date:20151010

CVS commit: src/sys/external/bsd/drm2/dist/drm/i915

2015-10-10 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Oct 10 19:29:44 UTC 2015

Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_dma.c

Log Message:
Zero out the guard for bus_space_unmap before calling i915_dma_cleanup() which
calls i915_free_hws(), which then tries to unmap. Perhaps this fixes PR/50060.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c

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

Modified files:

Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.16 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.17
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.16	Thu Apr  2 21:06:05 2015
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c	Sat Oct 10 15:29:44 2015
@@ -1137,8 +1137,8 @@ static int i915_set_status_page(struct d
 	BUS_SPACE_MAP_PREFETCHABLE,
 	_priv->dri1.gfx_hws_cpu_bsh);
 	if (ret) {
-		i915_dma_cleanup(dev);
 		ring->status_page.gfx_addr = 0;
+		i915_dma_cleanup(dev);
 		DRM_ERROR("can not ioremap virtual address for"
 " G33 hw status page\n");
 		return ret;

CVS commit: src/sys/arch/alpha/alpha

2015-10-10 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Oct 10 17:00:12 UTC 2015

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

Log Message:
PR port-alpha/50325: cosmetic fix for cpu attach message
from Felix Deichmann.


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/alpha/alpha/cpu.c

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

Modified files:

Index: src/sys/arch/alpha/alpha/cpu.c
diff -u src/sys/arch/alpha/alpha/cpu.c:1.95 src/sys/arch/alpha/alpha/cpu.c:1.96
--- src/sys/arch/alpha/alpha/cpu.c:1.95	Mon Feb  6 02:14:10 2012
+++ src/sys/arch/alpha/alpha/cpu.c	Sat Oct 10 17:00:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.95 2012/02/06 02:14:10 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.96 2015/10/10 17:00:12 martin Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.95 2012/02/06 02:14:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.96 2015/10/10 17:00:12 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -217,7 +217,7 @@ cpuattach(device_t parent, device_t self
 			s = cpunametable[i].cpu_minor_names;
 			for(i = 0; s && s[i]; ++i) {
 if (i == minor && strlen(s[i]) != 0) {
-	aprint_normal(" (%s)\n", s[i]);
+	aprint_normal(" (%s)", s[i]);
 	goto recognized;
 }
 			}

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

2015-10-10 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Sat Oct 10 17:18:05 UTC 2015

Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c ehcivar.h

Log Message:
Provide and use some macros to access ehci_{xfer,pipe} from
usbd_{xfer,pipe}

No functional change


To generate a diff of this commit:
cvs rdiff -u -r1.234.2.51 -r1.234.2.52 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.42.14.16 -r1.42.14.17 src/sys/dev/usb/ehcivar.h

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

Modified files:

Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.234.2.51 src/sys/dev/usb/ehci.c:1.234.2.52
--- src/sys/dev/usb/ehci.c:1.234.2.51	Fri Oct  9 09:16:43 2015
+++ src/sys/dev/usb/ehci.c	Sat Oct 10 17:18:05 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci.c,v 1.234.2.51 2015/10/09 09:16:43 skrll Exp $ */
+/*	$NetBSD: ehci.c,v 1.234.2.52 2015/10/10 17:18:05 skrll Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.51 2015/10/09 09:16:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.52 2015/10/10 17:18:05 skrll Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -1002,7 +1002,7 @@ Static void
 ehci_idone(struct ehci_xfer *ex)
 {
 	struct usbd_xfer *xfer = >ex_xfer;
-	struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->ux_pipe;
+	struct ehci_pipe *epipe = EHCI_XFER2EPIPE(xfer);
 	struct ehci_softc *sc = xfer->ux_pipe->up_dev->ud_bus->ub_hcpriv;
 	ehci_soft_qtd_t *sqtd, *lsqtd;
 	uint32_t status = 0, nstatus = 0;
@@ -1527,7 +1527,8 @@ ehci_allocx(struct usbd_bus *bus)
 	if (xfer != NULL) {
 		memset(xfer, 0, sizeof(struct ehci_xfer));
 #ifdef DIAGNOSTIC
-		EXFER(xfer)->ex_isdone = true;
+		struct ehci_xfer *ex = EHCI_XFER2EXFER(xfer);
+		ex->ex_isdone = true;
 		xfer->ux_state = XFER_BUSY;
 #endif
 	}
@@ -1540,7 +1541,7 @@ ehci_freex(struct usbd_bus *bus, struct 
 	struct ehci_softc *sc = bus->ub_hcpriv;
 
 	KASSERT(xfer->ux_state == XFER_BUSY);
-	KASSERT(EXFER(xfer)->ex_isdone);
+	KASSERT(EHCI_XFER2EXFER(xfer)->ex_isdone);
 #ifdef DIAGNOSTIC
 	xfer->ux_state = XFER_FREE;
 #endif
@@ -1558,7 +1559,7 @@ ehci_get_lock(struct usbd_bus *bus, kmut
 Static void
 ehci_device_clear_toggle(struct usbd_pipe *pipe)
 {
-	struct ehci_pipe *epipe = (struct ehci_pipe *)pipe;
+	struct ehci_pipe *epipe = EHCI_PIPE2EPIPE(pipe);
 
 	USBHIST_FUNC(); USBHIST_CALLED(ehcidebug);
 
@@ -1848,7 +1849,7 @@ ehci_open(struct usbd_pipe *pipe)
 	uint8_t rhaddr = dev->ud_bus->ub_rhaddr;
 	uint8_t addr = dev->ud_addr;
 	uint8_t xfertype = UE_GET_XFERTYPE(ed->bmAttributes);
-	struct ehci_pipe *epipe = (struct ehci_pipe *)pipe;
+	struct ehci_pipe *epipe = EHCI_PIPE2EPIPE(pipe);
 	ehci_soft_qh_t *sqh;
 	usbd_status err;
 	int ival, speed, naks;
@@ -3087,7 +3088,7 @@ ehci_free_sitd(ehci_softc_t *sc, ehci_so
 Static void
 ehci_close_pipe(struct usbd_pipe *pipe, ehci_soft_qh_t *head)
 {
-	struct ehci_pipe *epipe = (struct ehci_pipe *)pipe;
+	struct ehci_pipe *epipe = EHCI_PIPE2EPIPE(pipe);
 	ehci_softc_t *sc = pipe->up_dev->ud_bus->ub_hcpriv;
 	ehci_soft_qh_t *sqh = epipe->sqh;
 
@@ -3112,8 +3113,8 @@ ehci_close_pipe(struct usbd_pipe *pipe, 
 Static void
 ehci_abort_xfer(struct usbd_xfer *xfer, usbd_status status)
 {
-	struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->ux_pipe;
-	struct ehci_xfer *exfer = EXFER(xfer);
+	struct ehci_pipe *epipe = EHCI_XFER2EPIPE(xfer);
+	struct ehci_xfer *exfer = EHCI_XFER2EXFER(xfer);
 	ehci_softc_t *sc = epipe->pipe.up_dev->ud_bus->ub_hcpriv;
 	ehci_soft_qh_t *sqh = epipe->sqh;
 	ehci_soft_qtd_t *sqtd;
@@ -3268,8 +3269,8 @@ ehci_abort_isoc_xfer(struct usbd_xfer *x
 
 	USBHIST_FUNC(); USBHIST_CALLED(ehcidebug);
 
-	epipe = (struct ehci_pipe *) xfer->ux_pipe;
-	exfer = EXFER(xfer);
+	epipe = EHCI_XFER2EPIPE(xfer);
+	exfer = EHCI_XFER2EXFER(xfer);
 	sc = epipe->pipe.up_dev->ud_bus->ub_hcpriv;
 
 	USBHIST_LOG(ehcidebug, "xfer %p pipe %p", xfer, epipe, 0, 0);
@@ -3364,8 +3365,9 @@ done:
 Static void
 ehci_timeout(void *addr)
 {
-	struct ehci_xfer *exfer = addr;
-	struct ehci_pipe *epipe = (struct ehci_pipe *)exfer->ex_xfer.ux_pipe;
+	struct usbd_xfer *xfer = addr;
+	struct ehci_xfer *exfer = EHCI_XFER2EXFER(xfer);
+	struct ehci_pipe *epipe = EHCI_XFER2EPIPE(xfer);
 	ehci_softc_t *sc = epipe->pipe.up_dev->ud_bus->ub_hcpriv;
 
 	USBHIST_FUNC(); USBHIST_CALLED(ehcidebug);
@@ -3373,12 +3375,12 @@ ehci_timeout(void *addr)
 	USBHIST_LOG(ehcidebug, "exfer %p", exfer, 0, 0, 0);
 #ifdef EHCI_DEBUG
 	if (ehcidebug > 1)
-		usbd_dump_pipe(exfer->ex_xfer.ux_pipe);
+		usbd_dump_pipe(xfer->ux_pipe);
 #endif
 
 	if (sc->sc_dying) {
 		mutex_enter(>sc_lock);
-		ehci_abort_xfer(>ex_xfer, USBD_TIMEOUT);
+		ehci_abort_xfer(xfer, USBD_TIMEOUT);
 		mutex_exit(>sc_lock);
 		return;
 	}
@@ -3386,7 +3388,7 @@ ehci_timeout(void *addr)
 	/* Execute the abort in a process context. */
 	usb_init_task(>ex_aborttask, ehci_timeout_task, addr,
 	USB_TASKQ_MPSAFE);
-

CVS commit: src/sys/external/bsd/drm2/dist/drm/i915

2015-10-10 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Oct 10 19:35:15 UTC 2015

Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_dma.c

Log Message:
fix the same bug on the linux side, print the error, and return the -tive
error to mimick linux.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c

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

Modified files:

Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.17 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.18
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.17	Sat Oct 10 15:29:44 2015
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c	Sat Oct 10 15:35:15 2015
@@ -1140,8 +1140,8 @@ static int i915_set_status_page(struct d
 		ring->status_page.gfx_addr = 0;
 		i915_dma_cleanup(dev);
 		DRM_ERROR("can not ioremap virtual address for"
-" G33 hw status page\n");
-		return ret;
+		" G33 hw status page, error %d\n", ret);
+		return -ret;
 	}
 
 	__CTASSERT(PAGE_SIZE == 4096);
@@ -1151,8 +1151,8 @@ static int i915_set_status_page(struct d
 	dev_priv->dri1.gfx_hws_cpu_addr =
 		ioremap_wc(dev_priv->gtt.mappable_base + hws->addr, 4096);
 	if (dev_priv->dri1.gfx_hws_cpu_addr == NULL) {
-		i915_dma_cleanup(dev);
 		ring->status_page.gfx_addr = 0;
+		i915_dma_cleanup(dev);
 		DRM_ERROR("can not ioremap virtual address for"
 " G33 hw status page\n");
 		return -ENOMEM;

CVS commit: src/libexec/lfs_cleanerd

2015-10-10 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Oct 10 22:34:47 UTC 2015

Modified Files:
src/libexec/lfs_cleanerd: Makefile coalesce.c

Log Message:
Use llabs(), not abs(), on the difference of daddr_t's.
Caught by clang, reported by joerg.

Turn off the clang-specific compiler flags that were making the report
nonfatal.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/libexec/lfs_cleanerd/Makefile
cvs rdiff -u -r1.32 -r1.33 src/libexec/lfs_cleanerd/coalesce.c

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

Modified files:

Index: src/libexec/lfs_cleanerd/Makefile
diff -u src/libexec/lfs_cleanerd/Makefile:1.18 src/libexec/lfs_cleanerd/Makefile:1.19
--- src/libexec/lfs_cleanerd/Makefile:1.18	Tue Mar  4 21:06:47 2014
+++ src/libexec/lfs_cleanerd/Makefile	Sat Oct 10 22:34:46 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2014/03/04 21:06:47 joerg Exp $
+#	$NetBSD: Makefile,v 1.19 2015/10/10 22:34:46 dholland Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 .include "Makefile.inc"
@@ -11,6 +11,4 @@ BINDIR=		/libexec
 LDSTATIC?=  -static
 .endif
 
-CWARNFLAGS.clang+=	-Wno-error=absolute-value
-
 .include 

Index: src/libexec/lfs_cleanerd/coalesce.c
diff -u src/libexec/lfs_cleanerd/coalesce.c:1.32 src/libexec/lfs_cleanerd/coalesce.c:1.33
--- src/libexec/lfs_cleanerd/coalesce.c:1.32	Wed Aug 12 18:28:00 2015
+++ src/libexec/lfs_cleanerd/coalesce.c	Sat Oct 10 22:34:46 2015
@@ -1,4 +1,4 @@
-/*  $NetBSD: coalesce.c,v 1.32 2015/08/12 18:28:00 dholland Exp $  */
+/*  $NetBSD: coalesce.c,v 1.33 2015/10/10 22:34:46 dholland Exp $  */
 
 /*-
  * Copyright (c) 2002, 2005 The NetBSD Foundation, Inc.
@@ -269,7 +269,7 @@ clean_inode(struct clfs *fs, ino_t ino)
 	for (i = 1; i < nb; i++) {
 		if (bip[i].bi_daddr != bip[i - 1].bi_daddr + lfs_sb_getfrag(fs))
 			++noff;
-		toff += abs(bip[i].bi_daddr - bip[i - 1].bi_daddr
+		toff += llabs(bip[i].bi_daddr - bip[i - 1].bi_daddr
 		- lfs_sb_getfrag(fs)) >> lfs_sb_getfbshift(fs);
 	}

CVS commit: src

2015-10-10 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Oct 10 22:34:10 UTC 2015

Modified Files:
src/sbin/fsck_lfs: lfs.c
src/usr.sbin/dumplfs: dumplfs.c

Log Message:
Track down and fix two missing uses of SEGSUM_FINFOBASE().


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/dumplfs/dumplfs.c

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

Modified files:

Index: src/sbin/fsck_lfs/lfs.c
diff -u src/sbin/fsck_lfs/lfs.c:1.67 src/sbin/fsck_lfs/lfs.c:1.68
--- src/sbin/fsck_lfs/lfs.c:1.67	Sat Oct  3 08:29:48 2015
+++ src/sbin/fsck_lfs/lfs.c	Sat Oct 10 22:34:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.67 2015/10/03 08:29:48 dholland Exp $ */
+/* $NetBSD: lfs.c,v 1.68 2015/10/10 22:34:09 dholland Exp $ */
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -791,7 +791,7 @@ check_summary(struct lfs *fs, SEGSUM *sp
 
 	iip = iibase;
 	daddr = pseg_addr + lfs_btofsb(fs, lfs_sb_getsumsize(fs));
-	fp = (FINFO *) (sp + 1);
+	fp = SEGSUM_FINFOBASE(fs, sp);
 	for (i = 0, j = 0;
 	 i < lfs_ss_getnfinfo(fs, sp) || j < howmany(lfs_ss_getninos(fs, sp), LFS_INOPB(fs)); i++) {
 		if (i >= lfs_ss_getnfinfo(fs, sp) && lfs_ii_getblock(fs, iip) != daddr) {

Index: src/usr.sbin/dumplfs/dumplfs.c
diff -u src/usr.sbin/dumplfs/dumplfs.c:1.59 src/usr.sbin/dumplfs/dumplfs.c:1.60
--- src/usr.sbin/dumplfs/dumplfs.c:1.59	Sat Oct  3 08:28:56 2015
+++ src/usr.sbin/dumplfs/dumplfs.c	Sat Oct 10 22:34:09 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: dumplfs.c,v 1.59 2015/10/03 08:28:56 dholland Exp $	*/
+/*	$NetBSD: dumplfs.c,v 1.60 2015/10/10 22:34:09 dholland Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
 #if 0
 static char sccsid[] = "@(#)dumplfs.c	8.5 (Berkeley) 5/24/95";
 #else
-__RCSID("$NetBSD: dumplfs.c,v 1.59 2015/10/03 08:28:56 dholland Exp $");
+__RCSID("$NetBSD: dumplfs.c,v 1.60 2015/10/10 22:34:09 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -622,11 +622,10 @@ dump_sum(int fd, struct lfs *lfsp, SEGSU
 	 * to prevent us from continuing, but it odes merit a warning.)
 	 */
 	iip2 = SEGSUM_IINFOSTART(lfsp, sp);
+	fp = SEGSUM_FINFOBASE(lfsp, sp);
 	if (lfs_sb_getversion(lfsp) == 1) {
-		fp = (FINFO *)((SEGSUM_V1 *)sp + 1);
 		el_size = sizeof(unsigned long);
 	} else {
-		fp = (FINFO *)(sp + 1);
 		el_size = sizeof(u_int32_t);
 	}
 	datap = (char *)malloc(el_size * numblocks);

CVS commit: src/sys/ufs/lfs

2015-10-10 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Oct 10 22:34:34 UTC 2015

Modified Files:
src/sys/ufs/lfs: lfs_alloc.c lfs_segment.c lfs_syscalls.c

Log Message:
Fix minor bitrot in #if 0 or otherwise disabled code.


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/ufs/lfs/lfs_alloc.c
cvs rdiff -u -r1.261 -r1.262 src/sys/ufs/lfs/lfs_segment.c
cvs rdiff -u -r1.170 -r1.171 src/sys/ufs/lfs/lfs_syscalls.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/ufs/lfs/lfs_alloc.c
diff -u src/sys/ufs/lfs/lfs_alloc.c:1.130 src/sys/ufs/lfs/lfs_alloc.c:1.131
--- src/sys/ufs/lfs/lfs_alloc.c:1.130	Sun Sep 13 07:53:37 2015
+++ src/sys/ufs/lfs/lfs_alloc.c	Sat Oct 10 22:34:33 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_alloc.c,v 1.130 2015/09/13 07:53:37 dholland Exp $	*/
+/*	$NetBSD: lfs_alloc.c,v 1.131 2015/10/10 22:34:33 dholland Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lfs_alloc.c,v 1.130 2015/09/13 07:53:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_alloc.c,v 1.131 2015/10/10 22:34:33 dholland Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -327,7 +327,8 @@ lfs_last_alloc_ino(struct lfs *fs)
 	ino_t ino, maxino;
 
 	maxino = ((fs->lfs_ivnode->v_size >> lfs_sb_getbshift(fs)) -
-		  lfs_sb_getcleansz(fs) - lfs_sb_getsegtabsz(fs)) * fs->lfs_ifpb;
+		  lfs_sb_getcleansz(fs) - lfs_sb_getsegtabsz(fs)) *
+		lfs_sb_getifpb(fs);
 	for (ino = maxino - 1; ino > LFS_UNUSED_INUM; --ino) {
 		if (ISSET_BITMAP_FREE(fs, ino) == 0)
 			break;
@@ -602,8 +603,8 @@ lfs_order_freelist(struct lfs *fs)
 			lfs_truncate(vp, 0, 0, NOCRED);
 			vput(vp);
 			LFS_SEGENTRY(sup, fs, segno, bp);
-			KASSERT(sup->su_nbytes >= LFS_DINODE1_SIZE);
-			sup->su_nbytes -= LFS_DINODE1_SIZE;
+			KASSERT(sup->su_nbytes >= DINOSIZE(fs));
+			sup->su_nbytes -= DINOSIZE(fs);
 			LFS_WRITESEGENTRY(sup, fs, segno, bp);
 
 			/* Set up to fall through to next section */

Index: src/sys/ufs/lfs/lfs_segment.c
diff -u src/sys/ufs/lfs/lfs_segment.c:1.261 src/sys/ufs/lfs/lfs_segment.c:1.262
--- src/sys/ufs/lfs/lfs_segment.c:1.261	Sat Oct 10 22:33:31 2015
+++ src/sys/ufs/lfs/lfs_segment.c	Sat Oct 10 22:34:33 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_segment.c,v 1.261 2015/10/10 22:33:31 dholland Exp $	*/
+/*	$NetBSD: lfs_segment.c,v 1.262 2015/10/10 22:34:33 dholland Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.261 2015/10/10 22:33:31 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.262 2015/10/10 22:34:33 dholland Exp $");
 
 #ifdef DEBUG
 # define vndebug(vp, str) do {		\
@@ -2232,7 +2232,7 @@ lfs_writeseg(struct lfs *fs, struct segm
 if (copyin((void *)(*bpp)->b_saveaddr +
 	   byteoffset, dp, el_size)) {
 	panic("lfs_writeseg: copyin failed [1]:"
-		" ino %d blk %" PRId64,
+		" ino %" PRIu64 " blk %" PRId64,
 		VTOI((*bpp)->b_vp)->i_number,
 		(*bpp)->b_lblkno);
 }

Index: src/sys/ufs/lfs/lfs_syscalls.c
diff -u src/sys/ufs/lfs/lfs_syscalls.c:1.170 src/sys/ufs/lfs/lfs_syscalls.c:1.171
--- src/sys/ufs/lfs/lfs_syscalls.c:1.170	Tue Sep  1 06:08:37 2015
+++ src/sys/ufs/lfs/lfs_syscalls.c	Sat Oct 10 22:34:33 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_syscalls.c,v 1.170 2015/09/01 06:08:37 dholland Exp $	*/
+/*	$NetBSD: lfs_syscalls.c,v 1.171 2015/10/10 22:34:33 dholland Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007, 2008
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lfs_syscalls.c,v 1.170 2015/09/01 06:08:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_syscalls.c,v 1.171 2015/10/10 22:34:33 dholland Exp $");
 
 #ifndef LFS
 # define LFS		/* for prototypes in syscallargs.h */
@@ -122,7 +122,7 @@ sys_lfs_markv(struct lwp *l, const struc
 	if ((error = copyin(SCARG(uap, fsidp), , sizeof(fsid_t))) != 0)
 		return (error);
 
-	if ((mntp = vfs_getvfs(fsidp)) == NULL) 
+	if ((mntp = vfs_getvfs()) == NULL) 
 		return (ENOENT);
 	fs = VFSTOULFS(mntp)->um_lfs;
 
@@ -136,7 +136,7 @@ sys_lfs_markv(struct lwp *l, const struc
 			blkcnt * sizeof(BLOCK_INFO))) != 0)
 		goto out;
 
-	if ((error = lfs_markv(p, , blkiov, blkcnt)) == 0)
+	if ((error = lfs_markv(l, , blkiov, blkcnt)) == 0)
 		copyout(blkiov, SCARG(uap, blkiov),
 			blkcnt * sizeof(BLOCK_INFO));
 out:
@@ -551,15 +551,17 @@ sys_lfs_bmapv(struct lwp *l, const struc
 	fs = VFSTOULFS(mntp)->um_lfs;
 
 	blkcnt = SCARG(uap, blkcnt);
+#if SIZE_T_MAX <= UINT_MAX
 	if ((u_int) blkcnt > SIZE_T_MAX / sizeof(BLOCK_INFO))
 		return (EINVAL);
+#endif
 	KERNEL_LOCK(1, NULL);
 	blkiov = lfs_malloc(fs, blkcnt * sizeof(BLOCK_INFO), LFS_NB_BLKIOV);
 	if ((error = copyin(SCARG(uap, blkiov), blkiov,
 			blkcnt * sizeof(BLOCK_INFO))) !=

CVS commit: src/sys/ufs/lfs

2015-10-10 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Oct 10 22:33:57 UTC 2015

Modified Files:
src/sys/ufs/lfs: lfs_vfsops.c

Log Message:
Remove no longer needed explicit 32->64 sign extension.

This is the last 32-bit-on-disk item among those that were either
already tagged or readily discoverable.


To generate a diff of this commit:
cvs rdiff -u -r1.345 -r1.346 src/sys/ufs/lfs/lfs_vfsops.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/ufs/lfs/lfs_vfsops.c
diff -u src/sys/ufs/lfs/lfs_vfsops.c:1.345 src/sys/ufs/lfs/lfs_vfsops.c:1.346
--- src/sys/ufs/lfs/lfs_vfsops.c:1.345	Tue Sep  1 06:16:59 2015
+++ src/sys/ufs/lfs/lfs_vfsops.c	Sat Oct 10 22:33:57 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_vfsops.c,v 1.345 2015/09/01 06:16:59 dholland Exp $	*/
+/*	$NetBSD: lfs_vfsops.c,v 1.346 2015/10/10 22:33:57 dholland Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.345 2015/09/01 06:16:59 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.346 2015/10/10 22:33:57 dholland Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_lfs.h"
@@ -1843,9 +1843,6 @@ lfs_issequential_hole(const struct lfs *
 {
 	(void)fs; /* not used */
 
-	daddr0 = (daddr_t)((int32_t)daddr0); /* XXX ondisk32 */
-	daddr1 = (daddr_t)((int32_t)daddr1); /* XXX ondisk32 */
-
 	KASSERT(daddr0 == UNWRITTEN ||
 	(0 <= daddr0 && daddr0 <= LFS_MAX_DADDR(fs)));
 	KASSERT(daddr1 == UNWRITTEN ||

CVS commit: src/sbin/newfs_lfs

2015-10-10 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Oct 10 22:34:19 UTC 2015

Modified Files:
src/sbin/newfs_lfs: make_lfs.c

Log Message:
Use a specific SEGSUM size instead of the size of the union.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sbin/newfs_lfs/make_lfs.c

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

Modified files:

Index: src/sbin/newfs_lfs/make_lfs.c
diff -u src/sbin/newfs_lfs/make_lfs.c:1.57 src/sbin/newfs_lfs/make_lfs.c:1.58
--- src/sbin/newfs_lfs/make_lfs.c:1.57	Mon Sep 21 01:24:58 2015
+++ src/sbin/newfs_lfs/make_lfs.c	Sat Oct 10 22:34:19 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: make_lfs.c,v 1.57 2015/09/21 01:24:58 dholland Exp $	*/
+/*	$NetBSD: make_lfs.c,v 1.58 2015/10/10 22:34:19 dholland Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
 #if 0
 static char sccsid[] = "@(#)lfs.c	8.5 (Berkeley) 5/24/95";
 #else
-__RCSID("$NetBSD: make_lfs.c,v 1.57 2015/09/21 01:24:58 dholland Exp $");
+__RCSID("$NetBSD: make_lfs.c,v 1.58 2015/10/10 22:34:19 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -426,7 +426,7 @@ make_lfs(int devfd, uint secsize, struct
 	 * the segment table for the number of hash chains.
 	 */
 	tnseg = dkw->dkw_size / ((seg_size ? seg_size : DFL_LFSSEG) / secsize);
-	tsepb = (block_size ? block_size : DFL_LFSBLOCK) / sizeof(SEGSUM);
+	tsepb = (block_size ? block_size : DFL_LFSBLOCK) / sizeof(SEGSUM32);
 	if (tnseg == 0)
 		fatal("zero size partition");
 	bufinit(tnseg / tsepb);

CVS commit: src/share/misc

2015-10-10 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Oct 10 22:51:05 UTC 2015

Modified Files:
src/share/misc: acronyms

Log Message:
+FTR (from Nikolai Lifanov in PR 50293)


To generate a diff of this commit:
cvs rdiff -u -r1.240 -r1.241 src/share/misc/acronyms

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

Modified files:

Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.240 src/share/misc/acronyms:1.241
--- src/share/misc/acronyms:1.240	Fri Sep 18 13:40:10 2015
+++ src/share/misc/acronyms	Sat Oct 10 22:51:05 2015
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.240 2015/09/18 13:40:10 wiz Exp $
+$NetBSD: acronyms,v 1.241 2015/10/10 22:51:05 dholland Exp $
 10Q	thank you
 10X	thanks
 1337	elite ("leet")
@@ -151,6 +151,7 @@ FTFY	fixed that for you
 FTHOI	for the {heck,hell} of it
 FTL	faster than light
 FTL	for the loss
+FTR	for the record
 FTTT	from time to time
 FTW	for the win
 FUD	fear, uncertainty, [and] doubt

CVS commit: src/share/misc

2015-10-10 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sun Oct 11 00:58:24 UTC 2015

Modified Files:
src/share/misc: acronyms.comp

Log Message:
ALUA (asymmetric logical unit access) from Nikolai Lifanov in PR 50227


To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/share/misc/acronyms.comp

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

Modified files:

Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.150 src/share/misc/acronyms.comp:1.151
--- src/share/misc/acronyms.comp:1.150	Sat Aug 22 19:18:10 2015
+++ src/share/misc/acronyms.comp	Sun Oct 11 00:58:24 2015
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.150 2015/08/22 19:18:10 dholland Exp $
+$NetBSD: acronyms.comp,v 1.151 2015/10/11 00:58:24 dholland Exp $
 3WHS	three-way handshake
 8VSB	8-state vestigial side band modulation
 AA	anti-aliasing
@@ -37,6 +37,7 @@ AL	active link
 ALE	address latch enable
 ALS	ambient light sensor
 ALU	arithmetic and logical unit
+ALUA	asymmetric logical unit access
 AM	access method
 AM	alignment mask
 AM	amplitude modulation

CVS commit: src/sys/ufs/lfs

2015-10-10 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Oct 10 22:33:31 UTC 2015

Modified Files:
src/sys/ufs/lfs: lfs_balloc.c lfs_segment.c

Log Message:
Use accessors for some more indirect block manipulations.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/ufs/lfs/lfs_balloc.c
cvs rdiff -u -r1.260 -r1.261 src/sys/ufs/lfs/lfs_segment.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/ufs/lfs/lfs_balloc.c
diff -u src/sys/ufs/lfs/lfs_balloc.c:1.87 src/sys/ufs/lfs/lfs_balloc.c:1.88
--- src/sys/ufs/lfs/lfs_balloc.c:1.87	Tue Sep  1 06:08:37 2015
+++ src/sys/ufs/lfs/lfs_balloc.c	Sat Oct 10 22:33:31 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_balloc.c,v 1.87 2015/09/01 06:08:37 dholland Exp $	*/
+/*	$NetBSD: lfs_balloc.c,v 1.88 2015/10/10 22:33:31 dholland Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lfs_balloc.c,v 1.87 2015/09/01 06:08:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_balloc.c,v 1.88 2015/10/10 22:33:31 dholland Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -271,12 +271,10 @@ lfs_balloc(struct vnode *vp, off_t start
  * If that is the case mark it UNWRITTEN to keep
  * the accounting straight.
  */
-/* XXX ondisk32 */
-if (((int32_t *)ibp->b_data)[indirs[i].in_off] == 0)
-	((int32_t *)ibp->b_data)[indirs[i].in_off] =
-		UNWRITTEN;
-/* XXX ondisk32 */
-idaddr = ((int32_t *)ibp->b_data)[indirs[i].in_off];
+if (lfs_iblock_get(fs, ibp->b_data, indirs[i].in_off) == 0)
+	lfs_iblock_set(fs, ibp->b_data, indirs[i].in_off,
+		UNWRITTEN);
+idaddr = lfs_iblock_get(fs, ibp->b_data, indirs[i].in_off);
 #ifdef DEBUG
 if (vp == fs->lfs_ivnode) {
 	LFS_ENTER_LOG("balloc", __FILE__,
@@ -333,8 +331,7 @@ lfs_balloc(struct vnode *vp, off_t start
   B_MODIFY, ))
 panic("lfs_balloc: bread bno %lld",
 (long long)idp->in_lbn);
-			/* XXX ondisk32 */
-			((int32_t *)ibp->b_data)[idp->in_off] = UNWRITTEN;
+			lfs_iblock_set(fs, ibp->b_data, idp->in_off, UNWRITTEN);
 #ifdef DEBUG
 			if (vp == fs->lfs_ivnode) {
 LFS_ENTER_LOG("balloc", __FILE__,

Index: src/sys/ufs/lfs/lfs_segment.c
diff -u src/sys/ufs/lfs/lfs_segment.c:1.260 src/sys/ufs/lfs/lfs_segment.c:1.261
--- src/sys/ufs/lfs/lfs_segment.c:1.260	Sat Oct  3 08:28:16 2015
+++ src/sys/ufs/lfs/lfs_segment.c	Sat Oct 10 22:33:31 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_segment.c,v 1.260 2015/10/03 08:28:16 dholland Exp $	*/
+/*	$NetBSD: lfs_segment.c,v 1.261 2015/10/10 22:33:31 dholland Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.260 2015/10/03 08:28:16 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.261 2015/10/10 22:33:31 dholland Exp $");
 
 #ifdef DEBUG
 # define vndebug(vp, str) do {		\
@@ -2035,7 +2035,7 @@ lfs_writeseg(struct lfs *fs, struct segm
 	struct vnode *devvp;
 	char *p = NULL;
 	struct vnode *vp;
-	int32_t *daddrp;	/* XXX ondisk32 */
+	unsigned ibindex, iblimit;
 	int changed;
 	u_int32_t sum;
 	size_t sumstart;
@@ -2162,13 +2162,12 @@ lfs_writeseg(struct lfs *fs, struct segm
 			   newbp->b_bcount);
 
 			changed = 0;
-			/* XXX ondisk32 */
-			for (daddrp = (int32_t *)(newbp->b_data);
-			 daddrp < (int32_t *)((char *)newbp->b_data +
-		  newbp->b_bcount); daddrp++) {
-if (*daddrp == UNWRITTEN) {
+			iblimit = newbp->b_bcount / LFS_BLKPTRSIZE(fs);
+			for (ibindex = 0; ibindex < iblimit; ibindex++) {
+if (lfs_iblock_get(fs, newbp->b_data, ibindex) == UNWRITTEN) {
 	++changed;
-	*daddrp = 0;
+	lfs_iblock_set(fs, newbp->b_data,
+		   ibindex, 0);
 }
 			}
 			/*

CVS commit: src/sys/ufs/lfs

2015-10-10 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Oct 10 22:33:44 UTC 2015

Modified Files:
src/sys/ufs/lfs: lfs_accessors.h

Log Message:
Add byteswapping to the inode block-pointer accessors.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/ufs/lfs/lfs_accessors.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/ufs/lfs/lfs_accessors.h
diff -u src/sys/ufs/lfs/lfs_accessors.h:1.36 src/sys/ufs/lfs/lfs_accessors.h:1.37
--- src/sys/ufs/lfs/lfs_accessors.h:1.36	Sat Oct  3 08:29:48 2015
+++ src/sys/ufs/lfs/lfs_accessors.h	Sat Oct 10 22:33:44 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_accessors.h,v 1.36 2015/10/03 08:29:48 dholland Exp $	*/
+/*	$NetBSD: lfs_accessors.h,v 1.37 2015/10/10 22:33:44 dholland Exp $	*/
 
 /*  from NetBSD: lfs.h,v 1.165 2015/07/24 06:59:32 dholland Exp  */
 /*  from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp  */
@@ -499,10 +499,10 @@ lfs_dino_getdb(STRUCT_LFS *fs, union lfs
 {
 	KASSERT(ix < ULFS_NDADDR);
 	if (fs->lfs_is64) {
-		return dip->u_64.di_db[ix];
+		return LFS_SWAP_uint64_t(fs, dip->u_64.di_db[ix]);
 	} else {
 		/* note: this must sign-extend or UNWRITTEN gets trashed */
-		return dip->u_32.di_db[ix];
+		return (int32_t)LFS_SWAP_uint32_t(fs, dip->u_32.di_db[ix]);
 	}
 }
 
@@ -511,10 +511,10 @@ lfs_dino_getib(STRUCT_LFS *fs, union lfs
 {
 	KASSERT(ix < ULFS_NIADDR);
 	if (fs->lfs_is64) {
-		return dip->u_64.di_ib[ix];
+		return LFS_SWAP_uint64_t(fs, dip->u_64.di_ib[ix]);
 	} else {
 		/* note: this must sign-extend or UNWRITTEN gets trashed */
-		return dip->u_32.di_ib[ix];
+		return (int32_t)LFS_SWAP_uint32_t(fs, dip->u_32.di_ib[ix]);
 	}
 }
 
@@ -523,9 +523,9 @@ lfs_dino_setdb(STRUCT_LFS *fs, union lfs
 {
 	KASSERT(ix < ULFS_NDADDR);
 	if (fs->lfs_is64) {
-		dip->u_64.di_db[ix] = val;
+		dip->u_64.di_db[ix] = LFS_SWAP_uint64_t(fs, val);
 	} else {
-		dip->u_32.di_db[ix] = val;
+		dip->u_32.di_db[ix] = LFS_SWAP_uint32_t(fs, val);
 	}
 }
 
@@ -534,9 +534,9 @@ lfs_dino_setib(STRUCT_LFS *fs, union lfs
 {
 	KASSERT(ix < ULFS_NIADDR);
 	if (fs->lfs_is64) {
-		dip->u_64.di_ib[ix] = val;
+		dip->u_64.di_ib[ix] = LFS_SWAP_uint64_t(fs, val);
 	} else {
-		dip->u_32.di_ib[ix] = val;
+		dip->u_32.di_ib[ix] = LFS_SWAP_uint32_t(fs, val);
 	}
 }

CVS commit: src/usr.bin/xinstall

2015-10-10 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Oct 10 22:54:03 UTC 2015

Modified Files:
src/usr.bin/xinstall: Makefile

Log Message:
Don't assume HAVE_POSIX_SPAWN when building a host prog. From Joachim
Kuebart in PR 50301. needs pullup-7


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/xinstall/Makefile

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/xinstall/Makefile
diff -u src/usr.bin/xinstall/Makefile:1.25 src/usr.bin/xinstall/Makefile:1.26
--- src/usr.bin/xinstall/Makefile:1.25	Wed Jun 17 15:34:08 2015
+++ src/usr.bin/xinstall/Makefile	Sat Oct 10 22:54:03 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.25 2015/06/17 15:34:08 christos Exp $
+#	$NetBSD: Makefile,v 1.26 2015/10/10 22:54:03 dholland Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 .include 
@@ -12,9 +12,9 @@ CPPFLAGS+=	-I${NETBSDSRCDIR}/usr.bin/mak
 
 .PATH:		${NETBSDSRCDIR}/usr.sbin/mtree
 CPPFLAGS+=	-I${NETBSDSRCDIR}/usr.sbin/mtree
-CPPFLAGS+=	-DHAVE_POSIX_SPAWN
 
 .if (${HOSTPROG:U} == "")
+CPPFLAGS+=	-DHAVE_POSIX_SPAWN
 DPADD+= ${LIBUTIL}
 LDADD+= -lutil
 .endif

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

2015-10-10 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Oct 11 01:01:46 UTC 2015

Modified Files:
src/external/mit/lua/dist/src: lobject.c lstrlib.c luac.c luaconf.h

Log Message:
Get rid of the sprintf() bogus macro and use lengths explicitly when buffers
are involved.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/lua/dist/src/lobject.c
cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/src/lstrlib.c
cvs rdiff -u -r1.4 -r1.5 src/external/mit/lua/dist/src/luac.c
cvs rdiff -u -r1.14 -r1.15 src/external/mit/lua/dist/src/luaconf.h

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

Modified files:

Index: src/external/mit/lua/dist/src/lobject.c
diff -u src/external/mit/lua/dist/src/lobject.c:1.5 src/external/mit/lua/dist/src/lobject.c:1.6
--- src/external/mit/lua/dist/src/lobject.c:1.5	Thu Oct  8 09:21:00 2015
+++ src/external/mit/lua/dist/src/lobject.c	Sat Oct 10 21:01:45 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: lobject.c,v 1.5 2015/10/08 13:21:00 mbalmer Exp $	*/
+/*	$NetBSD: lobject.c,v 1.6 2015/10/11 01:01:45 christos Exp $	*/
 
 /*
 ** Id: lobject.c,v 2.104 2015/04/11 18:30:08 roberto Exp 
@@ -358,9 +358,9 @@ void luaO_tostring (lua_State *L, StkId 
   lua_assert(ttisnumber(obj));
 #ifndef _KERNEL
   if (ttisinteger(obj))
-len = lua_integer2str(buff, ivalue(obj));
+len = lua_integer2str(buff, sizeof(buff), ivalue(obj));
   else {
-len = lua_number2str(buff, fltvalue(obj));
+len = lua_number2str(buff, sizeof(buff), fltvalue(obj));
 #if !defined(LUA_COMPAT_FLOATSTRING)
 if (buff[strspn(buff, "-0123456789")] == '\0') {  /* looks like an int? */
   buff[len++] = lua_getlocaledecpoint();
@@ -424,7 +424,7 @@ const char *luaO_pushvfstring (lua_State
 #endif
   case 'p': {
 char buff[4*sizeof(void *) + 8]; /* should be enough space for a '%p' */
-int l = sprintf(buff, "%p", va_arg(argp, void *));
+int l = snprintf(buff, sizeof(buff), "%p", va_arg(argp, void *));
 pushstr(L, buff, l);
 break;
   }

Index: src/external/mit/lua/dist/src/lstrlib.c
diff -u src/external/mit/lua/dist/src/lstrlib.c:1.9 src/external/mit/lua/dist/src/lstrlib.c:1.10
--- src/external/mit/lua/dist/src/lstrlib.c:1.9	Thu Oct  8 09:40:16 2015
+++ src/external/mit/lua/dist/src/lstrlib.c	Sat Oct 10 21:01:45 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: lstrlib.c,v 1.9 2015/10/08 13:40:16 mbalmer Exp $	*/
+/*	$NetBSD: lstrlib.c,v 1.10 2015/10/11 01:01:45 christos Exp $	*/
 
 /*
 ** Id: lstrlib.c,v 1.229 2015/05/20 17:39:23 roberto Exp 
@@ -834,12 +834,12 @@ static lua_Number adddigit (char *buff, 
 }
 
 
-static int num2straux (char *buff, lua_Number x) {
+static int num2straux (char *buff, size_t len, lua_Number x) {
   if (x != x || x == HUGE_VAL || x == -HUGE_VAL)  /* inf or NaN? */
-return sprintf(buff, LUA_NUMBER_FMT, x);  /* equal to '%g' */
+return snprintf(buff, len, LUA_NUMBER_FMT, x);  /* equal to '%g' */
   else if (x == 0) {  /* can be -0... */
-sprintf(buff, LUA_NUMBER_FMT, x);
-strcat(buff, "x0p+0");  /* reuses '0/-0' from 'sprintf'... */
+snprintf(buff, len, LUA_NUMBER_FMT, x);
+strlcat(buff, "x0p+0", len);  /* reuses '0/-0' from 'snprintf'... */
 return strlen(buff);
   }
   else {
@@ -859,7 +859,8 @@ static int num2straux (char *buff, lua_N
 m = adddigit(buff, n++, m * 16);
   } while (m > 0);
 }
-n += sprintf(buff + n, "p%+d", e);  /* add exponent */
+if (len > (size_t)n)
+	n += snprintf(buff + n, len - n, "p%+d", e);  /* add exponent */
 return n;
   }
 }
@@ -913,9 +914,9 @@ static void addquoted (lua_State *L, lua
 else if (*s == '\0' || iscntrl(uchar(*s))) {
   char buff[10];
   if (!isdigit(uchar(*(s+1
-sprintf(buff, "\\%d", (int)uchar(*s));
+snprintf(buff, sizeof(buff), "\\%d", (int)uchar(*s));
   else
-sprintf(buff, "\\%03d", (int)uchar(*s));
+snprintf(buff, sizeof(buff), "\\%03d", (int)uchar(*s));
   luaL_addstring(b, buff);
 }
 else
@@ -982,25 +983,25 @@ static int str_format (lua_State *L) {
   strfrmt = scanformat(L, strfrmt, form);
   switch (*strfrmt++) {
 case 'c': {
-  nb = sprintf(buff, form, (int)luaL_checkinteger(L, arg));
+  nb = snprintf(buff, MAX_ITEM, form, (int)luaL_checkinteger(L, arg));
   break;
 }
 case 'd': case 'i':
 case 'o': case 'u': case 'x': case 'X': {
   lua_Integer n = luaL_checkinteger(L, arg);
   addlenmod(form, LUA_INTEGER_FRMLEN);
-  nb = sprintf(buff, form, n);
+  nb = snprintf(buff, MAX_ITEM, form, n);
   break;
 }
 #ifndef _KERNEL
 case 'a': case 'A':
   addlenmod(form, LUA_NUMBER_FRMLEN);
-  nb = lua_number2strx(L, buff, form, luaL_checknumber(L, arg));
+  nb = lua_number2strx(L, buff, MAX_ITEM, form, luaL_checknumber(L, arg));
   break;
 case

CVS commit: src/sys/dev/dkwedge

2015-10-10 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Oct 10 23:39:43 UTC 2015

Modified Files:
src/sys/dev/dkwedge: dk.c

Log Message:
remove incorrect comment (from kre)


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/dkwedge/dk.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/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.84 src/sys/dev/dkwedge/dk.c:1.85
--- src/sys/dev/dkwedge/dk.c:1.84	Tue Oct  6 07:22:40 2015
+++ src/sys/dev/dkwedge/dk.c	Sat Oct 10 19:39:43 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: dk.c,v 1.84 2015/10/06 11:22:40 jmcneill Exp $	*/
+/*	$NetBSD: dk.c,v 1.85 2015/10/10 23:39:43 christos Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.84 2015/10/06 11:22:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.85 2015/10/10 23:39:43 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_dkwedge.h"
@@ -684,8 +684,6 @@ dkwedge_delall1(struct disk *pdk, bool i
  * dkwedge_list:	[exported function]
  *
  *	List all of the wedges on a particular disk.
- *	If p == NULL, the buffer is in kernel space.  Otherwise, it is
- *	in user space of the specified process.
  */
 int
 dkwedge_list(struct disk *pdk, struct dkwedge_list *dkwl, struct lwp *l)

CVS commit: src/usr.bin/make

2015-10-10 Thread Simon J. Gerraty

Module Name:src
Committed By:   sjg
Date:   Sun Oct 11 04:51:24 UTC 2015

Modified Files:
src/usr.bin/make: arch.c compat.c cond.c for.c job.c main.c make.c
meta.c nonints.h parse.c suff.c var.c
src/usr.bin/make/unit-tests: varmisc.exp varmisc.mk

Log Message:
Add Boolean wantit to Var_Parse and Var_Subst

wantit will be FALSE when we are just consuming to discard
in which case we skip "expensive" things like Cmd_Exec.

Reviewed by: christos


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/usr.bin/make/arch.c
cvs rdiff -u -r1.100 -r1.101 src/usr.bin/make/compat.c
cvs rdiff -u -r1.68 -r1.69 src/usr.bin/make/cond.c src/usr.bin/make/nonints.h
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/make/for.c
cvs rdiff -u -r1.180 -r1.181 src/usr.bin/make/job.c
cvs rdiff -u -r1.233 -r1.234 src/usr.bin/make/main.c
cvs rdiff -u -r1.91 -r1.92 src/usr.bin/make/make.c
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/make/meta.c
cvs rdiff -u -r1.204 -r1.205 src/usr.bin/make/parse.c
cvs rdiff -u -r1.73 -r1.74 src/usr.bin/make/suff.c
cvs rdiff -u -r1.196 -r1.197 src/usr.bin/make/var.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/varmisc.exp
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/varmisc.mk

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/arch.c
diff -u src/usr.bin/make/arch.c:1.63 src/usr.bin/make/arch.c:1.64
--- src/usr.bin/make/arch.c:1.63	Tue Jun 12 19:21:50 2012
+++ src/usr.bin/make/arch.c	Sun Oct 11 04:51:24 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: arch.c,v 1.63 2012/06/12 19:21:50 joerg Exp $	*/
+/*	$NetBSD: arch.c,v 1.64 2015/10/11 04:51:24 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: arch.c,v 1.63 2012/06/12 19:21:50 joerg Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.64 2015/10/11 04:51:24 sjg Exp $";
 #else
 #include 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)arch.c	8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: arch.c,v 1.63 2012/06/12 19:21:50 joerg Exp $");
+__RCSID("$NetBSD: arch.c,v 1.64 2015/10/11 04:51:24 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -261,7 +261,7 @@ Arch_ParseArchive(char **linePtr, Lst no
 	void	*freeIt;
 	char	*result;
 
-	result = Var_Parse(cp, ctxt, TRUE, , );
+	result = Var_Parse(cp, ctxt, TRUE, TRUE, , );
 	if (freeIt)
 		free(freeIt);
 	if (result == var_Error) {
@@ -276,7 +276,7 @@ Arch_ParseArchive(char **linePtr, Lst no
 
 *cp++ = '\0';
 if (subLibName) {
-	libName = Var_Subst(NULL, libName, ctxt, TRUE);
+	libName = Var_Subst(NULL, libName, ctxt, TRUE, TRUE);
 }
 
 
@@ -302,7 +302,7 @@ Arch_ParseArchive(char **linePtr, Lst no
 		void	*freeIt;
 		char	*result;
 
-		result = Var_Parse(cp, ctxt, TRUE, , );
+		result = Var_Parse(cp, ctxt, TRUE, TRUE, , );
 		if (freeIt)
 		free(freeIt);
 		if (result == var_Error) {
@@ -355,7 +355,7 @@ Arch_ParseArchive(char **linePtr, Lst no
 	char*oldMemName = memName;
 	size_t   sz;
 
-	memName = Var_Subst(NULL, memName, ctxt, TRUE);
+	memName = Var_Subst(NULL, memName, ctxt, TRUE, TRUE);
 
 	/*
 	 * Now form an archive spec and recurse to deal with nested

Index: src/usr.bin/make/compat.c
diff -u src/usr.bin/make/compat.c:1.100 src/usr.bin/make/compat.c:1.101
--- src/usr.bin/make/compat.c:1.100	Fri Jun 19 14:32:04 2015
+++ src/usr.bin/make/compat.c	Sun Oct 11 04:51:24 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat.c,v 1.100 2015/06/19 14:32:04 christos Exp $	*/
+/*	$NetBSD: compat.c,v 1.101 2015/10/11 04:51:24 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: compat.c,v 1.100 2015/06/19 14:32:04 christos Exp $";
+static char rcsid[] = "$NetBSD: compat.c,v 1.101 2015/10/11 04:51:24 sjg Exp $";
 #else
 #include 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: compat.c,v 1.100 2015/06/19 14:32:04 christos Exp $");
+__RCSID("$NetBSD: compat.c,v 1.101 2015/10/11 04:51:24 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -210,7 +210,7 @@ CompatRunCommand(void *cmdp, void *gnp)
 doIt = FALSE;
 
 cmdNode = Lst_Member(gn->commands, cmd);
-cmdStart = Var_Subst(NULL, cmd, gn, FALSE);
+cmdStart = Var_Subst(NULL, cmd, gn, FALSE, TRUE);
 
 /*
  * brk_string will return an argv with a NULL in av[0], thus causing

Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.68 src/usr.bin/make/cond.c:1.69
--- src/usr.bin/make/cond.c:1.68	Tue May  5 21:51:09 2015
+++ src/usr.bin/make/cond.c	Sun Oct 11 04:51:24 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: cond.c,v 1.68 2015/05/05 21:51:09 sjg Exp $	*/
+/*	$NetBSD: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of

CVS commit: src/sys/arch/sparc/stand/ofwboot

2015-10-10 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Oct 10 06:50:25 UTC 2015

Modified Files:
src/sys/arch/sparc/stand/ofwboot: Locore.c

Log Message:
Add compile time asserts to make sure we have properly picked up types
for a 64bit cpu and 64bit openfirmware.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sparc/stand/ofwboot/Locore.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/sparc/stand/ofwboot/Locore.c
diff -u src/sys/arch/sparc/stand/ofwboot/Locore.c:1.14 src/sys/arch/sparc/stand/ofwboot/Locore.c:1.15
--- src/sys/arch/sparc/stand/ofwboot/Locore.c:1.14	Fri Mar 27 06:07:33 2015
+++ src/sys/arch/sparc/stand/ofwboot/Locore.c	Sat Oct 10 06:50:25 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: Locore.c,v 1.14 2015/03/27 06:07:33 nakayama Exp $	*/
+/*	$NetBSD: Locore.c,v 1.15 2015/10/10 06:50:25 martin Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -36,6 +36,15 @@
 
 #include 
 
+/*
+ * We are trying to boot a sparc v9 cpu, so openfirmware has to be 64bit,
+ * and the kernel we load will be dealing with 64bits too (even if it is
+ * a 32bit kernel.
+ * Make sure we picked up the right defines:
+ */
+__CTASSERT(sizeof(cell_t)==8);
+__CTASSERT(sizeof(paddr_t)==8);
+
 extern int openfirmware(void *);

CVS commit: src/sys/arch/sparc/stand/ofwboot

2015-10-10 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Oct 10 06:49:40 UTC 2015

Modified Files:
src/sys/arch/sparc/stand/ofwboot: Makefile

Log Message:
Simplify, get rid of manual _LP64 define.
Do not pass a SUN4U define, as that is no longer used in the relevant headers.
Instead tell the compiler we are compiling for a v9 CPU (so it internally
defines everything we need).


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sparc/stand/ofwboot/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/sparc/stand/ofwboot/Makefile
diff -u src/sys/arch/sparc/stand/ofwboot/Makefile:1.34 src/sys/arch/sparc/stand/ofwboot/Makefile:1.35
--- src/sys/arch/sparc/stand/ofwboot/Makefile:1.34	Fri Oct  2 20:36:54 2015
+++ src/sys/arch/sparc/stand/ofwboot/Makefile	Sat Oct 10 06:49:40 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.34 2015/10/02 20:36:54 joerg Exp $
+#	$NetBSD: Makefile,v 1.35 2015/10/10 06:49:40 martin Exp $
 
 CURDIR=	${.CURDIR}
 S=	${CURDIR}/../../../..
@@ -15,6 +15,7 @@ SRCS=		srt0.s Locore.c boot.c ofdev.c al
 SRCS+=		bootinfo.c loadfile_machdep.c promlib.c prf.c isfloppy.c
 .if ${MACHINE_ARCH} == "sparc64"
 SRCS+=		hvcall.S
+CPPFLAGS+=	-DSUN4V
 .endif
 .PATH:		${S}/arch/sparc64/sparc64 ${S}/arch/sparc/stand/common
 
@@ -27,11 +28,8 @@ LIBCRTEND=
 
 COPTS+=		-ffreestanding
 CWARNFLAGS+=	-Wno-main
-CFLAGS+=	${COPTS} ${CEXTRAFLAGS}
-CPPFLAGS+=	-D_STANDALONE -DSUN4U
-.if ${MACHINE_ARCH} == "sparc64"
-CPPFLAGS+=	-DSUN4V
-.endif
+CFLAGS+=	${COPTS}
+CPPFLAGS+=	-D_STANDALONE
 CPPFLAGS+=	-DBOOT_ELF32 -DBOOT_ELF64 -DBOOT_AOUT
 CPPFLAGS+=	-DNETBOOT
 CPPFLAGS+=	-DSUPPORT_DHCP
@@ -109,19 +107,9 @@ ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBK
 
 .include 
 
-.if ${MACHINE_ARCH} == "sparc64"
+CPUFLAGS+=		-mcpu=v9
 AFLAGS+=		-Wa,-Av9a
-CEXTRAFLAGS?=		-D_LP64
-.else
-AFLAGS+=		-Wa,-Av8plusa
-.endif
-
-.if CROSS
 AFLAGS+=		-x assembler-with-cpp -D_LOCORE -D__ELF__
-CEXTRAFLAGS?=		-D_LP64
-.else
-AFLAGS+=		-x assembler-with-cpp -D_LOCORE -D__ELF__ ${CEXTRAFLAGS}
-.endif
 
 NORMAL_S=	${CC} ${AFLAGS} ${AFLAGS.${<:T}}  ${CPPFLAGS} -c $<
 srt0.o: srt0.s

CVS commit: xsrc/external/mit/ctwm/dist

2015-10-10 Thread Marc Balmer

Module Name:xsrc
Committed By:   mbalmer
Date:   Sat Oct 10 09:08:11 UTC 2015

Modified Files:
xsrc/external/mit/ctwm/dist: README

Log Message:
fox wording and typos


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/ctwm/dist/README

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

Modified files:

Index: xsrc/external/mit/ctwm/dist/README
diff -u xsrc/external/mit/ctwm/dist/README:1.1 xsrc/external/mit/ctwm/dist/README:1.2
--- xsrc/external/mit/ctwm/dist/README:1.1	Thu Sep  3 22:16:33 2015
+++ xsrc/external/mit/ctwm/dist/README	Sat Oct 10 09:08:11 2015
@@ -2,20 +2,20 @@

 
 
-CTWM is an extension to twm, originally written by Claude Lecommandeur
-that support multiple virtual screens, and a lot of other goodies.
+CTWM is an extension to twm, originally written by Claude Lecommandeur,
+that supports multiple virtual screens, and a lot of other goodies.
 
 You can use and manage up to 32 virtual screens called workspaces.
 You swap from one workspace to another by clicking on a button in an
-optionnal panel of buttons (the workspace manager) or by invoking a
+optional panel of buttons (the workspace manager) or by invoking a
 function.
 
-You can custom each workspace by choosing different colors, names and
+You can customize each workspace by choosing different colors, names and
 pixmaps for the buttons and background root windows.
 
 Main features are :
 
- - Optional 3D window titles and border (ala Motif).
+ - Optional 3D window titles and borders (ala Motif).
  - Shaped, colored icons.
  - Multiple icons for clients based on the icon name.
  - Windows can belong to several workspaces.
@@ -25,7 +25,7 @@ Main features are :
  - Pinnable and sticky menus.
  - etc...
 
-The sources files were once the twm ones with only workmgr.[ch] added
+The source files were once the twm ones with only workmgr.[ch] added
 (written from scratch by Claude Lecommandeur).  There were also some
 modifications to some twm files.  This was back in CTWM version 1, by
 now, there are a bit more changes and a few more additions.  It's
@@ -40,7 +40,7 @@ please send a report to the mailing list
 
 Configuration:
 
-Ctwm is built using xmkmf, which read Imakefile.  That file includes
+Ctwm is built using xmkmf, which reads Imakefile.  That file includes
 Imakefile.local, which is meant for local configuration, and *WHICH YOU
 MUST CREATE*.  For your comfort, the file Imakefile.local-template can
 simply be copied to Imakefile.local, then changed.

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

2015-10-10 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Sat Oct 10 07:23:25 UTC 2015

Modified Files:
src/sys/dev/usb [nick-nhusb]: usbdi.c

Log Message:
KNF


To generate a diff of this commit:
cvs rdiff -u -r1.162.2.29 -r1.162.2.30 src/sys/dev/usb/usbdi.c

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

Modified files:

Index: src/sys/dev/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.162.2.29 src/sys/dev/usb/usbdi.c:1.162.2.30
--- src/sys/dev/usb/usbdi.c:1.162.2.29	Tue Oct  6 21:32:15 2015
+++ src/sys/dev/usb/usbdi.c	Sat Oct 10 07:23:25 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi.c,v 1.162.2.29 2015/10/06 21:32:15 skrll Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.162.2.30 2015/10/10 07:23:25 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.29 2015/10/06 21:32:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.30 2015/10/10 07:23:25 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -487,7 +487,8 @@ usbd_free_xfer(struct usbd_xfer *xfer)
 	return USBD_NORMAL_COMPLETION;
 }
 
-int usbd_create_xfer(struct usbd_pipe *pipe, size_t len, unsigned int flags,
+int
+usbd_create_xfer(struct usbd_pipe *pipe, size_t len, unsigned int flags,
 unsigned int nframes, struct usbd_xfer **xp)
 {
 	KASSERT(xp != NULL);

CVS commit: src/sys/sys

2015-10-10 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Sat Oct 10 10:51:15 UTC 2015

Modified Files:
src/sys/sys: exec.h

Log Message:
Remove the mach entry.


To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/sys/sys/exec.h

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

Modified files:

Index: src/sys/sys/exec.h
diff -u src/sys/sys/exec.h:1.148 src/sys/sys/exec.h:1.149
--- src/sys/sys/exec.h:1.148	Sun Dec 14 23:49:28 2014
+++ src/sys/sys/exec.h	Sat Oct 10 10:51:15 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec.h,v 1.148 2014/12/14 23:49:28 chs Exp $	*/
+/*	$NetBSD: exec.h,v 1.149 2015/10/10 10:51:15 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -154,7 +154,6 @@ struct execsw {
 		int (*elf_probe_func)(struct lwp *,
 			struct exec_package *, void *, char *, vaddr_t *);
 		int (*ecoff_probe_func)(struct lwp *, struct exec_package *);
-		int (*mach_probe_func)(const char **);
 	} u;
 	struct  emul *es_emul;		/* os emulation */
 	int	es_prio;		/* entry priority */

CVS commit: src/external/bsd/pkg_install/dist/create

2015-10-10 Thread Marc Balmer

Module Name:src
Committed By:   mbalmer
Date:   Sat Oct 10 10:08:12 UTC 2015

Modified Files:
src/external/bsd/pkg_install/dist/create: pkg_create.1

Log Message:
use a verb in the authors section for all entries


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8 -r1.2 \
src/external/bsd/pkg_install/dist/create/pkg_create.1

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/pkg_install/dist/create/pkg_create.1
diff -u src/external/bsd/pkg_install/dist/create/pkg_create.1:1.1.1.8 src/external/bsd/pkg_install/dist/create/pkg_create.1:1.2
--- src/external/bsd/pkg_install/dist/create/pkg_create.1:1.1.1.8	Fri Apr 23 20:54:08 2010
+++ src/external/bsd/pkg_install/dist/create/pkg_create.1	Sat Oct 10 10:08:12 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_create.1,v 1.1.1.8 2010/04/23 20:54:08 joerg Exp $
+.\" $NetBSD: pkg_create.1,v 1.2 2015/10/10 10:08:12 mbalmer Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -24,7 +24,7 @@
 .\" [jkh] Took John's changes back and made some additional extensions for
 .\" better integration with FreeBSD's new ports collection.
 .\"
-.Dd January 20, 2010
+.Dd October 10, 2015
 .Dt PKG_CREATE 1
 .Os
 .Sh NAME
@@ -494,11 +494,12 @@ command first appeared in
 .Sh AUTHORS
 .Bl -tag -width indent -compact
 .It Jordan Hubbard
-most of the work
+did most of the work.
 .It John Kohl
 refined it for
-.Nx
+.Nx .
 .It Hubert Feyrer
+added
 .Nx
 wildcard dependency processing, pkgdb, pkg size recording etc.
 .El

CVS commit: src/sys/external/bsd/drm2/dist/drm/i915

CVS commit: src/sys/arch/alpha/alpha

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

CVS commit: src/sys/external/bsd/drm2/dist/drm/i915

CVS commit: src/libexec/lfs_cleanerd

CVS commit: src

CVS commit: src/sys/ufs/lfs

CVS commit: src/sys/ufs/lfs

CVS commit: src/sbin/newfs_lfs

CVS commit: src/share/misc

CVS commit: src/share/misc

CVS commit: src/sys/ufs/lfs

CVS commit: src/sys/ufs/lfs

CVS commit: src/usr.bin/xinstall

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

CVS commit: src/sys/dev/dkwedge

CVS commit: src/usr.bin/make

CVS commit: src/sys/arch/sparc/stand/ofwboot

CVS commit: src/sys/arch/sparc/stand/ofwboot

CVS commit: xsrc/external/mit/ctwm/dist

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

CVS commit: src/sys/sys

CVS commit: src/external/bsd/pkg_install/dist/create

23 matches

Site Navigation

Mail list logo

Footer information