Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d3428e91017f2ecf5655b3ffdf6ed65f5430ade1
Commit:     d3428e91017f2ecf5655b3ffdf6ed65f5430ade1
Parent:     1760b7d760b2804a87affcb8ec74edde8812a1ea
Author:     Paul Mundt <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 8 17:06:54 2007 +0900
Committer:  Paul Mundt <[EMAIL PROTECTED]>
CommitDate: Fri Sep 21 11:57:49 2007 +0900

    sh: Wire up CSM node for SH-X3.
    
    Now that NODES_SHIFT is bumped up, we can plug in the CSM block as
    a separate node, too.
    
    Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
---
 arch/sh/kernel/cpu/sh4a/setup-shx3.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c 
b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
index f7a2cc2..98f1535 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c
+++ b/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 */
 }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to