Commit:     5756dd59f118daacd68ee971a2381360ef769c48
Parent:     503595010f2024b236fd2636a7318fe64c794d6c
Author:     Ian Campbell <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:33:27 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:33:27 2008 +0100

    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: Eric W. Biederman <[EMAIL PROTECTED]>
    Signed-off-by: Ian Campbell <[EMAIL PROTECTED]>
    Cc: H. Peter Anvin <[EMAIL PROTECTED]>
    Cc: Andi Kleen <[EMAIL PROTECTED]>
    Cc: Mika Penttilä <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
 arch/x86/kernel/head_32.S |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 7b9b256..a2b6331 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -221,6 +221,8 @@ ENTRY(startup_32_smp)
        movl %eax,%es
        movl %eax,%fs
        movl %eax,%gs
+#endif /* CONFIG_SMP */
  *     New page tables may be in 4Mbyte page mode and may
@@ -267,8 +269,6 @@ ENTRY(startup_32_smp)
-#endif /* CONFIG_SMP */
  * Enable paging
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to