diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-07 16:39:35 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-07 16:39:35 -0400 |
| commit | 35c44933ef10ff4e47c9b28a7e61e648edd38845 (patch) | |
| tree | 7490f78f5479620ee5cf931f9701a673908e39ce /arch/arm/mm | |
| parent | 941f81c16ec7497ecce6f1f611277d67e89bdfe1 (diff) | |
| parent | a3be6327163c223c1715c8307a616941fbf8bf73 (diff) | |
Merge branch 'gemini_fix' of git://git.berlios.de/gemini-board into devel-stable
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/copypage-fa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/copypage-fa.c b/arch/arm/mm/copypage-fa.c index b2a6008b0111..d2852e1635b1 100644 --- 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) | |||
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | void fa_copy_user_highpage(struct page *to, struct page *from, | 42 | void fa_copy_user_highpage(struct page *to, struct page *from, |
| 43 | unsigned long vaddr) | 43 | unsigned long vaddr, struct vm_area_struct *vma) |
| 44 | { | 44 | { |
| 45 | void *kto, *kfrom; | 45 | void *kto, *kfrom; |
| 46 | 46 | ||