diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-04-27 15:48:08 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-27 15:48:08 +0100 |
| commit | cd469e0cc67b74ba41daec335ea72baedb750b80 (patch) | |
| tree | 8054cc6b13f48785165af1485a873dd3e33d4ca6 /include | |
| parent | ad1588798620901c12ba86c71865150a4eb727bf (diff) | |
Exclude asm-generic/{page,memory_model}.h from user bits of i386/x86_64 page.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/page.h | 4 | ||||
| -rw-r--r-- | include/asm-x86_64/page.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-i386/page.h b/include/asm-i386/page.h index 85f35e67020..e3a552fa553 100644 --- a/include/asm-i386/page.h +++ b/include/asm-i386/page.h @@ -136,9 +136,9 @@ extern int page_is_ram(unsigned long pagenr); ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#endif /* __KERNEL__ */ - #include <asm-generic/memory_model.h> #include <asm-generic/page.h> +#endif /* __KERNEL__ */ + #endif /* _I386_PAGE_H */ diff --git a/include/asm-x86_64/page.h b/include/asm-x86_64/page.h index b59f33e6b83..f7bf875aae4 100644 --- a/include/asm-x86_64/page.h +++ b/include/asm-x86_64/page.h @@ -135,9 +135,9 @@ typedef struct { unsigned long pgprot; } pgprot_t; #define __HAVE_ARCH_GATE_AREA 1 -#endif /* __KERNEL__ */ - #include <asm-generic/memory_model.h> #include <asm-generic/page.h> +#endif /* __KERNEL__ */ + #endif /* _X86_64_PAGE_H */ |