Commit-ID: ac4d3bfdd9e27bfcc0b016c7ac364acb166455a1 Gitweb: http://git.kernel.org/tip/ac4d3bfdd9e27bfcc0b016c7ac364acb166455a1 Author: "Pekka Enberg" <penberg@xxxxxxxxxxxxxx> AuthorDate: Thu, 5 Mar 2009 17:22:21 +0200 Commit: Ingo Molnar <mingo@xxxxxxx> CommitDate: Fri, 6 Mar 2009 15:25:53 +0100 x86: init_memory_mapping() PSE and PGE setup ifdef removal Impact: cleanup Section 3.10 ("PAE-Enabled Paging in IA-32e Mode") of the Intel manual states that The CR4.PSE bit is ignored in IA-32e mode. In 64-bit mode, PGE is enabled at early boot so there's no need to hide setting them up in an ifdef. Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx> LKML-Reference: <1236266541.31324.14.camel@penberg-laptop> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- arch/x86/mm/init.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 5d06d25..e7d8bb5 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -223,7 +223,6 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, if (nx_enabled) printk(KERN_INFO "NX (Execute Disable) protection: active\n"); -#ifdef CONFIG_X86_32 /* Enable PSE if available */ if (cpu_has_pse) set_in_cr4(X86_CR4_PSE); @@ -233,7 +232,6 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, set_in_cr4(X86_CR4_PGE); __supported_pte_mask |= _PAGE_GLOBAL; } -#endif if (use_gbpages) page_size_mask |= 1 << PG_LEVEL_1G; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html