On 10/8/24 15:15, Jason Andryuk wrote:
On 2024-10-06 17:49, Daniel P. Smith wrote:
Any direct usages of struct mod have been transitioned, remove the
remaining
references to early_mod fields.
This is unclear, please try to re-word. "struct mod" and "early_mod"
don't exist.
Ack.
Signed-off-by: Daniel P. Smith <dpsm...@apertussolutions.com>
---
xen/arch/x86/setup.c | 31 +++++++++++--------------------
1 file changed, 11 insertions(+), 20 deletions(-)
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index e9e3da3204f1..0ffe8d3ff8dd 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1404,16 +1401,12 @@ void asmlinkage __init noreturn
__start_xen(unsigned long mbi_p)
*/
bi->mods[xen].start = virt_to_mfn(_stext);
bi->mods[xen].size = __2M_rwdata_end - _stext;
-
- bi->mods[xen].mod->mod_start = 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);
Thunderbird might corrupt this, bit the above can fit on two lines:
bi->mods[0].headroom =
bzimage_headroom(bootstrap_map_bm(&bi->mods[0]),
bi->mods[0].size);
I actually prefer the same formatting as Jan has suggested, will apply
that one.
+ bootstrap_map_bm(NULL);
#ifndef highmem_start
/* Don't allow split below 4Gb. */
@@ -1708,8 +1699,8 @@ void asmlinkage __init noreturn
__start_xen(unsigned long mbi_p)
for ( i = 0; i < bi->nr_modules; ++i )
{
- set_pdx_range(paddr_to_pfn(bi->mods[i].mod->mod_start),
- paddr_to_pfn(bi->mods[i].mod->mod_start) +
+ set_pdx_range(paddr_to_pfn(bi->mods[i].start),
+ paddr_to_pfn(bi->mods[i].start) +
This belongs in patch 14 as mentioned there.
Ack.
v/r,
dps
