Author: dchagin
Date: Sun Mar 24 14:46:07 2019
New Revision: 345470
URL: https://svnweb.freebsd.org/changeset/base/345470
Log:
Regen for r345469 (shmat()).
MFC after: 1 month
Modified:
head/sys/amd64/linux32/linux32_proto.h
head/sys/amd64/linux32/linux32_systrace_args.c
head/sys/i386/linux/linux_proto.h
head/sys/i386/linux/linux_systrace_args.c
Modified: head/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- head/sys/amd64/linux32/linux32_proto.h Sun Mar 24 14:44:35 2019
(r345469)
+++ head/sys/amd64/linux32/linux32_proto.h Sun Mar 24 14:46:07 2019
(r345470)
@@ -369,9 +369,9 @@ struct linux_ipc_args {
char what_l_[PADL_(l_uint)]; l_uint what; char what_r_[PADR_(l_uint)];
char arg1_l_[PADL_(l_int)]; l_int arg1; char arg1_r_[PADR_(l_int)];
char arg2_l_[PADL_(l_int)]; l_int arg2; char arg2_r_[PADR_(l_int)];
- char arg3_l_[PADL_(l_int)]; l_int arg3; char arg3_r_[PADR_(l_int)];
- char ptr_l_[PADL_(void *)]; void * ptr; char ptr_r_[PADR_(void *)];
- char arg5_l_[PADL_(l_long)]; l_long arg5; char arg5_r_[PADR_(l_long)];
+ char arg3_l_[PADL_(l_uint)]; l_uint arg3; char arg3_r_[PADR_(l_uint)];
+ char ptr_l_[PADL_(l_uintptr_t)]; l_uintptr_t ptr; char
ptr_r_[PADR_(l_uintptr_t)];
+ char arg5_l_[PADL_(l_uint)]; l_uint arg5; char arg5_r_[PADR_(l_uint)];
};
struct linux_sigreturn_args {
char sfp_l_[PADL_(struct l_sigframe *)]; struct l_sigframe * sfp; char
sfp_r_[PADR_(struct l_sigframe *)];
Modified: head/sys/amd64/linux32/linux32_systrace_args.c
==============================================================================
--- head/sys/amd64/linux32/linux32_systrace_args.c Sun Mar 24 14:44:35
2019 (r345469)
+++ head/sys/amd64/linux32/linux32_systrace_args.c Sun Mar 24 14:46:07
2019 (r345470)
@@ -785,9 +785,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
iarg[0] = p->what; /* l_uint */
iarg[1] = p->arg1; /* l_int */
iarg[2] = p->arg2; /* l_int */
- iarg[3] = p->arg3; /* l_int */
- uarg[4] = (intptr_t) p->ptr; /* void * */
- iarg[5] = p->arg5; /* l_long */
+ iarg[3] = p->arg3; /* l_uint */
+ iarg[4] = p->ptr; /* l_uintptr_t */
+ iarg[5] = p->arg5; /* l_uint */
*n_args = 6;
break;
}
@@ -3894,13 +3894,13 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
p = "l_int";
break;
case 3:
- p = "l_int";
+ p = "l_uint";
break;
case 4:
- p = "userland void *";
+ p = "l_uintptr_t";
break;
case 5:
- p = "l_long";
+ p = "l_uint";
break;
default:
break;
Modified: head/sys/i386/linux/linux_proto.h
==============================================================================
--- head/sys/i386/linux/linux_proto.h Sun Mar 24 14:44:35 2019
(r345469)
+++ head/sys/i386/linux/linux_proto.h Sun Mar 24 14:46:07 2019
(r345470)
@@ -372,9 +372,9 @@ struct linux_ipc_args {
char what_l_[PADL_(l_uint)]; l_uint what; char what_r_[PADR_(l_uint)];
char arg1_l_[PADL_(l_int)]; l_int arg1; char arg1_r_[PADR_(l_int)];
char arg2_l_[PADL_(l_int)]; l_int arg2; char arg2_r_[PADR_(l_int)];
- char arg3_l_[PADL_(l_int)]; l_int arg3; char arg3_r_[PADR_(l_int)];
- char ptr_l_[PADL_(void *)]; void * ptr; char ptr_r_[PADR_(void *)];
- char arg5_l_[PADL_(l_long)]; l_long arg5; char arg5_r_[PADR_(l_long)];
+ char arg3_l_[PADL_(l_uint)]; l_uint arg3; char arg3_r_[PADR_(l_uint)];
+ char ptr_l_[PADL_(l_uintptr_t)]; l_uintptr_t ptr; char
ptr_r_[PADR_(l_uintptr_t)];
+ char arg5_l_[PADL_(l_uint)]; l_uint arg5; char arg5_r_[PADR_(l_uint)];
};
struct linux_sigreturn_args {
char sfp_l_[PADL_(struct l_sigframe *)]; struct l_sigframe * sfp; char
sfp_r_[PADR_(struct l_sigframe *)];
Modified: head/sys/i386/linux/linux_systrace_args.c
==============================================================================
--- head/sys/i386/linux/linux_systrace_args.c Sun Mar 24 14:44:35 2019
(r345469)
+++ head/sys/i386/linux/linux_systrace_args.c Sun Mar 24 14:46:07 2019
(r345470)
@@ -814,9 +814,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
iarg[0] = p->what; /* l_uint */
iarg[1] = p->arg1; /* l_int */
iarg[2] = p->arg2; /* l_int */
- iarg[3] = p->arg3; /* l_int */
- uarg[4] = (intptr_t) p->ptr; /* void * */
- iarg[5] = p->arg5; /* l_long */
+ iarg[3] = p->arg3; /* l_uint */
+ iarg[4] = p->ptr; /* l_uintptr_t */
+ iarg[5] = p->arg5; /* l_uint */
*n_args = 6;
break;
}
@@ -4012,13 +4012,13 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
p = "l_int";
break;
case 3:
- p = "l_int";
+ p = "l_uint";
break;
case 4:
- p = "userland void *";
+ p = "l_uintptr_t";
break;
case 5:
- p = "l_long";
+ p = "l_uint";
break;
default:
break;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
