diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-03 08:29:34 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2011-12-28 16:25:35 -0600 |
| commit | 934274ee270ef3b1b3724e83fdd8a34711bdffee (patch) | |
| tree | 92e365dbbf91b1ad6c8d1e15d703091b1f772c3b /include/linux | |
| parent | 858c6e321beaae2be9073c3fb5abed9102889199 (diff) | |
hrtimers: prepare full preemption
Make cancellation of a running callback in softirq context safe
against preemption.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/hrtimer.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index fd0dc30c9f15..e8b395d556b9 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -187,6 +187,9 @@ struct hrtimer_cpu_base { unsigned long nr_hangs; ktime_t max_hang_time; #endif +#ifdef CONFIG_PREEMPT_RT_BASE + wait_queue_head_t wait; +#endif struct hrtimer_clock_base clock_base[HRTIMER_MAX_CLOCK_BASES]; }; @@ -374,6 +377,13 @@ static inline int hrtimer_restart(struct hrtimer *timer) return hrtimer_start_expires(timer, HRTIMER_MODE_ABS); } +/* Softirq preemption could deadlock timer removal */ +#ifdef CONFIG_PREEMPT_RT_BASE + extern void hrtimer_wait_for_timer(const struct hrtimer *timer); +#else +# define hrtimer_wait_for_timer(timer) do { cpu_relax(); } while (0) +#endif + /* Query timers: */ extern ktime_t hrtimer_get_remaining(const struct hrtimer *timer); extern int hrtimer_get_res(const clockid_t which_clock, struct timespec *tp); |