[src/trunk]: src/sys/compat/linux/arch/arm regen

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d3a00c251176
branches:  trunk
changeset: 820796:d3a00c251176
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 15 15:19:33 2017 +0000

description:
regen

diffstat:

 sys/compat/linux/arch/arm/linux_syscall.h       |  2 +-
 sys/compat/linux/arch/arm/linux_syscallargs.h   |  2 +-
 sys/compat/linux/arch/arm/linux_syscalls.c      |  4 ++--
 sys/compat/linux/arch/arm/linux_sysent.c        |  4 ++--
 sys/compat/linux/arch/arm/linux_systrace_args.c |  6 +++++-
 5 files changed, 11 insertions(+), 7 deletions(-)

diffs (75 lines):

diff -r 2cc15dd625c9 -r d3a00c251176 sys/compat/linux/arch/arm/linux_syscall.h
--- a/sys/compat/linux/arch/arm/linux_syscall.h Sun Jan 15 15:18:52 2017 +0000
+++ b/sys/compat/linux/arch/arm/linux_syscall.h Sun Jan 15 15:19:33 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_syscall.h,v 1.72 2017/01/13 06:18:31 christos Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.73 2017/01/15 15:19:33 christos Exp $ */
 
 /*
  * System call numbers.
diff -r 2cc15dd625c9 -r d3a00c251176 sys/compat/linux/arch/arm/linux_syscallargs.h
--- a/sys/compat/linux/arch/arm/linux_syscallargs.h     Sun Jan 15 15:18:52 2017 +0000
+++ b/sys/compat/linux/arch/arm/linux_syscallargs.h     Sun Jan 15 15:19:33 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_syscallargs.h,v 1.72 2017/01/13 06:18:31 christos Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.73 2017/01/15 15:19:33 christos Exp $ */
 
 /*
  * System call argument lists.
diff -r 2cc15dd625c9 -r d3a00c251176 sys/compat/linux/arch/arm/linux_syscalls.c
--- a/sys/compat/linux/arch/arm/linux_syscalls.c        Sun Jan 15 15:18:52 2017 +0000
+++ b/sys/compat/linux/arch/arm/linux_syscalls.c        Sun Jan 15 15:19:33 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_syscalls.c,v 1.72 2017/01/13 06:18:31 christos Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.73 2017/01/15 15:19:33 christos Exp $ */
 
 /*
  * System call names.
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.72 2017/01/13 06:18:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.73 2017/01/15 15:19:33 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include <sys/param.h>
diff -r 2cc15dd625c9 -r d3a00c251176 sys/compat/linux/arch/arm/linux_sysent.c
--- a/sys/compat/linux/arch/arm/linux_sysent.c  Sun Jan 15 15:18:52 2017 +0000
+++ b/sys/compat/linux/arch/arm/linux_sysent.c  Sun Jan 15 15:19:33 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sysent.c,v 1.72 2017/01/13 06:18:31 christos Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.73 2017/01/15 15:19:33 christos Exp $ */
 
 /*
  * System call switch table.
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.72 2017/01/13 06:18:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.73 2017/01/15 15:19:33 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/poll.h>
diff -r 2cc15dd625c9 -r d3a00c251176 sys/compat/linux/arch/arm/linux_systrace_args.c
--- a/sys/compat/linux/arch/arm/linux_systrace_args.c   Sun Jan 15 15:18:52 2017 +0000
+++ b/sys/compat/linux/arch/arm/linux_systrace_args.c   Sun Jan 15 15:19:33 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_systrace_args.c,v 1.5 2017/01/15 11:46:21 martin Exp $ */
+/* $NetBSD: linux_systrace_args.c,v 1.6 2017/01/15 15:19:33 christos Exp $ */
 
 /*
  * System call argument to DTrace register array converstion.
@@ -302,7 +302,11 @@
        case 48: {
                const struct linux_sys_signal_args *p = params;
                iarg[0] = SCARG(p, signum); /* int */
+<<<<<<< linux_systrace_args.c
+               uarg[1] = (intptr_t) SCARG(p, handler).i32; /* linux_handler_t */
+=======
                iarg[1] = (intptr_t) SCARG(p, handler); /* linux_handler_t */
+>>>>>>> 1.5
                *n_args = 2;
                break;
        }