diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2013-01-24 12:19:51 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-01-29 15:13:24 -0800 |
| commit | 4f7b92263ad68cdc72b11808320d9c881bfa857e (patch) | |
| tree | 6aeddf7284dec1acf7d7ad7296ab57d9ba80787c /arch/x86/kernel/setup.c | |
| parent | 9735e91e9c29c0d8fe432aef1152e43e50bdb316 (diff) | |
x86, realmode: Separate real_mode reserve and setup
After we switch to use #PF handler help to set page table, init_level4_pgt
will only have entries set after init_mem_mapping().
We need to move copying init_level4_pgt to trampoline_pgd after that.
So split reserve and setup, and move the setup after init_mem_mapping()
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1359058816-7615-11-git-send-email-yinghai@kernel.org
Cc: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
Acked-by: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 5552d04b0cc..85a8290801d 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -999,12 +999,14 @@ void __init setup_arch(char **cmdline_p) printk(KERN_DEBUG "initial memory mapped: [mem 0x00000000-%#010lx]\n", (max_pfn_mapped<<PAGE_SHIFT) - 1); - setup_real_mode(); + reserve_real_mode(); trim_platform_memory_ranges(); init_mem_mapping(); + setup_real_mode(); + memblock.current_limit = get_max_mapped(); dma_contiguous_reserve(0); |