UBUNTU: SAUCE: allow IRQs to be irq-threaded by default via config

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig
index 27c4e774071ce68ce06bc86c8ed817536e0e795b..17b896d7bcac27c0e71c7037a593bc027134c4bf 100644 (file)
--- a/kernel/irq/Kconfig
+++ b/kernel/irq/Kconfig
@@ -102,6 +102,10 @@ config IRQ_DOMAIN_DEBUG
 config IRQ_FORCED_THREADING
        bool
 
+config IRQ_FORCED_THREADING_DEFAULT
+       bool "Use IRQ threading by default"
+       depends on IRQ_FORCED_THREADING
+
 config SPARSE_IRQ
        bool "Support sparse irq numbering" if MAY_HAVE_SPARSE_IRQ
        ---help---

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 1d1a5b945ab428008ebaa8b31cd1f2a638f6aa97..34e86a9011d2d188145746c8bfcab31a3b09b78f 100644 (file)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -24,14 +24,20 @@
 #include "internals.h"
 
 #ifdef CONFIG_IRQ_FORCED_THREADING
-__read_mostly bool force_irqthreads;
+__read_mostly bool force_irqthreads = IS_ENABLED(CONFIG_IRQ_FORCED_THREADING_DEFAULT);
 
 static int __init setup_forced_irqthreads(char *arg)
 {
        force_irqthreads = true;
        return 0;
 }
+static int __init setup_no_irqthreads(char *arg)
+{
+       force_irqthreads = false;
+       return 0;
+}
 early_param("threadirqs", setup_forced_irqthreads);
+early_param("nothreadirqs", setup_no_irqthreads);
 #endif
 
 static void __synchronize_hardirq(struct irq_desc *desc)