CVS commit: src/usr.sbin/npf
Module Name:src Committed By: taca Date: Thu Dec 17 05:33:06 UTC 2020 Modified Files: src/usr.sbin/npf: npf-params.7 Log Message: Change second gc.interval_min to gc.interval_max. Obviously, second gc.interval_min should be gc.interval_max. Should be pulled up to netbnsd-9. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/npf/npf-params.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/npf/npf-params.7 diff -u src/usr.sbin/npf/npf-params.7:1.7 src/usr.sbin/npf/npf-params.7:1.8 --- src/usr.sbin/npf/npf-params.7:1.7 Sat Jun 6 20:38:00 2020 +++ src/usr.sbin/npf/npf-params.7 Thu Dec 17 05:33:06 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: npf-params.7,v 1.7 2020/06/06 20:38:00 wiz Exp $ +.\" $NetBSD: npf-params.7,v 1.8 2020/12/17 05:33:06 taca Exp $ .\" .\" Copyright (c) 2019 Mindaugas Rasiukevicius .\" All rights reserved. @@ -83,7 +83,7 @@ The worker is self-tuning and will wake connections to expire; it will wake up less frequently, diverging towards the upper bound, if it does not encounter expired connections. Default: 50 (in milliseconds). -.It Li gc.interval_min +.It Li gc.interval_max The upper bound for the sleep time of the G/C worker. Default: 5000 (in milliseconds). .El
CVS commit: [thorpej-futex] src/sys/compat/linux/arch
Module Name:src Committed By: thorpej Date: Thu Dec 17 03:14:36 UTC 2020 Modified Files: src/sys/compat/linux/arch/alpha [thorpej-futex]: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/amd64 [thorpej-futex]: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/arm [thorpej-futex]: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/i386 [thorpej-futex]: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/m68k [thorpej-futex]: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/mips [thorpej-futex]: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/powerpc [thorpej-futex]: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c Log Message: Regen for preadv(2) and pwritev(2). To generate a diff of this commit: cvs rdiff -u -r1.110.2.1 -r1.110.2.2 \ src/sys/compat/linux/arch/alpha/linux_syscall.h \ src/sys/compat/linux/arch/alpha/linux_sysent.c cvs rdiff -u -r1.109.2.1 -r1.109.2.2 \ src/sys/compat/linux/arch/alpha/linux_syscallargs.h cvs rdiff -u -r1.111.2.1 -r1.111.2.2 \ src/sys/compat/linux/arch/alpha/linux_syscalls.c cvs rdiff -u -r1.71.2.1 -r1.71.2.2 \ src/sys/compat/linux/arch/amd64/linux_syscall.h \ src/sys/compat/linux/arch/amd64/linux_syscallargs.h \ src/sys/compat/linux/arch/amd64/linux_syscalls.c \ src/sys/compat/linux/arch/amd64/linux_sysent.c cvs rdiff -u -r1.15.2.1 -r1.15.2.2 \ src/sys/compat/linux/arch/amd64/linux_systrace_args.c cvs rdiff -u -r1.82.2.1 -r1.82.2.2 \ 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.15.2.1 -r1.15.2.2 \ src/sys/compat/linux/arch/arm/linux_systrace_args.c cvs rdiff -u -r1.116.2.1 -r1.116.2.2 \ src/sys/compat/linux/arch/i386/linux_syscall.h \ src/sys/compat/linux/arch/i386/linux_syscallargs.h \ src/sys/compat/linux/arch/i386/linux_sysent.c cvs rdiff -u -r1.117.2.1 -r1.117.2.2 \ src/sys/compat/linux/arch/i386/linux_syscalls.c cvs rdiff -u -r1.11.2.1 -r1.11.2.2 \ src/sys/compat/linux/arch/i386/linux_systrace_args.c cvs rdiff -u -r1.108.2.1 -r1.108.2.2 \ src/sys/compat/linux/arch/m68k/linux_syscall.h \ src/sys/compat/linux/arch/m68k/linux_syscalls.c \ src/sys/compat/linux/arch/m68k/linux_sysent.c cvs rdiff -u -r1.107.2.1 -r1.107.2.2 \ src/sys/compat/linux/arch/m68k/linux_syscallargs.h cvs rdiff -u -r1.80.2.1 -r1.80.2.2 \ src/sys/compat/linux/arch/mips/linux_syscall.h cvs rdiff -u -r1.79.2.1 -r1.79.2.2 \ src/sys/compat/linux/arch/mips/linux_syscallargs.h \ src/sys/compat/linux/arch/mips/linux_syscalls.c \ src/sys/compat/linux/arch/mips/linux_sysent.c cvs rdiff -u -r1.86.2.1 -r1.86.2.2 \ src/sys/compat/linux/arch/powerpc/linux_syscall.h \ src/sys/compat/linux/arch/powerpc/linux_sysent.c cvs rdiff -u -r1.85.2.1 -r1.85.2.2 \ src/sys/compat/linux/arch/powerpc/linux_syscallargs.h \ src/sys/compat/linux/arch/powerpc/linux_syscalls.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/alpha/linux_syscall.h diff -u src/sys/compat/linux/arch/alpha/linux_syscall.h:1.110.2.1 src/sys/compat/linux/arch/alpha/linux_syscall.h:1.110.2.2 --- src/sys/compat/linux/arch/alpha/linux_syscall.h:1.110.2.1 Tue Dec 15 14:07:51 2020 +++ src/sys/compat/linux/arch/alpha/linux_syscall.h Thu Dec 17 03:14:35 2020 @@ -1,10 +1,10 @@ -/* $NetBSD: linux_syscall.h,v 1.110.2.1 2020/12/15 14:07:51 thorpej Exp $ */ +/* $NetBSD: linux_syscall.h,v 1.110.2.2 2020/12/17 03:14:35 thorpej Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.97.2.1 2020/12/15 14:07:20 thorpej Exp + * created from NetBSD: syscalls.master,v 1.97.2.2 2020/12/17 03:14:15 thorpej Exp */ #ifndef _LINUX_SYS_SYSCALL_H_ @@ -741,6 +741,12 @@ /* syscall: "pipe2" ret: "int" args: "int *" "int" */ #define LINUX_SYS_pipe2 488 +/* syscall: "preadv" ret: "int" args: "int" "const struct iovec *" "int" "unsigned long" "unsigned long" */ +#define LINUX_SYS_preadv 490 + +/* syscall: "pwritev" ret: "int" args: "int" "const struct iovcnt *" "int" "unsigned long" "unsigned long" */ +#define LINUX_SYS_pwritev 491 + /* syscall: "accept4" ret: "int" args: "int" "struct osockaddr *" "int *" "int" */ #define LINUX_SYS_accept4 502 Index: src/sys/c
CVS commit: [thorpej-futex] src/sys/compat/linux
Module Name:src
Committed By: thorpej
Date: Thu Dec 17 03:14:16 UTC 2020
Modified Files:
src/sys/compat/linux/arch/alpha [thorpej-futex]: syscalls.master
src/sys/compat/linux/arch/amd64 [thorpej-futex]: syscalls.master
src/sys/compat/linux/arch/arm [thorpej-futex]: syscalls.master
src/sys/compat/linux/arch/i386 [thorpej-futex]: syscalls.master
src/sys/compat/linux/arch/m68k [thorpej-futex]: syscalls.master
src/sys/compat/linux/arch/mips [thorpej-futex]: syscalls.master
src/sys/compat/linux/arch/powerpc [thorpej-futex]: syscalls.master
src/sys/compat/linux/common [thorpej-futex]: linux_file.c
Log Message:
Add suppport for Linux preadv(2) and pwritev(2). Same as native, except
for the silly way that the offset argument is passed in.
To generate a diff of this commit:
cvs rdiff -u -r1.97.2.1 -r1.97.2.2 \
src/sys/compat/linux/arch/alpha/syscalls.master
cvs rdiff -u -r1.62.2.1 -r1.62.2.2 \
src/sys/compat/linux/arch/amd64/syscalls.master
cvs rdiff -u -r1.69.2.1 -r1.69.2.2 \
src/sys/compat/linux/arch/arm/syscalls.master
cvs rdiff -u -r1.124.2.1 -r1.124.2.2 \
src/sys/compat/linux/arch/i386/syscalls.master
cvs rdiff -u -r1.95.2.1 -r1.95.2.2 \
src/sys/compat/linux/arch/m68k/syscalls.master
cvs rdiff -u -r1.68.2.1 -r1.68.2.2 \
src/sys/compat/linux/arch/mips/syscalls.master
cvs rdiff -u -r1.74.2.1 -r1.74.2.2 \
src/sys/compat/linux/arch/powerpc/syscalls.master
cvs rdiff -u -r1.118 -r1.118.2.1 src/sys/compat/linux/common/linux_file.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/alpha/syscalls.master
diff -u src/sys/compat/linux/arch/alpha/syscalls.master:1.97.2.1 src/sys/compat/linux/arch/alpha/syscalls.master:1.97.2.2
--- src/sys/compat/linux/arch/alpha/syscalls.master:1.97.2.1 Tue Dec 15 14:07:20 2020
+++ src/sys/compat/linux/arch/alpha/syscalls.master Thu Dec 17 03:14:15 2020
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.97.2.1 2020/12/15 14:07:20 thorpej Exp $
+ $NetBSD: syscalls.master,v 1.97.2.2 2020/12/17 03:14:15 thorpej Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -784,8 +784,12 @@
487 STD { int|linux_sys||dup3(int from, int to, int flags); }
488 STD { int|linux_sys||pipe2(int *pfds, int flags); }
489 UNIMPL inotify_init1
-490 UNIMPL preadv
-491 UNIMPL pwritev
+490 STD { int|linux_sys||preadv(int fd, \
+ const struct iovec *iovp, int iovcnt, \
+ unsigned long off_lo, unsigned long off_hi); }
+491 STD { int|linux_sys||pwritev(int fd, \
+ const struct iovcnt *iovp, int iovcnt, \
+ unsigned long off_lo, unsigned long off_hi); }
492 UNIMPL rt_tgsigqueueinfo
493 UNIMPL perf_counter_open
494 UNIMPL fanotify_init
Index: src/sys/compat/linux/arch/amd64/syscalls.master
diff -u src/sys/compat/linux/arch/amd64/syscalls.master:1.62.2.1 src/sys/compat/linux/arch/amd64/syscalls.master:1.62.2.2
--- src/sys/compat/linux/arch/amd64/syscalls.master:1.62.2.1 Tue Dec 15 14:07:20 2020
+++ src/sys/compat/linux/arch/amd64/syscalls.master Thu Dec 17 03:14:15 2020
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.62.2.1 2020/12/15 14:07:20 thorpej Exp $
+ $NetBSD: syscalls.master,v 1.62.2.2 2020/12/17 03:14:15 thorpej Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -539,8 +539,12 @@
292 STD { int|linux_sys||dup3(int from, int to, int flags); }
293 STD { int|linux_sys||pipe2(int *pfds, int flags); }
294 UNIMPL inotify_init1
-295 UNIMPL preadv
-296 UNIMPL pwritev
+295 STD { int|linux_sys||preadv(int fd, \
+ const struct iovec *iovp, int iovcnt, \
+ unsigned long off_lo, unsigned long off_hi); }
+296 STD { int|linux_sys||pwritev(int fd, \
+ const struct iovcnt *iovp, int iovcnt, \
+ unsigned long off_lo, unsigned long off_hi); }
297 UNIMPL rt_tgsigqueueinfo
298 UNIMPL perf_counter_open
299 STD { int|linux_sys||recvmmsg(int s, \
Index: src/sys/compat/linux/arch/arm/syscalls.master
diff -u src/sys/compat/linux/arch/arm/syscalls.master:1.69.2.1 src/sys/compat/linux/arch/arm/syscalls.master:1.69.2.2
--- src/sys/compat/linux/arch/arm/syscalls.master:1.69.2.1 Tue Dec 15 14:07:21 2020
+++ src/sys/compat/linux/arch/arm/syscalls.master Thu Dec 17 03:14:15 2020
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.69.2.1 2020/12/15 14:07:21 thorpej Exp $
+ $NetBSD: syscalls.master,v 1.69.2.2 2020/12/17 03:14:15 thorpej Exp $
; Derived from sys/compat/linux/arch/*/syscalls.master
; and from Linux 2.4.12 arch/arm/kernel/calls.S
@@ -579,8 +579,12 @@
358 STD { int|linux_sys||dup3(int from, int to, int flags); }
359 STD { int|linux_sys||pipe2(int *pfds, int flags); }
360 UNIMPL inotify_init1
-361 UNIMPL preadv
-362 UNIMPL pwritev
+361 STD { int|linux_sys||preadv(int fd, \
+ const struct iovec *iovp, int iovcnt, \
+ unsigned long off_lo, unsigned long off_hi); }
+362 STD { int|linux_sys||pwritev(int fd, \
CVS commit: [thorpej-futex] src/sys/compat/linux32/arch/amd64
Module Name:src
Committed By: thorpej
Date: Thu Dec 17 03:05:50 UTC 2020
Modified Files:
src/sys/compat/linux32/arch/amd64 [thorpej-futex]: linux32_syscall.h
linux32_syscallargs.h linux32_syscalls.c linux32_sysent.c
linux32_systrace_args.c
Log Message:
Regen for POSIX timers and timerfd.
To generate a diff of this commit:
cvs rdiff -u -r1.81.2.1 -r1.81.2.2 \
src/sys/compat/linux32/arch/amd64/linux32_syscall.h \
src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h \
src/sys/compat/linux32/arch/amd64/linux32_syscalls.c \
src/sys/compat/linux32/arch/amd64/linux32_sysent.c
cvs rdiff -u -r1.8.2.1 -r1.8.2.2 \
src/sys/compat/linux32/arch/amd64/linux32_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/linux32/arch/amd64/linux32_syscall.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.81.2.1 src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.81.2.2
--- src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.81.2.1 Wed Dec 16 03:08:01 2020
+++ src/sys/compat/linux32/arch/amd64/linux32_syscall.h Thu Dec 17 03:05:50 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscall.h,v 1.81.2.1 2020/12/16 03:08:01 thorpej Exp $ */
+/* $NetBSD: linux32_syscall.h,v 1.81.2.2 2020/12/17 03:05:50 thorpej Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.71.2.1 2020/12/16 03:07:43 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.71.2.2 2020/12/17 03:05:32 thorpej Exp
*/
#ifndef _LINUX32_SYS_SYSCALL_H_
@@ -627,6 +627,21 @@
/* syscall: "set_tid_address" ret: "int" args: "linux32_intp_t" */
#define LINUX32_SYS_set_tid_address 258
+/* syscall: "timer_create" ret: "int" args: "clockid_t" "struct linux32_sigevent *" "timer_t *" */
+#define LINUX32_SYS_timer_create 259
+
+/* syscall: "timer_settime" ret: "int" args: "timer_t" "int" "const struct linux32_itimerspec *" "struct linux32_itimerspec *" */
+#define LINUX32_SYS_timer_settime 260
+
+/* syscall: "timer_gettime" ret: "int" args: "timer_t" "struct linux32_itimerspec *" */
+#define LINUX32_SYS_timer_gettime 261
+
+/* syscall: "timer_getoverrun" ret: "int" args: "timer_t" */
+#define LINUX32_SYS_timer_getoverrun 262
+
+/* syscall: "timer_delete" ret: "int" args: "timer_t" */
+#define LINUX32_SYS_timer_delete 263
+
/* syscall: "clock_settime" ret: "int" args: "clockid_t" "linux32_timespecp_t" */
#define LINUX32_SYS_clock_settime 264
@@ -702,12 +717,21 @@
/* syscall: "utimensat" ret: "int" args: "int" "netbsd32_charp" "linux32_timespecp_t" "int" */
#define LINUX32_SYS_utimensat 320
+/* syscall: "timerfd_create" ret: "int" args: "clockid_t" "int" */
+#define LINUX32_SYS_timerfd_create 322
+
/* syscall: "eventfd" ret: "int" args: "unsigned int" */
#define LINUX32_SYS_eventfd 323
/* syscall: "fallocate" ret: "int" args: "int" "int" "off_t" "off_t" */
#define LINUX32_SYS_fallocate 324
+/* syscall: "timerfd_settime" ret: "int" args: "int" "int" "const struct linux32_itimerspec *" "struct linux32_itimerspec *" */
+#define LINUX32_SYS_timerfd_settime 325
+
+/* syscall: "timerfd_gettime" ret: "int" args: "int" "struct linux32_itimerspec *" */
+#define LINUX32_SYS_timerfd_gettime 326
+
/* syscall: "eventfd2" ret: "int" args: "unsigned int" "int" */
#define LINUX32_SYS_eventfd2 328
Index: src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.81.2.1 src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.81.2.2
--- src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.81.2.1 Wed Dec 16 03:08:01 2020
+++ src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h Thu Dec 17 03:05:50 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscallargs.h,v 1.81.2.1 2020/12/16 03:08:01 thorpej Exp $ */
+/* $NetBSD: linux32_syscallargs.h,v 1.81.2.2 2020/12/17 03:05:50 thorpej Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.71.2.1 2020/12/16 03:07:43 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.71.2.2 2020/12/17 03:05:32 thorpej Exp
*/
#ifndef _LINUX32_SYS_SYSCALLARGS_H_
@@ -854,6 +854,31 @@ struct linux32_sys_set_tid_address_args
};
check_syscall_args(linux32_sys_set_tid_address)
+struct linux32_sys_timer_create_args {
+ syscallarg(clockid_t) clockid;
+ syscallarg(struct linux32_sigevent *) evp;
+ syscallarg(timer_t *) timerid;
+};
+check_syscall_args(linux32_sys_timer_create)
+
+struct linux32_sys_timer_settime_args {
+ syscallarg(timer_t) timerid;
+ syscallarg(int) flags;
+ syscallarg(const struct linux32_itimerspec *) tim;
+ syscallarg(struct linux32_itimerspec *) otim;
+};
+check_syscall_args(linux32_sys_timer_settime)
+
+struct linux32_sys_timer_gettime_args {
+ syscallarg(timer_t) timerid;
CVS commit: [thorpej-futex] src/sys/compat/linux32
Module Name:src
Committed By: thorpej
Date: Thu Dec 17 03:05:32 UTC 2020
Modified Files:
src/sys/compat/linux32/arch/amd64 [thorpej-futex]: syscalls.master
src/sys/compat/linux32/common [thorpej-futex]: linux32_sched.h
linux32_time.c
Log Message:
Add POSIX timer and timerfd support to COMPAT_LINUX32.
To generate a diff of this commit:
cvs rdiff -u -r1.71.2.1 -r1.71.2.2 \
src/sys/compat/linux32/arch/amd64/syscalls.master
cvs rdiff -u -r1.1 -r1.1.66.1 src/sys/compat/linux32/common/linux32_sched.h
cvs rdiff -u -r1.37 -r1.37.50.1 src/sys/compat/linux32/common/linux32_time.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/linux32/arch/amd64/syscalls.master
diff -u src/sys/compat/linux32/arch/amd64/syscalls.master:1.71.2.1 src/sys/compat/linux32/arch/amd64/syscalls.master:1.71.2.2
--- src/sys/compat/linux32/arch/amd64/syscalls.master:1.71.2.1 Wed Dec 16 03:07:43 2020
+++ src/sys/compat/linux32/arch/amd64/syscalls.master Thu Dec 17 03:05:32 2020
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.71.2.1 2020/12/16 03:07:43 thorpej Exp $
+ $NetBSD: syscalls.master,v 1.71.2.2 2020/12/17 03:05:32 thorpej Exp $
; NetBSD i386 COMPAT_LINUX32 system call name/number "master" file.
; (See syscalls.conf to see what it is processed into.)
@@ -454,11 +454,15 @@
256 UNIMPL epoll_wait
257 UNIMPL remap_file_pages
258 STD { int|linux32_sys||set_tid_address(linux32_intp_t tid); }
-259 UNIMPL timer_create
-260 UNIMPL timer_settime
-261 UNIMPL timer_gettime
-262 UNIMPL timer_getoverrun
-263 UNIMPL timer_delete
+259 STD { int|linux32_sys||timer_create(clockid_t clockid, \
+ struct linux32_sigevent *evp, timer_t *timerid); }
+260 STD { int|linux32_sys||timer_settime(timer_t timerid, \
+ int flags, const struct linux32_itimerspec *tim, \
+ struct linux32_itimerspec *otim); }
+261 STD { int|linux32_sys||timer_gettime(timer_t timerid, \
+ struct linux32_itimerspec *tim); }
+262 NOARGS { int|sys||timer_getoverrun(timer_t timerid); }
+263 NOARGS { int|sys||timer_delete(timer_t timerid); }
264 STD { int|linux32_sys||clock_settime(clockid_t which, \
linux32_timespecp_t tp); }
265 STD { int|linux32_sys||clock_gettime(clockid_t which, \
@@ -546,12 +550,16 @@
320 STD { int|linux32_sys||utimensat(int fd, netbsd32_charp path, \
linux32_timespecp_t times, int flag); }
321 UNIMPL signalfd
-322 UNIMPL timerfd_create
+322 NOARGS { int|linux_sys||timerfd_create(clockid_t clock_id, \
+ int flags); }
323 STD { int|linux32_sys||eventfd(unsigned int initval); }
324 STD { int|linux32_sys||fallocate(int fd, int mode, \
off_t offset, off_t len); }
-325 UNIMPL timerfd_settime
-326 UNIMPL timerfd_gettime
+325 STD { int|linux32_sys||timerfd_settime(int fd, int flags, \
+ const struct linux32_itimerspec *new_value, \
+ struct linux32_itimerspec *old_value); }
+326 STD { int|linux32_sys||timerfd_gettime(int fd, \
+ struct linux32_itimerspec *curr_value); }
327 UNIMPL signalfd4
328 STD { int|linux32_sys||eventfd2(unsigned int initval, \
int flags); }
Index: src/sys/compat/linux32/common/linux32_sched.h
diff -u src/sys/compat/linux32/common/linux32_sched.h:1.1 src/sys/compat/linux32/common/linux32_sched.h:1.1.66.1
--- src/sys/compat/linux32/common/linux32_sched.h:1.1 Fri Nov 18 04:08:56 2011
+++ src/sys/compat/linux32/common/linux32_sched.h Thu Dec 17 03:05:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_sched.h,v 1.1 2011/11/18 04:08:56 christos Exp $ */
+/* $NetBSD: linux32_sched.h,v 1.1.66.1 2020/12/17 03:05:32 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -33,56 +33,28 @@
#ifndef _LINUX32_SCHED_H
#define _LINUX32_SCHED_H
-/*
- * Flags passed to the Linux __clone(2) system call.
- */
-#define LINUX32_CLONE_CSIGNAL 0x00ff /* signal to be sent at exit */
-#define LINUX32_CLONE_VM 0x0100 /* share address space */
-#define LINUX32_CLONE_FS 0x0200 /* share "file system" info */
-#define LINUX32_CLONE_FILES 0x0400 /* share file descriptors */
-#define LINUX32_CLONE_SIGHAND 0x0800 /* share signal actions */
-#define LINUX32_CLONE_PID 0x1000 /* share process ID */
-#define LINUX32_CLONE_PTRACE 0x2000 /* ptrace(2) continues on
- child */
-#define LINUX32_CLONE_VFORK 0x4000 /* parent blocks until child
- exits */
-#define LINUX32_CLONE_PARENT 0x8000 /* want same parent as cloner */
-#define LINUX32_CLONE_THREAD 0x0001 /* same thread group */
-#define LINUX32_CLONE_NEWNS 0x0002 /* new namespace group */
-#define LINUX32_CLONE_SYSVSEM 0x0004 /* share SysV SEM_UNDO */
-#define LINUX32_CLONE_SETTLS 0x0008 /* create new TLS for child */
-#define LINUX32_CLONE_PARENT_SETTID \
-0x0010 /* set TID in the parent */
-#define LINUX32_CLONE_CHILD_CLEARTID \
-0x0020 /* clear TID in the child */
-#define LINUX32_CLONE_DETACHED 0x00400
CVS commit: [thorpej-futex] src/sys/compat/linux32/common
Module Name:src Committed By: thorpej Date: Thu Dec 17 03:02:07 UTC 2020 Modified Files: src/sys/compat/linux32/common [thorpej-futex]: linux32_misc.c Log Message: Remove a redundant prototype. To generate a diff of this commit: cvs rdiff -u -r1.30.2.1 -r1.30.2.2 \ src/sys/compat/linux32/common/linux32_misc.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/linux32/common/linux32_misc.c diff -u src/sys/compat/linux32/common/linux32_misc.c:1.30.2.1 src/sys/compat/linux32/common/linux32_misc.c:1.30.2.2 --- src/sys/compat/linux32/common/linux32_misc.c:1.30.2.1 Wed Dec 16 03:07:43 2020 +++ src/sys/compat/linux32/common/linux32_misc.c Thu Dec 17 03:02:06 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_misc.c,v 1.30.2.1 2020/12/16 03:07:43 thorpej Exp $ */ +/* $NetBSD: linux32_misc.c,v 1.30.2.2 2020/12/17 03:02:06 thorpej Exp $ */ /*- * Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux32_misc.c,v 1.30.2.1 2020/12/16 03:07:43 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_misc.c,v 1.30.2.2 2020/12/17 03:02:06 thorpej Exp $"); #include #include @@ -67,8 +67,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_misc extern const struct linux_mnttypes linux_fstypes[]; extern const int linux_fstypes_cnt; -void linux32_to_native_timespec(struct timespec *, struct linux32_timespec *); - /* * Implement the fs stat functions. Straightforward. */
CVS commit: [thorpej-futex] src/sys/compat/linux32
Module Name:src
Committed By: thorpej
Date: Thu Dec 17 03:00:28 UTC 2020
Modified Files:
src/sys/compat/linux32/arch/amd64 [thorpej-futex]: linux32_siginfo.h
src/sys/compat/linux32/common [thorpej-futex]: linux32_siginfo.h
linux32_signal.c
Added Files:
src/sys/compat/linux32/common [thorpej-futex]: linux32_sigevent.h
Log Message:
Add sigevent mapping for Linux-32 compat.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.66.1 \
src/sys/compat/linux32/arch/amd64/linux32_siginfo.h
cvs rdiff -u -r0 -r1.1.2.1 src/sys/compat/linux32/common/linux32_sigevent.h
cvs rdiff -u -r1.1 -r1.1.66.1 src/sys/compat/linux32/common/linux32_siginfo.h
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/compat/linux32/common/linux32_signal.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/linux32/arch/amd64/linux32_siginfo.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_siginfo.h:1.1 src/sys/compat/linux32/arch/amd64/linux32_siginfo.h:1.1.66.1
--- src/sys/compat/linux32/arch/amd64/linux32_siginfo.h:1.1 Fri Nov 18 04:08:56 2011
+++ src/sys/compat/linux32/arch/amd64/linux32_siginfo.h Thu Dec 17 03:00:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_siginfo.h,v 1.1 2011/11/18 04:08:56 christos Exp $ */
+/* $NetBSD: linux32_siginfo.h,v 1.1.66.1 2020/12/17 03:00:28 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -32,10 +32,7 @@
#ifndef _AMD64_LINUX32_SIGINFO_H
#define _AMD64_LINUX32_SIGINFO_H
-typedef union linux32_sigval {
- int sival_int;
- netbsd32_voidp sival_ptr;
-} linux32_sigval_t;
+#include
#define SI_MAX_SIZE 128
#define SI_PAD_SIZE ((SI_MAX_SIZE/sizeof(int)) - 3)
Index: src/sys/compat/linux32/common/linux32_siginfo.h
diff -u src/sys/compat/linux32/common/linux32_siginfo.h:1.1 src/sys/compat/linux32/common/linux32_siginfo.h:1.1.66.1
--- src/sys/compat/linux32/common/linux32_siginfo.h:1.1 Fri Nov 18 04:08:56 2011
+++ src/sys/compat/linux32/common/linux32_siginfo.h Thu Dec 17 03:00:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_siginfo.h,v 1.1 2011/11/18 04:08:56 christos Exp $ */
+/* $NetBSD: linux32_siginfo.h,v 1.1.66.1 2020/12/17 03:00:28 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _LINUX32_SIGINFO_H
#define _LINUX32_SIGINFO_H
+#include
+
#if defined(__amd64__)
#include
#endif
Index: src/sys/compat/linux32/common/linux32_signal.c
diff -u src/sys/compat/linux32/common/linux32_signal.c:1.20 src/sys/compat/linux32/common/linux32_signal.c:1.20.8.1
--- src/sys/compat/linux32/common/linux32_signal.c:1.20 Fri Aug 23 08:31:11 2019
+++ src/sys/compat/linux32/common/linux32_signal.c Thu Dec 17 03:00:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_signal.c,v 1.20 2019/08/23 08:31:11 maxv Exp $ */
+/* $NetBSD: linux32_signal.c,v 1.20.8.1 2020/12/17 03:00:28 thorpej Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux32_signal.c,v 1.20 2019/08/23 08:31:11 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_signal.c,v 1.20.8.1 2020/12/17 03:00:28 thorpej Exp $");
#include
#include
@@ -46,9 +46,11 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_sign
#include
#include
+#include
#include
#include
+#include
#include
#include
#include
@@ -652,3 +654,56 @@ native_to_linux32_si_status(int code, in
return sts;
}
+
+int
+linux32_to_native_sigevent(struct sigevent *nsep,
+const struct linux32_sigevent *lsep)
+{
+ memset(nsep, 0, sizeof(*nsep));
+
+ switch (lsep->sigev_notify) {
+ case LINUX_SIGEV_SIGNAL:
+ nsep->sigev_notify = SIGEV_SIGNAL;
+ break;
+
+ case LINUX_SIGEV_NONE:
+ nsep->sigev_notify = SIGEV_NONE;
+ break;
+
+ case LINUX_SIGEV_THREAD:
+ case LINUX_SIGEV_THREAD_ID:
+ default:
+ return ENOTSUP;
+ }
+
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+ nsep->sigev_value.sival_ptr =
+ NETBSD32PTR64(lsep->sigev_value.sival_ptr);
+#else
+#error This is probably broken on big-endian platforms.
+#endif
+
+ if (lsep->sigev_signo < 0 || lsep->sigev_signo >= LINUX32__NSIG) {
+ return EINVAL;
+ }
+ nsep->sigev_signo = linux32_to_native_signo[lsep->sigev_signo];
+
+ return 0;
+}
+
+int
+linux32_sigevent_copyin(const void *src, void *dst, size_t size)
+{
+ struct linux32_sigevent lse;
+ struct sigevent *sep = dst;
+ int error;
+
+ KASSERT(size == sizeof(*sep));
+
+ error = copyin(src, &lse, sizeof(lse));
+ if (error) {
+ return error;
+ }
+
+ return linux32_to_native_sigevent(sep, &lse);
+}
Added files:
Index: src/sys/compat/linux32/common/linux32_sigevent.h
diff -u /dev/null src/sys/compat/linux32/common/linux32_sigevent.h:1.1.2.1
--- /dev/null Thu Dec 17 03:00:28 2020
+++ src/sys/compat/linux32/common/linux32_sigevent.h Thu Dec 17 03:00:28 2020
@@ -0,0 +1,64 @@
+/* $NetBSD: linux32_sigevent.h,v 1.1.2.1 2020/12/17 03:00:28 thorpej Exp $ */
+
+/*-
+ * Copyright (c) 2005 Th
CVS commit: [thorpej-futex] src/sys/compat/linux/common
Module Name:src
Committed By: thorpej
Date: Thu Dec 17 02:52:41 UTC 2020
Modified Files:
src/sys/compat/linux/common [thorpej-futex]: linux_sched.h linux_time.c
Log Message:
Re-factor the code that maps the clockid_t in timer_create() and
the flags in timerfd_settime() into separate functions.
To generate a diff of this commit:
cvs rdiff -u -r1.8.64.1 -r1.8.64.2 src/sys/compat/linux/common/linux_sched.h
cvs rdiff -u -r1.39.16.1 -r1.39.16.2 src/sys/compat/linux/common/linux_time.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/common/linux_sched.h
diff -u src/sys/compat/linux/common/linux_sched.h:1.8.64.1 src/sys/compat/linux/common/linux_sched.h:1.8.64.2
--- src/sys/compat/linux/common/linux_sched.h:1.8.64.1 Tue Dec 15 14:07:21 2020
+++ src/sys/compat/linux/common/linux_sched.h Thu Dec 17 02:52:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sched.h,v 1.8.64.1 2020/12/15 14:07:21 thorpej Exp $ */
+/* $NetBSD: linux_sched.h,v 1.8.64.2 2020/12/17 02:52:40 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -104,4 +104,8 @@ void native_to_linux_itimerspec(struct l
void linux_to_native_itimerspec(struct itimerspec *,
const struct linux_itimerspec *);
+int linux_to_native_timer_create_clockid(clockid_t *, clockid_t);
+
+int linux_to_native_timerfd_settime_flags(int *, int);
+
#endif /* _LINUX_SCHED_H */
Index: src/sys/compat/linux/common/linux_time.c
diff -u src/sys/compat/linux/common/linux_time.c:1.39.16.1 src/sys/compat/linux/common/linux_time.c:1.39.16.2
--- src/sys/compat/linux/common/linux_time.c:1.39.16.1 Tue Dec 15 14:07:21 2020
+++ src/sys/compat/linux/common/linux_time.c Thu Dec 17 02:52:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_time.c,v 1.39.16.1 2020/12/15 14:07:21 thorpej Exp $ */
+/* $NetBSD: linux_time.c,v 1.39.16.2 2020/12/17 02:52:40 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.39.16.1 2020/12/15 14:07:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.39.16.2 2020/12/17 02:52:40 thorpej Exp $");
#include
#include
@@ -319,18 +319,12 @@ linux_sys_clock_nanosleep(struct lwp *l,
}
int
-linux_sys_timer_create(struct lwp *l,
-const struct linux_sys_timer_create_args *uap, register_t *retval)
+linux_to_native_timer_create_clockid(clockid_t *nid, clockid_t lid)
{
- /* {
- syscallarg(clockid_t) clockid;
- syscallarg(struct linux_sigevent *) evp;
- syscallarg(timer_t *) timerid;
- } */
clockid_t id;
int error;
- error = linux_to_native_clockid(&id, SCARG(uap, clockid));
+ error = linux_to_native_clockid(&id, lid);
if (error == 0) {
/*
* We can't create a timer with every sort of clock ID
@@ -351,6 +345,26 @@ linux_sys_timer_create(struct lwp *l,
default:
return ENOTSUP;
}
+ *nid = id;
+ }
+
+ return error;
+}
+
+int
+linux_sys_timer_create(struct lwp *l,
+const struct linux_sys_timer_create_args *uap, register_t *retval)
+{
+ /* {
+ syscallarg(clockid_t) clockid;
+ syscallarg(struct linux_sigevent *) evp;
+ syscallarg(timer_t *) timerid;
+ } */
+ clockid_t id;
+ int error;
+
+ error = linux_to_native_timer_create_clockid(&id, SCARG(uap, clockid));
+ if (error == 0) {
error = timer_create1(SCARG(uap, timerid), id,
(void *)SCARG(uap, evp), linux_sigevent_copyin, l);
}
@@ -483,6 +497,27 @@ linux_sys_timerfd_gettime(struct lwp *l,
}
int
+linux_to_native_timerfd_settime_flags(int *nflagsp, int lflags)
+{
+ int nflags = 0;
+
+ if (lflags & ~(LINUX_TFD_TIMER_ABSTIME |
+ LINUX_TFD_TIMER_CANCEL_ON_SET)) {
+ return EINVAL;
+ }
+ if (lflags & LINUX_TFD_TIMER_ABSTIME) {
+ nflags |= TFD_TIMER_ABSTIME;
+ }
+ if (lflags & LINUX_TFD_TIMER_CANCEL_ON_SET) {
+ nflags |= TFD_TIMER_CANCEL_ON_SET;
+ }
+
+ *nflagsp = nflags;
+
+ return 0;
+}
+
+int
linux_sys_timerfd_settime(struct lwp *l,
const struct linux_sys_timerfd_settime_args *uap, register_t *retval)
{
@@ -494,7 +529,7 @@ linux_sys_timerfd_settime(struct lwp *l,
} */
struct itimerspec nits, oits, *oitsp = NULL;
struct linux_itimerspec lits;
- int nflags = 0;
+ int nflags;
int error;
error = copyin(SCARG(uap, new_value), &lits, sizeof(lits));
@@ -503,15 +538,10 @@ linux_sys_timerfd_settime(struct lwp *l,
}
linux_to_native_itimerspec(&nits, &lits);
- if (SCARG(uap, flags) & ~(LINUX_TFD_TIMER_ABSTIME |
- LINUX_TFD_TIMER_CANCEL_ON_SET)) {
- return EINVAL;
- }
- if (SCARG(uap, flags) & LINUX_TFD_TIMER_ABSTIME) {
- nflags |= TFD_TIMER_ABSTIME;
- }
- if (SCARG(uap, flags) & LINUX_TFD_TIMER_CANCEL_ON_SET) {
- nflags |= TFD_TIMER_CANCEL_ON_SET;
+ error = linux_to_native_timerfd_settime_flags(&nflags,
+ SCARG(uap, flags));
+ if (error) {
+ return error;
}
if (SCARG(uap, old_value)) {
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Wed Dec 16 19:49:05 UTC 2020
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_intr.c
src/sys/arch/riscv/include: sysreg.h
src/sys/dev/i2c: tcakp.c
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_uvd_v4_2.c
amdgpu_uvd_v5_0.c amdgpu_uvd_v6_0.c
src/sys/external/bsd/drm2/dist/drm/i915: intel_pm.c
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_uvd_v1_0.c
src/sys/external/bsd/drm2/dist/drm/vmwgfx: vmwgfx_drv.h
src/sys/external/isc/atheros_hal/dist: ah.h
Log Message:
interupt -> interrupt
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/broadcom/bcm2835_intr.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/riscv/include/sysreg.h
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/i2c/tcakp.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v5_0.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v6_0.c
cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_drv.h
cvs rdiff -u -r1.4 -r1.5 src/sys/external/isc/atheros_hal/dist/ah.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm2835_intr.c
diff -u src/sys/arch/arm/broadcom/bcm2835_intr.c:1.32 src/sys/arch/arm/broadcom/bcm2835_intr.c:1.33
--- src/sys/arch/arm/broadcom/bcm2835_intr.c:1.32 Sat Feb 15 03:16:11 2020
+++ src/sys/arch/arm/broadcom/bcm2835_intr.c Wed Dec 16 14:49:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_intr.c,v 1.32 2020/02/15 08:16:11 skrll Exp $ */
+/* $NetBSD: bcm2835_intr.c,v 1.33 2020/12/16 19:49:04 christos Exp $ */
/*-
* Copyright (c) 2012, 2015, 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.32 2020/02/15 08:16:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.33 2020/12/16 19:49:04 christos Exp $");
#define _INTR_PRIVATE
@@ -891,8 +891,8 @@ bcm2836mp_icu_fdt_establish(device_t dev
bip->bi_arg = arg;
/*
- * If we're not cold and the BPs have been started then we can register the
- * interupt for all CPUs now, e.g. PMU
+ * If we're not cold and the BPs have been started then we can
+ * register the interrupt for all CPUs now, e.g. PMU
*/
if (!cold) {
for (cpuid_t cpuid = 0; cpuid < BCM2836_NCPUS; cpuid++) {
Index: src/sys/arch/riscv/include/sysreg.h
diff -u src/sys/arch/riscv/include/sysreg.h:1.10 src/sys/arch/riscv/include/sysreg.h:1.11
--- src/sys/arch/riscv/include/sysreg.h:1.10 Wed Nov 4 15:05:47 2020
+++ src/sys/arch/riscv/include/sysreg.h Wed Dec 16 14:49:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sysreg.h,v 1.10 2020/11/04 20:05:47 skrll Exp $ */
+/* $NetBSD: sysreg.h,v 1.11 2020/12/16 19:49:04 christos Exp $ */
/*
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -141,7 +141,7 @@ riscvreg_fcsr_write_frm(uint32_t __new)
#define SR_UIE __BIT(0)
/* Supervisor interrupt registers */
-/* ... interupt pending register (sip) */
+/* ... interrupt pending register (sip) */
/* Bit (XLEN-1)-10 is WIRI */
#define SIP_SEIP __BIT(9)
#define SIP_UEIP __BIT(8)
@@ -152,7 +152,7 @@ riscvreg_fcsr_write_frm(uint32_t __new)
#define SIP_SSIP __BIT(1)
#define SIP_USIP __BIT(0)
-/* ... interupt-enable register (sie) */
+/* ... interrupt-enable register (sie) */
/* Bit (XLEN-1) - 10 is WIRI */
#define SIE_SEIE __BIT(9)
#define SIE_UEIE __BIT(8)
Index: src/sys/dev/i2c/tcakp.c
diff -u src/sys/dev/i2c/tcakp.c:1.11 src/sys/dev/i2c/tcakp.c:1.12
--- src/sys/dev/i2c/tcakp.c:1.11 Mon Dec 23 15:38:08 2019
+++ src/sys/dev/i2c/tcakp.c Wed Dec 16 14:49:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tcakp.c,v 1.11 2019/12/23 20:38:08 thorpej Exp $ */
+/* $NetBSD: tcakp.c,v 1.12 2020/12/16 19:49:04 christos Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -29,7 +29,7 @@
#include "opt_fdt.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: tcakp.c,v 1.11 2019/12/23 20:38:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcakp.c,v 1.12 2020/12/16 19:49:04 christos Exp $");
#include
#include
@@ -400,7 +400,7 @@ tcakp_attach(device_t parent, device_t s
sc->sc_sih = softint_establish(SOFTINT_SERIAL, tcakp_softintr, sc);
if (sc->sc_sih == NULL) {
aprint_error_dev(sc->sc_dev,
- "unable to establish soft interupt\n");
+ "unable to establish soft interrupt\n");
return;
}
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd_v4_2.c:1.4
--- src/sys/external/bsd/drm2/dist/
