Merge commit 'v2.6.34-rc1' into perf/urgent

[mv-sheeva.git] / arch / arm / mm / copypage-v4wt.c

diff --git a/arch/arm/mm/copypage-v4wt.c b/arch/arm/mm/copypage-v4wt.c
index 300efafd66431ae02b042df0e065efca88424bf3..172e6a55458eb321dbf0708be20433a4daa7909f 100644 (file)
--- a/arch/arm/mm/copypage-v4wt.c
+++ b/arch/arm/mm/copypage-v4wt.c
@@ -44,7 +44,7 @@ v4wt_copy_user_page(void *kto, const void *kfrom)
 }
 
 void v4wt_copy_user_highpage(struct page *to, struct page *from,
-       unsigned long vaddr)
+       unsigned long vaddr, struct vm_area_struct *vma)
 {
        void *kto, *kfrom;