diff options
-rw-r--r-- | include/linux/syscalls.h | 2 | ||||
-rw-r--r-- | kernel/compat.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index e42738c69166..33785b79d548 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, | |||
522 | int __user *status, | 522 | int __user *status, |
523 | int flags); | 523 | int flags); |
524 | asmlinkage long compat_sys_move_pages(pid_t pid, unsigned long nr_page, | 524 | asmlinkage long compat_sys_move_pages(pid_t pid, unsigned long nr_page, |
525 | void __user *pages, | 525 | __u32 __user *pages, |
526 | const int __user *nodes, | 526 | const int __user *nodes, |
527 | int __user *status, | 527 | int __user *status, |
528 | int flags); | 528 | int flags); |
diff --git a/kernel/compat.c b/kernel/compat.c index ccea93e28954..2f672332430f 100644 --- a/kernel/compat.c +++ b/kernel/compat.c | |||
@@ -938,7 +938,7 @@ asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp) | |||
938 | 938 | ||
939 | #ifdef CONFIG_NUMA | 939 | #ifdef CONFIG_NUMA |
940 | asmlinkage long compat_sys_move_pages(pid_t pid, unsigned long nr_pages, | 940 | asmlinkage long compat_sys_move_pages(pid_t pid, unsigned long nr_pages, |
941 | void __user *pages32, | 941 | compat_uptr_t __user *pages32, |
942 | const int __user *nodes, | 942 | const int __user *nodes, |
943 | int __user *status, | 943 | int __user *status, |
944 | int flags) | 944 | int flags) |
@@ -950,7 +950,7 @@ asmlinkage long compat_sys_move_pages(pid_t pid, unsigned long nr_pages, | |||
950 | for (i = 0; i < nr_pages; i++) { | 950 | for (i = 0; i < nr_pages; i++) { |
951 | compat_uptr_t p; | 951 | compat_uptr_t p; |
952 | 952 | ||
953 | if (get_user(p, (compat_uptr_t *)(pages32 + i)) || | 953 | if (get_user(p, pages32 + i) || |
954 | put_user(compat_ptr(p), pages + i)) | 954 | put_user(compat_ptr(p), pages + i)) |
955 | return -EFAULT; | 955 | return -EFAULT; |
956 | } | 956 | } |