提交 9a6d44b9 编写于 作者: K Kamal Mostafa 提交者: Ingo Molnar

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: NKamal 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: NIngo Molnar <mingo@elte.hu>
Cc: <stable@kernel.org>
上级 77eed821
...@@ -847,12 +847,15 @@ static int __init parse_memopt(char *p) ...@@ -847,12 +847,15 @@ static int __init parse_memopt(char *p)
if (!p) if (!p)
return -EINVAL; return -EINVAL;
#ifdef CONFIG_X86_32
if (!strcmp(p, "nopentium")) { if (!strcmp(p, "nopentium")) {
#ifdef CONFIG_X86_32
setup_clear_cpu_cap(X86_FEATURE_PSE); setup_clear_cpu_cap(X86_FEATURE_PSE);
return 0; return 0;
} #else
printk(KERN_WARNING "mem=nopentium ignored! (only supported on x86_32)\n");
return -EINVAL;
#endif #endif
}
userdef = 1; userdef = 1;
mem_size = memparse(p, &p); mem_size = memparse(p, &p);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册