diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-11-08 17:01:42 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-11-08 17:01:42 +0900 |
| commit | 541c54773173d95c8e99a7378a5bb63125c297f1 (patch) | |
| tree | 59270b4498d0502f778e26978865e1e8c6eddc54 /include/asm-sh/page.h | |
| parent | 6d1c76d4e76ef72fce5a7169430ab8f9a68d7924 (diff) | |
| parent | af39c16bd843ee8bde495c8ccb95a5ca209f3051 (diff) | |
| download | op-kernel-dev-541c54773173d95c8e99a7378a5bb63125c297f1.zip op-kernel-dev-541c54773173d95c8e99a7378a5bb63125c297f1.tar.gz | |
Merge branch 'page_colouring_despair'
Diffstat (limited to 'include/asm-sh/page.h')
| -rw-r--r-- | include/asm-sh/page.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/asm-sh/page.h b/include/asm-sh/page.h index 3aa8b07..d00a8fd 100644 --- a/include/asm-sh/page.h +++ b/include/asm-sh/page.h @@ -73,10 +73,13 @@ extern void copy_page_nommu(void *to, void *from); #if !defined(CONFIG_CACHE_OFF) && defined(CONFIG_MMU) && \ (defined(CONFIG_CPU_SH4) || defined(CONFIG_SH7705_CACHE_32KB)) struct page; -extern void clear_user_page(void *to, unsigned long address, struct page *pg); -extern void copy_user_page(void *to, void *from, unsigned long address, struct page *pg); -extern void __clear_user_page(void *to, void *orig_to); -extern void __copy_user_page(void *to, void *from, void *orig_to); +struct vm_area_struct; +extern void clear_user_page(void *to, unsigned long address, struct page *page); +#ifdef CONFIG_CPU_SH4 +extern void copy_user_highpage(struct page *to, struct page *from, + unsigned long vaddr, struct vm_area_struct *vma); +#define __HAVE_ARCH_COPY_USER_HIGHPAGE +#endif #else #define clear_user_page(page, vaddr, pg) clear_page(page) #define copy_user_page(to, from, vaddr, pg) copy_page(to, from) |
