lkml.org 
[lkml]   [2018]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 16/64] x86/nospec: Fix header guards names
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Borislav Petkov bp@suse.de

    commit 7a32fc51ca938e67974cbb9db31e1a43f98345a9

    ... 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: Greg Kroah-Hartman <gregkh@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_ */

    \
     
     \ /
      Last update: 2018-02-05 19:24    [W:4.095 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site