From 9101b8e6ce550d5c02eb5a6f37396f6b05e3c1bc Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Tue, 14 Oct 2008 16:55:36 +0200 Subject: [PATCH] --- yaml --- r: 117623 b: refs/heads/master c: 2778d0d51dd5007c4909c1d9874f5e9097785a7a h: refs/heads/master i: 117621: 4cb4bdbc325e2548ae8051d259581e9acd787e1e 117619: b7f3246f2a886a8dc353931ffa61cd1005e096ec 117615: a10b27f66f181fb5c07568146917d72b9636e414 v: v3 --- [refs] | 2 +- trunk/kernel/hrtimer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 34f27210def0..4ad8d5b494e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fd87545c97b91cf9cfa52e914d66863878efe60 +refs/heads/master: 2778d0d51dd5007c4909c1d9874f5e9097785a7a diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c index eb2cf984959f..2bd230be1cb5 100644 --- a/trunk/kernel/hrtimer.c +++ b/trunk/kernel/hrtimer.c @@ -1396,7 +1396,7 @@ void hrtimer_peek_ahead_timers(void) struct tick_device *td; struct clock_event_device *dev; - if (hrtimer_hres_active()) + if (!hrtimer_hres_active()) return; local_irq_save(flags);