CVS commit: src/external/gpl3/binutils/dist/bfd

2016-04-03 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Mon Apr  4 06:58:48 UTC 2016

Modified Files:
src/external/gpl3/binutils/dist/bfd: configure configure.ac

Log Message:
Don't use secureplt on alpha yet


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/binutils/dist/bfd/configure
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/dist/bfd/configure.ac

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

Modified files:

Index: src/external/gpl3/binutils/dist/bfd/configure
diff -u src/external/gpl3/binutils/dist/bfd/configure:1.9 src/external/gpl3/binutils/dist/bfd/configure:1.10
--- src/external/gpl3/binutils/dist/bfd/configure:1.9	Fri Jan 29 18:05:18 2016
+++ src/external/gpl3/binutils/dist/bfd/configure	Mon Apr  4 06:58:48 2016
@@ -12147,7 +12147,7 @@ if test "${enable_secureplt+set}" = set;
   *)as_fn_error "bad value ${enableval} for secureplt option" "$LINENO" 5 ;;
 esac
 else
-  use_secureplt=true
+  use_secureplt=false
 fi
 if test $use_secureplt = true; then
 

Index: src/external/gpl3/binutils/dist/bfd/configure.ac
diff -u src/external/gpl3/binutils/dist/bfd/configure.ac:1.2 src/external/gpl3/binutils/dist/bfd/configure.ac:1.3
--- src/external/gpl3/binutils/dist/bfd/configure.ac:1.2	Fri Jan 29 18:05:18 2016
+++ src/external/gpl3/binutils/dist/bfd/configure.ac	Mon Apr  4 06:58:48 2016
@@ -82,7 +82,7 @@ AC_ARG_ENABLE(secureplt,
   yes)  use_secureplt=true  ;;
   no)   use_secureplt=false ;;
   *)AC_MSG_ERROR(bad value ${enableval} for secureplt option) ;;
-esac],[use_secureplt=true])dnl
+esac],[use_secureplt=false])dnl
 if test $use_secureplt = true; then
   AC_DEFINE(USE_SECUREPLT, 1,
 [Define if we should default to creating read-only plt entries])

Re: CVS commit: src/sys/external/bsd/ipf/netinet

2016-04-03 Thread Ryota Ozaki 
On Mon, Apr 4, 2016 at 12:52 AM, Christos Zoulas  wrote:
> Module Name:src
> Committed By:   christos
> Date:   Sun Apr  3 15:52:37 UTC 2016
>
> Modified Files:
> src/sys/external/bsd/ipf/netinet: fil.c
>
> Log Message:
> Comment out the mutex calls that protect against concurrent configuration
> changes and processing. This needs to be done differently since you can't
> sleep during interrupt processing.

We don't need the fix for -current because any input packet processing
now doesn't run in hardware interrupt context (even fast forward).

  ozaki-r

>
>
> To generate a diff of this commit:
> cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/ipf/netinet/fil.c
>
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
>

CVS commit: src/external/cddl/osnet/dev/profile

2016-04-03 Thread Taylor R Campbell 
Module Name:src
Committed By:   riastradh
Date:   Mon Apr  4 05:15:07 UTC 2016

Modified Files:
src/external/cddl/osnet/dev/profile: profile.c

Log Message:
Fix module name of dtrace_profile.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dev/profile/profile.c

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

Modified files:

