Messages in this thread Patch in this message | | | From | Kamal Mostafa <> | Subject | [PATCH 2/2] x86: "mem=nopentium ignored" warning when not supported | Date | Thu, 3 Feb 2011 17:38:05 -0800 |
| |
Emit warning when "mem=nopentium" is specified on any arch other than x86_32 (the only that arch supports it).
BugLink: http://bugs.launchpad.net/bugs/553464 Signed-off-by: Kamal Mostafa <kamal@canonical.com> Cc: <stable@kernel.org> --- arch/x86/kernel/e820.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 55a59d8..0429ad0 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -847,12 +847,16 @@ 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); -- 1.7.1
| |