diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-22 14:42:36 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-22 14:42:36 -0400 |
| commit | 69758820a42da207bdc775d6eccf1f9fb67cd62e (patch) | |
| tree | 4c4dd2b596aa5535231656bf0fa1bc65a8b17471 /kernel/hrtimer.c | |
| parent | 113b898e38cb20e80847c24154ce62273b948c6a (diff) | |
| parent | ef7d1b244fa6c94fb76d5f787b8629df64ea4046 (diff) | |
| download | op-kernel-dev-69758820a42da207bdc775d6eccf1f9fb67cd62e.zip op-kernel-dev-69758820a42da207bdc775d6eccf1f9fb67cd62e.tar.gz | |
Merge branch 'from-linus' into upstream
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 be989ef..21c38a7 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -187,7 +187,7 @@ switch_hrtimer_base(struct hrtimer *timer, struct hrtimer_base *base) { struct hrtimer_base *new_base; - new_base = &__get_cpu_var(hrtimer_bases[base->index]); + new_base = &__get_cpu_var(hrtimer_bases)[base->index]; if (base != new_base) { /* |
