68 lines
2.7 KiB
Diff
68 lines
2.7 KiB
Diff
--- sys/amd64/linux32/linux32_proto.h.orig
|
|
+++ sys/amd64/linux32/linux32_proto.h
|
|
@@ -992,7 +992,7 @@
|
|
};
|
|
struct linux_get_robust_list_args {
|
|
char pid_l_[PADL_(l_int)]; l_int pid; char pid_r_[PADR_(l_int)];
|
|
- char head_l_[PADL_(struct linux_robust_list_head *)]; struct linux_robust_list_head * head; char head_r_[PADR_(struct linux_robust_list_head *)];
|
|
+ char head_l_[PADL_(struct linux_robust_list_head **)]; struct linux_robust_list_head ** head; char head_r_[PADR_(struct linux_robust_list_head **)];
|
|
char len_l_[PADL_(l_size_t *)]; l_size_t * len; char len_r_[PADR_(l_size_t *)];
|
|
};
|
|
struct linux_splice_args {
|
|
--- sys/amd64/linux32/linux32_systrace_args.c.orig
|
|
+++ sys/amd64/linux32/linux32_systrace_args.c
|
|
@@ -2088,7 +2088,7 @@
|
|
case 312: {
|
|
struct linux_get_robust_list_args *p = params;
|
|
iarg[0] = p->pid; /* l_int */
|
|
- uarg[1] = (intptr_t) p->head; /* struct linux_robust_list_head * */
|
|
+ uarg[1] = (intptr_t) p->head; /* struct linux_robust_list_head ** */
|
|
uarg[2] = (intptr_t) p->len; /* l_size_t * */
|
|
*n_args = 3;
|
|
break;
|
|
@@ -5363,7 +5363,7 @@
|
|
p = "l_int";
|
|
break;
|
|
case 1:
|
|
- p = "struct linux_robust_list_head *";
|
|
+ p = "struct linux_robust_list_head **";
|
|
break;
|
|
case 2:
|
|
p = "l_size_t *";
|
|
--- sys/amd64/linux32/syscalls.master.orig
|
|
+++ sys/amd64/linux32/syscalls.master
|
|
@@ -512,8 +512,8 @@
|
|
; linux 2.6.17:
|
|
311 AUE_NULL STD { int linux_set_robust_list(struct linux_robust_list_head *head, \
|
|
l_size_t len); }
|
|
-312 AUE_NULL STD { int linux_get_robust_list(l_int pid, struct linux_robust_list_head *head, \
|
|
- l_size_t *len); }
|
|
+312 AUE_NULL STD { int linux_get_robust_list(l_int pid, \
|
|
+ struct linux_robust_list_head **head, l_size_t *len); }
|
|
313 AUE_NULL STD { int linux_splice(void); }
|
|
314 AUE_NULL STD { int linux_sync_file_range(void); }
|
|
315 AUE_NULL STD { int linux_tee(void); }
|
|
--- sys/compat/linux/linux_futex.c.orig
|
|
+++ sys/compat/linux/linux_futex.c
|
|
@@ -1090,7 +1090,7 @@
|
|
return (EFAULT);
|
|
}
|
|
|
|
- error = copyout(head, args->head, sizeof(struct linux_robust_list_head));
|
|
+ error = copyout(&head, args->head, sizeof(head));
|
|
if (error) {
|
|
LIN_SDT_PROBE1(futex, linux_get_robust_list, copyout_error,
|
|
error);
|
|
--- sys/i386/linux/syscalls.master.orig
|
|
+++ sys/i386/linux/syscalls.master
|
|
@@ -520,8 +520,8 @@
|
|
; linux 2.6.17:
|
|
311 AUE_NULL STD { int linux_set_robust_list(struct linux_robust_list_head *head, \
|
|
l_size_t len); }
|
|
-312 AUE_NULL STD { int linux_get_robust_list(l_int pid, struct linux_robust_list_head **head, \
|
|
- l_size_t *len); }
|
|
+312 AUE_NULL STD { int linux_get_robust_list(l_int pid, \
|
|
+ struct linux_robust_list_head **head, l_size_t *len); }
|
|
313 AUE_NULL STD { int linux_splice(void); }
|
|
314 AUE_NULL STD { int linux_sync_file_range(void); }
|
|
315 AUE_NULL STD { int linux_tee(void); }
|