diff options
| -rw-r--r-- | arch/powerpc/Kconfig | 13 | ||||
| -rw-r--r-- | arch/ppc64/Kconfig | 11 |
2 files changed, 9 insertions, 15 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index c71ddc0c191a..967ecf92d6a7 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -538,6 +538,11 @@ config IRQ_ALL_CPUS | |||
| 538 | 538 | ||
| 539 | source "arch/powerpc/platforms/pseries/Kconfig" | 539 | source "arch/powerpc/platforms/pseries/Kconfig" |
| 540 | 540 | ||
| 541 | config NUMA | ||
| 542 | bool "NUMA support" | ||
| 543 | depends on PPC64 | ||
| 544 | default y if SMP && PPC_PSERIES | ||
| 545 | |||
| 541 | config ARCH_SELECT_MEMORY_MODEL | 546 | config ARCH_SELECT_MEMORY_MODEL |
| 542 | def_bool y | 547 | def_bool y |
| 543 | depends on PPC64 | 548 | depends on PPC64 |
| @@ -554,10 +559,6 @@ config ARCH_DISCONTIGMEM_DEFAULT | |||
| 554 | def_bool y | 559 | def_bool y |
| 555 | depends on ARCH_DISCONTIGMEM_ENABLE | 560 | depends on ARCH_DISCONTIGMEM_ENABLE |
| 556 | 561 | ||
| 557 | config ARCH_FLATMEM_ENABLE | ||
| 558 | def_bool y | ||
| 559 | depends on PPC64 | ||
| 560 | |||
| 561 | config ARCH_SPARSEMEM_ENABLE | 562 | config ARCH_SPARSEMEM_ENABLE |
| 562 | def_bool y | 563 | def_bool y |
| 563 | depends on ARCH_DISCONTIGMEM_ENABLE | 564 | depends on ARCH_DISCONTIGMEM_ENABLE |
| @@ -581,10 +582,6 @@ config NODES_SPAN_OTHER_NODES | |||
| 581 | def_bool y | 582 | def_bool y |
| 582 | depends on NEED_MULTIPLE_NODES | 583 | depends on NEED_MULTIPLE_NODES |
| 583 | 584 | ||
| 584 | config NUMA | ||
| 585 | bool "NUMA support" | ||
| 586 | default y if DISCONTIGMEM || SPARSEMEM | ||
| 587 | |||
| 588 | config SCHED_SMT | 585 | config SCHED_SMT |
| 589 | bool "SMT (Hyperthreading) scheduler support" | 586 | bool "SMT (Hyperthreading) scheduler support" |
| 590 | depends on PPC64 && SMP | 587 | depends on PPC64 && SMP |
diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig index b889277ab7de..42677cc96508 100644 --- a/arch/ppc64/Kconfig +++ b/arch/ppc64/Kconfig | |||
| @@ -248,6 +248,10 @@ config HMT | |||
| 248 | This option enables hardware multithreading on RS64 cpus. | 248 | This option enables hardware multithreading on RS64 cpus. |
| 249 | pSeries systems p620 and p660 have such a cpu type. | 249 | pSeries systems p620 and p660 have such a cpu type. |
| 250 | 250 | ||
| 251 | config NUMA | ||
| 252 | bool "NUMA support" | ||
| 253 | default y if SMP && PPC_PSERIES | ||
| 254 | |||
| 251 | config ARCH_SELECT_MEMORY_MODEL | 255 | config ARCH_SELECT_MEMORY_MODEL |
| 252 | def_bool y | 256 | def_bool y |
| 253 | 257 | ||
| @@ -263,9 +267,6 @@ config ARCH_DISCONTIGMEM_DEFAULT | |||
| 263 | def_bool y | 267 | def_bool y |
| 264 | depends on ARCH_DISCONTIGMEM_ENABLE | 268 | depends on ARCH_DISCONTIGMEM_ENABLE |
| 265 | 269 | ||
| 266 | config ARCH_FLATMEM_ENABLE | ||
| 267 | def_bool y | ||
| 268 | |||
| 269 | config ARCH_SPARSEMEM_ENABLE | 270 | config ARCH_SPARSEMEM_ENABLE |
| 270 | def_bool y | 271 | def_bool y |
| 271 | depends on ARCH_DISCONTIGMEM_ENABLE | 272 | depends on ARCH_DISCONTIGMEM_ENABLE |
| @@ -288,10 +289,6 @@ config NODES_SPAN_OTHER_NODES | |||
| 288 | def_bool y | 289 | def_bool y |
| 289 | depends on NEED_MULTIPLE_NODES | 290 | depends on NEED_MULTIPLE_NODES |
| 290 | 291 | ||
| 291 | config NUMA | ||
| 292 | bool "NUMA support" | ||
| 293 | default y if DISCONTIGMEM || SPARSEMEM | ||
| 294 | |||
| 295 | config SCHED_SMT | 292 | config SCHED_SMT |
| 296 | bool "SMT (Hyperthreading) scheduler support" | 293 | bool "SMT (Hyperthreading) scheduler support" |
| 297 | depends on SMP | 294 | depends on SMP |