From b160258d02a10ca0173650b90302fcbce678cd60 Mon Sep 17 00:00:00 2001 From: Jessica Yu Date: Jul 05 2021 12:22:40 +0000 Subject: Merge branch 'users/bpetkov/SLE15-SP3/for-next' into SLE15-SP3 Pull an x86 fix from Borislav Petkov. --- diff --git a/patches.suse/x86-elf-use-bitul-macro-in-uapi-headers.patch b/patches.suse/x86-elf-use-bitul-macro-in-uapi-headers.patch new file mode 100644 index 0000000..b44dcdf --- /dev/null +++ b/patches.suse/x86-elf-use-bitul-macro-in-uapi-headers.patch @@ -0,0 +1,38 @@ +From: Joe Richey +Date: Fri, 21 May 2021 01:58:42 -0700 +Subject: x86/elf: Use _BITUL() macro in UAPI headers +Git-commit: d06aca989c243dd9e5d3e20aa4e5c2ecfdd07050 +Patch-mainline: v5.13 or v5.13-rc8 (next release) +References: bsc#1178134 + +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 +Signed-off-by: Borislav Petkov +Link: https://lkml.kernel.org/r/20210521085849.37676-2-joerichey94@gmail.com +--- + 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 ++ + /* 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 + diff --git a/series.conf b/series.conf index 665c72e..55b1c1a 100644 --- a/series.conf +++ b/series.conf @@ -49699,6 +49699,7 @@ patches.suse/kthread_worker-split-code-for-canceling-the-delayed-.patch patches.suse/kthread-prevent-deadlock-when-kthread_mod_delayed_wo.patch patches.suse/s390-stack-fix-possible-register-corruption-with-stack-switch-helper.patch + patches.suse/x86-elf-use-bitul-macro-in-uapi-headers.patch patches.suse/dax-fix-ENOMEM-handling-in-grab_mapping_entry.patch patches.suse/0001-ipmi-watchdog-Stop-watchdog-timer-when-the-current-a.patch patches.suse/block-return-the-correct-bvec-when-checking-for-gaps.patch