diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-07-03 08:44:31 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-11 11:07:34 -0500 |
| commit | 04e1a91a80819f3de5c846be542805e1860c2bc9 (patch) | |
| tree | 1687b314020663969fb1402ee15458fa74696030 /include | |
| parent | 672080be2d36e1c049af01f7feecbdae2aa60391 (diff) | |
hrtimer: fixup hrtimer callback changes for preempt-rt
In preempt-rt we can not call the callbacks which take sleeping locks
from the timer interrupt context.
Bring back the softirq split for now, until we fixed the signal
delivery problem for real.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hrtimer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index e8b395d556b9..0e3708636ce0 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -111,6 +111,8 @@ struct hrtimer { enum hrtimer_restart (*function)(struct hrtimer *); struct hrtimer_clock_base *base; unsigned long state; + struct list_head cb_entry; + int irqsafe; #ifdef CONFIG_TIMER_STATS int start_pid; void *start_site; @@ -147,6 +149,7 @@ struct hrtimer_clock_base { int index; clockid_t clockid; struct timerqueue_head active; + struct list_head expired; ktime_t resolution; ktime_t (*get_time)(void); ktime_t softirq_time; |