linux-kernel - [PATCH 4.9 47/92] x86/nospec: Fix header guards names

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20180209133934.558739883@linuxfoundation.org>
Date:   Fri,  9 Feb 2018 14:39:16 +0100
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     linux-kernel@...r.kernel.org
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        stable@...r.kernel.org, Borislav Petkov <bp@...e.de>,
        Thomas Gleixner <tglx@...utronix.de>, riel@...hat.com,
        ak@...ux.intel.com, peterz@...radead.org,
        David Woodhouse <dwmw2@...radead.org>, jikos@...nel.org,
        luto@...capital.net, dave.hansen@...el.com,
        torvalds@...ux-foundation.org, keescook@...gle.com,
        Josh Poimboeuf <jpoimboe@...hat.com>,
        tim.c.chen@...ux.intel.com, pjt@...gle.com,
        David Woodhouse <dwmw@...zon.co.uk>,
        gregkh@...ux-foundation.org
Subject: [PATCH 4.9 47/92] x86/nospec: Fix header guards names

4.9-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Borislav Petkov <bp@...e.de>

(cherry picked from commit 7a32fc51ca938e67974cbb9db31e1a43f98345a9)

... to adhere to the _ASM_X86_ naming scheme.

No functional change.

Signed-off-by: Borislav Petkov <bp@...e.de>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Cc: riel@...hat.com
Cc: ak@...ux.intel.com
Cc: peterz@...radead.org
Cc: David Woodhouse <dwmw2@...radead.org>
Cc: jikos@...nel.org
Cc: luto@...capital.net
Cc: dave.hansen@...el.com
Cc: torvalds@...ux-foundation.org
Cc: keescook@...gle.com
Cc: Josh Poimboeuf <jpoimboe@...hat.com>
Cc: tim.c.chen@...ux.intel.com
Cc: gregkh@...ux-foundation.org
Cc: pjt@...gle.com
Link: https://lkml.kernel.org/r/20180126121139.31959-3-bp@alien8.de
Signed-off-by: David Woodhouse <dwmw@...zon.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.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_ */