diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2009-12-17 21:47:19 -0500 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-29 17:19:53 -0400 |
commit | 0b28a3122d6917784701377e15a863489aee1c6c (patch) | |
tree | 259c8f59ed477e81f97b5dc6ac7ec8ce06ce1e26 /kernel/hrtimer.c | |
parent | c15be843778236e9f2fdbc207ab36ba996b2bb1b (diff) |
[ported from 2008.3] Add release-master support
Diffstat (limited to 'kernel/hrtimer.c')
-rw-r--r-- | kernel/hrtimer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 509ecaea3016..7b19403900ad 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -1077,9 +1077,11 @@ int hrtimer_start_on(int cpu, struct hrtimer_start_on_info* info, | |||
1077 | /* start timer locally; we may get called | 1077 | /* start timer locally; we may get called |
1078 | * with rq->lock held, do not wake up anything | 1078 | * with rq->lock held, do not wake up anything |
1079 | */ | 1079 | */ |
1080 | TRACE("hrtimer_start_on: starting on local CPU\n"); | ||
1080 | __hrtimer_start_range_ns(info->timer, info->time, | 1081 | __hrtimer_start_range_ns(info->timer, info->time, |
1081 | 0, info->mode, 0); | 1082 | 0, info->mode, 0); |
1082 | } else { | 1083 | } else { |
1084 | TRACE("hrtimer_start_on: pulling to remote CPU\n"); | ||
1083 | base = &per_cpu(hrtimer_bases, cpu); | 1085 | base = &per_cpu(hrtimer_bases, cpu); |
1084 | spin_lock_irqsave(&base->lock, flags); | 1086 | spin_lock_irqsave(&base->lock, flags); |
1085 | was_empty = list_empty(&base->to_pull); | 1087 | was_empty = list_empty(&base->to_pull); |