Merge branch 'x86/pat' into x86/urgent

[pandora-kernel.git] / arch / x86 / kernel / apic / ipi.c

diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c
index 6ef00ba..08385e0 100644 (file)
--- a/arch/x86/kernel/apic/ipi.c
+++ b/arch/x86/kernel/apic/ipi.c
@@ -153,7 +153,7 @@ int safe_smp_processor_id(void)
 {
        int apicid, cpuid;
 
-       if (!boot_cpu_has(X86_FEATURE_APIC))
+       if (!cpu_has_apic)
                return 0;
 
        apicid = hard_smp_processor_id();