2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Kamal Mostafa <[email protected]> commit 9a6d44b9adb777ca9549e88cd55bd8f2673c52a2 upstream. Emit warning when "mem=nopentium" is specified on any arch other than x86_32 (the only that arch supports it). Signed-off-by: Kamal Mostafa <[email protected]> Signed-off-by: Andi Kleen <[email protected]> BugLink: http://bugs.launchpad.net/bugs/553464 Cc: Yinghai Lu <[email protected]> Cc: Len Brown <[email protected]> Cc: Rafael J. Wysocki <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- arch/x86/kernel/e820.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) Index: linux-2.6.35.y/arch/x86/kernel/e820.c =================================================================== --- linux-2.6.35.y.orig/arch/x86/kernel/e820.c 2011-03-29 23:03:02.252242542 -0700 +++ linux-2.6.35.y/arch/x86/kernel/e820.c 2011-03-29 23:03:02.270242081 -0700 @@ -980,12 +980,15 @@ if (!p) return -EINVAL; -#ifdef CONFIG_X86_32 if (!strcmp(p, "nopentium")) { +#ifdef CONFIG_X86_32 setup_clear_cpu_cap(X86_FEATURE_PSE); return 0; - } +#else + printk(KERN_WARNING "mem=nopentium ignored! (only supported on x86_32)\n"); + return -EINVAL; #endif + } userdef = 1; mem_size = memparse(p, &p); _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
