summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/syscalls.h2
-rw-r--r--kernel/compat.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index e42738c..33785b7 100644
--- a/include/linux/syscalls.h
+++ b/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/kernel/compat.c b/kernel/compat.c
index ccea93e..2f67233 100644
--- a/kernel/compat.c
+++ b/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;
}
OpenPOWER on IntegriCloud