diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-09-21 04:33:55 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-21 04:33:55 -0400 |
commit | ed9526b0d342a1c08a19f880c3f0c1d0fec4e8db (patch) | |
tree | a09b43d06d123bbf8763eb91a5c2c46632d8e27f /include/asm-cris/page.h | |
parent | 2a1b181eff32f497f285fcfc1e771ec469205908 (diff) |
Clean up exported headers on CRIS
This fixes most of the issues with exported headers on CRIS, although
we do still need to deal with the asm/arch symlink.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-cris/page.h')
-rw-r--r-- | include/asm-cris/page.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-cris/page.h b/include/asm-cris/page.h index 81832e9e157f..9f13c32552bf 100644 --- a/include/asm-cris/page.h +++ b/include/asm-cris/page.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _CRIS_PAGE_H | 1 | #ifndef _CRIS_PAGE_H |
2 | #define _CRIS_PAGE_H | 2 | #define _CRIS_PAGE_H |
3 | 3 | ||
4 | #ifdef __KERNEL__ | ||
5 | |||
4 | #include <asm/arch/page.h> | 6 | #include <asm/arch/page.h> |
5 | 7 | ||
6 | /* PAGE_SHIFT determines the page size */ | 8 | /* PAGE_SHIFT determines the page size */ |
@@ -12,8 +14,6 @@ | |||
12 | #endif | 14 | #endif |
13 | #define PAGE_MASK (~(PAGE_SIZE-1)) | 15 | #define PAGE_MASK (~(PAGE_SIZE-1)) |
14 | 16 | ||
15 | #ifdef __KERNEL__ | ||
16 | |||
17 | #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) | 17 | #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) |
18 | #define copy_page(to,from) memcpy((void *)(to), (void *)(from), PAGE_SIZE) | 18 | #define copy_page(to,from) memcpy((void *)(to), (void *)(from), PAGE_SIZE) |
19 | 19 | ||
@@ -73,10 +73,10 @@ typedef struct { unsigned long pgprot; } pgprot_t; | |||
73 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ | 73 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ |
74 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | 74 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |
75 | 75 | ||
76 | #endif /* __KERNEL__ */ | ||
77 | |||
78 | #include <asm-generic/memory_model.h> | 76 | #include <asm-generic/memory_model.h> |
79 | #include <asm-generic/page.h> | 77 | #include <asm-generic/page.h> |
80 | 78 | ||
79 | #endif /* __KERNEL__ */ | ||
80 | |||
81 | #endif /* _CRIS_PAGE_H */ | 81 | #endif /* _CRIS_PAGE_H */ |
82 | 82 | ||