diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-07 22:39:35 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-07 22:39:35 +0200 |
| commit | 35c44933ef10ff4e47c9b28a7e61e648edd38845 (patch) | |
| tree | 7490f78f5479620ee5cf931f9701a673908e39ce /arch/arm/mm | |
| parent | Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx int... (diff) | |
| parent | ARM: Gemini: fix compiler error in copypage-fa.c (diff) | |
| download | linux-35c44933ef10ff4e47c9b28a7e61e648edd38845.tar.xz linux-35c44933ef10ff4e47c9b28a7e61e648edd38845.zip | |
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) } 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; |