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: Eric W. Biederman <ebiederm@xxxxxxxxxxxx> --- arch/i386/kernel/head.S | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S index aa9e28e..248d44c 100644 --- a/arch/i386/kernel/head.S +++ b/arch/i386/kernel/head.S @@ -181,6 +181,8 @@ ENTRY(startup_32_smp) movl %eax,%es movl %eax,%fs movl %eax,%gs +#endif /* CONFIG_SMP */ +3: /* * New page tables may be in 4Mbyte page mode and may @@ -227,8 +229,6 @@ ENTRY(startup_32_smp) wrmsr 6: -#endif /* CONFIG_SMP */ -3: /* * Enable paging -- 1.5.1.1.181.g2de0 _______________________________________________ Virtualization mailing list Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/virtualization