Index: src/external/cddl/osnet/dev/profile/profile.c
diff -u src/external/cddl/osnet/dev/profile/profile.c:1.4 src/external/cddl/osnet/dev/profile/profile.c:1.5
--- src/external/cddl/osnet/dev/profile/profile.c:1.4	Fri Dec  7 03:11:17 2012
+++ src/external/cddl/osnet/dev/profile/profile.c	Mon Apr  4 05:15:07 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: profile.c,v 1.4 2012/12/07 03:11:17 chs Exp $	*/
+/*	$NetBSD: profile.c,v 1.5 2016/04/04 05:15:07 riastradh Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -565,7 +565,7 @@ MODULE_DEPEND(profile, opensolaris, 1, 1
 #ifdef __NetBSD__
 
 static int
-profile_modcmd(modcmd_t cmd, void *data)
+dtrace_profile_modcmd(modcmd_t cmd, void *data)
 {
 	switch (cmd) {
 	case MODULE_CMD_INIT:
@@ -581,6 +581,6 @@ profile_modcmd(modcmd_t cmd, void *data)
 	}
 }
 
-MODULE(MODULE_CLASS_MISC, profile, "dtrace,cyclic");
+MODULE(MODULE_CLASS_MISC, dtrace_profile, "dtrace,cyclic");
 
 #endif

CVS commit: src/sys/kern

2016-04-03 Thread Kengo NAKAHARA 
Module Name:src
Committed By:   knakahara
Date:   Mon Apr  4 03:53:25 UTC 2016

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

Log Message:
fix inconsistency about "sdt" provider which was declared but not defined.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/kern/kern_sdt.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/kern_sdt.c
diff -u src/sys/kern/kern_sdt.c:1.2 src/sys/kern/kern_sdt.c:1.3
--- src/sys/kern/kern_sdt.c:1.2	Fri Oct  2 16:54:15 2015
+++ src/sys/kern/kern_sdt.c	Mon Apr  4 03:53:25 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_sdt.c,v 1.2 2015/10/02 16:54:15 christos Exp $	*/
+/*	$NetBSD: kern_sdt.c,v 1.3 2016/04/04 03:53:25 knakahara Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -71,6 +71,8 @@
 #include 
 #include 
 
+SDT_PROVIDER_DEFINE(sdt);
+
 void sdt_probe_stub(u_int32_t, uintptr_t, uintptr_t,
 	uintptr_t, uintptr_t, uintptr_t);

CVS commit: src/external/gpl3/gcc

2016-04-03 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Mon Apr  4 01:47:18 UTC 2016

Modified Files:
src/external/gpl3/gcc: README.gcc53

Log Message:
remove platforms successful switched and update some of the mips testing


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/gpl3/gcc/README.gcc53

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

Modified files:

Index: src/external/gpl3/gcc/README.gcc53
diff -u src/external/gpl3/gcc/README.gcc53:1.18 src/external/gpl3/gcc/README.gcc53:1.19
--- src/external/gpl3/gcc/README.gcc53:1.18	Mon Apr  4 01:32:21 2016
+++ src/external/gpl3/gcc/README.gcc53	Mon Apr  4 01:47:18 2016
@@ -1,4 +1,4 @@
-$NetBSD: README.gcc53,v 1.18 2016/04/04 01:32:21 mrg Exp $
+$NetBSD: README.gcc53,v 1.19 2016/04/04 01:47:18 mrg Exp $
 
 lib:
 	libasan is disabled currently (haven't tried yet)
@@ -33,7 +33,6 @@ atf:		does atf run / compare well
 
 architecture	tools	kernels	libgcc	native-gcc	make release	runs	atf
 	-	---	--	--			---
-alpha		y	y	y	y		y		y[6]	y - 7 new failures out of ~4000
 arm		y	?	y	y		n[3]
 armeb		y	?	y	y		n[3]
 coldfire	y	N/A	y	y		?		N/A	N/A
@@ -51,21 +50,18 @@ earmv7		y	?	y	y		y[3]
 earmv7eb	y	?	y	y		y[3]
 earmv7hf	y	?	y	y		y[3]
 earmv7hfeb	y	?	y	y		y[3]
-hppa		y	y	y	y		y		y[6]	y
-i386		y	y	y	y		y		y	y
 m68000		y	?	y	y		y
 m68k		y	y[16]	y	y		y[13]
 mipseb		y	y	y	y		y		y
-mipsel		y	y	y	y		y		y
-mips64eb	y	y	y	y		y[8]		y
-mips64el	y	?	y	y		y
+mipsel		y	y	y	y		y		y	y
+mips64eb	y	y	y	y		y[8]		y	y
+mips64el	y	?	y	y		y		y	y
 powerpc		y	y	y	y		y		y[6]	
 sh3eb		y	?	y	y		y[5]
 sh3el		y	?	y	y		y
 sparc		y	y	y	y		y		y[6]
 sparc64		y	y	y	y		y		y[6,2]	y
 vax		y	y	y	y		y		y[15]	n
-x86_64		y	y	y	y		y		y	y
 --
 or1k		n[10]
 riscv32		n[10]
@@ -100,7 +96,7 @@ architecture	tools	kernels	libgcc	native
- sgimips O2 (OK kernel -- but my O2 is not stable)
- i386/amd64 (OK)
- hppa (OK)
-[15] - vax
+[15] - vax -- switched to GCC 5.3 already as it is less broken
 	- ssh is broken, was broken with 4.8
 	- there are too many -O0's we added because of mis-handled rtl
 	- the eh_frame stuff is probably busted, but it never worked?

CVS commit: src/external/gpl3/gcc

2016-04-03 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Mon Apr  4 01:32:21 UTC 2016

Modified Files:
src/external/gpl3/gcc: README.gcc53

Log Message:
note shark (earmv4) works including atf.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc/README.gcc53

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

Modified files:

Index: src/external/gpl3/gcc/README.gcc53
diff -u src/external/gpl3/gcc/README.gcc53:1.17 src/external/gpl3/gcc/README.gcc53:1.18
--- src/external/gpl3/gcc/README.gcc53:1.17	Sat Apr  2 08:54:47 2016
+++ src/external/gpl3/gcc/README.gcc53	Mon Apr  4 01:32:21 2016
@@ -1,4 +1,4 @@
-$NetBSD: README.gcc53,v 1.17 2016/04/02 08:54:47 mlelstv Exp $
+$NetBSD: README.gcc53,v 1.18 2016/04/04 01:32:21 mrg Exp $
 
 lib:
 	libasan is disabled currently (haven't tried yet)
@@ -41,7 +41,7 @@ earm		y	?	y	y		y[3,13]
 earmeb		y	?	y	y		y[3,13]
 earmhf		y	?	y	y		y[3]
 earmhfeb	y	?	y	y		y[3]
-earmv4		y	y	y	y		y[3]		y	y[4]
+earmv4		y	y	y	y		y[3]		y	y
 earmv4eb	y	?	y	y		y[3]
 earmv6		y	?	y	y		y[3]
 earmv6eb	y	?	y	y		y[3]
@@ -80,7 +80,6 @@ architecture	tools	kernels	libgcc	native
 	-- may be a SMP issue; ultra10 works, ultra45 SMP does not
 		-- try sb2000 (particularly with UP kernel.  u45 UP is shitty.)
 [3] - MKCOMPAT=no enabled currently, infact OABI seems to be broken.  the docs say it was only deprecated, but the options make broken crap.
-[4] - bin/expr/t_expr:overflow fails on shark, only new failure.  fails on other ports too.
 [5] - sh3eb tries to use sh specific atomic config which doesn't work, has hand edited mknative output
 [6] - crtbeginS.o builds incorrectly with GCC 5.3 and -O2.  a hack for -O1 has been added.
 [8] - sgimips64 release build fails, mdsetimage'd gz'd kernels don't get built?

CVS commit: src/sys/external/bsd/ipf/netinet

2016-04-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Mon Apr  4 00:44:07 UTC 2016

Modified Files:
src/sys/external/bsd/ipf/netinet: fil.c

Log Message:
We don't need this in /current because packet processing does not happen in
an interrupt anymore (pointed out by ozaki@)


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/ipf/netinet/fil.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/external/bsd/ipf/netinet/fil.c
diff -u src/sys/external/bsd/ipf/netinet/fil.c:1.17 src/sys/external/bsd/ipf/netinet/fil.c:1.18
--- src/sys/external/bsd/ipf/netinet/fil.c:1.17	Sun Apr  3 11:52:37 2016
+++ src/sys/external/bsd/ipf/netinet/fil.c	Sun Apr  3 20:44:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fil.c,v 1.17 2016/04/03 15:52:37 christos Exp $	*/
+/*	$NetBSD: fil.c,v 1.18 2016/04/04 00:44:06 christos Exp $	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -138,7 +138,7 @@ extern struct timeout ipf_slowtimer_ch;
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.17 2016/04/03 15:52:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.18 2016/04/04 00:44:06 christos Exp $");
 #else
 static const char sccsid[] = "@(#)fil.c	1.36 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $";
@@ -2916,9 +2916,7 @@ ipf_check(void *ctx, ip_t *ip, int hlen,
 		LBUMPD(ipf_stats[out], fr_short);
 	}
 
-#if 0
 	READ_ENTER(&softc->ipf_mutex);
-#endif
 
 	if (!out) {
 		switch (fin->fin_v)
@@ -3050,10 +3048,9 @@ filterdone:
 		fr->fr_ref++;
 		MUTEX_EXIT(&fr->fr_lock);
 	}
-#if 0
+
 	RWLOCK_EXIT(&softc->ipf_mutex);
 #endif
-#endif
 
 	if ((pass & FR_RETMASK) != 0) {
 		/*
@@ -3149,10 +3146,8 @@ filterdone:
 #endif
 	}
 #if !defined(FASTROUTE_RECURSION)
-#if 0
 	RWLOCK_EXIT(&softc->ipf_mutex);
 #endif
-#endif
 
 finished:
 	if (!FR_ISPASS(pass)) {

CVS commit: src/sys/kern

2016-04-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Apr  3 23:50:49 UTC 2016

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

Log Message:
restore the early breaks for the exact process match.


To generate a diff of this commit:
cvs rdiff -u -r1.250 -r1.251 src/sys/kern/kern_exit.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/kern_exit.c
diff -u src/sys/kern/kern_exit.c:1.250 src/sys/kern/kern_exit.c:1.251
--- src/sys/kern/kern_exit.c:1.250	Sat Apr  2 22:28:46 2016
+++ src/sys/kern/kern_exit.c	Sun Apr  3 19:50:49 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_exit.c,v 1.250 2016/04/03 02:28:46 christos Exp $	*/
+/*	$NetBSD: kern_exit.c,v 1.251 2016/04/03 23:50:49 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.250 2016/04/03 02:28:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.251 2016/04/03 23:50:49 christos Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_dtrace.h"
@@ -792,12 +792,22 @@ sys_wait6(struct lwp *l, const struct sy
 }
 
 
+/*
+ * Find a process that matches the provided criteria, and fill siginfo
+ * and resources if found.
+ * Returns:
+ *	-1: 	Not found, abort early
+ *	 0:	Not matched
+ *	 1:	Matched, there might be more matches
+ *	 2:	This is the only match
+ */
 static int
 match_process(struct proc *pp, struct proc **q, idtype_t idtype, id_t id,
 int options, struct wrusage *wrusage, siginfo_t *siginfo)
 {
 	struct rusage *rup;
 	struct proc *p = *q;
+	int rv = 1;
 
 	mutex_enter(p->p_lock);
 	switch (idtype) {
@@ -813,6 +823,7 @@ match_process(struct proc *pp, struct pr
 			}
 			mutex_enter(p->p_lock);
 		}
+		rv++;
 		break;
 	case P_PGID:
 		if (p->p_pgid != (pid_t)id)
@@ -891,7 +902,7 @@ match_process(struct proc *pp, struct pr
 	}
 
 	mutex_exit(p->p_lock);
-	return 1;
+	return rv;
 }
 
 /*
@@ -955,6 +966,10 @@ find_stopped_child(struct proc *parent, 
 			if (((options & WALLSIG) == 0) &&
 			(options & WALTSIG ? child->p_exitsig == SIGCHLD
 		: P_EXITSIG(child) != SIGCHLD)){
+if (rv == 2) {
+	child = NULL;
+	break;
+}
 continue;
 			}
 
@@ -1005,7 +1020,7 @@ find_stopped_child(struct proc *parent, 
 }
 break;
 			}
-			if (parent->p_nstopchild == 0) {
+			if (parent->p_nstopchild == 0 || rv == 2) {
 child = NULL;
 break;
 			}

CVS commit: src/external/gpl3/binutils

2016-04-03 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Apr  3 18:24:03 UTC 2016

Modified Files:
src/external/gpl3/binutils/lib/libbfd/arch/mipseb: bfd.h bfdver.h
config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/mipseb: config.h defs.mk
src/external/gpl3/binutils/lib/libopcodes/arch/mipseb: config.h
src/external/gpl3/binutils/usr.bin/common/arch/mipseb: config.h defs.mk
src/external/gpl3/binutils/usr.bin/gas/arch/mipseb: config.h
src/external/gpl3/binutils/usr.bin/gprof/arch/mipseb: defs.mk gconfig.h
src/external/gpl3/binutils/usr.bin/ld/arch/mipseb: config.h defs.mk

Log Message:
binutils 2.26 mknative for mipseb


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/binutils/lib/libbfd/arch/mipseb/bfd.h
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/binutils/lib/libbfd/arch/mipseb/bfdver.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/lib/libbfd/arch/mipseb/config.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/binutils/lib/libbfd/arch/mipseb/defs.mk
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/lib/libiberty/arch/mipseb/config.h \
src/external/gpl3/binutils/lib/libiberty/arch/mipseb/defs.mk
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/lib/libopcodes/arch/mipseb/config.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/usr.bin/common/arch/mipseb/config.h
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/binutils/usr.bin/common/arch/mipseb/defs.mk
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/usr.bin/gas/arch/mipseb/config.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/binutils/usr.bin/gprof/arch/mipseb/defs.mk
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/usr.bin/gprof/arch/mipseb/gconfig.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/usr.bin/ld/arch/mipseb/config.h \
src/external/gpl3/binutils/usr.bin/ld/arch/mipseb/defs.mk

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

Modified files:

Index: src/external/gpl3/binutils/lib/libbfd/arch/mipseb/bfd.h
diff -u src/external/gpl3/binutils/lib/libbfd/arch/mipseb/bfd.h:1.7 src/external/gpl3/binutils/lib/libbfd/arch/mipseb/bfd.h:1.8
--- src/external/gpl3/binutils/lib/libbfd/arch/mipseb/bfd.h:1.7	Mon Mar 28 17:00:43 2016
+++ src/external/gpl3/binutils/lib/libbfd/arch/mipseb/bfd.h	Sun Apr  3 18:24:03 2016
@@ -11,9 +11,7 @@
 
 /* Main header file for the bfd library -- portable access to object files.
 
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-   2012 Free Software Foundation, Inc.
+   Copyright (C) 1990-2015 Free Software Foundation, Inc.
 
Contributed by Cygnus Support.
 
@@ -73,7 +71,7 @@ extern "C" {
problem for example when trying to use STRING_COMMA_LEN to build
the arguments to the strncmp() macro.  Hence this alternative
definition of strncmp is provided here.
-   
+
Note - these macros do NOT work if STR2 is not a constant string.  */
 #define CONST_STRNEQ(STR1,STR2) (strncmp ((STR1), (STR2), sizeof (STR2) - 1) == 0)
   /* strcpy() can have a similar problem, but since we know we are
@@ -84,7 +82,7 @@ extern "C" {
 #define LITSTRCPY(DEST,STR2) memcpy ((DEST), (STR2), sizeof (STR2))
 
 
-#define BFD_SUPPORTS_PLUGINS 0
+#define BFD_SUPPORTS_PLUGINS 1
 
 /* The word size used by BFD on the host.  This may be 64 with a 32
bit target if the host is 64 bit, or if other 64 bit targets have
@@ -285,7 +283,7 @@ alent;
 /* Object and core file sections.  */
 
 #define	align_power(addr, align)	\
