Sparc: Adjust to new {clear,copy}_user_page calling convention.

diff --git a/include/asm-sparc/page.h b/include/asm-sparc/page.h
index 4ce13153c390f5b867570fb6155e379edb10ed9d..0c5b3a066d970f562ea47837f9afa312f4fe29d1 100644 (file)
--- a/include/asm-sparc/page.h
+++ b/include/asm-sparc/page.h
@@ -54,8 +54,8 @@
 
 #define clear_page(page)        memset((void *)(page), 0, PAGE_SIZE)
 #define copy_page(to,from)     memcpy((void *)(to), (void *)(from), PAGE_SIZE)
-#define clear_user_page(page, vaddr)   clear_page(page)
-#define copy_user_page(to, from, vaddr)        copy_page(to, from)
+#define clear_user_page(addr, vaddr, page)     clear_page(addr)
+#define copy_user_page(to, from, vaddr, page)  copy_page(to, from)
 
 /* The following structure is used to hold the physical
  * memory configuration of the machine.  This is filled in

diff --git a/include/asm-sparc64/page.h b/include/asm-sparc64/page.h
index a0ffd1ac93ea29d88c8d0ec3e7fbcda8497557f2..c01cafda59eedea7ce06567ba84d44d62e3ec57f 100644 (file)
--- a/include/asm-sparc64/page.h
+++ b/include/asm-sparc64/page.h
@@ -35,8 +35,9 @@ extern void do_BUG(const char *file, int line);
 
 extern void _clear_page(void *page);
 #define clear_page(X)  _clear_page((void *)(X))
-extern void clear_user_page(void *page, unsigned long vaddr);
-extern void copy_user_page(void *to, void *from, unsigned long vaddr);
+struct page;
+extern void clear_user_page(void *addr, unsigned long vaddr, struct page *page);
+extern void copy_user_page(void *to, void *from, unsigned long vaddr, struct page *topage);
 
 /* GROSS, defining this makes gcc pass these types as aggregates,
  * and thus on the stack, turn this crap off... -DaveM