--- arch/x86/kernel/e820.c

+++ arch/x86/kernel/e820.c

@@ -1236,15 +1236,21 @@ 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);

+ /* don't remove all of memory when handling "mem={invalid}" param */

+ if (mem_size == 0)

+ return -EINVAL;

e820_remove_range(mem_size, ULLONG_MAX - mem_size, E820_RAM, 1);

return 0;