CVS commit: src/usr.sbin/sysinst

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Jan 26 14:05:29 UTC 2016

Modified Files:
src/usr.sbin/sysinst: disks.c

Log Message:
David Binderman in PR bin/50713: fix memory leaks


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/disks.c

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

Modified files:

Index: src/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.11 src/usr.sbin/sysinst/disks.c:1.12
--- src/usr.sbin/sysinst/disks.c:1.11	Sat Nov 14 23:00:17 2015
+++ src/usr.sbin/sysinst/disks.c	Tue Jan 26 14:05:29 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: disks.c,v 1.11 2015/11/14 23:00:17 pgoyette Exp $ */
+/*	$NetBSD: disks.c,v 1.12 2016/01/26 14:05:29 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -800,8 +800,11 @@ make_filesystems(void)
 			error = fsck_preen(pm->diskdev, ptn, lbl->fsname);
 		}
 		free(newfs);
-		if (error != 0)
+		if (error != 0) {
+			free(devdev);
+			free(dev);
 			return error;
+		}
 
 		lbl->pi_flags ^= PIF_NEWFS;
 		md_pre_mount();
@@ -813,6 +816,8 @@ make_filesystems(void)
 			if (error) {
 msg_display(MSG_mountfail, dev, ' ', lbl->pi_mount);
 process_menu(MENU_ok, NULL);
+free(devdev);
+free(dev);
 return error;
 			}
 		}
@@ -1055,8 +1060,10 @@ fsck_preen(const char *disk, int ptn, co
 	asprintf(, "/sbin/fsck_%s", fsname);
 	if (prog == NULL)
 		return 0;
-	if (access(prog, X_OK) != 0)
+	if (access(prog, X_OK) != 0) {
+		free(prog);
 		return 0;
+	}
 	if (!strcmp(fsname,"ffs"))
 		fixsb(prog, disk, ptn);
 	error = run_program(0, "%s -p -q /dev/r%s%c", prog, disk, ptn);

CVS commit: src/usr.sbin/sysinst

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Jan 26 14:08:58 UTC 2016

Modified Files:
src/usr.sbin/sysinst: savenewlabel.c

Log Message:
David Binderman in PR bin/50714: fix memory leak


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/savenewlabel.c

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

Modified files:

Index: src/usr.sbin/sysinst/savenewlabel.c
diff -u src/usr.sbin/sysinst/savenewlabel.c:1.3 src/usr.sbin/sysinst/savenewlabel.c:1.4
--- src/usr.sbin/sysinst/savenewlabel.c:1.3	Fri May  1 17:48:36 2015
+++ src/usr.sbin/sysinst/savenewlabel.c	Tue Jan 26 14:08:58 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: savenewlabel.c,v 1.3 2015/05/01 17:48:36 martin Exp $	*/
+/*	$NetBSD: savenewlabel.c,v 1.4 2016/01/26 14:08:58 martin Exp $	*/
 
 /*
  * Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
 
 #include 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: savenewlabel.c,v 1.3 2015/05/01 17:48:36 martin Exp $");
+__RCSID("$NetBSD: savenewlabel.c,v 1.4 2016/01/26 14:08:58 martin Exp $");
 #endif
 
 #include 
@@ -133,5 +133,6 @@ savenewlabel(partinfo *lp, int nparts)
 	scripting_fprintf(NULL, "EOF\n");
 	fflush(NULL);
 	run_program(0, "sh -c 'cat /tmp/disktab.* >/tmp/disktab'");
+	free(f_name);
 	return(0);
 }

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

[Juergen Hannken-Illjes]

Module Name:src
Committed By:   hannken
Date:   Tue Jan 26 14:34:50 UTC 2016

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

Log Message:
Operation pmap_pp_clear_attrs() may remove the "used" attribute from a page
that is still cached in the TLB of other CPUs.

Call pmap_tlb_shootnow() here before enabling preemption to clear the
TLB entries on other CPUs.

Should prevent tmpfs data corruption under load.

Ok: Chuck Silvers


To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/sys/arch/x86/x86/pmap.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/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.189 src/sys/arch/x86/x86/pmap.c:1.190
--- src/sys/arch/x86/x86/pmap.c:1.189	Wed Nov 11 08:20:22 2015
+++ src/sys/arch/x86/x86/pmap.c	Tue Jan 26 14:34:50 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.189 2015/11/11 08:20:22 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.190 2016/01/26 14:34:50 hannken Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.189 2015/11/11 08:20:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.190 2016/01/26 14:34:50 hannken Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -3746,6 +3746,7 @@ startover:
 	}
 	result = pp->pp_attrs & clearbits;
 	pp->pp_attrs &= ~clearbits;
+	pmap_tlb_shootnow();
 	kpreempt_enable();
 
 	return result != 0;

CVS import: src/external/mit/lua/dist

[Lourival Pereira Vieira Neto]

Module Name:src
Committed By:   lneto
Date:   Tue Jan 26 14:37:05 UTC 2016

Update of /cvsroot/src/external/mit/lua/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv28256

Log Message:
Lua 5.3.2

Status:

Vendor Tag: LUA
Release Tags:   LUA_5_3_2

N src/external/mit/lua/dist/._doc
C src/external/mit/lua/dist/Makefile
N src/external/mit/lua/dist/._Makefile
C src/external/mit/lua/dist/README
N src/external/mit/lua/dist/._README
N src/external/mit/lua/dist/._src
U src/external/mit/lua/dist/doc/contents.html
N src/external/mit/lua/dist/doc/._contents.html
U src/external/mit/lua/dist/doc/index.css
N src/external/mit/lua/dist/doc/._index.css
U src/external/mit/lua/dist/doc/logo.gif
N src/external/mit/lua/dist/doc/._logo.gif
U src/external/mit/lua/dist/doc/lua.1
N src/external/mit/lua/dist/doc/._lua.1
C src/external/mit/lua/dist/doc/lua.css
N src/external/mit/lua/dist/doc/._lua.css
U src/external/mit/lua/dist/doc/luac.1
N src/external/mit/lua/dist/doc/._luac.1
U src/external/mit/lua/dist/doc/manual.css
N src/external/mit/lua/dist/doc/._manual.css
C src/external/mit/lua/dist/doc/manual.html
N src/external/mit/lua/dist/doc/._manual.html
U src/external/mit/lua/dist/doc/osi-certified-72x60.png
N src/external/mit/lua/dist/doc/._osi-certified-72x60.png
U src/external/mit/lua/dist/doc/readme.html
N src/external/mit/lua/dist/doc/._readme.html
C src/external/mit/lua/dist/src/lapi.c
N src/external/mit/lua/dist/src/._lapi.c
U src/external/mit/lua/dist/src/lapi.h
N src/external/mit/lua/dist/src/._lapi.h
C src/external/mit/lua/dist/src/lauxlib.c
N src/external/mit/lua/dist/src/._lauxlib.c
C src/external/mit/lua/dist/src/lauxlib.h
N src/external/mit/lua/dist/src/._lauxlib.h
C src/external/mit/lua/dist/src/lbaselib.c
N src/external/mit/lua/dist/src/._lbaselib.c
C src/external/mit/lua/dist/src/lbitlib.c
N src/external/mit/lua/dist/src/._lbitlib.c
C src/external/mit/lua/dist/src/lcode.c
N src/external/mit/lua/dist/src/._lcode.c
U src/external/mit/lua/dist/src/lcode.h
N src/external/mit/lua/dist/src/._lcode.h
U src/external/mit/lua/dist/src/lcorolib.c
N src/external/mit/lua/dist/src/._lcorolib.c
U src/external/mit/lua/dist/src/lctype.c
N src/external/mit/lua/dist/src/._lctype.c
U src/external/mit/lua/dist/src/lctype.h
N src/external/mit/lua/dist/src/._lctype.h
C src/external/mit/lua/dist/src/ldblib.c
N src/external/mit/lua/dist/src/._ldblib.c
C src/external/mit/lua/dist/src/ldo.c
C src/external/mit/lua/dist/src/ldebug.c
N src/external/mit/lua/dist/src/._ldebug.c
U src/external/mit/lua/dist/src/ldebug.h
N src/external/mit/lua/dist/src/._ldebug.h
N src/external/mit/lua/dist/src/._ldo.c
C src/external/mit/lua/dist/src/ldo.h
N src/external/mit/lua/dist/src/._ldo.h
C src/external/mit/lua/dist/src/ldump.c
N src/external/mit/lua/dist/src/._ldump.c
U src/external/mit/lua/dist/src/lfunc.c
N src/external/mit/lua/dist/src/._lfunc.c
U src/external/mit/lua/dist/src/lfunc.h
N src/external/mit/lua/dist/src/._lfunc.h
C src/external/mit/lua/dist/src/lgc.c
N src/external/mit/lua/dist/src/._lgc.c
C src/external/mit/lua/dist/src/lgc.h
N src/external/mit/lua/dist/src/._lgc.h
U src/external/mit/lua/dist/src/linit.c
N src/external/mit/lua/dist/src/._linit.c
C src/external/mit/lua/dist/src/liolib.c
N src/external/mit/lua/dist/src/._liolib.c
C src/external/mit/lua/dist/src/llex.c
N src/external/mit/lua/dist/src/._llex.c
U src/external/mit/lua/dist/src/llex.h
N src/external/mit/lua/dist/src/._llex.h
C src/external/mit/lua/dist/src/llimits.h
N src/external/mit/lua/dist/src/._llimits.h
C src/external/mit/lua/dist/src/lmathlib.c
N src/external/mit/lua/dist/src/._lmathlib.c
U src/external/mit/lua/dist/src/lmem.c
N src/external/mit/lua/dist/src/._lmem.c
U src/external/mit/lua/dist/src/lmem.h
N src/external/mit/lua/dist/src/._lmem.h
C src/external/mit/lua/dist/src/loadlib.c
N src/external/mit/lua/dist/src/._loadlib.c
C src/external/mit/lua/dist/src/lobject.c
N src/external/mit/lua/dist/src/._lobject.c
C src/external/mit/lua/dist/src/lobject.h
N src/external/mit/lua/dist/src/._lobject.h
U src/external/mit/lua/dist/src/lopcodes.c
N src/external/mit/lua/dist/src/._lopcodes.c
U src/external/mit/lua/dist/src/lopcodes.h
N src/external/mit/lua/dist/src/._lopcodes.h
C src/external/mit/lua/dist/src/loslib.c
N src/external/mit/lua/dist/src/._loslib.c
C src/external/mit/lua/dist/src/lparser.c
N src/external/mit/lua/dist/src/._lparser.c
U src/external/mit/lua/dist/src/lparser.h
N src/external/mit/lua/dist/src/._lparser.h
U src/external/mit/lua/dist/src/lprefix.h
N src/external/mit/lua/dist/src/._lprefix.h
C src/external/mit/lua/dist/src/lstate.c
N src/external/mit/lua/dist/src/._lstate.c
C src/external/mit/lua/dist/src/lstate.h
N src/external/mit/lua/dist/src/._lstate.h
C src/external/mit/lua/dist/src/lstring.c
N src/external/mit/lua/dist/src/._lstring.c
C src/external/mit/lua/dist/src/lstring.h
N src/external/mit/lua/dist/src/._lstring.h
C src/external/mit/lua/dist/src/lstrlib.c
N src/external/mit/lua/dist/src/._lstrlib.c
C 

CVS commit: src/sys/dev/ic

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 26 16:00:12 UTC 2016

Modified Files:
src/sys/dev/ic: atw.c

Log Message:
PR/50692: David Binderman: Set the right wake up bits.


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/dev/ic/atw.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/ic/atw.c
diff -u src/sys/dev/ic/atw.c:1.156 src/sys/dev/ic/atw.c:1.157
--- src/sys/dev/ic/atw.c:1.156	Thu Nov 21 19:01:09 2013
+++ src/sys/dev/ic/atw.c	Tue Jan 26 11:00:12 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: atw.c,v 1.156 2013/11/22 00:01:09 riz Exp $  */
+/*	$NetBSD: atw.c,v 1.157 2016/01/26 16:00:12 christos Exp $  */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.156 2013/11/22 00:01:09 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.157 2016/01/26 16:00:12 christos Exp $");
 
 
 #include 
@@ -988,9 +988,11 @@ atw_wcsr_init(struct atw_softc *sc)
 	uint32_t wcsr;
 
 	wcsr = ATW_READ(sc, ATW_WCSR);
-	wcsr &= ~(ATW_WCSR_BLN_MASK|ATW_WCSR_LSOE|ATW_WCSR_MPRE|ATW_WCSR_LSOE);
+	wcsr &= ~ATW_WCSR_BLN_MASK;
 	wcsr |= __SHIFTIN(7, ATW_WCSR_BLN_MASK);
-	ATW_WRITE(sc, ATW_WCSR, wcsr);	/* XXX resets wake-up status bits */
+	/* We always want to wake up on link loss or TSFT out of range */
+	wcsr |= ATW_WCSR_LSOE|ATW_WCSR_TSFTWE;
+	ATW_WRITE(sc, ATW_WCSR, wcsr);
 
 	DPRINTF(sc, ("%s: %s reg[WCSR] = %08x\n",
 	device_xname(sc->sc_dev), __func__, ATW_READ(sc, ATW_WCSR)));

CVS commit: src/sys/dev/pci

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 26 16:01:45 UTC 2016

Modified Files:
src/sys/dev/pci: if_ale.c

Log Message:
PR/50693: David Binderman: Fix constant pasto.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/if_ale.c

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

Modified files:

Index: src/sys/dev/pci/if_ale.c
diff -u src/sys/dev/pci/if_ale.c:1.18 src/sys/dev/pci/if_ale.c:1.19
--- src/sys/dev/pci/if_ale.c:1.18	Mon Apr 13 12:33:25 2015
+++ src/sys/dev/pci/if_ale.c	Tue Jan 26 11:01:45 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ale.c,v 1.18 2015/04/13 16:33:25 riastradh Exp $	*/
+/*	$NetBSD: if_ale.c,v 1.19 2016/01/26 16:01:45 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008, Pyun YongHyeon 
@@ -32,7 +32,7 @@
 /* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.18 2015/04/13 16:33:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.19 2016/01/26 16:01:45 christos Exp $");
 
 #include "vlan.h"
 
@@ -541,7 +541,7 @@ ale_attach(device_t parent, device_t sel
 #ifdef ALE_CHECKSUM
 	ifp->if_capabilities |= IFCAP_CSUM_IPv4_Tx | IFCAP_CSUM_IPv4_Rx |
 IFCAP_CSUM_TCPv4_Tx | IFCAP_CSUM_TCPv4_Rx |
-IFCAP_CSUM_UDPv4_Tx | IFCAP_CSUM_TCPv4_Rx;
+IFCAP_CSUM_UDPv4_Tx | IFCAP_CSUM_UDPv4_Rx;
 #endif
 
 #if NVLAN > 0

CVS commit: src/sys/dev/pci

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 26 16:02:50 UTC 2016

Modified Files:
src/sys/dev/pci: if_alc.c

Log Message:
PR/50694: David Binderman: Fix wrong pasto constant.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/if_alc.c

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

Modified files:

Index: src/sys/dev/pci/if_alc.c
diff -u src/sys/dev/pci/if_alc.c:1.17 src/sys/dev/pci/if_alc.c:1.18
--- src/sys/dev/pci/if_alc.c:1.17	Tue Nov 24 18:30:04 2015
+++ src/sys/dev/pci/if_alc.c	Tue Jan 26 11:02:50 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_alc.c,v 1.17 2015/11/24 23:30:04 leot Exp $	*/
+/*	$NetBSD: if_alc.c,v 1.18 2016/01/26 16:02:50 christos Exp $	*/
 /*	$OpenBSD: if_alc.c,v 1.1 2009/08/08 09:31:13 kevlo Exp $	*/
 /*-
  * Copyright (c) 2009, Pyun YongHyeon 
@@ -1418,7 +1418,7 @@ alc_attach(device_t parent, device_t sel
 #ifdef ALC_CHECKSUM
 	ifp->if_capabilities |= IFCAP_CSUM_IPv4_Tx | IFCAP_CSUM_IPv4_Rx |
 IFCAP_CSUM_TCPv4_Tx | IFCAP_CSUM_TCPv4_Rx |
-IFCAP_CSUM_UDPv4_Tx | IFCAP_CSUM_TCPv4_Rx;
+IFCAP_CSUM_UDPv4_Tx | IFCAP_CSUM_UDPv4_Rx;
 #endif
 
 #if NVLAN > 0

CVS commit: src/distrib/utils/more

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 26 16:04:12 UTC 2016

Modified Files:
src/distrib/utils/more: os.c

Log Message:
PR/50710: David Binderman: Fix memory leak.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/more/os.c

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

Modified files:

Index: src/distrib/utils/more/os.c
diff -u src/distrib/utils/more/os.c:1.8 src/distrib/utils/more/os.c:1.9
--- src/distrib/utils/more/os.c:1.8	Sat Jan 24 08:58:21 2009
+++ src/distrib/utils/more/os.c	Tue Jan 26 11:04:12 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: os.c,v 1.8 2009/01/24 13:58:21 tsutsui Exp $	*/
+/*	$NetBSD: os.c,v 1.9 2016/01/26 16:04:12 christos Exp $	*/
 
 /*
  * Copyright (c) 1988 Mark Nudelman
@@ -35,7 +35,7 @@
 #if 0
 static char sccsid[] = "@(#)os.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: os.c,v 1.8 2009/01/24 13:58:21 tsutsui Exp $");
+__RCSID("$NetBSD: os.c,v 1.9 2016/01/26 16:04:12 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -236,8 +236,10 @@ glob(filename)
 			return (filename);
 	}
 
-	if ((f = popen(cmd, "r")) == NULL)
+	if ((f = popen(cmd, "r")) == NULL) {
+		free(cmd);
 		return (filename);
+	}
 	free(cmd);
 
 	for (p = buffer; p < [sizeof(buffer)-1];  p++)

CVS commit: src/lib/libcompat/regexp

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 26 16:05:18 UTC 2016

Modified Files:
src/lib/libcompat/regexp: regexp.c

Log Message:
PR/50711: David Binderman: Fix memory leak on error


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libcompat/regexp/regexp.c

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

Modified files:

Index: src/lib/libcompat/regexp/regexp.c
diff -u src/lib/libcompat/regexp/regexp.c:1.18 src/lib/libcompat/regexp/regexp.c:1.19
--- src/lib/libcompat/regexp/regexp.c:1.18	Fri Feb 16 11:34:19 2007
+++ src/lib/libcompat/regexp/regexp.c	Tue Jan 26 11:05:18 2016
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: regexp.c,v 1.18 2007/02/16 16:34:19 freza Exp $");
+__RCSID("$NetBSD: regexp.c,v 1.19 2016/01/26 16:05:18 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include 
@@ -236,7 +236,7 @@ const char *expn;
 		FAIL("regexp too big");
 
 	/* Allocate space. */
-	r = (regexp *)malloc(sizeof(regexp) + (unsigned)regsize);
+	r = malloc(sizeof(regexp) + (unsigned)regsize);
 	if (r == NULL)
 		FAIL("out of space");
 
@@ -246,8 +246,10 @@ const char *expn;
 	regnpar = 1;
 	regcode = r->program;
 	regc(MAGIC);
-	if (reg(0, ) == NULL)
+	if (reg(0, ) == NULL) {
+		free(r);
 		return(NULL);
+	}
 
 	/* Dig out information for optimizations. */
 	r->regstart = '\0';	/* Worst-case defaults. */

CVS commit: src/usr.bin/showmount

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 26 16:23:27 UTC 2016

Modified Files:
src/usr.bin/showmount: showmount.c

Log Message:
PR/50712: David Binderman: Fix memory leaks.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/showmount/showmount.c

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

Modified files:

Index: src/usr.bin/showmount/showmount.c
diff -u src/usr.bin/showmount/showmount.c:1.21 src/usr.bin/showmount/showmount.c:1.22
--- src/usr.bin/showmount/showmount.c:1.21	Sat Oct 18 04:33:30 2014
+++ src/usr.bin/showmount/showmount.c	Tue Jan 26 11:23:27 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: showmount.c,v 1.21 2014/10/18 08:33:30 snj Exp $	*/
+/*	$NetBSD: showmount.c,v 1.22 2016/01/26 16:23:27 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1995
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
 #if 0
 static char sccsid[] = "@(#)showmount.c	8.3 (Berkeley) 3/29/95";
 #endif
-__RCSID("$NetBSD: showmount.c,v 1.21 2014/10/18 08:33:30 snj Exp $");
+__RCSID("$NetBSD: showmount.c,v 1.22 2016/01/26 16:23:27 christos Exp $");
 #endif /* not lint */
 
 #include 
@@ -152,7 +152,7 @@ main(int argc, char **argv)
 
 	if (rpcs & DODUMP)
 		if ((estat = tcp_callrpc(host, RPCPROG_MNT, mntvers,
-			 RPCMNT_DUMP, (xdrproc_t)xdr_void, (char *)0,
+			 RPCMNT_DUMP, (xdrproc_t)xdr_void, NULL,
 			 (xdrproc_t)xdr_mntdump, (char *))) != 0) {
 			fprintf(stderr, "showmount: Can't do Mountdump rpc: ");
 			clnt_perrno(estat);
@@ -160,7 +160,7 @@ main(int argc, char **argv)
 		}
 	if (rpcs & DOEXPORTS)
 		if ((estat = tcp_callrpc(host, RPCPROG_MNT, mntvers,
-			 RPCMNT_EXPORT, (xdrproc_t)xdr_void, (char *)0,
+			 RPCMNT_EXPORT, (xdrproc_t)xdr_void, NULL,
 			 (xdrproc_t)xdr_exports, (char *))) != 0) {
 			fprintf(stderr, "showmount: Can't do Exports rpc: ");
 			clnt_perrno(estat);
@@ -233,6 +233,16 @@ tcp_callrpc(const char *host, int prognu
  	return rval;
 }
 
+static void
+mountlist_free(struct mountlist *ml)
+{
+	if (ml == NULL)
+		return;
+	mountlist_free(ml->ml_left);
+	mountlist_free(ml->ml_right);
+	free(ml);
+}
+
 /*
  * Xdr routine for retrieving the mount dump list
  */
@@ -244,20 +254,24 @@ xdr_mntdump(XDR *xdrsp, struct mountlist
 	char *strp;
 
 	otp = NULL;
-	*mlp = (struct mountlist *)0;
+	*mlp = NULL;
 	if (!xdr_bool(xdrsp, _int))
-		return (0);
+		return 0;
 	while (bool_int) {
-		mp = (struct mountlist *)malloc(sizeof(struct mountlist));
+		mp = malloc(sizeof(*mp));
 		if (mp == NULL)
-			return (0);
-		mp->ml_left = mp->ml_right = (struct mountlist *)0;
+			goto out;
+		mp->ml_left = mp->ml_right = NULL;
 		strp = mp->ml_host;
-		if (!xdr_string(xdrsp, , RPCMNT_NAMELEN))
-			return (0);
+		if (!xdr_string(xdrsp, , RPCMNT_NAMELEN)) {
+			free(mp);
+			goto out;
+		}
 		strp = mp->ml_dirp;
-		if (!xdr_string(xdrsp, , RPCMNT_PATHLEN))
-			return (0);
+		if (!xdr_string(xdrsp, , RPCMNT_PATHLEN)) {
+			free(mp);
+			goto out;
+		}
 
 		/*
 		 * Build a binary tree on sorted order of either host or dirp.
@@ -274,7 +288,7 @@ xdr_mntdump(XDR *xdrsp, struct mountlist
 case ALL:
 	if (val == 0) {
 		if (val2 == 0) {
-			free((caddr_t)mp);
+			free(mp);
 			goto next;
 		}
 		val = val2;
@@ -282,14 +296,14 @@ xdr_mntdump(XDR *xdrsp, struct mountlist
 	break;
 case DIRS:
 	if (val2 == 0) {
-		free((caddr_t)mp);
+		free(mp);
 		goto next;
 	}
 	val = val2;
 	break;
 default:
 	if (val == 0) {
-		free((caddr_t)mp);
+		free(mp);
 		goto next;
 	}
 	break;
@@ -306,9 +320,31 @@ xdr_mntdump(XDR *xdrsp, struct mountlist
 		}
 next:
 		if (!xdr_bool(xdrsp, _int))
-			return (0);
+			goto out;
 	}
-	return (1);
+	return 1;
+out:
+	mountlist_free(*mlp);
+	return 0;
+}
+
+static void
+grouplist_free(struct grouplist *gp)
+{
+	if (gp == NULL)
+		return;
+	grouplist_free(gp->gr_next);
+	free(gp);
+}
+
+static void
+exportslist_free(struct exportslist *ep)
+{
+	if (ep == NULL)
+		return;
+	exportslist_free(ep->ex_next);
+	grouplist_free(ep->ex_groups);
+	free(ep);
 }
 
 /*
@@ -317,42 +353,47 @@ next:
 static int
 xdr_exports(XDR *xdrsp, struct exportslist **exp)
 {
-	struct exportslist *ep;
+	struct exportslist *ep = NULL;
 	struct grouplist *gp;
 	int bool_int, grpbool;
 	char *strp;
 
-	*exp = (struct exportslist *)0;
+	*exp = NULL;
 	if (!xdr_bool(xdrsp, _int))
-		return (0);
+		return 0;
 	while (bool_int) {
-		ep = (struct exportslist *)malloc(sizeof(struct exportslist));
+		ep = malloc(sizeof(*ep));
 		if (ep == NULL)
-			return (0);
-		ep->ex_groups = (struct grouplist *)0;
+			goto out;
+		ep->ex_groups = NULL;
 		strp = ep->ex_dirp;
 		if (!xdr_string(xdrsp, , RPCMNT_PATHLEN))
-			return (0);
+			goto out;
 		if (!xdr_bool(xdrsp, ))
-			return (0);
+			goto out;
 		while (grpbool) {
-			gp = (struct grouplist *)malloc(sizeof(struct grouplist));
+			gp = malloc(sizeof(*gp));
 			if (gp == NULL)
-		

CVS commit: src/external/gpl3

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 26 17:37:52 UTC 2016

Modified Files:
src/external/gpl3: Makefile

Log Message:
switch to binutils.old


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/Makefile

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/Makefile
diff -u src/external/gpl3/Makefile:1.15 src/external/gpl3/Makefile:1.16
--- src/external/gpl3/Makefile:1.15	Thu Sep 17 05:34:20 2015
+++ src/external/gpl3/Makefile	Tue Jan 26 12:37:51 2016
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.15 2015/09/17 09:34:20 skrll Exp $
+#	$NetBSD: Makefile,v 1.16 2016/01/26 17:37:51 christos Exp $
 
 .include 
 
 .if ${MKBINUTILS} != "no"
-SUBDIR+=	binutils
+SUBDIR+=	binutils.old
 .endif
 
 .if ${MKGCC} != "no"

CVS commit: src/lib

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 26 17:47:35 UTC 2016

Modified Files:
src/lib: Makefile

Log Message:
use EXTERNAL_BINUTILS_SUBDIR


To generate a diff of this commit:
cvs rdiff -u -r1.238 -r1.239 src/lib/Makefile

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

Modified files:

Index: src/lib/Makefile
diff -u src/lib/Makefile:1.238 src/lib/Makefile:1.239
--- src/lib/Makefile:1.238	Wed Jan 13 16:57:26 2016
+++ src/lib/Makefile	Tue Jan 26 12:47:35 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.238 2016/01/13 21:57:26 christos Exp $
+#	$NetBSD: Makefile,v 1.239 2016/01/26 17:47:35 christos Exp $
 #	from: @(#)Makefile	5.25.1.1 (Berkeley) 5/7/91
 
 .include 
@@ -155,7 +155,7 @@ SUBDIR+=	../external/gpl2/lvm2/lib	# dep
 .endif
 
 .if (${MKBINUTILS} != "no")
-SUBDIR+=	../external/gpl3/binutils/lib	# libbfd depends on libz
+SUBDIR+=	../external/gpl3/${EXTERNAL_BINUTILS_SUBDIR}/lib	# libbfd depends on libz
 .endif
 
 .if (${MKLIBCXX} != "no")

CVS commit: src/share/mk

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 26 17:47:06 UTC 2016

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

Log Message:
external binutils and gdb variables.


To generate a diff of this commit:
cvs rdiff -u -r1.885 -r1.886 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.885 src/share/mk/bsd.own.mk:1.886
--- src/share/mk/bsd.own.mk:1.885	Sun Jan 24 15:15:11 2016
+++ src/share/mk/bsd.own.mk	Tue Jan 26 12:47:06 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.885 2016/01/24 20:15:11 christos Exp $
+#	$NetBSD: bsd.own.mk,v 1.886 2016/01/26 17:47:06 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -113,8 +113,6 @@ HAVE_LIBGCC_EH?=	no
 HAVE_LIBGCC_EH?=	yes
 .endif
 
-HAVE_GDB?=	79
-
 .if (${MACHINE_ARCH} == "alpha") || \
 (${MACHINE_ARCH} == "hppa") || \
 (${MACHINE_ARCH} == "ia64") || \
@@ -127,6 +125,22 @@ USE_SSP?=	yes
 .endif
 .endif
 
+HAVE_GDB?=	79
+
+.if ${HAVE_GDB} == 79
+EXTERNAL_GDB_SUBDIR=		gdb
+.else
+EXTERNAL_GDB_SUBDIR=		/does/not/exist
+.endif
+
+HAVE_BINUTILS?=	223
+
+.if ${HAVE_BINUTILS} == 223
+EXTERNAL_BINUTILS_SUBDIR=	binutils.old
+.else
+EXTERNAL_BINUTILS_SUBDIR=	/does/not/exist
+.endif
+
 .if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*)
 .if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
 PRINTOBJDIR=	${MAKE} -r -V .OBJDIR -f /dev/null xxx

CVS commit: src/external/gpl3

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 26 17:48:56 UTC 2016

Modified Files:
src/external/gpl3: Makefile

Log Message:
use EXTERNAL_FOO_SUBDIR


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/Makefile

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/Makefile
diff -u src/external/gpl3/Makefile:1.16 src/external/gpl3/Makefile:1.17
--- src/external/gpl3/Makefile:1.16	Tue Jan 26 12:37:51 2016
+++ src/external/gpl3/Makefile	Tue Jan 26 12:48:56 2016
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.16 2016/01/26 17:37:51 christos Exp $
+#	$NetBSD: Makefile,v 1.17 2016/01/26 17:48:56 christos Exp $
 
 .include 
 
 .if ${MKBINUTILS} != "no"
-SUBDIR+=	binutils.old
+SUBDIR+=	${EXTERNAL_BINUTILS_SUBDIR}
 .endif
 
 .if ${MKGCC} != "no"
@@ -11,7 +11,7 @@ SUBDIR+=	${EXTERNAL_GCC_SUBDIR}
 .endif
 
 .if ${MKGDB} != "no"
-SUBDIR+=gdb
+SUBDIR+=${EXTERNAL_GDB_SUBDIR}
 .endif
 
 .include 

CVS commit: src/tools/binutils

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 26 17:47:57 UTC 2016

Modified Files:
src/tools/binutils: Makefile

Log Message:
use EXTERNAL_BINUTILS_SUBDIR


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/tools/binutils/Makefile

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

Modified files:

Index: src/tools/binutils/Makefile
diff -u src/tools/binutils/Makefile:1.24 src/tools/binutils/Makefile:1.25
--- src/tools/binutils/Makefile:1.24	Sat Feb 15 08:34:28 2014
+++ src/tools/binutils/Makefile	Tue Jan 26 12:47:57 2016
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.24 2014/02/15 13:34:28 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.25 2016/01/26 17:47:57 christos Exp $
 
 .include 
 
 MODULE=		binutils
 
-GNUHOSTDIST=	${.CURDIR}/../../external/gpl3/binutils/dist
+GNUHOSTDIST=	${.CURDIR}/../../external/gpl3/${EXTERNAL_BINUTILS_SUBDIR}/dist
 
 BRANDING?=	\
 	--with-pkgversion="NetBSD Binutils nb1" \

CVS commit: src/share/mk

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 26 19:09:56 UTC 2016

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

Log Message:
back to use binutils since the path is hard-coded everywhere!


To generate a diff of this commit:
cvs rdiff -u -r1.886 -r1.887 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.886 src/share/mk/bsd.own.mk:1.887
--- src/share/mk/bsd.own.mk:1.886	Tue Jan 26 12:47:06 2016
+++ src/share/mk/bsd.own.mk	Tue Jan 26 14:09:56 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.886 2016/01/26 17:47:06 christos Exp $
+#	$NetBSD: bsd.own.mk,v 1.887 2016/01/26 19:09:56 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -136,7 +136,7 @@ EXTERNAL_GDB_SUBDIR=		/does/not/exist
 HAVE_BINUTILS?=	223
 
 .if ${HAVE_BINUTILS} == 223
-EXTERNAL_BINUTILS_SUBDIR=	binutils.old
+EXTERNAL_BINUTILS_SUBDIR=	binutils
 .else
 EXTERNAL_BINUTILS_SUBDIR=	/does/not/exist
 .endif

CVS commit: src/external/gpl3/binutils.old

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 26 19:38:12 UTC 2016

Modified Files:
src/external/gpl3/binutils.old/lib/libbfd: Makefile
src/external/gpl3/binutils.old/lib/libiberty: Makefile
src/external/gpl3/binutils.old/lib/libopcodes: Makefile
src/external/gpl3/binutils.old/usr.bin: Makefile.inc
src/external/gpl3/binutils.old/usr.bin/addr2line: Makefile
src/external/gpl3/binutils.old/usr.bin/ar: Makefile
src/external/gpl3/binutils.old/usr.bin/c++filt: Makefile
src/external/gpl3/binutils.old/usr.bin/coffdump: Makefile
src/external/gpl3/binutils.old/usr.bin/common: Makefile Makefile.inc
Makefile.prog
src/external/gpl3/binutils.old/usr.bin/elfedit: Makefile
src/external/gpl3/binutils.old/usr.bin/gas: Makefile
src/external/gpl3/binutils.old/usr.bin/gprof: Makefile
src/external/gpl3/binutils.old/usr.bin/ld: Makefile
src/external/gpl3/binutils.old/usr.bin/nlmconv: Makefile
src/external/gpl3/binutils.old/usr.bin/nm: Makefile
src/external/gpl3/binutils.old/usr.bin/objcopy: Makefile
src/external/gpl3/binutils.old/usr.bin/objdump: Makefile
src/external/gpl3/binutils.old/usr.bin/ranlib: Makefile
src/external/gpl3/binutils.old/usr.bin/readelf: Makefile
src/external/gpl3/binutils.old/usr.bin/size: Makefile
src/external/gpl3/binutils.old/usr.bin/strings: Makefile
src/external/gpl3/binutils.old/usr.bin/strip: Makefile
src/external/gpl3/binutils.old/usr.sbin: Makefile.inc
src/external/gpl3/binutils.old/usr.sbin/dbsym: Makefile
src/external/gpl3/binutils.old/usr.sbin/mdsetimage: Makefile
Added Files:
src/external/gpl3/binutils.old: Makefile.inc
src/external/gpl3/binutils.old/lib: Makefile.inc

Log Message:
Sync with binutils.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/binutils.old/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/gpl3/binutils.old/lib/Makefile.inc
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/lib/libbfd/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/lib/libiberty/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/lib/libopcodes/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/Makefile.inc
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/addr2line/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/ar/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/c++filt/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/coffdump/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/common/Makefile \
src/external/gpl3/binutils.old/usr.bin/common/Makefile.inc \
src/external/gpl3/binutils.old/usr.bin/common/Makefile.prog
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/elfedit/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/gas/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/gprof/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/ld/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/nlmconv/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/nm/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/objcopy/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/objdump/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/ranlib/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/readelf/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/size/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/strings/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.bin/strip/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.sbin/Makefile.inc
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.sbin/dbsym/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/usr.sbin/mdsetimage/Makefile

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.old/lib/libbfd/Makefile
diff -u src/external/gpl3/binutils.old/lib/libbfd/Makefile:1.1.1.1 src/external/gpl3/binutils.old/lib/libbfd/Makefile:1.2
--- src/external/gpl3/binutils.old/lib/libbfd/Makefile:1.1.1.1	Tue Jan 26 12:26:57 2016
+++ src/external/gpl3/binutils.old/lib/libbfd/Makefile	Tue Jan 26 14:38:09 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:26:57 christos Exp $
+#	

CVS commit: src/external/gpl3/binutils

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 26 19:37:49 UTC 2016

Modified Files:
src/external/gpl3/binutils/lib/libbfd: Makefile
src/external/gpl3/binutils/lib/libiberty: Makefile
src/external/gpl3/binutils/lib/libopcodes: Makefile
src/external/gpl3/binutils/usr.bin: Makefile.inc
src/external/gpl3/binutils/usr.bin/addr2line: Makefile
src/external/gpl3/binutils/usr.bin/ar: Makefile
src/external/gpl3/binutils/usr.bin/c++filt: Makefile
src/external/gpl3/binutils/usr.bin/coffdump: Makefile
src/external/gpl3/binutils/usr.bin/common: Makefile Makefile.inc
Makefile.prog
src/external/gpl3/binutils/usr.bin/elfedit: Makefile
src/external/gpl3/binutils/usr.bin/gas: Makefile
src/external/gpl3/binutils/usr.bin/gprof: Makefile
src/external/gpl3/binutils/usr.bin/ld: Makefile
src/external/gpl3/binutils/usr.bin/nlmconv: Makefile
src/external/gpl3/binutils/usr.bin/nm: Makefile
src/external/gpl3/binutils/usr.bin/objcopy: Makefile
src/external/gpl3/binutils/usr.bin/objdump: Makefile
src/external/gpl3/binutils/usr.bin/ranlib: Makefile
src/external/gpl3/binutils/usr.bin/readelf: Makefile
src/external/gpl3/binutils/usr.bin/size: Makefile
src/external/gpl3/binutils/usr.bin/strings: Makefile
src/external/gpl3/binutils/usr.bin/strip: Makefile
src/external/gpl3/binutils/usr.sbin: Makefile.inc
src/external/gpl3/binutils/usr.sbin/dbsym: Makefile
src/external/gpl3/binutils/usr.sbin/mdsetimage: Makefile
Added Files:
src/external/gpl3/binutils: Makefile.inc
src/external/gpl3/binutils/lib: Makefile.inc

Log Message:
Centralize the definition of TOP/DIST and cleanup a little.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/binutils/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/gpl3/binutils/lib/Makefile.inc
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/binutils/lib/libbfd/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/lib/libiberty/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/lib/libopcodes/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/usr.bin/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/binutils/usr.bin/addr2line/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/usr.bin/ar/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/c++filt/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/coffdump/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/usr.bin/common/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/binutils/usr.bin/common/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/binutils/usr.bin/common/Makefile.prog
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/elfedit/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/binutils/usr.bin/gas/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/binutils/usr.bin/gprof/Makefile
cvs rdiff -u -r1.21 -r1.22 src/external/gpl3/binutils/usr.bin/ld/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/nlmconv/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/nm/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/objcopy/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/usr.bin/objdump/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/usr.bin/ranlib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/usr.bin/readelf/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/size/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/strings/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/strip/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/usr.sbin/Makefile.inc
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/binutils/usr.sbin/dbsym/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile

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/Makefile
diff -u src/external/gpl3/binutils/lib/libbfd/Makefile:1.13 src/external/gpl3/binutils/lib/libbfd/Makefile:1.14
--- src/external/gpl3/binutils/lib/libbfd/Makefile:1.13	Sat Mar 28 03:03:23 2015
+++ src/external/gpl3/binutils/lib/libbfd/Makefile	Tue Jan 26 14:37:47 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2015/03/28 07:03:23 matt Exp $
+#	$NetBSD: Makefile,v 1.14 2016/01/26 19:37:47 christos Exp $
 
 NOLINKLIB=	# defined
 NOLINT=		# defined
@@ -6,7 +6,7 @@ NOMAN=		# defined
 NOPROFILE=	# defined
 NOCLANGERROR=	# defined
 
-.include 
+.include 
 
 # If the platform does not support shared libraries, we need to supply
 # *something* for BFD-using programs to link against.  Also provide an
@@ -25,8 +25,6 @@ 

CVS commit: src/distrib/sets/lists

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 26 21:18:43 UTC 2016

Modified Files:
src/distrib/sets/lists/xcomp: md.amd64
src/distrib/sets/lists/xdebug: md.amd64

Log Message:
adjust to the Makefile fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/xcomp/md.amd64
cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/xdebug/md.amd64

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

Modified files:

Index: src/distrib/sets/lists/xcomp/md.amd64
diff -u src/distrib/sets/lists/xcomp/md.amd64:1.45 src/distrib/sets/lists/xcomp/md.amd64:1.46
--- src/distrib/sets/lists/xcomp/md.amd64:1.45	Fri Oct 30 15:04:21 2015
+++ src/distrib/sets/lists/xcomp/md.amd64	Tue Jan 26 16:18:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.45 2015/10/30 19:04:21 christos Exp $
+# $NetBSD: md.amd64,v 1.46 2016/01/26 21:18:43 christos Exp $
 ./usr/X11R6/include/xf86Optrec.h			-unknown-	x11
 ./usr/X11R6/include/xf86Parser.h			-unknown-	x11
 ./usr/X11R6/man/cat3/XF86VidMode.0			-unknown-	.cat,x11
@@ -94,19 +94,5 @@
 ./usr/libdata/lint/llib-lI810XvMC.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lchromeXvMC.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lchromeXvMCPro.ln		-unknown-	lint,xorg
-./usr/libdata/lint/llib-ldbe.ln-unknown-	lint,xorg
-./usr/libdata/lint/llib-ldri.ln-unknown-	lint,xorg
-./usr/libdata/lint/llib-ldri2.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-ldrm_intel.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-ldrm_nouveau.ln			-unknown-	lint,xorg
-./usr/libdata/lint/llib-lexa.ln-unknown-	lint,xorg
-./usr/libdata/lint/llib-lextmod.ln			-unknown-	lint,xorg
-./usr/libdata/lint/llib-lfb.ln-unknown-	lint,xorg
-./usr/libdata/lint/llib-lglx.ln-unknown-	lint,xorg
-./usr/libdata/lint/llib-lint10.ln			-unknown-	lint,xorg
-./usr/libdata/lint/llib-lrecord.ln			-unknown-	lint,xorg
-./usr/libdata/lint/llib-lshadow.ln			-unknown-	lint,xorg
-./usr/libdata/lint/llib-lshadowfb.ln			-unknown-	lint,xorg
-./usr/libdata/lint/llib-lvbe.ln-unknown-	lint,xorg
-./usr/libdata/lint/llib-lvgahw.ln			-unknown-	lint,xorg
-./usr/libdata/lint/llib-lxaa.ln-unknown-	lint,xorg

Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.23 src/distrib/sets/lists/xdebug/md.amd64:1.24
--- src/distrib/sets/lists/xdebug/md.amd64:1.23	Fri Oct 30 15:04:10 2015
+++ src/distrib/sets/lists/xdebug/md.amd64	Tue Jan 26 16:18:43 2016
@@ -1,25 +1,25 @@
-# $NetBSD: md.amd64,v 1.23 2015/10/30 19:04:10 christos Exp $
+# $NetBSD: md.amd64,v 1.24 2016/01/26 21:18:43 christos Exp $
 ./usr/X11R7/lib/libI810XvMC_g.a-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libIntelXvMC_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libchromeXvMCPro_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libchromeXvMC_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libdrm_intel_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libdrm_nouveau_g.a			-unknown-	debuglib,xorg,compatx11file
-./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	xorg,debuglib
-./usr/X11R7/lib/modules/extensions/libdri2_g.a		-unknown-	debuglib,xorg
-./usr/X11R7/lib/modules/extensions/libdri_g.a		-unknown-	xorg,debuglib
-./usr/X11R7/lib/modules/extensions/libextmod_g.a	-unknown-	xorg,debuglib
-./usr/X11R7/lib/modules/extensions/libglx_g.a		-unknown-	xorg,debuglib
-./usr/X11R7/lib/modules/extensions/librecord_g.a	-unknown-	xorg,debuglib
-./usr/X11R7/lib/modules/extensions/libshadow_g.a	-unknown-	xorg,debuglib
-./usr/X11R7/lib/modules/libexa_g.a			-unknown-	xorg,debuglib
-./usr/X11R7/lib/modules/libi2c_g.a			-unknown-	xorg,debuglib,obsolete
-./usr/X11R7/lib/modules/libfb_g.a			-unknown-	xorg,debuglib
-./usr/X11R7/lib/modules/libint10_g.a			-unknown-	xorg,debuglib
-./usr/X11R7/lib/modules/libshadowfb_g.a			-unknown-	xorg,debuglib
-./usr/X11R7/lib/modules/libvbe_g.a			-unknown-	xorg,debuglib
-./usr/X11R7/lib/modules/libvgahw_g.a			-unknown-	xorg,debuglib
-./usr/X11R7/lib/modules/libxaa_g.a			-unknown-	xorg,debuglib
+./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	xorg,debuglib,obsolete
+./usr/X11R7/lib/modules/extensions/libdri2_g.a		-unknown-	debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libdri_g.a		-unknown-	xorg,debuglib,obsolete
+./usr/X11R7/lib/modules/extensions/libextmod_g.a	-unknown-	xorg,debuglib,obsolete
+./usr/X11R7/lib/modules/extensions/libglx_g.a		-unknown-	xorg,debuglib,obsolete
+./usr/X11R7/lib/modules/extensions/librecord_g.a	-unknown-	xorg,debuglib,obsolete
+./usr/X11R7/lib/modules/extensions/libshadow_g.a	-unknown-	xorg,debuglib,obsolete
+./usr/X11R7/lib/modules/libexa_g.a			-unknown-	xorg,debuglib,obsolete
+./usr/X11R7/lib/modules/libi2c_g.a			-unknown-	xorg,debuglib
+./usr/X11R7/lib/modules/libfb_g.a			-unknown-	xorg,debuglib,obsolete
+./usr/X11R7/lib/modules/libint10_g.a			-unknown-	xorg,debuglib,obsolete

CVS commit: src/share/mk

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 26 21:19:20 UTC 2016

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

Log Message:
back to binutils.old now that it works.


To generate a diff of this commit:
cvs rdiff -u -r1.887 -r1.888 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.887 src/share/mk/bsd.own.mk:1.888
--- src/share/mk/bsd.own.mk:1.887	Tue Jan 26 14:09:56 2016
+++ src/share/mk/bsd.own.mk	Tue Jan 26 16:19:20 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.887 2016/01/26 19:09:56 christos Exp $
+#	$NetBSD: bsd.own.mk,v 1.888 2016/01/26 21:19:20 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -136,7 +136,7 @@ EXTERNAL_GDB_SUBDIR=		/does/not/exist
 HAVE_BINUTILS?=	223
 
 .if ${HAVE_BINUTILS} == 223
-EXTERNAL_BINUTILS_SUBDIR=	binutils
+EXTERNAL_BINUTILS_SUBDIR=	binutils.old
 .else
 EXTERNAL_BINUTILS_SUBDIR=	/does/not/exist
 .endif

CVS commit: src/sys/dev/acpi/acpica

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 26 22:52:15 UTC 2016

Modified Files:
src/sys/dev/acpi/acpica: OsdHardware.c

Log Message:
The new acpi code tries to read the pci configuration registers in the
acpi_probe() phase, before acpi_softc is allocated. Detect this and use
a NULL chipset handle instead of crashing.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/acpica/OsdHardware.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/acpica/OsdHardware.c
diff -u src/sys/dev/acpi/acpica/OsdHardware.c:1.9 src/sys/dev/acpi/acpica/OsdHardware.c:1.10
--- src/sys/dev/acpi/acpica/OsdHardware.c:1.9	Fri Dec 27 13:53:25 2013
+++ src/sys/dev/acpi/acpica/OsdHardware.c	Tue Jan 26 17:52:14 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: OsdHardware.c,v 1.9 2013/12/27 18:53:25 christos Exp $	*/
+/*	$NetBSD: OsdHardware.c,v 1.10 2016/01/26 22:52:14 christos Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: OsdHardware.c,v 1.9 2013/12/27 18:53:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdHardware.c,v 1.10 2016/01/26 22:52:14 christos Exp $");
 
 #include 
 #include 
@@ -212,15 +212,15 @@ AcpiOsReadPciConfiguration(ACPI_PCI_ID *
 {
 	pcitag_t tag;
 	pcireg_t tmp;
+	pci_chipset_tag_t pc = acpi_softc ? acpi_softc->sc_pc : NULL;
 
 	/* XXX Need to deal with "segment" ("hose" in Alpha terminology). */
 
 	if (PciId->Bus >= 256 || PciId->Device >= 32 || PciId->Function >= 8)
 		return AE_BAD_PARAMETER;
 
-	tag = pci_make_tag(acpi_softc->sc_pc, PciId->Bus, PciId->Device,
-	PciId->Function);
-	tmp = pci_conf_read(acpi_softc->sc_pc, tag, Register & ~3);
+	tag = pci_make_tag(pc, PciId->Bus, PciId->Device, PciId->Function);
+	tmp = pci_conf_read(pc, tag, Register & ~3);
 
 	switch (Width) {
 	case 8:
@@ -253,21 +253,21 @@ AcpiOsWritePciConfiguration(ACPI_PCI_ID 
 {
 	pcitag_t tag;
 	pcireg_t tmp;
+	pci_chipset_tag_t pc = acpi_softc ? acpi_softc->sc_pc : NULL;
 
 	/* XXX Need to deal with "segment" ("hose" in Alpha terminology). */
 
-	tag = pci_make_tag(acpi_softc->sc_pc, PciId->Bus, PciId->Device,
-	PciId->Function);
+	tag = pci_make_tag(pc, PciId->Bus, PciId->Device, PciId->Function);
 
 	switch (Width) {
 	case 8:
-		tmp = pci_conf_read(acpi_softc->sc_pc, tag, Register & ~3);
+		tmp = pci_conf_read(pc, tag, Register & ~3);
 		tmp &= ~(0xff << ((Register & 3) * 8));
 		tmp |= (Value << ((Register & 3) * 8));
 		break;
 
 	case 16:
-		tmp = pci_conf_read(acpi_softc->sc_pc, tag, Register & ~3);
+		tmp = pci_conf_read(pc, tag, Register & ~3);
 		tmp &= ~(0x << ((Register & 3) * 8));
 		tmp |= (Value << ((Register & 3) * 8));
 		break;
@@ -280,7 +280,7 @@ AcpiOsWritePciConfiguration(ACPI_PCI_ID 
 		return AE_BAD_PARAMETER;
 	}
 
-	pci_conf_write(acpi_softc->sc_pc, tag, Register & ~3, tmp);
+	pci_conf_write(pc, tag, Register & ~3, tmp);
 
 	return AE_OK;
 }

CVS commit: src/sys/rump/librump

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Jan 26 23:21:19 UTC 2016

Modified Files:
src/sys/rump/librump: makerumpif.sh

Log Message:
include rumpif private headers from 


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/librump/makerumpif.sh

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

Modified files:

Index: src/sys/rump/librump/makerumpif.sh
diff -u src/sys/rump/librump/makerumpif.sh:1.9 src/sys/rump/librump/makerumpif.sh:1.10
--- src/sys/rump/librump/makerumpif.sh:1.9	Thu Apr 23 10:50:00 2015
+++ src/sys/rump/librump/makerumpif.sh	Tue Jan 26 23:21:18 2016
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$NetBSD: makerumpif.sh,v 1.9 2015/04/23 10:50:00 pooka Exp $
+#	$NetBSD: makerumpif.sh,v 1.10 2016/01/26 23:21:18 pooka Exp $
 #
 # Copyright (c) 2009, 2015 Antti Kantee.  All rights reserved.
 #
@@ -78,9 +78,9 @@ sed -e '
 ' ${1} | awk -F\| -v topdir=${TOPDIR} '
 function fileheaders(file, srcstr)
 {
-	printf("/*\t$NetBSD: makerumpif.sh,v 1.9 2015/04/23 10:50:00 pooka Exp $\t*/\n\n") > file
+	printf("/*\t$NetBSD: makerumpif.sh,v 1.10 2016/01/26 23:21:18 pooka Exp $\t*/\n\n") > file
 	printf("/*\n * Automatically generated.  DO NOT EDIT.\n") > file
-	genstr = "$NetBSD: makerumpif.sh,v 1.9 2015/04/23 10:50:00 pooka Exp $"
+	genstr = "$NetBSD: makerumpif.sh,v 1.10 2016/01/26 23:21:18 pooka Exp $"
 	gsub("\\$", "", genstr)
 	printf(" * from: %s\n", srcstr) > file
 	printf(" * by:   %s\n", genstr) > file
@@ -154,11 +154,11 @@ $1 == "WRAPPERS"{gencalls = topdir "/" $
 		printf("\n") > privhdr
 
 		printf("\n#include \n") > gencalls
-		printf("#include \n") > gencalls
-		printf("\n#include \n") > gencalls
+		printf("#include \n\n") > gencalls
+		printf("#include \n", privfile) > gencalls
+		printf("#include \n\n", privfile) > gencalls
+		printf("#include \n") > gencalls
 		printf("#include \n\n", pubfile) > gencalls
-		printf("#include \"rump_private.h\"\n", privfile) > gencalls
-		printf("#include \"%s\"\n\n", privfile) > gencalls
 		printf("void __dead rump_%s_unavailable(void);\n",	\
 		myname) > gencalls
 		printf("void __dead\nrump_%s_unavailable(void)\n{\n",	\

CVS commit: src/sys/rump/librump

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Jan 26 23:22:22 UTC 2016

Modified Files:
src/sys/rump/librump/rumpkern: rumpkern.ifspec
src/sys/rump/librump/rumpnet: rumpnet.ifspec
src/sys/rump/librump/rumpvfs: rumpvfs.ifspec

Log Message:
generate privhdrs to new location


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/rump/librump/rumpkern/rumpkern.ifspec
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpnet/rumpnet.ifspec
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/librump/rumpvfs/rumpvfs.ifspec

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

Modified files:

Index: src/sys/rump/librump/rumpkern/rumpkern.ifspec
diff -u src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.13 src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.14
--- src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.13	Fri Apr 25 13:10:42 2014
+++ src/sys/rump/librump/rumpkern/rumpkern.ifspec	Tue Jan 26 23:22:22 2016
@@ -1,8 +1,8 @@
-;	$NetBSD: rumpkern.ifspec,v 1.13 2014/04/25 13:10:42 pooka Exp $
+;	$NetBSD: rumpkern.ifspec,v 1.14 2016/01/26 23:22:22 pooka Exp $
 
 NAME|kern
 PUBHDR|include/rump/rumpkern_if_pub.h
-PRIVHDR|librump/rumpkern/rumpkern_if_priv.h
+PRIVHDR|include/rump-sys/kern_if.h
 WRAPPERS|librump/rumpkern/rumpkern_if_wrappers.c
 
 ; type		| name		| args

Index: src/sys/rump/librump/rumpnet/rumpnet.ifspec
diff -u src/sys/rump/librump/rumpnet/rumpnet.ifspec:1.3 src/sys/rump/librump/rumpnet/rumpnet.ifspec:1.4
--- src/sys/rump/librump/rumpnet/rumpnet.ifspec:1.3	Wed Jul  3 19:21:11 2013
+++ src/sys/rump/librump/rumpnet/rumpnet.ifspec	Tue Jan 26 23:22:22 2016
@@ -1,8 +1,8 @@
-;   $NetBSD: rumpnet.ifspec,v 1.3 2013/07/03 19:21:11 pooka Exp $
+;   $NetBSD: rumpnet.ifspec,v 1.4 2016/01/26 23:22:22 pooka Exp $
 
 NAME|net
 PUBHDR|include/rump/rumpnet_if_pub.h
-PRIVHDR|librump/rumpnet/rumpnet_if_priv.h
+PRIVHDR|include/rump-sys/net_if.h
 WRAPPERS|librump/rumpnet/rumpnet_if_wrappers.c
 
 ; type  | name  | args			| attrs

Index: src/sys/rump/librump/rumpvfs/rumpvfs.ifspec
diff -u src/sys/rump/librump/rumpvfs/rumpvfs.ifspec:1.10 src/sys/rump/librump/rumpvfs/rumpvfs.ifspec:1.11
--- src/sys/rump/librump/rumpvfs/rumpvfs.ifspec:1.10	Thu Apr 23 10:50:29 2015
+++ src/sys/rump/librump/rumpvfs/rumpvfs.ifspec	Tue Jan 26 23:22:22 2016
@@ -1,8 +1,8 @@
-;   $NetBSD: rumpvfs.ifspec,v 1.10 2015/04/23 10:50:29 pooka Exp $
+;   $NetBSD: rumpvfs.ifspec,v 1.11 2016/01/26 23:22:22 pooka Exp $
 
 NAME|vfs
 PUBHDR|include/rump/rumpvfs_if_pub.h
-PRIVHDR|librump/rumpvfs/rumpvfs_if_priv.h
+PRIVHDR|include/rump-sys/vfs_if.h
 WRAPPERS|librump/rumpvfs/rumpvfs_if_wrappers.c
 
 ; type  | name  | args		| attrs

CVS commit: src/sys/rump

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Jan 26 23:24:55 UTC 2016

Modified Files:
src/sys/rump: makerumpsyscalls.sh

Log Message:
"rump_private.h" -> 


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/makerumpsyscalls.sh

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

Modified files:

Index: src/sys/rump/makerumpsyscalls.sh
diff -u src/sys/rump/makerumpsyscalls.sh:1.2 src/sys/rump/makerumpsyscalls.sh:1.3
--- src/sys/rump/makerumpsyscalls.sh:1.2	Sun Apr 27 16:28:21 2014
+++ src/sys/rump/makerumpsyscalls.sh	Tue Jan 26 23:24:55 2016
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$NetBSD: makerumpsyscalls.sh,v 1.2 2014/04/27 16:28:21 pooka Exp $
+#	$NetBSD: makerumpsyscalls.sh,v 1.3 2016/01/26 23:24:55 pooka Exp $
 #
 
 #
@@ -58,16 +58,16 @@ END {
 }
 '
 
-SYSCOMP_HDR='/*	$NetBSD: makerumpsyscalls.sh,v 1.2 2014/04/27 16:28:21 pooka Exp $	*/
+SYSCOMP_HDR='/*	$NetBSD: makerumpsyscalls.sh,v 1.3 2016/01/26 23:24:55 pooka Exp $	*/
 
 /* AUTOMATICALLY GENERATED BY makerumpsyscalls.sh */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: makerumpsyscalls.sh,v 1.2 2014/04/27 16:28:21 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makerumpsyscalls.sh,v 1.3 2016/01/26 23:24:55 pooka Exp $");
 
 #include 
 
-#include "rump_private.h"
+#include 
 '
 
 SYSCOMP_BODY='

CVS commit: src/sys/rump

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Jan 26 23:25:41 UTC 2016

Modified Files:
src/sys/rump/include/rump: rumpkern_if_pub.h rumpnet_if_pub.h
rumpvfs_if_pub.h
src/sys/rump/include/rump-sys: kern_if.h net_if.h vfs_if.h
src/sys/rump/librump/rumpkern: rumpkern_if_wrappers.c
src/sys/rump/librump/rumpnet: rumpnet_if_wrappers.c
src/sys/rump/librump/rumpvfs: rumpvfs_if_wrappers.c

Log Message:
regen rump kernel interfaces for header change.
(they were already manually edited for a prior commit, so not much change)


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/rump/include/rump/rumpkern_if_pub.h
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/include/rump/rumpnet_if_pub.h
cvs rdiff -u -r1.13 -r1.14 src/sys/rump/include/rump/rumpvfs_if_pub.h
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/rump-sys/kern_if.h \
src/sys/rump/include/rump-sys/net_if.h \
src/sys/rump/include/rump-sys/vfs_if.h
cvs rdiff -u -r1.17 -r1.18 \
src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/librump/rumpnet/rumpnet_if_wrappers.c
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.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/rump/include/rump/rumpkern_if_pub.h
diff -u src/sys/rump/include/rump/rumpkern_if_pub.h:1.17 src/sys/rump/include/rump/rumpkern_if_pub.h:1.18
--- src/sys/rump/include/rump/rumpkern_if_pub.h:1.17	Fri Apr 25 17:50:28 2014
+++ src/sys/rump/include/rump/rumpkern_if_pub.h	Tue Jan 26 23:25:40 2016
@@ -1,9 +1,9 @@
-/*	$NetBSD: rumpkern_if_pub.h,v 1.17 2014/04/25 17:50:28 pooka Exp $	*/
+/*	$NetBSD: rumpkern_if_pub.h,v 1.18 2016/01/26 23:25:40 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
- * from: NetBSD: rumpkern.ifspec,v 1.13 2014/04/25 13:10:42 pooka Exp 
- * by:   NetBSD: makerumpif.sh,v 1.8 2014/04/25 17:50:01 pooka Exp 
+ * from: NetBSD: rumpkern.ifspec,v 1.14 2016/01/26 23:22:22 pooka Exp 
+ * by:   NetBSD: makerumpif.sh,v 1.10 2016/01/26 23:21:18 pooka Exp 
  */
 
 int rump_pub_module_init(const struct modinfo * const *, size_t);

Index: src/sys/rump/include/rump/rumpnet_if_pub.h
diff -u src/sys/rump/include/rump/rumpnet_if_pub.h:1.5 src/sys/rump/include/rump/rumpnet_if_pub.h:1.6
--- src/sys/rump/include/rump/rumpnet_if_pub.h:1.5	Wed Jul  3 19:22:21 2013
+++ src/sys/rump/include/rump/rumpnet_if_pub.h	Tue Jan 26 23:25:40 2016
@@ -1,9 +1,9 @@
-/*	$NetBSD: rumpnet_if_pub.h,v 1.5 2013/07/03 19:22:21 pooka Exp $	*/
+/*	$NetBSD: rumpnet_if_pub.h,v 1.6 2016/01/26 23:25:40 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
- * from: NetBSD: rumpnet.ifspec,v 1.3 2013/07/03 19:21:11 pooka Exp 
- * by:   NetBSD: makerumpif.sh,v 1.6 2013/02/14 10:54:54 pooka Exp 
+ * from: NetBSD: rumpnet.ifspec,v 1.4 2016/01/26 23:22:22 pooka Exp 
+ * by:   NetBSD: makerumpif.sh,v 1.10 2016/01/26 23:21:18 pooka Exp 
  */
 
 int rump_pub_shmif_create(const char *, int *);

Index: src/sys/rump/include/rump/rumpvfs_if_pub.h
diff -u src/sys/rump/include/rump/rumpvfs_if_pub.h:1.13 src/sys/rump/include/rump/rumpvfs_if_pub.h:1.14
--- src/sys/rump/include/rump/rumpvfs_if_pub.h:1.13	Thu Apr 23 10:51:20 2015
+++ src/sys/rump/include/rump/rumpvfs_if_pub.h	Tue Jan 26 23:25:40 2016
@@ -1,9 +1,9 @@
-/*	$NetBSD: rumpvfs_if_pub.h,v 1.13 2015/04/23 10:51:20 pooka Exp $	*/
+/*	$NetBSD: rumpvfs_if_pub.h,v 1.14 2016/01/26 23:25:40 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
- * from: NetBSD: rumpvfs.ifspec,v 1.10 2015/04/23 10:50:29 pooka Exp 
- * by:   NetBSD: makerumpif.sh,v 1.9 2015/04/23 10:50:00 pooka Exp 
+ * from: NetBSD: rumpvfs.ifspec,v 1.11 2016/01/26 23:22:22 pooka Exp 
+ * by:   NetBSD: makerumpif.sh,v 1.10 2016/01/26 23:21:18 pooka Exp 
  */
 
 void rump_pub_getvninfo(struct vnode *, enum rump_vtype *, off_t *, dev_t *);

Index: src/sys/rump/include/rump-sys/kern_if.h
diff -u src/sys/rump/include/rump-sys/kern_if.h:1.1 src/sys/rump/include/rump-sys/kern_if.h:1.2
--- src/sys/rump/include/rump-sys/kern_if.h:1.1	Tue Jan 26 23:12:17 2016
+++ src/sys/rump/include/rump-sys/kern_if.h	Tue Jan 26 23:25:40 2016
@@ -1,9 +1,9 @@
-/*	$NetBSD: kern_if.h,v 1.1 2016/01/26 23:12:17 pooka Exp $	*/
+/*	$NetBSD: kern_if.h,v 1.2 2016/01/26 23:25:40 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
- * from: NetBSD: rumpkern.ifspec,v 1.13 2014/04/25 13:10:42 pooka Exp 
- * by:   NetBSD: makerumpif.sh,v 1.8 2014/04/25 17:50:01 pooka Exp 
+ * from: NetBSD: rumpkern.ifspec,v 1.14 2016/01/26 23:22:22 pooka Exp 
+ * by:   NetBSD: makerumpif.sh,v 1.10 2016/01/26 23:21:18 pooka Exp 
  */
 
 #ifndef _RUMP_PRIF_KERN_H_
Index: src/sys/rump/include/rump-sys/net_if.h
diff -u src/sys/rump/include/rump-sys/net_if.h:1.1 src/sys/rump/include/rump-sys/net_if.h:1.2
--- src/sys/rump/include/rump-sys/net_if.h:1.1	Tue Jan 26 23:12:17 2016
+++ 

CVS commit: src/sys/kern

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Jan 26 23:28:06 UTC 2016

Modified Files:
src/sys/kern: vnode_if.sh

Log Message:
"rump_private.h" -> 


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/kern/vnode_if.sh

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/vnode_if.sh
diff -u src/sys/kern/vnode_if.sh:1.60 src/sys/kern/vnode_if.sh:1.61
--- src/sys/kern/vnode_if.sh:1.60	Mon Jan 13 12:07:55 2014
+++ src/sys/kern/vnode_if.sh	Tue Jan 26 23:28:06 2016
@@ -29,7 +29,7 @@ copyright="\
  * SUCH DAMAGE.
  */
 "
-SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.60 2014/01/13 12:07:55 hannken Exp $'
+SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.61 2016/01/26 23:28:06 pooka Exp $'
 
 # Script to produce VFS front-end sugar.
 #
@@ -306,7 +306,7 @@ echo '
 #include 
 #include '
 [ ! -z "${rump}" ] && echo '#include '		\
-	&& echo '#include "rump_private.h"'
+	&& echo '#include '
 
 if [ -z "${rump}" ] ; then
 	echo "

CVS commit: src/sys

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Jan 26 23:30:10 UTC 2016

Modified Files:
src/sys/kern: vnode_if.c
src/sys/rump/include/rump: rumpvnode_if.h
src/sys/rump/librump/rumpvfs: rumpvnode_if.c
src/sys/sys: vnode_if.h

Log Message:
regen vnode interfaces


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/kern/vnode_if.c
cvs rdiff -u -r1.19 -r1.20 src/sys/rump/include/rump/rumpvnode_if.h
cvs rdiff -u -r1.19 -r1.20 src/sys/rump/librump/rumpvfs/rumpvnode_if.c
cvs rdiff -u -r1.90 -r1.91 src/sys/sys/vnode_if.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/vnode_if.c
diff -u src/sys/kern/vnode_if.c:1.95 src/sys/kern/vnode_if.c:1.96
--- src/sys/kern/vnode_if.c:1.95	Mon Apr 20 23:11:27 2015
+++ src/sys/kern/vnode_if.c	Tue Jan 26 23:30:10 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnode_if.c,v 1.95 2015/04/20 23:11:27 riastradh Exp $	*/
+/*	$NetBSD: vnode_if.c,v 1.96 2016/01/26 23:30:10 pooka Exp $	*/
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.95 2015/04/20 23:11:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.96 2016/01/26 23:30:10 pooka Exp $");
 
 #include 
 #include 

Index: src/sys/rump/include/rump/rumpvnode_if.h
diff -u src/sys/rump/include/rump/rumpvnode_if.h:1.19 src/sys/rump/include/rump/rumpvnode_if.h:1.20
--- src/sys/rump/include/rump/rumpvnode_if.h:1.19	Mon Apr 20 23:11:27 2015
+++ src/sys/rump/include/rump/rumpvnode_if.h	Tue Jan 26 23:30:10 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpvnode_if.h,v 1.19 2015/04/20 23:11:27 riastradh Exp $	*/
+/*	$NetBSD: rumpvnode_if.h,v 1.20 2016/01/26 23:30:10 pooka Exp $	*/
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!

Index: src/sys/rump/librump/rumpvfs/rumpvnode_if.c
diff -u src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.19 src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.20
--- src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.19	Tue Jan 26 23:12:18 2016
+++ src/sys/rump/librump/rumpvfs/rumpvnode_if.c	Tue Jan 26 23:30:10 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpvnode_if.c,v 1.19 2016/01/26 23:12:18 pooka Exp $	*/
+/*	$NetBSD: rumpvnode_if.c,v 1.20 2016/01/26 23:30:10 pooka Exp $	*/
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
@@ -40,17 +40,15 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rumpvnode_if.c,v 1.19 2016/01/26 23:12:18 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpvnode_if.c,v 1.20 2016/01/26 23:30:10 pooka Exp $");
 
 #include 
 #include 
 #include 
 #include 
 #include 
-
-#include 
-
 #include 
+#include 
 
 int
 RUMP_VOP_BWRITE(struct vnode *vp,

Index: src/sys/sys/vnode_if.h
diff -u src/sys/sys/vnode_if.h:1.90 src/sys/sys/vnode_if.h:1.91
--- src/sys/sys/vnode_if.h:1.90	Mon Apr 20 23:11:27 2015
+++ src/sys/sys/vnode_if.h	Tue Jan 26 23:30:10 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnode_if.h,v 1.90 2015/04/20 23:11:27 riastradh Exp $	*/
+/*	$NetBSD: vnode_if.h,v 1.91 2016/01/26 23:30:10 pooka Exp $	*/
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!

CVS commit: src/sys/rump

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Jan 26 23:41:15 UTC 2016

Modified Files:
src/sys/rump/dev/lib/libucom: Makefile
src/sys/rump/librump/rumpkern: Makefile.rumpkern

Log Message:
nuke a few missed -Ifactiondir CPPFLAGSitions.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libucom/Makefile
cvs rdiff -u -r1.165 -r1.166 src/sys/rump/librump/rumpkern/Makefile.rumpkern

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

Modified files:

Index: src/sys/rump/dev/lib/libucom/Makefile
diff -u src/sys/rump/dev/lib/libucom/Makefile:1.6 src/sys/rump/dev/lib/libucom/Makefile:1.7
--- src/sys/rump/dev/lib/libucom/Makefile:1.6	Mon Oct 19 16:16:34 2015
+++ src/sys/rump/dev/lib/libucom/Makefile	Tue Jan 26 23:41:15 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2015/10/19 16:16:34 pooka Exp $
+#	$NetBSD: Makefile,v 1.7 2016/01/26 23:41:15 pooka Exp $
 #
 
 .PATH:	${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../kern
@@ -12,7 +12,5 @@ SRCS=	ucom.c uplcom.c u3g.c
 
 SRCS+=	ucom_at_usb.c
 
-CPPFLAGS+=	-I${RUMPTOP}/librump/rumpvfs
-
 .include 
 .include 

Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.165 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.166
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.165	Mon Oct 19 16:16:38 2015
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern	Tue Jan 26 23:41:15 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.rumpkern,v 1.165 2015/10/19 16:16:38 pooka Exp $
+#	$NetBSD: Makefile.rumpkern,v 1.166 2016/01/26 23:41:15 pooka Exp $
 #
 
 .include "${RUMPTOP}/Makefile.rump"
@@ -169,8 +169,7 @@ SRCS+=		subr_lockdebug.c
 SRCS+=		kern_ktrace.c
 .endif
 
-CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpvfs
-CPPFLAGS+=	-I${RUMPTOP}/librump/rumpnet -I${RUMPTOP}/librump/rumpdev
+CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern
 AFLAGS+=	-D_LOCORE -Wa,--fatal-warnings
 
 #

CVS commit: [netbsd-7] src/sys/kern

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan 26 23:43:34 UTC 2016

Modified Files:
src/sys/kern [netbsd-7]: vfs_vnode.c

Log Message:
Pull up following revision(s) (requested by hannken in ticket #1070):
sys/kern/vfs_vnode.c: revision 1.46 via patch
Take the vnode lock before the vnode is marked VI_CHANGING and fed
to vclean().  Prevents a deadlock with two null mounts on the same
physical mount where one thread tries to vclean() a layer node and
another thread tries to vget() a layer node pointing to the same
physical node.
Fixes PR kern/50375 layerfs (nullfs) locking problem leading to livelock


To generate a diff of this commit:
cvs rdiff -u -r1.37.2.1 -r1.37.2.2 src/sys/kern/vfs_vnode.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/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.37.2.1 src/sys/kern/vfs_vnode.c:1.37.2.2
--- src/sys/kern/vfs_vnode.c:1.37.2.1	Sun Oct 19 10:02:59 2014
+++ src/sys/kern/vfs_vnode.c	Tue Jan 26 23:43:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_vnode.c,v 1.37.2.1 2014/10/19 10:02:59 martin Exp $	*/
+/*	$NetBSD: vfs_vnode.c,v 1.37.2.2 2016/01/26 23:43:34 snj Exp $	*/
 
 /*-
  * Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.37.2.1 2014/10/19 10:02:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.37.2.2 2016/01/26 23:43:34 snj Exp $");
 
 #define _VFS_VNODE_PRIVATE
 
@@ -328,15 +328,17 @@ try_nextlist:
 		KASSERT((vp->v_iflag & VI_CLEAN) == 0);
 		KASSERT(vp->v_freelisthd == listhd);
 
-		if (!mutex_tryenter(vp->v_interlock))
+		if (vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT) != 0)
 			continue;
-		if ((vp->v_iflag & VI_XLOCK) != 0) {
-			mutex_exit(vp->v_interlock);
+		if (!mutex_tryenter(vp->v_interlock)) {
+			VOP_UNLOCK(vp);
 			continue;
 		}
+		KASSERT((vp->v_iflag & VI_XLOCK) == 0);
 		mp = vp->v_mount;
 		if (fstrans_start_nowait(mp, FSTRANS_SHARED) != 0) {
 			mutex_exit(vp->v_interlock);
+			VOP_UNLOCK(vp);
 			continue;
 		}
 		break;
@@ -735,6 +737,11 @@ vrelel(vnode_t *vp, int flags)
 		 * Note that VOP_INACTIVE() will drop the vnode lock.
 		 */
 		VOP_INACTIVE(vp, );
+		if (recycle) {
+			/* vclean() below will drop the lock. */
+			if (vn_lock(vp, LK_EXCLUSIVE) != 0)
+recycle = false;
+		}
 		mutex_enter(vp->v_interlock);
 		if (!recycle) {
 			if (vtryrele(vp)) {
@@ -959,6 +966,7 @@ holdrelel(vnode_t *vp)
 /*
  * Disassociate the underlying file system from a vnode.
  *
+ * Must be called with vnode locked and will return unlocked.
  * Must be called with the interlock held, and will return with it held.
  */
 static void
@@ -968,28 +976,21 @@ vclean(vnode_t *vp)
 	bool recycle, active, doclose;
 	int error;
 
+	KASSERT((vp->v_vflag & VV_LOCKSWORK) == 0 ||
+	VOP_ISLOCKED(vp) == LK_EXCLUSIVE);
 	KASSERT(mutex_owned(vp->v_interlock));
 	KASSERT((vp->v_iflag & VI_MARKER) == 0);
+	KASSERT((vp->v_iflag & (VI_XLOCK | VI_CLEAN)) == 0);
 	KASSERT(vp->v_usecount != 0);
 
-	/* If already clean, nothing to do. */
-	if ((vp->v_iflag & VI_CLEAN) != 0) {
-		return;
-	}
-
 	active = (vp->v_usecount > 1);
 	doclose = ! (active && vp->v_type == VBLK &&
 	spec_node_getmountedfs(vp) != NULL);
-	mutex_exit(vp->v_interlock);
-
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 
 	/*
 	 * Prevent the vnode from being recycled or brought into use
 	 * while we clean it out.
 	 */
-	mutex_enter(vp->v_interlock);
-	KASSERT((vp->v_iflag & (VI_XLOCK | VI_CLEAN)) == 0);
 	vp->v_iflag |= VI_XLOCK;
 	if (vp->v_iflag & VI_EXECMAP) {
 		atomic_add_int(, -vp->v_uobj.uo_npages);
@@ -1073,23 +1074,26 @@ bool
 vrecycle(vnode_t *vp)
 {
 
+	if (vn_lock(vp, LK_EXCLUSIVE) != 0)
+		return false;
+
 	mutex_enter(vp->v_interlock);
 
 	KASSERT((vp->v_iflag & VI_MARKER) == 0);
 
 	if (vp->v_usecount != 1) {
 		mutex_exit(vp->v_interlock);
+		VOP_UNLOCK(vp);
 		return false;
 	}
 	if ((vp->v_iflag & VI_CHANGING) != 0)
 		vwait(vp, VI_CHANGING);
 	if (vp->v_usecount != 1) {
 		mutex_exit(vp->v_interlock);
+		VOP_UNLOCK(vp);
 		return false;
-	} else if ((vp->v_iflag & VI_CLEAN) != 0) {
-		mutex_exit(vp->v_interlock);
-		return true;
 	}
+	KASSERT((vp->v_iflag & VI_CLEAN) == 0);
 	vp->v_iflag |= VI_CHANGING;
 	vclean(vp);
 	vrelel(vp, VRELEL_CHANGING_SET);
@@ -1137,6 +1141,11 @@ void
 vgone(vnode_t *vp)
 {
 
+	if (vn_lock(vp, LK_EXCLUSIVE) != 0) {
+		KASSERT((vp->v_iflag & VI_CLEAN) != 0);
+		vrele(vp);
+	}
+
 	mutex_enter(vp->v_interlock);
 	if ((vp->v_iflag & VI_CHANGING) != 0)
 		vwait(vp, VI_CHANGING);

CVS commit: [netbsd-7-0] src/sys/kern

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan 26 23:44:11 UTC 2016

Modified Files:
src/sys/kern [netbsd-7-0]: vfs_vnode.c

Log Message:
Pull up following revision(s) (requested by hannken in ticket #1070):
sys/kern/vfs_vnode.c: revision 1.46 via patch
Take the vnode lock before the vnode is marked VI_CHANGING and fed
to vclean().  Prevents a deadlock with two null mounts on the same
physical mount where one thread tries to vclean() a layer node and
another thread tries to vget() a layer node pointing to the same
physical node.
Fixes PR kern/50375 layerfs (nullfs) locking problem leading to livelock


To generate a diff of this commit:
cvs rdiff -u -r1.37.2.1 -r1.37.2.1.2.1 src/sys/kern/vfs_vnode.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/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.37.2.1 src/sys/kern/vfs_vnode.c:1.37.2.1.2.1
--- src/sys/kern/vfs_vnode.c:1.37.2.1	Sun Oct 19 10:02:59 2014
+++ src/sys/kern/vfs_vnode.c	Tue Jan 26 23:44:11 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_vnode.c,v 1.37.2.1 2014/10/19 10:02:59 martin Exp $	*/
+/*	$NetBSD: vfs_vnode.c,v 1.37.2.1.2.1 2016/01/26 23:44:11 snj Exp $	*/
 
 /*-
  * Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.37.2.1 2014/10/19 10:02:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.37.2.1.2.1 2016/01/26 23:44:11 snj Exp $");
 
 #define _VFS_VNODE_PRIVATE
 
@@ -328,15 +328,17 @@ try_nextlist:
 		KASSERT((vp->v_iflag & VI_CLEAN) == 0);
 		KASSERT(vp->v_freelisthd == listhd);
 
-		if (!mutex_tryenter(vp->v_interlock))
+		if (vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT) != 0)
 			continue;
-		if ((vp->v_iflag & VI_XLOCK) != 0) {
-			mutex_exit(vp->v_interlock);
+		if (!mutex_tryenter(vp->v_interlock)) {
+			VOP_UNLOCK(vp);
 			continue;
 		}
+		KASSERT((vp->v_iflag & VI_XLOCK) == 0);
 		mp = vp->v_mount;
 		if (fstrans_start_nowait(mp, FSTRANS_SHARED) != 0) {
 			mutex_exit(vp->v_interlock);
+			VOP_UNLOCK(vp);
 			continue;
 		}
 		break;
@@ -735,6 +737,11 @@ vrelel(vnode_t *vp, int flags)
 		 * Note that VOP_INACTIVE() will drop the vnode lock.
 		 */
 		VOP_INACTIVE(vp, );
+		if (recycle) {
+			/* vclean() below will drop the lock. */
+			if (vn_lock(vp, LK_EXCLUSIVE) != 0)
+recycle = false;
+		}
 		mutex_enter(vp->v_interlock);
 		if (!recycle) {
 			if (vtryrele(vp)) {
@@ -959,6 +966,7 @@ holdrelel(vnode_t *vp)
 /*
  * Disassociate the underlying file system from a vnode.
  *
+ * Must be called with vnode locked and will return unlocked.
  * Must be called with the interlock held, and will return with it held.
  */
 static void
@@ -968,28 +976,21 @@ vclean(vnode_t *vp)
 	bool recycle, active, doclose;
 	int error;
 
+	KASSERT((vp->v_vflag & VV_LOCKSWORK) == 0 ||
+	VOP_ISLOCKED(vp) == LK_EXCLUSIVE);
 	KASSERT(mutex_owned(vp->v_interlock));
 	KASSERT((vp->v_iflag & VI_MARKER) == 0);
+	KASSERT((vp->v_iflag & (VI_XLOCK | VI_CLEAN)) == 0);
 	KASSERT(vp->v_usecount != 0);
 
-	/* If already clean, nothing to do. */
-	if ((vp->v_iflag & VI_CLEAN) != 0) {
-		return;
-	}
-
 	active = (vp->v_usecount > 1);
 	doclose = ! (active && vp->v_type == VBLK &&
 	spec_node_getmountedfs(vp) != NULL);
-	mutex_exit(vp->v_interlock);
-
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 
 	/*
 	 * Prevent the vnode from being recycled or brought into use
 	 * while we clean it out.
 	 */
-	mutex_enter(vp->v_interlock);
-	KASSERT((vp->v_iflag & (VI_XLOCK | VI_CLEAN)) == 0);
 	vp->v_iflag |= VI_XLOCK;
 	if (vp->v_iflag & VI_EXECMAP) {
 		atomic_add_int(, -vp->v_uobj.uo_npages);
@@ -1073,23 +1074,26 @@ bool
 vrecycle(vnode_t *vp)
 {
 
+	if (vn_lock(vp, LK_EXCLUSIVE) != 0)
+		return false;
+
 	mutex_enter(vp->v_interlock);
 
 	KASSERT((vp->v_iflag & VI_MARKER) == 0);
 
 	if (vp->v_usecount != 1) {
 		mutex_exit(vp->v_interlock);
+		VOP_UNLOCK(vp);
 		return false;
 	}
 	if ((vp->v_iflag & VI_CHANGING) != 0)
 		vwait(vp, VI_CHANGING);
 	if (vp->v_usecount != 1) {
 		mutex_exit(vp->v_interlock);
+		VOP_UNLOCK(vp);
 		return false;
-	} else if ((vp->v_iflag & VI_CLEAN) != 0) {
-		mutex_exit(vp->v_interlock);
-		return true;
 	}
+	KASSERT((vp->v_iflag & VI_CLEAN) == 0);
 	vp->v_iflag |= VI_CHANGING;
 	vclean(vp);
 	vrelel(vp, VRELEL_CHANGING_SET);
@@ -1137,6 +1141,11 @@ void
 vgone(vnode_t *vp)
 {
 
+	if (vn_lock(vp, LK_EXCLUSIVE) != 0) {
+		KASSERT((vp->v_iflag & VI_CLEAN) != 0);
+		vrele(vp);
+	}
+
 	mutex_enter(vp->v_interlock);
 	if ((vp->v_iflag & VI_CHANGING) != 0)
 		vwait(vp, VI_CHANGING);

CVS commit: src/sys/kern

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Jan 26 23:44:58 UTC 2016

Modified Files:
src/sys/kern: makesyscalls.sh

Log Message:
"rump_private" -> 


To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/sys/kern/makesyscalls.sh

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/makesyscalls.sh
diff -u src/sys/kern/makesyscalls.sh:1.162 src/sys/kern/makesyscalls.sh:1.163
--- src/sys/kern/makesyscalls.sh:1.162	Tue Dec  1 00:58:29 2015
+++ src/sys/kern/makesyscalls.sh	Tue Jan 26 23:44:58 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: makesyscalls.sh,v 1.162 2015/12/01 00:58:29 pgoyette Exp $
+#	$NetBSD: makesyscalls.sh,v 1.163 2016/01/26 23:44:58 pooka Exp $
 #
 # Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou
 # All rights reserved.
@@ -287,8 +287,8 @@ NR == 1 {
 	printf "#include \n" > rumpcalls
 	printf "#include \n\n" > rumpcalls
 	printf "#include \n\n" > rumpcalls
+	printf "#include \"\n\n" > rumpcalls
 	printf "#include \n" > rumpcalls
-	printf "#include \"rump_private.h\"\n\n" > rumpcalls
 	printf "#define rsys_syscall(num, data, dlen, retval)\t\\\n" > rumpcalls
 	printf "rump_syscall(num, data, dlen, retval)\n\n" > rumpcalls
 	printf "#define rsys_seterrno(error) rumpuser_seterrno(error)\n" \

CVS commit: [netbsd-7] src/sys/arch/x86

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan 26 23:46:59 UTC 2016

Modified Files:
src/sys/arch/x86/include [netbsd-7]: cpufunc.h
src/sys/arch/x86/x86 [netbsd-7]: errata.c

Log Message:
Pull up following revision(s) (requested by hannken in ticket #1073):
sys/arch/x86/x86/errata.c: revision 1.23
sys/arch/x86/include/cpufunc.h: revision 1.19
Adapt prototypes and usage of rdmsr_locked() and wrmsr_locked() to
their implementation.  Both functions don't take the passcode as
argument.
As wrmsr_locked() no longer writes the passcode to the msr the
erratum 721 on my Opteron 2356 really gets patched and cc1 no longer
crashes with SIGSEGV.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.4.1 src/sys/arch/x86/include/cpufunc.h
cvs rdiff -u -r1.21 -r1.21.12.1 src/sys/arch/x86/x86/errata.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/include/cpufunc.h
diff -u src/sys/arch/x86/include/cpufunc.h:1.18 src/sys/arch/x86/include/cpufunc.h:1.18.4.1
--- src/sys/arch/x86/include/cpufunc.h:1.18	Tue Feb 25 22:16:52 2014
+++ src/sys/arch/x86/include/cpufunc.h	Tue Jan 26 23:46:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.h,v 1.18 2014/02/25 22:16:52 dsl Exp $	*/
+/*	$NetBSD: cpufunc.h,v 1.18.4.1 2016/01/26 23:46:59 snj Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
@@ -134,12 +134,12 @@ void	x86_reset(void);
 #define	OPTERON_MSR_PASSCODE	0x9c5a203aU
 
 uint64_t	rdmsr(u_int);
-uint64_t	rdmsr_locked(u_int, u_int);
+uint64_t	rdmsr_locked(u_int);
 int		rdmsr_safe(u_int, uint64_t *);
 uint64_t	rdtsc(void);
 uint64_t	rdpmc(u_int);
 void		wrmsr(u_int, uint64_t);
-void		wrmsr_locked(u_int, u_int, uint64_t);
+void		wrmsr_locked(u_int, uint64_t);
 void		setfs(int);
 void		setusergs(int);
 

Index: src/sys/arch/x86/x86/errata.c
diff -u src/sys/arch/x86/x86/errata.c:1.21 src/sys/arch/x86/x86/errata.c:1.21.12.1
--- src/sys/arch/x86/x86/errata.c:1.21	Thu Mar 21 13:22:37 2013
+++ src/sys/arch/x86/x86/errata.c	Tue Jan 26 23:46:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: errata.c,v 1.21 2013/03/21 13:22:37 christos Exp $	*/
+/*	$NetBSD: errata.c,v 1.21.12.1 2016/01/26 23:46:59 snj Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: errata.c,v 1.21 2013/03/21 13:22:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: errata.c,v 1.21.12.1 2016/01/26 23:46:59 snj Exp $");
 
 #include 
 #include 
@@ -294,7 +294,7 @@ x86_errata_testmsr(struct cpu_info *ci, 
 
 	(void)ci;
 
-	val = rdmsr_locked(e->e_data1, OPTERON_MSR_PASSCODE);
+	val = rdmsr_locked(e->e_data1);
 	if ((val & e->e_data2) != 0)
 		return FALSE;
 
@@ -309,10 +309,10 @@ x86_errata_setmsr(struct cpu_info *ci, e
 
 	(void)ci;
 
-	val = rdmsr_locked(e->e_data1, OPTERON_MSR_PASSCODE);
+	val = rdmsr_locked(e->e_data1);
 	if ((val & e->e_data2) != 0)
 		return FALSE;
-	wrmsr_locked(e->e_data1, OPTERON_MSR_PASSCODE, val | e->e_data2);
+	wrmsr_locked(e->e_data1, val | e->e_data2);
 	aprint_debug_dev(ci->ci_dev, "erratum %d patched\n",
 	e->e_num);
 

CVS commit: src/sys/kern

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Jan 26 23:46:37 UTC 2016

Modified Files:
src/sys/kern: makesyscalls.sh

Log Message:
fix typo in previous


To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/kern/makesyscalls.sh

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/makesyscalls.sh
diff -u src/sys/kern/makesyscalls.sh:1.163 src/sys/kern/makesyscalls.sh:1.164
--- src/sys/kern/makesyscalls.sh:1.163	Tue Jan 26 23:44:58 2016
+++ src/sys/kern/makesyscalls.sh	Tue Jan 26 23:46:37 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: makesyscalls.sh,v 1.163 2016/01/26 23:44:58 pooka Exp $
+#	$NetBSD: makesyscalls.sh,v 1.164 2016/01/26 23:46:37 pooka Exp $
 #
 # Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou
 # All rights reserved.
@@ -287,7 +287,7 @@ NR == 1 {
 	printf "#include \n" > rumpcalls
 	printf "#include \n\n" > rumpcalls
 	printf "#include \n\n" > rumpcalls
-	printf "#include \"\n\n" > rumpcalls
+	printf "#include \n\n" > rumpcalls
 	printf "#include \n" > rumpcalls
 	printf "#define rsys_syscall(num, data, dlen, retval)\t\\\n" > rumpcalls
 	printf "rump_syscall(num, data, dlen, retval)\n\n" > rumpcalls

CVS commit: [netbsd-7] src/etc/ssh

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan 26 23:48:48 UTC 2016

Modified Files:
src/etc/ssh [netbsd-7]: ssh_known_hosts

Log Message:
Pull up following revision(s) (requested by wiz in ticket #1074):
etc/ssh/ssh_known_hosts: revision 1.9
Add keys for wip.pkgsrc.org.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.6.1 src/etc/ssh/ssh_known_hosts

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

Modified files:

Index: src/etc/ssh/ssh_known_hosts
diff -u src/etc/ssh/ssh_known_hosts:1.8 src/etc/ssh/ssh_known_hosts:1.8.6.1
--- src/etc/ssh/ssh_known_hosts:1.8	Fri Jun  7 16:44:17 2013
+++ src/etc/ssh/ssh_known_hosts	Tue Jan 26 23:48:48 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: ssh_known_hosts,v 1.8 2013/06/07 16:44:17 spz Exp $
+#	$NetBSD: ssh_known_hosts,v 1.8.6.1 2016/01/26 23:48:48 snj Exp $
 #
 anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU=
 
@@ -48,4 +48,7 @@ babylon5.netbsd.org ssh-rsa B3NzaC1y
 
 babylon5.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAGezUIquRab5bDygg8gme0Xu5K2V2YOJf2GeChuL7ZjLwjb5trRNkZ2VlS/rbp8vUkcQ5q5s6HnnuaY/3xTIpR7DwF3TqCSbf74e8i2HJ/AaD9w9TWm1kmXLVhHTH0lEX1a91HX1MBqonw6N10roOPmNjiwWbV5VkdqMSSwk3nREnS5Zg==
 #
+wip.pkgsrc.org ssh-rsa B3NzaC1yc2EDAQABAAABAQDNc90vEP32OwsKkkHXQkUkkZYM155HZSoCIEQovICKQfeZ/MtEt2I4rINKlvmw+SEsbHvidiHRGk1V2c6/9aPjrzu7QkIkFZ5KgDyRDOrnQh2ZYwSU8AVRggb3lom616nYKhLw1S7y9rUlBDjhhSGr7GdCPKyQlzcfuIZLTR981TcRE1rUwOzwSZANh478U3eLIcF7ZB0Q+24l4sImcCh8o11sMXZpJB0i63m8sHr37JxvgOAxKLJ2rvUV0lq8F0NEr9zIpPPV0CCXOYS6UbkTaAAU5x6qFA+Yb5cRMVFno57A/jsi+1qGFpXFq05eVE76yczeKpa4b2Dd8f1yVx17
 
+wip.pkgsrc.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAC/6upkeVmje3znifKezKD9rtZEzr63ACPTmhtki7vAXgv2KRnyc6KBIZkycaCChZZJ5hM/TKsVnq6GbbU70+SUhgDNEWQXtjkk0ADpJLXLtL9tG6LMA2Cf8xSQf1sCv3hpE3IiKK6lq9EE9+kjqHlEMqxcOtTK2aMSvkpwcF4Udg7w8g==
+#

CVS commit: src/sys

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Jan 26 23:49:47 UTC 2016

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

Log Message:
regen syscall files


To generate a diff of this commit:
cvs rdiff -u -r1.305 -r1.306 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.295 -r1.296 src/sys/kern/syscalls.c
cvs rdiff -u -r1.14 -r1.15 src/sys/kern/syscalls_autoload.c \
src/sys/kern/systrace_args.c
cvs rdiff -u -r1.95 -r1.96 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.122 -r1.123 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.289 -r1.290 src/sys/sys/syscall.h
cvs rdiff -u -r1.273 -r1.274 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.305 src/sys/kern/init_sysent.c:1.306
--- src/sys/kern/init_sysent.c:1.305	Thu Dec  3 02:56:48 2015
+++ src/sys/kern/init_sysent.c	Tue Jan 26 23:49:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysent.c,v 1.305 2015/12/03 02:56:48 pgoyette Exp $ */
+/* $NetBSD: init_sysent.c,v 1.306 2016/01/26 23:49:46 pooka Exp $ */
 
 /*
  * System call switch table.
@@ -8,7 +8,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.305 2015/12/03 02:56:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.306 2016/01/26 23:49:46 pooka Exp $");
 
 #include "opt_modular.h"
 #include "opt_ntp.h"

Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.295 src/sys/kern/syscalls.c:1.296
--- src/sys/kern/syscalls.c:1.295	Thu Dec  3 02:56:48 2015
+++ src/sys/kern/syscalls.c	Tue Jan 26 23:49:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: syscalls.c,v 1.295 2015/12/03 02:56:48 pgoyette Exp $ */
+/* $NetBSD: syscalls.c,v 1.296 2016/01/26 23:49:46 pooka Exp $ */
 
 /*
  * System call names.
@@ -8,7 +8,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.295 2015/12/03 02:56:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.296 2016/01/26 23:49:46 pooka 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.14 src/sys/kern/syscalls_autoload.c:1.15
--- src/sys/kern/syscalls_autoload.c:1.14	Thu Dec  3 02:56:48 2015
+++ src/sys/kern/syscalls_autoload.c	Tue Jan 26 23:49:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: syscalls_autoload.c,v 1.14 2015/12/03 02:56:48 pgoyette Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.15 2016/01/26 23:49:46 pooka Exp $ */
 
 /*
  * System call autoload table.
@@ -8,7 +8,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.14 2015/12/03 02:56:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.15 2016/01/26 23:49:46 pooka Exp $");
 
 #include 
 static struct sc_autoload netbsd_syscalls_autoload[] = {
Index: src/sys/kern/systrace_args.c
diff -u src/sys/kern/systrace_args.c:1.14 src/sys/kern/systrace_args.c:1.15
--- src/sys/kern/systrace_args.c:1.14	Thu Dec  3 02:56:48 2015
+++ src/sys/kern/systrace_args.c	Tue Jan 26 23:49:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: systrace_args.c,v 1.14 2015/12/03 02:56:48 pgoyette Exp $ */
+/* $NetBSD: systrace_args.c,v 1.15 2016/01/26 23:49:46 pooka Exp $ */
 
 /*
  * System call argument to DTrace register array converstion.

Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.95 src/sys/rump/include/rump/rump_syscalls.h:1.96
--- src/sys/rump/include/rump/rump_syscalls.h:1.95	Thu Dec  3 02:56:48 2015
+++ src/sys/rump/include/rump/rump_syscalls.h	Tue Jan 26 23:49:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_syscalls.h,v 1.95 2015/12/03 02:56:48 pgoyette Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.96 2016/01/26 23:49:46 pooka Exp $ */
 
 /*
  * System call protos in rump namespace.
@@ -16,824 +16,824 @@
 
 #include 
 
-#ifndef RUMP_SYS_RENAME_FKTRACE
-#define RUMP_SYS_RENAME_FKTRACE rump___sysimpl_fktrace
-#endif
-
-#ifndef RUMP_SYS_RENAME_GETSID
-#define RUMP_SYS_RENAME_GETSID rump___sysimpl_getsid
+#ifndef RUMP_SYS_RENAME_FGETXATTR
+#define RUMP_SYS_RENAME_FGETXATTR rump___sysimpl_fgetxattr
 #endif
 
-#ifndef RUMP_SYS_RENAME_RECVMMSG
-#define RUMP_SYS_RENAME_RECVMMSG rump___sysimpl_recvmmsg
+#ifndef RUMP_SYS_RENAME_IOCTL
+#define RUMP_SYS_RENAME_IOCTL rump___sysimpl_ioctl
 #endif
 
-#ifndef RUMP_SYS_RENAME_UTIMENSAT
-#define RUMP_SYS_RENAME_UTIMENSAT rump___sysimpl_utimensat
+#ifndef RUMP_SYS_RENAME_GETPPID
+#define RUMP_SYS_RENAME_GETPPID rump___sysimpl_getppid
 #endif
 
-#ifndef RUMP_SYS_RENAME_CHFLAGS
-#define RUMP_SYS_RENAME_CHFLAGS rump___sysimpl_chflags
+#ifndef RUMP_SYS_RENAME___QUOTACTL
+#define RUMP_SYS_RENAME___QUOTACTL rump___sysimpl___quotactl
 #endif
 
-#ifndef RUMP_SYS_RENAME_GETGROUPS

CVS commit: [netbsd-7-0] src/etc/ssh

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan 26 23:49:37 UTC 2016

Modified Files:
src/etc/ssh [netbsd-7-0]: ssh_known_hosts

Log Message:
Pull up following revision(s) (requested by wiz in ticket #1074):
etc/ssh/ssh_known_hosts: revision 1.9
Add keys for wip.pkgsrc.org.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.8.1 src/etc/ssh/ssh_known_hosts

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

Modified files:

Index: src/etc/ssh/ssh_known_hosts
diff -u src/etc/ssh/ssh_known_hosts:1.8 src/etc/ssh/ssh_known_hosts:1.8.8.1
--- src/etc/ssh/ssh_known_hosts:1.8	Fri Jun  7 16:44:17 2013
+++ src/etc/ssh/ssh_known_hosts	Tue Jan 26 23:49:36 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: ssh_known_hosts,v 1.8 2013/06/07 16:44:17 spz Exp $
+#	$NetBSD: ssh_known_hosts,v 1.8.8.1 2016/01/26 23:49:36 snj Exp $
 #
 anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU=
 
@@ -48,4 +48,7 @@ babylon5.netbsd.org ssh-rsa B3NzaC1y
 
 babylon5.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAGezUIquRab5bDygg8gme0Xu5K2V2YOJf2GeChuL7ZjLwjb5trRNkZ2VlS/rbp8vUkcQ5q5s6HnnuaY/3xTIpR7DwF3TqCSbf74e8i2HJ/AaD9w9TWm1kmXLVhHTH0lEX1a91HX1MBqonw6N10roOPmNjiwWbV5VkdqMSSwk3nREnS5Zg==
 #
+wip.pkgsrc.org ssh-rsa B3NzaC1yc2EDAQABAAABAQDNc90vEP32OwsKkkHXQkUkkZYM155HZSoCIEQovICKQfeZ/MtEt2I4rINKlvmw+SEsbHvidiHRGk1V2c6/9aPjrzu7QkIkFZ5KgDyRDOrnQh2ZYwSU8AVRggb3lom616nYKhLw1S7y9rUlBDjhhSGr7GdCPKyQlzcfuIZLTR981TcRE1rUwOzwSZANh478U3eLIcF7ZB0Q+24l4sImcCh8o11sMXZpJB0i63m8sHr37JxvgOAxKLJ2rvUV0lq8F0NEr9zIpPPV0CCXOYS6UbkTaAAU5x6qFA+Yb5cRMVFno57A/jsi+1qGFpXFq05eVE76yczeKpa4b2Dd8f1yVx17
 
+wip.pkgsrc.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAC/6upkeVmje3znifKezKD9rtZEzr63ACPTmhtki7vAXgv2KRnyc6KBIZkycaCChZZJ5hM/TKsVnq6GbbU70+SUhgDNEWQXtjkk0ADpJLXLtL9tG6LMA2Cf8xSQf1sCv3hpE3IiKK6lq9EE9+kjqHlEMqxcOtTK2aMSvkpwcF4Udg7w8g==
+#

CVS commit: [netbsd-7-0] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jan 26 23:55:52 UTC 2016

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
1070, 1073, 1074


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.30 -r1.1.2.31 src/doc/CHANGES-7.0.1

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-7.0.1
diff -u src/doc/CHANGES-7.0.1:1.1.2.30 src/doc/CHANGES-7.0.1:1.1.2.31
--- src/doc/CHANGES-7.0.1:1.1.2.30	Tue Jan 26 04:57:19 2016
+++ src/doc/CHANGES-7.0.1	Tue Jan 26 23:55:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.1,v 1.1.2.30 2016/01/26 04:57:19 riz Exp $
+# $NetBSD: CHANGES-7.0.1,v 1.1.2.31 2016/01/26 23:55:52 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1
 release:
@@ -896,7 +896,31 @@ sys/kern/kern_softint.c1.42
 
 sys/arch/sparc64/sparc64/ofw_machdep.c		1.45
 
-	Restrict the check for fully specified interrupts to machines with psycho
-	controllers only, and adjust comments to note this.
+	Restrict the check for fully specified interrupts to machines
+	with psycho controllers only, and adjust comments to note this.
 	[jdc, ticket #1069]
 
+sys/kern/vfs_vnode.c1.46 via patch
+
+	Take the vnode lock before the vnode is marked VI_CHANGING and fed
+	to vclean().  Prevents a deadlock with two null mounts on the same
+	physical mount where one thread tries to vclean() a layer node and
+	another thread tries to vget() a layer node pointing to the same
+	physical node.
+
+	Fixes PR kern/50375.
+	[hannken, ticket #1070]
+
+sys/arch/x86/include/cpufunc.h			1.19
+sys/arch/x86/x86/errata.c			1.23
+
+	Adapt prototypes and usage of rdmsr_locked() and wrmsr_locked() to
+	their implementation.  Both functions don't take the passcode as
+	argument.
+	[hannken, ticket #1073]
+
+etc/ssh/ssh_known_hosts1.9
+
+	Add keys for wip.pkgsrc.org.
+	[wiz, ticket #1074]
+

CVS commit: [netbsd-7] src/sys/external/bsd/drm2/include/linux

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed Jan 27 00:01:07 UTC 2016

Modified Files:
src/sys/external/bsd/drm2/include/linux [netbsd-7]: pci.h

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1077):
sys/external/bsd/drm2/include/linux/pci.h: revision 1.22
Use PCI ROM MD fallback if PCI ROM BAR points to invalid ROM.
We previously applied the PCI ROM MD fallback only if the PCI ROM BAR
was altogether unpopulated.  Some Radeon devices seem to have a
populated PCI ROM BAR pointing at a bogus ROM, while 0xc works
fine.
Fixes at least one manifestation of PR kern/49964.


To generate a diff of this commit:
cvs rdiff -u -r1.7.2.7 -r1.7.2.8 \
src/sys/external/bsd/drm2/include/linux/pci.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/external/bsd/drm2/include/linux/pci.h
diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.7.2.7 src/sys/external/bsd/drm2/include/linux/pci.h:1.7.2.8
--- src/sys/external/bsd/drm2/include/linux/pci.h:1.7.2.7	Thu Jul 30 15:46:41 2015
+++ src/sys/external/bsd/drm2/include/linux/pci.h	Wed Jan 27 00:01:07 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci.h,v 1.7.2.7 2015/07/30 15:46:41 snj Exp $	*/
+/*	$NetBSD: pci.h,v 1.7.2.8 2016/01/27 00:01:07 snj Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -496,6 +496,7 @@ pci_map_rom_md(struct pci_dev *pdev)
 	pdev->pd_rom_bst = pdev->pd_pa.pa_memt;
 	pdev->pd_rom_bsh = rom_bsh;
 	pdev->pd_rom_size = rom_size;
+	pdev->pd_kludges |= NBPCI_KLUDGE_MAP_ROM;
 
 	return 0;
 #else
@@ -512,9 +513,8 @@ pci_map_rom(struct pci_dev *pdev, size_t
 	if (pci_mapreg_map(>pd_pa, PCI_MAPREG_ROM, PCI_MAPREG_TYPE_ROM,
 		(BUS_SPACE_MAP_PREFETCHABLE | BUS_SPACE_MAP_LINEAR),
 		>pd_rom_bst, >pd_rom_bsh, NULL, >pd_rom_size)
-	!= 0 &&
-	pci_map_rom_md(pdev) != 0)
-		return NULL;
+	!= 0)
+		goto fail_mi;
 	pdev->pd_kludges |= NBPCI_KLUDGE_MAP_ROM;
 
 	/* XXX This type is obviously wrong in general...  */
@@ -522,14 +522,31 @@ pci_map_rom(struct pci_dev *pdev, size_t
 		pdev->pd_rom_size, PCI_ROM_CODE_TYPE_X86,
 		>pd_rom_found_bsh, >pd_rom_found_size)) {
 		pci_unmap_rom(pdev, NULL);
-		return NULL;
+		goto fail_mi;
 	}
+	goto success;
+
+fail_mi:
+	if (pci_map_rom_md(pdev) != 0)
+		goto fail_md;
 
+	/* XXX This type is obviously wrong in general...  */
+	if (pci_find_rom(>pd_pa, pdev->pd_rom_bst, pdev->pd_rom_bsh,
+		pdev->pd_rom_size, PCI_ROM_CODE_TYPE_X86,
+		>pd_rom_found_bsh, >pd_rom_found_size)) {
+		pci_unmap_rom(pdev, NULL);
+		goto fail_md;
+	}
+
+success:
 	KASSERT(pdev->pd_rom_found_size <= SIZE_T_MAX);
 	*sizep = pdev->pd_rom_found_size;
 	pdev->pd_rom_vaddr = bus_space_vaddr(pdev->pd_rom_bst,
 	pdev->pd_rom_found_bsh);
 	return pdev->pd_rom_vaddr;
+
+fail_md:
+	return NULL;
 }
 
 static inline void __pci_rom_iomem *

CVS commit: src/sys/fs/udf

[Reinoud Zandijk]

Module Name:src
Committed By:   reinoud
Date:   Wed Jan 27 00:06:49 UTC 2016

Modified Files:
src/sys/fs/udf: udf_subr.c

Log Message:
Fix filename creation and deleting with illegal file names. UDF has a
machanism for it but it allowed to create a file with a name it considered
illegal that then couldn't be deleted with the same name.

Fixes PR kern/50608. When confirmed, it can be closed.


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sys/fs/udf/udf_subr.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/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.135 src/sys/fs/udf/udf_subr.c:1.136
--- src/sys/fs/udf/udf_subr.c:1.135	Sat Dec 19 03:16:09 2015
+++ src/sys/fs/udf/udf_subr.c	Wed Jan 27 00:06:49 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.135 2015/12/19 03:16:09 dholland Exp $ */
+/* $NetBSD: udf_subr.c,v 1.136 2016/01/27 00:06:49 reinoud Exp $ */
 
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
 
 #include 
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.135 2015/12/19 03:16:09 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.136 2016/01/27 00:06:49 reinoud Exp $");
 #endif /* not lint */
 
 
@@ -4486,7 +4486,8 @@ udf_lookup_name_in_dir(struct vnode *vp,
 	struct dirhash   *dirh;
 	struct dirhash_entry *dirh_ep;
 	struct fileid_desc *fid;
-	struct dirent *dirent;
+	struct dirent *dirent, *s_dirent;
+	struct charspec osta_charspec;
 	uint64_t diroffset;
 	uint32_t lb_size;
 	int hit, error;
@@ -4504,18 +4505,28 @@ udf_lookup_name_in_dir(struct vnode *vp,
 	dirh = dir_node->dir_hash;
 
 	/* allocate temporary space for fid */
-	lb_size = udf_rw32(dir_node->ump->logical_vol->lb_size);
-	fid = malloc(lb_size, M_UDFTEMP, M_WAITOK);
-	dirent  = malloc(sizeof(struct dirent), M_UDFTEMP, M_WAITOK);
+	lb_size  = udf_rw32(dir_node->ump->logical_vol->lb_size);
+	fid  = malloc(lb_size, M_UDFTEMP, M_WAITOK);
+	dirent   = malloc(sizeof(struct dirent), M_UDFTEMP, M_WAITOK);
+	s_dirent = malloc(sizeof(struct dirent), M_UDFTEMP, M_WAITOK);
 
 	DPRINTF(DIRHASH, ("dirhash_lookup looking for `%*.*s`\n",
 		namelen, namelen, name));
 
+	/* convert given unix name to canonical unix name */
+	udf_osta_charset(_charspec);
+	unix_to_udf_name((char *) fid->data, >l_fi,
+		name, namelen, _charspec);
+	udf_to_unix_name(s_dirent->d_name, NAME_MAX,
+		(char *) fid->data, fid->l_fi,
+		_charspec);
+	s_dirent->d_namlen = strlen(s_dirent->d_name);
+
 	/* search our dirhash hits */
 	memset(icb_loc, 0, sizeof(*icb_loc));
 	dirh_ep = NULL;
 	for (;;) {
-		hit = dirhash_lookup(dirh, name, namelen, _ep);
+		hit = dirhash_lookup(dirh, s_dirent->d_name, s_dirent->d_namlen, _ep);
 		/* if no hit, abort the search */
 		if (!hit)
 			break;
@@ -4532,16 +4543,7 @@ udf_lookup_name_in_dir(struct vnode *vp,
 			dirent->d_namlen, dirent->d_namlen, dirent->d_name));
 
 		/* see if its our entry */
-#ifdef DIAGNOSTIC
-		if (dirent->d_namlen != namelen) {
-			printf("WARNING: dirhash_lookup() returned wrong "
-"d_namelen: %d and ought to be %d\n",
-dirent->d_namlen, namelen);
-			printf("\tlooked for `%s' and got `%s'\n",
-name, dirent->d_name);
-		}
-#endif
-		if (strncmp(dirent->d_name, name, namelen) == 0) {
+		if (strncmp(dirent->d_name, s_dirent->d_name, s_dirent->d_namlen) == 0) {
 			*found = 1;
 			*icb_loc = fid->icb;
 			break;
@@ -4549,6 +4551,7 @@ udf_lookup_name_in_dir(struct vnode *vp,
 	}
 	free(fid, M_UDFTEMP);
 	free(dirent, M_UDFTEMP);
+	free(s_dirent, M_UDFTEMP);
 
 	dirhash_put(dir_node->dir_hash);
 
@@ -4718,12 +4721,11 @@ udf_dir_detach(struct udf_mount *ump, st
 	struct dirhash_entry *dirh_ep;
 	struct file_entry*fe  = dir_node->fe;
 	struct fileid_desc *fid;
-	struct dirent *dirent;
+	struct dirent *dirent, *s_dirent;
+	struct charspec osta_charspec;
 	uint64_t diroffset;
 	uint32_t lb_size, fidsize;
 	int found, error;
-	char const *name  = cnp->cn_nameptr;
-	int namelen = cnp->cn_namelen;
 	int hit, refcnt;
 
 	/* get our dirhash and make sure its read in */
@@ -4740,16 +4742,26 @@ udf_dir_detach(struct udf_mount *ump, st
 		assert(dir_node->efe);
 	}
 
-	/* allocate temporary space for fid */
-	lb_size = udf_rw32(dir_node->ump->logical_vol->lb_size);
-	fid = malloc(lb_size, M_UDFTEMP, M_WAITOK);
-	dirent  = malloc(sizeof(struct dirent), M_UDFTEMP, M_WAITOK);
+	/* allocate temporary space for fid and dirents */
+	lb_size  = udf_rw32(dir_node->ump->logical_vol->lb_size);
+	fid  = malloc(lb_size, M_UDFTEMP, M_WAITOK);
+	dirent   = malloc(sizeof(struct dirent), M_UDFTEMP, M_WAITOK);
+	s_dirent = malloc(sizeof(struct dirent), M_UDFTEMP, M_WAITOK);
+
+	/* convert given unix name to canonical unix name */
+	udf_osta_charset(_charspec);
+	unix_to_udf_name((char *) fid->data, >l_fi,
+		cnp->cn_nameptr, cnp->cn_namelen, _charspec);
+	udf_to_unix_name(s_dirent->d_name, NAME_MAX,
+		(char *) fid->data, 

CVS commit: [netbsd-7] src/sys/dev/pci

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed Jan 27 00:26:18 UTC 2016

Modified Files:
src/sys/dev/pci [netbsd-7]: agp_i810.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1078):
sys/dev/pci/agp_i810.c: revision 1.120
sys/dev/pci/agp_i810.c: revision 1.121
CID 1328433: Anding with 0 and comparing != 0 will not work very will.
Fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.112.2.4 -r1.112.2.5 src/sys/dev/pci/agp_i810.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/agp_i810.c
diff -u src/sys/dev/pci/agp_i810.c:1.112.2.4 src/sys/dev/pci/agp_i810.c:1.112.2.5
--- src/sys/dev/pci/agp_i810.c:1.112.2.4	Fri Nov  6 22:55:10 2015
+++ src/sys/dev/pci/agp_i810.c	Wed Jan 27 00:26:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: agp_i810.c,v 1.112.2.4 2015/11/06 22:55:10 riz Exp $	*/
+/*	$NetBSD: agp_i810.c,v 1.112.2.5 2016/01/27 00:26:18 snj Exp $	*/
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.112.2.4 2015/11/06 22:55:10 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.112.2.5 2016/01/27 00:26:18 snj Exp $");
 
 #include 
 #include 
@@ -445,7 +445,7 @@ agp_i810_attach(device_t parent, device_
 	 */
 	mmadr_type = pci_mapreg_type(isc->vga_pa.pa_pc, isc->vga_pa.pa_tag,
 	mmadr_bar);
-	if ((mmadr_type & PCI_MAPREG_TYPE_MEM) != PCI_MAPREG_TYPE_MEM) {
+	if (PCI_MAPREG_TYPE(mmadr_type) != PCI_MAPREG_TYPE_MEM) {
 		aprint_error_dev(self, "non-memory device MMIO registers\n");
 		error = ENXIO;
 		goto fail1;

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed Jan 27 00:27:45 UTC 2016

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
1070, 1073, 1074, 1077, 1078


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.51 -r1.1.2.52 src/doc/CHANGES-7.1

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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.51 src/doc/CHANGES-7.1:1.1.2.52
--- src/doc/CHANGES-7.1:1.1.2.51	Tue Jan 26 04:57:58 2016
+++ src/doc/CHANGES-7.1	Wed Jan 27 00:27:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.51 2016/01/26 04:57:58 riz Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.52 2016/01/27 00:27:45 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -1828,7 +1828,43 @@ include/protocols/dumprestore.h			1.17
 
 sys/arch/sparc64/sparc64/ofw_machdep.c		1.45
 
-	Restrict the check for fully specified interrupts to machines with psycho
-	controllers only, and adjust comments to note this.
+	Restrict the check for fully specified interrupts to machines
+	with psycho controllers only, and adjust comments to note this.
 	[jdc, ticket #1069]
 
+sys/kern/vfs_vnode.c1.46 via patch
+
+	Take the vnode lock before the vnode is marked VI_CHANGING and fed
+	to vclean().  Prevents a deadlock with two null mounts on the same
+	physical mount where one thread tries to vclean() a layer node and
+	another thread tries to vget() a layer node pointing to the same
+	physical node.
+
+	Fixes PR kern/50375.
+	[hannken, ticket #1070]
+
+sys/arch/x86/include/cpufunc.h			1.19
+sys/arch/x86/x86/errata.c			1.23
+
+	Adapt prototypes and usage of rdmsr_locked() and wrmsr_locked() to
+	their implementation.  Both functions don't take the passcode as
+	argument.
+	[hannken, ticket #1073]
+
+etc/ssh/ssh_known_hosts1.9
+
+	Add keys for wip.pkgsrc.org.
+	[wiz, ticket #1074]
+
+sys/external/bsd/drm2/include/linux/pci.h	1.22
+
+	Use PCI ROM MD fallback if PCI ROM BAR points to invalid ROM.
+	Fixes at least one manifestation of PR kern/49964.
+	[riastradh, ticket #1077]
+
+sys/dev/pci/agp_i810.c1.120, 1.121
+
+	Fix a sanity check for PCI BARs in Intel graphics devices
+	(CID 1328433).
+	[riastradh, ticket #1078]
+