diff options
Diffstat (limited to 'kernel/time/jiffies.c')
| -rw-r--r-- | kernel/time/jiffies.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c index a6a5bf53e86d..347fecf86a3f 100644 --- a/kernel/time/jiffies.c +++ b/kernel/time/jiffies.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 27 | 27 | ||
| 28 | #include "tick-internal.h" | 28 | #include "timekeeping.h" |
| 29 | 29 | ||
| 30 | /* The Jiffies based clocksource is the lowest common | 30 | /* The Jiffies based clocksource is the lowest common |
| 31 | * denominator clock source which should function on | 31 | * denominator clock source which should function on |
| @@ -71,6 +71,7 @@ static struct clocksource clocksource_jiffies = { | |||
| 71 | .mask = 0xffffffff, /*32bits*/ | 71 | .mask = 0xffffffff, /*32bits*/ |
| 72 | .mult = NSEC_PER_JIFFY << JIFFIES_SHIFT, /* details above */ | 72 | .mult = NSEC_PER_JIFFY << JIFFIES_SHIFT, /* details above */ |
| 73 | .shift = JIFFIES_SHIFT, | 73 | .shift = JIFFIES_SHIFT, |
| 74 | .max_cycles = 10, | ||
| 74 | }; | 75 | }; |
| 75 | 76 | ||
| 76 | __cacheline_aligned_in_smp DEFINE_SEQLOCK(jiffies_lock); | 77 | __cacheline_aligned_in_smp DEFINE_SEQLOCK(jiffies_lock); |
| @@ -94,7 +95,7 @@ EXPORT_SYMBOL(jiffies); | |||
| 94 | 95 | ||
| 95 | static int __init init_jiffies_clocksource(void) | 96 | static int __init init_jiffies_clocksource(void) |
| 96 | { | 97 | { |
| 97 | return clocksource_register(&clocksource_jiffies); | 98 | return __clocksource_register(&clocksource_jiffies); |
| 98 | } | 99 | } |
| 99 | 100 | ||
| 100 | core_initcall(init_jiffies_clocksource); | 101 | core_initcall(init_jiffies_clocksource); |
| @@ -130,6 +131,6 @@ int register_refined_jiffies(long cycles_per_second) | |||
| 130 | 131 | ||
| 131 | refined_jiffies.mult = ((u32)nsec_per_tick) << JIFFIES_SHIFT; | 132 | refined_jiffies.mult = ((u32)nsec_per_tick) << JIFFIES_SHIFT; |
| 132 | 133 | ||
| 133 | clocksource_register(&refined_jiffies); | 134 | __clocksource_register(&refined_jiffies); |
| 134 | return 0; | 135 | return 0; |
| 135 | } | 136 | } |
