Merge tag 'pm-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[linux-2.6-block.git] / drivers / cpufreq / longhaul.c

diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c
index beae5cf5c62c114af3c188dd21d5356e2b869141..c46a12df40dd8391818956474b4381074ae70e19 100644 (file)
--- a/drivers/cpufreq/longhaul.c
+++ b/drivers/cpufreq/longhaul.c
@@ -932,7 +932,7 @@ static int __init longhaul_init(void)
        }
 #endif
 #ifdef CONFIG_X86_IO_APIC
-       if (cpu_has_apic) {
+       if (boot_cpu_has(X86_FEATURE_APIC)) {
                pr_err("APIC detected. Longhaul is currently broken in this configuration.\n");
                return -ENODEV;
        }