diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-06-23 05:03:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 10:42:53 -0400 |
commit | 9216dfad4fc97ab639ef0885efc713f3d7a20d5b (patch) | |
tree | 546e301f3181f56133509327f9c5ed035dd4b50d /include | |
parent | 1b2db9fb7adc4d67d9ce7d16ce79c41ee84730fe (diff) |
[PATCH] move_pages: fix 32 -> 64 bit compat function
The definition of the third parameter is a pointer to an array of virtual
addresses which give us some trouble. The existing code calculated the
wrong address in the array since I used void to avoid having to specify a
type.
I now use the correct type "compat_uptr_t __user *" in the definition of
the function in kernel/compat.c.
However, I used __u32 in syscalls.h. Would have to include compat.h there
in order to provide the same definition which would generate an ugly
include situation.
On both ia64 and x86_64 compat_uptr_t is u32. So this works although
parameter declarations differ.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/syscalls.h | 2 |
1 files changed, 1 insertions, 1 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); |