diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-13 19:33:56 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-13 19:33:56 (GMT) |
| commit | 4ef7e3e90f56c74b2a17e12d49ed35c3767d66c2 (patch) | |
| tree | 263f3462ea88a4a038b64c1e7b076f35ad24fbd0 /arch/x86/mm/init_32.c | |
| parent | 9604006d283fb67dda5ee9e0e15b7cc6c62e1557 (diff) | |
| parent | 1f465f4e475454b8bb590846c50a9d16e8046f3d (diff) | |
| download | linux-fsl-qoriq-4ef7e3e90f56c74b2a17e12d49ed35c3767d66c2.tar.xz | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: user_regset_view table fix for ia32 on 64-bit
x86: arch/x86/mm/pat.c - fix warning
x86: fix csum_partial() export
x86: early_init_centaur(): use set_cpu_cap()
x86: fix app crashes after SMP resume
x86: wakeup.lds.S - section ordering fix
x86: [VOYAGER] fix duplicate phys_cpu_present_map symbol
x86/pci: fix broken ISA DMA
Diffstat (limited to 'arch/x86/mm/init_32.c')
| -rw-r--r-- | arch/x86/mm/init_32.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index de236e4..ec30d10 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -438,8 +438,6 @@ void zap_low_mappings(void) { int i; - save_pg_dir(); - /* * Zap initial low-memory mappings. * @@ -663,16 +661,8 @@ void __init mem_init(void) test_wp_bit(); cpa_init(); - - /* - * Subtle. SMP is doing it's boot stuff late (because it has to - * fork idle threads) - but it also needs low mappings for the - * protected-mode entry to work. We zap these entries only after - * the WP-bit has been tested. - */ -#ifndef CONFIG_SMP + save_pg_dir(); zap_low_mappings(); -#endif } #ifdef CONFIG_MEMORY_HOTPLUG |