Author: jkim
Date: Mon Apr 16 21:24:23 2012
New Revision: 234354
URL: http://svn.freebsd.org/changeset/base/234354

Log:
  Regen for r234352.

Modified:
  head/sys/amd64/linux32/linux32_proto.h
  head/sys/amd64/linux32/linux32_syscall.h
  head/sys/amd64/linux32/linux32_syscalls.c
  head/sys/amd64/linux32/linux32_sysent.c
  head/sys/amd64/linux32/linux32_systrace_args.c
  head/sys/i386/linux/linux_proto.h
  head/sys/i386/linux/linux_syscall.h
  head/sys/i386/linux/linux_syscalls.c
  head/sys/i386/linux/linux_sysent.c
  head/sys/i386/linux/linux_systrace_args.c

Modified: head/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- head/sys/amd64/linux32/linux32_proto.h      Mon Apr 16 21:23:25 2012        
(r234353)
+++ head/sys/amd64/linux32/linux32_proto.h      Mon Apr 16 21:24:23 2012        
(r234354)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 232799 
2012-03-10 23:10:18Z netchild 
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 234352 
2012-04-16 21:22:02Z jkim 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
@@ -153,7 +153,7 @@ struct linux_rmdir_args {
        char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
 };
 struct linux_pipe_args {
-       char pipefds_l_[PADL_(l_ulong *)]; l_ulong * pipefds; char 
pipefds_r_[PADR_(l_ulong *)];
+       char pipefds_l_[PADL_(l_int *)]; l_int * pipefds; char 
pipefds_r_[PADR_(l_int *)];
 };
 struct linux_times_args {
        char buf_l_[PADL_(struct l_times_argv *)]; struct l_times_argv * buf; 
char buf_r_[PADR_(struct l_times_argv *)];
@@ -1046,7 +1046,8 @@ struct linux_dup3_args {
        register_t dummy;
 };
 struct linux_pipe2_args {
-       register_t dummy;
+       char pipefds_l_[PADL_(l_int *)]; l_int * pipefds; char 
pipefds_r_[PADR_(l_int *)];
+       char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
 };
 struct linux_inotify_init1_args {
        register_t dummy;

Modified: head/sys/amd64/linux32/linux32_syscall.h
==============================================================================
--- head/sys/amd64/linux32/linux32_syscall.h    Mon Apr 16 21:23:25 2012        
(r234353)
+++ head/sys/amd64/linux32/linux32_syscall.h    Mon Apr 16 21:24:23 2012        
(r234354)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 232799 
2012-03-10 23:10:18Z netchild 
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 234352 
2012-04-16 21:22:02Z jkim 
  */
 
 #define        LINUX_SYS_exit  1

Modified: head/sys/amd64/linux32/linux32_syscalls.c
==============================================================================
--- head/sys/amd64/linux32/linux32_syscalls.c   Mon Apr 16 21:23:25 2012        
(r234353)
+++ head/sys/amd64/linux32/linux32_syscalls.c   Mon Apr 16 21:24:23 2012        
(r234354)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 232799 
2012-03-10 23:10:18Z netchild 
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 234352 
2012-04-16 21:22:02Z jkim 
  */
 
 const char *linux_syscallnames[] = {

Modified: head/sys/amd64/linux32/linux32_sysent.c
==============================================================================
--- head/sys/amd64/linux32/linux32_sysent.c     Mon Apr 16 21:23:25 2012        
(r234353)
+++ head/sys/amd64/linux32/linux32_sysent.c     Mon Apr 16 21:24:23 2012        
(r234354)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 232799 
2012-03-10 23:10:18Z netchild 
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 234352 
2012-04-16 21:22:02Z jkim 
  */
 
 #include "opt_compat.h"
@@ -350,7 +350,7 @@ struct sysent linux_sysent[] = {
        { 0, (sy_call_t *)linux_eventfd2, AUE_NULL, NULL, 0, 0, 0, 
SY_THR_STATIC },     /* 328 = linux_eventfd2 */
        { 0, (sy_call_t *)linux_epoll_create1, AUE_NULL, NULL, 0, 0, 0, 
SY_THR_STATIC },        /* 329 = linux_epoll_create1 */
        { 0, (sy_call_t *)linux_dup3, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, 
/* 330 = linux_dup3 */
-       { 0, (sy_call_t *)linux_pipe2, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC 
},        /* 331 = linux_pipe2 */
+       { AS(linux_pipe2_args), (sy_call_t *)linux_pipe2, AUE_NULL, NULL, 0, 0, 
0, SY_THR_STATIC },     /* 331 = linux_pipe2 */
        { 0, (sy_call_t *)linux_inotify_init1, AUE_NULL, NULL, 0, 0, 0, 
SY_THR_STATIC },        /* 332 = linux_inotify_init1 */
        { 0, (sy_call_t *)linux_preadv, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC 
},       /* 333 = linux_preadv */
        { 0, (sy_call_t *)linux_pwritev, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC 
},      /* 334 = linux_pwritev */

Modified: head/sys/amd64/linux32/linux32_systrace_args.c
==============================================================================
--- head/sys/amd64/linux32/linux32_systrace_args.c      Mon Apr 16 21:23:25 
2012        (r234353)
+++ head/sys/amd64/linux32/linux32_systrace_args.c      Mon Apr 16 21:24:23 
2012        (r234354)
@@ -287,7 +287,7 @@ systrace_args(int sysnum, void *params, 
        /* linux_pipe */
        case 42: {
                struct linux_pipe_args *p = params;
-               uarg[0] = (intptr_t) p->pipefds; /* l_ulong * */
+               uarg[0] = (intptr_t) p->pipefds; /* l_int * */
                *n_args = 1;
                break;
        }
@@ -2172,7 +2172,10 @@ systrace_args(int sysnum, void *params, 
        }
        /* linux_pipe2 */
        case 331: {
-               *n_args = 0;
+               struct linux_pipe2_args *p = params;
+               uarg[0] = (intptr_t) p->pipefds; /* l_int * */
+               iarg[1] = p->flags; /* l_int */
+               *n_args = 2;
                break;
        }
        /* linux_inotify_init1 */
@@ -2689,7 +2692,7 @@ systrace_entry_setargdesc(int sysnum, in
        case 42:
                switch(ndx) {
                case 0:
-                       p = "l_ulong *";
+                       p = "l_int *";
                        break;
                default:
                        break;
@@ -5368,6 +5371,16 @@ systrace_entry_setargdesc(int sysnum, in
                break;
        /* linux_pipe2 */
        case 331:
+               switch(ndx) {
+               case 0:
+                       p = "l_int *";
+                       break;
+               case 1:
+                       p = "l_int";
+                       break;
+               default:
+                       break;
+               };
                break;
        /* linux_inotify_init1 */
        case 332:
@@ -6621,6 +6634,9 @@ systrace_return_setargdesc(int sysnum, i
        case 330:
        /* linux_pipe2 */
        case 331:
+               if (ndx == 0 || ndx == 1)
+                       p = "int";
+               break;
        /* linux_inotify_init1 */
        case 332:
        /* linux_preadv */

Modified: head/sys/i386/linux/linux_proto.h
==============================================================================
--- head/sys/i386/linux/linux_proto.h   Mon Apr 16 21:23:25 2012        
(r234353)
+++ head/sys/i386/linux/linux_proto.h   Mon Apr 16 21:24:23 2012        
(r234354)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/i386/linux/syscalls.master 232799 2012-03-10 
23:10:18Z netchild 
+ * created from FreeBSD: head/sys/i386/linux/syscalls.master 234352 2012-04-16 
21:22:02Z jkim 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
@@ -157,7 +157,7 @@ struct linux_rmdir_args {
        char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
 };
 struct linux_pipe_args {
-       char pipefds_l_[PADL_(l_ulong *)]; l_ulong * pipefds; char 
pipefds_r_[PADR_(l_ulong *)];
+       char pipefds_l_[PADL_(l_int *)]; l_int * pipefds; char 
pipefds_r_[PADR_(l_int *)];
 };
 struct linux_times_args {
        char buf_l_[PADL_(struct l_times_argv *)]; struct l_times_argv * buf; 
char buf_r_[PADR_(struct l_times_argv *)];
@@ -1065,7 +1065,8 @@ struct linux_dup3_args {
        register_t dummy;
 };
 struct linux_pipe2_args {
-       register_t dummy;
+       char pipefds_l_[PADL_(l_int *)]; l_int * pipefds; char 
pipefds_r_[PADR_(l_int *)];
+       char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
 };
 struct linux_inotify_init1_args {
        register_t dummy;

Modified: head/sys/i386/linux/linux_syscall.h
==============================================================================
--- head/sys/i386/linux/linux_syscall.h Mon Apr 16 21:23:25 2012        
(r234353)
+++ head/sys/i386/linux/linux_syscall.h Mon Apr 16 21:24:23 2012        
(r234354)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/i386/linux/syscalls.master 232799 2012-03-10 
23:10:18Z netchild 
+ * created from FreeBSD: head/sys/i386/linux/syscalls.master 234352 2012-04-16 
21:22:02Z jkim 
  */
 
 #define        LINUX_SYS_exit  1

Modified: head/sys/i386/linux/linux_syscalls.c
==============================================================================
--- head/sys/i386/linux/linux_syscalls.c        Mon Apr 16 21:23:25 2012        
(r234353)
+++ head/sys/i386/linux/linux_syscalls.c        Mon Apr 16 21:24:23 2012        
(r234354)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/i386/linux/syscalls.master 232799 2012-03-10 
23:10:18Z netchild 
+ * created from FreeBSD: head/sys/i386/linux/syscalls.master 234352 2012-04-16 
21:22:02Z jkim 
  */
 
 const char *linux_syscallnames[] = {

Modified: head/sys/i386/linux/linux_sysent.c
==============================================================================
--- head/sys/i386/linux/linux_sysent.c  Mon Apr 16 21:23:25 2012        
(r234353)
+++ head/sys/i386/linux/linux_sysent.c  Mon Apr 16 21:24:23 2012        
(r234354)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/i386/linux/syscalls.master 232799 2012-03-10 
23:10:18Z netchild 
+ * created from FreeBSD: head/sys/i386/linux/syscalls.master 234352 2012-04-16 
21:22:02Z jkim 
  */
 
 #include <sys/param.h>
@@ -349,7 +349,7 @@ struct sysent linux_sysent[] = {
        { 0, (sy_call_t *)linux_eventfd2, AUE_NULL, NULL, 0, 0, 0, 
SY_THR_STATIC },     /* 328 = linux_eventfd2 */
        { 0, (sy_call_t *)linux_epoll_create1, AUE_NULL, NULL, 0, 0, 0, 
SY_THR_STATIC },        /* 329 = linux_epoll_create1 */
        { 0, (sy_call_t *)linux_dup3, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, 
/* 330 = linux_dup3 */
-       { 0, (sy_call_t *)linux_pipe2, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC 
},        /* 331 = linux_pipe2 */
+       { AS(linux_pipe2_args), (sy_call_t *)linux_pipe2, AUE_NULL, NULL, 0, 0, 
0, SY_THR_STATIC },     /* 331 = linux_pipe2 */
        { 0, (sy_call_t *)linux_inotify_init1, AUE_NULL, NULL, 0, 0, 0, 
SY_THR_STATIC },        /* 332 = linux_inotify_init1 */
        { 0, (sy_call_t *)linux_preadv, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC 
},       /* 333 = linux_preadv */
        { 0, (sy_call_t *)linux_pwritev, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC 
},      /* 334 = linux_pwritev */

Modified: head/sys/i386/linux/linux_systrace_args.c
==============================================================================
--- head/sys/i386/linux/linux_systrace_args.c   Mon Apr 16 21:23:25 2012        
(r234353)
+++ head/sys/i386/linux/linux_systrace_args.c   Mon Apr 16 21:24:23 2012        
(r234354)
@@ -295,7 +295,7 @@ systrace_args(int sysnum, void *params, 
        /* linux_pipe */
        case 42: {
                struct linux_pipe_args *p = params;
-               uarg[0] = (intptr_t) p->pipefds; /* l_ulong * */
+               uarg[0] = (intptr_t) p->pipefds; /* l_int * */
                *n_args = 1;
                break;
        }
@@ -2263,7 +2263,10 @@ systrace_args(int sysnum, void *params, 
        }
        /* linux_pipe2 */
        case 331: {
-               *n_args = 0;
+               struct linux_pipe2_args *p = params;
+               uarg[0] = (intptr_t) p->pipefds; /* l_int * */
+               iarg[1] = p->flags; /* l_int */
+               *n_args = 2;
                break;
        }
        /* linux_inotify_init1 */
@@ -2793,7 +2796,7 @@ systrace_entry_setargdesc(int sysnum, in
        case 42:
                switch(ndx) {
                case 0:
-                       p = "l_ulong *";
+                       p = "l_int *";
                        break;
                default:
                        break;
@@ -5664,6 +5667,16 @@ systrace_entry_setargdesc(int sysnum, in
                break;
        /* linux_pipe2 */
        case 331:
+               switch(ndx) {
+               case 0:
+                       p = "l_int *";
+                       break;
+               case 1:
+                       p = "l_int";
+                       break;
+               default:
+                       break;
+               };
                break;
        /* linux_inotify_init1 */
        case 332:
@@ -6979,6 +6992,9 @@ systrace_return_setargdesc(int sysnum, i
        case 330:
        /* linux_pipe2 */
        case 331:
+               if (ndx == 0 || ndx == 1)
+                       p = "int";
+               break;
        /* linux_inotify_init1 */
        case 332:
        /* linux_preadv */
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to