CVS commit: [pgoyette-compat] src/sys/modules
Module Name:src
Committed By: pgoyette
Date: Thu Sep 13 03:52:35 UTC 2018
Added Files:
src/sys/modules/compat_netbsd32_sysvipc_10 [pgoyette-compat]: Makefile
src/sys/modules/compat_netbsd32_sysvipc_14 [pgoyette-compat]: Makefile
src/sys/modules/compat_netbsd32_sysvipc_50 [pgoyette-compat]: Makefile
Log Message:
Add Makefiles for version-specific compat_netbsd32_sysvipc* modules
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 \
src/sys/modules/compat_netbsd32_sysvipc_10/Makefile
cvs rdiff -u -r0 -r1.1.2.1 \
src/sys/modules/compat_netbsd32_sysvipc_14/Makefile
cvs rdiff -u -r0 -r1.1.2.1 \
src/sys/modules/compat_netbsd32_sysvipc_50/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/modules/compat_netbsd32_sysvipc_10/Makefile
diff -u /dev/null src/sys/modules/compat_netbsd32_sysvipc_10/Makefile:1.1.2.1
--- /dev/null Thu Sep 13 03:52:35 2018
+++ src/sys/modules/compat_netbsd32_sysvipc_10/Makefile Thu Sep 13 03:52:34 2018
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1.2.1 2018/09/13 03:52:34 pgoyette Exp $
+
+.include "../Makefile.inc"
+.include "../Makefile.assym"
+
+KMOD= compat_netbsd32_sysvipc_10
+
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_10 -DCOMPAT_13 -DCOMPAT_14 -DCOMPAT_50
+CPPFLAGS+= -DSYSVSHM -DSYSVSEM -DSYSVMSG
+
+.PATH: ${S}/compat/netbsd32
+
+SRCS+= netbsd32_compat_10_sysv.c
+
+.include
Index: src/sys/modules/compat_netbsd32_sysvipc_14/Makefile
diff -u /dev/null src/sys/modules/compat_netbsd32_sysvipc_14/Makefile:1.1.2.1
--- /dev/null Thu Sep 13 03:52:35 2018
+++ src/sys/modules/compat_netbsd32_sysvipc_14/Makefile Thu Sep 13 03:52:34 2018
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1.2.1 2018/09/13 03:52:34 pgoyette Exp $
+
+.include "../Makefile.inc"
+.include "../Makefile.assym"
+
+KMOD= compat_netbsd32_sysvipc_14
+
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_14 -DCOMPAT_50
+CPPFLAGS+= -DSYSVSHM -DSYSVSEM -DSYSVMSG
+
+.PATH: ${S}/compat/netbsd32
+
+SRCS+= netbsd32_compat_14_sysv.c
+
+.include
Index: src/sys/modules/compat_netbsd32_sysvipc_50/Makefile
diff -u /dev/null src/sys/modules/compat_netbsd32_sysvipc_50/Makefile:1.1.2.1
--- /dev/null Thu Sep 13 03:52:35 2018
+++ src/sys/modules/compat_netbsd32_sysvipc_50/Makefile Thu Sep 13 03:52:35 2018
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1.2.1 2018/09/13 03:52:35 pgoyette Exp $
+
+.include "../Makefile.inc"
+.include "../Makefile.assym"
+
+KMOD= compat_netbsd32_sysvipc_50
+
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_50
+CPPFLAGS+= -DSYSVSHM -DSYSVSEM -DSYSVMSG
+
+.PATH: ${S}/compat/netbsd32
+
+SRCS+= netbsd32_compat_50_sysv.c
+
+.include
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Sep 13 03:51:32 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_ipc.c netbsd32_mod.c Log Message: More clean-up of module dependencies To generate a diff of this commit: cvs rdiff -u -r1.18.16.5 -r1.18.16.6 src/sys/compat/netbsd32/netbsd32_ipc.c cvs rdiff -u -r1.13.16.7 -r1.13.16.8 src/sys/compat/netbsd32/netbsd32_mod.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/netbsd32/netbsd32_ipc.c diff -u src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.5 src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.6 --- src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.5 Wed Sep 12 23:28:16 2018 +++ src/sys/compat/netbsd32/netbsd32_ipc.c Thu Sep 13 03:51:32 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_ipc.c,v 1.18.16.5 2018/09/12 23:28:16 pgoyette Exp $ */ +/* $NetBSD: netbsd32_ipc.c,v 1.18.16.6 2018/09/13 03:51:32 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18.16.5 2018/09/12 23:28:16 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18.16.6 2018/09/13 03:51:32 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -83,7 +83,7 @@ static const struct syscall_package comp }; MODULE(MODULE_CLASS_EXEC, compat_netbsd32_sysvipc, -"sysv_ipc,compat_netbsd32,sysv_ipc"); +"compat_netbsd32,sysv_ipc"); static int compat_netbsd32_sysvipc_modcmd(modcmd_t cmd, void *arg) Index: src/sys/compat/netbsd32/netbsd32_mod.c diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.7 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.8 --- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.7 Thu Sep 13 02:03:49 2018 +++ src/sys/compat/netbsd32/netbsd32_mod.c Thu Sep 13 03:51:32 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_mod.c,v 1.13.16.7 2018/09/13 02:03:49 pgoyette Exp $ */ +/* $NetBSD: netbsd32_mod.c,v 1.13.16.8 2018/09/13 03:51:32 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.7 2018/09/13 02:03:49 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.8 2018/09/13 03:51:32 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_execfmt.h" @@ -57,7 +57,7 @@ int compat32_80_modctl_compat_stub(struc int (*vec_compat32_80_modctl)(struct lwp *, const struct netbsd32_modctl_args *, register_t *); -# define DEPS1 "ksem" +# define DEPS1 "ksem,compat_util" #if defined(EXEC_ELF32) # define DEPS2 ",exec_elf32"
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Thu Sep 13 03:50:24 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.11 -r1.134.2.12 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.10 -r1.134.2.11 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.11 -r1.132.2.12 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.10 -r1.13.2.11 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.10 -r1.132.2.11 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.10 -r1.24.2.11 \
src/sys/compat/netbsd32/netbsd32_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/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.11 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.12
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.11 Wed Sep 12 23:27:24 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Thu Sep 13 03:50:24 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.11 2018/09/12 23:27:24 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.12 2018/09/13 03:50:24 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.10 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.11
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.10 Wed Sep 12 23:27:24 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Thu Sep 13 03:50:24 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.10 2018/09/12 23:27:24 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.11 2018/09/13 03:50:24 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.11 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.12
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.11 Wed Sep 12 23:27:24 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Thu Sep 13 03:50:24 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.11 2018/09/12 23:27:24 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.12 2018/09/13 03:50:24 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.11 2018/09/12 23:27:24 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.12 2018/09/13 03:50:24 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.10 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.11
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.10 Wed Sep 12 23:27:24 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Thu Sep 13 03:50:24 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.10 2018/09/12 23:27:24 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.11 2018/09/13 03:50:24 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.10 2018/09/12 23:27:24 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.11 2018/09/13 03:50:24 pgoyette Exp $");
#include
static struct sc_autoload netbsd32_syscalls_autoload[] = {
@@ -22,17 +22,21 @@ static struct sc_autoload netbsd32_sysca
{
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Thu Sep 13 03:49:47 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master
Log Message:
More MODULAR tags
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.14 -r1.120.2.15 \
src/sys/compat/netbsd32/syscalls.master
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/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.14 src/sys/compat/netbsd32/syscalls.master:1.120.2.15
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.14 Wed Sep 12 23:26:38 2018
+++ src/sys/compat/netbsd32/syscalls.master Thu Sep 13 03:49:46 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -156,7 +156,8 @@
u_int namelen); }
50 STD { int|netbsd32||setlogin(netbsd32_charp namebuf); }
51 STD { int|netbsd32||acct(netbsd32_charp path); }
-52 COMPAT_13 { int|sys||sigpending(void); } sigpending13
+52 COMPAT_13 MODULAR compat_netbsd32_13 \
+ { int|sys||sigpending(void); } sigpending13
53 COMPAT_13 MODULAR compat_netbsd32_13 \
{ int|netbsd32||sigaltstack13( \
netbsd32_sigaltstack13p_t nss, \
@@ -180,7 +181,8 @@
{ int|netbsd32||ogetkerninfo(int op, \
netbsd32_charp where, netbsd32_intp size, \
int arg); }
-64 COMPAT_43 { int|sys||getpagesize(void); } ogetpagesize
+64 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|sys||getpagesize(void); } ogetpagesize
65 COMPAT_12 MODULAR compat_netbsd32_12 \
{ int|netbsd32||msync(netbsd32_voidp addr, \
netbsd32_size_t len); }
@@ -215,7 +217,8 @@
{ int|netbsd32||setitimer(int which, \
netbsd32_itimerval50p_t itv, \
netbsd32_itimerval50p_t oitv); }
-84 COMPAT_43 { int|sys||wait(void); } owait
+84 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|sys||wait(void); } owait
85 COMPAT_12 MODULAR compat_netbsd32_12 \
{ int|netbsd32||oswapon(netbsd32_charp name); }
86 COMPAT_50 MODULAR compat_netbsd32_50 \
@@ -227,7 +230,8 @@
88 COMPAT_43 MODULAR compat_netbsd32_43 \
{ int|netbsd32||osethostname(netbsd32_charp hostname, \
u_int len); }
-89 COMPAT_43 { int|sys||getdtablesize(void); } ogetdtablesize
+89 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|sys||getdtablesize(void); } ogetdtablesize
90 STD { int|netbsd32||dup2(int from, int to); }
91 UNIMPL getdopt
92 STD { int|netbsd32||fcntl(int fd, int cmd, \
@@ -336,7 +340,8 @@
141 COMPAT_43 MODULAR compat_netbsd32_43 \
{ int|netbsd32||ogetpeername(int fdes, \
netbsd32_voidp asa, netbsd32_intp alen); }
-142 COMPAT_43 { int32_t|sys||gethostid(void); } ogethostid
+142 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int32_t|sys||gethostid(void); } ogethostid
143 COMPAT_43 MODULAR compat_netbsd32_43 \
{ int|netbsd32||sethostid(int32_t hostid); }
144 COMPAT_43 MODULAR compat_netbsd32_43 \
@@ -351,7 +356,8 @@
148 COMPAT_50 MODULAR compat_netbsd32_50 \
{ int|netbsd32||quotactl(netbsd32_charp path, int cmd, \
int uid, netbsd32_voidp arg); }
-149 COMPAT_43 { int|sys||quota(void); } oquota
+149 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|sys||quota(void); } oquota
150 COMPAT_43 MODULAR compat_netbsd32_43 \
{ int|netbsd32||ogetsockname(int fdec, \
netbsd32_voidp asa, netbsd32_intp alen); }
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Thu Sep 13 02:03:49 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_mod.c
Log Message:
Now that compat_netbsd32 is no longer monolithic, it no longer
requires compat_09 (and all higher) compat code. Adjust the
requirements list accordingly.
To generate a diff of this commit:
cvs rdiff -u -r1.13.16.6 -r1.13.16.7 src/sys/compat/netbsd32/netbsd32_mod.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/netbsd32/netbsd32_mod.c
diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.6 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.7
--- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.6 Tue Sep 11 23:26:21 2018
+++ src/sys/compat/netbsd32/netbsd32_mod.c Thu Sep 13 02:03:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_mod.c,v 1.13.16.6 2018/09/11 23:26:21 pgoyette Exp $ */
+/* $NetBSD: netbsd32_mod.c,v 1.13.16.7 2018/09/13 02:03:49 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.6 2018/09/11 23:26:21 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.7 2018/09/13 02:03:49 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -48,14 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod
#include
#include
-# define DEPS1 "compat_09,ksem"
-
-#if defined(EXEC_ELF32)
-# define DEPS2 ",exec_elf32"
-#else
-# define DEPS2 ""
-#endif
-
#define ELF32_AUXSIZE (howmany(ELF_AUX_ENTRIES * sizeof(Aux32Info), \
sizeof(Elf32_Addr)) + MAXPATHLEN + ALIGN(1))
@@ -65,6 +57,14 @@ int compat32_80_modctl_compat_stub(struc
int (*vec_compat32_80_modctl)(struct lwp *,
const struct netbsd32_modctl_args *, register_t *);
+# define DEPS1 "ksem"
+
+#if defined(EXEC_ELF32)
+# define DEPS2 ",exec_elf32"
+#else
+# define DEPS2 ""
+#endif
+
MODULE(MODULE_CLASS_EXEC, compat_netbsd32, DEPS1 DEPS2);
static struct execsw netbsd32_execsw[] = {
CVS commit: src/sys
Module Name:src
Committed By: mrg
Date: Thu Sep 13 01:55:16 UTC 2018
Modified Files:
src/sys/ddb: db_command.c
src/sys/kern: subr_lockdebug.c
Log Message:
always call lockdebug_dismiss() from DDB -- there are always some
minimal lockdebug checks in place, even without LOCKDEBUG.
adjust lockdebug_abort() to ignore problems after ld_panic is set
so that there's a chance of this working.
this fixes ddb 'reboot' on softiron od1000.
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/ddb/db_command.c
cvs rdiff -u -r1.66 -r1.67 src/sys/kern/subr_lockdebug.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/ddb/db_command.c
diff -u src/sys/ddb/db_command.c:1.156 src/sys/ddb/db_command.c:1.157
--- src/sys/ddb/db_command.c:1.156 Mon Aug 13 03:20:19 2018
+++ src/sys/ddb/db_command.c Thu Sep 13 01:55:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: db_command.c,v 1.156 2018/08/13 03:20:19 mrg Exp $ */
+/* $NetBSD: db_command.c,v 1.157 2018/09/13 01:55:16 mrg Exp $ */
/*
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2009 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.156 2018/08/13 03:20:19 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.157 2018/09/13 01:55:16 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_aio.h"
@@ -1353,9 +1353,7 @@ db_reboot_cmd(db_expr_t addr, bool have_
*/
db_recover = 0;
/* Avoid all mutex errors */
-#ifdef LOCKDEBUG
lockdebug_dismiss();
-#endif
panicstr = "reboot forced via kernel debugger";
cpu_reboot((int)bootflags, NULL);
#else /* _KERNEL */
Index: src/sys/kern/subr_lockdebug.c
diff -u src/sys/kern/subr_lockdebug.c:1.66 src/sys/kern/subr_lockdebug.c:1.67
--- src/sys/kern/subr_lockdebug.c:1.66 Mon Sep 3 16:29:35 2018
+++ src/sys/kern/subr_lockdebug.c Thu Sep 13 01:55:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_lockdebug.c,v 1.66 2018/09/03 16:29:35 riastradh Exp $ */
+/* $NetBSD: subr_lockdebug.c,v 1.67 2018/09/13 01:55:16 mrg Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.66 2018/09/03 16:29:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.67 2018/09/13 01:55:16 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1016,20 +1016,21 @@ lockdebug_abort(const char *func, size_t
#endif /* LOCKDEBUG */
/*
- * Complain first on the occurrance only. Otherwise proceeed to
- * panic where we will `rendezvous' with other CPUs if the machine
- * is going down in flames.
+ * Don't make the situation worse if the system is already going
+ * down in flames. Once a panic is triggered, lockdebug state
+ * becomes stale and cannot be trusted.
*/
- if (atomic_inc_uint_nv(_panic) == 1) {
- printf_nolog("%s error: %s,%zu: %s\n\n"
- "lock address : %#018lx\n"
- "current cpu : %18d\n"
- "current lwp : %#018lx\n",
- ops->lo_name, func, line, msg, (long)lock,
- (int)cpu_index(curcpu()), (long)curlwp);
- (*ops->lo_dump)(lock);
- printf_nolog("\n");
- }
+ if (atomic_inc_uint_nv(_panic) > 1)
+ return;
+
+ printf_nolog("%s error: %s,%zu: %s\n\n"
+ "lock address : %#018lx\n"
+ "current cpu : %18d\n"
+ "current lwp : %#018lx\n",
+ ops->lo_name, func, line, msg, (long)lock,
+ (int)cpu_index(curcpu()), (long)curlwp);
+ (*ops->lo_dump)(lock);
+ printf_nolog("\n");
panic("lock error: %s: %s,%zu: %s: lock %p cpu %d lwp %p",
ops->lo_name, func, line, msg, lock, cpu_index(curcpu()), curlwp);
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Thu Sep 13 01:26:33 UTC 2018
Modified Files:
src/lib/libedit: history.c
Log Message:
more efficient to use decode_result :-) Pointed out by kre@
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/lib/libedit/history.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/history.c
diff -u src/lib/libedit/history.c:1.60 src/lib/libedit/history.c:1.61
--- src/lib/libedit/history.c:1.60 Wed Sep 12 18:10:35 2018
+++ src/lib/libedit/history.c Wed Sep 12 21:26:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: history.c,v 1.60 2018/09/12 22:10:35 christos Exp $ */
+/* $NetBSD: history.c,v 1.61 2018/09/13 01:26:33 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)history.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: history.c,v 1.60 2018/09/12 22:10:35 christos Exp $");
+__RCSID("$NetBSD: history.c,v 1.61 2018/09/13 01:26:33 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -811,7 +811,7 @@ history_load(TYPE(History) *h, const cha
decode_result = ct_decode_string(ptr, );
if (decode_result == NULL)
continue;
- if (HENTER(h, , ct_decode_string(ptr, )) == -1) {
+ if (HENTER(h, , decode_result)) == -1) {
i = -1;
goto oomem;
}
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Sep 13 01:15:59 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_60.c Log Message: Another dependency typo To generate a diff of this commit: cvs rdiff -u -r1.3.2.6 -r1.3.2.7 src/sys/compat/netbsd32/netbsd32_compat_60.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/netbsd32/netbsd32_compat_60.c diff -u src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.6 src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.7 --- src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.6 Tue Sep 11 21:18:32 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_60.c Thu Sep 13 01:15:59 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_60.c,v 1.3.2.6 2018/09/11 21:18:32 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_60.c,v 1.3.2.7 2018/09/13 01:15:59 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.3.2.6 2018/09/11 21:18:32 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.3.2.7 2018/09/13 01:15:59 pgoyette Exp $"); #include #include @@ -94,7 +94,7 @@ static struct syscall_package compat_net }; -MODULE(MODULE_CLASS_EXEC, compat_netbsd32_60, "compat_netbsd,compat_60"); +MODULE(MODULE_CLASS_EXEC, compat_netbsd32_60, "compat_netbsd32,compat_60"); static int compat_netbsd32_60_modcmd(modcmd_t cmd, void *arg)
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Thu Sep 13 00:15:01 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: compat_sysv_10_mod.c compat_sysv_14_mod.c Log Message: Fix some module requirements To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/compat/common/compat_sysv_10_mod.c \ src/sys/compat/common/compat_sysv_14_mod.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/common/compat_sysv_10_mod.c diff -u src/sys/compat/common/compat_sysv_10_mod.c:1.1.2.1 src/sys/compat/common/compat_sysv_10_mod.c:1.1.2.2 --- src/sys/compat/common/compat_sysv_10_mod.c:1.1.2.1 Tue Apr 17 23:06:11 2018 +++ src/sys/compat/common/compat_sysv_10_mod.c Thu Sep 13 00:15:00 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_sysv_10_mod.c,v 1.1.2.1 2018/04/17 23:06:11 pgoyette Exp $ */ +/* $NetBSD: compat_sysv_10_mod.c,v 1.1.2.2 2018/09/13 00:15:00 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_sysv_10_mod.c,v 1.1.2.1 2018/04/17 23:06:11 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_sysv_10_mod.c,v 1.1.2.2 2018/09/13 00:15:00 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -44,7 +44,8 @@ __KERNEL_RCSID(0, "$NetBSD: compat_sysv_ #include #include -MODULE(MODULE_CLASS_EXEC, compat_sysv_10, "sysv_ipc,sysv_50,sysv_14"); +MODULE(MODULE_CLASS_EXEC, compat_sysv_10, +"sysv_ipc,compat_sysv_50,compat_sysv_14"); /* Build the syscall package based on options specified */ Index: src/sys/compat/common/compat_sysv_14_mod.c diff -u src/sys/compat/common/compat_sysv_14_mod.c:1.1.2.1 src/sys/compat/common/compat_sysv_14_mod.c:1.1.2.2 --- src/sys/compat/common/compat_sysv_14_mod.c:1.1.2.1 Tue Apr 17 23:06:11 2018 +++ src/sys/compat/common/compat_sysv_14_mod.c Thu Sep 13 00:15:00 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_sysv_14_mod.c,v 1.1.2.1 2018/04/17 23:06:11 pgoyette Exp $ */ +/* $NetBSD: compat_sysv_14_mod.c,v 1.1.2.2 2018/09/13 00:15:00 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_sysv_14_mod.c,v 1.1.2.1 2018/04/17 23:06:11 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_sysv_14_mod.c,v 1.1.2.2 2018/09/13 00:15:00 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: compat_sysv_ #include #include -MODULE(MODULE_CLASS_EXEC, compat_sysv_14, "sysv_ipc_50,sysv_ipc"); +MODULE(MODULE_CLASS_EXEC, compat_sysv_14, "compat_sysv_50,sysv_ipc"); /* Build the syscall package based on options specified */
CVS commit: src/bin/test
Module Name:src
Committed By: kre
Date: Wed Sep 12 23:33:31 UTC 2018
Modified Files:
src/bin/test: test.c
Log Message:
PR standards/34646
Make test(1) always use the POSIX "number of args" evaluation rules
when they apply.
Only fall back to the old expression evaluation when there are more
than 4 args, or when the args given cannot work as a test expression
using the POSIX rules. That is when the result is unspecified.
Also fix old bug where a string of whitespace is considered to be a
valid number (at least one digit is needed amongst it somewhere...)
XXX pullup -8
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/bin/test/test.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/test/test.c
diff -u src/bin/test/test.c:1.41 src/bin/test/test.c:1.42
--- src/bin/test/test.c:1.41 Mon Sep 5 01:00:07 2016
+++ src/bin/test/test.c Wed Sep 12 23:33:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: test.c,v 1.41 2016/09/05 01:00:07 sevan Exp $ */
+/* $NetBSD: test.c,v 1.42 2018/09/12 23:33:31 kre Exp $ */
/*
* test(1); version 7-like -- author Erik Baalbergen
@@ -12,7 +12,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: test.c,v 1.41 2016/09/05 01:00:07 sevan Exp $");
+__RCSID("$NetBSD: test.c,v 1.42 2018/09/12 23:33:31 kre Exp $");
#endif
#include
@@ -160,10 +160,13 @@ __dead static void syntax(const char *,
static int oexpr(enum token);
static int aexpr(enum token);
static int nexpr(enum token);
+static struct t_op const *findop(const char *);
static int primary(enum token);
static int binop(void);
+static int perform_unop(enum token, const char *);
+static int perform_binop(enum token, const char *, const char *);
static int test_access(struct stat *, mode_t);
-static int filstat(char *, enum token);
+static int filstat(const char *, enum token);
static enum token t_lex(char *);
static int isoperand(void);
static long long getn(const char *);
@@ -171,6 +174,11 @@ static int newerf(const char *, const ch
static int olderf(const char *, const char *);
static int equalf(const char *, const char *);
+static int one_arg(const char *);
+static int two_arg(const char *, const char *);
+static int three_arg(const char *, const char *, const char *);
+static int four_arg(const char *, const char *, const char *, const char *);
+
#if defined(SHELL)
extern void error(const char *, ...) __dead __printflike(1, 2);
extern void *ckmalloc(size_t);
@@ -226,9 +234,64 @@ main(int argc, char *argv[])
argv[argc] = NULL;
}
- if (argc < 2)
+ /*
+ * POSIX defines operations of test for up to 4 args
+ * (depending upon what the args are in some cases)
+ *
+ * arg count does not include the command name, (but argc does)
+ * nor the closing ']' when the command was '[' (removed above)
+ *
+ * None of the following allow -a or -o as an operator (those
+ * only apply in the evaluation of unspeicified expressions)
+ *
+ * Note that the xxx_arg() functions return "shell" true/false
+ * (0 == true, 1 == false) or -1 for "unspecified case"
+ *
+ * Other functions return C true/false (1 == true, 0 == false)
+ *
+ * Hence we simply return the result from xxx_arg(), but
+ * invert the result of oexpr() below before returning it.
+ */
+ switch (argc - 1) {
+ case -1: /* impossible, but never mind */
+ case 0: /* test $awhere a=''false */
return 1;
+ case 1: /* test "$a" */
+ return one_arg(argv[1]); /* always works */
+
+ case 2: /* test op "$a" */
+ res = two_arg(argv[1], argv[2]);
+ if (res >= 0)
+ return res;
+ break;
+
+ case 3: /* test "$a" op "$b" or test ! op "$a" */
+ res = three_arg(argv[1], argv[2], argv[3]);
+ if (res >= 0)
+ return res;
+ break;
+
+ case 4: /* test ! "$a" op "$b" or test ( op "$a" ) */
+ res = four_arg(argv[1], argv[2], argv[3], argv[4]);
+ if (res >= 0)
+ return res;
+ break;
+
+ default:
+ break;
+ }
+
+ /*
+ * All other cases produce unspecified results
+ * (including cases above with small arg counts where the
+ * args are not what was expected to be seen)
+ *
+ * We fall back to the old method, of attempting to parse
+ * the expr (highly ambiguous as there is no distinction between
+ * operators and operands that happen to look like operators)
+ */
+
t_wp = [1];
res = !oexpr(t_lex(*t_wp));
@@ -246,6 +309,85 @@ syntax(const char *op, const char *msg)
error("%s: %s", op, msg);
else
error("%s", msg);
+}
+
+static int
+one_arg(const char *arg)
+{
+ /*
+ * True (exit 0, so false...) if arg is not a null string
+ * False (so exit 1, so true) if it is.
+ */
+ return *arg == '\0';
+}
+
+static int
+two_arg(const char *a1, const char *a2)
+{
+ static struct t_op const *op;
+
+ if (a1[0] == '!' && a1[1] == 0)
+ return !one_arg(a2);
+
+ op = findop(a1);
+ if (op != NULL && op->op_type == UNOP)
+ return !perform_unop(op->op_num, a2);
+
+ /*
+ * an extension, but as we've
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 23:28:16 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_ipc.c Log Message: Use correct module name for dependency To generate a diff of this commit: cvs rdiff -u -r1.18.16.4 -r1.18.16.5 src/sys/compat/netbsd32/netbsd32_ipc.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/netbsd32/netbsd32_ipc.c diff -u src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.4 src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.5 --- src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.4 Wed Sep 12 04:35:22 2018 +++ src/sys/compat/netbsd32/netbsd32_ipc.c Wed Sep 12 23:28:16 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_ipc.c,v 1.18.16.4 2018/09/12 04:35:22 pgoyette Exp $ */ +/* $NetBSD: netbsd32_ipc.c,v 1.18.16.5 2018/09/12 23:28:16 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18.16.4 2018/09/12 04:35:22 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18.16.5 2018/09/12 23:28:16 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -83,7 +83,7 @@ static const struct syscall_package comp }; MODULE(MODULE_CLASS_EXEC, compat_netbsd32_sysvipc, -"sysv_ipc,compat_netbsd32,compat_sysv"); +"sysv_ipc,compat_netbsd32,sysv_ipc"); static int compat_netbsd32_sysvipc_modcmd(modcmd_t cmd, void *arg)
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Wed Sep 12 23:27:25 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.10 -r1.134.2.11 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.9 -r1.134.2.10 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.10 -r1.132.2.11 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.9 -r1.13.2.10 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.9 -r1.132.2.10 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.9 -r1.24.2.10 \
src/sys/compat/netbsd32/netbsd32_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/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.10 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.11
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.10 Wed Sep 12 03:22:07 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Wed Sep 12 23:27:24 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.10 2018/09/12 03:22:07 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.11 2018/09/12 23:27:24 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.9 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.10
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.9 Wed Sep 12 03:22:07 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Wed Sep 12 23:27:24 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.9 2018/09/12 03:22:07 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.10 2018/09/12 23:27:24 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.10 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.11
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.10 Wed Sep 12 03:22:07 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Wed Sep 12 23:27:24 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.10 2018/09/12 03:22:07 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.11 2018/09/12 23:27:24 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.10 2018/09/12 03:22:07 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.11 2018/09/12 23:27:24 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.9 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.10
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.9 Wed Sep 12 03:22:07 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Wed Sep 12 23:27:24 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.9 2018/09/12 03:22:07 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.10 2018/09/12 23:27:24 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.9 2018/09/12 03:22:07 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.10 2018/09/12 23:27:24 pgoyette Exp $");
#include
static struct sc_autoload netbsd32_syscalls_autoload[] = {
@@ -38,6 +38,7 @@ static struct sc_autoload netbsd32_sysca
{
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Wed Sep 12 23:26:38 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master
Log Message:
Missed a couple of MODULAR tags
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.13 -r1.120.2.14 \
src/sys/compat/netbsd32/syscalls.master
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/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.13 src/sys/compat/netbsd32/syscalls.master:1.120.2.14
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.13 Wed Sep 12 03:21:14 2018
+++ src/sys/compat/netbsd32/syscalls.master Wed Sep 12 23:26:38 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -263,7 +263,8 @@
netbsd32_voidp val, int valsize); }
106 STD { int|netbsd32||listen(int s, int backlog); }
107 OBSOL vtimes
-108 COMPAT_43 { int|netbsd32||osigvec(int signum, \
+108 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|netbsd32||osigvec(int signum, \
netbsd32_sigvecp_t nsv, netbsd32_sigvecp_t osv); }
109 COMPAT_43 MODULAR compat_netbsd32_43 \
{ int|netbsd32||sigblock(int mask); }
@@ -447,7 +448,8 @@
netbsd32_rlimitp_t rlp); }
195 STD { int|netbsd32||setrlimit(int which, \
netbsd32_rlimitp_t rlp); }
-196 COMPAT_12 { int|netbsd32||getdirentries(int fd, \
+196 COMPAT_12 MODULAR compat_netbsd32_12 \
+ { int|netbsd32||getdirentries(int fd, \
netbsd32_charp buf, u_int count, \
netbsd32_longp basep); }
197 STD { netbsd32_voidp|netbsd32||mmap(netbsd32_voidp addr, \
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: sevan Date: Wed Sep 12 22:10:07 UTC 2018 Modified Files: src/games/fortune/datfiles: fortunes Log Message: I've been on an Ed Wood binge. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/games/fortune/datfiles/fortunes Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes diff -u src/games/fortune/datfiles/fortunes:1.72 src/games/fortune/datfiles/fortunes:1.73 --- src/games/fortune/datfiles/fortunes:1.72 Tue May 8 05:24:22 2018 +++ src/games/fortune/datfiles/fortunes Wed Sep 12 22:10:07 2018 @@ -16231,3 +16231,9 @@ reaching the destination quickly. [NeXT] attracted the strangest kind of hybrid, which was sort of like... Unix weenies by Armani. -- John Perry Barlow +% +Greetings, my friend. We are all interested in the future, for that is where you +and I are going to spend the rest of our lives. And remember, my friend, future +events such as these will affect you in the future. You are interested in the +unknown, the mysterious, the unexplainable. That is why you are here. + -- Criswell Predicts, "Plan 9 From Outer Space"
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Wed Sep 12 22:10:35 UTC 2018
Modified Files:
src/lib/libedit: history.c
Log Message:
PR/53597: Yasuhiro Horimoto: Avoid segmentation fault in bad history file.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/lib/libedit/history.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/history.c
diff -u src/lib/libedit/history.c:1.59 src/lib/libedit/history.c:1.60
--- src/lib/libedit/history.c:1.59 Sat Dec 23 13:25:03 2017
+++ src/lib/libedit/history.c Wed Sep 12 18:10:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: history.c,v 1.59 2017/12/23 18:25:03 uwe Exp $ */
+/* $NetBSD: history.c,v 1.60 2018/09/12 22:10:35 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)history.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: history.c,v 1.59 2017/12/23 18:25:03 uwe Exp $");
+__RCSID("$NetBSD: history.c,v 1.60 2018/09/12 22:10:35 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -775,6 +775,7 @@ history_load(TYPE(History) *h, const cha
char *ptr;
int i = -1;
TYPE(HistEvent) ev;
+ Char *decode_result;
#ifndef NARROWCHAR
static ct_buffer_t conv;
#endif
@@ -807,6 +808,9 @@ history_load(TYPE(History) *h, const cha
ptr = nptr;
}
(void) strunvis(ptr, line);
+ decode_result = ct_decode_string(ptr, );
+ if (decode_result == NULL)
+ continue;
if (HENTER(h, , ct_decode_string(ptr, )) == -1) {
i = -1;
goto oomem;
CVS commit: src/sys/net/npf
Module Name:src
Committed By: christos
Date: Wed Sep 12 21:58:38 UTC 2018
Modified Files:
src/sys/net/npf: npf.c npf_alg.c npf_impl.h
Log Message:
Fix lockdebug diagnostic error of trying to acquire an rw_lock from a
pserialized active context. From riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/net/npf/npf.c
cvs rdiff -u -r1.16 -r1.17 src/sys/net/npf/npf_alg.c
cvs rdiff -u -r1.71 -r1.72 src/sys/net/npf/npf_impl.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/net/npf/npf.c
diff -u src/sys/net/npf/npf.c:1.34 src/sys/net/npf/npf.c:1.35
--- src/sys/net/npf/npf.c:1.34 Wed May 31 22:45:14 2017
+++ src/sys/net/npf/npf.c Wed Sep 12 17:58:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.c,v 1.34 2017/06/01 02:45:14 chs Exp $ */
+/* $NetBSD: npf.c,v 1.35 2018/09/12 21:58:38 christos Exp $ */
/*-
* Copyright (c) 2009-2013 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#ifdef _KERNEL
#include
-__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.34 2017/06/01 02:45:14 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.35 2018/09/12 21:58:38 christos Exp $");
#include
#include
@@ -56,6 +56,7 @@ npf_sysinit(unsigned nworkers)
npf_bpf_sysinit();
npf_tableset_sysinit();
npf_nat_sysinit();
+ npf_alg_sysinit();
return npf_worker_sysinit(nworkers);
}
@@ -63,6 +64,7 @@ __dso_public void
npf_sysfini(void)
{
npf_worker_sysfini();
+ npf_alg_sysfini();
npf_nat_sysfini();
npf_tableset_sysfini();
npf_bpf_sysfini();
Index: src/sys/net/npf/npf_alg.c
diff -u src/sys/net/npf/npf_alg.c:1.16 src/sys/net/npf/npf_alg.c:1.17
--- src/sys/net/npf/npf_alg.c:1.16 Mon Dec 26 18:05:06 2016
+++ src/sys/net/npf/npf_alg.c Wed Sep 12 17:58:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_alg.c,v 1.16 2016/12/26 23:05:06 christos Exp $ */
+/* $NetBSD: npf_alg.c,v 1.17 2018/09/12 21:58:38 christos Exp $ */
/*-
* Copyright (c) 2010-2013 The NetBSD Foundation, Inc.
@@ -35,13 +35,14 @@
#ifdef _KERNEL
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_alg.c,v 1.16 2016/12/26 23:05:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_alg.c,v 1.17 2018/09/12 21:58:38 christos Exp $");
#include
#include
#include
#include
+#include
#include
#include
#include
@@ -67,11 +68,31 @@ struct npf_algset {
/* Matching, inspection and translation functions. */
npfa_funcs_t alg_funcs[NPF_MAX_ALGS];
+
+ /* Passive reference until we npf conn lookup is pserialize-safe. */
+ struct psref_target alg_psref[NPF_MAX_ALGS];
};
static const char alg_prefix[] = "npf_alg_";
#define NPF_EXT_PREFLEN (sizeof(alg_prefix) - 1)
+__read_mostly static struct psref_class * npf_alg_psref_class = NULL;
+
+void
+npf_alg_sysinit(void)
+{
+
+ npf_alg_psref_class = psref_class_create("npf_alg", IPL_SOFTNET);
+}
+
+void
+npf_alg_sysfini(void)
+{
+
+ psref_class_destroy(npf_alg_psref_class);
+ npf_alg_psref_class = NULL;
+}
+
void
npf_alg_init(npf_t *npf)
{
@@ -160,6 +181,10 @@ npf_alg_register(npf_t *npf, const char
alg->na_name = name;
alg->na_slot = i;
+ /* Prepare a psref target. */
+ psref_target_init(>alg_psref[i], npf_alg_psref_class);
+ membar_producer();
+
/* Assign the functions. */
afuncs = >alg_funcs[i];
afuncs->match = funcs->match;
@@ -189,6 +214,7 @@ npf_alg_unregister(npf_t *npf, npf_alg_t
afuncs->translate = NULL;
afuncs->inspect = NULL;
pserialize_perform(npf->qsbr);
+ psref_target_destroy(>alg_psref[i], npf_alg_psref_class);
/* Finally, unregister the ALG. */
npf_ruleset_freealg(npf_config_natset(npf), alg);
@@ -246,15 +272,23 @@ npf_alg_conn(npf_cache_t *npc, int di)
{
npf_algset_t *aset = npc->npc_ctx->algset;
npf_conn_t *con = NULL;
+ struct psref psref;
int s;
s = pserialize_read_enter();
for (u_int i = 0; i < aset->alg_count; i++) {
const npfa_funcs_t *f = >alg_funcs[i];
+ struct psref_target *psref_target = >alg_psref[i];
if (!f->inspect)
continue;
- if ((con = f->inspect(npc, di)) != NULL)
+ membar_consumer();
+ psref_acquire(, psref_target, npf_alg_psref_class);
+ pserialize_read_exit(s);
+ con = f->inspect(npc, di);
+ s = pserialize_read_enter();
+ psref_release(, psref_target, npf_alg_psref_class);
+ if (con != NULL)
break;
}
pserialize_read_exit(s);
Index: src/sys/net/npf/npf_impl.h
diff -u src/sys/net/npf/npf_impl.h:1.71 src/sys/net/npf/npf_impl.h:1.72
--- src/sys/net/npf/npf_impl.h:1.71 Fri Aug 31 10:16:06 2018
+++ src/sys/net/npf/npf_impl.h Wed Sep 12 17:58:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_impl.h,v 1.71 2018/08/31 14:16:06 maxv Exp $ */
+/* $NetBSD: npf_impl.h,v 1.72 2018/09/12 21:58:38 christos Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -405,6 +405,8 @@ npf_nat_t * npf_nat_import(npf_t *, prop
npf_conn_t *);
/* ALG interface. */
+void npf_alg_sysinit(void);
+void npf_alg_sysfini(void);
void npf_alg_init(npf_t *);
void npf_alg_fini(npf_t *);
CVS commit: src/sys/dev/usb
Module Name:src Committed By: christos Date: Wed Sep 12 21:57:18 UTC 2018 Modified Files: src/sys/dev/usb: if_athn_usb.c if_axe.c if_axen.c if_rum.c if_run.c if_urtw.c if_urtwn.c Log Message: Don't have modules depend on bpf; they will find the dependency dynamically at runtime. Otherwise builtin modules will complain about non-builtin bpf. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/dev/usb/if_athn_usb.c \ src/sys/dev/usb/if_run.c cvs rdiff -u -r1.92 -r1.93 src/sys/dev/usb/if_axe.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/usb/if_axen.c cvs rdiff -u -r1.63 -r1.64 src/sys/dev/usb/if_rum.c \ src/sys/dev/usb/if_urtwn.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/usb/if_urtw.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/dev/usb/if_athn_usb.c diff -u src/sys/dev/usb/if_athn_usb.c:1.29 src/sys/dev/usb/if_athn_usb.c:1.30 --- src/sys/dev/usb/if_athn_usb.c:1.29 Thu Aug 2 02:09:04 2018 +++ src/sys/dev/usb/if_athn_usb.c Wed Sep 12 17:57:18 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_athn_usb.c,v 1.29 2018/08/02 06:09:04 riastradh Exp $ */ +/* $NetBSD: if_athn_usb.c,v 1.30 2018/09/12 21:57:18 christos Exp $ */ /* $OpenBSD: if_athn_usb.c,v 1.12 2013/01/14 09:50:31 jsing Exp $ */ /*- @@ -22,7 +22,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.29 2018/08/02 06:09:04 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.30 2018/09/12 21:57:18 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -2974,7 +2974,7 @@ athn_usb_stop_locked(struct ifnet *ifp) athn_set_power_sleep(sc); } -MODULE(MODULE_CLASS_DRIVER, if_athn_usb, "bpf"); +MODULE(MODULE_CLASS_DRIVER, if_athn_usb, NULL); #ifdef _MODULE #include "ioconf.c" Index: src/sys/dev/usb/if_run.c diff -u src/sys/dev/usb/if_run.c:1.29 src/sys/dev/usb/if_run.c:1.30 --- src/sys/dev/usb/if_run.c:1.29 Thu Aug 2 02:09:04 2018 +++ src/sys/dev/usb/if_run.c Wed Sep 12 17:57:18 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_run.c,v 1.29 2018/08/02 06:09:04 riastradh Exp $ */ +/* $NetBSD: if_run.c,v 1.30 2018/09/12 21:57:18 christos Exp $ */ /* $OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $ */ /*- @@ -23,7 +23,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.29 2018/08/02 06:09:04 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.30 2018/09/12 21:57:18 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -4842,7 +4842,7 @@ run_setup_beacon(struct run_softc *sc) } #endif -MODULE(MODULE_CLASS_DRIVER, if_run, "bpf"); +MODULE(MODULE_CLASS_DRIVER, if_run, NULL); #ifdef _MODULE #include "ioconf.c" Index: src/sys/dev/usb/if_axe.c diff -u src/sys/dev/usb/if_axe.c:1.92 src/sys/dev/usb/if_axe.c:1.93 --- src/sys/dev/usb/if_axe.c:1.92 Thu Aug 2 02:09:04 2018 +++ src/sys/dev/usb/if_axe.c Wed Sep 12 17:57:18 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_axe.c,v 1.92 2018/08/02 06:09:04 riastradh Exp $ */ +/* $NetBSD: if_axe.c,v 1.93 2018/09/12 21:57:18 christos Exp $ */ /* $OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */ /* @@ -87,7 +87,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.92 2018/08/02 06:09:04 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.93 2018/09/12 21:57:18 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1962,7 +1962,7 @@ axe_stop(struct ifnet *ifp, int disable) sc->axe_link = 0; } -MODULE(MODULE_CLASS_DRIVER, if_axe, "bpf"); +MODULE(MODULE_CLASS_DRIVER, if_axe, NULL); #ifdef _MODULE #include "ioconf.c" Index: src/sys/dev/usb/if_axen.c diff -u src/sys/dev/usb/if_axen.c:1.16 src/sys/dev/usb/if_axen.c:1.17 --- src/sys/dev/usb/if_axen.c:1.16 Thu Aug 2 02:09:04 2018 +++ src/sys/dev/usb/if_axen.c Wed Sep 12 17:57:18 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_axen.c,v 1.16 2018/08/02 06:09:04 riastradh Exp $ */ +/* $NetBSD: if_axen.c,v 1.17 2018/09/12 21:57:18 christos Exp $ */ /* $OpenBSD: if_axen.c,v 1.3 2013/10/21 10:10:22 yuo Exp $ */ /* @@ -23,7 +23,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.16 2018/08/02 06:09:04 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.17 2018/09/12 21:57:18 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1560,7 +1560,7 @@ axen_stop(struct ifnet *ifp, int disable sc->axen_link = 0; } -MODULE(MODULE_CLASS_DRIVER, if_axen, "bpf"); +MODULE(MODULE_CLASS_DRIVER, if_axen, NULL); #ifdef _MODULE #include "ioconf.c" Index: src/sys/dev/usb/if_rum.c diff -u src/sys/dev/usb/if_rum.c:1.63 src/sys/dev/usb/if_rum.c:1.64 --- src/sys/dev/usb/if_rum.c:1.63 Thu Aug 2 02:09:04 2018 +++ src/sys/dev/usb/if_rum.c Wed Sep 12 17:57:18 2018 @@ -1,5 +1,5 @@ /* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */ -/* $NetBSD: if_rum.c,v 1.63 2018/08/02 06:09:04 riastradh Exp $ */ +/* $NetBSD: if_rum.c,v 1.64 2018/09/12 21:57:18 christos Exp $ */ /*- * Copyright (c)
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Wed Sep 12 21:52:17 UTC 2018
Added Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_16.c
netbsd32_compat_40.c
Log Message:
Add some more module glue
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/sys/compat/netbsd32/netbsd32_compat_16.c \
src/sys/compat/netbsd32/netbsd32_compat_40.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/compat/netbsd32/netbsd32_compat_16.c
diff -u /dev/null src/sys/compat/netbsd32/netbsd32_compat_16.c:1.1.2.1
--- /dev/null Wed Sep 12 21:52:17 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_16.c Wed Sep 12 21:52:17 2018
@@ -0,0 +1,79 @@
+/* $NetBSD: netbsd32_compat_16.c,v 1.1.2.1 2018/09/12 21:52:17 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *must display the following acknowledgement:
+ *This product includes software developed by the NetBSD
+ *Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *contributors may be used to endorse or promote products derived
+ *from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_16.c,v 1.1.2.1 2018/09/12 21:52:17 pgoyette Exp $");
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+extern char netbsd32_sigcode[], netbsd32_esigcode[];
+struct uvm_object *emul_netbsd32_object;
+
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_16, "compat_netbsd32,compat_16");
+
+static int
+compat_netbsd32_16_modcmd(modcmd_t cmd, void *arg)
+{
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ emul_netbsd32.e_sigcode = netbsd32_sigcode;
+ emul_netbsd32.e_esigcode = netbsd32_esigcode;
+ emul_netbsd32.e_sigobject = _netbsd32_object;
+ return 0;
+
+ case MODULE_CMD_FINI:
+ emul_netbsd32.e_sigcode = NULL;
+ emul_netbsd32.e_esigcode = NULL;
+ emul_netbsd32.e_sigobject = NULL;
+ return 0;
+
+ default:
+ return ENOTTY;
+ }
+}
Index: src/sys/compat/netbsd32/netbsd32_compat_40.c
diff -u /dev/null src/sys/compat/netbsd32/netbsd32_compat_40.c:1.1.2.1
--- /dev/null Wed Sep 12 21:52:17 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_40.c Wed Sep 12 21:52:17 2018
@@ -0,0 +1,97 @@
+/* $NetBSD: netbsd32_compat_40.c,v 1.1.2.1 2018/09/12 21:52:17 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *must display the following acknowledgement:
+ *This product includes software developed by the NetBSD
+ *
CVS commit: [pgoyette-compat] src/sys
Module Name:src Committed By: pgoyette Date: Wed Sep 12 21:46:09 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: files.common src/sys/modules [pgoyette-compat]: Makefile Removed Files: src/sys/compat/common [pgoyette-compat]: compat_sysv_mod.c src/sys/modules/compat_sysv [pgoyette-compat]: Makefile Log Message: Complete removal of the "monolithic" all-version compat_sysvipc module To generate a diff of this commit: cvs rdiff -u -r1.4.10.4 -r0 src/sys/compat/common/compat_sysv_mod.c cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/sys/compat/common/files.common cvs rdiff -u -r1.202.2.32 -r1.202.2.33 src/sys/modules/Makefile cvs rdiff -u -r1.3.10.5 -r0 src/sys/modules/compat_sysv/Makefile 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/common/files.common diff -u src/sys/compat/common/files.common:1.1.2.34 src/sys/compat/common/files.common:1.1.2.35 --- src/sys/compat/common/files.common:1.1.2.34 Mon Sep 10 08:41:47 2018 +++ src/sys/compat/common/files.common Wed Sep 12 21:46:09 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.common,v 1.1.2.34 2018/09/10 08:41:47 pgoyette Exp $ +# $NetBSD: files.common,v 1.1.2.35 2018/09/12 21:46:09 pgoyette Exp $ # # Generic files, used by all compat options. @@ -108,20 +108,25 @@ file compat/common/kern_mod_80.c compat # Module interface for sysv ipc compatability options -define compat_sysv : sysvmsg, sysvshm, sysvsem -file compat/common/compat_sysv_mod.c compat_sysv - # Compatibility code for NetBSD 1.0 -file compat/common/kern_ipc_10.c compat_sysv +file compat/common/compat_sysv_10_mod.c compat_10 & + (sysvmsg | sysvshm | sysvsem) +file compat/common/kern_ipc_10.c compat_10 & + (sysvmsg | sysvshm | sysvsem) # Compatibility code for NetBSD 1.4 -file compat/common/sysv_msg_14.c compat_sysv -file compat/common/sysv_sem_14.c compat_sysv -file compat/common/sysv_shm_14.c compat_sysv +file compat/common/compat_sysv_14_mod.c compat_14 & + (sysvmsg | sysvshm | sysvsem) +file compat/common/sysv_msg_14.c compat_14 & sysvmsg +file compat/common/sysv_sem_14.c compat_14 & sysvsem +file compat/common/sysv_shm_14.c compat_14 & sysvshm # Compatibility code for NetBSD 5.0 -file compat/common/sysv_ipc_50.c compat_sysv -file compat/common/sysv_msg_50.c compat_sysv -file compat/common/sysv_sem_50.c compat_sysv -file compat/common/sysv_shm_50.c compat_sysv +file compat/common/compat_sysv_50_mod.c compat_50 & + (sysvmsg | sysvshm | sysvsem) +file compat/common/sysv_ipc_50.c compat_50 & + (sysvmsg | sysvshm | sysvsem) +file compat/common/sysv_msg_50.c compat_50 & sysvmsg +file compat/common/sysv_sem_50.c compat_50 & sysvsem +file compat/common/sysv_shm_50.c compat_50 & sysvshm Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.202.2.32 src/sys/modules/Makefile:1.202.2.33 --- src/sys/modules/Makefile:1.202.2.32 Wed Sep 12 04:35:22 2018 +++ src/sys/modules/Makefile Wed Sep 12 21:46:08 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.202.2.32 2018/09/12 04:35:22 pgoyette Exp $ +# $NetBSD: Makefile,v 1.202.2.33 2018/09/12 21:46:08 pgoyette Exp $ .include @@ -6,14 +6,12 @@ # Modules for compatability with earlier versions of NetBSD -#SUBDIR+= compat SUBDIR+= compat_util SUBDIR+= compat_43 compat_sysctl_09_43 SUBDIR+= compat_09 compat_10 compat_12 compat_13 compat_14 SUBDIR+= compat_16 compat_20 compat_30 compat_40 compat_50 SUBDIR+= compat_60 compat_70 compat_80 -#SUBDIR+= compat_sysv SUBDIR+= compat_sysv_10 compat_sysv_14 compat_sysv_50 SUBDIR+= accf_dataready
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: para Date: Wed Sep 12 19:55:39 UTC 2018 Modified Files: src/distrib/sets/lists/base: mi Log Message: add new dir to lists To generate a diff of this commit: cvs rdiff -u -r1.1186 -r1.1187 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1186 src/distrib/sets/lists/base/mi:1.1187 --- src/distrib/sets/lists/base/mi:1.1186 Fri Sep 7 20:44:04 2018 +++ src/distrib/sets/lists/base/mi Wed Sep 12 19:55:39 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1186 2018/09/07 20:44:04 para Exp $ +# $NetBSD: mi,v 1.1187 2018/09/12 19:55:39 para Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -5970,6 +5970,7 @@ ./var/chroot/named/etc/namedb base-bind-root ./var/chroot/named/etc/namedb/cache base-bind-root ./var/chroot/named/etc/namedb/keys base-bind-root +./var/chroot/named/etc/namedb/nta base-bind-root ./var/chroot/named/usrbase-bind-root ./var/chroot/named/usr/libexec base-bind-root ./var/chroot/named/varbase-bind-root
CVS commit: src/sys/uvm
Module Name:src
Committed By: maxv
Date: Wed Sep 12 15:58:08 UTC 2018
Modified Files:
src/sys/uvm: uvm_map.c
Log Message:
Remove this check, it has never protected against mmap on page zero, and
has since been replaced by the code in exec_vm_minaddr.
To generate a diff of this commit:
cvs rdiff -u -r1.355 -r1.356 src/sys/uvm/uvm_map.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/uvm/uvm_map.c
diff -u src/sys/uvm/uvm_map.c:1.355 src/sys/uvm/uvm_map.c:1.356
--- src/sys/uvm/uvm_map.c:1.355 Mon Sep 3 16:29:37 2018
+++ src/sys/uvm/uvm_map.c Wed Sep 12 15:58:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_map.c,v 1.355 2018/09/03 16:29:37 riastradh Exp $ */
+/* $NetBSD: uvm_map.c,v 1.356 2018/09/12 15:58:08 maxv Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.355 2018/09/03 16:29:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.356 2018/09/12 15:58:08 maxv Exp $");
#include "opt_ddb.h"
#include "opt_pax.h"
@@ -1064,15 +1064,6 @@ uvm_map(struct vm_map *map, vaddr_t *sta
KASSERT((size & PAGE_MASK) == 0);
-#ifndef __USER_VA0_IS_SAFE
- if ((flags & UVM_FLAG_FIXED) && *startp == 0 &&
- !VM_MAP_IS_KERNEL(map) && user_va0_disable) {
- uprintf("%s: process wants to map virtual address 0; see "
- "vm.user_va0_disable in sysctl(7).\n", __func__);
- return EACCES;
- }
-#endif
-
/*
* for pager_map, allocate the new entry first to avoid sleeping
* for memory while we have the map locked.
CVS commit: src/etc/mtree
Module Name:src Committed By: christos Date: Wed Sep 12 15:29:11 UTC 2018 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: add nta named directory. To generate a diff of this commit: cvs rdiff -u -r1.174 -r1.175 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.174 src/etc/mtree/NetBSD.dist.base:1.175 --- src/etc/mtree/NetBSD.dist.base:1.174 Fri Sep 7 12:50:22 2018 +++ src/etc/mtree/NetBSD.dist.base Wed Sep 12 11:29:11 2018 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.174 2018/09/07 16:50:22 christos Exp $ +# $NetBSD: NetBSD.dist.base,v 1.175 2018/09/12 15:29:11 christos Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -1264,6 +1264,7 @@ ./var/chroot/named/etc/namedb ./var/chroot/named/etc/namedb/cache mode=0775 uname=named gname=named ./var/chroot/named/etc/namedb/keys type=dir mode=0775 uname=named gname=named +./var/chroot/named/etc/namedb/nta type=dir mode=0775 uname=named gname=named ./var/chroot/named/usr ./var/chroot/named/usr/libexec ./var/chroot/named/var
CVS commit: src/external/mpl/bind/dist/lib/dns
Module Name:src
Committed By: christos
Date: Wed Sep 12 15:28:42 UTC 2018
Modified Files:
src/external/mpl/bind/dist/lib/dns: view.c
Log Message:
Put the nta files in a subdirectory instead of requiring the namedb root
directory to be writable by named... Others have expressed the same concern,
but upstream refused: https://bugzilla.redhat.com/show_bug.cgi?id=1487823
https://bugs.isc.org/Public/Bug/Display.html?id=46242
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/dns/view.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/bind/dist/lib/dns/view.c
diff -u src/external/mpl/bind/dist/lib/dns/view.c:1.2 src/external/mpl/bind/dist/lib/dns/view.c:1.3
--- src/external/mpl/bind/dist/lib/dns/view.c:1.2 Sun Aug 12 09:02:35 2018
+++ src/external/mpl/bind/dist/lib/dns/view.c Wed Sep 12 11:28:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: view.c,v 1.2 2018/08/12 13:02:35 christos Exp $ */
+/* $NetBSD: view.c,v 1.3 2018/09/12 15:28:42 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -106,7 +106,7 @@ dns_view_create(isc_mem_t *mctx, dns_rda
goto cleanup_view;
}
- result = isc_file_sanitize(NULL, view->name, "nta",
+ result = isc_file_sanitize("nta", view->name, "nta",
buffer, sizeof(buffer));
if (result != ISC_R_SUCCESS)
goto cleanup_name;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jakllsch
Date: Wed Sep 12 13:52:36 UTC 2018
Modified Files:
src/sys/dev/pci: if_msk.c
Log Message:
if_msk: detach/reattach fixes
- Fill in sc->sk_bsize upon pci_mapreg_map() so that we'll correctly
bus_space_unmap() on detach.
- Clear sc->sk_intrhand after interrupt disestablish, to prevent
disestablishing unestablished interrupt.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/pci/if_msk.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/dev/pci/if_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.76 src/sys/dev/pci/if_msk.c:1.77
--- src/sys/dev/pci/if_msk.c:1.76 Thu Aug 23 11:53:15 2018
+++ src/sys/dev/pci/if_msk.c Wed Sep 12 13:52:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.76 2018/08/23 11:53:15 maxv Exp $ */
+/* $NetBSD: if_msk.c,v 1.77 2018/09/12 13:52:36 jakllsch Exp $ */
/* $OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $ */
/*
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.76 2018/08/23 11:53:15 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.77 2018/09/12 13:52:36 jakllsch Exp $");
#include
#include
@@ -1310,7 +1310,6 @@ mskc_attach(device_t parent, device_t se
pcireg_t command, memtype;
pci_intr_handle_t ih;
const char *intrstr = NULL;
- bus_size_t size;
int rc, sk_nodenum;
u_int8_t hw, pmd;
const char *revstr = NULL;
@@ -1356,7 +1355,7 @@ mskc_attach(device_t parent, device_t se
*/
memtype = pci_mapreg_type(pc, pa->pa_tag, SK_PCI_LOMEM);
if (pci_mapreg_map(pa, SK_PCI_LOMEM, memtype, 0, >sk_btag,
- >sk_bhandle, NULL, )) {
+ >sk_bhandle, NULL, >sk_bsize)) {
aprint_error(": can't map mem space\n");
return;
}
@@ -1677,7 +1676,7 @@ fail_2:
pci_intr_disestablish(pc, sc->sk_intrhand);
sc->sk_intrhand = NULL;
fail_1:
- bus_space_unmap(sc->sk_btag, sc->sk_bhandle, size);
+ bus_space_unmap(sc->sk_btag, sc->sk_bhandle, sc->sk_bsize);
sc->sk_bsize = 0;
}
@@ -1687,8 +1686,10 @@ mskc_detach(device_t self, int flags)
struct sk_softc *sc = device_private(self);
int rv;
- if (sc->sk_intrhand)
+ if (sc->sk_intrhand) {
pci_intr_disestablish(sc->sk_pc, sc->sk_intrhand);
+ sc->sk_intrhand = NULL;
+ }
rv = config_detach_children(self, flags);
if (rv != 0)
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Wed Sep 12 13:44:05 UTC 2018
Modified Files:
src/usr.sbin/sysinst: Makefile.inc defs.h main.c
Log Message:
Try to properly guess a path on the ftp server for pkg binaries
and use that as default.
Assume for $N.99 (current) we can use $N.0. Otherwise strip all
RC*/STABLE* annotations and just use the plain numbers.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sysinst/Makefile.inc
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/main.c
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/sysinst/Makefile.inc
diff -u src/usr.sbin/sysinst/Makefile.inc:1.10 src/usr.sbin/sysinst/Makefile.inc:1.11
--- src/usr.sbin/sysinst/Makefile.inc:1.10 Wed Sep 5 12:01:52 2018
+++ src/usr.sbin/sysinst/Makefile.inc Wed Sep 12 13:44:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2018/09/05 12:01:52 martin Exp $
+# $NetBSD: Makefile.inc,v 1.11 2018/09/12 13:44:05 martin Exp $
#
# Makefile for sysinst
@@ -61,10 +61,13 @@ CPPFLAGS+= -DSYSINST_FTP_HOST=\"nyftp.Ne
CPPFLAGS+= -DSYSINST_HTTP_HOST=\"nycdn.NetBSD.org\"
.if (${DISTRIBVER:M*.99.*})
CPPFLAGS+= -DREL_PATH=\"HEAD\"
+CPPFLAGS+= -DPKG_SUBDIR="\"${DISTRIBVER:C/\.99\.[0-9]*[_A-Z]*$//}.0\""
.elif (${DISTRIBVER:M*.[0-9].[0-9]*})
CPPFLAGS+= -DREL_PATH=\"netbsd-${DISTRIBVER:C/\.[0-9][_A-Z]*$//:S/./-/}\"
+CPPFLAGS+= -DPKG_SUBDIR="\"${DISTRIBVER:C/_.*$//}\""
.elif (${DISTRIBVER:M*.[0-9]*})
CPPFLAGS+= -DREL_PATH=\"netbsd-${DISTRIBVER:C/\.[0-9][_A-Z]*$//}\"
+CPPFLAGS+= -DPKG_SUBDIR="\"${DISTRIBVER:C/_.*$//}\""
.endif
.endif
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.16 src/usr.sbin/sysinst/defs.h:1.17
--- src/usr.sbin/sysinst/defs.h:1.16 Tue Sep 11 08:05:18 2018
+++ src/usr.sbin/sysinst/defs.h Wed Sep 12 13:44:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.16 2018/09/11 08:05:18 martin Exp $ */
+/* $NetBSD: defs.h,v 1.17 2018/09/12 13:44:05 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -367,6 +367,10 @@ int clean_xfer_dir;
#define SYSINST_PKG_DIR "pub/pkgsrc/packages/NetBSD"
#endif
+#if !defined(PKG_SUBDIR)
+#define PKG_SUBDIR REL
+#endif
+
#if !defined(SYSINST_PKGSRC_HOST)
#define SYSINST_PKGSRC_HOST SYSINST_PKG_HOST
#endif
Index: src/usr.sbin/sysinst/main.c
diff -u src/usr.sbin/sysinst/main.c:1.8 src/usr.sbin/sysinst/main.c:1.9
--- src/usr.sbin/sysinst/main.c:1.8 Tue Sep 11 08:05:18 2018
+++ src/usr.sbin/sysinst/main.c Wed Sep 12 13:44:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.8 2018/09/11 08:05:18 martin Exp $ */
+/* $NetBSD: main.c,v 1.9 2018/09/12 13:44:05 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -112,7 +112,7 @@ static const struct f_arg fflagopts[] =
{"pkg host", SYSINST_PKG_HOST, pkg.xfer_host[XFER_FTP], sizeof pkg.xfer_host[XFER_FTP]},
{"pkg http host", SYSINST_PKG_HTTP_HOST, pkg.xfer_host[XFER_HTTP], sizeof pkg.xfer_host[XFER_HTTP]},
{"pkg dir", SYSINST_PKG_DIR, pkg.dir, sizeof pkg.dir},
- {"pkg prefix", "/" MACH "/" REL "/All", pkg_dir, sizeof pkg_dir},
+ {"pkg prefix", "/" MACH "/" PKG_SUBDIR "/All", pkg_dir, sizeof pkg_dir},
{"pkg user", "ftp", pkg.user, sizeof pkg.user},
{"pkg pass", "", pkg.pass, sizeof pkg.pass},
{"pkg proxy", "", pkg.proxy, sizeof pkg.proxy},
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: mrg
Date: Wed Sep 12 09:49:03 UTC 2018
Modified Files:
src/sys/dev/pci: hdaudio_pci.c
Log Message:
use pa_dmat64 if pci_dma64_available().
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/hdaudio_pci.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/dev/pci/hdaudio_pci.c
diff -u src/sys/dev/pci/hdaudio_pci.c:1.9 src/sys/dev/pci/hdaudio_pci.c:1.10
--- src/sys/dev/pci/hdaudio_pci.c:1.9 Wed Sep 12 03:23:38 2018
+++ src/sys/dev/pci/hdaudio_pci.c Wed Sep 12 09:49:03 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio_pci.c,v 1.9 2018/09/12 03:23:38 mrg Exp $ */
+/* $NetBSD: hdaudio_pci.c,v 1.10 2018/09/12 09:49:03 mrg Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.9 2018/09/12 03:23:38 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.10 2018/09/12 09:49:03 mrg Exp $");
#include
#include
@@ -139,7 +139,10 @@ hdaudio_pci_attach(device_t parent, devi
return;
}
sc->sc_hdaudio.sc_memvalid = true;
- sc->sc_hdaudio.sc_dmat = pa->pa_dmat;
+ if (pci_dma64_available(pa))
+ sc->sc_hdaudio.sc_dmat = pa->pa_dmat64;
+ else
+ sc->sc_hdaudio.sc_dmat = pa->pa_dmat;
/* Map interrupt and establish handler */
if (pci_intr_alloc(pa, >sc_pihp, NULL, 0)) {
CVS commit: src/share/man/man9
Module Name:src Committed By: mrg Date: Wed Sep 12 09:46:00 UTC 2018 Modified Files: src/share/man/man9: pci.9 Log Message: - link to pci_mapreg_type() from pci_mapreg_map() for the type argument - note that 64 bit memory mappings are different to others - bump date To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/share/man/man9/pci.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/pci.9 diff -u src/share/man/man9/pci.9:1.46 src/share/man/man9/pci.9:1.47 --- src/share/man/man9/pci.9:1.46 Mon Jul 3 21:28:48 2017 +++ src/share/man/man9/pci.9 Wed Sep 12 09:45:59 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: pci.9,v 1.46 2017/07/03 21:28:48 wiz Exp $ +.\" $NetBSD: pci.9,v 1.47 2018/09/12 09:45:59 mrg Exp $ .\" .\" Copyright (c) 2001, 2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 12, 2016 +.Dd September 12, 2018 .Dt PCI 9 .Os .Sh NAME @@ -573,13 +573,17 @@ The physical address of the mapping is i (BAR) in configuration space specified by .Fa reg . Valid values for the type of mapping -.Fa type +.Fa type , +which can be obtained from +.Fn pci_mapreg_type , are: .Bl -tag -width compact .It Dv PCI_MAPREG_TYPE_IO The mapping should be to I/O address space. .It Dv PCI_MAPREG_TYPE_MEM The mapping should be to memory address space. +.It Dv PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT +The mapping should be to 64-bit memory address space. .It Dv PCI_MAPREG_TYPE_ROM The mapping is to access ROM. This type of mapping is only permitted when the value for
CVS commit: [pgoyette-compat] src/sys/compat/linux32/common
Module Name:src Committed By: pgoyette Date: Wed Sep 12 08:09:23 UTC 2018 Modified Files: src/sys/compat/linux32/common [pgoyette-compat]: linux32_mod.c Log Message: Typo - missing trailing quote To generate a diff of this commit: cvs rdiff -u -r1.11.2.2 -r1.11.2.3 \ src/sys/compat/linux32/common/linux32_mod.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_mod.c diff -u src/sys/compat/linux32/common/linux32_mod.c:1.11.2.2 src/sys/compat/linux32/common/linux32_mod.c:1.11.2.3 --- src/sys/compat/linux32/common/linux32_mod.c:1.11.2.2 Wed Sep 12 07:45:56 2018 +++ src/sys/compat/linux32/common/linux32_mod.c Wed Sep 12 08:09:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_mod.c,v 1.11.2.2 2018/09/12 07:45:56 pgoyette Exp $ */ +/* $NetBSD: linux32_mod.c,v 1.11.2.3 2018/09/12 08:09:23 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.2 2018/09/12 07:45:56 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.3 2018/09/12 08:09:23 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_execfmt.h" @@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_mod. #define REQ1 "compat_linux,compat_sysv_50" #define REQ2 ",compat_netbsd32_43,compat_netbsd32_50,compat_netbsd32_12" -#define REQ3 ",compat_netbsd32_30,compat_netbsd32_16 +#define REQ3 ",compat_netbsd32_30,compat_netbsd32_16" #define REQ4",compat_ossaudio,sysv_ipc,compat_netbsd32_sysvipc" MODULE(MODULE_CLASS_EXEC, compat_linux32, REQ1 REQ2 REQ3 REQ4 MD1);
CVS commit: [pgoyette-compat] src/sys/compat
Module Name:src
Committed By: pgoyette
Date: Wed Sep 12 07:45:56 UTC 2018
Modified Files:
src/sys/compat/linux/common [pgoyette-compat]: linux_mod.c
src/sys/compat/linux32/common [pgoyette-compat]: linux32_mod.c
Log Message:
Adjust module requirements to reflect the new more granular modules
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/compat/linux/common/linux_mod.c
cvs rdiff -u -r1.11.2.1 -r1.11.2.2 \
src/sys/compat/linux32/common/linux32_mod.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_mod.c
diff -u src/sys/compat/linux/common/linux_mod.c:1.10 src/sys/compat/linux/common/linux_mod.c:1.10.2.1
--- src/sys/compat/linux/common/linux_mod.c:1.10 Sun Dec 10 00:43:05 2017
+++ src/sys/compat/linux/common/linux_mod.c Wed Sep 12 07:45:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_mod.c,v 1.10 2017/12/10 00:43:05 kre Exp $ */
+/* $NetBSD: linux_mod.c,v 1.10.2.1 2018/09/12 07:45:56 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.10 2017/12/10 00:43:05 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.10.2.1 2018/09/12 07:45:56 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -66,8 +66,10 @@ __KERNEL_RCSID(0, "$NetBSD: linux_mod.c,
# define MD3 ""
#endif
-MODULE(MODULE_CLASS_EXEC, compat_linux, "compat,compat_ossaudio,sysv_ipc"
- MD1 MD2 MD3);
+#define REQ1",compat_ossaudio,sysv_ipc"
+#define REQ2",compat_12,compat_30,compat_50,compat_43,compat_sysv_50"
+
+MODULE(MODULE_CLASS_EXEC, compat_linux, REQ1 REQ2 MD1 MD2 MD3);
static struct execsw linux_execsw[] = {
#if defined(EXEC_ELF32) && ELFSIZE == 32
Index: src/sys/compat/linux32/common/linux32_mod.c
diff -u src/sys/compat/linux32/common/linux32_mod.c:1.11.2.1 src/sys/compat/linux32/common/linux32_mod.c:1.11.2.2
--- src/sys/compat/linux32/common/linux32_mod.c:1.11.2.1 Sun Mar 11 23:50:18 2018
+++ src/sys/compat/linux32/common/linux32_mod.c Wed Sep 12 07:45:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_mod.c,v 1.11.2.1 2018/03/11 23:50:18 pgoyette Exp $ */
+/* $NetBSD: linux32_mod.c,v 1.11.2.2 2018/09/12 07:45:56 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.1 2018/03/11 23:50:18 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.2 2018/09/12 07:45:56 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -57,7 +57,12 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_mod.
# define MD1 ""
#endif
-MODULE(MODULE_CLASS_EXEC, compat_linux32, "compat_linux,compat_sysv" MD1);
+#define REQ1 "compat_linux,compat_sysv_50"
+#define REQ2 ",compat_netbsd32_43,compat_netbsd32_50,compat_netbsd32_12"
+#define REQ3 ",compat_netbsd32_30,compat_netbsd32_16
+#define REQ4",compat_ossaudio,sysv_ipc,compat_netbsd32_sysvipc"
+
+MODULE(MODULE_CLASS_EXEC, compat_linux32, REQ1 REQ2 REQ3 REQ4 MD1);
static struct execsw linux32_execsw[] = {
#if defined(EXEC_ELF32)
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Sep 12 07:42:22 UTC 2018
Modified Files:
src/sys/dev/pci: pci_subr.c pcireg.h
Log Message:
Add ATS Relaxed Ordering supported bit described in Address Translation
Relaxed Ordering ECN.
To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.139 -r1.140 src/sys/dev/pci/pcireg.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/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.202 src/sys/dev/pci/pci_subr.c:1.203
--- src/sys/dev/pci/pci_subr.c:1.202 Tue Jul 3 04:56:59 2018
+++ src/sys/dev/pci/pci_subr.c Wed Sep 12 07:42:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.202 2018/07/03 04:56:59 msaitoh Exp $ */
+/* $NetBSD: pci_subr.c,v 1.203 2018/09/12 07:42:22 msaitoh Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.202 2018/07/03 04:56:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.203 2018/09/12 07:42:22 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -3152,6 +3152,7 @@ pci_conf_print_ats_cap(const pcireg_t *r
printf(" Invalidate Queue Depth: %u\n", num);
onoff("Page Aligned Request", reg, PCI_ATS_CAP_PALIGNREQ);
onoff("Global Invalidate", reg, PCI_ATS_CAP_GLOBALINVL);
+ onoff("Relaxed Ordering", reg, PCI_ATS_CAP_RELAXORD);
printf("Control register: 0x%04x\n", ctl);
printf(" Smallest Translation Unit: %u\n",
Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.139 src/sys/dev/pci/pcireg.h:1.140
--- src/sys/dev/pci/pcireg.h:1.139 Mon Jul 2 03:52:32 2018
+++ src/sys/dev/pci/pcireg.h Wed Sep 12 07:42:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pcireg.h,v 1.139 2018/07/02 03:52:32 msaitoh Exp $ */
+/* $NetBSD: pcireg.h,v 1.140 2018/09/12 07:42:21 msaitoh Exp $ */
/*
* Copyright (c) 1995, 1996, 1999, 2000
@@ -1770,6 +1770,7 @@ struct pci_rom {
#define PCI_ATS_CAP_INVQDEPTH __BITS(4, 0) /* Invalidate Queue Depth */
#define PCI_ATS_CAP_PALIGNREQ __BIT(5) /* Page Aligned Request */
#define PCI_ATS_CAP_GLOBALINVL __BIT(6) /* Global Invalidate Support */
+#define PCI_ATS_CAP_RELAXORD __BIT(7) /* Relaxed Ordering */
#define PCI_ATS_CTL 0x04 /* Control Register */
#define PCI_ATS_CTL_STU __BITS(20, 16) /* Smallest Translation Unit */
#define PCI_ATS_CTL_EN __BIT(31) /* Enable */
