diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-04 16:39:20 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-04 16:39:20 +0200 |
| commit | 9402efaa96e4c047dcc63ad5db65384c328aee5f (patch) | |
| tree | e2df879ca02ab2306e000fbb771f2110d3530abe /arch/x86/kernel/apic/apic.c | |
| parent | 78fca1b95837a44983608302e89c7258981be9b3 (diff) | |
| parent | 711b8c87a5fe6de78e90411cb67b506babfef74a (diff) | |
Merge branch 'x86-mm' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into x86/mm
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index fabf01eff77..2bc503bf9e9 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -505,7 +505,7 @@ static void __cpuinit setup_APIC_timer(void) { struct clock_event_device *levt = &__get_cpu_var(lapic_events); - if (cpu_has(__this_cpu_ptr(&cpu_info), X86_FEATURE_ARAT)) { + if (this_cpu_has(X86_FEATURE_ARAT)) { lapic_clockevent.features &= ~CLOCK_EVT_FEAT_C3STOP; /* Make LAPIC timer preferrable over percpu HPET */ lapic_clockevent.rating = 150; |