diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-04 14:43:38 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-04 14:43:38 -0700 |
| commit | 94865bf8aa24aa359903de3c858a517243e20263 (patch) | |
| tree | 950de82b3556dbab5a68a4f17aac8fb21af7c090 /kernel/irq_work.c | |
| parent | 1a621b34f2a4bf8495bf801cd0024f063d561472 (diff) | |
| parent | 474271f666ce974ee183057c022325b3833ecb39 (diff) | |
Merge tag 'v3.14.43-rt42-lno1' of git://git.linaro.org/people/anders.roxell/linux-rt into linux-linaro-lsk-v3.14-rtlsk-v3.14-15.06-rt
Linux 3.14.43-rt42
Changes since v3.14.39-rt37:
- KVM: lapic: mark LAPIC timer handler as irqsafe
- KVM: use simple waitqueue for vcpu->wq
- hotplug: Use set_cpus_allowed_ptr() in sync_unplug_thread()
- rt, nohz_full: fix nohz_full for PREEMPT_RT_FULL
- kernel/irq_work: fix no_hz deadlock
* tag 'v3.14.43-rt42-lno1' of git://git.linaro.org/people/anders.roxell/linux-rt: (360 commits)
Linux 3.14.43-rt42 REBASE
rt, nohz_full: fix nohz_full for PREEMPT_RT_FULL
hotplug: Use set_cpus_allowed_ptr() in sync_unplug_thread()
KVM: use simple waitqueue for vcpu->wq
KVM: lapic: mark LAPIC timer handler as irqsafe
kernel/irq_work: fix no_hz deadlock
netpoll: guard the access to dev->npinfo with rcu_read_lock/unlock_bh() for CONFIG_PREEMPT_RT_FULL=y
Revert "timers: do not raise softirq unconditionally"
fs,btrfs: fix rt deadlock on extent_buffer->lock
staging: Mark rtl8821ae as broken
timers: Reduce future __run_timers() latency for first add to empty list
timers: Reduce future __run_timers() latency for newly emptied list
timers: Reduce __run_timers() latency for empty list
timers: Track total number of timers in list
fs/aio: simple simple work
lockdep: selftest: fix warnings due to missing PREEMPT_RT conditionals
thermal: Defer thermal wakups to threads
locking: ww_mutex: fix ww_mutex vs self-deadlock
Revert "rwsem-rt: Do not allow readers to nest"
sunrpc: make svc_xprt_do_enqueue() use get_cpu_light()
...
Diffstat (limited to 'kernel/irq_work.c')
| -rw-r--r-- | kernel/irq_work.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/irq_work.c b/kernel/irq_work.c index 35d21f93bbe8..5f7d93d89c7f 100644 --- a/kernel/irq_work.c +++ b/kernel/irq_work.c @@ -16,6 +16,7 @@ #include <linux/tick.h> #include <linux/cpu.h> #include <linux/notifier.h> +#include <linux/interrupt.h> #include <asm/processor.h> @@ -51,11 +52,7 @@ static bool irq_work_claim(struct irq_work *work) return true; } -#ifdef CONFIG_PREEMPT_RT_FULL -void arch_irq_work_raise(void) -#else void __weak arch_irq_work_raise(void) -#endif { /* * Lame architectures will get the timer tick callback |