[PATCH 03/12] i386 head.S: 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]>
---
 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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • [PATCH 04/12] i386 voyager: Use modern techniques to setup and teardown low identiy mappings.
    • From: [email protected] (Eric W. Biederman)

• References:
  • [PATCH 0/12] Early USB debug port and i386 boot cleanups
    • From: [email protected] (Eric W. Biederman)
  • [PATCH 01/12] x86_64: Allow fixmaps to be used with the initial page table.
    • From: [email protected] (Eric W. Biederman)
  • [PATCH 02/12] i386 head.S: Remove unnecessary use of %ebx as the boot cpu flag
    • From: [email protected] (Eric W. Biederman)

• Prev by Date: [PATCH] [31/34] i386: convert to the kthread API
• Next by Date: [PATCH] [26/34] i386: remove xtime_lock'ing around cpufreq notifier
• Previous by thread: [PATCH 02/12] i386 head.S: Remove unnecessary use of %ebx as the boot cpu flag
• Next by thread: [PATCH 04/12] i386 voyager: Use modern techniques to setup and teardown low identiy mappings.
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]