diff options
author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2009-12-07 15:24:07 -0500 |
---|---|---|
committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2009-12-07 15:24:07 -0500 |
commit | 71e974213dca7fbb407554229864e8fe363db4f2 (patch) | |
tree | 9317858a9a741c782640f8adcc1cd64b208c67e6 | |
parent | abbda9b07ef3cf30d925be5f3fbd3118db0b1984 (diff) |
minor cleanups
-rw-r--r-- | kernel/hrtimer.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 26c0228ea9..3165b48101 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -1324,9 +1324,8 @@ static enum hrtimer_restart hrtimer_wakeup(struct hrtimer *timer) | |||
1324 | struct task_struct *task = t->task; | 1324 | struct task_struct *task = t->task; |
1325 | 1325 | ||
1326 | t->task = NULL; | 1326 | t->task = NULL; |
1327 | if (task) { | 1327 | if (task) |
1328 | wake_up_process(task); | 1328 | wake_up_process(task); |
1329 | } | ||
1330 | 1329 | ||
1331 | return HRTIMER_NORESTART; | 1330 | return HRTIMER_NORESTART; |
1332 | } | 1331 | } |
@@ -1452,7 +1451,6 @@ static void __cpuinit init_hrtimers_cpu(int cpu) | |||
1452 | int i; | 1451 | int i; |
1453 | 1452 | ||
1454 | spin_lock_init(&cpu_base->lock); | 1453 | spin_lock_init(&cpu_base->lock); |
1455 | |||
1456 | lockdep_set_class(&cpu_base->lock, &cpu_base->lock_key); | 1454 | lockdep_set_class(&cpu_base->lock, &cpu_base->lock_key); |
1457 | 1455 | ||
1458 | for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) | 1456 | for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) |