[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1236266541.31324.14.camel@penberg-laptop>
Date: Thu, 05 Mar 2009 17:22:21 +0200
From: Pekka Enberg <penberg@...helsinki.fi>
To: mingo@...e.hu
Cc: x86@...nel.org, linux-kernel@...r.kernel.org
Subject: [PATCH] x86: init_memory_mapping() PSE and PGE setup ifdef removal
From: Pekka Enberg <penberg@...helsinki.fi>
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@...helsinki.fi>
---
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 244ae9c..3002f62 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -221,7 +221,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);
@@ -231,7 +230,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;
--
1.5.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists