From fb657e9d303df7b48c89cfd10fe985387b0b1ad4 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sun, 25 Jan 2009 11:31:36 +0100 Subject: [PATCH] --- yaml --- r: 130599 b: refs/heads/master c: b0a9b5111abf60ef07eade834f480e89004c7920 h: refs/heads/master i: 130597: d86cc6ba80603f502ba78d0b1300d2bcd5715e7e 130595: c6505780af4472e615c4e262c05a256893a2ccd2 130591: 4340a7a55a2d39fdc88bfda80a8f3454591a5ca6 v: v3 --- [refs] | 2 +- trunk/kernel/hrtimer.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d88c4c4eab2c..b684851d7e40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94df7de0289bc2df3d6e85cd2ece52bf42682f45 +refs/heads/master: b0a9b5111abf60ef07eade834f480e89004c7920 diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c index 647a40e2fea1..f394d2a42ca3 100644 --- a/trunk/kernel/hrtimer.c +++ b/trunk/kernel/hrtimer.c @@ -501,6 +501,13 @@ static void hrtimer_force_reprogram(struct hrtimer_cpu_base *cpu_base) continue; timer = rb_entry(base->first, struct hrtimer, node); expires = ktime_sub(hrtimer_get_expires(timer), base->offset); + /* + * clock_was_set() has changed base->offset so the + * result might be negative. Fix it up to prevent a + * false positive in clockevents_program_event() + */ + if (expires.tv64 < 0) + expires.tv64 = 0; if (expires.tv64 < cpu_base->expires_next.tv64) cpu_base->expires_next = expires; }