]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
x86/mce: Merge mce_amd_inj into mce-inject
authorBorislav Petkov <bp@suse.de>
Tue, 13 Jun 2017 16:28:30 +0000 (18:28 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 14 Jun 2017 05:32:07 +0000 (07:32 +0200)
commitbc8e80d56c1ecb35e65df392d7601d1427d14efe
tree967695725e0d65f665dfbf9bc289207aba724eb8
parent17ef4af0ec0f97b369f304dc04d61722f3591c4b
x86/mce: Merge mce_amd_inj into mce-inject

Reuse mce_amd_inj's debugfs interface so that mce-inject can
benefit from it too. The old functionality is still preserved under
CONFIG_X86_MCELOG_LEGACY.

Tested-by: Yazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Yazen Ghannam <yazen.ghannam@amd.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Link: http://lkml.kernel.org/r/20170613162835.30750-4-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/Kconfig
arch/x86/Makefile
arch/x86/include/asm/processor.h
arch/x86/kernel/cpu/mcheck/mce-inject.c
arch/x86/ras/Kconfig
arch/x86/ras/Makefile [deleted file]
arch/x86/ras/mce_amd_inj.c [deleted file]