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/ras/Kconfig | |
parent | x86/mce/AMD: Use saved threshold block info in interrupt handler (diff) | |
download | linux-bc8e80d56c1ecb35e65df392d7601d1427d14efe.tar.xz 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/ras/Kconfig')
-rw-r--r-- | arch/x86/ras/Kconfig | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/x86/ras/Kconfig b/arch/x86/ras/Kconfig index 2a2d89d39af6..bb026699ad19 100644 --- a/arch/x86/ras/Kconfig +++ b/arch/x86/ras/Kconfig @@ -1,13 +1,3 @@ -config MCE_AMD_INJ - tristate "Simple MCE injection interface for AMD processors" - depends on RAS && X86_MCE && DEBUG_FS && AMD_NB - default n - help - This is a simple debugfs interface to inject MCEs and test different - aspects of the MCE handling code. - - WARNING: Do not even assume this interface is staying stable! - config RAS_CEC bool "Correctable Errors Collector" depends on X86_MCE && MEMORY_FAILURE && DEBUG_FS @@ -20,4 +10,3 @@ config RAS_CEC Bear in mind that this is absolutely useless if your platform doesn't have ECC DIMMs and doesn't have DRAM ECC checking enabled in the BIOS. - |