From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753799AbeAZPPn (ORCPT ); Fri, 26 Jan 2018 10:15:43 -0500 Received: from terminus.zytor.com ([65.50.211.136]:47541 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753778AbeAZPPl (ORCPT ); Fri, 26 Jan 2018 10:15:41 -0500 Date: Fri, 26 Jan 2018 07:03:13 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: jpoimboe@redhat.com, linux-kernel@vger.kernel.org, dwmw2@infradead.org, tglx@linutronix.de, hpa@zytor.com, bp@suse.de, mingo@kernel.org Reply-To: dwmw2@infradead.org, tglx@linutronix.de, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, bp@suse.de In-Reply-To: <20180126121139.31959-3-bp@alien8.de> References: <20180126121139.31959-3-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/nospec: Fix header guards names Git-Commit-ID: 7a32fc51ca938e67974cbb9db31e1a43f98345a9 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: 7a32fc51ca938e67974cbb9db31e1a43f98345a9 Gitweb: https://git.kernel.org/tip/7a32fc51ca938e67974cbb9db31e1a43f98345a9 Author: Borislav Petkov AuthorDate: Fri, 26 Jan 2018 13:11:37 +0100 Committer: Thomas Gleixner CommitDate: Fri, 26 Jan 2018 15:53:19 +0100 x86/nospec: Fix header guards names ... to adhere to the _ASM_X86_ naming scheme. No functional change. Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner Cc: riel@redhat.com Cc: ak@linux.intel.com Cc: peterz@infradead.org Cc: David Woodhouse Cc: jikos@kernel.org Cc: luto@amacapital.net Cc: dave.hansen@intel.com Cc: torvalds@linux-foundation.org Cc: keescook@google.com Cc: Josh Poimboeuf Cc: tim.c.chen@linux.intel.com Cc: gregkh@linux-foundation.org Cc: pjt@google.com Link: https://lkml.kernel.org/r/20180126121139.31959-3-bp@alien8.de --- arch/x86/include/asm/nospec-branch.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index 34e384c..865192a 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __NOSPEC_BRANCH_H__ -#define __NOSPEC_BRANCH_H__ +#ifndef _ASM_X86_NOSPEC_BRANCH_H_ +#define _ASM_X86_NOSPEC_BRANCH_H_ #include #include @@ -232,4 +232,4 @@ static inline void indirect_branch_prediction_barrier(void) } #endif /* __ASSEMBLY__ */ -#endif /* __NOSPEC_BRANCH_H__ */ +#endif /* _ASM_X86_NOSPEC_BRANCH_H_ */