diff options
author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2009-04-22 23:12:45 -0400 |
---|---|---|
committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2009-04-22 23:12:45 -0400 |
commit | 0202b6a9e846c4e7d85d4e9a3bd2490eac0d7c32 (patch) | |
tree | 63a8df3894dcc5771c1291e7b6bdd2f9fd7252fc /kernel | |
parent | 308c70fb71e3fec8a5641cf65db22611872455e1 (diff) |
fixup commit: missing hrtimer bits
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/hrtimer.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index c47baab445..b14d5922fd 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -46,6 +46,9 @@ | |||
46 | 46 | ||
47 | #include <asm/uaccess.h> | 47 | #include <asm/uaccess.h> |
48 | 48 | ||
49 | #include <litmus/litmus.h> | ||
50 | |||
51 | |||
49 | /** | 52 | /** |
50 | * ktime_get - get the monotonic time in ktime_t format | 53 | * ktime_get - get the monotonic time in ktime_t format |
51 | * | 54 | * |
@@ -1451,12 +1454,14 @@ static void __cpuinit init_hrtimers_cpu(int cpu) | |||
1451 | int i; | 1454 | int i; |
1452 | 1455 | ||
1453 | spin_lock_init(&cpu_base->lock); | 1456 | spin_lock_init(&cpu_base->lock); |
1457 | |||
1454 | lockdep_set_class(&cpu_base->lock, &cpu_base->lock_key); | 1458 | lockdep_set_class(&cpu_base->lock, &cpu_base->lock_key); |
1455 | 1459 | ||
1456 | for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) | 1460 | for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) |
1457 | cpu_base->clock_base[i].cpu_base = cpu_base; | 1461 | cpu_base->clock_base[i].cpu_base = cpu_base; |
1458 | 1462 | ||
1459 | hrtimer_init_hres(cpu_base); | 1463 | hrtimer_init_hres(cpu_base); |
1464 | INIT_LIST_HEAD(&cpu_base->to_pull); | ||
1460 | } | 1465 | } |
1461 | 1466 | ||
1462 | #ifdef CONFIG_HOTPLUG_CPU | 1467 | #ifdef CONFIG_HOTPLUG_CPU |