From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750967AbdAXItl (ORCPT ); Tue, 24 Jan 2017 03:49:41 -0500 Received: from terminus.zytor.com ([65.50.211.136]:54280 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750832AbdAXIth (ORCPT ); Tue, 24 Jan 2017 03:49:37 -0500 Date: Tue, 24 Jan 2017 00:48:59 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, Yazen.Ghannam@amd.com, peterz@infradead.org, bp@suse.de, tony.luck@intel.com, torvalds@linux-foundation.org Reply-To: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, Yazen.Ghannam@amd.com, peterz@infradead.org, bp@suse.de, tony.luck@intel.com, torvalds@linux-foundation.org In-Reply-To: <20170123183514.13356-6-bp@alien8.de> References: <20170123183514.13356-6-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/ras/amd/inj: Change dependency Git-Commit-ID: bd43f60a260c83cbc9befd7d710a3f2bfd3b2dd2 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: bd43f60a260c83cbc9befd7d710a3f2bfd3b2dd2 Gitweb: http://git.kernel.org/tip/bd43f60a260c83cbc9befd7d710a3f2bfd3b2dd2 Author: Borislav Petkov AuthorDate: Mon, 23 Jan 2017 19:35:10 +0100 Committer: Ingo Molnar CommitDate: Tue, 24 Jan 2017 09:14:55 +0100 x86/ras/amd/inj: Change dependency Change dependency to mce.c as we're using mce_inject_log() now to stick an MCE into the MCA subsystem. Signed-off-by: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Tony Luck Cc: Yazen Ghannam Cc: linux-edac Link: http://lkml.kernel.org/r/20170123183514.13356-6-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/ras/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/ras/Kconfig b/arch/x86/ras/Kconfig index d957d5f..0bc60a3 100644 --- a/arch/x86/ras/Kconfig +++ b/arch/x86/ras/Kconfig @@ -1,6 +1,6 @@ config MCE_AMD_INJ tristate "Simple MCE injection interface for AMD processors" - depends on RAS && EDAC_DECODE_MCE && DEBUG_FS && AMD_NB + depends on RAS && X86_MCE && DEBUG_FS && AMD_NB default n help This is a simple debugfs interface to inject MCEs and test different