As the last user of MAY_HAVE_SPARSE_IRQ is gone, kill it, and clean up the SPARSE_IRQ, covert the help text into comment. Also move GENERIC_IRQ_MULTI_HANDLER into menu, and change all spaces to tabs to fix alignment issue. Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx> --- kernel/irq/Kconfig | 50 +++++++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig index fbc54c2a7f23..aa7d0e3edea6 100644 --- a/kernel/irq/Kconfig +++ b/kernel/irq/Kconfig @@ -2,13 +2,9 @@ menu "IRQ subsystem" # Options selectable by the architecture code -# Make sparse irq Kconfig switch below available -config MAY_HAVE_SPARSE_IRQ - bool - # Legacy support, required for itanic config GENERIC_IRQ_LEGACY - bool + bool # Enable the generic irq autoprobe mechanism config GENERIC_IRQ_PROBE @@ -16,15 +12,15 @@ config GENERIC_IRQ_PROBE # Use the generic /proc/interrupts implementation config GENERIC_IRQ_SHOW - bool + bool # Print level/edge extra information config GENERIC_IRQ_SHOW_LEVEL - bool + bool # Supports effective affinity mask config GENERIC_IRQ_EFFECTIVE_AFF_MASK - bool + bool # Support for delayed migration from interrupt context config GENERIC_PENDING_IRQ @@ -36,7 +32,7 @@ config GENERIC_IRQ_MIGRATION # Alpha specific irq affinity mechanism config AUTO_IRQ_AFFINITY - bool + bool # Interrupt injection mechanism config GENERIC_IRQ_INJECTION @@ -44,16 +40,16 @@ config GENERIC_IRQ_INJECTION # Tasklet based software resend for pending interrupts on enable_irq() config HARDIRQS_SW_RESEND - bool + bool # Edge style eoi based handler (cell) config IRQ_EDGE_EOI_HANDLER - bool + bool # Generic configurable interrupt chip implementation config GENERIC_IRQ_CHIP - bool - select IRQ_DOMAIN + bool + select IRQ_DOMAIN # Generic irq_domain hw <--> linux irq number translation config IRQ_DOMAIN @@ -103,6 +99,10 @@ config HANDLE_DOMAIN_IRQ config IRQ_TIMINGS bool +# Allow to specify the low level IRQ handler at run time. +config GENERIC_IRQ_MULTI_HANDLER + bool + config GENERIC_IRQ_MATRIX_ALLOCATOR bool @@ -111,20 +111,15 @@ config GENERIC_IRQ_RESERVATION_MODE # Support forced irq threading config IRQ_FORCED_THREADING - bool + bool +# Sparse irq numbering is useful for distro kernels that want +# to define a high CONFIG_NR_CPUS value but still want to have +# low kernel memory footprint on smaller machines. +# Sparse irqs can also be beneficial on NUMA boxes, as they spread +# out the interrupt descriptors in a more NUMA-friendly way. config SPARSE_IRQ - bool "Support sparse irq numbering" if MAY_HAVE_SPARSE_IRQ - help - - Sparse irq numbering is useful for distro kernels that want - to define a high CONFIG_NR_CPUS value but still want to have - low kernel memory footprint on smaller machines. - - ( Sparse irqs can also be beneficial on NUMA boxes, as they spread - out the interrupt descriptors in a more NUMA-friendly way. ) - - If you don't know what to do here, say N. + bool config GENERIC_IRQ_DEBUGFS bool "Expose irq internals in debugfs" @@ -139,8 +134,3 @@ config GENERIC_IRQ_DEBUGFS If you don't know what to do here, say N. endmenu - -config GENERIC_IRQ_MULTI_HANDLER - bool - help - Allow to specify the low level IRQ handler at run time. -- 2.26.2
