From 081a01827b15209c1b188dc23c45ea2d0f9ccb53 Mon Sep 17 00:00:00 2001
From: Stuart Menefy <stuart.menefy@st.com>
Date: Mon, 26 Nov 2007 21:16:09 +0900
Subject: [PATCH] --- yaml --- r: 77805 b: refs/heads/master c:
 80a68a43d90e2221599b507b6b26c3cba1957687 h: refs/heads/master i:   77803:
 b76dab60135893f6a801404d97b63b3f69a98cad v: v3

---
 [refs]                       |  2 +-
 trunk/arch/sh/kernel/setup.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 02c49a2dab78..c2a4a617a762 100644
--- 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
index 6891cc93548e..7eb7fdcce0f8 100644
--- 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;