4.9-stable review patch. If anyone has any objections, please let me know.
------------------ From: Borislav Petkov <b...@suse.de> (cherry picked from commit 7a32fc51ca938e67974cbb9db31e1a43f98345a9) ... to adhere to the _ASM_X86_ naming scheme. No functional change. Signed-off-by: Borislav Petkov <b...@suse.de> Signed-off-by: Thomas Gleixner <t...@linutronix.de> Cc: r...@redhat.com Cc: a...@linux.intel.com Cc: pet...@infradead.org Cc: David Woodhouse <dw...@infradead.org> Cc: ji...@kernel.org Cc: l...@amacapital.net Cc: dave.han...@intel.com Cc: torva...@linux-foundation.org Cc: keesc...@google.com Cc: Josh Poimboeuf <jpoim...@redhat.com> Cc: tim.c.c...@linux.intel.com Cc: gre...@linux-foundation.org Cc: p...@google.com Link: https://lkml.kernel.org/r/20180126121139.31959-3...@alien8.de Signed-off-by: David Woodhouse <d...@amazon.co.uk> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- 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> @@ -232,4 +232,4 @@ static inline void indirect_branch_predi } #endif /* __ASSEMBLY__ */ -#endif /* __NOSPEC_BRANCH_H__ */ +#endif /* _ASM_X86_NOSPEC_BRANCH_H_ */
