| From: Borislav Petkov <bp@suse.de> |
| Date: Fri, 26 Jan 2018 13:11:37 +0100 |
| Subject: x86/nospec: Fix header guards names |
| |
| commit 7a32fc51ca938e67974cbb9db31e1a43f98345a9 upstream. |
| |
| ... to adhere to the _ASM_X86_ naming scheme. |
| |
| No functional change. |
| |
| Signed-off-by: Borislav Petkov <bp@suse.de> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Cc: riel@redhat.com |
| Cc: ak@linux.intel.com |
| Cc: peterz@infradead.org |
| Cc: David Woodhouse <dwmw2@infradead.org> |
| 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 <jpoimboe@redhat.com> |
| 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 |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/x86/include/asm/nospec-branch.h | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- 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 <asm/alternative.h> |
| #include <asm/alternative-asm.h> |
| @@ -195,4 +195,4 @@ static inline void vmexit_fill_RSB(void) |
| } |
| |
| #endif /* __ASSEMBLY__ */ |
| -#endif /* __NOSPEC_BRANCH_H__ */ |
| +#endif /* _ASM_X86_NOSPEC_BRANCH_H_ */ |
