From ed17cc6e754d3b7ffae81480110e4df9ab34f3db Mon Sep 17 00:00:00 2001
From: Marco Stornelli <marco.stornelli@gmail.com>
Date: Tue, 16 Sep 2008 09:14:03 +0200
Subject: [PATCH] --- yaml --- r: 113206 b: refs/heads/master c:
 48c1fd3882286fd9e978ca8725013f2e060b700e h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/arch/avr32/kernel/setup.c | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 11691de7b36d..7cc84e4fec96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d256151471ba9fd60a5b896a706eb21a6b1cea1
+refs/heads/master: 48c1fd3882286fd9e978ca8725013f2e060b700e
diff --git a/trunk/arch/avr32/kernel/setup.c b/trunk/arch/avr32/kernel/setup.c
index d8e623c426c1..5c7083916c33 100644
--- a/trunk/arch/avr32/kernel/setup.c
+++ b/trunk/arch/avr32/kernel/setup.c
@@ -283,6 +283,25 @@ static int __init early_parse_fbmem(char *p)
 }
 early_param("fbmem", early_parse_fbmem);
 
+/*
+ * Pick out the memory size.  We look for mem=size@start,
+ * where start and size are "size[KkMmGg]"
+ */
+static int __init early_mem(char *p)
+{
+	resource_size_t size, start;
+
+	start = system_ram->start;
+	size  = memparse(p, &p);
+	if (*p == '@')
+		start = memparse(p + 1, &p);
+
+	system_ram->start = start;
+	system_ram->end = system_ram->start + size - 1;
+	return 0;
+}
+early_param("mem", early_mem);
+
 static int __init parse_tag_core(struct tag *tag)
 {
 	if (tag->hdr.size > 2) {