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 3bbfd6a9c475610cef70ac32a928f79e50db60e8..736e12782f3b6c9bdd1a15672ecce311a19d3a27 100644 (file)
--- a/kernel/irq/Kconfig
+++ b/kernel/irq/Kconfig
@@ -95,6 +95,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 a4afe5cc5af1828a49f1005825eadc880a727088..25721727d38797897828a8a05acd73f4deb7c27e 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)