Merge branch 'misc' into release

Conflicts:
	arch/x86/kernel/process.c

Signed-off-by: Len Brown <len.brown@intel.com>

diff --cc arch/x86/kernel/process.c
index ceb05db59be1208a771fd1a4c1593bafac687ba4,aef852eac292627d33f6b867e196fcb3fb7e9bda..b11719ea2f7bff11105d5a6481c92301c7176fc5
--- 1/arch/x86/kernel/process.c
--- 2/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@@ -390,11 -396,12 +390,12 @@@ void default_idle(void
  EXPORT_SYMBOL(default_idle);
  #endif
  
- bool set_pm_idle_to_default(void)
+ #ifdef CONFIG_XEN
+ bool xen_set_default_idle(void)
  {
 -      bool ret = !!pm_idle;
 +      bool ret = !!x86_idle;
  
 -      pm_idle = default_idle;
 +      x86_idle = default_idle;
  
        return ret;
  }
@@@ -561,24 -499,19 +493,18 @@@ static void amd_e400_idle(void
  void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c)
  {
  #ifdef CONFIG_SMP
 -      if (pm_idle == poll_idle && smp_num_siblings > 1) {
 +      if (x86_idle == poll_idle && smp_num_siblings > 1)
                pr_warn_once("WARNING: polling idle and HT enabled, performance may degrade\n");
 -      }
  #endif
 -      if (pm_idle)
 +      if (x86_idle)
                return;
  
-       if (cpu_has(c, X86_FEATURE_MWAIT) && mwait_usable(c)) {
-               /*
-                * One CPU supports mwait => All CPUs supports mwait
-                */
-               pr_info("using mwait in idle threads\n");
-               x86_idle = mwait_idle;
-       } else if (cpu_has_amd_erratum(amd_erratum_400)) {
+       if (cpu_has_amd_erratum(amd_erratum_400)) {
                /* E400: APIC timer interrupt does not wake up CPU from C1e */
                pr_info("using AMD E400 aware idle routine\n");
 -              pm_idle = amd_e400_idle;
 +              x86_idle = amd_e400_idle;
        } else
 -              pm_idle = default_idle;
 +              x86_idle = default_idle;
  }
  
  void __init init_amd_e400_c1e_mask(void)
@@@ -595,11 -528,8 +521,8 @@@ static int __init idle_setup(char *str
  
        if (!strcmp(str, "poll")) {
                pr_info("using polling idle threads\n");
 -              pm_idle = poll_idle;
 +              x86_idle = poll_idle;
                boot_option_idle_override = IDLE_POLL;
-       } else if (!strcmp(str, "mwait")) {
-               boot_option_idle_override = IDLE_FORCE_MWAIT;
-               WARN_ONCE(1, "\"idle=mwait\" will be removed in 2012\n");
        } else if (!strcmp(str, "halt")) {
                /*
                 * When the boot option of idle=halt is added, halt is

diff --cc drivers/acpi/processor_idle.c
Simple merge