CVS commit: src/sys/arch/x86/x86

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Mar 16 04:48:19 UTC 2018

Modified Files:
src/sys/arch/x86/x86: db_memrw.c

Log Message:
x86: avoid accessing invalid addresses in ddb like arm32

This avoids that a command stops in the middle of an execution if
a fault occurs due to an access to an invalid address.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/x86/db_memrw.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/arch/x86/x86/db_memrw.c
diff -u src/sys/arch/x86/x86/db_memrw.c:1.5 src/sys/arch/x86/x86/db_memrw.c:1.6
--- src/sys/arch/x86/x86/db_memrw.c:1.5	Thu Mar 15 03:45:05 2018
+++ src/sys/arch/x86/x86/db_memrw.c	Fri Mar 16 04:48:19 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_memrw.c,v 1.5 2018/03/15 03:45:05 ozaki-r Exp $	*/
+/*	$NetBSD: db_memrw.c,v 1.6 2018/03/16 04:48:19 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.5 2018/03/15 03:45:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.6 2018/03/16 04:48:19 ozaki-r Exp $");
 
 #include 
 #include 
@@ -64,6 +64,22 @@ __KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v
 #include 
 #include 
 
+static int
+db_validate_address(vaddr_t addr)
+{
+	struct proc *p = curproc;
+	struct pmap *pmap;
+
+	if (!p || !p->p_vmspace || !p->p_vmspace->vm_map.pmap ||
+	addr >= VM_MIN_KERNEL_ADDRESS
+	   )
+		pmap = pmap_kernel();
+	else
+		pmap = p->p_vmspace->vm_map.pmap;
+
+	return (pmap_extract(pmap, addr, NULL) == false);
+}
+
 /*
  * Read bytes from kernel address space for debugger.
  */
@@ -74,6 +90,11 @@ db_read_bytes(vaddr_t addr, size_t size,
 
 	src = (char *)addr;
 
+	if (db_validate_address((vaddr_t)src)) {
+		db_printf("address %p is invalid\n", src);
+		return;
+	}
+
 	if (size == 8) {
 		*((long *)data) = *((long *)src);
 		return;
@@ -89,8 +110,14 @@ db_read_bytes(vaddr_t addr, size_t size,
 		return;
 	}
 
-	while (size-- > 0)
+	while (size-- > 0) {
+		if (db_validate_address((vaddr_t)src)) {
+			db_printf("address %p is invalid\n", src);
+			return;
+		}
+
 		*data++ = *src++;
+	}
 }
 
 /*

CVS commit: src/sys/ddb

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Mar 16 04:45:20 UTC 2018

Modified Files:
src/sys/ddb: db_command.c

Log Message:
Don't pass a unset address to lockdebug_lock_print


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sys/ddb/db_command.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.151 src/sys/ddb/db_command.c:1.152
--- src/sys/ddb/db_command.c:1.151	Fri Mar 16 04:44:51 2018
+++ src/sys/ddb/db_command.c	Fri Mar 16 04:45:20 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_command.c,v 1.151 2018/03/16 04:44:51 ozaki-r Exp $	*/
+/*	$NetBSD: db_command.c,v 1.152 2018/03/16 04:45:20 ozaki-r 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.151 2018/03/16 04:44:51 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.152 2018/03/16 04:45:20 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_aio.h"
@@ -1229,7 +1229,8 @@ db_lock_print_cmd(db_expr_t addr, bool h
 {
 
 #ifdef _KERNEL	/* XXX CRASH(8) */
-	lockdebug_lock_print((void *)(uintptr_t)addr, db_printf);
+	lockdebug_lock_print(have_addr ? (void *)(uintptr_t)addr : NULL,
+	db_printf);
 #endif
 }
 

CVS commit: src

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Mar 16 04:44:51 UTC 2018

Modified Files:
src/share/man/man4: ddb.4
src/sys/ddb: db_command.c
src/sys/kern: subr_lockdebug.c
src/sys/sys: lockdebug.h

Log Message:
Add a new command, show all locks, which shows information of active locks

The command shows information of all active (i.e., being held) locks that are
tracked through either of LWPs or CPUs by the LOCKDEBUG facility.  The /t
modifier additionally shows a backtrace for each LWP additionally.  This
feature is useful for debugging especially to analyze deadlocks.

The command is useful only if LOCKDEBUG is enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 src/share/man/man4/ddb.4
cvs rdiff -u -r1.150 -r1.151 src/sys/ddb/db_command.c
cvs rdiff -u -r1.61 -r1.62 src/sys/kern/subr_lockdebug.c
cvs rdiff -u -r1.17 -r1.18 src/sys/sys/lockdebug.h

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/man4/ddb.4
diff -u src/share/man/man4/ddb.4:1.175 src/share/man/man4/ddb.4:1.176
--- src/share/man/man4/ddb.4:1.175	Fri Mar 16 04:37:55 2018
+++ src/share/man/man4/ddb.4	Fri Mar 16 04:44:51 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ddb.4,v 1.175 2018/03/16 04:37:55 ozaki-r Exp $
+.\"	$NetBSD: ddb.4,v 1.176 2018/03/16 04:44:51 ozaki-r Exp $
 .\"
 .\" Copyright (c) 1997 - 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -556,6 +556,13 @@ Display information about callouts in th
 See
 .Xr callout 9
 for more information on callouts.
+.It Ic show all locks Ns Op Cm /t
+Display details information about all active locks.
+If
+.Cm /t
+is specified, stack traces of LWPs holding locks are printed additionally.
+This command is useful only if a kernel is compiled with
+.Cd options LOCKDEBUG .
 .It Ic show all pages
 Display basic information about all physical pages managed by the VM system.
 For more detailed information about a single page, use

