From c97a9020d66f848e833423c0ed859d7335464ca7 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Fri, 23 Jun 2006 02:03:57 -0700
Subject: [PATCH] --- yaml --- r: 28954 b: refs/heads/master c:
 9216dfad4fc97ab639ef0885efc713f3d7a20d5b h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/syscalls.h | 2 +-
 trunk/kernel/compat.c          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b0b17992c46a..a334e7790401 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b2db9fb7adc4d67d9ce7d16ce79c41ee84730fe
+refs/heads/master: 9216dfad4fc97ab639ef0885efc713f3d7a20d5b
diff --git a/trunk/include/linux/syscalls.h b/trunk/include/linux/syscalls.h
index e42738c69166..33785b79d548 100644
--- a/trunk/include/linux/syscalls.h
+++ b/trunk/include/linux/syscalls.h
@@ -522,7 +522,7 @@ asmlinkage long sys_move_pages(pid_t pid, unsigned long nr_pages,
 				int __user *status,
 				int flags);
 asmlinkage long compat_sys_move_pages(pid_t pid, unsigned long nr_page,
-				void __user *pages,
+				__u32 __user *pages,
 				const int __user *nodes,
 				int __user *status,
 				int flags);
diff --git a/trunk/kernel/compat.c b/trunk/kernel/compat.c
index ccea93e28954..2f672332430f 100644
--- a/trunk/kernel/compat.c
+++ b/trunk/kernel/compat.c
@@ -938,7 +938,7 @@ asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp)
 
 #ifdef CONFIG_NUMA
 asmlinkage long compat_sys_move_pages(pid_t pid, unsigned long nr_pages,
-		void __user *pages32,
+		compat_uptr_t __user *pages32,
 		const int __user *nodes,
 		int __user *status,
 		int flags)
@@ -950,7 +950,7 @@ asmlinkage long compat_sys_move_pages(pid_t pid, unsigned long nr_pages,
 	for (i = 0; i < nr_pages; i++) {
 		compat_uptr_t p;
 
-		if (get_user(p, (compat_uptr_t *)(pages32 + i)) ||
+		if (get_user(p, pages32 + i) ||
 			put_user(compat_ptr(p), pages + i))
 			return -EFAULT;
 	}