diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-26 13:03:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-26 13:03:47 -0800 |
| commit | eed9688f8513189295887e5a27ec7f576754b60e (patch) | |
| tree | c205a6fa6b8ee8a5a99179a0d42e40e4a713c450 /arch/x86/kernel/cpu/Makefile | |
| parent | 72af84151fa7e98720a0482b59de2d90ec7f10a7 (diff) | |
| parent | 72a8f089c382c078f8c7c1c759cb726de80d4284 (diff) | |
| download | linux-stable-eed9688f8513189295887e5a27ec7f576754b60e.tar.gz linux-stable-eed9688f8513189295887e5a27ec7f576754b60e.tar.bz2 linux-stable-eed9688f8513189295887e5a27ec7f576754b60e.zip | |
Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/x86/kernel/cpu/Makefile')
| -rw-r--r-- | arch/x86/kernel/cpu/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index dc4acaa1549d..ac78f90aea56 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -36,7 +36,7 @@ obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o -obj-$(CONFIG_X86_MCE) += mcheck/ +obj-$(CONFIG_X86_MCE) += mce/ obj-$(CONFIG_MTRR) += mtrr/ obj-$(CONFIG_MICROCODE) += microcode/ obj-$(CONFIG_RESCTRL) += resctrl/ |