diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-02 02:53:50 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-03 07:26:28 -0400 |
commit | 6af61a7614a306fe882a0c2b4ddc63b65aa66efc (patch) | |
tree | a4027323b741d9784b5f3755fe7a276c536932ee /arch/x86/kernel/head_32.S | |
parent | 287572cb38de7f270b59191a0fecfa5c5de7765d (diff) |
x86: clean up max_pfn_mapped usage - 32-bit
on 32-bit in head_32.S after initial page table is done, we get initial
max_pfn_mapped, and then kernel_physical_mapping_init will give us
a final one.
We need to use that to make sure find_e820_area will get valid addresses
for boot_map and for NODE_DATA(0) on numa32.
XEN PV and lguest may need to assign max_pfn_mapped too.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/head_32.S')
-rw-r--r-- | arch/x86/kernel/head_32.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index bef4618feadb..ac7002fdd637 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
@@ -220,6 +220,8 @@ default_entry: | |||
220 | jb 10b | 220 | jb 10b |
221 | 1: | 221 | 1: |
222 | movl %edi,pa(init_pg_tables_end) | 222 | movl %edi,pa(init_pg_tables_end) |
223 | shrl $12, %eax | ||
224 | movl %eax, pa(max_pfn_mapped) | ||
223 | 225 | ||
224 | /* Do early initialization of the fixmap area */ | 226 | /* Do early initialization of the fixmap area */ |
225 | movl $pa(swapper_pg_fixmap)+PDE_ATTR,%eax | 227 | movl $pa(swapper_pg_fixmap)+PDE_ATTR,%eax |
@@ -251,6 +253,8 @@ page_pde_offset = (__PAGE_OFFSET >> 20); | |||
251 | cmpl %ebp,%eax | 253 | cmpl %ebp,%eax |
252 | jb 10b | 254 | jb 10b |
253 | movl %edi,pa(init_pg_tables_end) | 255 | movl %edi,pa(init_pg_tables_end) |
256 | shrl $12, %eax | ||
257 | movl %eax, pa(max_pfn_mapped) | ||
254 | 258 | ||
255 | /* Do early initialization of the fixmap area */ | 259 | /* Do early initialization of the fixmap area */ |
256 | movl $pa(swapper_pg_fixmap)+PDE_ATTR,%eax | 260 | movl $pa(swapper_pg_fixmap)+PDE_ATTR,%eax |