diff options
Diffstat (limited to 'arch/x86/kernel/apb_timer.c')
-rw-r--r-- | arch/x86/kernel/apb_timer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c index 915483604c0c..af5b08ab3b71 100644 --- a/arch/x86/kernel/apb_timer.c +++ b/arch/x86/kernel/apb_timer.c | |||
@@ -157,13 +157,13 @@ static int __init apbt_clockevent_register(void) | |||
157 | 157 | ||
158 | adev->num = smp_processor_id(); | 158 | adev->num = smp_processor_id(); |
159 | adev->timer = dw_apb_clockevent_init(smp_processor_id(), "apbt0", | 159 | adev->timer = dw_apb_clockevent_init(smp_processor_id(), "apbt0", |
160 | mrst_timer_options == MRST_TIMER_LAPIC_APBT ? | 160 | intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT ? |
161 | APBT_CLOCKEVENT_RATING - 100 : APBT_CLOCKEVENT_RATING, | 161 | APBT_CLOCKEVENT_RATING - 100 : APBT_CLOCKEVENT_RATING, |
162 | adev_virt_addr(adev), 0, apbt_freq); | 162 | adev_virt_addr(adev), 0, apbt_freq); |
163 | /* Firmware does EOI handling for us. */ | 163 | /* Firmware does EOI handling for us. */ |
164 | adev->timer->eoi = NULL; | 164 | adev->timer->eoi = NULL; |
165 | 165 | ||
166 | if (mrst_timer_options == MRST_TIMER_LAPIC_APBT) { | 166 | if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT) { |
167 | global_clock_event = &adev->timer->ced; | 167 | global_clock_event = &adev->timer->ced; |
168 | printk(KERN_DEBUG "%s clockevent registered as global\n", | 168 | printk(KERN_DEBUG "%s clockevent registered as global\n", |
169 | global_clock_event->name); | 169 | global_clock_event->name); |
@@ -253,7 +253,7 @@ static int apbt_cpuhp_notify(struct notifier_block *n, | |||
253 | 253 | ||
254 | static __init int apbt_late_init(void) | 254 | static __init int apbt_late_init(void) |
255 | { | 255 | { |
256 | if (mrst_timer_options == MRST_TIMER_LAPIC_APBT || | 256 | if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT || |
257 | !apb_timer_block_enabled) | 257 | !apb_timer_block_enabled) |
258 | return 0; | 258 | return 0; |
259 | /* This notifier should be called after workqueue is ready */ | 259 | /* This notifier should be called after workqueue is ready */ |
@@ -340,7 +340,7 @@ void __init apbt_time_init(void) | |||
340 | } | 340 | } |
341 | #ifdef CONFIG_SMP | 341 | #ifdef CONFIG_SMP |
342 | /* kernel cmdline disable apb timer, so we will use lapic timers */ | 342 | /* kernel cmdline disable apb timer, so we will use lapic timers */ |
343 | if (mrst_timer_options == MRST_TIMER_LAPIC_APBT) { | 343 | if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT) { |
344 | printk(KERN_INFO "apbt: disabled per cpu timer\n"); | 344 | printk(KERN_INFO "apbt: disabled per cpu timer\n"); |
345 | return; | 345 | return; |
346 | } | 346 | } |