commit 901c28c257eb8903a7d66c900df163e2c13ca995
author Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Tue Oct 05 08:16:08 2010 +0000
committer Paul Mundt <lethal@linux-sh.org> Wed Oct 06 16:53:28 2010 +0900
tree 9d5cde441120ac52b281e233b43cf601e229c2ee
parent bde40898c814362e8041cad0e989c7a749c417ec

sh: Fix address calculation of Initrd

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

arch/sh/kernel/setup.c

diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index f24d0ea..4e27846 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -135,8 +135,9 @@
 		goto disable;
 	}
 
-	if (unlikely(start < PAGE_OFFSET)) {
-		pr_err("initrd start < PAGE_OFFSET\n");
+	if (unlikely(start < __MEMORY_START)) {
+		pr_err("initrd start (%08lx) < __MEMORY_START(%x)\n",
+			start, __MEMORY_START);
 		goto disable;
 	}
 
@@ -157,7 +158,7 @@
 	/*
 	 * Address sanitization
 	 */
-	initrd_start = (unsigned long)__va(__pa(start));
+	initrd_start = (unsigned long)__va(start);
 	initrd_end = initrd_start + INITRD_SIZE;
 
 	memblock_reserve(__pa(initrd_start), INITRD_SIZE);