summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips64/config.in1
-rw-r--r--arch/mips64/defconfig1
-rw-r--r--arch/mips64/defconfig-ip271
-rw-r--r--include/asm-mips64/mmzone.h2
4 files changed, 5 insertions, 0 deletions
diff --git a/arch/mips64/config.in b/arch/mips64/config.in
index 7777ed3a3..083969249 100644
--- a/arch/mips64/config.in
+++ b/arch/mips64/config.in
@@ -17,6 +17,7 @@ bool 'Support for SGI IP27' CONFIG_SGI_IP27
if [ "$CONFIG_SGI_IP27" = "y" ]; then
bool ' IP27 N-Mode' CONFIG_SGI_SN0_N_MODE
bool ' Discontiguous Memory Support' CONFIG_DISCONTIGMEM
+ bool ' NUMA support' CONFIG_NUMA
bool ' Mapped kernel support' CONFIG_MAPPED_KERNEL
bool ' Kernel text replication support' CONFIG_REPLICATE_KTEXT
bool ' Exception handler replication support' CONFIG_REPLICATE_EXHANDLERS
diff --git a/arch/mips64/defconfig b/arch/mips64/defconfig
index 1c177bfee..4211c7500 100644
--- a/arch/mips64/defconfig
+++ b/arch/mips64/defconfig
@@ -14,6 +14,7 @@
CONFIG_SGI_IP27=y
# CONFIG_SGI_SN0_N_MODE is not set
# CONFIG_DISCONTIGMEM is not set
+# CONFIG_NUMA is not set
# CONFIG_MAPPED_KERNEL is not set
# CONFIG_REPLICATE_KTEXT is not set
# CONFIG_REPLICATE_EXHANDLERS is not set
diff --git a/arch/mips64/defconfig-ip27 b/arch/mips64/defconfig-ip27
index 1c177bfee..4211c7500 100644
--- a/arch/mips64/defconfig-ip27
+++ b/arch/mips64/defconfig-ip27
@@ -14,6 +14,7 @@
CONFIG_SGI_IP27=y
# CONFIG_SGI_SN0_N_MODE is not set
# CONFIG_DISCONTIGMEM is not set
+# CONFIG_NUMA is not set
# CONFIG_MAPPED_KERNEL is not set
# CONFIG_REPLICATE_KTEXT is not set
# CONFIG_REPLICATE_EXHANDLERS is not set
diff --git a/include/asm-mips64/mmzone.h b/include/asm-mips64/mmzone.h
index 1bbb1f818..2c6af1d75 100644
--- a/include/asm-mips64/mmzone.h
+++ b/include/asm-mips64/mmzone.h
@@ -29,6 +29,8 @@ extern plat_pg_data_t *plat_node_data[];
#define PLAT_NODE_DATA_LOCALNR(p, n) \
(((p) - PLAT_NODE_DATA(n)->gendata.node_start_paddr) >> PAGE_SHIFT)
+#define numa_node_id() cputocnode(current->processor)
+
#ifdef CONFIG_DISCONTIGMEM
/*