diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-08-26 09:14:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-08-26 09:14:05 +0200 |
| commit | 46466ae3a105d9620e1355e33125a413b8c6ce18 (patch) | |
| tree | 618b2d3574626956e0c7ea1d3bc3b35328e8cb40 /arch/ia64/Kconfig | |
| parent | 3f2cbe3810a60111a33f5f6267bd5a237b826fc9 (diff) | |
| parent | ccf26483416a339c114409f6e7cd02abdeaf8052 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 279252e3e0f7..4993c7ac7ff6 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -25,7 +25,6 @@ config IA64 select HAVE_ASM_MODVERSIONS select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_EXIT_THREAD - select HAVE_IDE select HAVE_KPROBES select HAVE_KRETPROBES select HAVE_FTRACE_MCOUNT_RECORD @@ -60,6 +59,7 @@ config IA64 select NUMA if !FLATMEM select PCI_MSI_ARCH_FALLBACKS if PCI_MSI select SET_FS + select ZONE_DMA32 default y help The Itanium Processor Family is Intel's 64-bit successor to @@ -72,9 +72,6 @@ config 64BIT select ATA_NONSTANDARD if ATA default y -config ZONE_DMA32 - def_bool y - config MMU bool default y @@ -302,15 +299,12 @@ config NODES_SHIFT int "Max num nodes shift(3-10)" range 3 10 default "10" - depends on NEED_MULTIPLE_NODES + depends on NUMA help This option specifies the maximum number of nodes in your SSI system. MAX_NUMNODES will be 2^(This value). If in doubt, use the default. -config HOLES_IN_ZONE - bool - config HAVE_ARCH_NODEDATA_EXTENSION def_bool y depends on NUMA |