diff options
| author |   Felix Blyakher <felixb@sgi.com> | 2009-01-27 14:16:18 -0600 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-01-27 14:16:18 -0600 |
| commit | aaca4ff0917f62433f222f9fb0d04c1d61ad68cf (patch) | |
| tree | cacb272469b1c75a99dd75dc47b96c34829b369b /kernel/hrtimer.c | |
| parent | don't reallocate sxp variable passed into xfs_swapext (diff) | |
| parent | Fix "multiple definition of `debugfs_create_size_t'" (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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); } |