From e8f75575dc3c8765b42ded8f9b46c3fc02317813 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 15 Aug 2022 11:21:17 +0200 Subject: [PATCH] drop genirq patch from 5.4 and older --- ...enirq-generic_irq_ipi-depends-on-smp.patch | 51 ------------------- queue-4.14/series | 1 - ...enirq-generic_irq_ipi-depends-on-smp.patch | 51 ------------------- queue-4.19/series | 1 - ...enirq-generic_irq_ipi-depends-on-smp.patch | 51 ------------------- queue-5.4/series | 1 - 6 files changed, 156 deletions(-) delete mode 100644 queue-4.14/genirq-generic_irq_ipi-depends-on-smp.patch delete mode 100644 queue-4.19/genirq-generic_irq_ipi-depends-on-smp.patch delete mode 100644 queue-5.4/genirq-generic_irq_ipi-depends-on-smp.patch diff --git a/queue-4.14/genirq-generic_irq_ipi-depends-on-smp.patch b/queue-4.14/genirq-generic_irq_ipi-depends-on-smp.patch deleted file mode 100644 index 451f897eb42..00000000000 --- a/queue-4.14/genirq-generic_irq_ipi-depends-on-smp.patch +++ /dev/null @@ -1,51 +0,0 @@ -From f9bc7dcf353bfb0741056c0e7084e6289e5b3a36 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 1 Jul 2022 15:00:50 -0500 -Subject: genirq: GENERIC_IRQ_IPI depends on SMP - -From: Samuel Holland - -[ Upstream commit 0f5209fee90b4544c58b4278d944425292789967 ] - -The generic IPI code depends on the IRQ affinity mask being allocated -and initialized. This will not be the case if SMP is disabled. Fix up -the remaining driver that selected GENERIC_IRQ_IPI in a non-SMP config. - -Reported-by: kernel test robot -Signed-off-by: Samuel Holland -Signed-off-by: Marc Zyngier -Link: https://lore.kernel.org/r/20220701200056.46555-3-samuel@sholland.org -Signed-off-by: Sasha Levin ---- - drivers/irqchip/Kconfig | 2 +- - kernel/irq/Kconfig | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig -index 9d8a1dd2e2c2..602602d7017b 100644 ---- a/drivers/irqchip/Kconfig -+++ b/drivers/irqchip/Kconfig -@@ -138,7 +138,7 @@ config IMGPDC_IRQ - config IRQ_MIPS_CPU - bool - select GENERIC_IRQ_CHIP -- select GENERIC_IRQ_IPI if SYS_SUPPORTS_MULTITHREADING -+ select GENERIC_IRQ_IPI if SMP && SYS_SUPPORTS_MULTITHREADING - select IRQ_DOMAIN - select IRQ_DOMAIN_HIERARCHY if GENERIC_IRQ_IPI - select GENERIC_IRQ_EFFECTIVE_AFF_MASK -diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig -index 779d858da2b3..94fb3ad9e275 100644 ---- a/kernel/irq/Kconfig -+++ b/kernel/irq/Kconfig -@@ -80,6 +80,7 @@ config IRQ_FASTEOI_HIERARCHY_HANDLERS - # Generic IRQ IPI support - config GENERIC_IRQ_IPI - bool -+ depends on SMP - select IRQ_DOMAIN_HIERARCHY - - # Generic MSI interrupt support --- -2.35.1 - diff --git a/queue-4.14/series b/queue-4.14/series index cd456d71257..89579ec50aa 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -40,7 +40,6 @@ netfilter-nf_tables-fix-null-deref-due-to-zeroed-list-head.patch arm64-do-not-forget-syscall-when-starting-a-new-thre.patch arm64-fix-oops-in-concurrently-setting-insn_emulatio.patch ext2-add-more-validity-checks-for-inode-counts.patch -genirq-generic_irq_ipi-depends-on-smp.patch arm-dts-imx6ul-add-missing-properties-for-sram.patch arm-dts-imx6ul-fix-qspi-node-compatible.patch arm-omap2-display-fix-refcount-leak-bug.patch diff --git a/queue-4.19/genirq-generic_irq_ipi-depends-on-smp.patch b/queue-4.19/genirq-generic_irq_ipi-depends-on-smp.patch deleted file mode 100644 index 8dad1886702..00000000000 --- a/queue-4.19/genirq-generic_irq_ipi-depends-on-smp.patch +++ /dev/null @@ -1,51 +0,0 @@ -From b99167fa29891e13cbc549090567ccfbd5a1dacd Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 1 Jul 2022 15:00:50 -0500 -Subject: genirq: GENERIC_IRQ_IPI depends on SMP - -From: Samuel Holland - -[ Upstream commit 0f5209fee90b4544c58b4278d944425292789967 ] - -The generic IPI code depends on the IRQ affinity mask being allocated -and initialized. This will not be the case if SMP is disabled. Fix up -the remaining driver that selected GENERIC_IRQ_IPI in a non-SMP config. - -Reported-by: kernel test robot -Signed-off-by: Samuel Holland -Signed-off-by: Marc Zyngier -Link: https://lore.kernel.org/r/20220701200056.46555-3-samuel@sholland.org -Signed-off-by: Sasha Levin ---- - drivers/irqchip/Kconfig | 2 +- - kernel/irq/Kconfig | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig -index 9d3812cd668e..85099cff62eb 100644 ---- a/drivers/irqchip/Kconfig -+++ b/drivers/irqchip/Kconfig -@@ -153,7 +153,7 @@ config IMGPDC_IRQ - config IRQ_MIPS_CPU - bool - select GENERIC_IRQ_CHIP -- select GENERIC_IRQ_IPI if SYS_SUPPORTS_MULTITHREADING -+ select GENERIC_IRQ_IPI if SMP && SYS_SUPPORTS_MULTITHREADING - select IRQ_DOMAIN - select IRQ_DOMAIN_HIERARCHY if GENERIC_IRQ_IPI - select GENERIC_IRQ_EFFECTIVE_AFF_MASK -diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig -index d532bf0c5a67..81473974b1d5 100644 ---- a/kernel/irq/Kconfig -+++ b/kernel/irq/Kconfig -@@ -80,6 +80,7 @@ config IRQ_FASTEOI_HIERARCHY_HANDLERS - # Generic IRQ IPI support - config GENERIC_IRQ_IPI - bool -+ depends on SMP - select IRQ_DOMAIN_HIERARCHY - - # Generic MSI interrupt support --- -2.35.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 0b9cfdbd9b8..2dbf7d8463e 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -41,7 +41,6 @@ netfilter-nf_tables-fix-null-deref-due-to-zeroed-list-head.patch arm64-do-not-forget-syscall-when-starting-a-new-thre.patch arm64-fix-oops-in-concurrently-setting-insn_emulatio.patch ext2-add-more-validity-checks-for-inode-counts.patch -genirq-generic_irq_ipi-depends-on-smp.patch arm-dts-imx6ul-add-missing-properties-for-sram.patch arm-dts-imx6ul-change-operating-points-to-uint32-mat.patch arm-dts-imx6ul-fix-lcdif-node-compatible.patch diff --git a/queue-5.4/genirq-generic_irq_ipi-depends-on-smp.patch b/queue-5.4/genirq-generic_irq_ipi-depends-on-smp.patch deleted file mode 100644 index 9ec67cbb86f..00000000000 --- a/queue-5.4/genirq-generic_irq_ipi-depends-on-smp.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 1ac66168f6a589c3f91104eb692fab83bae9ed73 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 1 Jul 2022 15:00:50 -0500 -Subject: genirq: GENERIC_IRQ_IPI depends on SMP - -From: Samuel Holland - -[ Upstream commit 0f5209fee90b4544c58b4278d944425292789967 ] - -The generic IPI code depends on the IRQ affinity mask being allocated -and initialized. This will not be the case if SMP is disabled. Fix up -the remaining driver that selected GENERIC_IRQ_IPI in a non-SMP config. - -Reported-by: kernel test robot -Signed-off-by: Samuel Holland -Signed-off-by: Marc Zyngier -Link: https://lore.kernel.org/r/20220701200056.46555-3-samuel@sholland.org -Signed-off-by: Sasha Levin ---- - drivers/irqchip/Kconfig | 2 +- - kernel/irq/Kconfig | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig -index 20f44ef9c4c9..e50b5516bbef 100644 ---- a/drivers/irqchip/Kconfig -+++ b/drivers/irqchip/Kconfig -@@ -178,7 +178,7 @@ config MADERA_IRQ - config IRQ_MIPS_CPU - bool - select GENERIC_IRQ_CHIP -- select GENERIC_IRQ_IPI if SYS_SUPPORTS_MULTITHREADING -+ select GENERIC_IRQ_IPI if SMP && SYS_SUPPORTS_MULTITHREADING - select IRQ_DOMAIN - select IRQ_DOMAIN_HIERARCHY if GENERIC_IRQ_IPI - select GENERIC_IRQ_EFFECTIVE_AFF_MASK -diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig -index 4e11120265c7..3a8a631044f0 100644 ---- a/kernel/irq/Kconfig -+++ b/kernel/irq/Kconfig -@@ -81,6 +81,7 @@ config IRQ_FASTEOI_HIERARCHY_HANDLERS - # Generic IRQ IPI support - config GENERIC_IRQ_IPI - bool -+ depends on SMP - select IRQ_DOMAIN_HIERARCHY - - # Generic MSI interrupt support --- -2.35.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 3dcdfe992da..961f468cbd1 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -56,7 +56,6 @@ arm64-do-not-forget-syscall-when-starting-a-new-thre.patch arm64-fix-oops-in-concurrently-setting-insn_emulatio.patch ext2-add-more-validity-checks-for-inode-counts.patch genirq-don-t-return-error-on-missing-optional-irq_re.patch -genirq-generic_irq_ipi-depends-on-smp.patch wait-fix-__wait_event_hrtimeout-for-rt-dl-tasks.patch arm-dts-imx6ul-add-missing-properties-for-sram.patch arm-dts-imx6ul-change-operating-points-to-uint32-mat.patch -- 2.47.3