diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-04-03 11:57:29 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-10 16:40:20 -0500 |
| commit | f64ff72016151591819e4cc9d56f754a84ad050c (patch) | |
| tree | 665b1f078f4883c85fee9b6686a523933fbf200d | |
| parent | 5f48d7818149c07bc476f2879ddf32c555efc225 (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 d2cc272dafb2..9027bde3c0a3 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -394,9 +394,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 89a3ea82569b..975b3a125544 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 /** |