diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-04-27 10:48:08 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-27 10:48:08 -0400 |
commit | cd469e0cc67b74ba41daec335ea72baedb750b80 (patch) | |
tree | 8054cc6b13f48785165af1485a873dd3e33d4ca6 /include/asm-i386/page.h | |
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/asm-i386/page.h')
-rw-r--r-- | include/asm-i386/page.h | 4 |
1 files changed, 2 insertions, 2 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); | |||
136 | ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ | 136 | ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ |
137 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | 137 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |
138 | 138 | ||
139 | #endif /* __KERNEL__ */ | ||
140 | |||
141 | #include <asm-generic/memory_model.h> | 139 | #include <asm-generic/memory_model.h> |
142 | #include <asm-generic/page.h> | 140 | #include <asm-generic/page.h> |
143 | 141 | ||
142 | #endif /* __KERNEL__ */ | ||
143 | |||
144 | #endif /* _I386_PAGE_H */ | 144 | #endif /* _I386_PAGE_H */ |