From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 26 Dec 2018 21:03:47 +0000 (-0800)
Subject: Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=eed9688f8513189295887e5a27ec7f576754b60e;p=linux.git

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

Pull x86 RAS updates from Borislav Petkov:
 "This time around we have a subsystem reorganization to offer, with the
  new directory being

    arch/x86/kernel/cpu/mce/

  and all compilation units' names streamlined under it"

* 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Restore MCE injector's module name
  x86/mce: Unify pr_* prefix
  x86/mce: Streamline MCE subsystem's naming
---

eed9688f8513189295887e5a27ec7f576754b60e
diff --cc arch/x86/kernel/cpu/Makefile
index dc4acaa1549de,43afe707c6fb9..ac78f90aea562
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@@ -36,10 -36,13 +36,10 @@@ obj-$(CONFIG_CPU_SUP_CENTAUR)		+= centa
  obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o
  obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o
  
- obj-$(CONFIG_X86_MCE)			+= mcheck/
 -obj-$(CONFIG_INTEL_RDT)	+= intel_rdt.o intel_rdt_rdtgroup.o intel_rdt_monitor.o
 -obj-$(CONFIG_INTEL_RDT)	+= intel_rdt_ctrlmondata.o intel_rdt_pseudo_lock.o
 -CFLAGS_intel_rdt_pseudo_lock.o = -I$(src)
 -
+ obj-$(CONFIG_X86_MCE)			+= mce/
  obj-$(CONFIG_MTRR)			+= mtrr/
  obj-$(CONFIG_MICROCODE)			+= microcode/
 +obj-$(CONFIG_RESCTRL)			+= resctrl/
  
  obj-$(CONFIG_X86_LOCAL_APIC)		+= perfctr-watchdog.o