diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 04:59:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 04:59:46 -0400 |
| commit | 701328a7b58d50d8640c21ba5fdf3170b1ddac16 (patch) | |
| tree | 99a3fe44310a97e92ad1cb3a01f2ee3f6ed0d59a /include/linux/compat.h | |
| parent | 53e36ada37cb8b01cfbf674580a79edc0bb764c7 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/linux/compat.h')
| -rw-r--r-- | include/linux/compat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index ef5cd192784..f4ebf96f530 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -163,7 +163,7 @@ asmlinkage long compat_sys_set_robust_list(struct compat_robust_list_head __user *head, compat_size_t len); asmlinkage long -compat_sys_get_robust_list(int pid, compat_uptr_t *head_ptr, +compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr, compat_size_t __user *len_ptr); long compat_sys_semctl(int first, int second, int third, void __user *uptr); |