svn commit: r297301 - in stable/10/sys: amd64/linux32 i386/linux
Dmitry Chagin
dchagin at FreeBSD.org
Sun Mar 27 06:17:22 UTC 2016
Author: dchagin
Date: Sun Mar 27 06:17:19 2016
New Revision: 297301
URL: https://svnweb.freebsd.org/changeset/base/297301
Log:
MFC r297062:
Regen for r297061 (fstatfs64 Linux syscall).
Modified:
stable/10/sys/amd64/linux32/linux32_proto.h
stable/10/sys/amd64/linux32/linux32_syscall.h
stable/10/sys/amd64/linux32/linux32_syscalls.c
stable/10/sys/amd64/linux32/linux32_sysent.c
stable/10/sys/amd64/linux32/linux32_systrace_args.c
stable/10/sys/i386/linux/linux_proto.h
stable/10/sys/i386/linux/linux_syscall.h
stable/10/sys/i386/linux/linux_syscalls.c
stable/10/sys/i386/linux/linux_sysent.c
stable/10/sys/i386/linux/linux_systrace_args.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- stable/10/sys/amd64/linux32/linux32_proto.h Sun Mar 27 06:10:51 2016 (r297300)
+++ stable/10/sys/amd64/linux32/linux32_proto.h Sun Mar 27 06:17:19 2016 (r297301)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 294368 2016-01-20 01:09:53Z jhb
+ * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 297300 2016-03-27 06:10:51Z dchagin
*/
#ifndef _LINUX32_SYSPROTO_H_
@@ -844,7 +844,9 @@ struct linux_statfs64_args {
char buf_l_[PADL_(struct l_statfs64_buf *)]; struct l_statfs64_buf * buf; char buf_r_[PADR_(struct l_statfs64_buf *)];
};
struct linux_fstatfs64_args {
- register_t dummy;
+ char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)];
+ char bufsize_l_[PADL_(size_t)]; size_t bufsize; char bufsize_r_[PADR_(size_t)];
+ char buf_l_[PADL_(struct l_statfs64_buf *)]; struct l_statfs64_buf * buf; char buf_r_[PADR_(struct l_statfs64_buf *)];
};
struct linux_tgkill_args {
char tgid_l_[PADL_(int)]; int tgid; char tgid_r_[PADR_(int)];
Modified: stable/10/sys/amd64/linux32/linux32_syscall.h
==============================================================================
--- stable/10/sys/amd64/linux32/linux32_syscall.h Sun Mar 27 06:10:51 2016 (r297300)
+++ stable/10/sys/amd64/linux32/linux32_syscall.h Sun Mar 27 06:17:19 2016 (r297301)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 294368 2016-01-20 01:09:53Z jhb
+ * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 297300 2016-03-27 06:10:51Z dchagin
*/
#define LINUX32_SYS_linux_exit 1
Modified: stable/10/sys/amd64/linux32/linux32_syscalls.c
==============================================================================
--- stable/10/sys/amd64/linux32/linux32_syscalls.c Sun Mar 27 06:10:51 2016 (r297300)
+++ stable/10/sys/amd64/linux32/linux32_syscalls.c Sun Mar 27 06:17:19 2016 (r297301)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 294368 2016-01-20 01:09:53Z jhb
+ * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 297300 2016-03-27 06:10:51Z dchagin
*/
const char *linux32_syscallnames[] = {
Modified: stable/10/sys/amd64/linux32/linux32_sysent.c
==============================================================================
--- stable/10/sys/amd64/linux32/linux32_sysent.c Sun Mar 27 06:10:51 2016 (r297300)
+++ stable/10/sys/amd64/linux32/linux32_sysent.c Sun Mar 27 06:17:19 2016 (r297301)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 294368 2016-01-20 01:09:53Z jhb
+ * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 297300 2016-03-27 06:10:51Z dchagin
*/
#include "opt_compat.h"
@@ -288,7 +288,7 @@ struct sysent linux32_sysent[] = {
{ AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 266 = linux_clock_getres */
{ AS(linux_clock_nanosleep_args), (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 267 = linux_clock_nanosleep */
{ AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_STATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 268 = linux_statfs64 */
- { 0, (sy_call_t *)linux_fstatfs64, AUE_FSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 269 = linux_fstatfs64 */
+ { AS(linux_fstatfs64_args), (sy_call_t *)linux_fstatfs64, AUE_FSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 269 = linux_fstatfs64 */
{ AS(linux_tgkill_args), (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 270 = linux_tgkill */
{ AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES, NULL, 0, 0, 0, SY_THR_STATIC }, /* 271 = linux_utimes */
{ AS(linux_fadvise64_64_args), (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 272 = linux_fadvise64_64 */
Modified: stable/10/sys/amd64/linux32/linux32_systrace_args.c
==============================================================================
--- stable/10/sys/amd64/linux32/linux32_systrace_args.c Sun Mar 27 06:10:51 2016 (r297300)
+++ stable/10/sys/amd64/linux32/linux32_systrace_args.c Sun Mar 27 06:17:19 2016 (r297301)
@@ -1820,7 +1820,11 @@ systrace_args(int sysnum, void *params,
}
/* linux_fstatfs64 */
case 269: {
- *n_args = 0;
+ struct linux_fstatfs64_args *p = params;
+ iarg[0] = p->fd; /* l_uint */
+ uarg[1] = p->bufsize; /* size_t */
+ uarg[2] = (intptr_t) p->buf; /* struct l_statfs64_buf * */
+ *n_args = 3;
break;
}
/* linux_tgkill */
@@ -5118,6 +5122,19 @@ systrace_entry_setargdesc(int sysnum, in
break;
/* linux_fstatfs64 */
case 269:
+ switch(ndx) {
+ case 0:
+ p = "l_uint";
+ break;
+ case 1:
+ p = "size_t";
+ break;
+ case 2:
+ p = "struct l_statfs64_buf *";
+ break;
+ default:
+ break;
+ };
break;
/* linux_tgkill */
case 270:
@@ -6878,6 +6895,9 @@ systrace_return_setargdesc(int sysnum, i
break;
/* linux_fstatfs64 */
case 269:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_tgkill */
case 270:
if (ndx == 0 || ndx == 1)
Modified: stable/10/sys/i386/linux/linux_proto.h
==============================================================================
--- stable/10/sys/i386/linux/linux_proto.h Sun Mar 27 06:10:51 2016 (r297300)
+++ stable/10/sys/i386/linux/linux_proto.h Sun Mar 27 06:17:19 2016 (r297301)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293592 2016-01-09 17:54:37Z dchagin
+ * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 297300 2016-03-27 06:10:51Z dchagin
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -848,7 +848,9 @@ struct linux_statfs64_args {
char buf_l_[PADL_(struct l_statfs64_buf *)]; struct l_statfs64_buf * buf; char buf_r_[PADR_(struct l_statfs64_buf *)];
};
struct linux_fstatfs64_args {
- register_t dummy;
+ char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)];
+ char bufsize_l_[PADL_(size_t)]; size_t bufsize; char bufsize_r_[PADR_(size_t)];
+ char buf_l_[PADL_(struct l_statfs64_buf *)]; struct l_statfs64_buf * buf; char buf_r_[PADR_(struct l_statfs64_buf *)];
};
struct linux_tgkill_args {
char tgid_l_[PADL_(int)]; int tgid; char tgid_r_[PADR_(int)];
Modified: stable/10/sys/i386/linux/linux_syscall.h
==============================================================================
--- stable/10/sys/i386/linux/linux_syscall.h Sun Mar 27 06:10:51 2016 (r297300)
+++ stable/10/sys/i386/linux/linux_syscall.h Sun Mar 27 06:17:19 2016 (r297301)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293592 2016-01-09 17:54:37Z dchagin
+ * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 297300 2016-03-27 06:10:51Z dchagin
*/
#define LINUX_SYS_linux_exit 1
Modified: stable/10/sys/i386/linux/linux_syscalls.c
==============================================================================
--- stable/10/sys/i386/linux/linux_syscalls.c Sun Mar 27 06:10:51 2016 (r297300)
+++ stable/10/sys/i386/linux/linux_syscalls.c Sun Mar 27 06:17:19 2016 (r297301)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293592 2016-01-09 17:54:37Z dchagin
+ * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 297300 2016-03-27 06:10:51Z dchagin
*/
const char *linux_syscallnames[] = {
Modified: stable/10/sys/i386/linux/linux_sysent.c
==============================================================================
--- stable/10/sys/i386/linux/linux_sysent.c Sun Mar 27 06:10:51 2016 (r297300)
+++ stable/10/sys/i386/linux/linux_sysent.c Sun Mar 27 06:17:19 2016 (r297301)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293592 2016-01-09 17:54:37Z dchagin
+ * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 297300 2016-03-27 06:10:51Z dchagin
*/
#include <sys/param.h>
@@ -287,7 +287,7 @@ struct sysent linux_sysent[] = {
{ AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 266 = linux_clock_getres */
{ AS(linux_clock_nanosleep_args), (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 267 = linux_clock_nanosleep */
{ AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_STATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 268 = linux_statfs64 */
- { 0, (sy_call_t *)linux_fstatfs64, AUE_FSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 269 = linux_fstatfs64 */
+ { AS(linux_fstatfs64_args), (sy_call_t *)linux_fstatfs64, AUE_FSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 269 = linux_fstatfs64 */
{ AS(linux_tgkill_args), (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 270 = linux_tgkill */
{ AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES, NULL, 0, 0, 0, SY_THR_STATIC }, /* 271 = linux_utimes */
{ AS(linux_fadvise64_64_args), (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 272 = linux_fadvise64_64 */
Modified: stable/10/sys/i386/linux/linux_systrace_args.c
==============================================================================
--- stable/10/sys/i386/linux/linux_systrace_args.c Sun Mar 27 06:10:51 2016 (r297300)
+++ stable/10/sys/i386/linux/linux_systrace_args.c Sun Mar 27 06:17:19 2016 (r297301)
@@ -1870,7 +1870,11 @@ systrace_args(int sysnum, void *params,
}
/* linux_fstatfs64 */
case 269: {
- *n_args = 0;
+ struct linux_fstatfs64_args *p = params;
+ iarg[0] = p->fd; /* l_uint */
+ uarg[1] = p->bufsize; /* size_t */
+ uarg[2] = (intptr_t) p->buf; /* struct l_statfs64_buf * */
+ *n_args = 3;
break;
}
/* linux_tgkill */
@@ -5265,6 +5269,19 @@ systrace_entry_setargdesc(int sysnum, in
break;
/* linux_fstatfs64 */
case 269:
+ switch(ndx) {
+ case 0:
+ p = "l_uint";
+ break;
+ case 1:
+ p = "size_t";
+ break;
+ case 2:
+ p = "struct l_statfs64_buf *";
+ break;
+ default:
+ break;
+ };
break;
/* linux_tgkill */
case 270:
@@ -7138,6 +7155,9 @@ systrace_return_setargdesc(int sysnum, i
break;
/* linux_fstatfs64 */
case 269:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_tgkill */
case 270:
if (ndx == 0 || ndx == 1)
More information about the svn-src-stable-10
mailing list