diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-26 20:09:20 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-26 20:09:20 +0300 |
| commit | 5bb7b2107f8c8e97750a36a723f3f74f819f6ff1 (patch) | |
| tree | a721a3a54b7fa24aa9083671d44a94b3a8c2481d /include/linux | |
| parent | 3a398acc56dd7592eba081ce1ea356151ab90e2d (diff) | |
| parent | 5ba1071f7554c4027bdbd712a146111de57918de (diff) | |
| download | linux-5bb7b2107f8c8e97750a36a723f3f74f819f6ff1.tar.xz | |
Merge tag 'x86-urgent-2021-09-26' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
"A set of fixes for X86:
- Prevent sending the wrong signal when protection keys are enabled
and the kernel handles a fault in the vsyscall emulation.
- Invoke early_reserve_memory() before invoking e820_memory_setup()
which is required to make the Xen dom0 e820 hooks work correctly.
- Use the correct data type for the SETZ operand in the EMQCMDS
instruction wrapper.
- Prevent undefined behaviour to the potential unaligned accesss in
the instruction decoder library"
* tag 'x86-urgent-2021-09-26' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/insn, tools/x86: Fix undefined behavior due to potential unaligned accesses
x86/asm: Fix SETZ size enqcmds() build failure
x86/setup: Call early_reserve_memory() earlier
x86/fault: Fix wrong signal when vsyscall fails with pkey
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pkeys.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pkeys.h b/include/linux/pkeys.h index 6beb26b7151d..86be8bf27b41 100644 --- a/include/linux/pkeys.h +++ b/include/linux/pkeys.h @@ -4,6 +4,8 @@ #include <linux/mm.h> +#define ARCH_DEFAULT_PKEY 0 + #ifdef CONFIG_ARCH_HAS_PKEYS #include <asm/pkeys.h> #else /* ! CONFIG_ARCH_HAS_PKEYS */ |