Module Name: src
Committed By: christos
Date: Sun Jan 15 15:20:15 UTC 2017
Modified Files:
src/sys/compat/linux/arch/arm: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c linux_systrace_args.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/compat/linux/arch/arm/linux_syscall.h \
src/sys/compat/linux/arch/arm/linux_syscallargs.h \
src/sys/compat/linux/arch/arm/linux_syscalls.c \
src/sys/compat/linux/arch/arm/linux_sysent.c
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/linux/arch/arm/linux_systrace_args.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/arm/linux_syscall.h
diff -u src/sys/compat/linux/arch/arm/linux_syscall.h:1.73 src/sys/compat/linux/arch/arm/linux_syscall.h:1.74
--- src/sys/compat/linux/arch/arm/linux_syscall.h:1.73 Sun Jan 15 10:19:33 2017
+++ src/sys/compat/linux/arch/arm/linux_syscall.h Sun Jan 15 10:20:15 2017
@@ -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.
Index: src/sys/compat/linux/arch/arm/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/arm/linux_syscallargs.h:1.73 src/sys/compat/linux/arch/arm/linux_syscallargs.h:1.74
--- src/sys/compat/linux/arch/arm/linux_syscallargs.h:1.73 Sun Jan 15 10:19:33 2017
+++ src/sys/compat/linux/arch/arm/linux_syscallargs.h Sun Jan 15 10:20:15 2017
@@ -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.
Index: src/sys/compat/linux/arch/arm/linux_syscalls.c
diff -u src/sys/compat/linux/arch/arm/linux_syscalls.c:1.73 src/sys/compat/linux/arch/arm/linux_syscalls.c:1.74
--- src/sys/compat/linux/arch/arm/linux_syscalls.c:1.73 Sun Jan 15 10:19:33 2017
+++ src/sys/compat/linux/arch/arm/linux_syscalls.c Sun Jan 15 10:20:15 2017
@@ -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>
Index: src/sys/compat/linux/arch/arm/linux_sysent.c
diff -u src/sys/compat/linux/arch/arm/linux_sysent.c:1.73 src/sys/compat/linux/arch/arm/linux_sysent.c:1.74
--- src/sys/compat/linux/arch/arm/linux_sysent.c:1.73 Sun Jan 15 10:19:33 2017
+++ src/sys/compat/linux/arch/arm/linux_sysent.c Sun Jan 15 10:20:15 2017
@@ -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>
Index: src/sys/compat/linux/arch/arm/linux_systrace_args.c
diff -u src/sys/compat/linux/arch/arm/linux_systrace_args.c:1.6 src/sys/compat/linux/arch/arm/linux_systrace_args.c:1.7
--- src/sys/compat/linux/arch/arm/linux_systrace_args.c:1.6 Sun Jan 15 10:19:33 2017
+++ src/sys/compat/linux/arch/arm/linux_systrace_args.c Sun Jan 15 10:20:15 2017
@@ -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 v
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;
}
