Commit-ID: 9a6d44b9adb777ca9549e88cd55bd8f2673c52a2 Gitweb: http://git.kernel.org/tip/9a6d44b9adb777ca9549e88cd55bd8f2673c52a2 Author: Kamal Mostafa <[email protected]> AuthorDate: Thu, 3 Feb 2011 17:38:05 -0800 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 14 Feb 2011 13:15:43 +0100
x86: Emit "mem=nopentium ignored" warning when not supported 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]> 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]> Cc: <[email protected]> --- arch/x86/kernel/e820.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 55a59d8..0b5e2b5 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -847,12 +847,15 @@ static int __init parse_memopt(char *p) 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
