With all references to early_mod fields removed, remove the
early_mod field from struct boot_module.
Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com>
---
xen/arch/x86/include/asm/bootinfo.h | 2 --
xen/arch/x86/setup.c | 3 ---
2 files changed, 5 deletions(-)
diff --git a/xen/arch/x86/include/asm/bootinfo.h b/xen/arch/x86/include/asm/bootinfo.h
index edd5c435d032..59755ef42e53 100644
--- a/xen/arch/x86/include/asm/bootinfo.h
+++ b/xen/arch/x86/include/asm/bootinfo.h
@@ -8,7 +8,6 @@
#ifndef __XEN_X86_BOOTINFO_H__
#define __XEN_X86_BOOTINFO_H__
-#include <xen/multiboot.h>
#include <xen/types.h>
/* Boot module binary type / purpose */
@@ -22,7 +21,6 @@ enum bootmod_type {
};
struct boot_module {
- module_t *early_mod;
unsigned long headroom;
enum bootmod_type type;
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 46f6bf82fe63..a6fbaecee9ed 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -311,8 +311,6 @@ static void __init multiboot_to_bootinfo(multiboot_info_t *mbi, module_t *mods)
for ( i=0; i < info.nr_mods; i++ )
{
- boot_mods[i].early_mod = &mods[i];
-
boot_mods[i].cmdline = (char *)(paddr_t)mods[i].string;
boot_mods[i].start = (paddr_t)mods[i].mod_start;
@@ -322,7 +320,6 @@ static void __init multiboot_to_bootinfo(multiboot_info_t *mbi, module_t *mods)
/* map the last mb module for xen entry */
boot_mods[info.nr_mods].type = BOOTMOD_XEN;
boot_mods[info.nr_mods].flags |= BOOTMOD_FLAG_X86_CONSUMED;
- boot_mods[info.nr_mods].early_mod = &mods[info.nr_mods];
boot_info = &info;
}
--
2.30.2