-  (((addr) + ((bfd_vma) 1 << (align)) - 1) & ((bfd_vma) -1 << (align)))
+  (((addr) + ((bfd_vma) 1 << (align)) - 1) & (-((bfd_vma) 1 << (align
 
 typedef struct bfd_section *sec_ptr;
 
@@ -305,13 +303,13 @@ typedef struct bfd_section *sec_ptr;
 
 #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0)
 
-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE)
-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE)
-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE)
+#define bfd_get_section_limit_octets(bfd, sec)			\
+  ((bfd)->direction != write_direction && (sec)->rawsize != 0	\
+   ? (sec)->rawsize : (sec)->size)
+
 /* Find the address one past the end of SEC.  */
 #define bfd_get_section_limit(bfd, sec) \
-  (((bfd)->direction != write_direction && (sec)->rawsize != 0	\
-? (sec)->rawsize : (sec)->size) / bfd_octets_per_byte (bfd))
+  (bfd_get_section_limit_octets(bfd, sec) / bfd_octets_per_byte (bfd))
 
 /* Return TRUE if input section SEC has been discarded.  */
 #define discarded_section(sec)\
@@ -450,6 +448,16 @@ extern void bfd_hash_traverse
this size.  */
 extern unsigned long bfd_hash_set_default_size (u

CVS commit: src/sys/dev/usb

2016-04-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Sun Apr  3 17:41:31 UTC 2016

Modified Files:
src/sys/dev/usb: umass.c

Log Message:
Update links to usb.org specs


To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/sys/dev/usb/umass.c

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

Modified files:

Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.149 src/sys/dev/usb/umass.c:1.150
--- src/sys/dev/usb/umass.c:1.149	Fri Sep 12 16:40:38 2014
+++ src/sys/dev/usb/umass.c	Sun Apr  3 17:41:30 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: umass.c,v 1.149 2014/09/12 16:40:38 skrll Exp $	*/
+/*	$NetBSD: umass.c,v 1.150 2016/04/03 17:41:30 martin Exp $	*/
 
 /*
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -60,10 +60,10 @@
 
 /*
  * Universal Serial Bus Mass Storage Class specs:
- * http://www.usb.org/developers/devclass_docs/usb_msc_overview_1.2.pdf
- * http://www.usb.org/developers/devclass_docs/usbmassbulk_10.pdf
- * http://www.usb.org/developers/devclass_docs/usb_msc_cbi_1.1.pdf
- * http://www.usb.org/developers/devclass_docs/usbmass-ufi10.pdf
+ * http://www.usb.org/developers/docs/devclass_docs/Mass_Storage_Specification_Overview_v1.4_2-19-2010.pdf
+ * http://www.usb.org/developers/docs/devclass_docs/usbmassbulk_10.pdf
+ * http://www.usb.org/developers/docs/devclass_docs/usb_msc_cbi_1.1.pdf
+ * http://www.usb.org/developers/docs/devclass_docs/usbmass-ufi10.pdf
  */
 
 /*
@@ -124,7 +124,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.149 2014/09/12 16:40:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.150 2016/04/03 17:41:30 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"

CVS commit: src/sys/external/bsd/ipf/netinet

2016-04-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Apr  3 15:52:37 UTC 2016

Modified Files:
src/sys/external/bsd/ipf/netinet: fil.c

Log Message:
Comment out the mutex calls that protect against concurrent configuration
changes and processing. This needs to be done differently since you can't
sleep during interrupt processing.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/ipf/netinet/fil.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/external/bsd/ipf/netinet/fil.c
diff -u src/sys/external/bsd/ipf/netinet/fil.c:1.16 src/sys/external/bsd/ipf/netinet/fil.c:1.17
--- src/sys/external/bsd/ipf/netinet/fil.c:1.16	Wed Apr  1 20:12:58 2015
+++ src/sys/external/bsd/ipf/netinet/fil.c	Sun Apr  3 11:52:37 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fil.c,v 1.16 2015/04/02 00:12:58 khorben Exp $	*/
+/*	$NetBSD: fil.c,v 1.17 2016/04/03 15:52:37 christos Exp $	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -138,7 +138,7 @@ extern struct timeout ipf_slowtimer_ch;
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.16 2015/04/02 00:12:58 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.17 2016/04/03 15:52:37 christos Exp $");
 #else
 static const char sccsid[] = "@(#)fil.c	1.36 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $";
@@ -2916,7 +2916,9 @@ ipf_check(void *ctx, ip_t *ip, int hlen,
 		LBUMPD(ipf_stats[out], fr_short);
 	}
 
+#if 0
 	READ_ENTER(&softc->ipf_mutex);
+#endif
 
 	if (!out) {
 		switch (fin->fin_v)
@@ -3048,9 +3050,10 @@ filterdone:
 		fr->fr_ref++;
 		MUTEX_EXIT(&fr->fr_lock);
 	}
-
+#if 0
 	RWLOCK_EXIT(&softc->ipf_mutex);
 #endif
+#endif
 
 	if ((pass & FR_RETMASK) != 0) {
 		/*
@@ -3146,8 +3149,10 @@ filterdone:
 #endif
 	}
 #if !defined(FASTROUTE_RECURSION)
+#if 0
 	RWLOCK_EXIT(&softc->ipf_mutex);
 #endif
+#endif
 
 finished:
 	if (!FR_ISPASS(pass)) {

CVS commit: src/tests/usr.bin/cc

2016-04-03 Thread Andreas Gustafsson 
Module Name:src
Committed By:   gson
Date:   Sun Apr  3 14:41:30 UTC 2016

Modified Files:
src/tests/usr.bin/cc: t_hello.sh

Log Message:
Fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/cc/t_hello.sh

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

Modified files:

Index: src/tests/usr.bin/cc/t_hello.sh
diff -u src/tests/usr.bin/cc/t_hello.sh:1.2 src/tests/usr.bin/cc/t_hello.sh:1.3
--- src/tests/usr.bin/cc/t_hello.sh:1.2	Sat Jul 21 12:30:55 2012
+++ src/tests/usr.bin/cc/t_hello.sh	Sun Apr  3 14:41:30 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: t_hello.sh,v 1.2 2012/07/21 12:30:55 martin Exp $
+#	$NetBSD: t_hello.sh,v 1.3 2016/04/03 14:41:30 gson Exp $
 #
 # Copyright (c) 2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -39,7 +39,7 @@ hello_pic_head() {
 
 atf_test_case hello_pie
 hello_pie_head() {
-	atf_set "descr" "compile and run position independend (PIE) \"hello world\""
+	atf_set "descr" "compile and run position independent (PIE) \"hello world\""
 	atf_set "require.progs" "cc"
 }

CVS commit: src/external/gpl3/binutils

2016-04-03 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Apr  3 14:34:23 UTC 2016

Modified Files:
src/external/gpl3/binutils/lib/libbfd/arch/mipsel: bfd.h bfdver.h
config.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/mipsel: config.h defs.mk
src/external/gpl3/binutils/lib/libopcodes/arch/mipsel: config.h
src/external/gpl3/binutils/usr.bin/common/arch/mipsel: config.h defs.mk
src/external/gpl3/binutils/usr.bin/gas/arch/mipsel: config.h
src/external/gpl3/binutils/usr.bin/gprof/arch/mipsel: defs.mk gconfig.h
src/external/gpl3/binutils/usr.bin/ld/arch/mipsel: config.h defs.mk

Log Message:
binutils 2.26 mknative for mipsel


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/binutils/lib/libbfd/arch/mipsel/bfd.h
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/binutils/lib/libbfd/arch/mipsel/bfdver.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/lib/libbfd/arch/mipsel/config.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/binutils/lib/libbfd/arch/mipsel/defs.mk
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/lib/libiberty/arch/mipsel/config.h \
src/external/gpl3/binutils/lib/libiberty/arch/mipsel/defs.mk
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/lib/libopcodes/arch/mipsel/config.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/usr.bin/common/arch/mipsel/config.h
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/binutils/usr.bin/common/arch/mipsel/defs.mk
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/usr.bin/gas/arch/mipsel/config.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/binutils/usr.bin/gprof/arch/mipsel/defs.mk
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/usr.bin/gprof/arch/mipsel/gconfig.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/usr.bin/ld/arch/mipsel/config.h \
src/external/gpl3/binutils/usr.bin/ld/arch/mipsel/defs.mk

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

Modified files:

Index: src/external/gpl3/binutils/lib/libbfd/arch/mipsel/bfd.h
diff -u src/external/gpl3/binutils/lib/libbfd/arch/mipsel/bfd.h:1.7 src/external/gpl3/binutils/lib/libbfd/arch/mipsel/bfd.h:1.8
--- src/external/gpl3/binutils/lib/libbfd/arch/mipsel/bfd.h:1.7	Mon Mar 28 17:00:43 2016
+++ src/external/gpl3/binutils/lib/libbfd/arch/mipsel/bfd.h	Sun Apr  3 14:34:22 2016
@@ -11,9 +11,7 @@
 
 /* Main header file for the bfd library -- portable access to object files.
 
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-   2012 Free Software Foundation, Inc.
+   Copyright (C) 1990-2015 Free Software Foundation, Inc.
 
Contributed by Cygnus Support.
 
@@ -73,7 +71,7 @@ extern "C" {
problem for example when trying to use STRING_COMMA_LEN to build
the arguments to the strncmp() macro.  Hence this alternative
definition of strncmp is provided here.
-   
+
Note - these macros do NOT work if STR2 is not a constant string.  */
 #define CONST_STRNEQ(STR1,STR2) (strncmp ((STR1), (STR2), sizeof (STR2) - 1) == 0)
   /* strcpy() can have a similar problem, but since we know we are
@@ -84,7 +82,7 @@ extern "C" {
 #define LITSTRCPY(DEST,STR2) memcpy ((DEST), (STR2), sizeof (STR2))
 
 
-#define BFD_SUPPORTS_PLUGINS 0
+#define BFD_SUPPORTS_PLUGINS 1
 
 /* The word size used by BFD on the host.  This may be 64 with a 32
bit target if the host is 64 bit, or if other 64 bit targets have
@@ -285,7 +283,7 @@ alent;
 /* Object and core file sections.  */
 
 #define	align_power(addr, align)	\
-  (((addr) + ((bfd_vma) 1 << (align)) - 1) & ((bfd_vma) -1 << (align)))
+  (((addr) + ((bfd_vma) 1 << (align)) - 1) & (-((bfd_vma) 1 << (align
 
 typedef struct bfd_section *sec_ptr;
 
@@ -305,13 +303,13 @@ typedef struct bfd_section *sec_ptr;
 
 #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0)
 
-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE)
-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE)
-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE)
+#define bfd_get_section_limit_octets(bfd, sec)			\
+  ((bfd)->direction != write_direction && (sec)->rawsize != 0	\
+   ? (sec)->rawsize : (sec)->size)
+
 /* Find the address one past the end of SEC.  */
 #define bfd_get_section_limit(bfd, sec) \
-  (((bfd)->direction != write_direction && (sec)->rawsize != 0	\
-? (sec)->rawsize : (sec)->size) / bfd_octets_per_byte (bfd))
+  (bfd_get_section_limit_octets(bfd, sec) / bfd_octets_per_byte (bfd))
 
 /* Return TRUE if input section SEC has been discarded.  */
 #define discarded_section(sec)\
@@ -450,6 +448,16 @@ extern void bfd_hash_traverse
this size.  */
 extern unsigned long bfd_hash_set_default_size (u

CVS commit: src/sys/arch/mvmeppc/mvmeppc

2016-04-03 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Sun Apr  3 11:04:14 UTC 2016

Modified Files:
src/sys/arch/mvmeppc/mvmeppc: mainbus.c

Log Message:
Use symbolic constant. No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mvmeppc/mvmeppc/mainbus.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/mvmeppc/mvmeppc/mainbus.c
diff -u src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.15 src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.16
--- src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.15	Fri Jan 27 18:52:59 2012
+++ src/sys/arch/mvmeppc/mvmeppc/mainbus.c	Sun Apr  3 11:04:14 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.15 2012/01/27 18:52:59 para Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.16 2016/04/03 11:04:14 mlelstv Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.15 2012/01/27 18:52:59 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.16 2016/04/03 11:04:14 mlelstv Exp $");
 
 #include 
 #include 
@@ -123,7 +123,7 @@ mainbus_attach(device_t parent, device_t
 	memext = extent_create("pcimem", 0x, 0x0fff,
 	NULL, 0, EX_NOWAIT);
 
-	pci_configure_bus(0, ioext, memext, NULL, 0, 32);
+	pci_configure_bus(genppc_pct, ioext, memext, NULL, 0, CACHELINESIZE);
 
 	extent_destroy(ioext);
 	extent_destroy(memext);

CVS commit: src/sys/arch/evbarm/rpi

2016-04-03 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Sun Apr  3 11:02:17 UTC 2016

Modified Files:
src/sys/arch/evbarm/rpi: vcprop.h

Log Message:
Add more tags understood by the firmware.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/rpi/vcprop.h

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

Modified files:

Index: src/sys/arch/evbarm/rpi/vcprop.h
diff -u src/sys/arch/evbarm/rpi/vcprop.h:1.14 src/sys/arch/evbarm/rpi/vcprop.h:1.15
--- src/sys/arch/evbarm/rpi/vcprop.h:1.14	Mon Mar 14 07:43:00 2016
+++ src/sys/arch/evbarm/rpi/vcprop.h	Sun Apr  3 11:02:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vcprop.h,v 1.14 2016/03/14 07:43:00 skrll Exp $	*/
+/*	$NetBSD: vcprop.h,v 1.15 2016/04/03 11:02:17 mlelstv Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -60,6 +60,8 @@ struct vcprop_tag {
 #define	VCPROPTAG_SET_CLOCKRATE		0x00038002
 #define	VCPROPTAG_GET_MIN_CLOCKRATE	0x00030007
 #define	VCPROPTAG_GET_MAX_CLOCKRATE	0x00030004
+#define	VCPROPTAG_GET_TURBO		0x00030009
+#define	VCPROPTAG_SET_TURBO		0x00038009
 
 #define VCPROPTAG_GET_VOLTAGE		0x00030003
 #define VCPROPTAG_SET_VOLTAGE		0x00038003
@@ -92,6 +94,10 @@ struct vcprop_tag {
 #define	VCPROPTAG_LOCKMEM		0x0003000d
 #define	VCPROPTAG_UNLOCKMEM		0x0003000e
 #define	VCPROPTAG_RELEASEMEM		0x0003000f
+#define	VCPROPTAG_EXECUTE_CODE		0x00030010
+#define	VCPROPTAG_EXECUTE_QPU		0x00030011
+#define	VCPROPTAG_SET_ENABLE_QPU	0x00030012
+#define	VCPROPTAG_GET_DISPMANX_HANDLE	0x00030014
 
 #define	VCPROPTAG_SET_CURSOR_INFO	0x8010
 #define	VCPROPTAG_SET_CURSOR_STATE	0x8011

CVS commit: src/sbin/newfs_msdos

2016-04-03 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Sun Apr  3 11:00:13 UTC 2016

Modified Files:
src/sbin/newfs_msdos: mkfs_msdos.c

Log Message:
Use the same defaults for cluster sizes as Windows.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sbin/newfs_msdos/mkfs_msdos.c

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

Modified files:

Index: src/sbin/newfs_msdos/mkfs_msdos.c
diff -u src/sbin/newfs_msdos/mkfs_msdos.c:1.9 src/sbin/newfs_msdos/mkfs_msdos.c:1.10
--- src/sbin/newfs_msdos/mkfs_msdos.c:1.9	Sun Jan  5 12:52:39 2014
+++ src/sbin/newfs_msdos/mkfs_msdos.c	Sun Apr  3 11:00:13 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkfs_msdos.c,v 1.9 2014/01/05 12:52:39 martin Exp $	*/
+/*	$NetBSD: mkfs_msdos.c,v 1.10 2016/04/03 11:00:13 mlelstv Exp $	*/
 
 /*
  * Copyright (c) 1998 Robert Nordier
@@ -37,7 +37,7 @@
 static const char rcsid[] =
   "$FreeBSD: src/sbin/newfs_msdos/newfs_msdos.c,v 1.15 2000/10/10 01:49:37 wollman Exp $";
 #else
-__RCSID("$NetBSD: mkfs_msdos.c,v 1.9 2014/01/05 12:52:39 martin Exp $");
+__RCSID("$NetBSD: mkfs_msdos.c,v 1.10 2016/04/03 11:00:13 mlelstv Exp $");
 #endif
 #endif /* not lint */
 
@@ -335,16 +335,26 @@ mkfs_msdos(const char *fname, const char
 	return -1;
 	bpb.bsec -= (o.offset / bpb.bps);
 	if (bpb.spc == 0) { /* set defaults */
-	if (bpb.bsec <= 6000)   /* about 3MB -> 512 bytes */
-		bpb.spc = 1;
-	else if (bpb.bsec <= (1<<17)) /* 64M -> 4k */
-		bpb.spc = 8;
-	else if (bpb.bsec <= (1<<19)) /* 256M -> 8k */
-		bpb.spc = 16;
-	else if (bpb.bsec <= (1<<21)) /* 1G -> 16k */
-		bpb.spc = 32;
-	else
-		bpb.spc = 64;   /* otherwise 32k */
+	/* minimum cluster size */
+	switch (o.fat_type) {
+	case 12:
+		bpb.spc = 1;/* use 512 bytes */
+		x = 2;  /* up to 2MB */
+		break;
+	case 16:
+		bpb.spc = 1;/* use 512 bytes */
+		x = 32; /* up to 32MB */
+		break;
+	default:
+		bpb.spc = 8;/* use 4k */
+		x = 8192;   /* up to 8GB */
+		break;
+	}
+	x1 = howmany(bpb.bsec, (1048576 / 512)); /* -> MB */
+	while (bpb.spc < 128 && x < x1) {
+		x *= 2;
+		bpb.spc *= 2;
+	}
 	}
 }

CVS commit: src/sys/dev/acpi

2016-04-03 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Sun Apr  3 10:36:00 UTC 2016

Modified Files:
src/sys/dev/acpi: thinkpad_acpi.c

Log Message:
Split toggles for bluetooth and wwan and use specific ACPI objects
where present.
Also make driver detach on shutdown.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/acpi/thinkpad_acpi.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/acpi/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.45 src/sys/dev/acpi/thinkpad_acpi.c:1.46
--- src/sys/dev/acpi/thinkpad_acpi.c:1.45	Thu Apr 23 23:23:00 2015
+++ src/sys/dev/acpi/thinkpad_acpi.c	Sun Apr  3 10:36:00 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.45 2015/04/23 23:23:00 pgoyette Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.46 2016/04/03 10:36:00 mlelstv Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.45 2015/04/23 23:23:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.46 2016/04/03 10:36:00 mlelstv Exp $");
 
 #include 
 #include 
@@ -119,6 +119,21 @@ typedef struct thinkpad_softc {
 #define	THINKPAD_DISPLAY_ALL \
 	(THINKPAD_DISPLAY_LCD | THINKPAD_DISPLAY_CRT | THINKPAD_DISPLAY_DVI)
 
+#define THINKPAD_BLUETOOTH_HWPRESENT	0x01
+#define THINKPAD_BLUETOOTH_RADIOSSW	0x02
+#define THINKPAD_BLUETOOTH_RESUMECTRL	0x04
+
+#define THINKPAD_WWAN_HWPRESENT		0x01
+#define THINKPAD_WWAN_RADIOSSW		0x02
+#define THINKPAD_WWAN_RESUMECTRL	0x04
+
+#define THINKPAD_UWB_HWPRESENT	0x01
+#define THINKPAD_UWB_RADIOSSW	0x02
+
+#define THINKPAD_RFK_BLUETOOTH		0
+#define THINKPAD_RFK_WWAN		1
+#define THINKPAD_RFK_UWB		2
+
 static int	thinkpad_match(device_t, cfdata_t, void *);
 static void	thinkpad_attach(device_t, device_t, void *);
 static int	thinkpad_detach(device_t, int);
@@ -132,8 +147,9 @@ static void	thinkpad_sensors_refresh(str
 static void	thinkpad_temp_refresh(struct sysmon_envsys *, envsys_data_t *);
 static void	thinkpad_fan_refresh(struct sysmon_envsys *, envsys_data_t *);
 
-static void	thinkpad_wireless_toggle(thinkpad_softc_t *);
+static void	thinkpad_uwb_toggle(thinkpad_softc_t *);
 static void	thinkpad_wwan_toggle(thinkpad_softc_t *);
+static void	thinkpad_bluetooth_toggle(thinkpad_softc_t *);
 
 static bool	thinkpad_resume(device_t, const pmf_qual_t *);
 static void	thinkpad_brightness_up(device_t);
@@ -141,8 +157,9 @@ static void	thinkpad_brightness_down(dev
 static uint8_t	thinkpad_brightness_read(thinkpad_softc_t *sc);
 static void	thinkpad_cmos(thinkpad_softc_t *, uint8_t);
 
-CFATTACH_DECL_NEW(thinkpad, sizeof(thinkpad_softc_t),
-thinkpad_match, thinkpad_attach, thinkpad_detach, NULL);
+CFATTACH_DECL3_NEW(thinkpad, sizeof(thinkpad_softc_t),
+thinkpad_match, thinkpad_attach, thinkpad_detach, NULL, NULL, NULL,
+DVF_DETACH_SHUTDOWN);
 
 static const char * const thinkpad_ids[] = {
 	"IBM0068",
@@ -387,7 +404,9 @@ thinkpad_get_hotkeys(void *opaque)
 #endif
 			break;
 		case THINKPAD_NOTIFY_WirelessSwitch:
-			thinkpad_wireless_toggle(sc);
+			thinkpad_uwb_toggle(sc);
+			thinkpad_wwan_toggle(sc);
+			thinkpad_bluetooth_toggle(sc);
 #ifndef THINKPAD_NORMAL_HOTKEYS
 			if (sc->sc_smpsw_valid == false)
 break;
@@ -694,18 +713,89 @@ thinkpad_fan_refresh(struct sysmon_envsy
 }
 
 static void
-thinkpad_wireless_toggle(thinkpad_softc_t *sc)
+thinkpad_bluetooth_toggle(thinkpad_softc_t *sc)
 {
+	ACPI_BUFFER buf;
+	ACPI_OBJECT retobj;
+	ACPI_OBJECT param[1];
+	ACPI_OBJECT_LIST params;
+	ACPI_STATUS rv;
+
 	/* Ignore return value, as the hardware may not support bluetooth */
-	(void)AcpiEvaluateObject(sc->sc_node->ad_handle, "BTGL", NULL, NULL);
-	(void)AcpiEvaluateObject(sc->sc_node->ad_handle, "GWAN", NULL, NULL);
+	rv = AcpiEvaluateObject(sc->sc_node->ad_handle, "BTGL", NULL, NULL);
+	if (!ACPI_FAILURE(rv))
+		return;
+
+	buf.Pointer = &retobj;
+	buf.Length = sizeof(retobj);
+
+	rv = AcpiEvaluateObject(sc->sc_node->ad_handle, "GBDC", NULL, &buf);
+	if (ACPI_FAILURE(rv))
+		return;
+
+	params.Count = 1;
+	params.Pointer = param;
+	param[0].Type = ACPI_TYPE_INTEGER;
+	param[0].Integer.Value =
+		(retobj.Integer.Value & THINKPAD_BLUETOOTH_RADIOSSW) == 0
+		? THINKPAD_BLUETOOTH_RADIOSSW | THINKPAD_BLUETOOTH_RESUMECTRL
+		: 0;
+
+	(void)AcpiEvaluateObject(sc->sc_node->ad_handle, "SBDC", ¶ms, NULL);
 }
 
 static void
 thinkpad_wwan_toggle(thinkpad_softc_t *sc)
 {
-	/* Ignore return value, as the hardware may not support wireless WAN */
-	(void)AcpiEvaluateObject(sc->sc_node->ad_handle, "WTGL", NULL, NULL);
+	ACPI_BUFFER buf;
+	ACPI_OBJECT retobj;
+	ACPI_OBJECT param[1];
+	ACPI_OBJECT_LIST params;
+	ACPI_STATUS rv;
+
+	buf.Pointer = &retobj;
+	buf.Length = sizeof(retobj);
+
+	rv = AcpiEvaluateObject(sc->sc_node->ad_handle, "GWAN", NULL, &buf);
+	if (ACPI_FAILURE(rv))
+		return;
+
+	params.Count = 1;
+	params.Pointer = param;
+	param[0].Type = ACPI

CVS commit: src/sys/dev/acpi

2016-04-03 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Sun Apr  3 10:32:47 UTC 2016

Modified Files:
src/sys/dev/acpi: acpi_display.c

Log Message:
Add comments.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/acpi/acpi_display.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/acpi/acpi_display.c
diff -u src/sys/dev/acpi/acpi_display.c:1.14 src/sys/dev/acpi/acpi_display.c:1.15
--- src/sys/dev/acpi/acpi_display.c:1.14	Thu Feb 18 15:42:44 2016
+++ src/sys/dev/acpi/acpi_display.c	Sun Apr  3 10:32:47 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_display.c,v 1.14 2016/02/18 15:42:44 riastradh Exp $	*/
+/*	$NetBSD: acpi_display.c,v 1.15 2016/04/03 10:32:47 mlelstv Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.14 2016/02/18 15:42:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.15 2016/04/03 10:32:47 mlelstv Exp $");
 
 #include 
 #include 
@@ -785,24 +785,31 @@ acpidisp_out_capabilities(const struct a
 
 	cap = 0;
 
+	/* List of Brigthness levels */
 	if (acpidisp_has_method(ad->ad_handle, "_BCL", ACPI_TYPE_PACKAGE))
 		cap |= ACPI_DISP_OUT_CAP__BCL;
 
+	/* Set brightness level */
 	if (acpidisp_has_method(ad->ad_handle, "_BCM", ACPI_TYPE_METHOD))
 		cap |= ACPI_DISP_OUT_CAP__BCM;
 
+	/* Get brightless level */
 	if (acpidisp_has_method(ad->ad_handle, "_BQC", ACPI_TYPE_INTEGER))
 		cap |= ACPI_DISP_OUT_CAP__BQC;
 
+	/* Return EDID */
 	if (acpidisp_has_method(ad->ad_handle, "_DDC", ACPI_TYPE_METHOD))
 		cap |= ACPI_DISP_OUT_CAP__DDC;
 
+	/* Get Status */
 	if (acpidisp_has_method(ad->ad_handle, "_DCS", ACPI_TYPE_INTEGER))
 		cap |= ACPI_DISP_OUT_CAP__DCS;
 
+	/* Get Graphics State */
 	if (acpidisp_has_method(ad->ad_handle, "_DGS", ACPI_TYPE_INTEGER))
 		cap |= ACPI_DISP_OUT_CAP__DGS;
 
+	/* Set Graphics State */
 	if (acpidisp_has_method(ad->ad_handle, "_DSS", ACPI_TYPE_METHOD))
 		cap |= ACPI_DISP_OUT_CAP__DSS;

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

2016-04-03 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Sun Apr  3 10:32:00 UTC 2016

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

Log Message:
Only fix up IPMI on ProLiant Microserver when address if set.
Don't assume a specific preconfigured address, just clear the lower bits.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/x86/x86/ipmi.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/ipmi.c
diff -u src/sys/arch/x86/x86/ipmi.c:1.62 src/sys/arch/x86/x86/ipmi.c:1.63
--- src/sys/arch/x86/x86/ipmi.c:1.62	Fri Aug 28 14:06:01 2015
+++ src/sys/arch/x86/x86/ipmi.c	Sun Apr  3 10:32:00 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipmi.c,v 1.62 2015/08/28 14:06:01 joerg Exp $ */
+/*	$NetBSD: ipmi.c,v 1.63 2016/04/03 10:32:00 mlelstv Exp $ */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -52,7 +52,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.62 2015/08/28 14:06:01 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.63 2016/04/03 10:32:00 mlelstv Exp $");
 
 #include 
 #include 
@@ -939,9 +939,10 @@ ipmi_smbios_probe(struct smbios_ipmi *pi
 
 	platform = pmf_get_platform("system-product");
 	if (platform != NULL &&
-	strcmp(platform, "ProLiant MicroServer") == 0) {
+	strcmp(platform, "ProLiant MicroServer") == 0 &&
+	pipmi->smipmi_base_address != 0) {
 ia->iaa_if_iospacing = 1;
-ia->iaa_if_iobase = pipmi->smipmi_base_address - 7;
+ia->iaa_if_iobase = pipmi->smipmi_base_address & ~0x7;
 ia->iaa_if_iotype = 'i';
 return;
 }

CVS commit: src/sys/arch/playstation2/dev

2016-04-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Sun Apr  3 10:03:05 UTC 2016

Modified Files:
src/sys/arch/playstation2/dev: emac3.c

Log Message:
Adopt to device_t/struct ifnet* changes


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/playstation2/dev/emac3.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/playstation2/dev/emac3.c
diff -u src/sys/arch/playstation2/dev/emac3.c:1.10 src/sys/arch/playstation2/dev/emac3.c:1.11
--- src/sys/arch/playstation2/dev/emac3.c:1.10	Mon Jul  7 10:12:24 2014
+++ src/sys/arch/playstation2/dev/emac3.c	Sun Apr  3 10:03:04 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: emac3.c,v 1.10 2014/07/07 10:12:24 martin Exp $	*/
+/*	$NetBSD: emac3.c,v 1.11 2016/04/03 10:03:04 martin Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: emac3.c,v 1.10 2014/07/07 10:12:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emac3.c,v 1.11 2016/04/03 10:03:04 martin Exp $");
 
 #include "debug_playstation2.h"
 
@@ -309,7 +309,7 @@ emac3_config(const u_int8_t *eaddr)
  * PHY/MII
  */
 void
-emac3_phy_writereg(struct device *self, int phy, int reg, int data)
+emac3_phy_writereg(device_t self, int phy, int reg, int data)
 {
 
 	if (emac3_phy_ready() != 0)
@@ -325,7 +325,7 @@ emac3_phy_writereg(struct device *self, 
 }
 
 int
-emac3_phy_readreg(struct device *self, int phy, int reg)
+emac3_phy_readreg(device_t self, int phy, int reg)
 {
 
 	if (emac3_phy_ready() != 0)
@@ -342,10 +342,10 @@ emac3_phy_readreg(struct device *self, i
 }
 
 void
-emac3_phy_statchg(struct device *dev)
+emac3_phy_statchg(struct ifnet *ifp)
 {
 #define EMAC3_FDX	(MR1_FDE | MR1_EIFC | MR1_APP)
-	struct emac3_softc *sc = (void *)dev;
+	struct emac3_softc *sc = ifp->if_softc;
 	int media;
 	u_int32_t r;

CVS commit: src/sys/arch/playstation2

2016-04-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Sun Apr  3 10:03:34 UTC 2016

Modified Files:
src/sys/arch/playstation2/ee: dmacreg.h eevar.h
src/sys/arch/playstation2/playstation2: interrupt.h

Log Message:
Add missing includes


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/playstation2/ee/dmacreg.h \
src/sys/arch/playstation2/ee/eevar.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/playstation2/playstation2/interrupt.h

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

Modified files:

Index: src/sys/arch/playstation2/ee/dmacreg.h
diff -u src/sys/arch/playstation2/ee/dmacreg.h:1.4 src/sys/arch/playstation2/ee/dmacreg.h:1.5
--- src/sys/arch/playstation2/ee/dmacreg.h:1.4	Mon Mar 31 11:25:49 2014
+++ src/sys/arch/playstation2/ee/dmacreg.h	Sun Apr  3 10:03:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: dmacreg.h,v 1.4 2014/03/31 11:25:49 martin Exp $	*/
+/*	$NetBSD: dmacreg.h,v 1.5 2016/04/03 10:03:34 martin Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -29,6 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include 
+
 typedef u_int64_t dmatag_t;
 
 #define DMAC_BLOCK_SIZE		16
Index: src/sys/arch/playstation2/ee/eevar.h
diff -u src/sys/arch/playstation2/ee/eevar.h:1.4 src/sys/arch/playstation2/ee/eevar.h:1.5
--- src/sys/arch/playstation2/ee/eevar.h:1.4	Mon Mar 31 11:25:49 2014
+++ src/sys/arch/playstation2/ee/eevar.h	Sun Apr  3 10:03:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: eevar.h,v 1.4 2014/03/31 11:25:49 martin Exp $	*/
+/*	$NetBSD: eevar.h,v 1.5 2016/04/03 10:03:34 martin Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,9 @@
  */
 
 #define _PLAYSTATION2_BUS_SPACE_PRIVATE
+
 #include 
+#include 
 
 #define _reg_read_1(a)		__read_1(a)
 #define _reg_read_2(a)		__read_2(a)

Index: src/sys/arch/playstation2/playstation2/interrupt.h
diff -u src/sys/arch/playstation2/playstation2/interrupt.h:1.6 src/sys/arch/playstation2/playstation2/interrupt.h:1.7
--- src/sys/arch/playstation2/playstation2/interrupt.h:1.6	Fri Jul  4 07:27:28 2014
+++ src/sys/arch/playstation2/playstation2/interrupt.h	Sun Apr  3 10:03:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: interrupt.h,v 1.6 2014/07/04 07:27:28 martin Exp $	*/
+/*	$NetBSD: interrupt.h,v 1.7 2016/04/03 10:03:34 martin Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -26,6 +26,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include 
+
 enum ipl_type {
 	IPL_INTC,
 	IPL_DMAC,

CVS commit: src/sys/arch/playstation2/dev

2016-04-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Sun Apr  3 10:01:52 UTC 2016

Modified Files:
src/sys/arch/playstation2/dev: emac3var.h

Log Message:
Use device_t/struct ifnet* for phy callbacks


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/playstation2/dev/emac3var.h

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

Modified files:

Index: src/sys/arch/playstation2/dev/emac3var.h
diff -u src/sys/arch/playstation2/dev/emac3var.h:1.5 src/sys/arch/playstation2/dev/emac3var.h:1.6
--- src/sys/arch/playstation2/dev/emac3var.h:1.5	Mon Mar 31 11:25:49 2014
+++ src/sys/arch/playstation2/dev/emac3var.h	Sun Apr  3 10:01:52 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: emac3var.h,v 1.5 2014/03/31 11:25:49 martin Exp $	*/
+/*	$NetBSD: emac3var.h,v 1.6 2016/04/03 10:01:52 martin Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -53,6 +53,6 @@ int emac3_tx_done(void);
 
 void emac3_setmulti(struct emac3_softc *, struct ethercom *);
 
-int emac3_phy_readreg(struct device *, int, int);
-void emac3_phy_writereg(struct device *, int, int, int);
-void emac3_phy_statchg(struct device *);
+int emac3_phy_readreg(device_t, int, int);
+void emac3_phy_writereg(device_t, int, int, int);
+void emac3_phy_statchg(struct ifnet *);

CVS commit: src/sys/arch/playstation2/dev

2016-04-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Sun Apr  3 09:58:45 UTC 2016

Modified Files:
src/sys/arch/playstation2/dev: if_smap.c

Log Message:
Fix bpf_mtap argument


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/playstation2/dev/if_smap.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/playstation2/dev/if_smap.c
diff -u src/sys/arch/playstation2/dev/if_smap.c:1.19 src/sys/arch/playstation2/dev/if_smap.c:1.20
--- src/sys/arch/playstation2/dev/if_smap.c:1.19	Tue Feb  9 08:32:09 2016
+++ src/sys/arch/playstation2/dev/if_smap.c	Sun Apr  3 09:58:45 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_smap.c,v 1.19 2016/02/09 08:32:09 ozaki-r Exp $	*/
+/*	$NetBSD: if_smap.c,v 1.20 2016/04/03 09:58:45 martin Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,22 +30,21 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_smap.c,v 1.19 2016/02/09 08:32:09 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smap.c,v 1.20 2016/04/03 09:58:45 martin Exp $");
 
 #include "debug_playstation2.h"
 
 #include 
 #include 
-
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
 
-#include 
-
 #include 
 #include 
 #include 
@@ -53,7 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_smap.c,v 
 #include 
 #include 
 
-#include 
 #include 
 
 #include 
@@ -119,7 +117,7 @@ struct smap_softc {
 STATIC int smap_match(struct device *, struct cfdata *, void *);
 STATIC void smap_attach(struct device *, struct device *, void *);
 
-CFATTACH_DECL(smap, sizeof (struct smap_softc),
+CFATTACH_DECL_NEW(smap, sizeof (struct smap_softc),
 smap_match, smap_attach, NULL, NULL);
 
 STATIC int smap_intr(void *);
@@ -260,7 +258,6 @@ int
 smap_ioctl(struct ifnet *ifp, u_long command, void *data)
 {
 	struct smap_softc *sc = ifp->if_softc;
-	struct ifreq *ifr = (struct ifreq *) data;
 	int error, s;
 
 	s = splnet();
@@ -409,7 +406,7 @@ smap_rxeof(void *arg)
 		
 		if (m != NULL) {
 			if (ifp->if_bpf)
-bpf_mtap(ifp->if_bpf, m);
+bpf_mtap(ifp, m);
 			if_percpuq_enqueue(ifp->if_percpuq, m);
 		}
 	}
@@ -509,7 +506,7 @@ smap_start(struct ifnet *ifp)
 		IFQ_DEQUEUE(&ifp->if_snd, m0);
 		KDASSERT(m0 != NULL);
 		if (ifp->if_bpf)
-			bpf_mtap(ifp->if_bpf, m0);
+			bpf_mtap(ifp, m0);
 
 		p = (u_int8_t *)sc->tx_buf;
 		q = p + sz;

CVS commit: src/sys/netinet

2016-04-03 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Sun Apr  3 09:57:40 UTC 2016

Modified Files:
src/sys/netinet: sctp_asconf.c sctp_output.c sctp_pcb.c sctp_usrreq.c
sctputil.c

Log Message:
Replace generic queue macros with IFNET/IFADDR macros.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/netinet/sctp_asconf.c \
src/sys/netinet/sctp_output.c src/sys/netinet/sctp_pcb.c
cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/sctp_usrreq.c
cvs rdiff -u -r1.3 -r1.4 src/sys/netinet/sctputil.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/sctp_asconf.c
diff -u src/sys/netinet/sctp_asconf.c:1.1 src/sys/netinet/sctp_asconf.c:1.2
--- src/sys/netinet/sctp_asconf.c:1.1	Tue Oct 13 21:28:35 2015
+++ src/sys/netinet/sctp_asconf.c	Sun Apr  3 09:57:40 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: sctp_asconf.c,v 1.1 2015/10/13 21:28:35 rjs Exp $ */
+/*	$NetBSD: sctp_asconf.c,v 1.2 2016/04/03 09:57:40 mlelstv Exp $ */
 /*	$KAME: sctp_asconf.c,v 1.25 2005/06/16 20:44:24 jinmei Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sctp_asconf.c,v 1.1 2015/10/13 21:28:35 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_asconf.c,v 1.2 2016/04/03 09:57:40 mlelstv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
@@ -2116,7 +2116,7 @@ sctp_find_valid_localaddr(struct sctp_tc
 	struct ifnet *ifn;
 	struct ifaddr *ifa, *nifa;
 
-	TAILQ_FOREACH(ifn, &ifnet_list, if_list) {
+	IFNET_FOREACH(ifn) {
 		if (stcb->asoc.loopback_scope == 0 && ifn->if_type == IFT_LOOP) {
 			/* Skip if loopback_scope not set */
 			continue;
@@ -2774,14 +2774,14 @@ sctp_check_address_list_all(struct sctp_
 	struct ifaddr *ifa;
 
 	/* go through all our known interfaces */
-	TAILQ_FOREACH(ifn, &ifnet_list, if_list) {
+	IFNET_FOREACH(ifn) {
 		if (loopback_scope == 0 && ifn->if_type == IFT_LOOP) {
 			/* skip loopback interface */
 			continue;
 		}
 
 		/* go through each interface address */
-		TAILQ_FOREACH(ifa, &ifn->if_addrlist, ifa_list) {
+		IFADDR_FOREACH(ifa, ifn) {
 			/* do i have it implicitly? */
 			if (sctp_cmpaddr(ifa->ifa_addr, init_addr)) {
 #ifdef SCTP_DEBUG
Index: src/sys/netinet/sctp_output.c
diff -u src/sys/netinet/sctp_output.c:1.1 src/sys/netinet/sctp_output.c:1.2
--- src/sys/netinet/sctp_output.c:1.1	Tue Oct 13 21:28:35 2015
+++ src/sys/netinet/sctp_output.c	Sun Apr  3 09:57:40 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: sctp_output.c,v 1.1 2015/10/13 21:28:35 rjs Exp $ */
+/*	$NetBSD: sctp_output.c,v 1.2 2016/04/03 09:57:40 mlelstv Exp $ */
 /*	$KAME: sctp_output.c,v 1.48 2005/06/16 18:29:24 jinmei Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.1 2015/10/13 21:28:35 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.2 2016/04/03 09:57:40 mlelstv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
@@ -546,7 +546,7 @@ sctp_choose_v4_boundspecific_inp(struct 
 	ifn = rt->rt_ifp;
 	if (ifn) {
 		/* is a prefered one on the interface we route out? */
-		TAILQ_FOREACH(ifa, &ifn->if_addrlist, ifa_list) {
+		IFADDR_FOREACH(ifa, ifn) {
 			sin = sctp_is_v4_ifa_addr_prefered (ifa, loopscope, ipv4_scope, &sin_loop, &sin_local);
 			if (sin == NULL)
 continue;
@@ -555,7 +555,7 @@ sctp_choose_v4_boundspecific_inp(struct 
 			}
 		}
 		/* is an acceptable one on the interface we route out? */
-		TAILQ_FOREACH(ifa, &ifn->if_addrlist, ifa_list) {
+		IFADDR_FOREACH(ifa, ifn) {
 			sin = sctp_is_v4_ifa_addr_acceptable (ifa, loopscope, ipv4_scope, &sin_loop, &sin_local);
 			if (sin == NULL)
 continue;
@@ -648,7 +648,7 @@ sctp_choose_v4_boundspecific_stcb(struct
 		 */
 		if (ifn) {
 			/* first try for an prefered address on the ep */
-			TAILQ_FOREACH(ifa, &ifn->if_addrlist, ifa_list) {
+			IFADDR_FOREACH(ifa, ifn) {
 if (sctp_is_addr_in_ep(inp, ifa)) {
 	sin = sctp_is_v4_ifa_addr_prefered (ifa, loopscope, ipv4_scope, &sin_loop, &sin_local);
 	if (sin == NULL)
@@ -662,7 +662,7 @@ sctp_choose_v4_boundspecific_stcb(struct
 }
 			}
 			/* next try for an acceptable address on the ep */
-			TAILQ_FOREACH(ifa, &ifn->if_addrlist, ifa_list) {
+			IFADDR_FOREACH(ifa, ifn) {
 if (sctp_is_addr_in_ep(inp, ifa)) {
 	sin = sctp_is_v4_ifa_addr_acceptable (ifa, loopscope, ipv4_scope, &sin_loop, &sin_local);
 	if (sin == NULL)
@@ -762,7 +762,7 @@ sctp_choose_v4_boundspecific_stcb(struct
 continue;
 			/* first question, is laddr->ifa an address associated with the emit interface */
 			if (ifn) {
-TAILQ_FOREACH(ifa, &ifn->if_addrlist, ifa_list) {
+IFADDR_FOREACH(ifa, ifn) {
 	if (laddr->ifa == ifa) {
 		sin = (struct sockaddr_in *)laddr->ifa->ifa_addr;
 		return (sin->sin_addr);
@@ -786,7 +786,7 @@ sctp_choose_v4_boundspecific_stcb(struct
 continue;
 			/* first question, is laddr->ifa an address associated with the emit interface */
 			if (ifn) {
-T

CVS commit: src/sys/arch/playstation2/playstation2

2016-04-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Sun Apr  3 09:06:28 UTC 2016

Modified Files:
src/sys/arch/playstation2/playstation2: locore_machdep.S

Log Message:
Convert # line comments to // line to avoid preprocessor confusion


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/sys/arch/playstation2/playstation2/locore_machdep.S

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/playstation2/playstation2/locore_machdep.S
diff -u src/sys/arch/playstation2/playstation2/locore_machdep.S:1.12 src/sys/arch/playstation2/playstation2/locore_machdep.S:1.13
--- src/sys/arch/playstation2/playstation2/locore_machdep.S:1.12	Sun Mar 22 20:32:08 2015
+++ src/sys/arch/playstation2/playstation2/locore_machdep.S	Sun Apr  3 09:06:28 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_machdep.S,v 1.12 2015/03/22 20:32:08 martin Exp $	*/
+/*	$NetBSD: locore_machdep.S,v 1.13 2016/04/03 09:06:28 martin Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -158,16 +158,16 @@ LEAF_NOPROFILE(kloader_playstation2_boot
 	sync.l
 	sync.p
 1:
-	# line +0
+	// line +0
 	cache	CACHEOP_R5900_IWBINV_D,  0(t0);sync.l;sync.p	# way 0
 	cache	CACHEOP_R5900_IWBINV_D,  1(t0);sync.l;sync.p	# way 1
-	# line +1
+	// line +1
 	cache	CACHEOP_R5900_IWBINV_D, 64(t0);sync.l;sync.p	# way 0
 	cache	CACHEOP_R5900_IWBINV_D, 65(t0);sync.l;sync.p	# way 1
-	# line +2
+	// line +2
 	cache	CACHEOP_R5900_IWBINV_D,128(t0);sync.l;sync.p	# way 0
 	cache	CACHEOP_R5900_IWBINV_D,129(t0);sync.l;sync.p	# way 1
-	# line +3
+	// line +3
 	cache	CACHEOP_R5900_IWBINV_D,192(t0);sync.l;sync.p	# way 0
 	cache	CACHEOP_R5900_IWBINV_D,193(t0);sync.l;sync.p	# way 1
 	addu	t0, t0, 256	
@@ -186,16 +186,16 @@ LEAF_NOPROFILE(kloader_playstation2_boot
 1:
 	#	[12:6]	... line
 	#	[0]	... way
-	# line +0
+	// line +0
 	cache	CACHEOP_R5900_IINV_I,  0(t0);sync.l;sync.p	# way 0
 	cache	CACHEOP_R5900_IINV_I,  1(t0);sync.l;sync.p	# way 1
-	# line +1	
+	// line +1	
 	cache	CACHEOP_R5900_IINV_I, 64(t0);sync.l;sync.p	# way 0
 	cache	CACHEOP_R5900_IINV_I, 65(t0);sync.l;sync.p	# way 1
-	# line +2
+	// line +2
 	cache	CACHEOP_R5900_IINV_I,128(t0);sync.l;sync.p	# way 0
 	cache	CACHEOP_R5900_IINV_I,129(t0);sync.l;sync.p	# way 1
-	# line +3	
+	// line +3	
 	cache	CACHEOP_R5900_IINV_I,192(t0);sync.l;sync.p	# way 0
 	cache	CACHEOP_R5900_IINV_I,193(t0);sync.l;sync.p	# way 1
 	addu	t0, t0, 256

CVS commit: src/doc

2016-04-03 Thread Takahiro Kambe 
Module Name:src
Committed By:   taca
Date:   Sun Apr  3 08:21:15 UTC 2016

Modified Files:
src/doc: 3RDPARTY

Log Message:
Update root.cache entry.


To generate a diff of this commit:
cvs rdiff -u -r1.1317 -r1.1318 src/doc/3RDPARTY

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1317 src/doc/3RDPARTY:1.1318
--- src/doc/3RDPARTY:1.1317	Wed Mar 16 23:52:53 2016
+++ src/doc/3RDPARTY	Sun Apr  3 08:21:15 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1317 2016/03/16 23:52:53 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1318 2016/04/03 08:21:15 taca Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1192,8 +1192,8 @@ Notes:
 Old versions are available from Purdue (ftp.cs.purdue.edu:/pub/RCS).
 
 Package:	root.cache
-Version:	2015120100 (December 01, 2015)
-Current Vers:	2015120100 (December 01, 2015)
+Version:	2015120100 (March 23, 2016)
+Current Vers:	2015120100 (March 23, 2016)
 Maintainer:	InterNIC
 Archive Site:	ftp://ftp.internic.net/domain/named.root
 Home Page:	ftp://ftp.internic.net/domain/named.root

CVS commit: [nick-nhusb] src/sys/dev/usb

2016-04-03 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Apr  3 08:08:27 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: uhcireg.h

Log Message:
Fix UHCI_INTR_SPIE defines that was broken in the __BIT conversion


To generate a diff of this commit:
cvs rdiff -u -r1.19.66.5 -r1.19.66.6 src/sys/dev/usb/uhcireg.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/usb/uhcireg.h
diff -u src/sys/dev/usb/uhcireg.h:1.19.66.5 src/sys/dev/usb/uhcireg.h:1.19.66.6
--- src/sys/dev/usb/uhcireg.h:1.19.66.5	Fri Mar 25 17:44:00 2016
+++ src/sys/dev/usb/uhcireg.h	Sun Apr  3 08:08:27 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhcireg.h,v 1.19.66.5 2016/03/25 17:44:00 skrll Exp $	*/
+/*	$NetBSD: uhcireg.h,v 1.19.66.6 2016/04/03 08:08:27 skrll Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhcireg.h,v 1.12 1999/11/17 22:33:42 n_hibma Exp $ */
 
 /*
@@ -84,7 +84,7 @@
 #define  UHCI_INTR_TOCRCIE	__BIT(0)
 #define  UHCI_INTR_RIE		__BIT(1)
 #define  UHCI_INTR_IOCE		__BIT(2)
-#define  UHCI_INTR_SPIE		__BIT(2)
+#define  UHCI_INTR_SPIE		__BIT(3)
 
 #define UHCI_FRNUM		0x06
 #define  UHCI_FRNUM_MASK	__BITS(9,0)

CVS commit: src/etc/namedb

2016-04-03 Thread Takahiro Kambe 
Module Name:src
Committed By:   taca
Date:   Sun Apr  3 08:01:34 UTC 2016

Modified Files:
src/etc/namedb: root.cache

Log Message:
Update root.cache to 2016/3/23 version, l.root-servers.net's  record
has changed.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/etc/namedb/root.cache

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

Modified files:

Index: src/etc/namedb/root.cache
diff -u src/etc/namedb/root.cache:1.19 src/etc/namedb/root.cache:1.20
--- src/etc/namedb/root.cache:1.19	Thu Dec  3 10:41:22 2015
+++ src/etc/namedb/root.cache	Sun Apr  3 08:01:34 2016
@@ -1,4 +1,4 @@
-;	$NetBSD: root.cache,v 1.19 2015/12/03 10:41:22 taca Exp $
+;	$NetBSD: root.cache,v 1.20 2016/04/03 08:01:34 taca Exp $
 ;   This file holds the information on root name servers needed to
 ;   initialize cache of Internet domain name servers
 ;   (e.g. reference this file in the "cache  .  "
@@ -10,8 +10,8 @@
 ;   on server   FTP.INTERNIC.NET
 ;   -OR-RS.INTERNIC.NET
 ;
-;   last update:December 01, 2015
-;   related version of root zone:   2015120100
+;   last update:March 23, 2016
+;   related version of root zone:   2016032301
 ;
 ; formerly NS.INTERNIC.NET
 ;
@@ -81,7 +81,7 @@ K.ROOT-SERVERS.NET.  360  AA
 ;
 .360  NSL.ROOT-SERVERS.NET.
 L.ROOT-SERVERS.NET.  360  A 199.7.83.42
-L.ROOT-SERVERS.NET.  360    2001:500:3::42
+L.ROOT-SERVERS.NET.  360    2001:500:9f::42
 ;
 ; OPERATED BY WIDE
 ;