From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759992AbcDMLgF (ORCPT ); Wed, 13 Apr 2016 07:36:05 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56106 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759214AbcDMLgB (ORCPT ); Wed, 13 Apr 2016 07:36:01 -0400 Date: Wed, 13 Apr 2016 04:35:27 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org, tony.luck@intel.com, bp@suse.de, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org Reply-To: hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, peterz@infradead.org, bp@suse.de, tony.luck@intel.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org In-Reply-To: <1459929916-12852-2-git-send-email-bp@alien8.de> References: <1459929916-12852-2-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/RAS: Rename AMD MCE injector config item Git-Commit-ID: 69385f8879344f4a1f078f761bd3523fcf697131 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: 69385f8879344f4a1f078f761bd3523fcf697131 Gitweb: http://git.kernel.org/tip/69385f8879344f4a1f078f761bd3523fcf697131 Author: Borislav Petkov AuthorDate: Wed, 6 Apr 2016 10:05:14 +0200 Committer: Ingo Molnar CommitDate: Wed, 13 Apr 2016 10:54:23 +0200 x86/RAS: Rename AMD MCE injector config item ... to be the same like the file name of injection module itself to avoid confusion when grepping. No functionality change. Signed-off-by: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Tony Luck Link: http://lkml.kernel.org/r/1459929916-12852-2-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/ras/Kconfig | 2 +- arch/x86/ras/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/ras/Kconfig b/arch/x86/ras/Kconfig index df280da..d957d5f 100644 --- a/arch/x86/ras/Kconfig +++ b/arch/x86/ras/Kconfig @@ -1,4 +1,4 @@ -config AMD_MCE_INJ +config MCE_AMD_INJ tristate "Simple MCE injection interface for AMD processors" depends on RAS && EDAC_DECODE_MCE && DEBUG_FS && AMD_NB default n diff --git a/arch/x86/ras/Makefile b/arch/x86/ras/Makefile index dd2c98b..5f94546 100644 --- a/arch/x86/ras/Makefile +++ b/arch/x86/ras/Makefile @@ -1,2 +1,2 @@ -obj-$(CONFIG_AMD_MCE_INJ) += mce_amd_inj.o +obj-$(CONFIG_MCE_AMD_INJ) += mce_amd_inj.o