diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-09 19:19:21 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-09 19:19:21 +0300 |
| commit | 2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa (patch) | |
| tree | b81ab05dac66fa0cccf44896d2d86be7ba52aa49 /arch/arm/mm/copypage-v4mc.c | |
| parent | 23c7b521c250b261dd97a7a06d5a2e74b56233d5 (diff) | |
| parent | 8bd4bb7a35e8ebb015a531218614c48e10a3c4ee (diff) | |
| download | linux-2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa.tar.xz | |
Merge branch 'topic/quirk-cleanup' into topic/hda
Diffstat (limited to 'arch/arm/mm/copypage-v4mc.c')
| -rw-r--r-- | arch/arm/mm/copypage-v4mc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/copypage-v4mc.c b/arch/arm/mm/copypage-v4mc.c index bdb5fd983b15..1601698b9800 100644 --- a/arch/arm/mm/copypage-v4mc.c +++ b/arch/arm/mm/copypage-v4mc.c @@ -68,7 +68,7 @@ mc_copy_user_page(void *from, void *to) : "r" (from), "r" (to), "I" (PAGE_SIZE / 64)); } -void v4_mc_copy_user_highpage(struct page *from, struct page *to, +void v4_mc_copy_user_highpage(struct page *to, struct page *from, unsigned long vaddr) { void *kto = kmap_atomic(to, KM_USER1); |