date:20140214

CVS commit: src/sys/fs/union

2014-02-14 Thread Juergen Hannken-Illjes

Module Name:src
Committed By:   hannken
Date:   Fri Feb 14 08:50:27 UTC 2014

Modified Files:
src/sys/fs/union: union.h union_subr.c

Log Message:
Member un_flags is unused now -- remove.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/fs/union/union.h
cvs rdiff -u -r1.61 -r1.62 src/sys/fs/union/union_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/union/union.h
diff -u src/sys/fs/union/union.h:1.25 src/sys/fs/union/union.h:1.26
--- src/sys/fs/union/union.h:1.25	Thu Feb 13 09:55:04 2014
+++ src/sys/fs/union/union.h	Fri Feb 14 08:50:27 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: union.h,v 1.25 2014/02/13 09:55:04 hannken Exp $	*/
+/*	$NetBSD: union.h,v 1.26 2014/02/14 08:50:27 hannken Exp $	*/
 
 /*
  * Copyright (c) 1994 The Regents of the University of California.
@@ -127,7 +127,6 @@ struct union_node {
 	struct vnode		*un_pvp;	/* v: Parent vnode */
 	char			*un_path;	/* v: saved component name */
 	int			un_openl;	/* v: # of opens on lowervp */
-	unsigned int		un_flags;	/* v: node flags */
 	unsigned int		un_cflags;	/* c: cache flags */
 	struct vnode		**un_dircache;	/* v: cached union stack */
 	off_t			un_uppersz;	/* l: size of upper object */

Index: src/sys/fs/union/union_subr.c
diff -u src/sys/fs/union/union_subr.c:1.61 src/sys/fs/union/union_subr.c:1.62
--- src/sys/fs/union/union_subr.c:1.61	Thu Feb 13 09:55:04 2014
+++ src/sys/fs/union/union_subr.c	Fri Feb 14 08:50:27 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: union_subr.c,v 1.61 2014/02/13 09:55:04 hannken Exp $	*/
+/*	$NetBSD: union_subr.c,v 1.62 2014/02/14 08:50:27 hannken Exp $	*/
 
 /*
  * Copyright (c) 1994
@@ -72,7 +72,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: union_subr.c,v 1.61 2014/02/13 09:55:04 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: union_subr.c,v 1.62 2014/02/14 08:50:27 hannken Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -550,7 +550,6 @@ found:
 		vref(undvp);
 	un-un_dircache = 0;
 	un-un_openl = 0;
-	un-un_flags = 0;
 	un-un_cflags = 0;
 
 	if (uppervp == NULL) {

CVS commit: src/sys/dev/pci

2014-02-14 Thread Nicolas Joly

Module Name:src
Committed By:   njoly
Date:   Fri Feb 14 13:25:19 UTC 2014

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
Regen for GeForce 210 High Definition Audio Controller.


To generate a diff of this commit:
cvs rdiff -u -r1.1175 -r1.1176 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1174 -r1.1175 src/sys/dev/pci/pcidevs_data.h

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

Modified files:

Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1175 src/sys/dev/pci/pcidevs.h:1.1176
--- src/sys/dev/pci/pcidevs.h:1.1175	Sun Jan 26 10:19:37 2014
+++ src/sys/dev/pci/pcidevs.h	Fri Feb 14 13:25:19 2014
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs.h,v 1.1175 2014/01/26 10:19:37 msaitoh Exp $	*/
+/*	$NetBSD: pcidevs.h,v 1.1176 2014/02/14 13:25:19 njoly Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1182 2014/01/26 10:19:07 msaitoh Exp
+ *	NetBSD: pcidevs,v 1.1183 2014/02/14 13:24:46 njoly Exp
  */
 
 /*
@@ -4530,6 +4530,7 @@
 #define	PCI_PRODUCT_NVIDIA_MCP79_AHCI_10	0x0abd		/* nForce MCP79 AHCI Controller */
 #define	PCI_PRODUCT_NVIDIA_MCP79_AHCI_11	0x0abe		/* nForce MCP79 AHCI Controller */
 #define	PCI_PRODUCT_NVIDIA_MCP79_AHCI_12	0x0abf		/* nForce MCP79 AHCI Controller */
+#define	PCI_PRODUCT_NVIDIA_GEFORCE_210_HDA	0x0be3		/* GeForce 210 High Definition Audio Controller */
 #define	PCI_PRODUCT_NVIDIA_GF116	0x1244		/* GeForce GTX 550 Ti */
 
 /* Nvidia  SGS-Thomson Microelectronics */

Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1174 src/sys/dev/pci/pcidevs_data.h:1.1175
--- src/sys/dev/pci/pcidevs_data.h:1.1174	Sun Jan 26 10:19:37 2014
+++ src/sys/dev/pci/pcidevs_data.h	Fri Feb 14 13:25:19 2014
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs_data.h,v 1.1174 2014/01/26 10:19:37 msaitoh Exp $	*/
+/*	$NetBSD: pcidevs_data.h,v 1.1175 2014/02/14 13:25:19 njoly Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1182 2014/01/26 10:19:07 msaitoh Exp
+ *	NetBSD: pcidevs,v 1.1183 2014/02/14 13:24:46 njoly Exp
  */
 
 /*
@@ -7579,6 +7579,8 @@ static const uint16_t pci_products[] = {
 	23830, 24197, 8268, 6239, 0,
 	PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP79_AHCI_12, 
 	23830, 24197, 8268, 6239, 0,
+	PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_GEFORCE_210_HDA, 
+	23569, 24193, 19683, 19688, 6838, 6239, 0,
 	PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_GF116, 
 	23569, 24203, 24207, 23867, 0,
 	PCI_VENDOR_NVIDIA_SGS, PCI_PRODUCT_NVIDIA_SGS_RIVA128, 
@@ -10312,7 +10314,7 @@ static const char pci_words[] = { . 
 	Escalade\0 /* 2 refs @ 6221 */
 	ATA\0 /* 51 refs @ 6230 */
 	RAID\0 /* 43 refs @ 6234 */
-	Controller\0 /* 865 refs @ 6239 */
+	Controller\0 /* 866 refs @ 6239 */
 	7000/8000\0 /* 1 refs @ 6250 */
 	Series\0 /* 116 refs @ 6260 */
 	9000\0 /* 5 refs @ 6267 */
