summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Kravetz <kravetz@us.ibm.com>2005-11-07 09:39:48 -0800
committerPaul Mackerras <paulus@samba.org>2005-11-08 15:17:38 +1100
commit7e9191daf643255c24893427f966795e4167ca2c (patch)
treeece13c7bc2a924bf5ec57dd004fd6e11662c763c
parent82dd26a971848efafc6c8f12803ae012d268d2eb (diff)
downloadblackbird-op-linux-7e9191daf643255c24893427f966795e4167ca2c.tar.gz
blackbird-op-linux-7e9191daf643255c24893427f966795e4167ca2c.zip
[PATCH] Memory Add Fixes for ppc64
ppc64 needs a special sysfs probe file for adding new memory. Signed-off-by: Mike Kravetz <kravetz@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/Kconfig4
-rw-r--r--arch/ppc64/Kconfig4
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 1493c7896fe3..ed31062029f7 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -599,6 +599,10 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
def_bool y
depends on NEED_MULTIPLE_NODES
+config ARCH_MEMORY_PROBE
+ def_bool y
+ depends on MEMORY_HOTPLUG
+
# Some NUMA nodes have memory ranges that span
# other nodes. Even though a pfn is valid and
# between a node's start and end pfns, it may not
diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 29552348e581..c9d32db9d76a 100644
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -297,6 +297,10 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
def_bool y
depends on NEED_MULTIPLE_NODES
+config ARCH_MEMORY_PROBE
+ def_bool y
+ depends on MEMORY_HOTPLUG
+
# Some NUMA nodes have memory ranges that span
# other nodes. Even though a pfn is valid and
# between a node's start and end pfns, it may not
OpenPOWER on IntegriCloud