From 995164bf44e4b8135d73422d03478ddeb4ae29c6 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun, 18 Jan 2009 16:24:19 +0000
Subject: [PATCH] --- yaml --- r: 130235 b: refs/heads/master c:
 7dd8c4f3526b16edb1a3f4edb4665a8fa6e632d8 h: refs/heads/master i:   130233:
 b47a9b783998ae36c2238b28634bc56a42c1d6cb   130231:
 080962f99aecfb45d780441a9b1bac5e96ac1a10 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/mm/copypage-v4mc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bf1905b7395d..9a385da80901 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 953a7e8476bbd7367cebdb868c326ba42968bc13
+refs/heads/master: 7dd8c4f3526b16edb1a3f4edb4665a8fa6e632d8
diff --git a/trunk/arch/arm/mm/copypage-v4mc.c b/trunk/arch/arm/mm/copypage-v4mc.c
index bdb5fd983b15..1601698b9800 100644
--- a/trunk/arch/arm/mm/copypage-v4mc.c
+++ b/trunk/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);