summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2017-01-15 15:20:15 +0000
committerchristos <christos@NetBSD.org>2017-01-15 15:20:15 +0000
commitff99c8d55d02d91bf47f5cb927efda70f98ceeb7 (patch)
treeacfc83fad3e321096ee577afbd563e49380d1c1f
parent6f3d78076b0f7d2ca83e08852e043c0c4caf8f4e (diff)
regen
-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, 7 insertions, 11 deletions
diff --git a/sys/compat/linux/arch/arm/linux_syscall.h b/sys/compat/linux/arch/arm/linux_syscall.h
index 29ae245e509..c7528186b5a 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.73 2017/01/15 15:19:33 christos Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.74 2017/01/15 15:20:15 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 66606006e9d..7db57665639 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.73 2017/01/15 15:19:33 christos Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.74 2017/01/15 15:20:15 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 09b86100fa9..a3d797aad38 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.73 2017/01/15 15:19:33 christos Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.74 2017/01/15 15:20:15 christos Exp $ */
/*
* System call names.
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.73 2017/01/15 15:19:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.74 2017/01/15 15:20:15 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 fcf747f0a63..4e9e42dd320 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.73 2017/01/15 15:19:33 christos Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.74 2017/01/15 15:20:15 christos Exp $ */
/*
* System call switch table.
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.73 2017/01/15 15:19:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.74 2017/01/15 15:20:15 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 4c6ac80bdc0..a166f87727c 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.6 2017/01/15 15:19:33 christos Exp $ */
+/* $NetBSD: linux_systrace_args.c,v 1.7 2017/01/15 15:20:15 christos Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -302,11 +302,7 @@ 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;
}