Author: dchagin
Date: Sun Jun 5 05:49:33 2016
New Revision: 301422
URL: https://svnweb.freebsd.org/changeset/base/301422
Log:
MFC r300359, r300360:
Correct an argument param of linux_sched_* system calls as a struct
l_sched_param
does not defined due to it's nature.
Modified:
stable/10/sys/amd64/linux/linux_proto.h
stable/10/sys/amd64/linux/linux_systrace_args.c
stable/10/sys/amd64/linux/syscalls.master
stable/10/sys/amd64/linux32/linux32_proto.h
stable/10/sys/amd64/linux32/linux32_systrace_args.c
stable/10/sys/amd64/linux32/syscalls.master
stable/10/sys/i386/linux/linux_proto.h
stable/10/sys/i386/linux/linux_systrace_args.c
stable/10/sys/i386/linux/syscalls.master
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/amd64/linux/linux_proto.h
==============================================================================
--- stable/10/sys/amd64/linux/linux_proto.h Sun Jun 5 02:17:51 2016
(r301421)
+++ stable/10/sys/amd64/linux/linux_proto.h Sun Jun 5 05:49:33 2016
(r301422)
@@ -524,16 +524,16 @@ struct linux_getpriority_args {
};
struct linux_sched_setparam_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
- char param_l_[PADL_(struct l_sched_param *)]; struct l_sched_param *
param; char param_r_[PADR_(struct l_sched_param *)];
+ char param_l_[PADL_(struct sched_param *)]; struct sched_param * param;
char param_r_[PADR_(struct sched_param *)];
};
struct linux_sched_getparam_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
- char param_l_[PADL_(struct l_sched_param *)]; struct l_sched_param *
param; char param_r_[PADR_(struct l_sched_param *)];
+ char param_l_[PADL_(struct sched_param *)]; struct sched_param * param;
char param_r_[PADR_(struct sched_param *)];
};
struct linux_sched_setscheduler_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
char policy_l_[PADL_(l_int)]; l_int policy; char
policy_r_[PADR_(l_int)];
- char param_l_[PADL_(struct l_sched_param *)]; struct l_sched_param *
param; char param_r_[PADR_(struct l_sched_param *)];
+ char param_l_[PADL_(struct sched_param *)]; struct sched_param * param;
char param_r_[PADR_(struct sched_param *)];
};
struct linux_sched_getscheduler_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
Modified: stable/10/sys/amd64/linux/linux_systrace_args.c
==============================================================================
--- stable/10/sys/amd64/linux/linux_systrace_args.c Sun Jun 5 02:17:51
2016 (r301421)
+++ stable/10/sys/amd64/linux/linux_systrace_args.c Sun Jun 5 05:49:33
2016 (r301422)
@@ -1178,7 +1178,7 @@ systrace_args(int sysnum, void *params,
case 142: {
struct linux_sched_setparam_args *p = params;
iarg[0] = p->pid; /* l_pid_t */
- uarg[1] = (intptr_t) p->param; /* struct l_sched_param * */
+ uarg[1] = (intptr_t) p->param; /* struct sched_param * */
*n_args = 2;
break;
}
@@ -1186,7 +1186,7 @@ systrace_args(int sysnum, void *params,
case 143: {
struct linux_sched_getparam_args *p = params;
iarg[0] = p->pid; /* l_pid_t */
- uarg[1] = (intptr_t) p->param; /* struct l_sched_param * */
+ uarg[1] = (intptr_t) p->param; /* struct sched_param * */
*n_args = 2;
break;
}
@@ -1195,7 +1195,7 @@ systrace_args(int sysnum, void *params,
struct linux_sched_setscheduler_args *p = params;
iarg[0] = p->pid; /* l_pid_t */
iarg[1] = p->policy; /* l_int */
- uarg[2] = (intptr_t) p->param; /* struct l_sched_param * */
+ uarg[2] = (intptr_t) p->param; /* struct sched_param * */
*n_args = 3;
break;
}
@@ -4209,7 +4209,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "l_pid_t";
break;
case 1:
- p = "struct l_sched_param *";
+ p = "struct sched_param *";
break;
default:
break;
@@ -4222,7 +4222,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "l_pid_t";
break;
case 1:
- p = "struct l_sched_param *";
+ p = "struct sched_param *";
break;
default:
break;
@@ -4238,7 +4238,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "l_int";
break;
case 2:
- p = "struct l_sched_param *";
+ p = "struct sched_param *";
break;
default:
break;
Modified: stable/10/sys/amd64/linux/syscalls.master
==============================================================================
--- stable/10/sys/amd64/linux/syscalls.master Sun Jun 5 02:17:51 2016
(r301421)
+++ stable/10/sys/amd64/linux/syscalls.master Sun Jun 5 05:49:33 2016
(r301422)
@@ -283,12 +283,12 @@
141 AUE_SETPRIORITY NOPROTO { int setpriority(int which, int who, \
int prio); }
142 AUE_SCHED_SETPARAM STD { int linux_sched_setparam(l_pid_t pid,
\
- struct l_sched_param *param); }
+ struct sched_param *param); }
143 AUE_SCHED_GETPARAM STD { int linux_sched_getparam(l_pid_t pid,
\
- struct l_sched_param *param); }
+ struct sched_param *param); }
144 AUE_SCHED_SETSCHEDULER STD { int linux_sched_setscheduler( \
l_pid_t pid, l_int policy, \
- struct l_sched_param *param); }
+ struct sched_param *param); }
145 AUE_SCHED_GETSCHEDULER STD { int linux_sched_getscheduler( \
l_pid_t pid); }
146 AUE_SCHED_GET_PRIORITY_MAX STD { int linux_sched_get_priority_max(
\
Modified: stable/10/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- stable/10/sys/amd64/linux32/linux32_proto.h Sun Jun 5 02:17:51 2016
(r301421)
+++ stable/10/sys/amd64/linux32/linux32_proto.h Sun Jun 5 05:49:33 2016
(r301422)
@@ -480,16 +480,16 @@ struct linux_sysctl_args {
};
struct linux_sched_setparam_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
- char param_l_[PADL_(struct l_sched_param *)]; struct l_sched_param *
param; char param_r_[PADR_(struct l_sched_param *)];
+ char param_l_[PADL_(struct sched_param *)]; struct sched_param * param;
char param_r_[PADR_(struct sched_param *)];
};
struct linux_sched_getparam_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
- char param_l_[PADL_(struct l_sched_param *)]; struct l_sched_param *
param; char param_r_[PADR_(struct l_sched_param *)];
+ char param_l_[PADL_(struct sched_param *)]; struct sched_param * param;
char param_r_[PADR_(struct sched_param *)];
};
struct linux_sched_setscheduler_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
char policy_l_[PADL_(l_int)]; l_int policy; char
policy_r_[PADR_(l_int)];
- char param_l_[PADL_(struct l_sched_param *)]; struct l_sched_param *
param; char param_r_[PADR_(struct l_sched_param *)];
+ char param_l_[PADL_(struct sched_param *)]; struct sched_param * param;
char param_r_[PADR_(struct sched_param *)];
};
struct linux_sched_getscheduler_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
Modified: stable/10/sys/amd64/linux32/linux32_systrace_args.c
==============================================================================
--- stable/10/sys/amd64/linux32/linux32_systrace_args.c Sun Jun 5 02:17:51
2016 (r301421)
+++ stable/10/sys/amd64/linux32/linux32_systrace_args.c Sun Jun 5 05:49:33
2016 (r301422)
@@ -1047,7 +1047,7 @@ systrace_args(int sysnum, void *params,
case 154: {
struct linux_sched_setparam_args *p = params;
iarg[0] = p->pid; /* l_pid_t */
- uarg[1] = (intptr_t) p->param; /* struct l_sched_param * */
+ uarg[1] = (intptr_t) p->param; /* struct sched_param * */
*n_args = 2;
break;
}
@@ -1055,7 +1055,7 @@ systrace_args(int sysnum, void *params,
case 155: {
struct linux_sched_getparam_args *p = params;
iarg[0] = p->pid; /* l_pid_t */
- uarg[1] = (intptr_t) p->param; /* struct l_sched_param * */
+ uarg[1] = (intptr_t) p->param; /* struct sched_param * */
*n_args = 2;
break;
}
@@ -1064,7 +1064,7 @@ systrace_args(int sysnum, void *params,
struct linux_sched_setscheduler_args *p = params;
iarg[0] = p->pid; /* l_pid_t */
iarg[1] = p->policy; /* l_int */
- uarg[2] = (intptr_t) p->param; /* struct l_sched_param * */
+ uarg[2] = (intptr_t) p->param; /* struct sched_param * */
*n_args = 3;
break;
}
@@ -3938,7 +3938,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "l_pid_t";
break;
case 1:
- p = "struct l_sched_param *";
+ p = "struct sched_param *";
break;
default:
break;
@@ -3951,7 +3951,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "l_pid_t";
break;
case 1:
- p = "struct l_sched_param *";
+ p = "struct sched_param *";
break;
default:
break;
@@ -3967,7 +3967,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "l_int";
break;
case 2:
- p = "struct l_sched_param *";
+ p = "struct sched_param *";
break;
default:
break;
Modified: stable/10/sys/amd64/linux32/syscalls.master
==============================================================================
--- stable/10/sys/amd64/linux32/syscalls.master Sun Jun 5 02:17:51 2016
(r301421)
+++ stable/10/sys/amd64/linux32/syscalls.master Sun Jun 5 05:49:33 2016
(r301422)
@@ -268,12 +268,12 @@
152 AUE_MLOCKALL NOPROTO { int mlockall(int how); }
153 AUE_MUNLOCKALL NOPROTO { int munlockall(void); }
154 AUE_SCHED_SETPARAM STD { int linux_sched_setparam(l_pid_t pid,
\
- struct l_sched_param *param); }
+ struct sched_param *param); }
155 AUE_SCHED_GETPARAM STD { int linux_sched_getparam(l_pid_t pid,
\
- struct l_sched_param *param); }
+ struct sched_param *param); }
156 AUE_SCHED_SETSCHEDULER STD { int linux_sched_setscheduler( \
l_pid_t pid, l_int policy, \
- struct l_sched_param *param); }
+ struct sched_param *param); }
157 AUE_SCHED_GETSCHEDULER STD { int linux_sched_getscheduler( \
l_pid_t pid); }
158 AUE_NULL NOPROTO { int sched_yield(void); }
Modified: stable/10/sys/i386/linux/linux_proto.h
==============================================================================
--- stable/10/sys/i386/linux/linux_proto.h Sun Jun 5 02:17:51 2016
(r301421)
+++ stable/10/sys/i386/linux/linux_proto.h Sun Jun 5 05:49:33 2016
(r301422)
@@ -478,16 +478,16 @@ struct linux_sysctl_args {
};
struct linux_sched_setparam_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
- char param_l_[PADL_(struct l_sched_param *)]; struct l_sched_param *
param; char param_r_[PADR_(struct l_sched_param *)];
+ char param_l_[PADL_(struct sched_param *)]; struct sched_param * param;
char param_r_[PADR_(struct sched_param *)];
};
struct linux_sched_getparam_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
- char param_l_[PADL_(struct l_sched_param *)]; struct l_sched_param *
param; char param_r_[PADR_(struct l_sched_param *)];
+ char param_l_[PADL_(struct sched_param *)]; struct sched_param * param;
char param_r_[PADR_(struct sched_param *)];
};
struct linux_sched_setscheduler_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
char policy_l_[PADL_(l_int)]; l_int policy; char
policy_r_[PADR_(l_int)];
- char param_l_[PADL_(struct l_sched_param *)]; struct l_sched_param *
param; char param_r_[PADR_(struct l_sched_param *)];
+ char param_l_[PADL_(struct sched_param *)]; struct sched_param * param;
char param_r_[PADR_(struct sched_param *)];
};
struct linux_sched_getscheduler_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
Modified: stable/10/sys/i386/linux/linux_systrace_args.c
==============================================================================
--- stable/10/sys/i386/linux/linux_systrace_args.c Sun Jun 5 02:17:51
2016 (r301421)
+++ stable/10/sys/i386/linux/linux_systrace_args.c Sun Jun 5 05:49:33
2016 (r301422)
@@ -1085,7 +1085,7 @@ systrace_args(int sysnum, void *params,
case 154: {
struct linux_sched_setparam_args *p = params;
iarg[0] = p->pid; /* l_pid_t */
- uarg[1] = (intptr_t) p->param; /* struct l_sched_param * */
+ uarg[1] = (intptr_t) p->param; /* struct sched_param * */
*n_args = 2;
break;
}
@@ -1093,7 +1093,7 @@ systrace_args(int sysnum, void *params,
case 155: {
struct linux_sched_getparam_args *p = params;
iarg[0] = p->pid; /* l_pid_t */
- uarg[1] = (intptr_t) p->param; /* struct l_sched_param * */
+ uarg[1] = (intptr_t) p->param; /* struct sched_param * */
*n_args = 2;
break;
}
@@ -1102,7 +1102,7 @@ systrace_args(int sysnum, void *params,
struct linux_sched_setscheduler_args *p = params;
iarg[0] = p->pid; /* l_pid_t */
iarg[1] = p->policy; /* l_int */
- uarg[2] = (intptr_t) p->param; /* struct l_sched_param * */
+ uarg[2] = (intptr_t) p->param; /* struct sched_param * */
*n_args = 3;
break;
}
@@ -4072,7 +4072,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "l_pid_t";
break;
case 1:
- p = "struct l_sched_param *";
+ p = "struct sched_param *";
break;
default:
break;
@@ -4085,7 +4085,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "l_pid_t";
break;
case 1:
- p = "struct l_sched_param *";
+ p = "struct sched_param *";
break;
default:
break;
@@ -4101,7 +4101,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "l_int";
break;
case 2:
- p = "struct l_sched_param *";
+ p = "struct sched_param *";
break;
default:
break;
Modified: stable/10/sys/i386/linux/syscalls.master
==============================================================================
--- stable/10/sys/i386/linux/syscalls.master Sun Jun 5 02:17:51 2016
(r301421)
+++ stable/10/sys/i386/linux/syscalls.master Sun Jun 5 05:49:33 2016
(r301422)
@@ -270,12 +270,12 @@
152 AUE_MLOCKALL NOPROTO { int mlockall(int how); }
153 AUE_MUNLOCKALL NOPROTO { int munlockall(void); }
154 AUE_SCHED_SETPARAM STD { int linux_sched_setparam(l_pid_t pid,
\
- struct l_sched_param *param); }
+ struct sched_param *param); }
155 AUE_SCHED_GETPARAM STD { int linux_sched_getparam(l_pid_t pid,
\
- struct l_sched_param *param); }
+ struct sched_param *param); }
156 AUE_SCHED_SETSCHEDULER STD { int linux_sched_setscheduler( \
l_pid_t pid, l_int policy, \
- struct l_sched_param *param); }
+ struct sched_param *param); }
157 AUE_SCHED_GETSCHEDULER STD { int linux_sched_getscheduler( \
l_pid_t pid); }
158 AUE_NULL NOPROTO { int sched_yield(void); }
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
