From 0a3f5b8dd6dfee8065377d925404658a122ad41a Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 10 Jul 2012 18:43:23 -0400 Subject: [PATCH] --- yaml --- r: 311921 b: refs/heads/master c: 196951e91262fccda81147d2bcf7fdab08668b40 h: refs/heads/master i: 311919: c6f00cb3167197b95dd3a5cab78a15a4fe17599d v: v3 --- [refs] | 2 +- trunk/kernel/hrtimer.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1fbd3dc22124..f175f994d89b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b9fe759a678e05be4937ddf03d50e950207c1c0 +refs/heads/master: 196951e91262fccda81147d2bcf7fdab08668b40 diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c index 3c24fb2c25c8..8f320af837b5 100644 --- a/trunk/kernel/hrtimer.c +++ b/trunk/kernel/hrtimer.c @@ -1263,11 +1263,10 @@ void hrtimer_interrupt(struct clock_event_device *dev) cpu_base->nr_events++; dev->next_event.tv64 = KTIME_MAX; + raw_spin_lock(&cpu_base->lock); entry_time = now = ktime_get(); retry: expires_next.tv64 = KTIME_MAX; - - raw_spin_lock(&cpu_base->lock); /* * We set expires_next to KTIME_MAX here with cpu_base->lock * held to prevent that a timer is enqueued in our queue via @@ -1344,6 +1343,7 @@ void hrtimer_interrupt(struct clock_event_device *dev) * interrupt routine. We give it 3 attempts to avoid * overreacting on some spurious event. */ + raw_spin_lock(&cpu_base->lock); now = ktime_get(); cpu_base->nr_retries++; if (++retries < 3) @@ -1356,6 +1356,7 @@ void hrtimer_interrupt(struct clock_event_device *dev) */ cpu_base->nr_hangs++; cpu_base->hang_detected = 1; + raw_spin_unlock(&cpu_base->lock); delta = ktime_sub(now, entry_time); if (delta.tv64 > cpu_base->max_hang_time.tv64) cpu_base->max_hang_time = delta;