Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull x86 cpufeature update from Ingo Molnar:
 "Two refinements to clflushopt support"

* 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, cpufeature: If we disable CLFLUSH, we should disable CLFLUSHOPT
  x86, cpufeature: Rename X86_FEATURE_CLFLSH to X86_FEATURE_CLFLUSH

diff --combined arch/x86/kernel/smpboot.c
index 60179ec39d4ca1d09986632cb17392ae0869c3fc,ffc78c3e9be151920f9c048ba45d8a51d2ca2149..5aad5a370c85886c662cb6ba5580f1ce56368dc5
--- 1/arch/x86/kernel/smpboot.c
--- 2/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@@ -122,9 -122,8 +122,9 @@@ static void smp_callin(void
         * Since CPU0 is not wakened up by INIT, it doesn't wait for the IPI.
         */
        cpuid = smp_processor_id();
 -      if (apic->wait_for_init_deassert && cpuid != 0)
 -              apic->wait_for_init_deassert(&init_deasserted);
 +      if (apic->wait_for_init_deassert && cpuid)
 +              while (!atomic_read(&init_deasserted))
 +                      cpu_relax();
  
        /*
         * (This works even if the APIC is not enabled.)
@@@ -702,15 -701,11 +702,15 @@@ wakeup_cpu_via_init_nmi(int cpu, unsign
        int id;
        int boot_error;
  
 +      preempt_disable();
 +
        /*
         * Wake up AP by INIT, INIT, STARTUP sequence.
         */
 -      if (cpu)
 -              return wakeup_secondary_cpu_via_init(apicid, start_ip);
 +      if (cpu) {
 +              boot_error = wakeup_secondary_cpu_via_init(apicid, start_ip);
 +              goto out;
 +      }
  
        /*
         * Wake up BSP by nmi.
@@@ -730,9 -725,6 +730,9 @@@
                boot_error = wakeup_secondary_cpu_via_nmi(id, start_ip);
        }
  
 +out:
 +      preempt_enable();
 +
        return boot_error;
  }
  
@@@ -1387,7 -1379,7 +1387,7 @@@ static inline void mwait_play_dead(void
  
        if (!this_cpu_has(X86_FEATURE_MWAIT))
                return;
-       if (!this_cpu_has(X86_FEATURE_CLFLSH))
+       if (!this_cpu_has(X86_FEATURE_CLFLUSH))
                return;
        if (__this_cpu_read(cpu_info.cpuid_level) < CPUID_MWAIT_LEAF)
                return;