Skip to content

Commit 6d32e46

Browse files
committed
genirq: GENERIC_IRQ_EFFECTIVE_AFF_MASK depends on SMP
jira LE-1907 Rebuild_History Non-Buildable kernel-5.14.0-284.30.1.el9_2 commit-author Samuel Holland <[email protected]> commit 0e6c027 An IRQ's effective affinity can only be different from its configured affinity if there are multiple CPUs. Make it clear that this option is only meaningful when SMP is enabled. Most of the relevant code in irqdesc.c is already hidden behind CONFIG_SMP anyway. Signed-off-by: Samuel Holland <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected] (cherry picked from commit 0e6c027) Signed-off-by: Jonathan Maple <[email protected]>
1 parent 7c31c22 commit 6d32e46

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

arch/arm/mach-hisi/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ config ARCH_HIP04
4040
select HAVE_ARM_ARCH_TIMER
4141
select MCPM if SMP
4242
select MCPM_QUAD_CLUSTER if SMP
43-
select GENERIC_IRQ_EFFECTIVE_AFF_MASK
43+
select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
4444
help
4545
Support for Hisilicon HiP04 SoC family
4646

drivers/irqchip/Kconfig

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ config IRQCHIP
88
config ARM_GIC
99
bool
1010
select IRQ_DOMAIN_HIERARCHY
11-
select GENERIC_IRQ_EFFECTIVE_AFF_MASK
11+
select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
1212

1313
config ARM_GIC_PM
1414
bool
@@ -34,7 +34,7 @@ config ARM_GIC_V3
3434
bool
3535
select IRQ_DOMAIN_HIERARCHY
3636
select PARTITION_PERCPU
37-
select GENERIC_IRQ_EFFECTIVE_AFF_MASK
37+
select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
3838

3939
config ARM_GIC_V3_ITS
4040
bool
@@ -76,7 +76,7 @@ config ARMADA_370_XP_IRQ
7676
bool
7777
select GENERIC_IRQ_CHIP
7878
select PCI_MSI if PCI
79-
select GENERIC_IRQ_EFFECTIVE_AFF_MASK
79+
select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
8080

8181
config ALPINE_MSI
8282
bool
@@ -112,13 +112,13 @@ config BCM6345_L1_IRQ
112112
bool
113113
select GENERIC_IRQ_CHIP
114114
select IRQ_DOMAIN
115-
select GENERIC_IRQ_EFFECTIVE_AFF_MASK
115+
select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
116116

117117
config BCM7038_L1_IRQ
118118
bool
119119
select GENERIC_IRQ_CHIP
120120
select IRQ_DOMAIN
121-
select GENERIC_IRQ_EFFECTIVE_AFF_MASK
121+
select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
122122

123123
config BCM7120_L2_IRQ
124124
bool
@@ -173,7 +173,7 @@ config IRQ_MIPS_CPU
173173
select GENERIC_IRQ_CHIP
174174
select GENERIC_IRQ_IPI if SYS_SUPPORTS_MULTITHREADING
175175
select IRQ_DOMAIN
176-
select GENERIC_IRQ_EFFECTIVE_AFF_MASK
176+
select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
177177

178178
config CLPS711X_IRQCHIP
179179
bool
@@ -276,7 +276,7 @@ config VERSATILE_FPGA_IRQ_NR
276276
config XTENSA_MX
277277
bool
278278
select IRQ_DOMAIN
279-
select GENERIC_IRQ_EFFECTIVE_AFF_MASK
279+
select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
280280

281281
config XILINX_INTC
282282
bool "Xilinx Interrupt Controller IP"

kernel/irq/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ config GENERIC_IRQ_SHOW_LEVEL
2424

2525
# Supports effective affinity mask
2626
config GENERIC_IRQ_EFFECTIVE_AFF_MASK
27+
depends on SMP
2728
bool
2829

2930
# Support for delayed migration from interrupt context

0 commit comments

Comments
 (0)