@@ -10400,7 +10402,7 @@ static const char pci_words[] = { . 
 	SATA/Raid\0 /* 1 refs @ 6814 */
 	M5451\0 /* 1 refs @ 6824 */
 	AC-Link\0 /* 3 refs @ 6830 */
-	Audio\0 /* 91 refs @ 6838 */
+	Audio\0 /* 92 refs @ 6838 */
 	M5453\0 /* 1 refs @ 6844 */
 	M5455\0 /* 1 refs @ 6850 */
 	M7101\0 /* 1 refs @ 6856 */
@@ -12193,8 +12195,8 @@ static const char pci_words[] = { . 
 	82801FR\0 /* 1 refs @ 19661 */
 	82801FB/FR\0 /* 13 refs @ 19669 */
 	#2\0 /* 7 refs @ 19680 */
-	High\0 /* 22 refs @ 19683 */
-	Definition\0 /* 22 refs @ 19688 */
+	High\0 /* 23 refs @ 19683 */
+	Definition\0 /* 23 refs @ 19688 */
 	63xxESB\0 /* 20 refs @ 19699 */
 	#3\0 /* 6 refs @ 19707 */
 	#4\0 /* 5 refs @ 19710 */
@@ -12717,7 +12719,7 @@ static const char pci_words[] = { . 
 	Model\0 /* 1 refs @ 23554 */
 	64\0 /* 1 refs @ 23560 */
 	MCP04\0 /* 7 refs @ 23563 */
-	GeForce\0 /* 40 refs @ 23569 */
+	GeForce\0 /* 41 refs @ 23569 */
 	6800\0 /* 4 refs @ 23577 */
 	GT\0 /* 4 refs @ 23582 */
 	nForce4\0 /* 14 refs @ 23585 */
@@ -12821,7 +12823,7 @@ static const char pci_words[] = { . 
 	8400\0 /* 1 refs @ 24175 */
 	MCP77\0 /* 21 refs @ 24180 */
 	MCP78S\0 /* 1 refs @ 24186 */
-	210\0 /* 1 refs @ 24193 */
+	210\0 /* 2 refs @ 24193 */
 	MCP79\0 /* 17 refs @ 24197 */
 	GTX\0 /* 1 refs @ 24203 */
 	550\0 /* 2 refs @ 24207 */

CVS commit: src/sys/dev/pci

2014-02-14 Thread Nicolas Joly

Module Name:src
Committed By:   njoly
Date:   Fri Feb 14 13:24:46 UTC 2014

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
Add GeForce 210 High Definition Audio Controller.


To generate a diff of this commit:
cvs rdiff -u -r1.1182 -r1.1183 src/sys/dev/pci/pcidevs

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/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1182 src/sys/dev/pci/pcidevs:1.1183
--- src/sys/dev/pci/pcidevs:1.1182	Sun Jan 26 10:19:07 2014
+++ src/sys/dev/pci/pcidevs	Fri Feb 14 13:24:46 2014
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1182 2014/01/26 10:19:07 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1183 2014/02/14 13:24:46 njoly Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -4523,6 +4523,7 @@ product NVIDIA	MCP79_AHCI_9	0x0abc	nForc
 product NVIDIA	MCP79_AHCI_10	0x0abd	nForce MCP79 AHCI Controller
 product NVIDIA	MCP79_AHCI_11	0x0abe	nForce MCP79 AHCI Controller
 product NVIDIA	MCP79_AHCI_12	0x0abf	nForce MCP79 AHCI Controller
+product NVIDIA	GEFORCE_210_HDA	0x0be3	GeForce 210 High Definition Audio Controller
 product NVIDIA	GF116		0x1244	GeForce GTX 550 Ti
 
 /* Nvidia  SGS-Thomson Microelectronics */

CVS commit: src/sys/arch/mipsco/stand/common

2014-02-14 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Feb 14 16:04:44 UTC 2014

Modified Files:
src/sys/arch/mipsco/stand/common: boot.c

Log Message:
make sure kernel is initialized properly.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mipsco/stand/common/boot.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/mipsco/stand/common/boot.c
diff -u src/sys/arch/mipsco/stand/common/boot.c:1.9 src/sys/arch/mipsco/stand/common/boot.c:1.10
--- src/sys/arch/mipsco/stand/common/boot.c:1.9	Sat Jan 22 14:19:20 2011
+++ src/sys/arch/mipsco/stand/common/boot.c	Fri Feb 14 11:04:44 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.9 2011/01/22 19:19:20 joerg Exp $	*/
+/*	$NetBSD: boot.c,v 1.10 2014/02/14 16:04:44 christos Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -133,7 +133,9 @@ main(int argc, char **argv)
 			--argc;
 		}
 
-	}
+	} else
+		kernel = NULL;
+
 	if (dev == NULL) {
 		(void) devsplit(argv[0], bootname);
 		dev = bootname;
@@ -156,7 +158,7 @@ main(int argc, char **argv)
 			}
 		}
 	}
-	if (!win)
+	if (!win || !kernel)
 		goto fail;
 
 	strncpy(bi_bpath.bootpath, kernel, BTINFO_BOOTPATH_LEN);

CVS commit: src/sys/kern

2014-02-14 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Feb 14 16:35:40 UTC 2014

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

Log Message:
explain why the innocent sigaction1 call now works.


To generate a diff of this commit:
cvs rdiff -u -r1.374 -r1.375 src/sys/kern/kern_exec.c

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

Modified files:

Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.374 src/sys/kern/kern_exec.c:1.375
--- src/sys/kern/kern_exec.c:1.374	Sun Feb  2 09:50:46 2014
+++ src/sys/kern/kern_exec.c	Fri Feb 14 11:35:40 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_exec.c,v 1.374 2014/02/02 14:50:46 martin Exp $	*/
+/*	$NetBSD: kern_exec.c,v 1.375 2014/02/14 16:35:40 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_exec.c,v 1.374 2014/02/02 14:50:46 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_exec.c,v 1.375 2014/02/14 16:35:40 christos Exp $);
 
 #include opt_exec.h
 #include opt_execfmt.h
@@ -1977,6 +1977,16 @@ spawn_return(void *arg)
 		}
 
 		if (spawn_data-sed_attrs-sa_flags  POSIX_SPAWN_SETSIGDEF) {
+			/*
+			 * The following sigaction call is using a sigaction
+			 * version 0 trampoline which is in the compatibility
+			 * code only. This is not a problem because for SIG_DFL
+			 * and SIG_IGN, the trampolines are now ignored. If they
+			 * were not, this would be a problem because we are
+			 * holding the exec_lock, and the compat code needs
+			 * to do the same in order to replace the trampoline
+			 * code of the process.
+			 */
 			for (i = 1; i = NSIG; i++) {
 if (sigismember(
 spawn_data-sed_attrs-sa_sigdefault, i))

CVS commit: src/sys/kern

2014-02-14 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Feb 14 16:35:11 UTC 2014

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

Log Message:
Don't check trampolines for SIG_DFL or SIG_IGN since they are not used.
From gimpy.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/kern/sys_sig.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/sys_sig.c
diff -u src/sys/kern/sys_sig.c:1.41 src/sys/kern/sys_sig.c:1.42
--- src/sys/kern/sys_sig.c:1.41	Fri Mar  8 04:32:59 2013
+++ src/sys/kern/sys_sig.c	Fri Feb 14 11:35:11 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_sig.c,v 1.41 2013/03/08 09:32:59 apb Exp $	*/
+/*	$NetBSD: sys_sig.c,v 1.42 2014/02/14 16:35:11 christos Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_sig.c,v 1.41 2013/03/08 09:32:59 apb Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_sig.c,v 1.42 2014/02/14 16:35:11 christos Exp $);
 
 #include sys/param.h
 #include sys/kernel.h
@@ -389,16 +389,18 @@ sigaction1(struct lwp *l, int signum, co
 	 * Trampoline ABI version 0 is reserved for the legacy kernel
 	 * provided on-stack trampoline.  Conversely, if we are using a
 	 * non-0 ABI version, we must have a trampoline.  Only validate the
-	 * vers if a new sigaction was supplied. Emulations use legacy
-	 * kernel trampolines with version 0, alternatively check for that
-	 * too.
+	 * vers if a new sigaction was supplied and there was an actual
+	 * handler specified (not SIG_IGN or SIG_DFL), which don't require
+	 * a trampoline. Emulations use legacy kernel trampolines with
+	 * version 0, alternatively check for that too.
 	 *
 	 * If version  2, we try to autoload the compat module.  Note
 	 * that we interlock with the unload check in compat_modcmd()
 	 * using kernconfig_lock.  If the autoload fails, we don't try it
 	 * again for this process.
 	 */
-	if (nsa != NULL) {
+	if (nsa != NULL  nsa-sa_handler != SIG_IGN
+	 nsa-sa_handler != SIG_DFL) {
 		if (__predict_false(vers  2)) {
 			if (p-p_flag  PK_32)
 v0v1valid = true;

CVS commit: [matt-nb5-mips64] src/sys/kern

2014-02-14 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Fri Feb 14 18:31:49 UTC 2014

Modified Files:
src/sys/kern [matt-nb5-mips64]: vfs_subr.c

Log Message:
vpanic - vnpanic


To generate a diff of this commit:
cvs rdiff -u -r1.357.4.4.2.1.2.1 -r1.357.4.4.2.1.2.2 src/sys/kern/vfs_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/kern/vfs_subr.c
diff -u src/sys/kern/vfs_subr.c:1.357.4.4.2.1.2.1 src/sys/kern/vfs_subr.c:1.357.4.4.2.1.2.2
--- src/sys/kern/vfs_subr.c:1.357.4.4.2.1.2.1	Wed Apr 21 00:28:19 2010
+++ src/sys/kern/vfs_subr.c	Fri Feb 14 18:31:49 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_subr.c,v 1.357.4.4.2.1.2.1 2010/04/21 00:28:19 matt Exp $	*/
+/*	$NetBSD: vfs_subr.c,v 1.357.4.4.2.1.2.2 2014/02/14 18:31:49 matt Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_subr.c,v 1.357.4.4.2.1.2.1 2010/04/21 00:28:19 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_subr.c,v 1.357.4.4.2.1.2.2 2014/02/14 18:31:49 matt Exp $);
 
 #include opt_ddb.h
 #include opt_compat_netbsd.h
@@ -191,7 +191,7 @@ static void vrele_thread(void *);
 static void insmntque(vnode_t *, struct mount *);
 static int getdevvp(dev_t, vnode_t **, enum vtype);
 static vnode_t *getcleanvnode(void);;
-void vpanic(vnode_t *, const char *);
+void vnpanic(vnode_t *, const char *);
 
 #ifdef DEBUG 
 void printlockedvnodes(void);
@@ -199,14 +199,14 @@ void printlockedvnodes(void);
 
 #ifdef DIAGNOSTIC
 void
-vpanic(vnode_t *vp, const char *msg)
+vnpanic(vnode_t *vp, const char *msg)
 {
 
 	vprint(NULL, vp);
 	panic(%s\n, msg);
 }
 #else
-#define	vpanic(vp, msg)	/* nothing */
+#define	vnpanic(vp, msg)	/* nothing */
 #endif
 
 void
@@ -333,14 +333,14 @@ try_nextlist:
 		 * lists.
 		 */
 		if (vp-v_usecount != 0) {
-			vpanic(vp, free vnode isn't);
+			vnpanic(vp, free vnode isn't);
 		}
 		if ((vp-v_iflag  VI_CLEAN) != 0) {
-			vpanic(vp, clean vnode on freelist);
+			vnpanic(vp, clean vnode on freelist);
 		}
 		if (vp-v_freelisthd != listhd) {
 			printf(vnode sez %p, listhd %p\n, vp-v_freelisthd, listhd);
-			vpanic(vp, list head mismatch);
+			vnpanic(vp, list head mismatch);
 		}
 		if (!mutex_tryenter(vp-v_interlock))
 			continue;
@@ -411,13 +411,13 @@ try_nextlist:
 
 	if (vp-v_data != NULL || vp-v_uobj.uo_npages != 0 ||
 	!TAILQ_EMPTY(vp-v_uobj.memq)) {
-		vpanic(vp, cleaned vnode isn't);
+		vnpanic(vp, cleaned vnode isn't);
 	}
 	if (vp-v_numoutput != 0) {
-		vpanic(vp, clean vnode has pending I/O's);
+		vnpanic(vp, clean vnode has pending I/O's);
 	}
 	if ((vp-v_iflag  VI_ONWORKLST) != 0) {
-		vpanic(vp, clean vnode on syncer list);
+		vnpanic(vp, clean vnode on syncer list);
 	}
 
 	return vp;
@@ -1376,7 +1376,7 @@ vrelel(vnode_t *vp, int flags)
 
 	if (__predict_false(vp-v_op == dead_vnodeop_p 
 	(vp-v_iflag  (VI_CLEAN|VI_XLOCK)) == 0)) {
-		vpanic(vp, dead but not clean);
+		vnpanic(vp, dead but not clean);
 	}
 
 	/*
@@ -1389,7 +1389,7 @@ vrelel(vnode_t *vp, int flags)
 		return;
 	}
 	if (vp-v_usecount = 0 || vp-v_writecount != 0) {
-		vpanic(vp, vrelel: bad ref count);
+		vnpanic(vp, vrelel: bad ref count);
 	}
 
 	KASSERT((vp-v_iflag  VI_XLOCK) == 0);
@@ -1421,7 +1421,7 @@ vrelel(vnode_t *vp, int flags)
 			LK_RETRY);
 			if (error != 0) {
 /* XXX */
-vpanic(vp, vrele: unable to lock %p);
+vnpanic(vp, vrele: unable to lock %p);
 			}
 			mutex_enter(vp-v_interlock);
 			/*
@@ -1642,7 +1642,7 @@ holdrelel(vnode_t *vp)
 	KASSERT((vp-v_iflag  VI_MARKER) == 0);
 
 	if (vp-v_holdcnt = 0) {
-		vpanic(vp, holdrelel: holdcnt vp %p);
+		vnpanic(vp, holdrelel: holdcnt vp %p);
 	}
 
 	vp-v_holdcnt--;
@@ -1891,7 +1891,7 @@ vclean(vnode_t *vp, int flags)
 
 	/* Disassociate the underlying file system from the vnode. */
 	if (VOP_RECLAIM(vp)) {
-		vpanic(vp, vclean: cannot reclaim);
+		vnpanic(vp, vclean: cannot reclaim);
 	}
 
 	KASSERT(vp-v_uobj.uo_npages == 0);

CVS commit: [matt-nb5-mips64] src/sys

2014-02-14 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Fri Feb 14 18:35:15 UTC 2014

Modified Files:
src/sys/conf [matt-nb5-mips64]: files
src/sys/dev/ic [matt-nb5-mips64]: comreg.h

Log Message:
defparam COM_TOLERANCE


To generate a diff of this commit:
cvs rdiff -u -r1.924.4.1.4.3 -r1.924.4.1.4.4 src/sys/conf/files
cvs rdiff -u -r1.15 -r1.15.18.1 src/sys/dev/ic/comreg.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/conf/files
diff -u src/sys/conf/files:1.924.4.1.4.3 src/sys/conf/files:1.924.4.1.4.4
--- src/sys/conf/files:1.924.4.1.4.3	Wed Nov 13 22:39:58 2013
+++ src/sys/conf/files	Fri Feb 14 18:35:15 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.924.4.1.4.3 2013/11/13 22:39:58 matt Exp $
+#	$NetBSD: files,v 1.924.4.1.4.4 2014/02/14 18:35:15 matt Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20080610
@@ -804,6 +804,7 @@ defflag	opt_com.h		COM_DEBUG
 # XXX In a perfect world, this would be done with attributes
 defflag	opt_com.h		COM_16650 COM_HAYESP COM_PXA2X0 COM_AU1X00
 COM_REGMAP
+defparam opt_com.h		COM_TOLERANCE
 device	com { } : tty
 file	dev/ic/com.c			com			needs-flag
 

Index: src/sys/dev/ic/comreg.h
diff -u src/sys/dev/ic/comreg.h:1.15 src/sys/dev/ic/comreg.h:1.15.18.1
--- src/sys/dev/ic/comreg.h:1.15	Mon Apr 28 22:00:01 2008
+++ src/sys/dev/ic/comreg.h	Fri Feb 14 18:35:15 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: comreg.h,v 1.15 2008/04/28 22:00:01 matt Exp $	*/
+/*	$NetBSD: comreg.h,v 1.15.18.1 2014/02/14 18:35:15 matt Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -33,8 +33,14 @@
 
 #include dev/ic/ns16550reg.h
 
+#ifdef _KERNEL_OPT
+#include opt_com.h
+#endif
+
 #define	COM_FREQ	1843200	/* 16-bit baud rate divisor */
+#ifndef COM_TOLERANCE
 #define	COM_TOLERANCE	30	/* baud rate tolerance, in 0.1% units */
+#endif
 
 /* interrupt enable register */
 #define	IER_ERXRDY	0x1	/* Enable receiver interrupt */

CVS commit: [matt-nb5-mips64] src/sys/conf

2014-02-14 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Fri Feb 14 18:36:14 UTC 2014

Modified Files:
src/sys/conf [matt-nb5-mips64]: Makefile.kern.inc

Log Message:
SYSTEM_DEP?= - SYSTEM_DEP+=
Add KERNLDSCRIPT to SYSTEM_DEP


To generate a diff of this commit:
cvs rdiff -u -r1.118.4.2.4.3 -r1.118.4.2.4.4 src/sys/conf/Makefile.kern.inc

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

Modified files:

Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.118.4.2.4.3 src/sys/conf/Makefile.kern.inc:1.118.4.2.4.4
--- src/sys/conf/Makefile.kern.inc:1.118.4.2.4.3	Wed Jan 27 07:28:09 2010
+++ src/sys/conf/Makefile.kern.inc	Fri Feb 14 18:36:14 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.kern.inc,v 1.118.4.2.4.3 2010/01/27 07:28:09 matt Exp $
+#	$NetBSD: Makefile.kern.inc,v 1.118.4.2.4.4 2014/02/14 18:36:14 matt Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -198,7 +198,10 @@ ${_cfile:T:R}.o: ${_cfile}
 #	${SYSTEM_LD} swapxxx.o
 #	${SYSTEM_LD_TAIL}
 SYSTEM_OBJ?=	${MD_OBJS} ${MI_OBJS} ${OBJS} ${SYSLIBCOMPAT} ${LIBKERN}
-SYSTEM_DEP?=	Makefile ${SYSTEM_OBJ:O} .gdbinit
+SYSTEM_DEP+=	Makefile ${SYSTEM_OBJ:O} .gdbinit
+.if defined(KERNLDSCRIPT)
+SYSTEM_DEP+=	${KERNLDSCRIPT} 
+.endif
 SYSTEM_LD_HEAD?=@rm -f $@
 SYSTEM_LD?=	@${_MKSHMSG}link  ${.CURDIR:T}/${.TARGET}; \
 		${_MKSHECHO}\

CVS commit: [matt-nb5-mips64] src/sys

2014-02-14 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Fri Feb 14 18:38:16 UTC 2014

Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: mips_softint.c pmap.c
pmap_tlb.c vm_machdep.c
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_intr.c rmixl_nand_pci.c
src/sys/dev/ic [matt-nb5-mips64]: siisata.c
src/sys/kern [matt-nb5-mips64]: subr_prf.c
src/sys/lib/libkern [matt-nb5-mips64]: __assert.c libkern.h
src/sys/sys [matt-nb5-mips64]: cdefs.h systm.h

Log Message:
Change KASSERTMSG/KDASSERTMSG to use varadic arguments like HEAD.
panic - vpanic, add panic wrapper to vpanic.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/arch/mips/mips/mips_softint.c
cvs rdiff -u -r1.179.16.46 -r1.179.16.47 src/sys/arch/mips/mips/pmap.c
cvs rdiff -u -r1.1.2.24 -r1.1.2.25 src/sys/arch/mips/mips/pmap_tlb.c
cvs rdiff -u -r1.121.6.1.2.30 -r1.121.6.1.2.31 \
src/sys/arch/mips/mips/vm_machdep.c
cvs rdiff -u -r1.1.2.38 -r1.1.2.39 src/sys/arch/mips/rmi/rmixl_intr.c
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/mips/rmi/rmixl_nand_pci.c
cvs rdiff -u -r1.2.14.2 -r1.2.14.3 src/sys/dev/ic/siisata.c
cvs rdiff -u -r1.124.4.1.4.1 -r1.124.4.1.4.2 src/sys/kern/subr_prf.c
cvs rdiff -u -r1.11 -r1.11.40.1 src/sys/lib/libkern/__assert.c
cvs rdiff -u -r1.82.8.4 -r1.82.8.5 src/sys/lib/libkern/libkern.h
cvs rdiff -u -r1.69.10.1 -r1.69.10.2 src/sys/sys/cdefs.h
cvs rdiff -u -r1.228.4.2.4.3 -r1.228.4.2.4.4 src/sys/sys/systm.h

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

Modified files:

Index: src/sys/arch/mips/mips/mips_softint.c
diff -u src/sys/arch/mips/mips/mips_softint.c:1.1.2.8 src/sys/arch/mips/mips/mips_softint.c:1.1.2.9
--- src/sys/arch/mips/mips/mips_softint.c:1.1.2.8	Fri Apr 29 08:26:29 2011
+++ src/sys/arch/mips/mips/mips_softint.c	Fri Feb 14 18:38:15 2014
@@ -28,7 +28,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mips_softint.c,v 1.1.2.8 2011/04/29 08:26:29 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: mips_softint.c,v 1.1.2.9 2014/02/14 18:38:15 matt Exp $);
 
 #include sys/param.h
 #include sys/cpu.h
@@ -103,7 +103,7 @@ softint_trigger(uintptr_t si)
 		softint_fast_dispatch(ci-ci_softlwps[SOFTINT_##level], \
 		IPL_SOFT##level); \
 		KASSERT(ci-ci_softlwps[SOFTINT_##level]-l_ctxswtch == 0); \
-		KASSERTMSG(ci-ci_cpl == IPL_HIGH, (cpl (%d) != HIGH, ci-ci_cpl)); \
+		KASSERTMSG(ci-ci_cpl == IPL_HIGH, cpl (%d) != HIGH, ci-ci_cpl); \
 		continue; \
 	}
 
@@ -117,8 +117,8 @@ softint_process(uint32_t ipending)
 	KASSERT((ipending  ~MIPS_SOFT_INT_MASK) == 0);
 	KASSERT(ci-ci_cpl == IPL_HIGH);
 	KASSERTMSG(ci-ci_mtx_count == 0,
-	(%s: cpu%u (%p): ci_mtx_count (%d) != 0,
-	 __func__, cpu_index(ci), ci, ci-ci_mtx_count));
+	%s: cpu%u (%p): ci_mtx_count (%d) != 0,
+	 __func__, cpu_index(ci), ci, ci-ci_mtx_count);
 
 	if (ipending  MIPS_SOFT_INT_MASK_0) {
 		/*

Index: src/sys/arch/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.179.16.46 src/sys/arch/mips/mips/pmap.c:1.179.16.47
--- src/sys/arch/mips/mips/pmap.c:1.179.16.46	Sat Aug  4 07:20:31 2012
+++ src/sys/arch/mips/mips/pmap.c	Fri Feb 14 18:38:16 2014
@@ -1446,8 +1446,8 @@ pmap_enter(pmap_t pmap, vaddr_t va, padd
 #endif
 	const bool good_color = PMAP_PAGE_COLOROK_P(pa, va);
 	KASSERTMSG(good_color,
-	(%s(%p, %#PRIxVADDR, %#PRIxPADDR, %x, %x): color mismatch\n,
-	 __func__, pmap, va, pa, prot, flags));
+	%s(%p, %#PRIxVADDR, %#PRIxPADDR, %x, %x): color mismatch\n,
+	__func__, pmap, va, pa, prot, flags);
 	if (kernel_pmap_p) {
 		PMAP_COUNT(kernel_mappings);
 		if (!good_color)
@@ -1673,8 +1673,8 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
 #endif
 	PMAP_COUNT(kenter_pa);
 	KASSERTMSG(!managed || PMAP_PAGE_COLOROK_P(pa, va),
-	(%s(%#PRIxVADDR, %#PRIxPADDR, %x): color mismatch\n,
-	 __func__, va, pa, prot));
+	%s(%#PRIxVADDR, %#PRIxPADDR, %x): color mismatch\n,
+	__func__, va, pa, prot);
 	if (!PMAP_PAGE_COLOROK_P(pa, va)  managed) {
 		PMAP_COUNT(kenter_pa_bad);
 	}

Index: src/sys/arch/mips/mips/pmap_tlb.c
diff -u src/sys/arch/mips/mips/pmap_tlb.c:1.1.2.24 src/sys/arch/mips/mips/pmap_tlb.c:1.1.2.25
--- src/sys/arch/mips/mips/pmap_tlb.c:1.1.2.24	Mon Jul  9 17:23:37 2012
+++ src/sys/arch/mips/mips/pmap_tlb.c	Fri Feb 14 18:38:16 2014
@@ -453,8 +453,8 @@ pmap_tlb_shootdown_process(void)
 #if 0
 	KASSERT(cpu_intr_p());
 	KASSERTMSG(ci-ci_cpl = IPL_SCHED,
-	(%s: cpl (%d)  IPL_SCHED (%d),
-	__func__, ci-ci_cpl, IPL_SCHED));
+	%s: cpl (%d)  IPL_SCHED (%d),
+	__func__, ci-ci_cpl, IPL_SCHED);
 #endif
 	TLBINFO_LOCK(ti);
 
@@ -862,8 +862,8 @@ pmap_tlb_asid_deactivate(pmap_t pm)
 		const uint32_t cpu_mask = 1  cpu_index(ci);
 		KASSERT(!cpu_intr_p());
 		KASSERTMSG(pm-pm_onproc  cpu_mask,
-		(%s: pmap %p onproc %#x doesn't include cpu %d (%p),
-		__func__, pm, pm-pm_onproc, cpu_index(ci), ci));
+		%s: pmap %p onproc %#x doesn't include cpu %d

CVS commit: src/tests/libexec/ld.elf_so

2014-02-14 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Fri Feb 14 20:33:32 UTC 2014

Modified Files:
src/tests/libexec/ld.elf_so/helper_symver_dso1: Makefile
src/tests/libexec/ld.elf_so/helper_symver_dso2: Makefile

Log Message:
ARM now works with integrated-as.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile

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

Modified files:

Index: src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile:1.2 src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile:1.3
--- src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile:1.2	Wed Dec 25 22:26:35 2013
+++ src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile	Fri Feb 14 20:33:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/12/25 22:26:35 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2014/02/14 20:33:32 joerg Exp $
 
 .include bsd.own.mk
 
@@ -20,10 +20,5 @@ FILESDIR=	${TESTSBASE}/libexec/ld.elf_so
 
 LDFLAGS.lib${LIB} += -Wl,--version-script=${.CURDIR}/h_helper_symver_dso1.map
 
-.if !empty(MACHINE_ARCH:M*arm*)
-# LLVM PR 18273
-COPTS.h_helper_symver_dso1.c=	${${ACTIVE_CC} == clang:?-no-integrated-as :}
-.endif
-
 .include bsd.lib.mk
 

Index: src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile:1.2 src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile:1.3
--- src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile:1.2	Wed Dec 25 22:26:35 2013
+++ src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile	Fri Feb 14 20:33:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/12/25 22:26:35 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2014/02/14 20:33:32 joerg Exp $
 
 .include bsd.own.mk
 
@@ -20,9 +20,4 @@ FILESDIR=	${TESTSBASE}/libexec/ld.elf_so
 
 LDFLAGS.lib${LIB} += -Wl,--version-script=${.CURDIR}/h_helper_symver_dso2.map
 
-.if !empty(MACHINE_ARCH:M*arm*)
-# LLVM PR 18273
-COPTS.h_helper_symver_dso2.c=	${${ACTIVE_CC} == clang:?-no-integrated-as :}
-.endif
-
 .include bsd.lib.mk

CVS commit: src/external/bsd/llvm/lib/libLLVMLineEditor

2014-02-14 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Fri Feb 14 20:32:58 UTC 2014

Added Files:
src/external/bsd/llvm/lib/libLLVMLineEditor: Makefile

Log Message:
Build glue for the libedit wrapper, not yet used.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libLLVMLineEditor/Makefile

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

Added files:

Index: src/external/bsd/llvm/lib/libLLVMLineEditor/Makefile
diff -u /dev/null src/external/bsd/llvm/lib/libLLVMLineEditor/Makefile:1.1
--- /dev/null	Fri Feb 14 20:32:58 2014
+++ src/external/bsd/llvm/lib/libLLVMLineEditor/Makefile	Fri Feb 14 20:32:58 2014
@@ -0,0 +1,15 @@
+#	$NetBSD: Makefile,v 1.1 2014/02/14 20:32:58 joerg Exp $
+
+LIB=	LLVMLineEditor
+
+.include bsd.init.mk
+
+.PATH: ${LLVM_SRCDIR}/lib/LineEditor
+
+SRCS+=	LineEditor.cpp
+
+.if defined(HOSTLIB)
+.include bsd.hostlib.mk
+.else
+.include bsd.lib.mk
+.endif

CVS commit: src/sys/arch/i386/stand/lib

2014-02-14 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Fri Feb 14 20:34:28 UTC 2014

Modified Files:
src/sys/arch/i386/stand/lib: Makefile

Log Message:
Only realprot.S still needs to be built with GNU as.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/i386/stand/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/sys/arch/i386/stand/lib/Makefile
diff -u src/sys/arch/i386/stand/lib/Makefile:1.36 src/sys/arch/i386/stand/lib/Makefile:1.37
--- src/sys/arch/i386/stand/lib/Makefile:1.36	Fri Aug 10 12:18:15 2012
+++ src/sys/arch/i386/stand/lib/Makefile	Fri Feb 14 20:34:27 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.36 2012/08/10 12:18:15 joerg Exp $
+#	$NetBSD: Makefile,v 1.37 2014/02/14 20:34:27 joerg Exp $
 
 S?=	${.CURDIR}/../../../..
 
@@ -11,27 +11,6 @@ I386_INCLUDE_DOS?= no
 I386_INCLUDE_BUS?= no
 I386_INCLUDE_PS2?= yes
 
-AFLAGS.biosdelay.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.biosgetrtc.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.biosgetsystime.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.biosmca.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.biosmemps2.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.biosmem.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.biosmemx.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.biosreboot.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.biosvbe.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.biosvideomode.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.bios_disk.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.bios_pci.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.comio.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.conio.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.dos_file.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.dump_eax.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.message.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.message32.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.pvcopy.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.putstr.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
-AFLAGS.putstr32.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
 AFLAGS.realprot.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
 
 CPPFLAGS= -I$S/lib/libsa ${I386CPPFLAGS} ${I386MISCCPPFLAGS}

CVS commit: src/usr.bin/fstat

2014-02-14 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Feb 14 20:43:35 UTC 2014

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

Log Message:
fix protocol printing order.


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/usr.bin/fstat/fstat.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/fstat/fstat.c
diff -u src/usr.bin/fstat/fstat.c:1.107 src/usr.bin/fstat/fstat.c:1.108
--- src/usr.bin/fstat/fstat.c:1.107	Thu Jan 16 22:28:01 2014
+++ src/usr.bin/fstat/fstat.c	Fri Feb 14 15:43:34 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: fstat.c,v 1.107 2014/01/17 03:28:01 christos Exp $	*/
+/*	$NetBSD: fstat.c,v 1.108 2014/02/14 20:43:34 christos Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19
 #if 0
 static char sccsid[] = @(#)fstat.c	8.3 (Berkeley) 5/2/95;
 #else
-__RCSID($NetBSD: fstat.c,v 1.107 2014/01/17 03:28:01 christos Exp $);
+__RCSID($NetBSD: fstat.c,v 1.108 2014/02/14 20:43:34 christos Exp $);
 #endif
 #endif /* not lint */
 
@@ -158,8 +158,8 @@ static const char *const dtypes[] = {
 static void	dofiles(struct kinfo_proc2 *);
 static int	ext2fs_filestat(struct vnode *, struct filestat *);
 static int	getfname(const char *);
-static void	getinetproto(int);
-static void	getatproto(int);
+static void	getinetproto(char *, size_t, int);
+static void	getatproto(char *, size_t, int);
 static char   *getmnton(struct mount *);
 static const char   *layer_filestat(struct vnode *, struct filestat *);
 static int	msdosfs_filestat(struct vnode *, struct filestat *);
@@ -1009,8 +1009,9 @@ socktrans(struct socket *sock, int i)
 	struct ddpcb	ddpcb;
 	int len;
 	char dname[32];
-	char lbuf[512], fbuf[512];
+	char lbuf[512], fbuf[512], pbuf[24];
 
+	pbuf[0] = '\0';
 	/* fill in socket */
 	if (!KVM_READ(sock, so, sizeof(struct socket))) {
 		dprintf(can't read sock at %p, sock);
@@ -1055,7 +1056,7 @@ socktrans(struct socket *sock, int i)
 	lbuf[0] = '\0';
 	switch(dom.dom_family) {
 	case AF_INET:
-		getinetproto(proto.pr_protocol);
+		getinetproto(pbuf, sizeof(pbuf), proto.pr_protocol);
 		switch (proto.pr_protocol) {
 		case IPPROTO_TCP:
 		case IPPROTO_UDP:
@@ -1077,7 +1078,7 @@ socktrans(struct socket *sock, int i)
 		break;
 #ifdef INET6
 	case AF_INET6:
-		getinetproto(proto.pr_protocol);
+		getinetproto(pbuf, sizeof(pbuf), proto.pr_protocol);
 		switch (proto.pr_protocol) {
 		case IPPROTO_TCP:
 		case IPPROTO_UDP:
@@ -1163,7 +1164,7 @@ again:
 		}
 		break;
 	case AF_APPLETALK:
-		getatproto(proto.pr_protocol);
+		getatproto(pbuf, sizeof(pbuf), proto.pr_protocol);
 		if (so.so_pcb) {
 			if (kvm_read(kd, (u_long)so.so_pcb, (char *)ddpcb,
 			sizeof(ddpcb)) != sizeof(ddpcb)){
@@ -1186,6 +1187,8 @@ again:
 	else
 		(void)printf(* %s %s, dname, stypename[so.so_type]);
 
+	if (pbuf[0])
+		printf(%s, pbuf);
 	if (fbuf[0] || lbuf[0])
 		printf( %s%s%s, fbuf, (fbuf[0]  lbuf[0]) ?  -  : ,
 		lbuf);
@@ -1236,7 +1239,7 @@ misctrans(struct file *file, int i)
  *	print name of protocol number
  */
 static void
-getinetproto(int number)
+getinetproto(char *buf, size_t len, int number)
 {
 	const char *cp;
 
@@ -1262,10 +1265,10 @@ getinetproto(int number)
 	case IPPROTO_ICMPV6:
 		cp =icmp6; break;
 	default:
-		(void)printf( %d, number);
+		(void)snprintf(buf, len,  %d, number);
 		return;
 	}
-	(void)printf( %s, cp);
+	(void)snprintf(buf, len,  %s, cp);
 }
 
 /*
@@ -1273,7 +1276,7 @@ getinetproto(int number)
  *	print name of protocol number
  */
 static void
-getatproto(int number)
+getatproto(char *buf, size_t len, int number)
 {
 	const char *cp;
 
@@ -1283,10 +1286,10 @@ getatproto(int number)
 	case ATPROTO_AARP:
 		cp =aarp; break;
 	default:
-		(void)printf( %d, number);
+		(void)snprintf(buf, len,  %d, number);
 		return;
 	}
-	(void)printf( %s, cp);
+	(void)snprintf(buf, len,  %s, cp);
 }
 
 static int

CVS commit: src/doc

2014-02-14 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Fri Feb 14 20:35:20 UTC 2014

Modified Files:
src/doc: TODO.clang

Log Message:
Update hacks.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/doc/TODO.clang

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

Modified files:

Index: src/doc/TODO.clang
diff -u src/doc/TODO.clang:1.7 src/doc/TODO.clang:1.8
--- src/doc/TODO.clang:1.7	Wed Jan 15 22:25:22 2014
+++ src/doc/TODO.clang	Fri Feb 14 20:35:20 2014
@@ -1,14 +1,10 @@
-$NetBSD: TODO.clang,v 1.7 2014/01/15 22:25:22 joerg Exp $
+$NetBSD: TODO.clang,v 1.8 2014/02/14 20:35:20 joerg Exp $
 
 Hacks for the clang integration
 ---
 
--no-integrated-as in src/sys/arch/amd64 and src/sys/arch/i386
-to compensate for the incomplete explicit positioning support in LLVM MC.
-
-LLVM PR 18273 and -no-integrated-as as workaround:
-src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile
-src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile
+-no-integrated-as is unsed in src/sys/arch/i386/stand to compensate
+for the incomplete explicit positioning support in LLVM MC.
 
 Missing atomic support in ARM libgcc, -march=armv6 workaround:
 src/external/bsd/libc++/lib

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

2014-02-14 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Fri Feb 14 23:21:20 UTC 2014

Modified Files:
src/sys/kern [netbsd-6]: exec_elf.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1028):
sys/kern/exec_elf.c: revision 1.55
Fix memory leak.
ok christos@ agc@


To generate a diff of this commit:
cvs rdiff -u -r1.37.2.1 -r1.37.2.2 src/sys/kern/exec_elf.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/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.37.2.1 src/sys/kern/exec_elf.c:1.37.2.2
--- src/sys/kern/exec_elf.c:1.37.2.1	Thu Apr 12 17:05:36 2012
+++ src/sys/kern/exec_elf.c	Fri Feb 14 23:21:20 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_elf.c,v 1.37.2.1 2012/04/12 17:05:36 riz Exp $	*/
+/*	$NetBSD: exec_elf.c,v 1.37.2.2 2014/02/14 23:21:20 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.37.2.1 2012/04/12 17:05:36 riz Exp $);
+__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.37.2.2 2014/02/14 23:21:20 bouyer Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_pax.h
@@ -820,6 +820,7 @@ exec_elf_makecmds(struct lwp *l, struct 
 
 		if ((error = elf_load_file(l, epp, interp,
 		epp-ep_vmcmds, interp_offset, ap, pos)) != 0) {
+			kmem_free(ap, sizeof(*ap));
 			goto bad;
 		}
 		ap-arg_interp = epp-ep_vmcmds.evs_cmds[j].ev_addr;

CVS commit: [netbsd-6-1] src/sys/kern

2014-02-14 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Fri Feb 14 23:21:25 UTC 2014

Modified Files:
src/sys/kern [netbsd-6-1]: exec_elf.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1028):
sys/kern/exec_elf.c: revision 1.55
Fix memory leak.
ok christos@ agc@


To generate a diff of this commit:
cvs rdiff -u -r1.37.2.1 -r1.37.2.1.6.1 src/sys/kern/exec_elf.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/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.37.2.1 src/sys/kern/exec_elf.c:1.37.2.1.6.1
--- src/sys/kern/exec_elf.c:1.37.2.1	Thu Apr 12 17:05:36 2012
+++ src/sys/kern/exec_elf.c	Fri Feb 14 23:21:25 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_elf.c,v 1.37.2.1 2012/04/12 17:05:36 riz Exp $	*/
+/*	$NetBSD: exec_elf.c,v 1.37.2.1.6.1 2014/02/14 23:21:25 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.37.2.1 2012/04/12 17:05:36 riz Exp $);
+__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.37.2.1.6.1 2014/02/14 23:21:25 bouyer Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_pax.h
@@ -820,6 +820,7 @@ exec_elf_makecmds(struct lwp *l, struct 
 
 		if ((error = elf_load_file(l, epp, interp,
 		epp-ep_vmcmds, interp_offset, ap, pos)) != 0) {
+			kmem_free(ap, sizeof(*ap));
 			goto bad;
 		}
 		ap-arg_interp = epp-ep_vmcmds.evs_cmds[j].ev_addr;

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

2014-02-14 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Fri Feb 14 23:21:28 UTC 2014

Modified Files:
src/sys/kern [netbsd-6-0]: exec_elf.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1028):
sys/kern/exec_elf.c: revision 1.55
Fix memory leak.
ok christos@ agc@


To generate a diff of this commit:
cvs rdiff -u -r1.37.2.1 -r1.37.2.1.4.1 src/sys/kern/exec_elf.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/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.37.2.1 src/sys/kern/exec_elf.c:1.37.2.1.4.1
--- src/sys/kern/exec_elf.c:1.37.2.1	Thu Apr 12 17:05:36 2012
+++ src/sys/kern/exec_elf.c	Fri Feb 14 23:21:28 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_elf.c,v 1.37.2.1 2012/04/12 17:05:36 riz Exp $	*/
+/*	$NetBSD: exec_elf.c,v 1.37.2.1.4.1 2014/02/14 23:21:28 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.37.2.1 2012/04/12 17:05:36 riz Exp $);
+__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.37.2.1.4.1 2014/02/14 23:21:28 bouyer Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_pax.h
@@ -820,6 +820,7 @@ exec_elf_makecmds(struct lwp *l, struct 
 
 		if ((error = elf_load_file(l, epp, interp,
 		epp-ep_vmcmds, interp_offset, ap, pos)) != 0) {
+			kmem_free(ap, sizeof(*ap));
 			goto bad;
 		}
 		ap-arg_interp = epp-ep_vmcmds.evs_cmds[j].ev_addr;

CVS commit: [netbsd-6-1] src/doc

2014-02-14 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Fri Feb 14 23:27:46 UTC 2014

Modified Files:
src/doc [netbsd-6-1]: CHANGES-6.1.4

Log Message:
ticket 1028


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/doc/CHANGES-6.1.4

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-6.1.4
diff -u src/doc/CHANGES-6.1.4:1.1.2.2 src/doc/CHANGES-6.1.4:1.1.2.3
--- src/doc/CHANGES-6.1.4:1.1.2.2	Mon Feb  3 11:57:55 2014
+++ src/doc/CHANGES-6.1.4	Fri Feb 14 23:27:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.4,v 1.1.2.2 2014/02/03 11:57:55 sborrill Exp $
+# $NetBSD: CHANGES-6.1.4,v 1.1.2.3 2014/02/14 23:27:46 bouyer Exp $
 
 A complete list of changes from the NetBSD 6.1.3 release to the NetBSD 6.1.4
 release:
@@ -24,3 +24,8 @@ sys/kern/kern_exec.c1.373
 	Maxime Villard.
 	[martin, ticket #1023]
 
+sys/kern/exec_elf.c1.55
+
+	Fix memory leak on bogus ELF binary.
+	[maxv, ticket #1028]
+

CVS commit: [netbsd-6] src/doc

2014-02-14 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Fri Feb 14 23:27:34 UTC 2014

Modified Files:
src/doc [netbsd-6]: CHANGES-6.2

Log Message:
ticket 1028


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.90 -r1.1.2.91 src/doc/CHANGES-6.2

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-6.2
diff -u src/doc/CHANGES-6.2:1.1.2.90 src/doc/CHANGES-6.2:1.1.2.91
--- src/doc/CHANGES-6.2:1.1.2.90	Fri Feb  7 13:28:58 2014
+++ src/doc/CHANGES-6.2	Fri Feb 14 23:27:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.2,v 1.1.2.90 2014/02/07 13:28:58 sborrill Exp $
+# $NetBSD: CHANGES-6.2,v 1.1.2.91 2014/02/14 23:27:34 bouyer Exp $
 
 A complete list of changes from the 6.1 release until the 6.2 release:
 
@@ -1317,3 +1317,8 @@ external/gpl3/gcc/dist/gcc/config/mips/m
 	modules from being loaded.
 	[bouyer, #ticket 1020]
 
+sys/kern/exec_elf.c1.55
+
+	Fix memory leak on bogus ELF binary.
+	[maxv, ticket #1028]
+

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

2014-02-14 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Fri Feb 14 23:27:57 UTC 2014

Modified Files:
src/doc [netbsd-6-0]: CHANGES-6.0.5

Log Message:
ticket 1028


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/doc/CHANGES-6.0.5

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-6.0.5
diff -u src/doc/CHANGES-6.0.5:1.1.2.2 src/doc/CHANGES-6.0.5:1.1.2.3
--- src/doc/CHANGES-6.0.5:1.1.2.2	Mon Feb  3 11:56:46 2014
+++ src/doc/CHANGES-6.0.5	Fri Feb 14 23:27:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0.5,v 1.1.2.2 2014/02/03 11:56:46 sborrill Exp $
+# $NetBSD: CHANGES-6.0.5,v 1.1.2.3 2014/02/14 23:27:57 bouyer Exp $
 
 A complete list of changes from the NetBSD 6.0.4 release to the NetBSD 6.0.5
 release:
@@ -24,3 +24,8 @@ sys/kern/kern_exec.c1.373
 	Maxime Villard.
 	[martin, ticket #1023]
 
+sys/kern/exec_elf.c1.55
+
+	Fix memory leak on bogus ELF binary.
+	[maxv, ticket #1028]
+

CVS commit: src/usr.bin/make

2014-02-14 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Feb 15 00:17:17 UTC 2014

Modified Files:
src/usr.bin/make: parse.c

Log Message:
delete the correct variables on eof
fix typo in comment (from sjg)


To generate a diff of this commit:
cvs rdiff -u -r1.193 -r1.194 src/usr.bin/make/parse.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/make/parse.c
diff -u src/usr.bin/make/parse.c:1.193 src/usr.bin/make/parse.c:1.194
--- src/usr.bin/make/parse.c:1.193	Fri Jan 10 11:12:52 2014
+++ src/usr.bin/make/parse.c	Fri Feb 14 19:17:17 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.193 2014/01/10 16:12:52 christos Exp $	*/
+/*	$NetBSD: parse.c,v 1.194 2014/02/15 00:17:17 christos Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: parse.c,v 1.193 2014/01/10 16:12:52 christos Exp $;
+static char rcsid[] = $NetBSD: parse.c,v 1.194 2014/02/15 00:17:17 christos Exp $;
 #else
 #include sys/cdefs.h
 #ifndef lint
 #if 0
 static char sccsid[] = @(#)parse.c	8.3 (Berkeley) 3/19/94;
 #else
-__RCSID($NetBSD: parse.c,v 1.193 2014/01/10 16:12:52 christos Exp $);
+__RCSID($NetBSD: parse.c,v 1.194 2014/02/15 00:17:17 christos Exp $);
 #endif
 #endif /* not lint */
 #endif
@@ -2236,7 +2236,7 @@ ParseDoInclude(char *line)
  * Side Effects:
  *	The .INCLUDEDFROMFILE variable is overwritten by the contents
  *	of .PARSEFILE and the .INCLUDEDFROMDIR variable is overwriten
- *	but the contents of .PARSEDIR
+ *	by the contents of .PARSEDIR
  *-
  */
 static void
@@ -2569,7 +2569,8 @@ ParseEOF(void)
 	/* We've run out of input */
 	Var_Delete(.PARSEDIR, VAR_GLOBAL);
 	Var_Delete(.PARSEFILE, VAR_GLOBAL);
-	Var_Delete(.INCLUDED_FROM, VAR_GLOBAL);
+	Var_Delete(.INCLUDEDFROMDIR, VAR_GLOBAL);
+	Var_Delete(.INCLUDEDFROMFILE, VAR_GLOBAL);
 	return DONE;
 }

CVS commit: src/usr.sbin/postinstall

2014-02-14 Thread Julio Merino

Module Name:src
Committed By:   jmmv
Date:   Sat Feb 15 01:54:17 UTC 2014

Modified Files:
src/usr.sbin/postinstall: postinstall

Log Message:
Fix path to atf-run.hooks after import of atf-0.19.

Problem found by martin@.  Not spotted by me, I think, because I always use
postinstall on an etc.tgz file and forgot about this code path.


To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/usr.sbin/postinstall/postinstall

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/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.163 src/usr.sbin/postinstall/postinstall:1.164
--- src/usr.sbin/postinstall/postinstall:1.163	Wed Jan 29 12:56:28 2014
+++ src/usr.sbin/postinstall/postinstall	Sat Feb 15 01:54:17 2014
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.163 2014/01/29 12:56:28 skrll Exp $
+# $NetBSD: postinstall,v 1.164 2014/02/15 01:54:17 jmmv Exp $
 #
 # Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1669,7 +1669,7 @@ do_atf()
 		failed=1
 	fi
 	if find_file_in_dirlist atf-run.hooks atf-run.hooks \
-	${SRC_DIR}/external/bsd/atf/dist/atf-run/sample \
+	${SRC_DIR}/external/bsd/atf/dist/tools/sample \
 	${SRC_DIR}/etc/atf; then
 			# ${dir} is set by find_file_in_dirlist()
 		populate_dir ${op} true ${dir} ${DEST_DIR}/etc/atf 644 \

CVS commit: src/external/bsd/atf

2014-02-14 Thread Julio Merino

Module Name:src
Committed By:   jmmv
Date:   Sat Feb 15 02:02:39 UTC 2014

Modified Files:
src/external/bsd/atf: Makefile.inc

Log Message:
Fix path to libtools.a.

The build would break when we do not use MAKEOBJDIR* but do use OBJMACHINE.
Problem found by B Harder and fix based on patch from NONAKA Kimihiro as
posted on current-users.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/Makefile.inc

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

Modified files:

Index: src/external/bsd/atf/Makefile.inc
diff -u src/external/bsd/atf/Makefile.inc:1.3 src/external/bsd/atf/Makefile.inc:1.4
--- src/external/bsd/atf/Makefile.inc:1.3	Wed Feb 12 04:08:31 2014
+++ src/external/bsd/atf/Makefile.inc	Sat Feb 15 02:02:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2014/02/12 04:08:31 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.4 2014/02/15 02:02:39 jmmv Exp $
 
 .include bsd.own.mk
 
@@ -39,8 +39,8 @@ CPPFLAGS+=	-I${TOPDIR}/lib/libatf-c	# Fo
 CPPFLAGS+=	-I${SRCDIR}
 
 .if defined(USE_ATF_LIBTOOLS)
-PRIVATELIBDIR!= cd ${TOPDIR}/lib; ${PRINTOBJDIR}
-CPPFLAGS+=	-I${PRIVATELIBDIR}/tools
-LDADD+=		${PRIVATELIBDIR}/tools/libtools.a
-DPADD+=		${PRIVATELIBDIR}/tools/libtools.a
+LIBTOOLSOBJDIR!=	cd ${TOPDIR}/lib/tools; ${PRINTOBJDIR}
+CPPFLAGS+=		-I${LIBTOOLSOBJDIR}
+LDADD+=			${LIBTOOLSOBJDIR}/libtools.a
+DPADD+=			${LIBTOOLSOBJDIR}/libtools.a
 .endif

CVS commit: [matt-nb5-mips64] src/sys/dev/pci

2014-02-14 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Sat Feb 15 03:22:27 UTC 2014

Modified Files:
src/sys/dev/pci [matt-nb5-mips64]: if_wm.c pcireg.h ppb.c

Log Message:
sync pcireg.h with HEAD.
update if_wm.c and ppb.c accordingly.


To generate a diff of this commit:
cvs rdiff -u -r1.162.4.3.2.1.2.1 -r1.162.4.3.2.1.2.2 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.57.26.1 -r1.57.26.2 src/sys/dev/pci/pcireg.h
cvs rdiff -u -r1.39.18.3 -r1.39.18.4 src/sys/dev/pci/ppb.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_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.162.4.3.2.1.2.1 src/sys/dev/pci/if_wm.c:1.162.4.3.2.1.2.2
--- src/sys/dev/pci/if_wm.c:1.162.4.3.2.1.2.1	Wed Apr 21 00:27:41 2010
+++ src/sys/dev/pci/if_wm.c	Sat Feb 15 03:22:27 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.162.4.3.2.1.2.1 2010/04/21 00:27:41 matt Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.162.4.3.2.1.2.2 2014/02/15 03:22:27 matt Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.162.4.3.2.1.2.1 2010/04/21 00:27:41 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.162.4.3.2.1.2.2 2014/02/15 03:22:27 matt Exp $);
 
 #include bpfilter.h
 #include rnd.h
@@ -1162,25 +1162,25 @@ wm_attach(device_t parent, device_t self
  * incorrectly.
  */
 pcix_cmd = pci_conf_read(pa-pa_pc, pa-pa_tag,
-sc-sc_pcix_offset + PCI_PCIX_CMD);
+sc-sc_pcix_offset + PCIX_CMD);
 pcix_sts = pci_conf_read(pa-pa_pc, pa-pa_tag,
-sc-sc_pcix_offset + PCI_PCIX_STATUS);
+sc-sc_pcix_offset + PCIX_STATUS);
 
 bytecnt =
-(pcix_cmd  PCI_PCIX_CMD_BYTECNT_MASK) 
-PCI_PCIX_CMD_BYTECNT_SHIFT;
+(pcix_cmd  PCIX_CMD_BYTECNT_MASK) 
+PCIX_CMD_BYTECNT_SHIFT;
 maxb =
-(pcix_sts  PCI_PCIX_STATUS_MAXB_MASK) 
-PCI_PCIX_STATUS_MAXB_SHIFT;
+(pcix_sts  PCIX_STATUS_MAXB_MASK) 
+PCIX_STATUS_MAXB_SHIFT;
 if (bytecnt  maxb) {
 	aprint_verbose_dev(sc-sc_dev,
 	resetting PCI-X MMRBC: %d - %d\n,
 	512  bytecnt, 512  maxb);
 	pcix_cmd = (pcix_cmd 
-	~PCI_PCIX_CMD_BYTECNT_MASK) |
-	   (maxb  PCI_PCIX_CMD_BYTECNT_SHIFT);
+	~PCIX_CMD_BYTECNT_MASK) |
+	   (maxb  PCIX_CMD_BYTECNT_SHIFT);
 	pci_conf_write(pa-pa_pc, pa-pa_tag,
-	sc-sc_pcix_offset + PCI_PCIX_CMD,
+	sc-sc_pcix_offset + PCIX_CMD,
 	pcix_cmd);
 }
 			}

Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.57.26.1 src/sys/dev/pci/pcireg.h:1.57.26.2
--- src/sys/dev/pci/pcireg.h:1.57.26.1	Sat Dec 24 01:27:25 2011
+++ src/sys/dev/pci/pcireg.h	Sat Feb 15 03:22:27 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcireg.h,v 1.57.26.1 2011/12/24 01:27:25 matt Exp $	*/
+/*	$NetBSD: pcireg.h,v 1.57.26.2 2014/02/15 03:22:27 matt Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1999, 2000
@@ -179,6 +179,7 @@ typedef u_int8_t pci_revision_t;
 #define	PCI_SUBCLASS_MASS_STORAGE_ATA		0x05
 #define	PCI_SUBCLASS_MASS_STORAGE_SATA		0x06
 #define	PCI_SUBCLASS_MASS_STORAGE_SAS		0x07
+#define	PCI_SUBCLASS_MASS_STORAGE_NVM		0x08
 #define	PCI_SUBCLASS_MASS_STORAGE_MISC		0x80
 
 /* 0x02 network subclasses */
@@ -462,6 +463,7 @@ typedef u_int8_t pci_revision_t;
 #define	PCI_CAP_DEBUGPORT	0x0a
 #define	PCI_CAP_CPCI_RSRCCTL	0x0b
 #define	PCI_CAP_HOTPLUG		0x0c
+#define	PCI_CAP_SUBVENDOR	0x0d
 #define	PCI_CAP_AGP8		0x0e
 #define	PCI_CAP_SECURE		0x0f
 #define	PCI_CAP_PCIEXPRESS 	0x10
@@ -567,128 +569,239 @@ struct pci_msix_table_entry {
  * as 32-bit values, offset and shifted appropriately.  Make sure you perform
  * the appropriate R/M/W cycles!
  */
-#define PCI_PCIX_CMD			0x00
-#define PCI_PCIX_CMD_PERR_RECOVER	0x0001
-#define PCI_PCIX_CMD_RELAXED_ORDER	0x0002
-#define PCI_PCIX_CMD_BYTECNT_MASK	0x000c
-#define	PCI_PCIX_CMD_BYTECNT_SHIFT	18
-#define		PCI_PCIX_CMD_BCNT_512		0x
-#define		PCI_PCIX_CMD_BCNT_1024		0x0004
-#define		PCI_PCIX_CMD_BCNT_2048		0x0008
-#define		PCI_PCIX_CMD_BCNT_4096		0x000c
-#define PCI_PCIX_CMD_SPLTRANS_MASK	0x0070
-#define		PCI_PCIX_CMD_SPLTRANS_1		0x
-#define		PCI_PCIX_CMD_SPLTRANS_2		0x0010
-#define		PCI_PCIX_CMD_SPLTRANS_3		0x0020
-#define		PCI_PCIX_CMD_SPLTRANS_4		0x0030
-#define		PCI_PCIX_CMD_SPLTRANS_8		0x0040
-#define		PCI_PCIX_CMD_SPLTRANS_12	0x0050
-#define		PCI_PCIX_CMD_SPLTRANS_16	0x0060
-#define		PCI_PCIX_CMD_SPLTRANS_32	0x0070
+#define PCIX_CMD			0x00
+#define PCIX_CMD_PERR_RECOVER	0x0001
+#define PCIX_CMD_RELAXED_ORDER	0x0002
+#define PCIX_CMD_BYTECNT_MASK	0x000c
+#define	PCIX_CMD_BYTECNT_SHIFT	18
+#define		PCIX_CMD_BCNT_512		0x
+#define		PCIX_CMD_BCNT_1024		0x0004
+#define		PCIX_CMD_BCNT_2048		0x0008
+#define		PCIX_CMD_BCNT_4096		0x000c
+#define PCIX_CMD_SPLTRANS_MASK	0x0070
+#define		PCIX_CMD_SPLTRANS_1

CVS commit: [matt-nb5-mips64] src/sys

2014-02-14 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Sat Feb 15 03:33:40 UTC 2014

Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_sdhc.c
src/sys/dev/sdmmc [matt-nb5-mips64]: sdhc.c sdhcvar.h

Log Message:
HAS_CGM - HAVE_CGM (like current)
Add 32BIT_ACCESS


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/mips/rmi/rmixl_sdhc.c
cvs rdiff -u -r1.7.2.5 -r1.7.2.6 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.4.2.4 -r1.4.2.5 src/sys/dev/sdmmc/sdhcvar.h

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

Modified files:

Index: src/sys/arch/mips/rmi/rmixl_sdhc.c
diff -u src/sys/arch/mips/rmi/rmixl_sdhc.c:1.1.2.1 src/sys/arch/mips/rmi/rmixl_sdhc.c:1.1.2.2
--- src/sys/arch/mips/rmi/rmixl_sdhc.c:1.1.2.1	Sat Dec 24 01:57:54 2011
+++ src/sys/arch/mips/rmi/rmixl_sdhc.c	Sat Feb 15 03:33:40 2014
@@ -29,7 +29,7 @@
 
 #include sys/param.h
 
-__KERNEL_RCSID(1, $NetBSD: rmixl_sdhc.c,v 1.1.2.1 2011/12/24 01:57:54 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: rmixl_sdhc.c,v 1.1.2.2 2014/02/15 03:33:40 matt Exp $);
 
 #include sys/device.h
 #include sys/bus.h
@@ -86,7 +86,7 @@ sdhc_xlsdio_attach(device_t parent, devi
 	KASSERT(psc-sc_slots[xa-xa_slot] == NULL);
 	psc-sc_slots[xa-xa_slot] = sc;
 
-	sc-sc_flags = SDHC_FLAG_HAS_CGM;
+	sc-sc_flags = SDHC_FLAG_HAVE_CGM;
 	sc-sc_dev = self;
 	sc-sc_dmat = xa-xa_dmat;
 	sc-sc_host = malloc(1 * sizeof(sc-sc_host[0]),

Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.7.2.5 src/sys/dev/sdmmc/sdhc.c:1.7.2.6
--- src/sys/dev/sdmmc/sdhc.c:1.7.2.5	Tue Nov  5 18:35:35 2013
+++ src/sys/dev/sdmmc/sdhc.c	Sat Feb 15 03:33:40 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdhc.c,v 1.7.2.5 2013/11/05 18:35:35 matt Exp $	*/
+/*	$NetBSD: sdhc.c,v 1.7.2.6 2014/02/15 03:33:40 matt Exp $	*/
 /*	$OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $	*/
 
 /*
@@ -23,7 +23,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.7.2.5 2013/11/05 18:35:35 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.7.2.6 2014/02/15 03:33:40 matt Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -290,7 +290,7 @@ sdhc_host_found(struct sdhc_softc *sc, b
 	hp-maxblklen  1 ? s : ));
 
 #if 0
-	if (sc-sc_flags  SDHC_FLAG_HAS_CGM) {
+	if (sc-sc_flags  SDHC_FLAG_HAVE_CGM) {
 		uint16_t clk = HREAD2(hp, SDHC_CLOCK_CTL);
 		clk |= SDHC_SDCLK_CGM;
 		HWRITE2(hp, SDHC_CLOCK_CTL, clk);
@@ -312,7 +312,7 @@ sdhc_host_found(struct sdhc_softc *sc, b
 	saa.saa_sct = sdhc_functions;
 	saa.saa_sch = hp;
 	saa.saa_dmat = hp-dmat;
-	if (sc-sc_flags  SDHC_FLAG_HAS_CGM) {
+	if (sc-sc_flags  SDHC_FLAG_HAVE_CGM) {
 		saa.saa_clkmin = hp-clkbase / 2046;
 	} else {
 		saa.saa_clkmin = hp-clkbase / 256;
@@ -573,7 +573,7 @@ sdhc_clock_divisor(struct sdhc_host *hp,
 {
 	int div;
 
-	if (hp-sc-sc_flags  SDHC_FLAG_HAS_CGM) {
+	if (hp-sc-sc_flags  SDHC_FLAG_HAVE_CGM) {
 		for (div = hp-clkbase / freq; div = 0x3ff; div++) {
 			if ((hp-clkbase / div) = freq) {
 *divp = SDHC_SDCLK_CGM

Index: src/sys/dev/sdmmc/sdhcvar.h
diff -u src/sys/dev/sdmmc/sdhcvar.h:1.4.2.4 src/sys/dev/sdmmc/sdhcvar.h:1.4.2.5
--- src/sys/dev/sdmmc/sdhcvar.h:1.4.2.4	Tue Dec 27 17:12:48 2011
+++ src/sys/dev/sdmmc/sdhcvar.h	Sat Feb 15 03:33:40 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdhcvar.h,v 1.4.2.4 2011/12/27 17:12:48 matt Exp $	*/
+/*	$NetBSD: sdhcvar.h,v 1.4.2.5 2014/02/15 03:33:40 matt Exp $	*/
 /*	$OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg Exp $	*/
 
 /*
@@ -39,7 +39,8 @@ struct sdhc_softc {
 #define	SDHC_FLAG_FORCE_DMA	0x0002
 #define	SDHC_FLAG_NO_PWR0	0x0004
 #define	SDHC_FLAG_HAVE_DVS	0x0008
-#define	SDHC_FLAG_HAS_CGM	0x0010
+#define	SDHC_FLAG_HAVE_CGM	0x0010
+#define	SDHC_FLAG_32BIT_ACCESS	0x0020
 	uint32_t		sc_clkbase;
 };

CVS commit: src/external/bsd/atf/tests/atf/test-programs

2014-02-14 Thread Julio Merino

Module Name:src
Committed By:   jmmv
Date:   Sat Feb 15 04:15:20 UTC 2014

Modified Files:
src/external/bsd/atf/tests/atf/test-programs: Makefile
Added Files:
src/external/bsd/atf/tests/atf/test-programs: Atffile Kyuafile

Log Message:
Prevent registering the helper programs as test programs.

They are not intended to be run neither by atf-run nor Kyua, and doing so
results in test failures.  The easiest way to do this for now is to just
ship custom Atffile and Kyuafile files.  (This broke because with atf-0.20
we started using the auto-generated versions of these, and due to the way
bsd.test.mk works, these registered the helpers as well.)

Problem reported by martin@.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/test-programs/Atffile \
src/external/bsd/atf/tests/atf/test-programs/Kyuafile
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/atf/tests/atf/test-programs/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/bsd/atf/tests/atf/test-programs/Makefile
diff -u src/external/bsd/atf/tests/atf/test-programs/Makefile:1.5 src/external/bsd/atf/tests/atf/test-programs/Makefile:1.6
--- src/external/bsd/atf/tests/atf/test-programs/Makefile:1.5	Wed Feb 12 04:08:32 2014
+++ src/external/bsd/atf/tests/atf/test-programs/Makefile	Sat Feb 15 04:15:20 2014
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2014/02/12 04:08:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2014/02/15 04:15:20 jmmv Exp $
 
 .include bsd.init.mk
 
 TESTSDIR=	${TESTSBASE}/atf/test-programs
+ATFFILE=	yes
+KYUAFILE=	yes
 
 .PATH:		${SRCDIR}/test-programs
 

Added files:

Index: src/external/bsd/atf/tests/atf/test-programs/Atffile
diff -u /dev/null src/external/bsd/atf/tests/atf/test-programs/Atffile:1.1
--- /dev/null	Sat Feb 15 04:15:20 2014
+++ src/external/bsd/atf/tests/atf/test-programs/Atffile	Sat Feb 15 04:15:20 2014
@@ -0,0 +1,9 @@
+Content-Type: application/X-atf-atffile; version=1
+
+prop: test-suite = NetBSD
+
+tp: config_test
+tp: expect_test
+tp: meta_data_test
+tp: result_test
+tp: srcdir_test
Index: src/external/bsd/atf/tests/atf/test-programs/Kyuafile
diff -u /dev/null src/external/bsd/atf/tests/atf/test-programs/Kyuafile:1.1
--- /dev/null	Sat Feb 15 04:15:20 2014
+++ src/external/bsd/atf/tests/atf/test-programs/Kyuafile	Sat Feb 15 04:15:20 2014
@@ -0,0 +1,9 @@
+syntax(2)
+
+test_suite(NetBSD)
+
+atf_test_program{name=config_test}
+atf_test_program{name=expect_test}
+atf_test_program{name=meta_data_test}
+atf_test_program{name=result_test}
+atf_test_program{name=srcdir_test}

CVS commit: src/external/bsd/atf

2014-02-14 Thread Julio Merino

Module Name:src
Committed By:   jmmv
Date:   Sat Feb 15 04:19:46 UTC 2014

Modified Files:
src/external/bsd/atf: Makefile.inc
src/external/bsd/atf/lib/libatf-c: Makefile
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
src/external/bsd/atf/usr.bin/atf-version: Makefile

Log Message:
Fix the bundling of the version number in built files.

Yes, attempting yet another fix at this so that the version number that
gets recorded in the pkgconfig files and inside atf-version really matches
the latest imported version.  Should resolve issues where the built files
get stuck with an older version number during update builds.

This time, I'm trying the same approach I applied in the FreeBSD source
tree, which has been working fine so far across various release imports.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/Makefile.inc
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/atf/usr.bin/atf-sh/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/atf/usr.bin/atf-version/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/bsd/atf/Makefile.inc
diff -u src/external/bsd/atf/Makefile.inc:1.4 src/external/bsd/atf/Makefile.inc:1.5
--- src/external/bsd/atf/Makefile.inc:1.4	Sat Feb 15 02:02:39 2014
+++ src/external/bsd/atf/Makefile.inc	Sat Feb 15 04:19:46 2014
@@ -1,17 +1,20 @@
-# $NetBSD: Makefile.inc,v 1.4 2014/02/15 02:02:39 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.5 2014/02/15 04:19:46 jmmv Exp $
 
 .include bsd.own.mk
 
 TOPDIR=		${NETBSDSRCDIR}/external/bsd/atf
 SRCDIR=		${TOPDIR}/dist
 
-ATF_VERSION!=	grep 'define VERSION' ${TOPDIR}/bconfig.h | cut -d '' -f 2
-cookie-version: cookie-version-2
-	@cmp -s cookie-version cookie-version-2 \
-	|| cp cookie-version-2 cookie-version
-cookie-version-2: .PHONY
-	@echo ${ATF_VERSION} cookie-version-2
-CLEANFILES+=	cookie-version cookie-version-2
+# Depend on the atf-version.txt target to generate a file that contains
+# the version number of the currently imported ATF release and that only
+# changes on new imports.
+atf-version.txt: atf-version-real.txt
+	@cmp -s atf-version.txt atf-version-real.txt \
+	|| cp atf-version-real.txt atf-version.txt
+atf-version-real.txt: .PHONY
+	@grep 'define VERSION' ${TOPDIR}/bconfig.h \
+	| cut -d '' -f 2 atf-version-real.txt
+CLEANFILES+= atf-version.txt atf-version-real.txt
 
 CPPFLAGS+=	-DHAVE_CONFIG_H
 

Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.19 src/external/bsd/atf/lib/libatf-c/Makefile:1.20
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.19	Wed Feb 12 04:08:31 2014
+++ src/external/bsd/atf/lib/libatf-c/Makefile	Sat Feb 15 04:19:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/02/12 04:08:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2014/02/15 04:19:46 jmmv Exp $
 
 NOLINT=		# defined
 
@@ -58,8 +58,8 @@ FILES+=		atf-c.pc
 FILESDIR=	/usr/lib/pkgconfig
 
 realall: atf-c.pc
-atf-c.pc: Makefile atf-c.pc.in cookie-version
-	${TOOL_SED} -e 's,__ATF_VERSION__,${ATF_VERSION},g' \
+atf-c.pc: Makefile atf-c.pc.in atf-version.txt
+	${TOOL_SED} -e 's,__ATF_VERSION__,$$(cat atf-version.txt),g' \
 	-e 's,__CC__,gcc,g' \
 	-e 's,__INCLUDEDIR__,/usr/include,g' \
 	-e 's,__LIBDIR__,/usr/lib,g' \

Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.22 src/external/bsd/atf/lib/libatf-c++/Makefile:1.23
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.22	Wed Feb 12 04:08:31 2014
+++ src/external/bsd/atf/lib/libatf-c++/Makefile	Sat Feb 15 04:19:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/02/12 04:08:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2014/02/15 04:19:46 jmmv Exp $
 
 NOLINT=		# defined
 
@@ -47,8 +47,8 @@ FILES+=		atf-c++.pc
 FILESDIR=	/usr/lib/pkgconfig
 
 realall: atf-c++.pc
-atf-c++.pc: Makefile atf-c++.pc.in cookie-version
-	${TOOL_SED} -e 's,__ATF_VERSION__,${ATF_VERSION},g' \
+atf-c++.pc: Makefile atf-c++.pc.in atf-version.txt
+	${TOOL_SED} -e 's,__ATF_VERSION__,$$(cat atf-version.txt),g' \
 	-e 's,__CXX__,g++,g' \
 	-e 's,__INCLUDEDIR__,/usr/include,g' \
 	-e 's,__LIBDIR__,/usr/lib,g' \

Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.10 src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.11
--- src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.10	Wed Feb 12 04:08:32 2014
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile	Sat Feb 15 04:19:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/02/12 04:08:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2014/02/15 04:19:46 jmmv Exp $
 
 .include bsd.init.mk
 
@@ -25,8 +25,8 @@ FILES+=			atf-sh.pc

CVS commit: src/sys/arch/hp700/hp700

2014-02-14 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Sat Feb 15 07:38:22 UTC 2014

Modified Files:
src/sys/arch/hp700/hp700: machdep.c

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/hp700/hp700/machdep.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/hp700/hp700/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.118 src/sys/arch/hp700/hp700/machdep.c:1.119
--- src/sys/arch/hp700/hp700/machdep.c:1.118	Thu Jan 16 13:19:36 2014
+++ src/sys/arch/hp700/hp700/machdep.c	Sat Feb 15 07:38:22 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.118 2014/01/16 13:19:36 skrll Exp $	*/
+/*	$NetBSD: machdep.c,v 1.119 2014/02/15 07:38:22 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.118 2014/01/16 13:19:36 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.119 2014/02/15 07:38:22 skrll Exp $);
 
 #include opt_cputype.h
 #include opt_ddb.h
@@ -196,7 +196,7 @@ static struct btlb_slot {
 
 	/* The number associated with this slot. */
 	int btlb_slot_number;
-	
+
 	/* The flags associated with this slot. */
 	int btlb_slot_flags;
 #define	BTLB_SLOT_IBTLB			(1  0)
@@ -477,7 +477,7 @@ hppa_init(paddr_t start, void *bi)
 	error = pdcproc_hpa_processor(hppa_mcpuhpa);
 	if (error  0)
 		panic(%s: PDC_HPA failed, __func__);
-	
+
 	/* cache parameters */
 	error = pdcproc_cache(pdc_cache);
 	if (error  0) {
@@ -667,7 +667,7 @@ cpuid(void)
 	error = pdcproc_model_info(pdc_model);
 	if (error  0) {
 		DPRINTF((WARNING: PDC_MODEL_INFO error %d\n, error));
-		
+
 		pdc_model.hwmodel = 0;
 		pdc_model.hv = 0;
 	} else {
@@ -1159,7 +1159,7 @@ hppa_btlb_insert(pa_space_t space, vaddr
 	 * allow execution also need instruction translation.
 	 */
 	switch (tlbprot  TLB_AR_MASK) {
-	case TLB_AR_R:	
+	case TLB_AR_R:
 	case TLB_AR_RW:
 	case TLB_AR_R | TLB_USER:
 	case TLB_AR_RW | TLB_USER:
@@ -1218,7 +1218,7 @@ hppa_btlb_insert(pa_space_t space, vaddr
 		for (btlb_slot = btlb_slots;
 		 btlb_slot  btlb_slot_end;
 		 btlb_slot++) {
-			
+
 			/*
 			 * Skip this slot if it's in use, or if we need a
 			 * variable-range slot and this isn't one.
@@ -1258,7 +1258,7 @@ hppa_btlb_insert(pa_space_t space, vaddr
 			DPRINTFN(10, (BTLB full\n));
 			return -(ENOMEM);
 		}
-			
+
 		/*
 		 * Now fill this BTLB slot record and insert the entry.
 		 */
@@ -1639,7 +1639,7 @@ hppa_pim64_dump(int check_type, void *da
 			printf(\n\n%s Registers:, name);
 			for (reg_k = 0; reg_k  reg_j; reg_k++)
 printf(%s0x%016lx,
-   (reg_k  3) ?   : \n, 
+   (reg_k  3) ?   : \n,
    (unsigned long)regarray[reg_k]);
 		}
 
@@ -1748,7 +1748,7 @@ hppa_machine_check(int check_type)
 		DELAY(25);
 		panic(machine check);
 	}
-	
+
 	/* Reboot the machine. */
 	printf(Rebooting...\n);
 	cpu_die();
@@ -1833,7 +1833,7 @@ dumpsys(void)
 		dump = bdev-d_dump;
 		/* TODO block map the whole physical memory */
 		for (i = 0; i  bytes; i += n) {
-		
+
 			/* Print out how many MBs we are to go. */
 			n = bytes - i;
 			if (n  (n % (1024*1024)) == 0)
@@ -1946,7 +1946,7 @@ sysctl_machdep_heartbeat(SYSCTLFN_ARGS)
 	int error;
 	bool oldval;
 	struct sysctlnode node = *rnode;
-	
+
 	oldval = lcd_blink_p;
 	/*
 	 * If we were false and are now true, start the timer.

CVS commit: src/sys/fs/union

2014-02-14 Thread Juergen Hannken-Illjes

Module Name:src
Committed By:   hannken
Date:   Fri Feb 14 08:50:27 UTC 2014

Modified Files:
src/sys/fs/union: union.h union_subr.c

Log Message:
Member un_flags is unused now -- remove.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/fs/union/union.h
cvs rdiff -u -r1.61 -r1.62 src/sys/fs/union/union_subr.c

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

CVS commit: src/sys/dev/pci

2014-02-14 Thread Nicolas Joly

Module Name:src
Committed By:   njoly
Date:   Fri Feb 14 13:24:46 UTC 2014

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
Add GeForce 210 High Definition Audio Controller.


To generate a diff of this commit:
cvs rdiff -u -r1.1182 -r1.1183 src/sys/dev/pci/pcidevs

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

CVS commit: src/sys/dev/pci

2014-02-14 Thread Nicolas Joly

Module Name:src
Committed By:   njoly
Date:   Fri Feb 14 13:25:19 UTC 2014

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
Regen for GeForce 210 High Definition Audio Controller.


To generate a diff of this commit:
cvs rdiff -u -r1.1175 -r1.1176 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1174 -r1.1175 src/sys/dev/pci/pcidevs_data.h

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

CVS commit: src/sys/arch/mipsco/stand/common

2014-02-14 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Feb 14 16:04:44 UTC 2014

Modified Files:
src/sys/arch/mipsco/stand/common: boot.c

Log Message:
make sure kernel is initialized properly.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mipsco/stand/common/boot.c

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

CVS commit: src/sys/kern

2014-02-14 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Feb 14 16:35:40 UTC 2014

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

Log Message:
explain why the innocent sigaction1 call now works.


To generate a diff of this commit:
cvs rdiff -u -r1.374 -r1.375 src/sys/kern/kern_exec.c

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

CVS commit: src/sys/kern

2014-02-14 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Feb 14 16:35:11 UTC 2014

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

Log Message:
Don't check trampolines for SIG_DFL or SIG_IGN since they are not used.
From gimpy.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/kern/sys_sig.c

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

CVS commit: [matt-nb5-mips64] src/sys/kern

2014-02-14 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Fri Feb 14 18:31:49 UTC 2014

Modified Files:
src/sys/kern [matt-nb5-mips64]: vfs_subr.c

Log Message:
vpanic - vnpanic


To generate a diff of this commit:
cvs rdiff -u -r1.357.4.4.2.1.2.1 -r1.357.4.4.2.1.2.2 src/sys/kern/vfs_subr.c

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

CVS commit: [matt-nb5-mips64] src/sys

2014-02-14 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Fri Feb 14 18:35:15 UTC 2014

Modified Files:
src/sys/conf [matt-nb5-mips64]: files
src/sys/dev/ic [matt-nb5-mips64]: comreg.h

Log Message:
defparam COM_TOLERANCE


To generate a diff of this commit:
cvs rdiff -u -r1.924.4.1.4.3 -r1.924.4.1.4.4 src/sys/conf/files
cvs rdiff -u -r1.15 -r1.15.18.1 src/sys/dev/ic/comreg.h

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

CVS commit: [matt-nb5-mips64] src/sys/conf

2014-02-14 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Fri Feb 14 18:36:14 UTC 2014

Modified Files:
src/sys/conf [matt-nb5-mips64]: Makefile.kern.inc

Log Message:
SYSTEM_DEP?= - SYSTEM_DEP+=
Add KERNLDSCRIPT to SYSTEM_DEP


To generate a diff of this commit:
cvs rdiff -u -r1.118.4.2.4.3 -r1.118.4.2.4.4 src/sys/conf/Makefile.kern.inc

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

CVS commit: [matt-nb5-mips64] src/sys

2014-02-14 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Fri Feb 14 18:38:16 UTC 2014

Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: mips_softint.c pmap.c
pmap_tlb.c vm_machdep.c
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_intr.c rmixl_nand_pci.c
src/sys/dev/ic [matt-nb5-mips64]: siisata.c
src/sys/kern [matt-nb5-mips64]: subr_prf.c
src/sys/lib/libkern [matt-nb5-mips64]: __assert.c libkern.h
src/sys/sys [matt-nb5-mips64]: cdefs.h systm.h

Log Message:
Change KASSERTMSG/KDASSERTMSG to use varadic arguments like HEAD.
panic - vpanic, add panic wrapper to vpanic.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/arch/mips/mips/mips_softint.c
cvs rdiff -u -r1.179.16.46 -r1.179.16.47 src/sys/arch/mips/mips/pmap.c
cvs rdiff -u -r1.1.2.24 -r1.1.2.25 src/sys/arch/mips/mips/pmap_tlb.c
cvs rdiff -u -r1.121.6.1.2.30 -r1.121.6.1.2.31 \
src/sys/arch/mips/mips/vm_machdep.c
cvs rdiff -u -r1.1.2.38 -r1.1.2.39 src/sys/arch/mips/rmi/rmixl_intr.c
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/mips/rmi/rmixl_nand_pci.c
cvs rdiff -u -r1.2.14.2 -r1.2.14.3 src/sys/dev/ic/siisata.c
cvs rdiff -u -r1.124.4.1.4.1 -r1.124.4.1.4.2 src/sys/kern/subr_prf.c
cvs rdiff -u -r1.11 -r1.11.40.1 src/sys/lib/libkern/__assert.c
cvs rdiff -u -r1.82.8.4 -r1.82.8.5 src/sys/lib/libkern/libkern.h
cvs rdiff -u -r1.69.10.1 -r1.69.10.2 src/sys/sys/cdefs.h
cvs rdiff -u -r1.228.4.2.4.3 -r1.228.4.2.4.4 src/sys/sys/systm.h

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

CVS commit: src/external/bsd/llvm

2014-02-14 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Fri Feb 14 20:23:57 UTC 2014

Modified Files:
src/external/bsd/llvm: Makefile.inc
src/external/bsd/llvm/bin/clang: Makefile
src/external/bsd/llvm/bin/llc: Makefile
src/external/bsd/llvm/bin/llvm-objdump: Makefile
src/external/bsd/llvm/bin/llvm-readobj: Makefile
src/external/bsd/llvm/bin/opt: Makefile
src/external/bsd/llvm/bin/tblgen: Makefile
src/external/bsd/llvm/config/llvm/Config: config.h.in
src/external/bsd/llvm/include: Makefile
src/external/bsd/llvm/lib: Makefile
src/external/bsd/llvm/lib/libLLVMARMMCTargetDesc: Makefile
src/external/bsd/llvm/lib/libLLVMAnalysis: Makefile
src/external/bsd/llvm/lib/libLLVMAsmPrinter: Makefile
src/external/bsd/llvm/lib/libLLVMMipsMCTargetDesc: Makefile
src/external/bsd/llvm/lib/libLLVMScalarOpts: Makefile
src/external/bsd/llvm/lib/libLLVMSparcCodeGen: Makefile
src/external/bsd/llvm/lib/libLLVMSupport: Makefile

Log Message:
Update LLVm/Clang to 3.5svn r201163. This brings improvements to the
16bit x86 support, self hosting for SPARC64 and improvements to the
NetBSD driver on ARM, AArch64 and MIPS.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.29 -r1.30 src/external/bsd/llvm/bin/clang/Makefile
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/llvm/bin/llc/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/llvm/bin/llvm-objdump/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/llvm/bin/llvm-readobj/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/llvm/bin/opt/Makefile
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/llvm/bin/tblgen/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/bsd/llvm/config/llvm/Config/config.h.in
cvs rdiff -u -r1.29 -r1.30 src/external/bsd/llvm/include/Makefile
cvs rdiff -u -r1.38 -r1.39 src/external/bsd/llvm/lib/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/bsd/llvm/lib/libLLVMARMMCTargetDesc/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/bsd/llvm/lib/libLLVMMipsMCTargetDesc/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/llvm/lib/libLLVMSparcCodeGen/Makefile
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/llvm/lib/libLLVMSupport/Makefile

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

CVS commit: src/external/bsd/llvm/lib/libLLVMLineEditor

2014-02-14 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Fri Feb 14 20:32:58 UTC 2014

Added Files:
src/external/bsd/llvm/lib/libLLVMLineEditor: Makefile

Log Message:
Build glue for the libedit wrapper, not yet used.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libLLVMLineEditor/Makefile

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

CVS commit: src/tests/libexec/ld.elf_so

2014-02-14 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Fri Feb 14 20:33:32 UTC 2014

Modified Files:
src/tests/libexec/ld.elf_so/helper_symver_dso1: Makefile
src/tests/libexec/ld.elf_so/helper_symver_dso2: Makefile

Log Message:
ARM now works with integrated-as.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile

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

CVS commit: src/doc

2014-02-14 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Fri Feb 14 20:35:20 UTC 2014

Modified Files:
src/doc: TODO.clang

Log Message:
Update hacks.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/doc/TODO.clang

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

CVS commit: src/usr.bin/fstat

2014-02-14 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Feb 14 20:43:35 UTC 2014

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

Log Message:
fix protocol printing order.


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/usr.bin/fstat/fstat.c

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

CVS commit: src/sys/arch/i386/stand/lib

2014-02-14 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Fri Feb 14 20:34:28 UTC 2014

Modified Files:
src/sys/arch/i386/stand/lib: Makefile

Log Message:
Only realprot.S still needs to be built with GNU as.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/i386/stand/lib/Makefile

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

CVS commit: [netbsd-6-1] src/sys/kern

2014-02-14 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Fri Feb 14 23:21:25 UTC 2014

Modified Files:
src/sys/kern [netbsd-6-1]: exec_elf.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1028):
sys/kern/exec_elf.c: revision 1.55
Fix memory leak.
ok christos@ agc@


To generate a diff of this commit:
cvs rdiff -u -r1.37.2.1 -r1.37.2.1.6.1 src/sys/kern/exec_elf.c

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

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

2014-02-14 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Fri Feb 14 23:21:20 UTC 2014

Modified Files:
src/sys/kern [netbsd-6]: exec_elf.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1028):
sys/kern/exec_elf.c: revision 1.55
Fix memory leak.
ok christos@ agc@


To generate a diff of this commit:
cvs rdiff -u -r1.37.2.1 -r1.37.2.2 src/sys/kern/exec_elf.c

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

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

2014-02-14 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Fri Feb 14 23:21:28 UTC 2014

Modified Files:
src/sys/kern [netbsd-6-0]: exec_elf.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1028):
sys/kern/exec_elf.c: revision 1.55
Fix memory leak.
ok christos@ agc@


To generate a diff of this commit:
cvs rdiff -u -r1.37.2.1 -r1.37.2.1.4.1 src/sys/kern/exec_elf.c

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

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

2014-02-14 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Fri Feb 14 23:27:57 UTC 2014

Modified Files:
src/doc [netbsd-6-0]: CHANGES-6.0.5

Log Message:
ticket 1028


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/doc/CHANGES-6.0.5

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

CVS commit: [netbsd-6-1] src/doc

2014-02-14 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Fri Feb 14 23:27:46 UTC 2014

Modified Files:
src/doc [netbsd-6-1]: CHANGES-6.1.4

Log Message:
ticket 1028


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/doc/CHANGES-6.1.4

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

CVS commit: [netbsd-6] src/doc

2014-02-14 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Fri Feb 14 23:27:34 UTC 2014

Modified Files:
src/doc [netbsd-6]: CHANGES-6.2

Log Message:
ticket 1028


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.90 -r1.1.2.91 src/doc/CHANGES-6.2

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

CVS commit: src/usr.bin/make

2014-02-14 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Feb 15 00:17:17 UTC 2014

Modified Files:
src/usr.bin/make: parse.c

Log Message:
delete the correct variables on eof
fix typo in comment (from sjg)


To generate a diff of this commit:
cvs rdiff -u -r1.193 -r1.194 src/usr.bin/make/parse.c

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

CVS commit: src/usr.sbin/postinstall

2014-02-14 Thread Julio Merino

Module Name:src
Committed By:   jmmv
Date:   Sat Feb 15 01:54:17 UTC 2014

Modified Files:
src/usr.sbin/postinstall: postinstall

Log Message:
Fix path to atf-run.hooks after import of atf-0.19.

Problem found by martin@.  Not spotted by me, I think, because I always use
postinstall on an etc.tgz file and forgot about this code path.


To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/usr.sbin/postinstall/postinstall

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

CVS commit: src/external/bsd/atf

2014-02-14 Thread Julio Merino

Module Name:src
Committed By:   jmmv
Date:   Sat Feb 15 02:02:39 UTC 2014

Modified Files:
src/external/bsd/atf: Makefile.inc

Log Message:
Fix path to libtools.a.

The build would break when we do not use MAKEOBJDIR* but do use OBJMACHINE.
Problem found by B Harder and fix based on patch from NONAKA Kimihiro as
posted on current-users.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/Makefile.inc

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

CVS commit: [matt-nb5-mips64] src/sys/dev/pci

2014-02-14 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Sat Feb 15 03:22:27 UTC 2014

Modified Files:
src/sys/dev/pci [matt-nb5-mips64]: if_wm.c pcireg.h ppb.c

Log Message:
sync pcireg.h with HEAD.
update if_wm.c and ppb.c accordingly.


To generate a diff of this commit:
cvs rdiff -u -r1.162.4.3.2.1.2.1 -r1.162.4.3.2.1.2.2 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.57.26.1 -r1.57.26.2 src/sys/dev/pci/pcireg.h
cvs rdiff -u -r1.39.18.3 -r1.39.18.4 src/sys/dev/pci/ppb.c

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

CVS commit: [matt-nb5-mips64] src/sys

2014-02-14 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Sat Feb 15 03:33:40 UTC 2014

Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_sdhc.c
src/sys/dev/sdmmc [matt-nb5-mips64]: sdhc.c sdhcvar.h

Log Message:
HAS_CGM - HAVE_CGM (like current)
Add 32BIT_ACCESS


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/mips/rmi/rmixl_sdhc.c
cvs rdiff -u -r1.7.2.5 -r1.7.2.6 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.4.2.4 -r1.4.2.5 src/sys/dev/sdmmc/sdhcvar.h

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

CVS commit: src/external/bsd/atf/tests/atf/test-programs

2014-02-14 Thread Julio Merino

Module Name:src
Committed By:   jmmv
Date:   Sat Feb 15 04:15:20 UTC 2014

Modified Files:
src/external/bsd/atf/tests/atf/test-programs: Makefile
Added Files:
src/external/bsd/atf/tests/atf/test-programs: Atffile Kyuafile

Log Message:
Prevent registering the helper programs as test programs.

They are not intended to be run neither by atf-run nor Kyua, and doing so
results in test failures.  The easiest way to do this for now is to just
ship custom Atffile and Kyuafile files.  (This broke because with atf-0.20
we started using the auto-generated versions of these, and due to the way
bsd.test.mk works, these registered the helpers as well.)

Problem reported by martin@.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/test-programs/Atffile \
src/external/bsd/atf/tests/atf/test-programs/Kyuafile
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/atf/tests/atf/test-programs/Makefile

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

CVS commit: src/external/bsd/atf

2014-02-14 Thread Julio Merino

Module Name:src
Committed By:   jmmv
Date:   Sat Feb 15 04:19:46 UTC 2014

Modified Files:
src/external/bsd/atf: Makefile.inc
src/external/bsd/atf/lib/libatf-c: Makefile
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
src/external/bsd/atf/usr.bin/atf-version: Makefile

Log Message:
Fix the bundling of the version number in built files.

Yes, attempting yet another fix at this so that the version number that
gets recorded in the pkgconfig files and inside atf-version really matches
the latest imported version.  Should resolve issues where the built files
get stuck with an older version number during update builds.

This time, I'm trying the same approach I applied in the FreeBSD source
tree, which has been working fine so far across various release imports.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/Makefile.inc
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/atf/usr.bin/atf-sh/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/atf/usr.bin/atf-version/Makefile

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

CVS commit: src/sys/arch/hp700/hp700

2014-02-14 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Sat Feb 15 07:38:22 UTC 2014

Modified Files:
src/sys/arch/hp700/hp700: machdep.c

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/hp700/hp700/machdep.c

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

59 matches

Mail list logo