tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Exclude asm-generic/{page,memory_model}.h from user bits of i386/x86_64 page.h

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

David Woodhouse cd469e0c ad158879

+4 -4
+2 -2
include/asm-i386/page.h
··· 136 136 ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ 137 137 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) 138 138 139 - #endif /* __KERNEL__ */ 140 - 141 139 #include <asm-generic/memory_model.h> 142 140 #include <asm-generic/page.h> 141 + 142 + #endif /* __KERNEL__ */ 143 143 144 144 #endif /* _I386_PAGE_H */
+2 -2
include/asm-x86_64/page.h
··· 135 135 136 136 #define __HAVE_ARCH_GATE_AREA 1 137 137 138 - #endif /* __KERNEL__ */ 139 - 140 138 #include <asm-generic/memory_model.h> 141 139 #include <asm-generic/page.h> 140 + 141 + #endif /* __KERNEL__ */ 142 142 143 143 #endif /* _X86_64_PAGE_H */