Commit 5756dd59 authored by Ian Campbell's avatar Ian Campbell Committed by Ingo Molnar

x86_32: always run the full set of paging state.

I am preparing to convert the boot time page table to the kernels
native format.  To achieve that I need to enable PAE. Enabling PSE
and the no execute bit would not hurt.  So this patch modifies
the boot cpu path to execute all of the kernels enable code
if and only if we have the proper bits set in mmu_cr4_features.
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarIan Campbell <ijc@hellion.org.uk>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Mika Penttilä <mika.penttila@kolumbus.fi>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 50359501
...@@ -221,6 +221,8 @@ ENTRY(startup_32_smp) ...@@ -221,6 +221,8 @@ ENTRY(startup_32_smp)
movl %eax,%es movl %eax,%es
movl %eax,%fs movl %eax,%fs
movl %eax,%gs movl %eax,%gs
#endif /* CONFIG_SMP */
3:
/* /*
* New page tables may be in 4Mbyte page mode and may * New page tables may be in 4Mbyte page mode and may
...@@ -267,8 +269,6 @@ ENTRY(startup_32_smp) ...@@ -267,8 +269,6 @@ ENTRY(startup_32_smp)
wrmsr wrmsr
6: 6:
#endif /* CONFIG_SMP */
3:
/* /*
* Enable paging * Enable paging
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment