mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
Exclude asm-generic/{page,memory_model}.h from user bits of i386/x86_64 page.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
parent
ad15887986
commit
cd469e0cc6
2 changed files with 4 additions and 4 deletions
|
@ -136,9 +136,9 @@ extern int page_is_ram(unsigned long pagenr);
|
||||||
((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \
|
((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \
|
||||||
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
|
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
|
||||||
|
|
||||||
#endif /* __KERNEL__ */
|
|
||||||
|
|
||||||
#include <asm-generic/memory_model.h>
|
#include <asm-generic/memory_model.h>
|
||||||
#include <asm-generic/page.h>
|
#include <asm-generic/page.h>
|
||||||
|
|
||||||
|
#endif /* __KERNEL__ */
|
||||||
|
|
||||||
#endif /* _I386_PAGE_H */
|
#endif /* _I386_PAGE_H */
|
||||||
|
|
|
@ -135,9 +135,9 @@ typedef struct { unsigned long pgprot; } pgprot_t;
|
||||||
|
|
||||||
#define __HAVE_ARCH_GATE_AREA 1
|
#define __HAVE_ARCH_GATE_AREA 1
|
||||||
|
|
||||||
#endif /* __KERNEL__ */
|
|
||||||
|
|
||||||
#include <asm-generic/memory_model.h>
|
#include <asm-generic/memory_model.h>
|
||||||
#include <asm-generic/page.h>
|
#include <asm-generic/page.h>
|
||||||
|
|
||||||
|
#endif /* __KERNEL__ */
|
||||||
|
|
||||||
#endif /* _X86_64_PAGE_H */
|
#endif /* _X86_64_PAGE_H */
|
||||||
|
|
Loading…
Reference in a new issue