Index: src/sys/ddb/db_command.c
diff -u src/sys/ddb/db_command.c:1.150 src/sys/ddb/db_command.c:1.151
--- src/sys/ddb/db_command.c:1.150	Fri Mar 16 04:37:55 2018
+++ src/sys/ddb/db_command.c	Fri Mar 16 04:44:51 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_command.c,v 1.150 2018/03/16 04:37:55 ozaki-r Exp $	*/
+/*	$NetBSD: db_command.c,v 1.151 2018/03/16 04:44:51 ozaki-r 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.150 2018/03/16 04:37:55 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.151 2018/03/16 04:44:51 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_aio.h"
@@ -190,6 +190,7 @@ static void	db_event_print_cmd(db_expr_t
 static void	db_fncall(db_expr_t, bool, db_expr_t, const char *);
 static void db_help_print_cmd(db_expr_t, bool, db_expr_t, const char *);
 static void	db_lock_print_cmd(db_expr_t, bool, db_expr_t, const char *);
+static void	db_show_all_locks(db_expr_t, bool, db_expr_t, const char *);
 static void	db_show_lockstat(db_expr_t, bool, db_expr_t, const char *);
 static void	db_mount_print_cmd(db_expr_t, bool, db_expr_t, const char *);
 static void	db_mbuf_print_cmd(db_expr_t, bool, db_expr_t, const char *);
@@ -226,6 +227,8 @@ static const struct db_command db_show_c
 	0 ,"List all processes.",NULL,NULL) },
 	{ DDB_ADD_CMD("pools",	db_show_all_pools,
 	0 ,"Show all pools",NULL,NULL) },
+	{ DDB_ADD_CMD("locks",	db_show_all_locks,
+	0 ,"Show all held locks", "[/t]", NULL) },
 #ifdef AIO
 	/*added from all sub cmds*/
 	{ DDB_ADD_CMD("aio_jobs",	db_show_aio_jobs,	0,
@@ -1231,6 +1234,16 @@ db_lock_print_cmd(db_expr_t addr, bool h
 }
 
 static void
+db_show_all_locks(db_expr_t addr, bool have_addr,
+db_expr_t count, const char *modif)
+{
+
+#ifdef _KERNEL	/* XXX CRASH(8) */
+	lockdebug_show_all_locks(db_printf, modif);
+#endif
+}
+
+static void
 db_show_lockstat(db_expr_t addr, bool have_addr,
 db_expr_t count, const char *modif)
 {

Index: src/sys/kern/subr_lockdebug.c
diff -u src/sys/kern/subr_lockdebug.c:1.61 src/sys/kern/subr_lockdebug.c:1.62
--- src/sys/kern/subr_lockdebug.c:1.61	Fri Mar 16 04:43:37 2018
+++ src/sys/kern/subr_lockdebug.c	Fri Mar 16 04:44:51 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_lockdebug.c,v 1.61 2018/03/16 04:43:37 ozaki-r Exp $	*/
+/*	$NetBSD: subr_lockdebug.c,v 1.62 2018/03/16 04:44:51 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.61 2018/03/16 04:43:37 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.62 2018/03/16 04:44:51 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -51,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: subr_lockdeb
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -815,6 +816,9 @@ lockdebug_abort1(const char *func, size_
 

CVS commit: src/sys/kern

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Mar 16 04:43:38 UTC 2018

Modified Files:
src/sys/kern: subr_lockdebug.c

Log Message:
Add a new command, show lockstat, which shows statistics of locks

Currently the command shows the number of allocated locks.

The command is useful only if LOCKDEBUG is enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 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/kern/subr_lockdebug.c
diff -u src/sys/kern/subr_lockdebug.c:1.60 src/sys/kern/subr_lockdebug.c:1.61
--- src/sys/kern/subr_lockdebug.c:1.60	Tue Feb 20 03:34:52 2018
+++ src/sys/kern/subr_lockdebug.c	Fri Mar 16 04:43:37 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_lockdebug.c,v 1.60 2018/02/20 03:34:52 ozaki-r Exp $	*/
+/*	$NetBSD: subr_lockdebug.c,v 1.61 2018/03/16 04:43:37 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.60 2018/02/20 03:34:52 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.61 2018/03/16 04:43:37 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -838,6 +838,56 @@ lockdebug_lock_print(void *addr, void (*
 	(*pr)("Sorry, kernel not built with the LOCKDEBUG option.\n");
 #endif	/* LOCKDEBUG */
 }
+
+void
+lockdebug_show_lockstat(void (*pr)(const char *, ...))
+{
+#ifdef LOCKDEBUG
+	lockdebug_t *ld;
+	void *_ld;
+	uint32_t n_null = 0;
+	uint32_t n_spin_mutex = 0;
+	uint32_t n_adaptive_mutex = 0;
+	uint32_t n_rwlock = 0;
+	uint32_t n_cv = 0;
+	uint32_t n_others = 0;
+
+	RB_TREE_FOREACH(_ld, _rb_tree) {
+		ld = _ld;
+		if (ld->ld_lock == NULL) {
+			n_null++;
+			continue;
+		}
+		if (ld->ld_lockops->lo_type == LOCKOPS_CV) {
+			n_cv++;
+			continue;
+		}
+		if (ld->ld_lockops->lo_name[0] == 'M') {
+			if (ld->ld_lockops->lo_type == LOCKOPS_SLEEP)
+n_adaptive_mutex++;
+			else
+n_spin_mutex++;
+			continue;
+		}
+		if (ld->ld_lockops->lo_name[0] == 'R') {
+			n_rwlock++;
+			continue;
+		}
+		n_others++;
+	}
+	(*pr)(
+	"condvar: %u\n"
+	"spin mutex: %u\n"
+	"adaptive mutex: %u\n"
+	"rwlock: %u\n"
+	"null locks: %u\n"
+	"others: %u\n",
+	n_cv,  n_spin_mutex, n_adaptive_mutex, n_rwlock,
+	n_null, n_others);
+#else
+	(*pr)("Sorry, kernel not built with the LOCKDEBUG option.\n");
+#endif	/* LOCKDEBUG */
+}
 #endif	/* DDB */
 
 /*

CVS commit: src

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Mar 16 04:37:55 UTC 2018

Modified Files:
src/share/man/man4: ddb.4
src/sys/ddb: db_command.c
src/sys/sys: lockdebug.h

Log Message:
Add a new command, show lockstat, which shows statistics of locks

Currently the command shows the number of allocated locks.

The command is useful only if LOCKDEBUG is enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/share/man/man4/ddb.4
cvs rdiff -u -r1.149 -r1.150 src/sys/ddb/db_command.c
cvs rdiff -u -r1.16 -r1.17 src/sys/sys/lockdebug.h

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/man4/ddb.4
diff -u src/share/man/man4/ddb.4:1.174 src/share/man/man4/ddb.4:1.175
--- src/share/man/man4/ddb.4:1.174	Mon Feb 19 10:31:53 2018
+++ src/share/man/man4/ddb.4	Fri Mar 16 04:37:55 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ddb.4,v 1.174 2018/02/19 10:31:53 wiz Exp $
+.\"	$NetBSD: ddb.4,v 1.175 2018/03/16 04:37:55 ozaki-r Exp $
 .\"
 .\" Copyright (c) 1997 - 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -56,7 +56,7 @@
 .\" any improvements or extensions that they make and grant Carnegie Mellon
 .\" the rights to redistribute these changes.
 .\"
-.Dd February 17, 2018
+.Dd March 16, 2018
 .Dt DDB 4
 .Os
 .Sh NAME
@@ -650,6 +650,10 @@ Display information about a lock at
 .Ar address .
 This command is useful only if a kernel is compiled with
 .Cd options LOCKDEBUG .
+.It Ic show lockstat
+Display information about statistics of locks.
+This command is useful only if a kernel is compiled with
+.Cd options LOCKDEBUG .
 .It Ic show map Ns Oo Cm /f Oc Ar address
 Print the vm_map at
 .Ar address .

Index: src/sys/ddb/db_command.c
diff -u src/sys/ddb/db_command.c:1.149 src/sys/ddb/db_command.c:1.150
--- src/sys/ddb/db_command.c:1.149	Sun Mar  4 07:14:50 2018
+++ src/sys/ddb/db_command.c	Fri Mar 16 04:37:55 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_command.c,v 1.149 2018/03/04 07:14:50 mlelstv Exp $	*/
+/*	$NetBSD: db_command.c,v 1.150 2018/03/16 04:37:55 ozaki-r 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.149 2018/03/04 07:14:50 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.150 2018/03/16 04:37:55 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_aio.h"
@@ -190,6 +190,7 @@ static void	db_event_print_cmd(db_expr_t
 static void	db_fncall(db_expr_t, bool, db_expr_t, const char *);
 static void db_help_print_cmd(db_expr_t, bool, db_expr_t, const char *);
 static void	db_lock_print_cmd(db_expr_t, bool, db_expr_t, const char *);
+static void	db_show_lockstat(db_expr_t, bool, db_expr_t, const char *);
 static void	db_mount_print_cmd(db_expr_t, bool, db_expr_t, const char *);
 static void	db_mbuf_print_cmd(db_expr_t, bool, db_expr_t, const char *);
 static void	db_map_print_cmd(db_expr_t, bool, db_expr_t, const char *);
@@ -248,6 +249,9 @@ static const struct db_command db_show_c
 	"Print the files open by process at address",
 	"[/f] address", NULL) },
 	{ DDB_ADD_CMD("lock",	db_lock_print_cmd,	0,NULL,NULL,NULL) },
+	{ DDB_ADD_CMD("lockstat",
+db_show_lockstat,	0,
+	"Print statistics of locks", NULL, NULL) },
 	{ DDB_ADD_CMD("map",	db_map_print_cmd,	0,
 	"Print the vm_map at address.", "[/f] address",NULL) },
 	{ DDB_ADD_CMD("module", db_show_module_cmd,	0,
@@ -1226,6 +1230,16 @@ db_lock_print_cmd(db_expr_t addr, bool h
 #endif
 }
 
+static void
+db_show_lockstat(db_expr_t addr, bool have_addr,
+db_expr_t count, const char *modif)
+{
+
+#ifdef _KERNEL	/* XXX CRASH(8) */
+	lockdebug_show_lockstat(db_printf);
+#endif
+}
+
 /*
  * Call random function:
  * !expr(arg,arg,arg)

Index: src/sys/sys/lockdebug.h
diff -u src/sys/sys/lockdebug.h:1.16 src/sys/sys/lockdebug.h:1.17
--- src/sys/sys/lockdebug.h:1.16	Sat Sep 16 23:54:41 2017
+++ src/sys/sys/lockdebug.h	Fri Mar 16 04:37:55 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: lockdebug.h,v 1.16 2017/09/16 23:54:41 christos Exp $	*/
+/*	$NetBSD: lockdebug.h,v 1.17 2018/03/16 04:37:55 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -58,6 +58,7 @@ void	lockdebug_abort(const char *, size_
 
 void	lockdebug_lock_print(void *, void (*)(const char *, ...)
 __printflike(1, 2));
+void	lockdebug_show_lockstat(void (*)(const char *, ...) __printflike(1, 2));
 
 #ifdef LOCKDEBUG
 

CVS commit: src/sys/arch/macppc/conf

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Fri Mar 16 03:19:38 UTC 2018

Modified Files:
src/sys/arch/macppc/conf: GENERIC

Log Message:
Forgot the pseudo devices in the previous commit.


To generate a diff of this commit:
cvs rdiff -u -r1.345 -r1.346 src/sys/arch/macppc/conf/GENERIC

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/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.345 src/sys/arch/macppc/conf/GENERIC:1.346
--- src/sys/arch/macppc/conf/GENERIC:1.345	Fri Mar 16 01:12:46 2018
+++ src/sys/arch/macppc/conf/GENERIC	Fri Mar 16 03:19:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.345 2018/03/16 01:12:46 sevan Exp $
+# $NetBSD: GENERIC,v 1.346 2018/03/16 03:19:38 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/macppc/conf/std.macppc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.345 $"
+#ident 		"GENERIC-$Revision: 1.346 $"
 
 maxusers	32
 
@@ -671,6 +671,8 @@ pseudo-device	nsmb			# SMB requester
 #pseudo-device	pf			# PF packet filter
 #pseudo-device	pflog			# PF log if
 pseudo-device	putter			# for puffs and pud
+pseudo-device	bcsp			# BlueCore Serial Protocol
+pseudo-device	btuart			# Bluetooth HCI UART (H4)
 
 # userland interface to drivers, including autoconf and properties retrieval
 pseudo-device   drvctl

CVS commit: [pgoyette-compat] src/sys/modules

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Mar 16 02:55:20 UTC 2018

Modified Files:
src/sys/modules [pgoyette-compat]: Makefile

Log Message:
Formatting only - no functional change


To generate a diff of this commit:
cvs rdiff -u -r1.202.2.6 -r1.202.2.7 src/sys/modules/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/modules/Makefile
diff -u src/sys/modules/Makefile:1.202.2.6 src/sys/modules/Makefile:1.202.2.7
--- src/sys/modules/Makefile:1.202.2.6	Fri Mar 16 02:38:40 2018
+++ src/sys/modules/Makefile	Fri Mar 16 02:55:20 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.202.2.6 2018/03/16 02:38:40 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.202.2.7 2018/03/16 02:55:20 pgoyette Exp $
 
 .include 
 
@@ -6,8 +6,7 @@
 
 # Modules for compatability with earlier versions of NetBSD
 
-SUBDIR+=	compatcompat_70
-#SUBDIR+=	compat_60 compat_50 compat_40
+SUBDIR+=	compatcompat_70 #compat_60 compat_50 compat_40
 #SUBDIR+=	compat_30 compat_20 compat_16 compat_14 compat_13
 #SUBDIR+=	compat_12 compat_10 compat_09
 SUBDIR+=	compat_ossaudio

CVS commit: [pgoyette-compat] src/sys/modules

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Mar 16 02:38:40 UTC 2018

Modified Files:
src/sys/modules [pgoyette-compat]: Makefile

Log Message:
Ooops - don't use SUBDIR= after the SUBDIR+= lines!


To generate a diff of this commit:
cvs rdiff -u -r1.202.2.5 -r1.202.2.6 src/sys/modules/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/modules/Makefile
diff -u src/sys/modules/Makefile:1.202.2.5 src/sys/modules/Makefile:1.202.2.6
--- src/sys/modules/Makefile:1.202.2.5	Fri Mar 16 01:20:20 2018
+++ src/sys/modules/Makefile	Fri Mar 16 02:38:40 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.202.2.5 2018/03/16 01:20:20 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.202.2.6 2018/03/16 02:38:40 pgoyette Exp $
 
 .include 
 
@@ -6,14 +6,14 @@
 
 # Modules for compatability with earlier versions of NetBSD
 
-SUBDIR+=	compatcompat_70#compat_60 compat_50 compat_40
+SUBDIR+=	compatcompat_70
+#SUBDIR+=	compat_60 compat_50 compat_40
 #SUBDIR+=	compat_30 compat_20 compat_16 compat_14 compat_13
 #SUBDIR+=	compat_12 compat_10 compat_09
 SUBDIR+=	compat_ossaudio
 SUBDIR+=	compat_sysv
 
-
-SUBDIR=		accf_dataready
+SUBDIR+=	accf_dataready
 SUBDIR+=	accf_httpready
 SUBDIR+=	adosfs
 SUBDIR+=	aio

CVS commit: src/share/man/man9

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Fri Mar 16 02:35:56 UTC 2018

Modified Files:
src/share/man/man9: firmload.9

Log Message:
Add the default locations firmload is set to search for firmaware files.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/share/man/man9/firmload.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/firmload.9
diff -u src/share/man/man9/firmload.9:1.9 src/share/man/man9/firmload.9:1.10
--- src/share/man/man9/firmload.9:1.9	Tue Apr 28 09:48:31 2015
+++ src/share/man/man9/firmload.9	Fri Mar 16 02:35:56 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: firmload.9,v 1.9 2015/04/28 09:48:31 prlw1 Exp $
+.\"	$NetBSD: firmload.9,v 1.10 2018/03/16 02:35:56 sevan Exp $
 .\"
 .\" Copyright (c) 2006 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 January 17, 2006
+.Dd March 16, 2018
 .Dt FIRMLOAD 9
 .Os
 .Sh NAME
@@ -114,6 +114,14 @@ may block.
 Frees a region of memory previously allocated by
 .Fn firmware_malloc .
 .El
+.Sh FILES
+Default search path for firmware
+.Bl -tag -width /libdata/firmware -compact
+.It Pa /libdata/firmware
+.It Pa /usr/libdata/firmware
+.It Pa /usr/pkg/libdata/firmware
+.It Pa /usr/pkg/libdata
+.El
 .Sh SEE ALSO
 .Xr autoconf 9 ,
 .Xr malloc 9 ,

CVS commit: src/sys/dev/pcmcia

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Fri Mar 16 01:58:42 UTC 2018

Modified Files:
src/sys/dev/pcmcia: pcmciadevs.h pcmciadevs_data.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 src/sys/dev/pcmcia/pcmciadevs.h \
src/sys/dev/pcmcia/pcmciadevs_data.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/pcmcia/pcmciadevs.h
diff -u src/sys/dev/pcmcia/pcmciadevs.h:1.233 src/sys/dev/pcmcia/pcmciadevs.h:1.234
--- src/sys/dev/pcmcia/pcmciadevs.h:1.233	Wed Jun  1 23:33:24 2016
+++ src/sys/dev/pcmcia/pcmciadevs.h	Fri Mar 16 01:58:42 2018
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcmciadevs.h,v 1.233 2016/06/01 23:33:24 pgoyette Exp $	*/
+/*	$NetBSD: pcmciadevs.h,v 1.234 2018/03/16 01:58:42 sevan Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcmciadevs,v 1.232 2016/06/01 23:31:53 pgoyette Exp
+ *	NetBSD: pcmciadevs,v 1.234 2018/03/16 01:49:15 sevan Exp
  */
 /* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
 
@@ -38,7 +38,7 @@
  */
 
 /*
- * Use "make -f Makefile.pcmicadevs" to regenerate pcmicadevs.h and
+ * Use "make -f Makefile.pcmciadevs" to regenerate pcmicadevs.h and
  * pcmicadevs_data.h
  */
 
@@ -143,6 +143,8 @@
 #define	PCMCIA_PRODUCT_3COM_3CXEM556INT	0x003d
 #define	PCMCIA_CIS_3COM_3CRWB6096	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_3COM_3CRWB6096	0x0040
+#define	PCMCIA_CIS_3COM_3CRWB6096B	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_3COM_3CRWB6096B	0x0041
 #define	PCMCIA_CIS_3COM_3CCFEM556BI	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_3COM_3CCFEM556BI	0x0556
 #define	PCMCIA_CIS_3COM_3C562	{ NULL, NULL, NULL, NULL }
Index: src/sys/dev/pcmcia/pcmciadevs_data.h
diff -u src/sys/dev/pcmcia/pcmciadevs_data.h:1.233 src/sys/dev/pcmcia/pcmciadevs_data.h:1.234
--- src/sys/dev/pcmcia/pcmciadevs_data.h:1.233	Wed Jun  1 23:33:24 2016
+++ src/sys/dev/pcmcia/pcmciadevs_data.h	Fri Mar 16 01:58:42 2018
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcmciadevs_data.h,v 1.233 2016/06/01 23:33:24 pgoyette Exp $	*/
+/*	$NetBSD: pcmciadevs_data.h,v 1.234 2018/03/16 01:58:42 sevan Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcmciadevs,v 1.232 2016/06/01 23:31:53 pgoyette Exp
+ *	NetBSD: pcmciadevs,v 1.234 2018/03/16 01:49:15 sevan Exp
  */
 /* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
 
@@ -92,6 +92,13 @@ struct pcmcia_knowndev pcmcia_knowndevs[
 	"3Com 3CRWB60-A Bluetooth PC Card",	}
 	,
 	{
+	PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CRWB6096B,
+	PCMCIA_CIS_3COM_3CRWB6096B,
+	0,
+	"3Com Corporation",
+	"3Com Wireless Bluetooth PC Card",	}
+	,
+	{
 	PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CCFEM556BI,
 	PCMCIA_CIS_3COM_3CCFEM556BI,
 	0,

CVS commit: src/sys/dev/pcmcia

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Fri Mar 16 01:49:15 UTC 2018

Modified Files:
src/sys/dev/pcmcia: pcmciadevs

Log Message:
Add 3Com Wireless Bluetooth PC Card (version 3.0) 3CRWB6096B


To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 src/sys/dev/pcmcia/pcmciadevs

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/pcmcia/pcmciadevs
diff -u src/sys/dev/pcmcia/pcmciadevs:1.233 src/sys/dev/pcmcia/pcmciadevs:1.234
--- src/sys/dev/pcmcia/pcmciadevs:1.233	Fri Mar 16 00:56:28 2018
+++ src/sys/dev/pcmcia/pcmciadevs	Fri Mar 16 01:49:15 2018
@@ -1,4 +1,4 @@
-$NetBSD: pcmciadevs,v 1.233 2018/03/16 00:56:28 sevan Exp $
+$NetBSD: pcmciadevs,v 1.234 2018/03/16 01:49:15 sevan Exp $
 /* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
 
 /*-
@@ -131,6 +131,7 @@ product 3COM 3CXM056BNW		0x002f 3Com/Not
 product 3COM 3CXEM556		0x0035 3Com/Megahertz 3CXEM556 Ethernet/Modem
 product 3COM 3CXEM556INT	0x003d 3Com/Megahertz 3CXEM556-INT Ethernet/Modem
 product 3COM 3CRWB6096		0x0040 3Com 3CRWB60-A Bluetooth PC Card
+product 3COM 3CRWB6096B 	0x0041 3Com Wireless Bluetooth PC Card
 product 3COM 3CCFEM556BI	0x0556 3Com/Megahertz 3CCFEM556BI Ethernet/Modem
 product 3COM 3C562		0x0562 3Com 3c562 33.6 Modem/10Mbps Ethernet
 product 3COM 3C589		0x0589 3Com 3c589 10Mbps Ethernet

CVS commit: [pgoyette-compat] src/sys/modules/compat_60

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Mar 16 01:33:24 UTC 2018

Modified Files:
src/sys/modules/compat_60 [pgoyette-compat]: Makefile

Log Message:
Add note/reminder to deal with setting of CPU_UCODE option based on
machine architecture.  It's needed for i386, amd64, and XEN3_DOM0
(but _not_ needed for XEN3_DOMU).


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/modules/compat_60/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/modules/compat_60/Makefile
diff -u src/sys/modules/compat_60/Makefile:1.1.2.1 src/sys/modules/compat_60/Makefile:1.1.2.2
--- src/sys/modules/compat_60/Makefile:1.1.2.1	Thu Mar 15 23:23:36 2018
+++ src/sys/modules/compat_60/Makefile	Fri Mar 16 01:33:24 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.2.1 2018/03/15 23:23:36 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.1.2.2 2018/03/16 01:33:24 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -8,6 +8,11 @@ KMOD=	compat_60
 
 CPPFLAGS+=	-D COMPAT_60 -DCOMPAT_70 -DCOMPAT_80
 
+# If being built for amd64, i386, or XEN3_DOM0 (but _not_ DOMU), we
+# need to add
+#
+# SRCS+=	CPU_UCODE
+
 SRCS+=	kern_sa_60.c tty_60.c kern_time_60.c
 
 .include 

CVS commit: [pgoyette-compat] src/sys/modules

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Mar 16 01:20:20 UTC 2018

Modified Files:
src/sys/modules [pgoyette-compat]: Makefile

Log Message:
For now, disable the compat_60 module


To generate a diff of this commit:
cvs rdiff -u -r1.202.2.4 -r1.202.2.5 src/sys/modules/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/modules/Makefile
diff -u src/sys/modules/Makefile:1.202.2.4 src/sys/modules/Makefile:1.202.2.5
--- src/sys/modules/Makefile:1.202.2.4	Thu Mar 15 23:23:35 2018
+++ src/sys/modules/Makefile	Fri Mar 16 01:20:20 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.202.2.4 2018/03/15 23:23:35 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.202.2.5 2018/03/16 01:20:20 pgoyette Exp $
 
 .include 
 
@@ -6,11 +6,9 @@
 
 # Modules for compatability with earlier versions of NetBSD
 
-SUBDIR+=	compatcompat_70 compat_60
-.ifdef NOTYET
-SUBDIR+=	compat_50 compat_40 compat_30 compat_20 compat_16
-SUBDIR+=	compat_14 compat_13 compat_12 compat_10 compat_09
-.endif
+SUBDIR+=	compatcompat_70#compat_60 compat_50 compat_40
+#SUBDIR+=	compat_30 compat_20 compat_16 compat_14 compat_13
+#SUBDIR+=	compat_12 compat_10 compat_09
 SUBDIR+=	compat_ossaudio
 SUBDIR+=	compat_sysv
 

CVS commit: [pgoyette-compat] src/sys

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Mar 16 01:16:29 UTC 2018

Modified Files:
src/sys/compat/common [pgoyette-compat]: compat_60_mod.c
compat_70_mod.c compat_mod.c compat_mod.h kern_sa_60.c
src/sys/kern [pgoyette-compat]: kern_cpu.c systrace_args.c

Log Message:
Initial pass at setting up the compat_60 module.

XXX needs some work to properly handle cpu_ucode stuff.

While here, move details of compat_70 init/fini routines into the
module itself.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/compat/common/compat_60_mod.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/compat/common/compat_70_mod.c
cvs rdiff -u -r1.24.14.11 -r1.24.14.12 src/sys/compat/common/compat_mod.c
cvs rdiff -u -r1.1 -r1.1.42.1 src/sys/compat/common/compat_mod.h \
src/sys/compat/common/kern_sa_60.c
cvs rdiff -u -r1.71 -r1.71.16.1 src/sys/kern/kern_cpu.c
cvs rdiff -u -r1.29.2.2 -r1.29.2.3 src/sys/kern/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/common/compat_60_mod.c
diff -u src/sys/compat/common/compat_60_mod.c:1.1.2.1 src/sys/compat/common/compat_60_mod.c:1.1.2.2
--- src/sys/compat/common/compat_60_mod.c:1.1.2.1	Thu Mar 15 23:23:36 2018
+++ src/sys/compat/common/compat_60_mod.c	Fri Mar 16 01:16:29 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_60_mod.c,v 1.1.2.1 2018/03/15 23:23:36 pgoyette Exp $	*/
+/*	$NetBSD: compat_60_mod.c,v 1.1.2.2 2018/03/16 01:16:29 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_60_mod.c,v 1.1.2.1 2018/03/15 23:23:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_60_mod.c,v 1.1.2.2 2018/03/16 01:16:29 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -51,21 +51,49 @@ __KERNEL_RCSID(0, "$NetBSD: compat_60_mo
 #include 
 #include 
 
+static const struct syscall_package compat_60_syscalls[] = {
+	{ SYS_compat_60_lwp_park, 0, (sy_call_t *)compat_60_sys__lwp_park },
+	{ NULL, 0, NULL }
+};
+
 #define REQUIRED_60 "compat_70"		/* XXX No compat_80 yet */
 MODULE(MODULE_CLASS_EXEC, compat_60, REQUIRED_60);
 
+#ifdef CPU_UCODE
+int (*orig_compat_6_cpu_ucode)(struct compat6_cpu_ucode *);
+int (*orig_compat6_cpu_ucode_apply)(const struct compat6_cpu_ucode *);
+#endif
+
 static int
 compat_60_modcmd(modcmd_t cmd, void *arg)
 {
+	int error;
 
 	switch (cmd) {
 	case MODULE_CMD_INIT:
+		error = syscall_establish(NULL, compat_60_syscalls);
+		if (error != 0)
+			return error;
+#ifdef CPU_UCODE
+		orig_get_version = vec_compat6_cpu_ucode_get_version;
+		*vec_compat6_cpu_ucode_get_version =
+		compat6_cpu_ucode_get_version;
+		orig_apply = vec_compat6_cpu_ucode_apply;
+		*vec_compat6_cpu_ucode_apply = compat6_cpu_ucode_apply;
+#endif
 		return 0;
 
 	case MODULE_CMD_FINI:
+		*vec_compat6_cpu_ucode_get_version = orig_get_version;
+		*vec_compat6_cpu_ucode_apply = orig_apply;
+		error = syscall_disestablish(NULL, compat_60_syscalls);
+		if (error != 0)
+			return error;
 		return 0;
 
 	default:
 		return ENOTTY;
 	}
 }
+
+

Index: src/sys/compat/common/compat_70_mod.c
diff -u src/sys/compat/common/compat_70_mod.c:1.1.2.2 src/sys/compat/common/compat_70_mod.c:1.1.2.3
--- src/sys/compat/common/compat_70_mod.c:1.1.2.2	Thu Mar 15 23:14:21 2018
+++ src/sys/compat/common/compat_70_mod.c	Fri Mar 16 01:16:29 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_70_mod.c,v 1.1.2.2 2018/03/15 23:14:21 pgoyette Exp $	*/
+/*	$NetBSD: compat_70_mod.c,v 1.1.2.3 2018/03/16 01:16:29 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_70_mod.c,v 1.1.2.2 2018/03/15 23:14:21 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_70_mod.c,v 1.1.2.3 2018/03/16 01:16:29 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -56,19 +56,31 @@ __KERNEL_RCSID(0, "$NetBSD: compat_70_mo
 
 MODULE(MODULE_CLASS_EXEC, compat_70, NULL);	/* XXX No compat_80 yet */
 
+void compat_70_init(void)
+{
+
+	vec_ocreds_valid = true;
+	rtsock_70_init();
+}
+
+void compat_70_fini(void)
+{
+
+	rtsock_70_fini();
+	vec_ocreds_valid = false;
+}
+
 static int
 compat_70_modcmd(modcmd_t cmd, void *arg)
 {
 
 	switch (cmd) {
 	case MODULE_CMD_INIT:
-		vec_ocreds_valid = true;
-		rtsock_70_init();
+		compat_70_init();
 		return 0;
 
 	case MODULE_CMD_FINI:
-		rtsock_70_fini();
-		vec_ocreds_valid = false;
+		compat_70_fini();
 		return 0;
 
 	default:

Index: src/sys/compat/common/compat_mod.c
diff -u src/sys/compat/common/compat_mod.c:1.24.14.11 src/sys/compat/common/compat_mod.c:1.24.14.12
--- src/sys/compat/common/compat_mod.c:1.24.14.11	Thu Mar 15 23:34:53 2018
+++ src/sys/compat/common/compat_mod.c	Fri Mar 16 01:16:29 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_mod.c,v 1.24.14.11 2018/03/15 23:34:53 pgoyette Exp $	*/
+/*	$NetBSD: 

CVS commit: src/doc

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Fri Mar 16 01:16:28 UTC 2018

Modified Files:
src/doc: CHANGES

Log Message:
macppc Bluetooth


To generate a diff of this commit:
cvs rdiff -u -r1.2365 -r1.2366 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2365 src/doc/CHANGES:1.2366
--- src/doc/CHANGES:1.2365	Thu Mar  8 10:17:22 2018
+++ src/doc/CHANGES	Fri Mar 16 01:16:28 2018
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2365 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2366 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -127,3 +127,5 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 		Controller-based SMBus [pgoyette 20170228]
 	ichsmb(4) Add Apollo Lake and Gemini Lake devices. [msaitoh 20180302]
 	lm(4): Add NCT6796D support. [msaitoh 20180308]
+	macppc: Enable Bluetooth support by default in GENERIC kernel.
+		[sevan 20180316]

CVS commit: src/sys/arch/macppc/conf

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Fri Mar 16 01:12:46 UTC 2018

Modified Files:
src/sys/arch/macppc/conf: GENERIC

Log Message:
Add bluetooth support by default. most hardware G4 onwards (e.g aluminium
PowerBooks) have Bluetooth installed as standard.


To generate a diff of this commit:
cvs rdiff -u -r1.344 -r1.345 src/sys/arch/macppc/conf/GENERIC

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/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.344 src/sys/arch/macppc/conf/GENERIC:1.345
--- src/sys/arch/macppc/conf/GENERIC:1.344	Mon Feb 26 23:09:32 2018
+++ src/sys/arch/macppc/conf/GENERIC	Fri Mar 16 01:12:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.344 2018/02/26 23:09:32 sevan Exp $
+# $NetBSD: GENERIC,v 1.345 2018/03/16 01:12:46 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/macppc/conf/std.macppc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.344 $"
+#ident 		"GENERIC-$Revision: 1.345 $"
 
 maxusers	32
 
@@ -546,6 +546,41 @@ ucom*   at u3g?
 ugensa* at uhub? port ?
 ucom*   at ugensa?
 
+# Bluetooth Controller and Device support
+
+# Bluetooth PCMCIA Controllers
+bt3c* at pcmcia? function ?		# 3Com 3CRWB6096-A
+btbc* at pcmcia? function ?		# AnyCom BlueCard LSE041/039/139
+
+# Bluetooth USB Controllers
+ubt* at uhub? port ?
+aubtfwl* at uhub? port ?
+
+# Bluetooth Device Hub
+bthub* at bcsp?
+bthub* at bt3c?
+bthub* at btbc?
+bthub* at btuart?
+bthub* at ubt?
+
+# Bluetooth HID support
+bthidev* at bthub?
+
+# Bluetooth Mouse
+btms* at bthidev? reportid ?
+wsmouse* at btms? mux 0
+
+# Bluetooth Keyboard
+btkbd* at bthidev? reportid ?
+wskbd* at btkbd? console ? mux 1
+
+# Bluetooth Apple Magic Mouse
+btmagic* at bthub?
+wsmouse* at btmagic? mux 0
+
+# Bluetooth Audio support
+btsco* at bthub?
+
 # PCI IEEE1394 controllers
 fwohci*	at pci? dev ? function ?	# IEEE1394 Open Host Controller
 

CVS commit: src/sys/dev/pcmcia

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Fri Mar 16 00:56:28 UTC 2018

Modified Files:
src/sys/dev/pcmcia: pcmciadevs

Log Message:
typo


To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 src/sys/dev/pcmcia/pcmciadevs

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/pcmcia/pcmciadevs
diff -u src/sys/dev/pcmcia/pcmciadevs:1.232 src/sys/dev/pcmcia/pcmciadevs:1.233
--- src/sys/dev/pcmcia/pcmciadevs:1.232	Wed Jun  1 23:31:53 2016
+++ src/sys/dev/pcmcia/pcmciadevs	Fri Mar 16 00:56:28 2018
@@ -1,4 +1,4 @@
-$NetBSD: pcmciadevs,v 1.232 2016/06/01 23:31:53 pgoyette Exp $
+$NetBSD: pcmciadevs,v 1.233 2018/03/16 00:56:28 sevan Exp $
 /* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
 
 /*-
@@ -31,7 +31,7 @@ $NetBSD: pcmciadevs,v 1.232 2016/06/01 2
  */
 
 /*
- * Use "make -f Makefile.pcmicadevs" to regenerate pcmicadevs.h and
+ * Use "make -f Makefile.pcmciadevs" to regenerate pcmicadevs.h and
  * pcmicadevs_data.h
  */
 

CVS commit: [pgoyette-compat] src/sys

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Mar 16 00:38:17 UTC 2018

Modified Files:
src/sys/kern [pgoyette-compat]: init_sysent.c syscalls.c
syscalls_autoload.c
src/sys/rump/include/rump [pgoyette-compat]: rump_syscalls.h
src/sys/rump/librump/rumpkern [pgoyette-compat]: rump_syscalls.c
src/sys/sys [pgoyette-compat]: syscall.h syscallargs.h

Log Message:
Regen


To generate a diff of this commit:
cvs rdiff -u -r1.319.2.2 -r1.319.2.3 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.310.2.2 -r1.310.2.3 src/sys/kern/syscalls.c
cvs rdiff -u -r1.27.2.2 -r1.27.2.3 src/sys/kern/syscalls_autoload.c
cvs rdiff -u -r1.108.2.2 -r1.108.2.3 \
src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.137.2.2 -r1.137.2.3 \
src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.304.2.2 -r1.304.2.3 src/sys/sys/syscall.h
cvs rdiff -u -r1.288.2.2 -r1.288.2.3 src/sys/sys/syscallargs.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/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.319.2.2 src/sys/kern/init_sysent.c:1.319.2.3
--- src/sys/kern/init_sysent.c:1.319.2.2	Thu Mar 15 23:07:56 2018
+++ src/sys/kern/init_sysent.c	Fri Mar 16 00:38:17 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.319.2.2 2018/03/15 23:07:56 pgoyette Exp $ */
+/* $NetBSD: init_sysent.c,v 1.319.2.3 2018/03/16 00:38:17 pgoyette Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.291.2.2 2018/03/15 23:04:48 pgoyette Exp
+ * created from	NetBSD: syscalls.master,v 1.291.2.3 2018/03/16 00:35:40 pgoyette Exp
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.319.2.2 2018/03/15 23:07:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.319.2.3 2018/03/16 00:38:17 pgoyette Exp $");
 
 #include "opt_modular.h"
 #include "opt_ntp.h"
@@ -1595,26 +1595,26 @@ struct sysent sysent[] = {
 	{
 		ns(struct compat_60_sys_sa_register_args),
 		.sy_flags = SYCALL_ARG_PTR,
-		.sy_call = (sy_call_t *)sys_nomodule
+		.sy_call = (sy_call_t *)compat_60(sys_sa_register)
 	},		/* 330 = compat_60_sa_register */
 	{
 		ns(struct compat_60_sys_sa_stacks_args),
 		.sy_flags = SYCALL_ARG_PTR,
-		.sy_call = (sy_call_t *)sys_nomodule
+		.sy_call = (sy_call_t *)compat_60(sys_sa_stacks)
 	},		/* 331 = compat_60_sa_stacks */
 	{
-		.sy_call = (sy_call_t *)sys_nomodule
+		.sy_call = (sy_call_t *)compat_60(sys_sa_enable)
 	},		/* 332 = compat_60_sa_enable */
 	{
 		ns(struct compat_60_sys_sa_setconcurrency_args),
-		.sy_call = (sy_call_t *)sys_nomodule
+		.sy_call = (sy_call_t *)compat_60(sys_sa_setconcurrency)
 	},		/* 333 = compat_60_sa_setconcurrency */
 	{
-		.sy_call = (sy_call_t *)sys_nomodule
+		.sy_call = (sy_call_t *)compat_60(sys_sa_yield)
 	},		/* 334 = compat_60_sa_yield */
 	{
 		ns(struct compat_60_sys_sa_preempt_args),
-		.sy_call = (sy_call_t *)sys_nomodule
+		.sy_call = (sy_call_t *)compat_60(sys_sa_preempt)
 	},		/* 335 = compat_60_sa_preempt */
 	{
 		.sy_call = sys_nosys,

Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.310.2.2 src/sys/kern/syscalls.c:1.310.2.3
--- src/sys/kern/syscalls.c:1.310.2.2	Thu Mar 15 23:07:56 2018
+++ src/sys/kern/syscalls.c	Fri Mar 16 00:38:17 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.310.2.2 2018/03/15 23:07:56 pgoyette Exp $ */
+/* $NetBSD: syscalls.c,v 1.310.2.3 2018/03/16 00:38:17 pgoyette Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.291.2.2 2018/03/15 23:04:48 pgoyette Exp
+ * created from	NetBSD: syscalls.master,v 1.291.2.3 2018/03/16 00:35:40 pgoyette Exp
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.310.2.2 2018/03/15 23:07:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.310.2.3 2018/03/16 00:38:17 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_modular.h"

Index: src/sys/kern/syscalls_autoload.c
diff -u src/sys/kern/syscalls_autoload.c:1.27.2.2 src/sys/kern/syscalls_autoload.c:1.27.2.3
--- src/sys/kern/syscalls_autoload.c:1.27.2.2	Thu Mar 15 23:07:56 2018
+++ src/sys/kern/syscalls_autoload.c	Fri Mar 16 00:38:17 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls_autoload.c,v 1.27.2.2 2018/03/15 23:07:56 pgoyette Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.27.2.3 2018/03/16 00:38:17 pgoyette Exp $ */
 
 /*
  * System call autoload table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.291.2.2 2018/03/15 23:04:48 pgoyette Exp
+ * created from	NetBSD: syscalls.master,v 1.291.2.3 2018/03/16 00:35:40 pgoyette Exp
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.27.2.2 2018/03/15 23:07:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.27.2.3 2018/03/16 00:38:17 pgoyette 

CVS commit: [pgoyette-compat] src/sys/kern

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Mar 16 00:35:40 UTC 2018

Modified Files:
src/sys/kern [pgoyette-compat]: syscalls.master

Log Message:
Revert changes for the scheduler-activation syscalls.  It's not
needed, as the syscalls are already marked ENOSYS if these sys-calls
are not built-in (ie, option COMPAT_60 is not specified;  if they
are built-in, the stubs in kern_sa_60.c still return ENOSYS, so no
change.


To generate a diff of this commit:
cvs rdiff -u -r1.291.2.2 -r1.291.2.3 src/sys/kern/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/kern/syscalls.master
diff -u src/sys/kern/syscalls.master:1.291.2.2 src/sys/kern/syscalls.master:1.291.2.3
--- src/sys/kern/syscalls.master:1.291.2.2	Thu Mar 15 23:04:48 2018
+++ src/sys/kern/syscalls.master	Fri Mar 16 00:35:40 2018
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.291.2.2 2018/03/15 23:04:48 pgoyette Exp $
+	$NetBSD: syscalls.master,v 1.291.2.3 2018/03/16 00:35:40 pgoyette Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
 
@@ -656,19 +656,13 @@
 328	UNIMPL
 329	UNIMPL
 ; SA system calls.
-330	COMPAT_60 MODULAR compat_60	\
-		 	{ int|sys||sa_register(void *newv, void **oldv, \
+330	COMPAT_60 	{ int|sys||sa_register(void *newv, void **oldv, \
 int flags, ssize_t stackinfo_offset); }
-331	COMPAT_60  MODULAR compat_60	\
-			{ int|sys||sa_stacks(int num, stack_t *stacks); }
-332	COMPAT_60  MODULAR compat_60	\
-			{ int|sys||sa_enable(void); }
-333	COMPAT_60  MODULAR compat_60	\
-			{ int|sys||sa_setconcurrency(int concurrency); }
-334	COMPAT_60  MODULAR compat_60	\
-			{ int|sys||sa_yield(void); }
-335	COMPAT_60  MODULAR compat_60	\
-			{ int|sys||sa_preempt(int sa_id); }
+331	COMPAT_60 	{ int|sys||sa_stacks(int num, stack_t *stacks); }
+332	COMPAT_60 	{ int|sys||sa_enable(void); }
+333	COMPAT_60 	{ int|sys||sa_setconcurrency(int concurrency); }
+334	COMPAT_60 	{ int|sys||sa_yield(void); }
+335	COMPAT_60 	{ int|sys||sa_preempt(int sa_id); }
 336	OBSOL 		sys_sa_unblockyield
 ;
 ; Syscalls 337-339 are reserved for other scheduler activation syscalls.

CVS commit: src/sys/arch/x86/pci/imcsmb

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Thu Mar 15 23:57:18 UTC 2018

Modified Files:
src/sys/arch/x86/pci/imcsmb: imc.c

Log Message:
Provide a default case also when building imc as builtin.

Fixes ALL kernel build. ok pgoyette.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/pci/imcsmb/imc.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/arch/x86/pci/imcsmb/imc.c
diff -u src/sys/arch/x86/pci/imcsmb/imc.c:1.1 src/sys/arch/x86/pci/imcsmb/imc.c:1.2
--- src/sys/arch/x86/pci/imcsmb/imc.c:1.1	Thu Mar  1 04:45:06 2018
+++ src/sys/arch/x86/pci/imcsmb/imc.c	Thu Mar 15 23:57:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: imc.c,v 1.1 2018/03/01 04:45:06 pgoyette Exp $ */
+/* $NetBSD: imc.c,v 1.2 2018/03/15 23:57:17 maya Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.1 2018/03/01 04:45:06 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.2 2018/03/15 23:57:17 maya Exp $");
 
 #include 
 #include 
@@ -394,10 +394,8 @@ imc_modcmd(modcmd_t cmd, void *opaque)
 			mutex_destroy(_access_mutex);
 		break;
 	default:
-#ifdef _MODULE
 		error = ENOTTY;
 		break;
-#endif
 	}
 
 	return error;

CVS commit: [pgoyette-compat] src/sys/compat/common

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Mar 15 23:34:53 UTC 2018

Modified Files:
src/sys/compat/common [pgoyette-compat]: compat_mod.c

Log Message:
Update alias list for included modules for compat_60


To generate a diff of this commit:
cvs rdiff -u -r1.24.14.10 -r1.24.14.11 src/sys/compat/common/compat_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_mod.c
diff -u src/sys/compat/common/compat_mod.c:1.24.14.10 src/sys/compat/common/compat_mod.c:1.24.14.11
--- src/sys/compat/common/compat_mod.c:1.24.14.10	Thu Mar 15 23:32:35 2018
+++ src/sys/compat/common/compat_mod.c	Thu Mar 15 23:34:53 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_mod.c,v 1.24.14.10 2018/03/15 23:32:35 pgoyette Exp $	*/
+/*	$NetBSD: compat_mod.c,v 1.24.14.11 2018/03/15 23:34:53 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.24.14.10 2018/03/15 23:32:35 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.24.14.11 2018/03/15 23:34:53 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -84,7 +84,7 @@ void if_50_fini(void);
 #endif
 
 static const char * const compat_includes[] = {
-	"compat_70",
+	"compat_70", "compat_60",
 	NULL
 };
 

CVS commit: [pgoyette-compat] src/sys/compat/common

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Mar 15 23:32:35 UTC 2018

Modified Files:
src/sys/compat/common [pgoyette-compat]: compat_mod.c

Log Message:
The big all-inclusive compat module still needs to initialize the
compat_70 stuff.


To generate a diff of this commit:
cvs rdiff -u -r1.24.14.9 -r1.24.14.10 src/sys/compat/common/compat_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_mod.c
diff -u src/sys/compat/common/compat_mod.c:1.24.14.9 src/sys/compat/common/compat_mod.c:1.24.14.10
--- src/sys/compat/common/compat_mod.c:1.24.14.9	Thu Mar 15 22:46:22 2018
+++ src/sys/compat/common/compat_mod.c	Thu Mar 15 23:32:35 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_mod.c,v 1.24.14.9 2018/03/15 22:46:22 pgoyette Exp $	*/
+/*	$NetBSD: compat_mod.c,v 1.24.14.10 2018/03/15 23:32:35 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.24.14.9 2018/03/15 22:46:22 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.24.14.10 2018/03/15 23:32:35 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -78,6 +78,11 @@ void if_50_init(void);
 void if_50_fini(void);
 #endif
 
+#ifdef COMPAT_70
+#include 
+#include 
+#endif
+
 static const char * const compat_includes[] = {
 	"compat_70",
 	NULL
@@ -282,9 +287,17 @@ compat_modcmd(modcmd_t cmd, void *arg)
 		uvm_50_init();
 		if_50_init();
 #endif
+#ifdef COMPAT_70
+		vec_ocreds_valid = true;
+		rtsock_70_init();
+#endif
 		return 0;
 
 	case MODULE_CMD_FINI:
+#ifdef COMPAT_70
+		rtsock_70_fini();
+		vec_ocreds_valid = false;
+#endif
 #ifdef COMPAT_10
 		vfs_syscalls_10_fini();
 #endif

CVS commit: [pgoyette-compat] src/sys

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Mar 15 23:23:36 UTC 2018

Modified Files:
src/sys/modules [pgoyette-compat]: Makefile
Added Files:
src/sys/compat/common [pgoyette-compat]: compat_60_mod.c
src/sys/modules/compat_60 [pgoyette-compat]: Makefile

Log Message:
Initial set-up for compat_60 module


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/sys/compat/common/compat_60_mod.c
cvs rdiff -u -r1.202.2.3 -r1.202.2.4 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/sys/modules/compat_60/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/modules/Makefile
diff -u src/sys/modules/Makefile:1.202.2.3 src/sys/modules/Makefile:1.202.2.4
--- src/sys/modules/Makefile:1.202.2.3	Thu Mar 15 05:10:05 2018
+++ src/sys/modules/Makefile	Thu Mar 15 23:23:35 2018
@@ -1,9 +1,20 @@
-#	$NetBSD: Makefile,v 1.202.2.3 2018/03/15 05:10:05 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.202.2.4 2018/03/15 23:23:35 pgoyette Exp $
 
 .include 
 
 # For all platforms
 
+# Modules for compatability with earlier versions of NetBSD
+
+SUBDIR+=	compatcompat_70 compat_60
+.ifdef NOTYET
+SUBDIR+=	compat_50 compat_40 compat_30 compat_20 compat_16
+SUBDIR+=	compat_14 compat_13 compat_12 compat_10 compat_09
+.endif
+SUBDIR+=	compat_ossaudio
+SUBDIR+=	compat_sysv
+
+
 SUBDIR=		accf_dataready
 SUBDIR+=	accf_httpready
 SUBDIR+=	adosfs
@@ -27,13 +38,6 @@ SUBDIR+=	clockctl
 SUBDIR+=	crypto
 SUBDIR+=	coda
 SUBDIR+=	coda5
-SUBDIR+=	compatcompat_70
-#ifdef NOTYET
-SUBDIR+=	compat_60 compat_50 compat_40 compat_30 compat_20 compat_16
-SUBDIR+=	compat_14 compat_13 compat_12 compat_10 compat_09
-#endif
-SUBDIR+=	compat_ossaudio
-SUBDIR+=	compat_sysv
 SUBDIR+=	coredump
 SUBDIR+=	dbcool
 SUBDIR+=	des

Added files:

Index: src/sys/compat/common/compat_60_mod.c
diff -u /dev/null src/sys/compat/common/compat_60_mod.c:1.1.2.1
--- /dev/null	Thu Mar 15 23:23:36 2018
+++ src/sys/compat/common/compat_60_mod.c	Thu Mar 15 23:23:36 2018
@@ -0,0 +1,71 @@
+/*	$NetBSD: compat_60_mod.c,v 1.1.2.1 2018/03/15 23:23:36 pgoyette Exp $	*/
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software developed for The NetBSD Foundation
+ * by Andrew Doran.
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+/*
+ * Linkage for the compat module: spaghetti.
+ */
+
+#include 
+__KERNEL_RCSID(0, "$NetBSD: compat_60_mod.c,v 1.1.2.1 2018/03/15 23:23:36 pgoyette Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_compat_netbsd.h"
+#include "opt_compat_43.h"
+#endif
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+
+#define REQUIRED_60 "compat_70"		/* XXX No compat_80 yet */
+MODULE(MODULE_CLASS_EXEC, compat_60, REQUIRED_60);
+
+static int
+compat_60_modcmd(modcmd_t cmd, void *arg)
+{
+
+	switch (cmd) {
+	case MODULE_CMD_INIT:
+		return 0;
+
+	case MODULE_CMD_FINI:
+		return 0;
+
+	default:
+		return ENOTTY;
+	}
+}

Index: src/sys/modules/compat_60/Makefile
diff -u /dev/null src/sys/modules/compat_60/Makefile:1.1.2.1
--- /dev/null	Thu Mar 15 23:23:36 2018
+++ src/sys/modules/compat_60/Makefile	Thu Mar 15 23:23:36 2018
@@ -0,0 +1,13 @@
+#	$NetBSD: Makefile,v 1.1.2.1 2018/03/15 23:23:36 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH:	${S}/compat/common
+
+KMOD=	compat_60
+
+CPPFLAGS+=	-D COMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+=	kern_sa_60.c tty_60.c kern_time_60.c
+
+.include 

CVS commit: [pgoyette-compat] src/sys/compat/common

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Mar 15 23:14:21 UTC 2018

Modified Files:
src/sys/compat/common [pgoyette-compat]: compat_70_mod.c

Log Message:
Remove some unnecessary #includes


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/compat/common/compat_70_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_70_mod.c
diff -u src/sys/compat/common/compat_70_mod.c:1.1.2.1 src/sys/compat/common/compat_70_mod.c:1.1.2.2
--- src/sys/compat/common/compat_70_mod.c:1.1.2.1	Thu Mar 15 05:10:05 2018
+++ src/sys/compat/common/compat_70_mod.c	Thu Mar 15 23:14:21 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_70_mod.c,v 1.1.2.1 2018/03/15 05:10:05 pgoyette Exp $	*/
+/*	$NetBSD: compat_70_mod.c,v 1.1.2.2 2018/03/15 23:14:21 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,19 +34,15 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_70_mod.c,v 1.1.2.1 2018/03/15 05:10:05 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_70_mod.c,v 1.1.2.2 2018/03/15 23:14:21 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #include "opt_compat_43.h"
-#include "opt_ntp.h"
-#include "opt_sysv.h"
-#include "opt_lfs.h"
 #endif
 
 #include 
 #include 
-#include 
 
 #include 
 #include 

CVS commit: [pgoyette-compat] src/sys

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Mar 15 23:07:57 UTC 2018

Modified Files:
src/sys/kern [pgoyette-compat]: init_sysent.c syscalls.c
syscalls_autoload.c systrace_args.c
src/sys/rump/include/rump [pgoyette-compat]: rump_syscalls.h
src/sys/rump/librump/rumpkern [pgoyette-compat]: rump_syscalls.c
src/sys/sys [pgoyette-compat]: syscall.h syscallargs.h

Log Message:
Regen


To generate a diff of this commit:
cvs rdiff -u -r1.319.2.1 -r1.319.2.2 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.310.2.1 -r1.310.2.2 src/sys/kern/syscalls.c
cvs rdiff -u -r1.27.2.1 -r1.27.2.2 src/sys/kern/syscalls_autoload.c
cvs rdiff -u -r1.29.2.1 -r1.29.2.2 src/sys/kern/systrace_args.c
cvs rdiff -u -r1.108.2.1 -r1.108.2.2 \
src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.137.2.1 -r1.137.2.2 \
src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.304.2.1 -r1.304.2.2 src/sys/sys/syscall.h
cvs rdiff -u -r1.288.2.1 -r1.288.2.2 src/sys/sys/syscallargs.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/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.319.2.1 src/sys/kern/init_sysent.c:1.319.2.2
--- src/sys/kern/init_sysent.c:1.319.2.1	Sat Mar 10 05:12:17 2018
+++ src/sys/kern/init_sysent.c	Thu Mar 15 23:07:56 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.319.2.1 2018/03/10 05:12:17 pgoyette Exp $ */
+/* $NetBSD: init_sysent.c,v 1.319.2.2 2018/03/15 23:07:56 pgoyette Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.291.2.1 2018/03/10 05:09:24 pgoyette Exp
+ * created from	NetBSD: syscalls.master,v 1.291.2.2 2018/03/15 23:04:48 pgoyette Exp
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.319.2.1 2018/03/10 05:12:17 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.319.2.2 2018/03/15 23:07:56 pgoyette Exp $");
 
 #include "opt_modular.h"
 #include "opt_ntp.h"
@@ -1595,26 +1595,26 @@ struct sysent sysent[] = {
 	{
 		ns(struct compat_60_sys_sa_register_args),
 		.sy_flags = SYCALL_ARG_PTR,
-		.sy_call = (sy_call_t *)compat_60(sys_sa_register)
+		.sy_call = (sy_call_t *)sys_nomodule
 	},		/* 330 = compat_60_sa_register */
 	{
 		ns(struct compat_60_sys_sa_stacks_args),
 		.sy_flags = SYCALL_ARG_PTR,
-		.sy_call = (sy_call_t *)compat_60(sys_sa_stacks)
+		.sy_call = (sy_call_t *)sys_nomodule
 	},		/* 331 = compat_60_sa_stacks */
 	{
-		.sy_call = (sy_call_t *)compat_60(sys_sa_enable)
+		.sy_call = (sy_call_t *)sys_nomodule
 	},		/* 332 = compat_60_sa_enable */
 	{
 		ns(struct compat_60_sys_sa_setconcurrency_args),
-		.sy_call = (sy_call_t *)compat_60(sys_sa_setconcurrency)
+		.sy_call = (sy_call_t *)sys_nomodule
 	},		/* 333 = compat_60_sa_setconcurrency */
 	{
-		.sy_call = (sy_call_t *)compat_60(sys_sa_yield)
+		.sy_call = (sy_call_t *)sys_nomodule
 	},		/* 334 = compat_60_sa_yield */
 	{
 		ns(struct compat_60_sys_sa_preempt_args),
-		.sy_call = (sy_call_t *)compat_60(sys_sa_preempt)
+		.sy_call = (sy_call_t *)sys_nomodule
 	},		/* 335 = compat_60_sa_preempt */
 	{
 		.sy_call = sys_nosys,

Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.310.2.1 src/sys/kern/syscalls.c:1.310.2.2
--- src/sys/kern/syscalls.c:1.310.2.1	Sat Mar 10 05:12:17 2018
+++ src/sys/kern/syscalls.c	Thu Mar 15 23:07:56 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.310.2.1 2018/03/10 05:12:17 pgoyette Exp $ */
+/* $NetBSD: syscalls.c,v 1.310.2.2 2018/03/15 23:07:56 pgoyette Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.291.2.1 2018/03/10 05:09:24 pgoyette Exp
+ * created from	NetBSD: syscalls.master,v 1.291.2.2 2018/03/15 23:04:48 pgoyette Exp
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.310.2.1 2018/03/10 05:12:17 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.310.2.2 2018/03/15 23:07:56 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_modular.h"

Index: src/sys/kern/syscalls_autoload.c
diff -u src/sys/kern/syscalls_autoload.c:1.27.2.1 src/sys/kern/syscalls_autoload.c:1.27.2.2
--- src/sys/kern/syscalls_autoload.c:1.27.2.1	Sat Mar 10 05:12:17 2018
+++ src/sys/kern/syscalls_autoload.c	Thu Mar 15 23:07:56 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls_autoload.c,v 1.27.2.1 2018/03/10 05:12:17 pgoyette Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.27.2.2 2018/03/15 23:07:56 pgoyette Exp $ */
 
 /*
  * System call autoload table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.291.2.1 2018/03/10 05:09:24 pgoyette Exp
+ * created from	NetBSD: syscalls.master,v 1.291.2.2 2018/03/15 23:04:48 pgoyette Exp
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.27.2.1 2018/03/10 05:12:17 pgoyette Exp $");

CVS commit: [pgoyette-compat] src/sys/kern

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Mar 15 23:04:48 UTC 2018

Modified Files:
src/sys/kern [pgoyette-compat]: syscalls.master

Log Message:
Update the compat_60 entries to reference the compat_60 module.

While here, allow the scheduler-activation syscalls to autoload the
compat_60 module.


To generate a diff of this commit:
cvs rdiff -u -r1.291.2.1 -r1.291.2.2 src/sys/kern/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/kern/syscalls.master
diff -u src/sys/kern/syscalls.master:1.291.2.1 src/sys/kern/syscalls.master:1.291.2.2
--- src/sys/kern/syscalls.master:1.291.2.1	Sat Mar 10 05:09:24 2018
+++ src/sys/kern/syscalls.master	Thu Mar 15 23:04:48 2018
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.291.2.1 2018/03/10 05:09:24 pgoyette Exp $
+	$NetBSD: syscalls.master,v 1.291.2.2 2018/03/15 23:04:48 pgoyette Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
 
@@ -656,13 +656,19 @@
 328	UNIMPL
 329	UNIMPL
 ; SA system calls.
-330	COMPAT_60 	{ int|sys||sa_register(void *newv, void **oldv, \
+330	COMPAT_60 MODULAR compat_60	\
+		 	{ int|sys||sa_register(void *newv, void **oldv, \
 int flags, ssize_t stackinfo_offset); }
-331	COMPAT_60 	{ int|sys||sa_stacks(int num, stack_t *stacks); }
-332	COMPAT_60 	{ int|sys||sa_enable(void); }
-333	COMPAT_60 	{ int|sys||sa_setconcurrency(int concurrency); }
-334	COMPAT_60 	{ int|sys||sa_yield(void); }
-335	COMPAT_60 	{ int|sys||sa_preempt(int sa_id); }
+331	COMPAT_60  MODULAR compat_60	\
+			{ int|sys||sa_stacks(int num, stack_t *stacks); }
+332	COMPAT_60  MODULAR compat_60	\
+			{ int|sys||sa_enable(void); }
+333	COMPAT_60  MODULAR compat_60	\
+			{ int|sys||sa_setconcurrency(int concurrency); }
+334	COMPAT_60  MODULAR compat_60	\
+			{ int|sys||sa_yield(void); }
+335	COMPAT_60  MODULAR compat_60	\
+			{ int|sys||sa_preempt(int sa_id); }
 336	OBSOL 		sys_sa_unblockyield
 ;
 ; Syscalls 337-339 are reserved for other scheduler activation syscalls.
@@ -878,7 +884,7 @@
 		{ ssize_t|sys|50|mq_timedreceive(mqd_t mqdes, \
 			char *msg_ptr, size_t msg_len, unsigned *msg_prio, \
 			const struct timespec *abs_timeout); }
-434	COMPAT_60 MODULAR compat \
+434	COMPAT_60 MODULAR compat_60 \
 		{ int|sys||_lwp_park(const struct timespec *ts, \
 lwpid_t unpark, const void *hint, \
 const void *unparkhint); }

CVS commit: [pgoyette-compat] src/sys/compat/common

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Mar 15 22:46:22 UTC 2018

Modified Files:
src/sys/compat/common [pgoyette-compat]: compat_mod.c

Log Message:
Add alias module name 'compat_70' since the full compat module includes
the entire compat_70 module.


To generate a diff of this commit:
cvs rdiff -u -r1.24.14.8 -r1.24.14.9 src/sys/compat/common/compat_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_mod.c
diff -u src/sys/compat/common/compat_mod.c:1.24.14.8 src/sys/compat/common/compat_mod.c:1.24.14.9
--- src/sys/compat/common/compat_mod.c:1.24.14.8	Thu Mar 15 11:17:54 2018
+++ src/sys/compat/common/compat_mod.c	Thu Mar 15 22:46:22 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_mod.c,v 1.24.14.8 2018/03/15 11:17:54 pgoyette Exp $	*/
+/*	$NetBSD: compat_mod.c,v 1.24.14.9 2018/03/15 22:46:22 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.24.14.8 2018/03/15 11:17:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.24.14.9 2018/03/15 22:46:22 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -78,7 +78,12 @@ void if_50_init(void);
 void if_50_fini(void);
 #endif
 
-MODULE(MODULE_CLASS_EXEC, compat, NULL);
+static const char * const compat_includes[] = {
+	"compat_70",
+	NULL
+};
+
+MODULE_WITH_ALIASES(MODULE_CLASS_EXEC, compat, NULL, _includes);
 
 int	ttcompat(struct tty *, u_long, void *, int, struct lwp *);
 

CVS commit: src/crypto/external/bsd/openssl/lib/libdes

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Mar 15 18:40:16 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/lib/libdes: Makefile

Log Message:
use the OpenSSL version of des_modes.7 since it is newer.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/lib/libdes/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssl/lib/libdes/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libdes/Makefile:1.2 src/crypto/external/bsd/openssl/lib/libdes/Makefile:1.3
--- src/crypto/external/bsd/openssl/lib/libdes/Makefile:1.2	Mon Apr 12 13:58:40 2010
+++ src/crypto/external/bsd/openssl/lib/libdes/Makefile	Thu Mar 15 14:40:16 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2010/04/12 17:58:40 joerg Exp $
+#	$NetBSD: Makefile,v 1.3 2018/03/15 18:40:16 christos Exp $
 
 .include 
 
@@ -23,10 +23,11 @@ INCSDIR=/usr/include
 make-manpages:
 	pod2man --section=3 --center=libdes --release=0.9.6j des.pod | \
 	sed -e 's/[[:space:]]*$$//' > ${.CURDIR}/des.3
-	pod2man --section=7 --center=libdes --release=0.9.6j des_modes.pod | \
-	sed -e 's/[[:space:]]*$$//' > ${.CURDIR}/des_modes.7
+#	Use the OpenSSL Version
+#	pod2man --section=7 --center=libdes --release=0.9.6j des_modes.pod | \
+#	sed -e 's/[[:space:]]*$$//' > ${.CURDIR}/des_modes.7
 
-MAN=	des.3 des_modes.7
+MAN=	des.3 # des_modes.7
 
 MLINKS+=des.3 des_cbc_cksum.3 \
 	des.3 des_cfb64_encrypt.3 \

CVS commit: src/share/mk

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Mar 15 13:44:45 UTC 2018

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
Don't barf if the ctf tools are not installed.
[perhaps warn?]


To generate a diff of this commit:
cvs rdiff -u -r1.1050 -r1.1051 src/share/mk/bsd.own.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1050 src/share/mk/bsd.own.mk:1.1051
--- src/share/mk/bsd.own.mk:1.1050	Wed Mar 14 19:41:05 2018
+++ src/share/mk/bsd.own.mk	Thu Mar 15 09:44:45 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1050 2018/03/14 23:41:05 mrg Exp $
+#	$NetBSD: bsd.own.mk,v 1.1051 2018/03/15 13:44:45 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1594,7 +1594,8 @@ TARGETS+=	lintmanpages
 TESTSBASE=	/usr/tests${MLIBDIR:D/${MLIBDIR}}
 
 # Override with tools versions if needed
-.if ${MKCTF:Uno} != "no" && !defined(NOCTF)
+.if ${MKCTF:Uno} != "no" && !defined(NOCTF) && \
+(exists(${TOOL_CTFCONVERT}) || exists(/usr/bin/${TOOL_CTFCONVERT}))
 CTFCONVERT=	${TOOL_CTFCONVERT}
 CTFMERGE=	${TOOL_CTFMERGE}
 .endif

CVS commit: [pgoyette-compat] src/sys/sys

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Mar 15 11:57:14 UTC 2018

Modified Files:
src/sys/sys [pgoyette-compat]: param.h

Log Message:
Typo in comment - no functional change, no version bump


To generate a diff of this commit:
cvs rdiff -u -r1.557.2.1 -r1.557.2.2 src/sys/sys/param.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/sys/param.h
diff -u src/sys/sys/param.h:1.557.2.1 src/sys/sys/param.h:1.557.2.2
--- src/sys/sys/param.h:1.557.2.1	Thu Mar 15 09:12:07 2018
+++ src/sys/sys/param.h	Thu Mar 15 11:57:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.557.2.1 2018/03/15 09:12:07 pgoyette Exp $	*/
+/*	$NetBSD: param.h,v 1.557.2.2 2018/03/15 11:57:14 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -87,7 +87,7 @@
 #define	NetBSD	199905		/* NetBSD version (year & month). */
 
 /*
- * There macros determine if we are running in protected mode or not.
+ * These macros determine if we are running in protected mode or not.
  *   _HARDKERNEL: code uses kernel namespace and runs in hw priviledged mode
  *   _SOFTKERNEL: code uses kernel namespace but runs without hw priviledges
  */

CVS commit: [netbsd-8] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu Mar 15 11:28:24 UTC 2018

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
Tickets 631, 632


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.143 -r1.1.2.144 src/doc/CHANGES-8.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.143 src/doc/CHANGES-8.0:1.1.2.144
--- src/doc/CHANGES-8.0:1.1.2.143	Thu Mar 15 09:56:35 2018
+++ src/doc/CHANGES-8.0	Thu Mar 15 11:28:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.143 2018/03/15 09:56:35 martin Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.144 2018/03/15 11:28:24 bouyer Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -10324,3 +10324,17 @@ tests/lib/libc/locale/t_wctype.c		1.2
 	more thorough and more correct.
 	[maya, ticket #608]
 
+tests/lib/libc/locale/t_sprintf.c		1.4 - 1.7
+
+	Since the C standard allows for intermediate floating results to
+	contain more precision bits than the data type expects, but
+	(kind of obviously) does not allow such values to be stored in memory,
+	check that the strtod() result and expected values are very very close
+	and not strictly equal.
+	[martin, ticket #631]
+
+sys/netinet6/in6_gif.c1.91
+
+	Fix potential NULL dereference
+	[knakahara, ticket #632]
+

CVS commit: [netbsd-8] src/sys/netinet6

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu Mar 15 11:27:25 UTC 2018

Modified Files:
src/sys/netinet6 [netbsd-8]: in6_gif.c

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #632):
sys/netinet6/in6_gif.c: revision 1.91
Fix error checking in in6_gif_ctlinput().
if_gif.c:r1.133 introduces gif_update_variant() which ensure ifp->if_flags
is set IFF_RUNNING when gif_softc->gif_var->gv_{psrc,pdst} are not null.
So, in6_gif_ctlinput() is not required IFF_RUNNING checking. In contrast,
it is required gv_{psrc,pdst} NULL checking.


To generate a diff of this commit:
cvs rdiff -u -r1.85.6.4 -r1.85.6.5 src/sys/netinet6/in6_gif.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/netinet6/in6_gif.c
diff -u src/sys/netinet6/in6_gif.c:1.85.6.4 src/sys/netinet6/in6_gif.c:1.85.6.5
--- src/sys/netinet6/in6_gif.c:1.85.6.4	Sun Feb 11 21:17:34 2018
+++ src/sys/netinet6/in6_gif.c	Thu Mar 15 11:27:25 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_gif.c,v 1.85.6.4 2018/02/11 21:17:34 snj Exp $	*/
+/*	$NetBSD: in6_gif.c,v 1.85.6.5 2018/03/15 11:27:25 bouyer Exp $	*/
 /*	$KAME: in6_gif.c,v 1.62 2001/07/29 04:27:25 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.85.6.4 2018/02/11 21:17:34 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.85.6.5 2018/03/15 11:27:25 bouyer Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -459,9 +459,11 @@ in6_gif_ctlinput(int cmd, const struct s
 	if (!ip6)
 		return NULL;
 
-	if ((sc->gif_if.if_flags & IFF_RUNNING) == 0)
-		return NULL;
 	var = gif_getref_variant(sc, );
+	if (var->gv_psrc == NULL || var->gv_pdst == NULL) {
+		gif_putref_variant(var, );
+		return NULL;
+	}
 	if (var->gv_psrc->sa_family != AF_INET6) {
 		gif_putref_variant(var, );
 		return NULL;

CVS commit: [netbsd-8] src/tests/lib/libc/locale

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu Mar 15 11:24:46 UTC 2018

Modified Files:
src/tests/lib/libc/locale [netbsd-8]: t_sprintf.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #631):
tests/lib/libc/locale/t_sprintf.c: revision 1.4
tests/lib/libc/locale/t_sprintf.c: revision 1.5
tests/lib/libc/locale/t_sprintf.c: revision 1.6
tests/lib/libc/locale/t_sprintf.c: revision 1.7
Add some diagnostics to the strto test, so I can see why this
fails on i386 (on qemu) - will probably keep them when done.
When comparing doubles (any floating point values) which have been
computed using different methods, don't expect to achieve identical
results (here, one constant is perhaps converted to binary from a string by
a cross compiler, the other is converted at run time).   Allow them to
have a small difference (for now, small is < 1e-7 - the constant is ~ 1e5,
so this is 12 orders of magnitude less) before failing (and include the
actual difference in the error message if it does fail.)
Revert 1.4 (perhaps temporarily) and add even more diagnostics to those
added in 1.3 to see if it is possible to determine why the strict equality
test fails on i386, yet succeeds elsewhere.
Since the C standard allows for intermediate floating results to contain
more precision bits than the data type expects, but (kind of obviously)
does not allow such values to be stored in memory, expecting the value
returned from strtod() (an intermediate result) to be identical (that is,
equal) to a stored value is incorrect.
So instead go back to checking that the two numbers are very very close.
See comments added to the test for more explanation.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/tests/lib/libc/locale/t_sprintf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/lib/libc/locale/t_sprintf.c
diff -u src/tests/lib/libc/locale/t_sprintf.c:1.1.2.2 src/tests/lib/libc/locale/t_sprintf.c:1.1.2.3
--- src/tests/lib/libc/locale/t_sprintf.c:1.1.2.2	Thu Mar 15 09:55:23 2018
+++ src/tests/lib/libc/locale/t_sprintf.c	Thu Mar 15 11:24:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: t_sprintf.c,v 1.1.2.2 2018/03/15 09:55:23 martin Exp $ */
+/* $NetBSD: t_sprintf.c,v 1.1.2.3 2018/03/15 11:24:46 bouyer Exp $ */
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -32,9 +32,10 @@
 #include 
 __COPYRIGHT("@(#) Copyright (c) 2017\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_sprintf.c,v 1.1.2.2 2018/03/15 09:55:23 martin Exp $");
+__RCSID("$NetBSD: t_sprintf.c,v 1.1.2.3 2018/03/15 11:24:46 bouyer Exp $");
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -125,12 +126,51 @@ h_sprintf(const struct test *t)
 static void
 h_strto(const struct test *t)
 {
+	double d, diff;
+
 	ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C");
 	printf("Trying locale %s...\n", t->locale);
 	ATF_REQUIRE(setlocale(LC_NUMERIC, t->locale) != NULL);
 
 	ATF_REQUIRE_EQ((int)strtol(t->int_input, NULL, 10), t->int_value);
-	ATF_REQUIRE_EQ(strtod(t->double_input, NULL), t->double_value);
+
+	/*
+	 * Note that the C standard permits function values to be
+	 * returned with more precision than is expected by (floating)
+	 * data types, and on i386 (and potentially other implementations)
+	 * that is exactly what happens, meaning that the result from
+	 * strtod() is not identical to the expected value - it turns out
+	 * that it is the same if the value is constrained to the number
+	 * of mantissa bits in a double (so the %a values printed below
+	 * show the exact same bit patterns) and on i386 -ffloat-store
+	 * will cause gcc to constrain the result that way, but nothing
+	 * demands that be true, so instead, we simply test that the
+	 * value returned is very very close to that expected.
+	 *
+	 * 1e-12 is chosen as the allowable delta, as we know (from
+	 * the data in the "struct test" earlier in this file) that
+	 * its magnitude is ~ 10^5, with values of that magnitude,
+	 * 10^-12 difference is a 10^-17 relative difference, and
+	 * with a 56 bit mantissa (standard IEEE "double") a difference
+	 * that small vanishes (requires at least 57 mantissa bits to
+	 * be representable).   If the data values were to change, then
+	 * so might this delta (if they were not all the same, we would
+	 * move the delta into the struct rather than having it a constant
+	 * here.).
+	 *
+	 * Finally, note that our purpose here is not to test floating
+	 * point arithmetic, we're testing locale dependent string to
+	 * binary conversions.
+	 */
+
+	d = (double)strtod(t->double_input, NULL);
+	diff = fabs(d - t->double_value);
+	if (diff >= 1e-12)
+		ATF_REQUIRE_EQ_MSG(d, t->double_value, "In %s: " 
+		"d=strtod(t->double_input[%s], NULL)[%.12g = %a] != "
+		"t->double_value[%.12g = %a]: diff=%g", t->locale,
+		t->double_input, d, d, 

CVS commit: [pgoyette-compat] src/sys

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Mar 15 11:17:55 UTC 2018

Modified Files:
src/sys/compat/common [pgoyette-compat]: compat_mod.c files.common
src/sys/uvm [pgoyette-compat]: uvm_swap.c uvm_swap.h

Log Message:
Resolve conflicts from sync-with-HEAD


To generate a diff of this commit:
cvs rdiff -u -r1.24.14.7 -r1.24.14.8 src/sys/compat/common/compat_mod.c
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/sys/compat/common/files.common
cvs rdiff -u -r1.175.2.3 -r1.175.2.4 src/sys/uvm/uvm_swap.c
cvs rdiff -u -r1.22.16.2 -r1.22.16.3 src/sys/uvm/uvm_swap.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/compat/common/compat_mod.c
diff -u src/sys/compat/common/compat_mod.c:1.24.14.7 src/sys/compat/common/compat_mod.c:1.24.14.8
--- src/sys/compat/common/compat_mod.c:1.24.14.7	Thu Mar 15 09:12:05 2018
+++ src/sys/compat/common/compat_mod.c	Thu Mar 15 11:17:54 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_mod.c,v 1.24.14.7 2018/03/15 09:12:05 pgoyette Exp $	*/
+/*	$NetBSD: compat_mod.c,v 1.24.14.8 2018/03/15 11:17:54 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.24.14.7 2018/03/15 09:12:05 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.24.14.8 2018/03/15 11:17:54 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -254,10 +254,6 @@ compat_modcmd(modcmd_t cmd, void *arg)
 #ifdef COMPAT_40
 		if_40_init();
 #endif
-#ifdef COMPAT_50
-		if_50_init();
-		swapstats_50_init();
-#endif
 #ifdef COMPAT_13
 		uvm_13_init();
 #endif
@@ -279,6 +275,7 @@ compat_modcmd(modcmd_t cmd, void *arg)
 		compat_sysctl_init();
 #ifdef COMPAT_50
 		uvm_50_init();
+		if_50_init();
 #endif
 		return 0;
 
@@ -342,20 +339,14 @@ compat_modcmd(modcmd_t cmd, void *arg)
 		rw_exit(_lock);
 #endif
 #endif	/* COMPAT_16 */
-#ifdef COMPAT_13
-		swapstats_13_fini();
-#endif
 #ifdef COMPAT_40
 		if_40_fini();
 #endif
 #ifdef COMPAT_50
 		if_50_fini();
-		swapstats_50_fini();
-#endif
-		compat_sysctl_fini();
-#ifdef COMPAT_50
 		uvm_50_fini();
 #endif
+		compat_sysctl_fini();
 		return 0;
 
 	default:

Index: src/sys/compat/common/files.common
diff -u src/sys/compat/common/files.common:1.1.2.9 src/sys/compat/common/files.common:1.1.2.10
--- src/sys/compat/common/files.common:1.1.2.9	Wed Mar 14 22:04:27 2018
+++ src/sys/compat/common/files.common	Thu Mar 15 11:17:54 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files.common,v 1.1.2.9 2018/03/14 22:04:27 pgoyette Exp $
+#	$NetBSD: files.common,v 1.1.2.10 2018/03/15 11:17:54 pgoyette Exp $
 
 #
 # Generic files, used by all compat options.
@@ -35,7 +35,7 @@ file	compat/common/vm_12.c			compat_12
 
 # Compatibility code for NetBSD 1.3
 file	compat/common/kern_sig_13.c		compat_13
-file	compat/common/uvm_stats_13.c		compat_13
+file	compat/common/uvm_13.c			compat_13
 
 # Compatibility code for NetBSD 1.4
 file	compat/common/rtsock_14.c		compat_14
@@ -63,7 +63,7 @@ file	compat/common/rndpseudo_50.c		compa
 file	compat/common/rtsock_50.c		compat_50
 file	compat/common/vfs_syscalls_50.c		compat_50
 file	compat/common/uipc_syscalls_50.c	compat_50
-file	compat/common/uvm_stats_50.c		compat_50
+file	compat/common/uvm_50.c			compat_50
 
 # Compatibility code for NetBSD 6.0
 file	compat/common/kern_sa_60.c		compat_60

Index: src/sys/uvm/uvm_swap.c
diff -u src/sys/uvm/uvm_swap.c:1.175.2.3 src/sys/uvm/uvm_swap.c:1.175.2.4
--- src/sys/uvm/uvm_swap.c:1.175.2.3	Thu Mar 15 09:12:07 2018
+++ src/sys/uvm/uvm_swap.c	Thu Mar 15 11:17:55 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_swap.c,v 1.175.2.3 2018/03/15 09:12:07 pgoyette Exp $	*/
+/*	$NetBSD: uvm_swap.c,v 1.175.2.4 2018/03/15 11:17:55 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.175.2.3 2018/03/15 09:12:07 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.175.2.4 2018/03/15 11:17:55 pgoyette Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_compat_netbsd.h"
@@ -116,6 +116,35 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v
  */
 
 /*
+ * swapdev: describes a single swap partition/file
+ *
+ * note the following should be true:
+ * swd_inuse <= swd_nblks  [number of blocks in use is <= total blocks]
+ * swd_nblks <= swd_mapsize [because mapsize includes miniroot+disklabel]
+ */
+struct swapdev {
+	dev_t			swd_dev;	/* device id */
+	int			swd_flags;	/* flags:inuse/enable/fake */
+	int			swd_priority;	/* our priority */
+	int			swd_nblks;	/* blocks in this device */
+	char			*swd_path;	/* saved pathname of device */
+	int			swd_pathlen;	/* length of pathname */
+	int			swd_npages;	/* #pages we can use */
+	int			swd_npginuse;	/* #pages in use */
+	int			swd_npgbad;	/* #pages bad */
+	int			swd_drumoffset;	/* page0 offset in drum */
+	int			swd_drumsize;	/* #pages in drum */
+	blist_t			

CVS commit: [pgoyette-compat] src/sbin/modstat

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Mar 15 10:03:04 UTC 2018

Modified Files:
src/sbin/modstat [pgoyette-compat]: modstat.8

Log Message:
Typo - for aliases, the REQUIRES column contains the real _module_ name,
not the real alias name.


To generate a diff of this commit:
cvs rdiff -u -r1.22.12.1 -r1.22.12.2 src/sbin/modstat/modstat.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/modstat/modstat.8
diff -u src/sbin/modstat/modstat.8:1.22.12.1 src/sbin/modstat/modstat.8:1.22.12.2
--- src/sbin/modstat/modstat.8:1.22.12.1	Sat Mar 10 10:36:26 2018
+++ src/sbin/modstat/modstat.8	Thu Mar 15 10:03:04 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: modstat.8,v 1.22.12.1 2018/03/10 10:36:26 pgoyette Exp $
+.\" $NetBSD: modstat.8,v 1.22.12.2 2018/03/15 10:03:04 pgoyette Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
 .\" All rights reserved.
@@ -103,10 +103,10 @@ flag
 .Fl f
 (force) to be loaded.
 .It Dv A
-Module is an alias for another module.
+The named module is an alias for another module.
 The REQUIRES column contains the
 .Dq real
-alias name.
+module name.
 .El
 .It Li REFS
 Number of references held on the module.

CVS commit: [pgoyette-compat] src/share/man/man9

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Mar 15 10:00:47 UTC 2018

Modified Files:
src/share/man/man9 [pgoyette-compat]: module.9

Log Message:
Spell the macro name correctly:  MODULE_WITH_ALIASES vs MODULE_WITH_ALIAS


To generate a diff of this commit:
cvs rdiff -u -r1.42.2.4 -r1.42.2.5 src/share/man/man9/module.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/module.9
diff -u src/share/man/man9/module.9:1.42.2.4 src/share/man/man9/module.9:1.42.2.5
--- src/share/man/man9/module.9:1.42.2.4	Wed Mar 14 02:47:41 2018
+++ src/share/man/man9/module.9	Thu Mar 15 10:00:47 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: module.9,v 1.42.2.4 2018/03/14 02:47:41 pgoyette Exp $
+.\"	$NetBSD: module.9,v 1.42.2.5 2018/03/15 10:00:47 pgoyette Exp $
 .\"
 .\" Copyright (c) 2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -43,7 +43,7 @@
 .Sh SYNOPSIS
 .In sys/module.h
 .Fn MODULE "class" "name" "required"
-.Fn MODULE_WITH_ALIAS "class" "name" "required" "aliases"
+.Fn MODULE_WITH_ALIASES "class" "name" "required" "aliases"
 .Ft int
 .Fn module_load "const char *name" "int flags" "prop_dictionary_t props" \
 "modclass_t class"

CVS commit: [netbsd-8] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu Mar 15 09:56:35 UTC 2018

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
Ticket #608


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.142 -r1.1.2.143 src/doc/CHANGES-8.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.142 src/doc/CHANGES-8.0:1.1.2.143
--- src/doc/CHANGES-8.0:1.1.2.142	Wed Mar 14 18:37:48 2018
+++ src/doc/CHANGES-8.0	Thu Mar 15 09:56:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.142 2018/03/14 18:37:48 bouyer Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.143 2018/03/15 09:56:35 martin Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -10309,3 +10309,18 @@ tests/lib/libc/locale/t_sprintf.c		1.2
 	Fixes PR standards/52282.
 	[martin, ticket #630]
 
+tests/lib/libc/locale/t_btowc.c			1.2,1.3
+tests/lib/libc/locale/t_io.c			1.5
+tests/lib/libc/locale/t_mbrtowc.c		1.2
+tests/lib/libc/locale/t_mbstowcs.c		1.2
+tests/lib/libc/locale/t_sprintf.c		1.3
+tests/lib/libc/locale/t_wcstod.c		1.4
+tests/lib/libc/locale/t_wctomb.c		1.5
+tests/lib/libc/locale/t_wctype.c		1.2
+
+	Add ISO10646 versions of these tests, conditional on
+	__STDC_ISO_10646__.
+	Separate the C/POSIX locale test from the rest; make it
+	more thorough and more correct.
+	[maya, ticket #608]
+

CVS commit: [netbsd-8] src/tests/lib/libc/locale

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu Mar 15 09:55:23 UTC 2018

Modified Files:
src/tests/lib/libc/locale [netbsd-8]: t_btowc.c t_io.c t_mbrtowc.c
t_mbstowcs.c t_sprintf.c t_wcstod.c t_wctomb.c t_wctype.c

Log Message:
Pull up following revision(s) (requested by maya in ticket #608):
tests/lib/libc/locale/t_sprintf.c: revision 1.3
tests/lib/libc/locale/t_wctomb.c: revision 1.5
tests/lib/libc/locale/t_io.c: revision 1.5
tests/lib/libc/locale/t_wcstod.c: revision 1.4
tests/lib/libc/locale/t_mbstowcs.c: revision 1.2
tests/lib/libc/locale/t_wctype.c: revision 1.2
tests/lib/libc/locale/t_mbrtowc.c: revision 1.2
tests/lib/libc/locale/t_btowc.c: revision 1.2
tests/lib/libc/locale/t_btowc.c: revision 1.3
Add ISO10646 versions of these tests, conditional on __STDC_ISO_10646__ .
Also make the tests a bit more verbose, to aid debugging when they fail.

Separate the C/POSIX locale test from the rest; make it more thorough
and more correct.  This fixes a problem reported by martin@ when the
test is compiled with -funsigned-char.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.2.1 src/tests/lib/libc/locale/t_btowc.c \
src/tests/lib/libc/locale/t_wctype.c
cvs rdiff -u -r1.4 -r1.4.20.1 src/tests/lib/libc/locale/t_io.c
cvs rdiff -u -r1.1 -r1.1.34.1 src/tests/lib/libc/locale/t_mbrtowc.c \
src/tests/lib/libc/locale/t_mbstowcs.c
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/tests/lib/libc/locale/t_sprintf.c
cvs rdiff -u -r1.3 -r1.3.34.1 src/tests/lib/libc/locale/t_wcstod.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/tests/lib/libc/locale/t_wctomb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/lib/libc/locale/t_btowc.c
diff -u src/tests/lib/libc/locale/t_btowc.c:1.1 src/tests/lib/libc/locale/t_btowc.c:1.1.2.1
--- src/tests/lib/libc/locale/t_btowc.c:1.1	Thu Jun  1 15:45:02 2017
+++ src/tests/lib/libc/locale/t_btowc.c	Thu Mar 15 09:55:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: t_btowc.c,v 1.1 2017/06/01 15:45:02 perseant Exp $ */
+/* $NetBSD: t_btowc.c,v 1.1.2.1 2018/03/15 09:55:23 martin Exp $ */
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -32,11 +32,12 @@
 #include 
 __COPYRIGHT("@(#) Copyright (c) 2017\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_btowc.c,v 1.1 2017/06/01 15:45:02 perseant Exp $");
+__RCSID("$NetBSD: t_btowc.c,v 1.1.2.1 2018/03/15 09:55:23 martin Exp $");
 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -51,13 +52,6 @@ struct test {
 	const wchar_t willegal[8]; /* ISO-10646 that do not map into charset */
 } tests[] = {
 	{
-		"C",
-		"\377",
-		"ABC123@\t",
-		{ 'A', 'B', 'C', '1', '2', '3', '@', '\t' },
-		{ 0x0430, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}
-	},
-	{
 		"en_US.UTF-8",
 		"\200",
 		"ABC123@\t",
@@ -85,18 +79,28 @@ static void
 h_iso10646(struct test *t)
 {
 	const char *cp;
-	unsigned char c;
+	int c, wc;
 	char *str;
 	const wchar_t *wcp;
 
+	ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C");
+	printf("Trying locale: %s\n", t->locale);
+	ATF_REQUIRE(setlocale(LC_CTYPE, t->locale) != NULL);
+	ATF_REQUIRE((str = setlocale(LC_ALL, NULL)) != NULL);
+	(void)printf("Using locale: %s\n", str);
+
 	/* These should have valid wchar representations */
 	for (cp = t->legal, wcp = t->wlegal; *cp != '\0'; ++cp, ++wcp) {
-		c = (unsigned char)*cp;
+		c = (int)(unsigned char)*cp;
 		printf("Checking legal character 0x%x\n", c);
+		wc = btowc(c);
+
+		if (errno != 0)
+			printf(" btowc() failed with errno=%d\n", errno);
 
 		/* It should map to the known Unicode equivalent */
 		printf("btowc(0x%2.2x) = 0x%x, expecting 0x%x\n",
-			c, btowc(c), *wcp);
+		   c, wc, *wcp);
 		ATF_REQUIRE(btowc(c) == *wcp);
 	}
 
@@ -120,6 +124,8 @@ h_btowc(struct test *t)
 	ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C");
 	printf("Trying locale: %s\n", t->locale);
 	ATF_REQUIRE(setlocale(LC_CTYPE, t->locale) != NULL);
+	ATF_REQUIRE((str = setlocale(LC_ALL, NULL)) != NULL);
+	(void)printf("Using locale: %s\n", str);
 
 	/* btowc(EOF) -> WEOF */
 	ATF_REQUIRE_EQ(btowc(EOF), WEOF);
@@ -180,9 +186,39 @@ ATF_TC_BODY(stdc_iso_10646, tc)
 #endif /* ! __STDC_ISO_10646__ */
 }
 
+ATF_TC(btowc_posix);
+ATF_TC_HEAD(btowc_posix, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks btowc(3) and wctob(3) for POSIX locale");
+}
+ATF_TC_BODY(btowc_posix, tc)
+{
+	const char *cp;
+	unsigned char c;
+	char *str;
+	const wchar_t *wcp;
+	int i;
+
+	ATF_REQUIRE_STREQ(setlocale(LC_ALL, "POSIX"), "POSIX");
+
+	/* btowc(EOF) -> WEOF */
+	ATF_REQUIRE_EQ(btowc(EOF), WEOF);
+
+	/* wctob(WEOF) -> EOF */
+	ATF_REQUIRE_EQ(wctob(WEOF), EOF);
+
+	/* All characters from 0 to 255, inclusive, map
+	   onto their unsigned char equivalent */
+	for (i = 0; i <= 255; i++) {
+		ATF_REQUIRE_EQ(btowc(i), (wchar_t)(unsigned char)(i));
+		ATF_REQUIRE_EQ((unsigned char)wctob(i), (wchar_t)i);
+	}
+}

CVS commit: src/sys/arch/x86/x86

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Thu Mar 15 09:17:31 UTC 2018

Modified Files:
src/sys/arch/x86/x86: cpu.c

Log Message:
Remove #ifdef XEN (Xen has its own cpu.c), and add a comment.


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sys/arch/x86/x86/cpu.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/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.151 src/sys/arch/x86/x86/cpu.c:1.152
--- src/sys/arch/x86/x86/cpu.c:1.151	Wed Mar 14 17:40:41 2018
+++ src/sys/arch/x86/x86/cpu.c	Thu Mar 15 09:17:31 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.151 2018/03/14 17:40:41 maxv Exp $	*/
+/*	$NetBSD: cpu.c,v 1.152 2018/03/15 09:17:31 maxv Exp $	*/
 
 /*
  * Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.151 2018/03/14 17:40:41 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.152 2018/03/15 09:17:31 maxv Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
@@ -1338,8 +1338,6 @@ cpu_kick(struct cpu_info *ci)
 	x86_send_ipi(ci, 0);
 }
 
-#if !defined(XEN)
-
 /* - */
 
 /*
@@ -1364,6 +1362,13 @@ speculation_detect_method(void)
 		/* TODO: detect MITIGATION_INTEL_IBRS */
 		mitigation_method = MITIGATION_NONE;
 	} else if (cpu_vendor == CPUVENDOR_AMD) {
+		/*
+		 * The AMD Family 10h manual documents the IC_CFG.DIS_IND bit.
+		 * This bit disables the Indirect Branch Predictor.
+		 *
+		 * Families 12h and 16h are believed to have this bit too, but
+		 * their manuals don't document it.
+		 */
 		switch (CPUID_TO_FAMILY(ci->ci_signature)) {
 		case 0x10:
 		case 0x12:
@@ -1504,5 +1509,3 @@ sysctl_machdep_spectreV2_mitigated(SYSCT
 
 	return error;
 }
-
-#endif

CVS commit: [pgoyette-compat] src

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Mar 15 09:12:09 UTC 2018

Modified Files:
src [pgoyette-compat]: Makefile UPDATING
src/bin/sh [pgoyette-compat]: sh.1
src/crypto/external/bsd/heimdal [pgoyette-compat]: Makefile.rules.inc
src/crypto/external/bsd/openssl/dist [pgoyette-compat]: e_os.h
src/crypto/external/bsd/openssl/dist/crypto/bn/asm [pgoyette-compat]:
mips.pl
src/crypto/external/bsd/openssl/dist/crypto/evp [pgoyette-compat]:
e_aes.c
src/crypto/external/bsd/openssl/dist/crypto/modes [pgoyette-compat]:
gcm128.c
src/crypto/external/bsd/openssl/lib/libcrypto [pgoyette-compat]:
man.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64 
[pgoyette-compat]:
Makefile aes.inc aesv8-armx.S bf.inc bn.inc crypto.inc des.inc
ghashv8-armx.S modes.inc rc4.inc sha.inc sha1-armv8.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm 
[pgoyette-compat]:
aes.inc crypto.inc modes.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k 
[pgoyette-compat]:
aes-m68k.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips 
[pgoyette-compat]:
aes.inc bn.inc crypto.inc mips64.S poly1305.inc sha.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax 
[pgoyette-compat]:
bn_asm_vax.S
src/distrib/i386/ramdisks/common [pgoyette-compat]: Makefile.ramdisk
src/distrib/notes/common [pgoyette-compat]: main
src/distrib/sets/lists/debug [pgoyette-compat]: ad.mips mi
src/distrib/sets/lists/tests [pgoyette-compat]: mi
src/distrib/sets/lists/xbase [pgoyette-compat]: shl.mi
src/distrib/sets/lists/xcomp [pgoyette-compat]: mi shl.mi
src/distrib/sets/lists/xdebug [pgoyette-compat]: md.amd64 md.i386 mi
shl.mi
src/distrib/sets/lists/xserver [pgoyette-compat]: md.amd64 md.i386
src/doc [pgoyette-compat]: BRANCHES CHANGES
src/etc/namedb [pgoyette-compat]: bind.keys
src/external/bsd/cron/dist [pgoyette-compat]: crontab.c
src/external/bsd/flex/dist/src [pgoyette-compat]: libmain.c libyywrap.c
src/external/bsd/unbound/sbin [pgoyette-compat]: Makefile.inc
src/external/gpl2/groff/bin/eqn [pgoyette-compat]: Makefile
src/external/gpl2/groff/bin/pic [pgoyette-compat]: Makefile
src/external/gpl2/groff/bin/refer [pgoyette-compat]: Makefile
src/external/gpl3/gcc [pgoyette-compat]: Makefile.hooks
src/external/gpl3/gcc.old [pgoyette-compat]: Makefile.hooks
src/external/mit/xorg/bin/bdftopcf [pgoyette-compat]: Makefile
src/external/mit/xorg/bin/ico [pgoyette-compat]: Makefile
src/external/mit/xorg/bin/xeyes [pgoyette-compat]: Makefile
src/external/mit/xorg/bin/xfs [pgoyette-compat]: Makefile
src/external/mit/xorg/bin/xrefresh [pgoyette-compat]: Makefile
src/external/mit/xorg/bin/xset [pgoyette-compat]: Makefile
src/external/mit/xorg/bin/xterm [pgoyette-compat]: Makefile
src/external/mit/xorg/bin/xwd [pgoyette-compat]: Makefile
src/external/mit/xorg/bin/xwud [pgoyette-compat]: Makefile
src/external/mit/xorg/include [pgoyette-compat]: Makefile
src/external/mit/xorg/lib [pgoyette-compat]: Makefile
src/external/mit/xorg/lib/libdrm [pgoyette-compat]: Makefile.defines
src/external/mit/xorg/lib/libdrm_amdgpu [pgoyette-compat]: Makefile
src/external/mit/xorg/lib/libxcb/files [pgoyette-compat]: config.h
dri3.c dri3.h present.h randr.c randr.h res.c shm.c xinput.c
xinput.h xkb.c xproto.c
src/external/mit/xorg/lib/xkeyboard-config [pgoyette-compat]:
xkeyboard-config.man
src/external/mit/xorg/lib/xkeyboard-config/rules [pgoyette-compat]:
base base.lst evdev evdev.lst
src/external/mit/xorg/tools/bdftopcf [pgoyette-compat]: Makefile
src/external/mit/xorg/tools/makekeys [pgoyette-compat]: Makefile
src/games/wtf [pgoyette-compat]: wtf
src/lib/csu/common [pgoyette-compat]: crt0-common.c
src/lib/libm/noieee_src [pgoyette-compat]: n_exp2.c
src/lib/libm/src [pgoyette-compat]: e_atan2.c
src/lib/libukfs [pgoyette-compat]: ukfs.3
src/libexec/ld.elf_so [pgoyette-compat]: rtld.c rtld.h
src/libexec/ld.elf_so/arch/powerpc [pgoyette-compat]: ppc_reloc.c
src/share/dict [pgoyette-compat]: propernames
src/share/man/man3 [pgoyette-compat]: bitmap.3
src/share/man/man4 [pgoyette-compat]: altq.4 lm.4
src/share/mk [pgoyette-compat]: bsd.README bsd.own.mk bsd.prog.mk
src/sys/arch/aarch64/include [pgoyette-compat]: armreg.h
src/sys/arch/amiga/conf [pgoyette-compat]: files.amiga
src/sys/arch/arm/omap [pgoyette-compat]: omap_gpio.c
src/sys/arch/arm/sunxi [pgoyette-compat]: 

CVS commit: src/sys

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Thu Mar 15 08:15:21 UTC 2018

Modified Files:
src/sys/netinet: in_proto.c
src/sys/netinet6: in6_proto.c

Log Message:
Add the PR_LASTHDR flag on the PFsync and CARP entries. Otherwise a
"require" IPsec policy is not enforced on them, and unauthenticated
packets will be accepted.

Tested with a require-AH configuration. Sent on tech-net@, no comment.


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/netinet/in_proto.c
cvs rdiff -u -r1.121 -r1.122 src/sys/netinet6/in6_proto.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/netinet/in_proto.c
diff -u src/sys/netinet/in_proto.c:1.126 src/sys/netinet/in_proto.c:1.127
--- src/sys/netinet/in_proto.c:1.126	Mon Feb  5 08:38:06 2018
+++ src/sys/netinet/in_proto.c	Thu Mar 15 08:15:21 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: in_proto.c,v 1.126 2018/02/05 08:38:06 maxv Exp $	*/
+/*	$NetBSD: in_proto.c,v 1.127 2018/03/15 08:15:21 maxv Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.126 2018/02/05 08:38:06 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.127 2018/03/15 08:15:21 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_mrouting.h"
@@ -432,7 +432,7 @@ const struct protosw inetsw[] = {
 {	.pr_type = SOCK_RAW,
 	.pr_domain = ,
 	.pr_protocol = IPPROTO_CARP,
-	.pr_flags = PR_ATOMIC|PR_ADDR,
+	.pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
 	.pr_input = carp_proto_input,
 	.pr_ctloutput = rip_ctloutput,
 	.pr_usrreqs = _usrreqs,
@@ -453,7 +453,7 @@ const struct protosw inetsw[] = {
 {	.pr_type = SOCK_RAW,
 	.pr_domain = ,
 	.pr_protocol = IPPROTO_PFSYNC,
-	.pr_flags	 = PR_ATOMIC|PR_ADDR,
+	.pr_flags	 = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
 	.pr_input	 = pfsync_input,
 	.pr_ctloutput = rip_ctloutput,
 	.pr_usrreqs	 = _usrreqs,

Index: src/sys/netinet6/in6_proto.c
diff -u src/sys/netinet6/in6_proto.c:1.121 src/sys/netinet6/in6_proto.c:1.122
--- src/sys/netinet6/in6_proto.c:1.121	Wed Feb  7 10:52:20 2018
+++ src/sys/netinet6/in6_proto.c	Thu Mar 15 08:15:21 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_proto.c,v 1.121 2018/02/07 10:52:20 maxv Exp $	*/
+/*	$NetBSD: in6_proto.c,v 1.122 2018/03/15 08:15:21 maxv Exp $	*/
 /*	$KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.121 2018/02/07 10:52:20 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.122 2018/03/15 08:15:21 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_gateway.h"
@@ -452,7 +452,7 @@ const struct ip6protosw inet6sw[] = {
 {	.pr_type = SOCK_RAW,
 	.pr_domain = ,
 	.pr_protocol = IPPROTO_CARP,
-	.pr_flags = PR_ATOMIC|PR_ADDR,
+	.pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
 	.pr_input = carp6_proto_input,
 	.pr_ctloutput = rip6_ctloutput,
 	.pr_usrreqs = _usrreqs,

CVS commit: [pgoyette-compat] src/sys/modules/compat_70

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Mar 15 07:29:02 UTC 2018

Modified Files:
src/sys/modules/compat_70 [pgoyette-compat]: Makefile

Log Message:
Use correct module name


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/modules/compat_70/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/modules/compat_70/Makefile
diff -u src/sys/modules/compat_70/Makefile:1.1.2.1 src/sys/modules/compat_70/Makefile:1.1.2.2
--- src/sys/modules/compat_70/Makefile:1.1.2.1	Thu Mar 15 05:10:05 2018
+++ src/sys/modules/compat_70/Makefile	Thu Mar 15 07:29:02 2018
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.1.2.1 2018/03/15 05:10:05 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.1.2.2 2018/03/15 07:29:02 pgoyette Exp $
 
 .include "../Makefile.inc"
 
 .PATH:	${S}/compat/common
 
-KMOD=	compat
+KMOD=	compat_70
 
 CPPFLAGS+=	-DCOMPAT_70 -DCOMPAT_80
 

CVS commit: src/sys/dev/pci/ixgbe

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Mar 15 06:48:51 UTC 2018

Modified Files:
src/sys/dev/pci/ixgbe: if_bypass.c if_sriov.c ix_txrx.c ixgbe.c ixgbe.h
ixgbe_common.c ixgbe_common.h ixgbe_osdep.c ixgbe_osdep.h
ixgbe_phy.c ixgbe_sriov.h ixgbe_type.h ixgbe_vf.h ixgbe_x540.c
ixgbe_x550.c ixv.c

Log Message:
 Add some changes from ix-3.2.17.tar.gz and r328265. Not fully synchronized.
Some others (e.g. sfp cage interrupt and bypass adapter  stuff) will be merged
later:
- Initialize firmware command buffer correctly in ixgbe_read_ee_hostif_X550()
  and ixgbe_read_ee_hostif_buffer_X550(). These functions are used when reading
  NVM.
- Fix a bug that ixgbe_mng_present() misunderstand management capability on
  X550 and newer on some environment. X550 changed FWSM bit definition.
  See X540 document and X550's document and compare them.
- Fix checksum calculation in ixgbe_set_fw_drv_ver_generic(). This function is
  not used in NetBSD.
- Add some unused funtions.
- Whitespace fix.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/ixgbe/if_bypass.c \
src/sys/dev/pci/ixgbe/ixgbe_osdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/ixgbe/if_sriov.c \
src/sys/dev/pci/ixgbe/ixgbe_sriov.h
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/ixgbe/ix_txrx.c \
src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.134 -r1.135 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/ixgbe/ixgbe_common.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/ixgbe/ixgbe_common.h
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pci/ixgbe/ixgbe_osdep.h
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/ixgbe/ixgbe_phy.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/ixgbe/ixgbe_type.h
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/ixgbe/ixgbe_vf.h
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/ixgbe/ixgbe_x540.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/ixgbe/ixgbe_x550.c
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/pci/ixgbe/ixv.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/ixgbe/if_bypass.c
diff -u src/sys/dev/pci/ixgbe/if_bypass.c:1.2 src/sys/dev/pci/ixgbe/if_bypass.c:1.3
--- src/sys/dev/pci/ixgbe/if_bypass.c:1.2	Wed Nov 22 15:15:09 2017
+++ src/sys/dev/pci/ixgbe/if_bypass.c	Thu Mar 15 06:48:51 2018
@@ -474,45 +474,45 @@ ixgbe_bp_wd_set(SYSCTLFN_ARGS)
 
 	mask = BYPASS_WDT_ENABLE_M;
 	switch (timeout) {
-		case 0: /* disables the timer */
-			break;
-		case 1:
-			arg = BYPASS_WDT_1_5 << BYPASS_WDT_TIME_SHIFT;
-			arg |= 0x1 << BYPASS_WDT_ENABLE_SHIFT;
-			mask |= BYPASS_WDT_VALUE_M;
-			break;
-		case 2:
-			arg = BYPASS_WDT_2 << BYPASS_WDT_TIME_SHIFT;
-			arg |= 0x1 << BYPASS_WDT_ENABLE_SHIFT;
-			mask |= BYPASS_WDT_VALUE_M;
-			break;
-		case 3:
-			arg = BYPASS_WDT_3 << BYPASS_WDT_TIME_SHIFT;
-			arg |= 0x1 << BYPASS_WDT_ENABLE_SHIFT;
-			mask |= BYPASS_WDT_VALUE_M;
-			break;
-		case 4:
-			arg = BYPASS_WDT_4 << BYPASS_WDT_TIME_SHIFT;
-			arg |= 0x1 << BYPASS_WDT_ENABLE_SHIFT;
-			mask |= BYPASS_WDT_VALUE_M;
-			break;
-		case 8:
-			arg = BYPASS_WDT_8 << BYPASS_WDT_TIME_SHIFT;
-			arg |= 0x1 << BYPASS_WDT_ENABLE_SHIFT;
-			mask |= BYPASS_WDT_VALUE_M;
-			break;
-		case 16:
-			arg = BYPASS_WDT_16 << BYPASS_WDT_TIME_SHIFT;
-			arg |= 0x1 << BYPASS_WDT_ENABLE_SHIFT;
-			mask |= BYPASS_WDT_VALUE_M;
-			break;
-		case 32:
-			arg = BYPASS_WDT_32 << BYPASS_WDT_TIME_SHIFT;
-			arg |= 0x1 << BYPASS_WDT_ENABLE_SHIFT;
-			mask |= BYPASS_WDT_VALUE_M;
-			break;
-		default:
-			return (EINVAL);
+	case 0: /* disables the timer */
+		break;
+	case 1:
+		arg = BYPASS_WDT_1_5 << BYPASS_WDT_TIME_SHIFT;
+		arg |= 0x1 << BYPASS_WDT_ENABLE_SHIFT;
+		mask |= BYPASS_WDT_VALUE_M;
+		break;
+	case 2:
+		arg = BYPASS_WDT_2 << BYPASS_WDT_TIME_SHIFT;
+		arg |= 0x1 << BYPASS_WDT_ENABLE_SHIFT;
+		mask |= BYPASS_WDT_VALUE_M;
+		break;
+	case 3:
+		arg = BYPASS_WDT_3 << BYPASS_WDT_TIME_SHIFT;
+		arg |= 0x1 << BYPASS_WDT_ENABLE_SHIFT;
+		mask |= BYPASS_WDT_VALUE_M;
+		break;
+	case 4:
+		arg = BYPASS_WDT_4 << BYPASS_WDT_TIME_SHIFT;
+		arg |= 0x1 << BYPASS_WDT_ENABLE_SHIFT;
+		mask |= BYPASS_WDT_VALUE_M;
+		break;
+	case 8:
+		arg = BYPASS_WDT_8 << BYPASS_WDT_TIME_SHIFT;
+		arg |= 0x1 << BYPASS_WDT_ENABLE_SHIFT;
+		mask |= BYPASS_WDT_VALUE_M;
+		break;
+	case 16:
+		arg = BYPASS_WDT_16 << BYPASS_WDT_TIME_SHIFT;
+		arg |= 0x1 << BYPASS_WDT_ENABLE_SHIFT;
+		mask |= BYPASS_WDT_VALUE_M;
+		break;
+	case 32:
+		arg = BYPASS_WDT_32 << BYPASS_WDT_TIME_SHIFT;
+		arg |= 0x1 << BYPASS_WDT_ENABLE_SHIFT;
+		mask |= BYPASS_WDT_VALUE_M;
+		break;
+	default:
+		return (EINVAL);
 	}
 	/* Set the new watchdog */
 	ixgbe_bypass_mutex_enter(adapter);
@@ -635,7 +635,7 @@ ixgbe_bp_log(SYSCTLFN_ARGS)
 			);
 			ixgbe_bypass_mutex_clear(adapter);
 			if (error)
-return (-EINVAL);
+return (EINVAL);
 			eeprom[count].logs += data << (8 * i);
 		}
 
@@ -644,7 +644,7 @@ ixgbe_bp_log(SYSCTLFN_ARGS)