git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
copypage-fa.c
diff --git
a/arch/arm/mm/copypage-fa.c
b/arch/arm/mm/copypage-fa.c
index
b2a6008
..
d2852e1
100644
(file)
--- a/
arch/arm/mm/copypage-fa.c
+++ b/
arch/arm/mm/copypage-fa.c
@@
-40,7
+40,7
@@
fa_copy_user_page(void *kto, const void *kfrom)
}
void fa_copy_user_highpage(struct page *to, struct page *from,
- unsigned long vaddr)
+ unsigned long vaddr
, struct vm_area_struct *vma
)
{
void *kto, *kfrom;