diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-04-03 11:57:29 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-02-15 10:32:40 -0600 |
| commit | 20b1c7294b2c493c92c41ba8bfbbbfec326631dd (patch) | |
| tree | 6bedfd5ebc551b585ac11371d4bc105a35b9e9ce | |
| parent | 15cff0ea7a8e3431ef1587e66db4af9633f7414a (diff) | |
genirq-force-threading.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | include/linux/interrupt.h | 8 | ||||
| -rw-r--r-- | kernel/irq/manage.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index ddd6b2a5a42e..b9162dc541ff 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -396,9 +396,13 @@ static inline int disable_irq_wake(unsigned int irq) #ifdef CONFIG_IRQ_FORCED_THREADING -extern bool force_irqthreads; +# ifndef CONFIG_PREEMPT_RT_BASE + extern bool force_irqthreads; +# else +# define force_irqthreads (true) +# endif #else -#define force_irqthreads (0) +#define force_irqthreads (false) #endif #ifndef __ARCH_SET_SOFTIRQ_PENDING diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index cf2d7aea5d61..09ba67d9ceb7 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -18,6 +18,7 @@ #include "internals.h" #ifdef CONFIG_IRQ_FORCED_THREADING +# ifndef CONFIG_PREEMPT_RT_BASE __read_mostly bool force_irqthreads; static int __init setup_forced_irqthreads(char *arg) @@ -26,6 +27,7 @@ static int __init setup_forced_irqthreads(char *arg) return 0; } early_param("threadirqs", setup_forced_irqthreads); +# endif #endif /** |