@@ -35,7 +35,6 @@ extern struct boot_info xen_boot_info;
unsigned long initial_images_nrpages(nodeid_t node);
void discard_initial_images(void);
-void *bootstrap_map(const module_t *mod);
void *bootstrap_map_bm(const struct boot_module *bm);
int remove_xen_ranges(struct rangeset *r);
@@ -350,8 +350,8 @@ unsigned long __init initial_images_nrpages(nodeid_t node)
for ( nr = i = 0; i < bi->nr_modules; ++i )
{
- unsigned long start = bi->mods[i].mod->mod_start;
- unsigned long end = start + PFN_UP(bi->mods[i].mod->mod_end);
+ unsigned long start = bi->mods[i].start;
+ unsigned long end = start + PFN_UP(bi->mods[i].size);
if ( end > node_start && node_end > start )
nr += min(node_end, end) - max(node_start, start);
@@ -488,7 +488,7 @@ static void *__init bootstrap_map_addr(paddr_t start, paddr_t end)
return ret;
}
-void *__init bootstrap_map(const module_t *mod)
+static void *__init bootstrap_map(const module_t *mod)
{
if ( !mod )
return bootstrap_map_addr(0, 0);
@@ -678,8 +678,8 @@ static uint64_t __init consider_modules(
for ( i = 0; i < nr_mods ; ++i )
{
- uint64_t start = pfn_to_paddr(mods[i].mod->mod_start);
- uint64_t end = start + PAGE_ALIGN(mods[i].mod->mod_end);
+ uint64_t start = (uint64_t)mods[i].start;
+ uint64_t end = start + PAGE_ALIGN(mods[i].size);
if ( i == this_mod )
continue;
@@ -1399,12 +1399,10 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
set_kexec_crash_area_size((u64)nr_pages << PAGE_SHIFT);
kexec_reserve_area();
- for ( i = 0; !efi_enabled(EFI_LOADER) && i < bi->nr_modules; i++ )
+ for ( i = 0; i < bi->nr_modules; i++ )
{
- if ( bi->mods[i].mod->mod_start & (PAGE_SIZE - 1) )
+ if ( bi->mods[i].start & (PAGE_SIZE - 1) )
panic("Bootloader didn't honor module alignment request\n");
- bi->mods[i].mod->mod_end -= bi->mods[i].mod->mod_start;
- bi->mods[i].mod->mod_start >>= PAGE_SHIFT;
}
/*
@@ -1425,16 +1423,11 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
*/
bi->mods[xen].start = virt_to_maddr(_stext);
bi->mods[xen].size = __2M_rwdata_end - _stext;
-
- bi->mods[xen].mod->mod_start = paddr_to_pfn(bi->mods[xen].start);
- bi->mods[xen].mod->mod_end = bi->mods[xen].size;
}
- bi->mods[0].headroom =
- bzimage_headroom(bootstrap_map(bi->mods[0].mod),
- bi->mods[0].mod->mod_end);
-
- bootstrap_map(NULL);
+ bi->mods[0].headroom = bzimage_headroom(
+ bootstrap_map_bm(&bi->mods[0]), bi->mods[0].size);
+ bootstrap_map_bm(NULL);
#ifndef highmem_start
/* Don't allow split below 4Gb. */
@@ -1535,9 +1528,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
{
move_memory(end - size + bm->headroom, bm->start, bm->size);
bm->start = (end - size);
- bm->mod->mod_start = paddr_to_pfn(bm->start);
bm->size += bm->headroom;
- bm->mod->mod_end = bm->size;
bm->relocated = true;
}
}
Any direct usages of module_t have been transitioned, remove the remaining references to the mod field. This also removes any external use of bootstrap_map(), dropping from setup.h and making it static. Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com> --- Changes since v6: - drop efi exclusion check for module memory alignment validation Changes since v5: - commit message rewrite - coding style change - remove export of bootstrap_map() --- xen/arch/x86/include/asm/setup.h | 1 - xen/arch/x86/setup.c | 29 ++++++++++------------------- 2 files changed, 10 insertions(+), 20 deletions(-)