From 2c9db594da863b5e8a4213f66775f2efbd6a7ee9 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 8 Aug 2007 17:06:54 +0900
Subject: [PATCH] --- yaml --- r: 68209 b: refs/heads/master c:
 d3428e91017f2ecf5655b3ffdf6ed65f5430ade1 h: refs/heads/master i:   68207:
 d7642a5dd0d46c84cb6702bdd57dfa06cd87600d v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/sh/kernel/cpu/sh4a/setup-shx3.c | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 997a8ccbd9ee..d28123f51b6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1760b7d760b2804a87affcb8ec74edde8812a1ea
+refs/heads/master: d3428e91017f2ecf5655b3ffdf6ed65f5430ade1
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/trunk/arch/sh/kernel/cpu/sh4a/setup-shx3.c
index f7a2cc221d22..98f153554deb 100644
--- a/trunk/arch/sh/kernel/cpu/sh4a/setup-shx3.c
+++ b/trunk/arch/sh/kernel/cpu/sh4a/setup-shx3.c
@@ -258,14 +258,17 @@ void __init plat_irq_setup(void)
 
 void __init plat_mem_setup(void)
 {
+	unsigned int nid = 1;
+
 	/* Register CPU#0 URAM space as Node 1 */
-	setup_bootmem_node(1, 0x145f0000, 0x14610000);	/* CPU0 */
+	setup_bootmem_node(nid++, 0x145f0000, 0x14610000);	/* CPU0 */
 
 #if 0
 	/* XXX: Not yet.. */
-	setup_bootmem_node(2, 0x14df0000, 0x14e10000);	/* CPU1 */
-	setup_bootmem_node(3, 0x155f0000, 0x15610000);	/* CPU2 */
-	setup_bootmem_node(4, 0x15df0000, 0x15e10000);	/* CPU3 */
-	setup_bootmem_node(5, 0x16000000, 0x16020000);	/* CSM */
+	setup_bootmem_node(nid++, 0x14df0000, 0x14e10000);	/* CPU1 */
+	setup_bootmem_node(nid++, 0x155f0000, 0x15610000);	/* CPU2 */
+	setup_bootmem_node(nid++, 0x15df0000, 0x15e10000);	/* CPU3 */
 #endif
+
+	setup_bootmem_node(nid++, 0x16000000, 0x16020000);	/* CSM */
 }