Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7da3b8ef662af6252aa17c55cc0aa6d74cbf02e4
Commit:     7da3b8ef662af6252aa17c55cc0aa6d74cbf02e4
Parent:     1ee010087e2d26f0d8182bb189d5606e3586253c
Author:     Paul Mundt <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 1 17:52:47 2007 +0900
Committer:  Paul Mundt <[EMAIL PROTECTED]>
CommitDate: Fri Sep 21 11:57:47 2007 +0900

    sh: Initial multiple-node support for SH-X3.
    
    Wire up CPU#0 URAM as node 1 on SH-X3.
    
    Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
---
 arch/sh/kernel/cpu/sh4a/setup-shx3.c |   14 ++++++++++++++
 arch/sh/mm/Kconfig                   |    3 +++
 2 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c 
b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
index 7f3fa51..f7a2cc2 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
@@ -255,3 +255,17 @@ void __init plat_irq_setup(void)
 {
        register_intc_controller(&intc_desc);
 }
+
+void __init plat_mem_setup(void)
+{
+       /* Register CPU#0 URAM space as Node 1 */
+       setup_bootmem_node(1, 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 */
+#endif
+}
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index d1a7e3f..eca68da 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -198,6 +198,8 @@ config CPU_SUBTYPE_SHX3
        select CPU_SH4A
        select CPU_SHX3
        select CPU_HAS_INTC_IRQ
+       select ARCH_SPARSEMEM_ENABLE
+       select SYS_SUPPORTS_NUMA
 
 # SH4AL-DSP Processor Support
 
@@ -323,6 +325,7 @@ config ARCH_SPARSEMEM_DEFAULT
 
 config MAX_ACTIVE_REGIONS
        int
+       default "6" if (CPU_SUBTYPE_SHX3 && SPARSEMEM)
        default "2" if (CPU_SUBTYPE_SH7722 && SPARSEMEM)
        default "1"
 
-
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