summaryrefslogtreecommitdiff
path: root/sys/compat/linux/arch/arm
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2017-01-15 15:19:33 +0000
committerchristos <christos@NetBSD.org>2017-01-15 15:19:33 +0000
commit6f3d78076b0f7d2ca83e08852e043c0c4caf8f4e (patch)
treed2ddda2ddc2f3a83fbdbdb11d4c0556208779a49 /sys/compat/linux/arch/arm
parent787c9b4b03cc804379ad6b0c8f1cee437a79bc59 (diff)
regen
Diffstat (limited to 'sys/compat/linux/arch/arm')
-rw-r--r--sys/compat/linux/arch/arm/linux_syscall.h2
-rw-r--r--sys/compat/linux/arch/arm/linux_syscallargs.h2
-rw-r--r--sys/compat/linux/arch/arm/linux_syscalls.c4
-rw-r--r--sys/compat/linux/arch/arm/linux_sysent.c4
-rw-r--r--sys/compat/linux/arch/arm/linux_systrace_args.c6
5 files changed, 11 insertions, 7 deletions
diff --git a/sys/compat/linux/arch/arm/linux_syscall.h b/sys/compat/linux/arch/arm/linux_syscall.h
index 0b800bdb8cf..29ae245e509 100644
--- a/sys/compat/linux/arch/arm/linux_syscall.h
+++ b/sys/compat/linux/arch/arm/linux_syscall.h
@@ -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 --git a/sys/compat/linux/arch/arm/linux_syscallargs.h b/sys/compat/linux/arch/arm/linux_syscallargs.h
index eedb4ba9690..66606006e9d 100644
--- a/sys/compat/linux/arch/arm/linux_syscallargs.h
+++ b/sys/compat/linux/arch/arm/linux_syscallargs.h
@@ -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 --git a/sys/compat/linux/arch/arm/linux_syscalls.c b/sys/compat/linux/arch/arm/linux_syscalls.c
index ae09d875bca..09b86100fa9 100644
--- a/sys/compat/linux/arch/arm/linux_syscalls.c
+++ b/sys/compat/linux/arch/arm/linux_syscalls.c
@@ -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 --git a/sys/compat/linux/arch/arm/linux_sysent.c b/sys/compat/linux/arch/arm/linux_sysent.c
index e0293f72f70..fcf747f0a63 100644
--- a/sys/compat/linux/arch/arm/linux_sysent.c
+++ b/sys/compat/linux/arch/arm/linux_sysent.c
@@ -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 --git a/sys/compat/linux/arch/arm/linux_systrace_args.c b/sys/compat/linux/arch/arm/linux_systrace_args.c
index 4f9fd9a3100..4c6ac80bdc0 100644
--- a/sys/compat/linux/arch/arm/linux_systrace_args.c
+++ b/sys/compat/linux/arch/arm/linux_systrace_args.c
@@ -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 @@ systrace_args(register_t sysnum, const void *params, uintptr_t *uarg, size_t *n_
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;
}