@@ -1053,7 +1053,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
unsigned int initrdidx, num_parked = 0;
multiboot_info_t *mbi;
module_t *mod;
- unsigned long nr_pages, raw_max_page, module_map[1];
+ unsigned long nr_pages, raw_max_page;
int i, j, e820_warn = 0, bytes = 0;
unsigned long eb_start, eb_end;
bool acpi_boot_table_init_done = false, relocated = false;
@@ -1203,15 +1203,14 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
panic("dom0 kernel not specified. Check bootloader configuration\n");
/* Check that we don't have a silly number of modules. */
- if ( boot_info->nr_mods > sizeof(module_map) * 8 )
+ if ( boot_info->nr_mods > MAX_NR_BOOTMODS + 1 )
{
- boot_info->nr_mods = sizeof(module_map) * 8;
+ boot_info->nr_mods = MAX_NR_BOOTMODS + 1;
printk("Excessive multiboot modules - using the first %u only\n",
boot_info->nr_mods);
}
- bitmap_fill(module_map, boot_info->nr_mods);
- __clear_bit(0, module_map); /* Dom0 kernel is always first */
+ /* Dom0 kernel is always first */
boot_info->mods[0].type = BOOTMOD_KERNEL;
boot_info->mods[0].flags |= BOOTMOD_FLAG_X86_CONSUMED;
The ramdisk loading is the last user of module_map, remove its usage and any remaining remnants of module_map. Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com> --- xen/arch/x86/setup.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)