diff options
| author | Linus Torvalds | 2009-01-26 09:47:43 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2009-01-26 09:47:43 -0800 |
| commit | 1e70c7f7a9d4a3d2cc78b40e1d7768d99cd79899 (patch) | |
| tree | 1218c32008412e57314f8f9db8d3b4912e2ecb25 /kernel/hrtimer.c | |
| parent | 810ee58de26c9c1255d716b1db7344c4a1093fec (diff) | |
| parent | 1d4a7f1c4faf53eb9e822743ec8a70b3019a26d2 (diff) | |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
hrtimers: fix inconsistent lock state on resume in hres_timers_resume
time-sched.c: tick_nohz_update_jiffies should be static
locking, hpet: annotate false positive warning
kernel/fork.c: unused variable 'ret'
itimers: remove the per-cpu-ish-ness
Diffstat (limited to 'kernel/hrtimer.c')
| -rw-r--r-- | kernel/hrtimer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 2dc30c59c5fd..f33afb0407bc 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -614,7 +614,9 @@ void clock_was_set(void) */ void hres_timers_resume(void) { - /* Retrigger the CPU local events: */ + WARN_ONCE(!irqs_disabled(), + KERN_INFO "hres_timers_resume() called with IRQs enabled!"); + retrigger_next_event(NULL); } |