diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
| commit | 23e735bc7b0e1d614656881794257b4224efda3a (patch) | |
| tree | d9523b531156fedb204e31b4612519b0a7a003e7 /kernel/hrtimer.c | |
| parent | 3906f4edeef976c081c4e7bd92164d2f59c325ae (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'kernel/hrtimer.c')
| -rw-r--r-- | kernel/hrtimer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index be989efc7856..21c38a7e666b 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
| @@ -187,7 +187,7 @@ switch_hrtimer_base(struct hrtimer *timer, struct hrtimer_base *base) | |||
| 187 | { | 187 | { |
| 188 | struct hrtimer_base *new_base; | 188 | struct hrtimer_base *new_base; |
| 189 | 189 | ||
| 190 | new_base = &__get_cpu_var(hrtimer_bases[base->index]); | 190 | new_base = &__get_cpu_var(hrtimer_bases)[base->index]; |
| 191 | 191 | ||
| 192 | if (base != new_base) { | 192 | if (base != new_base) { |
| 193 | /* | 193 | /* |