x86 / hibernate: Use hlt_play_dead() when resuming from hibernation

[cascardo/linux.git] / arch / x86 / kernel / smpboot.c

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 0e4329e..8264dfa 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1236,7 +1236,7 @@ static int __init smp_sanity_check(unsigned max_cpus)
         * If we couldn't find a local APIC, then get out of here now!
         */
        if (APIC_INTEGRATED(apic_version[boot_cpu_physical_apicid]) &&
-           !cpu_has_apic) {
+           !boot_cpu_has(X86_FEATURE_APIC)) {
                if (!disable_apic) {
                        pr_err("BIOS bug, local APIC #%d not detected!...\n",
                                boot_cpu_physical_apicid);
@@ -1622,7 +1622,7 @@ static inline void mwait_play_dead(void)
        }
 }
 
-static inline void hlt_play_dead(void)
+void hlt_play_dead(void)
 {
        if (__this_cpu_read(cpu_info.x86) >= 4)
                wbinvd();