From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Apr 2013 15:34:38 +0000 (-0700)
Subject: Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: upstream/snapshot3+hdmi~5266
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df8edfa9af5b2160549ed1a79b72e3ed13b6c7e2;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'x86-cpu-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 cpuid changes from Ingo Molnar:
 "The biggest change is x86 CPU bug handling refactoring and cleanups,
  by Borislav Petkov"

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, CPU, AMD: Drop useless label
  x86, AMD: Correct {rd,wr}msr_amd_safe warnings
  x86: Fold-in trivial check_config function
  x86, cpu: Convert AMD Erratum 400
  x86, cpu: Convert AMD Erratum 383
  x86, cpu: Convert Cyrix coma bug detection
  x86, cpu: Convert FDIV bug detection
  x86, cpu: Convert F00F bug detection
  x86, cpu: Expand cpufeature facility to include cpu bugs
---

df8edfa9af5b2160549ed1a79b72e3ed13b6c7e2
diff --cc arch/x86/kernel/process.c
index 6833bff,e718f15..14fcf55
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@@ -438,13 -489,13 +438,13 @@@ static void amd_e400_idle(void
  void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c)
  {
  #ifdef CONFIG_SMP
 -	if (x86_idle == poll_idle && smp_num_siblings > 1)
 +	if (boot_option_idle_override == IDLE_POLL && smp_num_siblings > 1)
  		pr_warn_once("WARNING: polling idle and HT enabled, performance may degrade\n");
  #endif
 -	if (x86_idle)
 +	if (x86_idle || boot_option_idle_override == IDLE_POLL)
  		return;
  
- 	if (cpu_has_amd_erratum(amd_erratum_400)) {
+ 	if (cpu_has_bug(c, X86_BUG_AMD_APIC_C1E)) {
  		/* E400: APIC timer interrupt does not wake up CPU from C1e */
  		pr_info("using AMD E400 aware idle routine\n");
  		x86_idle = amd_e400_idle;