UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <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>
Cc: <stable@kernel.org>
This commit is contained in:
Kamal Mostafa 2011-02-03 17:38:05 -08:00 committed by Ingo Molnar
parent 77eed821ac
commit 9a6d44b9ad
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/x86/kernel/e820.c
View File

@ -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);