---

yaml --- r: 77805 b: refs/heads/master c: 80a68a4 h: refs/heads/master i: 77803: b76dab6 v: v3
git-mirror · Jan 28, 2008 · 081a018 · 081a018
1 parent c371b6b
commit 081a018
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74d99a5e262229ee865f6f68528d10b82471ead6
+refs/heads/master: 80a68a43d90e2221599b507b6b26c3cba1957687
diff --git a/trunk/arch/sh/kernel/setup.c b/trunk/arch/sh/kernel/setup.c
@@ -84,6 +84,17 @@ static int __init early_parse_mem(char *p)
 
 	memory_start = (unsigned long)PAGE_OFFSET+__MEMORY_START;
 	size = memparse(p, &p);
+
+	if (size > __MEMORY_SIZE) {
+		static char msg[] __initdata = KERN_ERR
+			"Using mem= to increase the size of kernel memory "
+			"is not allowed.\n"
+			"  Recompile the kernel with the correct value for "
+			"CONFIG_MEMORY_SIZE.\n";
+		printk(msg);
+		return 0;
+	}
+
 	memory_end = memory_start + size;
 
 	return 0;