diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 10:37:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 10:37:51 -0500 |
| commit | 3ae0af12b458461f36dfddb26e54056be32928dd (patch) | |
| tree | 063059f24f42506ce2a86374a3b6e2b7a8ae3fcf /arch/powerpc/Kconfig | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
| parent | 7c43ee40ec602db3fa27e6e2d4f092f06ab0901c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 4 |
1 files changed, 4 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 | |||
| 599 | def_bool y | 599 | def_bool y |
| 600 | depends on NEED_MULTIPLE_NODES | 600 | depends on NEED_MULTIPLE_NODES |
| 601 | 601 | ||
| 602 | config ARCH_MEMORY_PROBE | ||
| 603 | def_bool y | ||
| 604 | depends on MEMORY_HOTPLUG | ||
| 605 | |||
| 602 | # Some NUMA nodes have memory ranges that span | 606 | # Some NUMA nodes have memory ranges that span |
| 603 | # other nodes. Even though a pfn is valid and | 607 | # other nodes. Even though a pfn is valid and |
| 604 | # between a node's start and end pfns, it may not | 608 | # between a node's start and end pfns, it may not |