diff options
Diffstat (limited to 'drivers/clocksource/arm_global_timer.c')
| -rw-r--r-- | drivers/clocksource/arm_global_timer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c index db8afc7427a6..b66c1f36066c 100644 --- a/drivers/clocksource/arm_global_timer.c +++ b/drivers/clocksource/arm_global_timer.c | |||
| @@ -164,7 +164,7 @@ static irqreturn_t gt_clockevent_interrupt(int irq, void *dev_id) | |||
| 164 | return IRQ_HANDLED; | 164 | return IRQ_HANDLED; |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | static int __cpuinit gt_clockevents_init(struct clock_event_device *clk) | 167 | static int gt_clockevents_init(struct clock_event_device *clk) |
| 168 | { | 168 | { |
| 169 | int cpu = smp_processor_id(); | 169 | int cpu = smp_processor_id(); |
| 170 | 170 | ||
| @@ -221,8 +221,8 @@ static void __init gt_clocksource_init(void) | |||
| 221 | clocksource_register_hz(>_clocksource, gt_clk_rate); | 221 | clocksource_register_hz(>_clocksource, gt_clk_rate); |
| 222 | } | 222 | } |
| 223 | 223 | ||
| 224 | static int __cpuinit gt_cpu_notify(struct notifier_block *self, | 224 | static int gt_cpu_notify(struct notifier_block *self, unsigned long action, |
| 225 | unsigned long action, void *hcpu) | 225 | void *hcpu) |
| 226 | { | 226 | { |
| 227 | switch (action & ~CPU_TASKS_FROZEN) { | 227 | switch (action & ~CPU_TASKS_FROZEN) { |
| 228 | case CPU_STARTING: | 228 | case CPU_STARTING: |
| @@ -235,7 +235,7 @@ static int __cpuinit gt_cpu_notify(struct notifier_block *self, | |||
| 235 | 235 | ||
| 236 | return NOTIFY_OK; | 236 | return NOTIFY_OK; |
| 237 | } | 237 | } |
| 238 | static struct notifier_block gt_cpu_nb __cpuinitdata = { | 238 | static struct notifier_block gt_cpu_nb = { |
| 239 | .notifier_call = gt_cpu_notify, | 239 | .notifier_call = gt_cpu_notify, |
| 240 | }; | 240 | }; |
| 241 | 241 | ||
