2 files changed, 6 insertions, 0 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index bc439de48cd1..b44e37753b9a 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -21,6 +21,7 @@ config SUPERH
         select HAVE_REGS_AND_STACK_ACCESS_API
         select HAVE_GENERIC_HARDIRQS
         select HAVE_SPARSE_IRQ
+        select IRQ_FORCED_THREADING
         select RTC_LIB
         select GENERIC_ATOMIC64
         select GENERIC_IRQ_SHOW
diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c
index ce5f81d7cc6b..1e6e2d0353ea 100644
--- a/drivers/sh/intc/virq.c
+++ b/drivers/sh/intc/virq.c
@@ -235,6 +235,11 @@ restart:
 
                 irq_set_handler_data(irq, (void *)entry->handle);
 
+                /*
+                 * Set the virtual IRQ as non-threadable.
+                 */
+                irq_set_nothread(irq);
+
                 irq_set_chained_handler(entry->pirq, intc_virq_handler);
                 add_virq_to_pirq(entry->pirq, irq);