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