lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 286/800] x86/elf: Use _BITUL() macro in UAPI headers
    Date
    From: Joe Richey <joerichey@google.com>

    [ Upstream commit d06aca989c243dd9e5d3e20aa4e5c2ecfdd07050 ]

    Replace BIT() in x86's UAPI header with _BITUL(). BIT() is not defined
    in the UAPI headers and its usage may cause userspace build errors.

    Fixes: 742c45c3ecc9 ("x86/elf: Enumerate kernel FSGSBASE capability in AT_HWCAP2")
    Signed-off-by: Joe Richey <joerichey@google.com>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Link: https://lkml.kernel.org/r/20210521085849.37676-2-joerichey94@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/include/uapi/asm/hwcap2.h | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/include/uapi/asm/hwcap2.h b/arch/x86/include/uapi/asm/hwcap2.h
    index 5fdfcb47000f..054604aba9f0 100644
    --- a/arch/x86/include/uapi/asm/hwcap2.h
    +++ b/arch/x86/include/uapi/asm/hwcap2.h
    @@ -2,10 +2,12 @@
    #ifndef _ASM_X86_HWCAP2_H
    #define _ASM_X86_HWCAP2_H

    +#include <linux/const.h>
    +
    /* MONITOR/MWAIT enabled in Ring 3 */
    -#define HWCAP2_RING3MWAIT (1 << 0)
    +#define HWCAP2_RING3MWAIT _BITUL(0)

    /* Kernel allows FSGSBASE instructions available in Ring 3 */
    -#define HWCAP2_FSGSBASE BIT(1)
    +#define HWCAP2_FSGSBASE _BITUL(1)

    #endif
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:40    [W:2.056 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site