diff options
| author | Kamal Mostafa <kamal@canonical.com> | 2011-02-03 17:38:05 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-21 12:45:38 -0700 |
| commit | 7203bdb035b9145b565da28d71a823d647425cee (patch) | |
| tree | 32c58a01ae8cd58f303fc5c14f015494ed512cb7 /arch | |
| parent | fcf391eef3662d8160ba3cd14aa000c43dd84920 (diff) | |
| download | kernel-common-7203bdb035b9145b565da28d71a823d647425cee.tar.gz kernel-common-7203bdb035b9145b565da28d71a823d647425cee.tar.bz2 kernel-common-7203bdb035b9145b565da28d71a823d647425cee.zip | |
x86: Emit "mem=nopentium ignored" warning when not supported
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 <kamal@canonical.com>
BugLink: http://bugs.launchpad.net/bugs/553464
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Len Brown <len.brown@intel.com>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
LKML-Reference: <1296783486-23033-2-git-send-email-kamal@canonical.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | 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 1873f423673a..88e9f57f26d7 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -1245,12 +1245,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); |