diff options
| author | Borislav Petkov <bp@suse.de> | 2017-06-13 18:28:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-14 07:32:07 +0200 |
| commit | bc8e80d56c1ecb35e65df392d7601d1427d14efe (patch) | |
| tree | 967695725e0d65f665dfbf9bc289207aba724eb8 /arch/x86/Kconfig | |
| parent | 17ef4af0ec0f97b369f304dc04d61722f3591c4b (diff) | |
| download | blackbird-obmc-linux-bc8e80d56c1ecb35e65df392d7601d1427d14efe.tar.gz blackbird-obmc-linux-bc8e80d56c1ecb35e65df392d7601d1427d14efe.zip | |
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>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 0efb4c9497bc..4371b6b5cbe4 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1082,7 +1082,7 @@ config X86_MCE_THRESHOLD def_bool y config X86_MCE_INJECT - depends on X86_MCE && X86_LOCAL_APIC && X86_MCELOG_LEGACY + depends on X86_MCE && X86_LOCAL_APIC && DEBUG_FS tristate "Machine check injector support" ---help--- Provide support for injecting machine checks for testing purposes. |
