Commit e98e8864 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'x86-misc-2021-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 uapi fixlet from Ingo Molnar:
 "Fix the <uapi/asm/hwcap2.h> UAPI header to build in user-space too"

* tag 'x86-misc-2021-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/elf: Use _BITUL() macro in UAPI headers
parents 8e4d7a78 d06aca98
...@@ -2,10 +2,12 @@ ...@@ -2,10 +2,12 @@
#ifndef _ASM_X86_HWCAP2_H #ifndef _ASM_X86_HWCAP2_H
#define _ASM_X86_HWCAP2_H #define _ASM_X86_HWCAP2_H
#include <linux/const.h>
/* MONITOR/MWAIT enabled in Ring 3 */ /* MONITOR/MWAIT enabled in Ring 3 */
#define HWCAP2_RING3MWAIT (1 << 0) #define HWCAP2_RING3MWAIT _BITUL(0)
/* Kernel allows FSGSBASE instructions available in Ring 3 */ /* Kernel allows FSGSBASE instructions available in Ring 3 */
#define HWCAP2_FSGSBASE BIT(1) #define HWCAP2_FSGSBASE _BITUL(1)
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment