4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Borislav Petkov <bp@xxxxxxx> (cherry picked from commit 7a32fc51ca938e67974cbb9db31e1a43f98345a9) ... to adhere to the _ASM_X86_ naming scheme. No functional change. Signed-off-by: Borislav Petkov <bp@xxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: riel@xxxxxxxxxx Cc: ak@xxxxxxxxxxxxxxx Cc: peterz@xxxxxxxxxxxxx Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Cc: jikos@xxxxxxxxxx Cc: luto@xxxxxxxxxxxxxx Cc: dave.hansen@xxxxxxxxx Cc: torvalds@xxxxxxxxxxxxxxxxxxxx Cc: keescook@xxxxxxxxxx Cc: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> Cc: tim.c.chen@xxxxxxxxxxxxxxx Cc: gregkh@xxxxxxxxxxxxxxxxxxxx Cc: pjt@xxxxxxxxxx Link: https://lkml.kernel.org/r/20180126121139.31959-3-bp@xxxxxxxxx Signed-off-by: David Woodhouse <dwmw@xxxxxxxxxxxx> [cherry-pick to 4.4] Signed-off-by: Jack Wang <jinpu.wang@xxxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- 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_ */