From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Feb 2017 20:47:44 +0000 (-0800)
Subject: Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.11-rc1~171
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=60c906bab124a0627fba04c9ca5e61bba4747c0c;p=linux.git

Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull RAS updates from Ingo Molnar:
 "The main changes in this cycle were:

  - Assign notifier chain priorities for all RAS related handlers to
    make the ordering explicit (Borislav Petkov)

  - Improve the AMD MCA banks sysfs output (Yazen Ghannam)

  - Various cleanups and restructuring of the x86 RAS code (Borislav
    Petkov)"

* 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/ras, EDAC, acpi: Assign MCE notifier handlers a priority
  x86/ras: Get rid of mce_process_work()
  EDAC/mce/amd: Dump TSC value
  EDAC/mce/amd: Unexport amd_decode_mce()
  x86/ras/amd/inj: Change dependency
  x86/ras: Flip the TSC-adding logic
  x86/ras/amd: Make sysfs names of banks more user-friendly
  x86/ras/therm_throt: Do not log a fake MCE for thermal events
  x86/ras/inject: Make it depend on X86_LOCAL_APIC=y
---

60c906bab124a0627fba04c9ca5e61bba4747c0c
diff --cc drivers/edac/mce_amd.c
index 27513dca8009,0d9bc25543d8..ba35b7ea3686
--- a/drivers/edac/mce_amd.c
+++ b/drivers/edac/mce_amd.c
@@@ -1003,8 -1004,12 +1004,11 @@@ amd_decode_mce(struct notifier_block *n
  
  		decode_smca_errors(m);
  		goto err_code;
 -	} else
 -		pr_cont("\n");
 +	}
  
+ 	if (m->tsc)
+ 		pr_emerg(HW_ERR "TSC: %llu\n", m->tsc);
+ 
  	if (!fam_ops)
  		goto err_code;