Merge tag 'x86-urgent-2023-09-10' of git://git.kernel.org/pub/scm/linux/kernel/git...

[tomoyo/tomoyo-test1.git] / arch / x86 / include / uapi / asm / mman.h

diff --git a/arch/x86/include/uapi/asm/mman.h b/arch/x86/include/uapi/asm/mman.h
index 8148bdd..46cdc94 100644 (file)
--- a/arch/x86/include/uapi/asm/mman.h
+++ b/arch/x86/include/uapi/asm/mman.h
@@ -5,14 +5,6 @@
 #define MAP_32BIT      0x40            /* only give out 32bit addresses */
 #define MAP_ABOVE4G    0x80            /* only map above 4GB */
 
-#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
-#define arch_calc_vm_prot_bits(prot, key) (            \
-               ((key) & 0x1 ? VM_PKEY_BIT0 : 0) |      \
-               ((key) & 0x2 ? VM_PKEY_BIT1 : 0) |      \
-               ((key) & 0x4 ? VM_PKEY_BIT2 : 0) |      \
-               ((key) & 0x8 ? VM_PKEY_BIT3 : 0))
-#endif
-
 /* Flags for map_shadow_stack(2) */
 #define SHADOW_STACK_SET_TOKEN (1ULL << 0)     /* Set up a restore token in the shadow stack */