summaryrefslogtreecommitdiff
path: root/include/linux/pkeys.h
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2018-04-10 13:12:20 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2018-05-09 11:50:40 +1000
commitcd419a513146367af08b895a8f7d360e4e77b638 (patch)
tree65ed3e0145f02bcece17d58d8ba7824b48a33ac4 /include/linux/pkeys.h
parent2c9e0a6fa2bb75697981825153128f43b32f6d08 (diff)
mm/pkeys: Remove include of asm/mmu_context.h from pkeys.h
While trying to unify the pkey handling in show_smap() between x86 and powerpc we stumbled across various build failures due to the order of includes between the two arches. Part of the problem is that linux/pkeys.h includes asm/mmu_context.h, and the relationship between asm/mmu_context.h and asm/pkeys.h is not consistent between the two arches. It would be cleaner if linux/pkeys.h only included asm/pkeys.h, creating a single integration point for the arch pkey definitions. So this patch removes the include of asm/mmu_context.h from linux/pkeys.h. We can't prove that this is safe in the general case, but it passes all the build tests I've thrown at it. Also asm/mmu_context.h is included widely while linux/pkeys.h is not, so most likely any code that is including linux/pkeys.h is already getting asm/mmu_context.h from elsewhere. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'include/linux/pkeys.h')
-rw-r--r--include/linux/pkeys.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/pkeys.h b/include/linux/pkeys.h
index 0794ca78c379..ed06e1a67bfa 100644
--- a/include/linux/pkeys.h
+++ b/include/linux/pkeys.h
@@ -3,7 +3,6 @@
#define _LINUX_PKEYS_H
#include <linux/mm_types.h>
-#include <asm/mmu_context.h>
#ifdef CONFIG_ARCH_HAS_PKEYS
#include <asm/pkeys.h>