CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Aug 20 23:56:20 UTC 2016

Modified Files:
src/distrib/sets/lists/xdebug: md.amd64 md.i386 md.macppc md.ofppc
md.shark
src/distrib/sets/lists/xserver: md.amd64 md.i386 md.macppc md.ofppc
md.shark
src/external/mit/xorg/server/drivers: Makefile

Log Message:
reenable chips driver everywhere now it builds with xorg-server 1.18


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xdebug/md.macppc \
src/distrib/sets/lists/xdebug/md.ofppc
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/xdebug/md.shark
cvs rdiff -u -r1.95 -r1.96 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.112 -r1.113 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/xserver/md.macppc
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/xserver/md.ofppc
cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/xserver/md.shark
cvs rdiff -u -r1.85 -r1.86 src/external/mit/xorg/server/drivers/Makefile

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

Modified files:

Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.33 src/distrib/sets/lists/xdebug/md.amd64:1.34
--- src/distrib/sets/lists/xdebug/md.amd64:1.33	Sat Aug 20 05:02:58 2016
+++ src/distrib/sets/lists/xdebug/md.amd64	Sat Aug 20 23:56:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.33 2016/08/20 05:02:58 mrg Exp $
+# $NetBSD: md.amd64,v 1.34 2016/08/20 23:56:19 mrg Exp $
 ./usr/X11R7/lib/libI810XvMC_g.a-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libIntelXvMC_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libchromeXvMCPro_g.a			-unknown-	debuglib,xorg,compatx11file
@@ -81,7 +81,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug	-unknown-		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug	-unknown-		xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug	-unknown-		xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug	-unknown-		xorg

Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.29 src/distrib/sets/lists/xdebug/md.i386:1.30
--- src/distrib/sets/lists/xdebug/md.i386:1.29	Sat Aug 20 05:02:58 2016
+++ src/distrib/sets/lists/xdebug/md.i386	Sat Aug 20 23:56:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.29 2016/08/20 05:02:58 mrg Exp $
+# $NetBSD: md.i386,v 1.30 2016/08/20 23:56:19 mrg Exp $
 ./usr/X11R7/lib/libI810XvMC_g.a-unknown-	debuglib,xorg
 ./usr/X11R7/lib/libIntelXvMC_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/libchromeXvMCPro_g.a			-unknown-	debuglib,xorg
@@ -89,7 +89,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug	-unknown-		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug	-unknown-		xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug	-unknown-		xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1.debug	-unknown-	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug	-unknown-	xorg,debug

Index: src/distrib/sets/lists/xdebug/md.macppc
diff -u src/distrib/sets/lists/xdebug/md.macppc:1.8 src/distrib/sets/lists/xdebug/md.macppc:1.9
--- src/distrib/sets/lists/xdebug/md.macppc:1.8	Sat Aug 20 06:51:00 2016
+++ src/distrib/sets/lists/xdebug/md.macppc	Sat Aug 20 23:56:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.8 2016/08/20 06:51:00 mrg Exp $
+# $NetBSD: md.macppc,v 1.9 2016/08/20 23:56:19 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libcfb32_g.a		-unknown-	obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb_g.a		-unknown-	obsolete
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	debuglib,xorg,obsolete
@@ -54,7 +54,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug	-unknown-		obsolete,debug
 

CVS commit: xsrc/external/mit/xf86-video-chips/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Aug 20 21:50:44 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-chips/dist/src: ct_driver.c

Log Message:
port this to xorg-server 1.18 and libpciaccess fully.  not tested.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c

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/xf86-video-chips/dist/src/ct_driver.c
diff -u xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.20 xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.21
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.20	Sat Aug 20 19:49:51 2016
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c	Sat Aug 20 21:50:44 2016
@@ -2335,7 +2335,7 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, i
 CHIPSPtr cPtr = CHIPSPTR(pScrn);
 CHIPSClockPtr SaveClk = &(cPtr->SavedReg.Clock);
 Bool useLinear = FALSE;
-char *s;
+const char *s;
 #ifndef XSERVER_LIBPCIACCESS
 resRange linearRes[] = { {ResExcMemBlock|ResBios|ResBus,0,0},_END };
 #endif
@@ -2802,7 +2802,7 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int
 CHIPSPanelSizePtr Size = >PanelSize;
 CHIPSClockPtr SaveClk = &(cPtr->SavedReg.Clock);
 Bool useLinear = FALSE;
-char *s;
+const char *s;
 #ifndef XSERVER_LIBPCIACCESS
 resRange linearRes[] = { {ResExcMemBlock|ResBios|ResBus,0,0},_END };
 #endif
@@ -6823,21 +6823,26 @@ chipsMapMem(ScrnInfoPtr pScrn)
 			   VIDMEM_MMIO_32BIT, cPtr->IOAddress, 0x2L);
 #else
 		{
+		int err;
+		void** result = (void**)>MMIOBase;
+
 		if (cPtr->pEnt->location.type == BUS_PCI) {
-		void** result = (void**)>MMIOBase;
-		int err = pci_device_map_range(cPtr->PciInfo,
-		 cPtr->IOAddress,
-		 0x2L,
-		 PCI_DEV_MAP_FLAG_WRITABLE,
-		 result);
-		if (err) {
-			xf86Msg(X_ERROR, "PCI mmap failed\n");
-		return FALSE;
-			}
-		} else
-			cPtr->MMIOBase = xf86MapVidMem(pScrn->scrnIndex,
-			   VIDMEM_MMIO_32BIT, cPtr->IOAddress, 0x2L);
-		
+		err = pci_device_map_range(cPtr->PciInfo,
+		   cPtr->IOAddress,
+		   0x2L,
+		   PCI_DEV_MAP_FLAG_WRITABLE,
+		   result);
+		} else {
+			err = pci_device_map_legacy(cPtr->PciInfo,
+		cPtr->IOAddress,
+		0x0002U,
+		PCI_DEV_MAP_FLAG_WRITABLE,
+		result);
+		}
+		if (err) {
+			xf86Msg(X_ERROR, "PCI mmap failed\n");
+		return FALSE;
+		}
 		}
 #endif
 	} else {
@@ -6851,20 +6856,26 @@ chipsMapMem(ScrnInfoPtr pScrn)
 			  VIDMEM_MMIO_32BIT, cPtr->IOAddress, 0x1L);
 #else
 		{
+		int err;
+		void** result = (void**)>MMIOBase;
+
 		if (cPtr->pEnt->location.type == BUS_PCI) {
-			void** result = (void**)>MMIOBase;
-			int err = pci_device_map_range(cPtr->PciInfo,
-		 cPtr->IOAddress,
-		 0x1L,
-		 PCI_DEV_MAP_FLAG_WRITABLE,
-		 result);
-		if (err) {
-			xf86Msg(X_ERROR, "PCI mmap failed\n");
-		return FALSE;
-			}
-		} else
-		cPtr->MMIOBase = xf86MapVidMem(pScrn->scrnIndex,
-			  VIDMEM_MMIO_32BIT, cPtr->IOAddress, 0x1L);
+			err = pci_device_map_range(cPtr->PciInfo,
+		   cPtr->IOAddress,
+		   0x1L,
+		   PCI_DEV_MAP_FLAG_WRITABLE,
+		   result);
+		} else {
+			err = pci_device_map_legacy(cPtr->PciInfo,
+		cPtr->IOAddress,
+		0x0001U,
+		PCI_DEV_MAP_FLAG_WRITABLE,
+		result);
+		}
+		if (err) {
+			xf86Msg(X_ERROR, "PCI mmap failed\n");
+		return FALSE;
+		}
 		}
 #endif
 	}
@@ -6873,59 +6884,65 @@ chipsMapMem(ScrnInfoPtr pScrn)
 		return FALSE;
 	}
 	if (cPtr->FbMapSize) {
-	  unsigned long Addr = (unsigned long)cPtr->FbAddress;
-	  unsigned int Map =  cPtr->FbMapSize;
+	unsigned long Addr = (unsigned long)cPtr->FbAddress;
+	unsigned int Map =  cPtr->FbMapSize;
+#ifdef XSERVER_LIBPCIACCESS
+	int err;
+	void** result;
+#endif
 	  
-	  if ((cPtr->Flags & ChipsDualChannelSupport) &&
-	  (xf86IsEntityShared(pScrn->entityList[0]))) {
-	  cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0],
-	 CHIPSEntityIndex)->ptr;
-	if(cPtr->SecondCrtc == FALSE) {
-	  Addr = cPtrEnt->masterFbAddress;
-	  Map = cPtrEnt->masterFbMapSize;
-	} else {
-	  Addr = cPtrEnt->slaveFbAddress;
-	  Map = cPtrEnt->slaveFbMapSize;
+	if ((cPtr->Flags & ChipsDualChannelSupport) &&
+	(xf86IsEntityShared(pScrn->entityList[0]))) {
+		cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0],
+	   CHIPSEntityIndex)->ptr;
+		if (cPtr->SecondCrtc == FALSE) {
+		Addr = cPtrEnt->masterFbAddress;
+		Map = cPtrEnt->masterFbMapSize;
+		} else {
+		Addr = cPtrEnt->slaveFbAddress;
+		Map = cPtrEnt->slaveFbMapSize;
+		}
 	}
-	  }
 
 #ifndef 

CVS commit: src/sys/ufs/ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Sat Aug 20 21:22:25 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs_vfsops.c

Log Message:
fix code which sets REV1 e2fs_fsmnt, set also mount time and mount count


To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 src/sys/ufs/ext2fs/ext2fs_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/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.201 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.202
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.201	Sat Aug 20 20:05:28 2016
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c	Sat Aug 20 21:22:25 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_vfsops.c,v 1.201 2016/08/20 20:05:28 jdolecek Exp $	*/
+/*	$NetBSD: ext2fs_vfsops.c,v 1.202 2016/08/20 21:22:25 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1994
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.201 2016/08/20 20:05:28 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.202 2016/08/20 21:22:25 jdolecek Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -239,6 +239,22 @@ ext2fs_done(void)
 	pool_destroy(_inode_pool);
 }
 
+static void
+ext2fs_sb_setmountinfo(struct m_ext2fs *fs, struct mount *mp)
+{
+	(void)strncpy(fs->e2fs_fsmnt, mp->mnt_stat.f_mntonname,
+sizeof(fs->e2fs_fsmnt));
+	if (fs->e2fs_ronly == 0 && fs->e2fs.e2fs_rev > E2FS_REV0) {
+		(void)strncpy(fs->e2fs.e2fs_fsmnt, mp->mnt_stat.f_mntonname,
+sizeof(fs->e2fs.e2fs_fsmnt));
+
+		fs->e2fs.e2fs_mtime = time_second;
+		fs->e2fs.e2fs_mnt_count++;
+
+		fs->e2fs_fmod = 1;
+	}
+}
+
 /*
  * Called by main() when ext2fs is going to be mounted as root.
  *
@@ -270,14 +286,7 @@ ext2fs_mountroot(void)
 	mountlist_append(mp);
 	ump = VFSTOUFS(mp);
 	fs = ump->um_e2fs;
-	memset(fs->e2fs_fsmnt, 0, sizeof(fs->e2fs_fsmnt));
-	(void) copystr(mp->mnt_stat.f_mntonname, fs->e2fs_fsmnt,
-	sizeof(fs->e2fs_fsmnt) - 1, 0);
-	if (fs->e2fs.e2fs_rev > E2FS_REV0) {
-		memset(fs->e2fs.e2fs_fsmnt, 0, sizeof(fs->e2fs.e2fs_fsmnt));
-		(void) copystr(mp->mnt_stat.f_mntonname, fs->e2fs.e2fs_fsmnt,
-		sizeof(fs->e2fs.e2fs_fsmnt) - 1, 0);
-	}
+	ext2fs_sb_setmountinfo(fs, mp);
 	(void)ext2fs_statvfs(mp, >mnt_stat);
 	vfs_unbusy(mp, false, NULL);
 	setrootfstime((time_t)fs->e2fs.e2fs_wtime);
@@ -297,7 +306,6 @@ ext2fs_mount(struct mount *mp, const cha
 	struct ufs_args *args = data;
 	struct ufsmount *ump = NULL;
 	struct m_ext2fs *fs;
-	size_t size;
 	int error = 0, flags, update;
 	mode_t accessmode;
 
@@ -467,15 +475,9 @@ ext2fs_mount(struct mount *mp, const cha
 
 	error = set_statvfs_info(path, UIO_USERSPACE, args->fspec,
 	UIO_USERSPACE, mp->mnt_op->vfs_name, mp, l);
-	(void) copystr(mp->mnt_stat.f_mntonname, fs->e2fs_fsmnt,
-	sizeof(fs->e2fs_fsmnt) - 1, );
-	memset(fs->e2fs_fsmnt + size, 0, sizeof(fs->e2fs_fsmnt) - size);
-	if (fs->e2fs.e2fs_rev > E2FS_REV0) {
-		(void) copystr(mp->mnt_stat.f_mntonname, fs->e2fs.e2fs_fsmnt,
-		sizeof(fs->e2fs.e2fs_fsmnt) - 1, );
-		memset(fs->e2fs.e2fs_fsmnt, 0,
-		sizeof(fs->e2fs.e2fs_fsmnt) - size);
-	}
+	if (error == 0)
+		ext2fs_sb_setmountinfo(fs, mp);
+
 	if (fs->e2fs_fmod != 0) {	/* XXX */
 		fs->e2fs_fmod = 0;
 		if (fs->e2fs.e2fs_state == 0)

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Aug 20 21:15:07 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c
xf86sbusBus.c xf86sbusBus.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus: Sbus.c
netbsdSbus.c

Log Message:
fix build issues for sparc64.  mostly constification.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c

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/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.9 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.9	Sun Aug 14 01:02:22 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c	Sat Aug 20 21:15:06 2016
@@ -303,7 +303,7 @@ listPossibleVideoDrivers(char *matches[]
 #ifdef __sparc__
 if (i < (nmatches - 1))
 {
-char *sbusDriver = sparcDriverName();
+const char *sbusDriver = sparcDriverName();
 
 if (sbusDriver)
 matches[i++] = xnfstrdup(sbusDriver);

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.6	Thu Aug 11 00:04:29 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c	Sat Aug 20 21:15:06 2016
@@ -76,7 +76,6 @@ CheckSbusDevice(const char *device, int 
 psdp->device = xnfstrdup(device);
 psdp->width = fbattr.fbtype.fb_width;
 psdp->height = fbattr.fbtype.fb_height;
-psdp->size = fbattr.fbtype.fb_size;
 psdp->fd = -1;
 }
 
@@ -727,7 +726,7 @@ xf86SbusHandleColormaps(ScreenPtr pScree
 if (pScreen->whitePixel == 0) {
 data[0] = 255;
 data[1] = 0;
-else {
+} else {
 data[0] = 0;
 data[1] = 255;
 }

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h:1.7 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h:1.8
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h:1.7	Thu Aug 11 00:04:29 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h	Sat Aug 20 21:15:06 2016
@@ -52,7 +52,7 @@ typedef struct sbus_device {
 int devId;
 int fbNum;
 int fd;
-int width, height; // XXXMRG also had size
+int width, height;
 sbusPromNode node;
 const char *descr;
 const char *device;
@@ -104,7 +104,7 @@ extern _X_EXPORT int sparcPromGetBool(sb
 extern _X_EXPORT void sparcPromAssignNodes(void);
 extern _X_EXPORT char *sparcPromNode2Pathname(sbusPromNodePtr pnode);
 extern _X_EXPORT int sparcPromPathname2Node(const char *pathName);
-extern _X_EXPORT char *sparcDriverName(void);
+extern _X_EXPORT const char *sparcDriverName(void);
 
 extern Bool xf86SbusConfigure(void *busData, sbusDevicePtr sBus);
 extern void xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus,

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c:1.1.1.4	Wed Aug 10 07:44:35 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c	Sat Aug 20 21:15:07 2016
@@ -245,7 +245,7 @@ sparcPromGetBool(sbusPromNodePtr pnode, 
 return promGetBool(prop);
 }
 
-static char *
+static const char *
 promWalkGetDriverName(int node, int oldnode)
 {
 int nextnode;
@@ -275,7 +275,7 @@ promWalkGetDriverName(int node, int oldn
 
 nextnode = promGetChild(node);
 if (nextnode) {
-char *name;
+const char *name;
 
 name = promWalkGetDriverName(nextnode, node);
 if (name)
@@ -288,10 +288,10 @@ promWalkGetDriverName(int node, int oldn
 return NULL;
 }
 
-char *
+const char *
 sparcDriverName(void)
 {
-char *name;
+const char *name;
 
 if (sparcPromInit() < 0)
 return NULL;

Index: 

CVS commit: src/external/mit/xorg/server/drivers

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Aug 20 20:22:54 UTC 2016

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
src/external/mit/xorg/server/drivers/xf86-video-suncg6: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile

Log Message:
apply -Wno-error=discarded-qualifiers only with GCC > 4.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-sunffb/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/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.2	Mon Aug 15 17:01:25 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile	Sat Aug 20 20:22:53 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2016/08/15 17:01:25 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2016/08/20 20:22:53 mrg Exp $
 
 DRIVER=		xf86-video-nouveau
 DRIVER_NAME=	nouveau_drv
@@ -45,11 +45,13 @@ CPPFLAGS+=	-DNV_MINOR_VERSION=${PACKAGE_
 CPPFLAGS+=	-DNV_PATCHLEVEL=${PACKAGE_PATCH}
 CPPFLAGS+=	-DNV_DRIVER_DATE=${DRIVER_DATE}
 
-# XXX
-COPTS.nouveau_xv.c+=	-Wno-error=discarded-qualifiers
-
 .include "../Makefile.xf86-driver"
 
+# XXX
+.if ${HAVE_GCC} > 48
+COPTS.nouveau_xv.c+=	${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+.endif
+
 .if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
 CPPFLAGS+=	-DHAVE_XORG_LIST
 CPPFLAGS+=	-DHAVE_XAA_H

Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.8	Fri Aug 19 23:51:44 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile	Sat Aug 20 20:22:53 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2016/08/19 23:51:44 mrg Exp $
+#	$NetBSD: Makefile,v 1.9 2016/08/20 20:22:53 mrg Exp $
 
 DRIVER=		xf86-video-openchrome
 DRIVER_NAME=	openchrome_drv
@@ -41,10 +41,10 @@ CPPFLAGS+=	-DHAVE_CONFIG_H -I${X11SRCDIR
 .include "../Makefile.xf86-driver"
 
 # XXX
-.if defined(HAVE_GCC)
 COPTS.via_dri.c+= -Wno-error
-COPTS.via_driver.c+= -Wno-error=discarded-qualifiers
-COPTS.via_lvds.c+= -Wno-error=discarded-qualifiers
+.if ${HAVE_GCC} > 48
+COPTS.via_driver.c+=	${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+COPTS.via_lvds.c+=	${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
 .endif
 
 CWARNFLAGS.clang+=	-Wno-tautological-compare

Index: src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.8	Tue Aug 16 07:10:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile	Sat Aug 20 20:22:53 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2016/08/16 07:10:01 mrg Exp $
+#	$NetBSD: Makefile,v 1.9 2016/08/20 20:22:53 mrg Exp $
 
 DRIVER=		xf86-video-siliconmotion
 DRIVER_NAME=	siliconmotion_drv
@@ -12,9 +12,11 @@ MAN=		siliconmotion.4
 
 CPPFLAGS+=	-DHAVE_XMODES -DHAVE_XEXTPROTO_71
 
-COPTS.smi_video.c+=	-Wno-error=discarded-qualifiers
-
 .include "../Makefile.xf86-driver"
 
+.if ${HAVE_GCC} > 48
+COPTS.smi_video.c+=	${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+.endif
+
 XORG_PKG_VER_PROG=	${DRIVER}
 .include "../../../xorg-pkg-ver.mk"

Index: src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.12	Tue Aug 16 08:37:47 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile	Sat Aug 20 20:22:54 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: 

CVS commit: src/external/mit/xorg/lib/libdrm

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sat Aug 20 20:19:08 UTC 2016

Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile

Log Message:
Don't bail out on #warning for clang either.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/libdrm/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/mit/xorg/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.13 src/external/mit/xorg/lib/libdrm/Makefile:1.14
--- src/external/mit/xorg/lib/libdrm/Makefile:1.13	Sat Aug 20 06:49:21 2016
+++ src/external/mit/xorg/lib/libdrm/Makefile	Sat Aug 20 20:19:08 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2016/08/20 06:49:21 mrg Exp $
+#	$NetBSD: Makefile,v 1.14 2016/08/20 20:19:08 joerg Exp $
 
 .include 
 
@@ -18,6 +18,7 @@ PKGCONFIG=	libdrm
 PKGDIST=	${LIB}
 
 COPTS.xf86drm.c+=	${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
+COPTS.xf86drm.c+=	${${ACTIVE_CC} == "clang":? -Wno-error=\#warnings :}
 
 CWARNFLAGS.clang+=	-Wno-conversion -Wno-tautological-compare
 

CVS commit: src/sys/uvm/pmap

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Aug 20 20:09:47 UTC 2016

Modified Files:
src/sys/uvm/pmap: pmap.c

Log Message:
put a variable under the #ifdef it's only used in.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/uvm/pmap/pmap.c

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

Modified files:

Index: src/sys/uvm/pmap/pmap.c
diff -u src/sys/uvm/pmap/pmap.c:1.20 src/sys/uvm/pmap/pmap.c:1.21
--- src/sys/uvm/pmap/pmap.c:1.20	Thu Aug 18 21:42:27 2016
+++ src/sys/uvm/pmap/pmap.c	Sat Aug 20 20:09:47 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.20 2016/08/18 21:42:27 matt Exp $	*/
+/*	$NetBSD: pmap.c,v 1.21 2016/08/20 20:09:47 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.20 2016/08/18 21:42:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.21 2016/08/20 20:09:47 mrg Exp $");
 
 /*
  *	Manages physical address maps.
@@ -1411,8 +1411,8 @@ pmap_pte_kremove(pmap_t pmap, vaddr_t sv
 			continue;
 
 		PMAP_COUNT(kremove_pages);
-		struct vm_page * const pg = PHYS_TO_VM_PAGE(pte_to_paddr(pte));
 #ifdef PMAP_VIRTUAL_CACHE_ALIASES
+		struct vm_page * const pg = PHYS_TO_VM_PAGE(pte_to_paddr(pte));
 		if (pg != NULL && pmap_md_virtual_cache_aliasing_p()) {
 			pmap_remove_pv(pmap, sva, pg, !pte_readonly_p(pte));
 		}

CVS commit: src/sys/ufs/ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Sat Aug 20 20:05:28 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs_vfsops.c

Log Message:
adjust ext2fs_loadvnode_content() to do the sanity checking before allocating
memory, and avoid reallocaing memory on vnode reload


To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.201 src/sys/ufs/ext2fs/ext2fs_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/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.200 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.201
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.200	Sat Aug 20 19:47:44 2016
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c	Sat Aug 20 20:05:28 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_vfsops.c,v 1.200 2016/08/20 19:47:44 jdolecek Exp $	*/
+/*	$NetBSD: ext2fs_vfsops.c,v 1.201 2016/08/20 20:05:28 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1994
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.200 2016/08/20 19:47:44 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.201 2016/08/20 20:05:28 jdolecek Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -493,22 +493,19 @@ fail:
 }
 
 /*
- *
+ * Sanity check the disk vnode content, and copy it over to inode structure.
  */
 static int
 ext2fs_loadvnode_content(struct m_ext2fs *fs, ino_t ino, struct buf *bp, struct inode *ip)
 {
 	struct ext2fs_dinode *din;
-	void *cp;
 	int error = 0;
 
-	cp = (char *)bp->b_data + (ino_to_fsbo(fs, ino) * EXT2_DINODE_SIZE(fs));
-	din = kmem_alloc(EXT2_DINODE_SIZE(fs), KM_SLEEP);
-	e2fs_iload((struct ext2fs_dinode *)cp, din, EXT2_DINODE_SIZE(fs));
+	din = (struct ext2fs_dinode *)((char *)bp->b_data + (ino_to_fsbo(fs, ino) * EXT2_DINODE_SIZE(fs)));
 
-	/* sanity checks */
+	/* sanity checks - inode data NOT byteswapped at this point */
 	if (EXT2_DINODE_FITS(din, e2di_extra_isize, EXT2_DINODE_SIZE(fs))
-	&& (EXT2_DINODE_SIZE(fs) - EXT2_REV0_DINODE_SIZE) < din->e2di_extra_isize)
+	&& (EXT2_DINODE_SIZE(fs) - EXT2_REV0_DINODE_SIZE) < fs2h16(din->e2di_extra_isize))
 	{
 		printf("ext2fs: inode %"PRIu64" bad extra_isize %u",
 			ino, din->e2di_extra_isize);
@@ -516,16 +513,15 @@ ext2fs_loadvnode_content(struct m_ext2fs
 		goto bad;
 	}
 
-	/* replace old dinode; assumes new dinode size is same as old one */
-	if (ip->i_din.e2fs_din)
-		kmem_free(ip->i_din.e2fs_din, EXT2_DINODE_SIZE(fs));
-	ip->i_din.e2fs_din = din;
+	/* everything allright, proceed with copy */
+	if (ip->i_din.e2fs_din == NULL)
+		ip->i_din.e2fs_din = kmem_alloc(EXT2_DINODE_SIZE(fs), KM_SLEEP);
+
+	e2fs_iload(din, ip->i_din.e2fs_din, EXT2_DINODE_SIZE(fs));
 
 	ext2fs_set_inode_guid(ip);
-	return error;
 
 bad:
-	kmem_free(din, EXT2_DINODE_SIZE(fs));
 	return error;
 }
 

CVS commit: src/sys/ufs/ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Sat Aug 20 19:53:43 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs_alloc.c

Log Message:
modify the comment to note code needs to brele() to have a shot on actually
working


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/ufs/ext2fs/ext2fs_alloc.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/ext2fs/ext2fs_alloc.c
diff -u src/sys/ufs/ext2fs/ext2fs_alloc.c:1.50 src/sys/ufs/ext2fs/ext2fs_alloc.c:1.51
--- src/sys/ufs/ext2fs/ext2fs_alloc.c:1.50	Sat Aug 20 19:51:50 2016
+++ src/sys/ufs/ext2fs/ext2fs_alloc.c	Sat Aug 20 19:53:43 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_alloc.c,v 1.50 2016/08/20 19:51:50 jdolecek Exp $	*/
+/*	$NetBSD: ext2fs_alloc.c,v 1.51 2016/08/20 19:53:43 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.50 2016/08/20 19:51:50 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.51 2016/08/20 19:53:43 jdolecek Exp $");
 
 #include 
 #include 
@@ -418,7 +418,10 @@ ext2fs_alloccg(struct inode *ip, int cg,
 
 	bno = ext2fs_mapsearch(fs, bbp, bpref);
 #if 0
-	/* XXX jdolecek mapsearch actually never fails, it panics instead */
+	/*
+	 * XXX jdolecek mapsearch actually never fails, it panics instead.
+	 * If re-enabling, make sure to brele() before returning.
+	 */
 	if (bno < 0)
 		return 0;
 #endif

CVS commit: src/sys/ufs/ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Sat Aug 20 19:51:50 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs_alloc.c

Log Message:
#if 0 the check for ext2fs_mapsearch() failure (similar what was done
for ffs counterpart), it actually never fails, it panics instead


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/ufs/ext2fs/ext2fs_alloc.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/ext2fs/ext2fs_alloc.c
diff -u src/sys/ufs/ext2fs/ext2fs_alloc.c:1.49 src/sys/ufs/ext2fs/ext2fs_alloc.c:1.50
--- src/sys/ufs/ext2fs/ext2fs_alloc.c:1.49	Sat Aug 20 19:47:44 2016
+++ src/sys/ufs/ext2fs/ext2fs_alloc.c	Sat Aug 20 19:51:50 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_alloc.c,v 1.49 2016/08/20 19:47:44 jdolecek Exp $	*/
+/*	$NetBSD: ext2fs_alloc.c,v 1.50 2016/08/20 19:51:50 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.49 2016/08/20 19:47:44 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.50 2016/08/20 19:51:50 jdolecek Exp $");
 
 #include 
 #include 
@@ -417,8 +417,11 @@ ext2fs_alloccg(struct inode *ip, int cg,
 	}
 
 	bno = ext2fs_mapsearch(fs, bbp, bpref);
+#if 0
+	/* XXX jdolecek mapsearch actually never fails, it panics instead */
 	if (bno < 0)
 		return 0;
+#endif
 gotit:
 #ifdef DIAGNOSTIC
 	if (isset(bbp, (daddr_t)bno)) {

CVS commit: xsrc/external/mit/xf86-video-chips/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Aug 20 19:49:51 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-chips/dist/src: ct_driver.c

Log Message:
fix the merge botch fix properly.  fixes shark builds.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c

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/xf86-video-chips/dist/src/ct_driver.c
diff -u xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.19 xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.20
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.19	Fri Aug 19 23:46:45 2016
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c	Sat Aug 20 19:49:51 2016
@@ -96,11 +96,6 @@
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
 
-/* All drivers using the mi banking wrapper need this */
-#ifdef HAVE_ISA
-#include "mibank.h"
-#endif
-
 /* All drivers using the mi colormap manipulation need this */
 #include "micmap.h"
 

CVS commit: src/sys/ufs/ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Sat Aug 20 19:47:44 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs.h ext2fs_alloc.c ext2fs_bswap.c
ext2fs_extern.h ext2fs_vfsops.c

Log Message:
add support for GDT_CSUM AKA uninit_bg feature


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/ufs/ext2fs/ext2fs.h
cvs rdiff -u -r1.48 -r1.49 src/sys/ufs/ext2fs/ext2fs_alloc.c
cvs rdiff -u -r1.23 -r1.24 src/sys/ufs/ext2fs/ext2fs_bswap.c
cvs rdiff -u -r1.54 -r1.55 src/sys/ufs/ext2fs/ext2fs_extern.h
cvs rdiff -u -r1.199 -r1.200 src/sys/ufs/ext2fs/ext2fs_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/ext2fs/ext2fs.h
diff -u src/sys/ufs/ext2fs/ext2fs.h:1.47 src/sys/ufs/ext2fs/ext2fs.h:1.48
--- src/sys/ufs/ext2fs/ext2fs.h:1.47	Mon Aug 15 18:46:11 2016
+++ src/sys/ufs/ext2fs/ext2fs.h	Sat Aug 20 19:47:44 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs.h,v 1.47 2016/08/15 18:46:11 jdolecek Exp $	*/
+/*	$NetBSD: ext2fs.h,v 1.48 2016/08/20 19:47:44 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -249,10 +249,10 @@ struct m_ext2fs {
 	int64_t e2fs_qbmask;	/* ~fs_bmask - for use with quad size */
 	int32_t	e2fs_fsbtodb;	/* fsbtodb and dbtofsb shift constant */
 	int32_t	e2fs_ncg;	/* number of cylinder groups */
-	int32_t	e2fs_ngdb;	/* number of group descriptor block */
+	int32_t	e2fs_ngdb;	/* number of group descriptor blocks */
 	int32_t	e2fs_ipb;	/* number of inodes per block */
-	int32_t	e2fs_itpg;	/* number of inode table per group */
-	struct	ext2_gd *e2fs_gd; /* group descripors */
+	int32_t	e2fs_itpg;	/* number of inode table blocks per group */
+	struct	ext2_gd *e2fs_gd; /* group descriptors (data not byteswapped) */
 };
 
 
@@ -366,7 +366,8 @@ struct m_ext2fs {
 	 | EXT2F_ROCOMPAT_LARGEFILE \
 	 | EXT2F_ROCOMPAT_HUGE_FILE \
 	 | EXT2F_ROCOMPAT_EXTRA_ISIZE \
-	 | EXT2F_ROCOMPAT_DIR_NLINK)
+	 | EXT2F_ROCOMPAT_DIR_NLINK \
+	 | EXT2F_ROCOMPAT_GDT_CSUM)
 #define EXT2F_INCOMPAT_SUPP		(EXT2F_INCOMPAT_FTYPE \
 	 | EXT2F_INCOMPAT_EXTENTS \
 	 | EXT2F_INCOMPAT_FLEX_BG)
@@ -415,15 +416,35 @@ struct m_ext2fs {
 struct ext2_gd {
 	uint32_t ext2bgd_b_bitmap;	/* blocks bitmap block */
 	uint32_t ext2bgd_i_bitmap;	/* inodes bitmap block */
-	uint32_t ext2bgd_i_tables;	/* inodes table block  */
+	uint32_t ext2bgd_i_tables;	/* first inodes table block */
 	uint16_t ext2bgd_nbfree;	/* number of free blocks */
 	uint16_t ext2bgd_nifree;	/* number of free inodes */
 	uint16_t ext2bgd_ndirs;		/* number of directories */
-	uint16_t reserved;
-	uint32_t reserved2[3];
+
+	/*
+	 * Following only valid when either GDT_CSUM (AKA uninit_bg) 
+	 * or METADATA_CKSUM feature is on
+	 */
+	uint16_t ext2bgd_flags;		/* ext4 bg flags (INODE_UNINIT, ...)*/
+	uint32_t ext2bgd_exclude_bitmap_lo;	/* snapshot exclude bitmap */
+	uint16_t ext2bgd_block_bitmap_csum_lo;	/* Low block bitmap checksum */
+	uint16_t ext2bgd_inode_bitmap_csum_lo;	/* Low inode bitmap checksum */
+	uint16_t ext2bgd_itable_unused_lo;	/* Low unused inode offset */
+	uint16_t ext2bgd_checksum;		/* Group desc checksum */
+
+	/*
+	 * XXX disk32 Further fields only exist if 64BIT feature is on
+	 * and superblock desc_size > 32, not supported for now.
+	 */
 };
 
+#define E2FS_BG_INODE_UNINIT	0x0001	/* Inode bitmap not used/initialized */
+#define E2FS_BG_BLOCK_UNINIT	0x0002	/* Block bitmap not used/initialized */
+#define E2FS_BG_INODE_ZEROED	0x0004	/* On-disk inode table initialized */
 
+#define E2FS_HAS_GD_CSUM(fs) \
+	EXT2F_HAS_ROCOMPAT_FEATURE(fs, EXT2F_ROCOMPAT_GDT_CSUM|EXT2F_ROCOMPAT_METADATA_CKSUM) != 0
+	
 /*
  * If the EXT2F_ROCOMPAT_SPARSESUPER flag is set, the cylinder group has a
  * copy of the super and cylinder group descriptors blocks only if it's
@@ -457,13 +478,10 @@ cg_has_sb(int i)
 #	define fs2h16(x) (x)
 #	define fs2h32(x) (x)
 #	define fs2h64(x) (x)
-#	define e2fs_sbload(old, new) memcpy((new), (old), SBSIZE);
-#	define e2fs_cgload(old, new, size) memcpy((new), (old), (size));
-#	define e2fs_sbsave(old, new) memcpy((new), (old), SBSIZE);
-#	define e2fs_cgsave(old, new, size) memcpy((new), (old), (size));
+#	define e2fs_sbload(old, new) memcpy((new), (old), SBSIZE)
+#	define e2fs_sbsave(old, new) memcpy((new), (old), SBSIZE)
 #else
 void e2fs_sb_bswap(struct ext2fs *, struct ext2fs *);
-void e2fs_cg_bswap(struct ext2_gd *, struct ext2_gd *, int);
 #	define h2fs16(x) bswap16(x)
 #	define h2fs32(x) bswap32(x)
 #	define h2fs64(x) bswap64(x)
@@ -471,11 +489,13 @@ void e2fs_cg_bswap(struct ext2_gd *, str
 #	define fs2h32(x) bswap32(x)
 #	define fs2h64(x) bswap64(x)
 #	define e2fs_sbload(old, new) e2fs_sb_bswap((old), (new))
-#	define e2fs_cgload(old, new, size) e2fs_cg_bswap((old), (new), (size));
 #	define e2fs_sbsave(old, new) e2fs_sb_bswap((old), (new))
-#	define e2fs_cgsave(old, new, size) e2fs_cg_bswap((old), (new), (size));
 #endif
 
+/* Group descriptors 

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 20 19:46:55 UTC 2016

Modified Files:
src/sys/arch/i386/i386: gdt.c

Log Message:
fix the build


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/i386/i386/gdt.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/i386/i386/gdt.c
diff -u src/sys/arch/i386/i386/gdt.c:1.54 src/sys/arch/i386/i386/gdt.c:1.55
--- src/sys/arch/i386/i386/gdt.c:1.54	Sat Aug 20 12:05:48 2016
+++ src/sys/arch/i386/i386/gdt.c	Sat Aug 20 15:46:54 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdt.c,v 1.54 2016/08/20 16:05:48 maxv Exp $	*/
+/*	$NetBSD: gdt.c,v 1.55 2016/08/20 19:46:54 christos Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.54 2016/08/20 16:05:48 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.55 2016/08/20 19:46:54 christos Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
@@ -304,6 +304,7 @@ gdt_grow(int which)
  *the new slots.
  */
 
+#ifndef XEN
 static int
 gdt_get_slot(void)
 {
@@ -312,6 +313,7 @@ gdt_get_slot(void)
 
 	return gdt_get_slot1(0);
 }
+#endif
 
 static int
 gdt_get_slot1(int which)
@@ -343,6 +345,7 @@ gdt_get_slot1(int which)
 /*
  * Deallocate a GDT slot, putting it on the free list.
  */
+#ifndef XEN
 static void
 gdt_put_slot(int slot)
 {
@@ -351,6 +354,7 @@ gdt_put_slot(int slot)
 
 	gdt_put_slot1(slot, 0);
 }
+#endif
 
 static void
 gdt_put_slot1(int slot, int which)

CVS commit: src/sys/ufs/ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Sat Aug 20 19:45:20 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs_htree.c

Log Message:
whitespace fix


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/ufs/ext2fs/ext2fs_htree.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/ext2fs/ext2fs_htree.c
diff -u src/sys/ufs/ext2fs/ext2fs_htree.c:1.7 src/sys/ufs/ext2fs/ext2fs_htree.c:1.8
--- src/sys/ufs/ext2fs/ext2fs_htree.c:1.7	Fri Aug 19 00:05:43 2016
+++ src/sys/ufs/ext2fs/ext2fs_htree.c	Sat Aug 20 19:45:20 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_htree.c,v 1.7 2016/08/19 00:05:43 jdolecek Exp $	*/
+/*	$NetBSD: ext2fs_htree.c,v 1.8 2016/08/20 19:45:20 jdolecek Exp $	*/
 
 /*-
  * Copyright (c) 2010, 2012 Zheng Liu 
@@ -29,7 +29,7 @@
  * $FreeBSD: head/sys/fs/ext2fs/ext2fs_htree.c 294653 2016-01-24 02:41:49Z pfg $
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_htree.c,v 1.7 2016/08/19 00:05:43 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_htree.c,v 1.8 2016/08/20 19:45:20 jdolecek Exp $");
 
 #include 
 #include 
@@ -306,7 +306,7 @@ ext2fs_htree_split_dirblock(char *block1
 	 * Sort directory entry descriptors by name hash value.
 	 */
 	kheapsort(sort_info, entry_cnt, sizeof(struct ext2fs_htree_sort_entry),
-	ext2fs_htree_cmp_sort_entry,);
+	ext2fs_htree_cmp_sort_entry, );
 
 	/*
 	 * Count the number of entries to move to directory block 2.

CVS commit: src/sys

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Sat Aug 20 19:44:46 UTC 2016

Modified Files:
src/sys/dev/usb: utoppy.c
Added Files:
src/sys/lib/libkern: crc16.h

Log Message:
extract crc16 code from utoppy driver to a separate file in libkern, for use
by ext2fs; every usage gets their own copy of the table for now, as it's
fairly small, and too rare to be used to be useful pulling into every kernel


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/usb/utoppy.c
cvs rdiff -u -r0 -r1.1 src/sys/lib/libkern/crc16.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/utoppy.c
diff -u src/sys/dev/usb/utoppy.c:1.26 src/sys/dev/usb/utoppy.c:1.27
--- src/sys/dev/usb/utoppy.c:1.26	Thu Jul  7 06:55:42 2016
+++ src/sys/dev/usb/utoppy.c	Sat Aug 20 19:44:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: utoppy.c,v 1.26 2016/07/07 06:55:42 msaitoh Exp $	*/
+/*	$NetBSD: utoppy.c,v 1.27 2016/08/20 19:44:46 jdolecek Exp $	*/
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.26 2016/07/07 06:55:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.27 2016/08/20 19:44:46 jdolecek Exp $");
 
 #include 
 #include 
@@ -44,6 +44,8 @@ __KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
@@ -387,43 +389,7 @@ utoppy_detach(device_t self, int flags)
 	return 0;
 }
 
-static const uint16_t utoppy_crc16_lookup[] = {
-	0x, 0xc0c1, 0xc181, 0x0140, 0xc301, 0x03c0, 0x0280, 0xc241,
-	0xc601, 0x06c0, 0x0780, 0xc741, 0x0500, 0xc5c1, 0xc481, 0x0440,
-	0xcc01, 0x0cc0, 0x0d80, 0xcd41, 0x0f00, 0xcfc1, 0xce81, 0x0e40,
-	0x0a00, 0xcac1, 0xcb81, 0x0b40, 0xc901, 0x09c0, 0x0880, 0xc841,
-	0xd801, 0x18c0, 0x1980, 0xd941, 0x1b00, 0xdbc1, 0xda81, 0x1a40,
-	0x1e00, 0xdec1, 0xdf81, 0x1f40, 0xdd01, 0x1dc0, 0x1c80, 0xdc41,
-	0x1400, 0xd4c1, 0xd581, 0x1540, 0xd701, 0x17c0, 0x1680, 0xd641,
-	0xd201, 0x12c0, 0x1380, 0xd341, 0x1100, 0xd1c1, 0xd081, 0x1040,
-	0xf001, 0x30c0, 0x3180, 0xf141, 0x3300, 0xf3c1, 0xf281, 0x3240,
-	0x3600, 0xf6c1, 0xf781, 0x3740, 0xf501, 0x35c0, 0x3480, 0xf441,
-	0x3c00, 0xfcc1, 0xfd81, 0x3d40, 0xff01, 0x3fc0, 0x3e80, 0xfe41,
-	0xfa01, 0x3ac0, 0x3b80, 0xfb41, 0x3900, 0xf9c1, 0xf881, 0x3840,
-	0x2800, 0xe8c1, 0xe981, 0x2940, 0xeb01, 0x2bc0, 0x2a80, 0xea41,
-	0xee01, 0x2ec0, 0x2f80, 0xef41, 0x2d00, 0xedc1, 0xec81, 0x2c40,
-	0xe401, 0x24c0, 0x2580, 0xe541, 0x2700, 0xe7c1, 0xe681, 0x2640,
-	0x2200, 0xe2c1, 0xe381, 0x2340, 0xe101, 0x21c0, 0x2080, 0xe041,
-	0xa001, 0x60c0, 0x6180, 0xa141, 0x6300, 0xa3c1, 0xa281, 0x6240,
-	0x6600, 0xa6c1, 0xa781, 0x6740, 0xa501, 0x65c0, 0x6480, 0xa441,
-	0x6c00, 0xacc1, 0xad81, 0x6d40, 0xaf01, 0x6fc0, 0x6e80, 0xae41,
-	0xaa01, 0x6ac0, 0x6b80, 0xab41, 0x6900, 0xa9c1, 0xa881, 0x6840,
-	0x7800, 0xb8c1, 0xb981, 0x7940, 0xbb01, 0x7bc0, 0x7a80, 0xba41,
-	0xbe01, 0x7ec0, 0x7f80, 0xbf41, 0x7d00, 0xbdc1, 0xbc81, 0x7c40,
-	0xb401, 0x74c0, 0x7580, 0xb541, 0x7700, 0xb7c1, 0xb681, 0x7640,
-	0x7200, 0xb2c1, 0xb381, 0x7340, 0xb101, 0x71c0, 0x7080, 0xb041,
-	0x5000, 0x90c1, 0x9181, 0x5140, 0x9301, 0x53c0, 0x5280, 0x9241,
-	0x9601, 0x56c0, 0x5780, 0x9741, 0x5500, 0x95c1, 0x9481, 0x5440,
-	0x9c01, 0x5cc0, 0x5d80, 0x9d41, 0x5f00, 0x9fc1, 0x9e81, 0x5e40,
-	0x5a00, 0x9ac1, 0x9b81, 0x5b40, 0x9901, 0x59c0, 0x5880, 0x9841,
-	0x8801, 0x48c0, 0x4980, 0x8941, 0x4b00, 0x8bc1, 0x8a81, 0x4a40,
-	0x4e00, 0x8ec1, 0x8f81, 0x4f40, 0x8d01, 0x4dc0, 0x4c80, 0x8c41,
-	0x4400, 0x84c1, 0x8581, 0x4540, 0x8701, 0x47c0, 0x4680, 0x8641,
-	0x8201, 0x42c0, 0x4380, 0x8341, 0x4100, 0x81c1, 0x8081, 0x4040
-};
-
-#define	UTOPPY_CRC16(ccrc,b)	\
-	(utoppy_crc16_lookup[((ccrc) ^ (b)) & 0xffu] ^ ((ccrc) >> 8))
+#define	UTOPPY_CRC16(ccrc,b)	crc16_byte((ccrc), (b)) /* from crc16.h */
 
 static const int utoppy_usbdstatus_lookup[] = {
 	0,		/* USBD_NORMAL_COMPLETION */

Added files:

Index: src/sys/lib/libkern/crc16.h
diff -u /dev/null src/sys/lib/libkern/crc16.h:1.1
--- /dev/null	Sat Aug 20 19:44:46 2016
+++ src/sys/lib/libkern/crc16.h	Sat Aug 20 19:44:46 2016
@@ -0,0 +1,83 @@
+/*	$NetBSD: crc16.h,v 1.1 2016/08/20 19:44:46 jdolecek Exp $	*/
+
+/*-
+ * Copyright (c) 2006 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Steve C. Woodford.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED 

CVS commit: src/sys/arch/amd64

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Sat Aug 20 18:31:06 UTC 2016

Modified Files:
src/sys/arch/amd64/amd64: gdt.c
src/sys/arch/amd64/include: gdt.h

Log Message:
Make this area compile, even if we don't support USER_LDT on amd64.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amd64/amd64/gdt.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amd64/include/gdt.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/amd64/amd64/gdt.c
diff -u src/sys/arch/amd64/amd64/gdt.c:1.29 src/sys/arch/amd64/amd64/gdt.c:1.30
--- src/sys/arch/amd64/amd64/gdt.c:1.29	Sat Aug 20 18:04:04 2016
+++ src/sys/arch/amd64/amd64/gdt.c	Sat Aug 20 18:31:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdt.c,v 1.29 2016/08/20 18:04:04 maxv Exp $	*/
+/*	$NetBSD: gdt.c,v 1.30 2016/08/20 18:31:06 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 2009 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.29 2016/08/20 18:04:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.30 2016/08/20 18:31:06 maxv Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
@@ -330,29 +330,30 @@ tss_free(int sel)
 }
 
 #ifdef USER_LDT
-void
-ldt_alloc(struct pmap *pmap, char *ldt, size_t len)
+/*
+ * XXX: USER_LDT is not implemented on amd64.
+ */
+int
+ldt_alloc(void *ldtp, size_t len)
 {
 	int slot;
-	struct sys_segment_descriptor *gdt;
 
 	KASSERT(mutex_owned(_lock));
 
-	gdt = (struct sys_segment_descriptor *)[DYNSEL_START];
-
 	slot = gdt_get_slot();
-	set_sys_gdt(slot, ldt, len - 1, SDT_SYSLDT, SEL_KPL, 0);
-	pmap->pm_ldt_sel = GSEL(slot, SEL_KPL);
+	set_sys_gdt(slot, ldtp, len - 1, SDT_SYSLDT, SEL_KPL, 0);
+
+	return GDYNSEL(slot, SEL_KPL);
 }
 
 void
-ldt_free(struct pmap *pmap)
+ldt_free(int sel)
 {
 	int slot;
 
 	KASSERT(mutex_owned(_lock));
 
-	slot = IDXDYNSEL(pmap->pm_ldt_sel);
+	slot = IDXDYNSEL(sel);
 
 	gdt_put_slot(slot);
 }

Index: src/sys/arch/amd64/include/gdt.h
diff -u src/sys/arch/amd64/include/gdt.h:1.7 src/sys/arch/amd64/include/gdt.h:1.8
--- src/sys/arch/amd64/include/gdt.h:1.7	Wed Jul  7 01:14:52 2010
+++ src/sys/arch/amd64/include/gdt.h	Sat Aug 20 18:31:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdt.h,v 1.7 2010/07/07 01:14:52 chs Exp $	*/
+/*	$NetBSD: gdt.h,v 1.8 2016/08/20 18:31:06 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -42,8 +42,8 @@ struct x86_64_tss;
 int tss_alloc(struct x86_64_tss *);
 void tss_free(int);
 
-void ldt_alloc(struct pmap *, char *, size_t);
-void ldt_free(struct pmap *);
+int ldt_alloc(void *, size_t);
+void ldt_free(int);
 
 void set_sys_gdt(int, void *, size_t, int, int, int);
 #endif

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

[Takeshi Nakayama]

Module Name:src
Committed By:   nakayama
Date:   Sat Aug 20 18:21:18 UTC 2016

Modified Files:
src/sys/arch/sparc64/dev: ldc.c vdsk.c

Log Message:
Avoid "cast to pointer from integer of different size" warning on
32-bit kernels.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/dev/ldc.c \
src/sys/arch/sparc64/dev/vdsk.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/sparc64/dev/ldc.c
diff -u src/sys/arch/sparc64/dev/ldc.c:1.1 src/sys/arch/sparc64/dev/ldc.c:1.2
--- src/sys/arch/sparc64/dev/ldc.c:1.1	Fri Aug 19 19:02:07 2016
+++ src/sys/arch/sparc64/dev/ldc.c	Sat Aug 20 18:21:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ldc.c,v 1.1 2016/08/19 19:02:07 palle Exp $	*/
+/*	$NetBSD: ldc.c,v 1.2 2016/08/20 18:21:18 nakayama Exp $	*/
 /*	$OpenBSD: ldc.c,v 1.12 2015/03/21 18:02:58 kettenis Exp $	*/
 /*
  * Copyright (c) 2009 Mark Kettenis
@@ -256,7 +256,7 @@ ldc_send_vers(struct ldc_conn *lc)
 		return;
 	}
 
-	lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+	lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
 	bzero(lp, sizeof(struct ldc_pkt));
 	lp->type = LDC_CTRL;
 	lp->stype = LDC_INFO;
@@ -291,7 +291,7 @@ ldc_send_ack(struct ldc_conn *lc)
 		return;
 	}
 
-	lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+	lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
 	bzero(lp, sizeof(struct ldc_pkt));
 	lp->type = LDC_CTRL;
 	lp->stype = LDC_ACK;
@@ -326,7 +326,7 @@ ldc_send_rts(struct ldc_conn *lc)
 		return;
 	}
 
-	lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+	lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
 	bzero(lp, sizeof(struct ldc_pkt));
 	lp->type = LDC_CTRL;
 	lp->stype = LDC_INFO;
@@ -361,7 +361,7 @@ ldc_send_rtr(struct ldc_conn *lc)
 		return;
 	}
 
-	lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+	lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
 	bzero(lp, sizeof(struct ldc_pkt));
 	lp->type = LDC_CTRL;
 	lp->stype = LDC_INFO;
@@ -396,7 +396,7 @@ ldc_send_rdx(struct ldc_conn *lc)
 		return;
 	}
 
-	lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+	lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
 	bzero(lp, sizeof(struct ldc_pkt));
 	lp->type = LDC_CTRL;
 	lp->stype = LDC_INFO;
@@ -442,7 +442,7 @@ ldc_send_unreliable(struct ldc_conn *lc,
 	}
 
 	while (len > 0) {
-		lp = (struct ldc_pkt *)(lc->lc_txq->lq_va + tx_tail);
+		lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_txq->lq_va + tx_tail);
 		bzero(lp, sizeof(struct ldc_pkt));
 		lp->type = LDC_DATA;
 		lp->stype = LDC_INFO;
Index: src/sys/arch/sparc64/dev/vdsk.c
diff -u src/sys/arch/sparc64/dev/vdsk.c:1.1 src/sys/arch/sparc64/dev/vdsk.c:1.2
--- src/sys/arch/sparc64/dev/vdsk.c:1.1	Fri Aug 19 19:02:07 2016
+++ src/sys/arch/sparc64/dev/vdsk.c	Sat Aug 20 18:21:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vdsk.c,v 1.1 2016/08/19 19:02:07 palle Exp $	*/
+/*	$NetBSD: vdsk.c,v 1.2 2016/08/20 18:21:18 nakayama Exp $	*/
 /*	$OpenBSD: vdsk.c,v 1.46 2015/01/25 21:42:13 kettenis Exp $	*/
 /*
  * Copyright (c) 2009, 2011 Mark Kettenis
@@ -542,7 +542,7 @@ vdsk_rx_intr(void *arg)
 	if (rx_head == rx_tail)
 		return (0);
 
-	lp = (struct ldc_pkt *)(lc->lc_rxq->lq_va + rx_head);
+	lp = (struct ldc_pkt *)(uintptr_t)(lc->lc_rxq->lq_va + rx_head);
 	switch (lp->type) {
 		case LDC_CTRL:
 			ldc_rx_ctrl(lc, lp);

CVS commit: src/sys/arch/amd64/amd64

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Sat Aug 20 18:04:04 UTC 2016

Modified Files:
src/sys/arch/amd64/amd64: gdt.c

Log Message:
The GDT needs to be grown on each CPU, and not just gdtstore (cpu0).
Otherwise, if the caller gets switched to another CPU, the kernel will
end up accessing unallocated memory.

Currently, it never happens. The same is done in i386.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amd64/amd64/gdt.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/amd64/amd64/gdt.c
diff -u src/sys/arch/amd64/amd64/gdt.c:1.28 src/sys/arch/amd64/amd64/gdt.c:1.29
--- src/sys/arch/amd64/amd64/gdt.c:1.28	Sat Aug 20 17:34:23 2016
+++ src/sys/arch/amd64/amd64/gdt.c	Sat Aug 20 18:04:04 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdt.c,v 1.28 2016/08/20 17:34:23 christos Exp $	*/
+/*	$NetBSD: gdt.c,v 1.29 2016/08/20 18:04:04 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 2009 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.28 2016/08/20 17:34:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.29 2016/08/20 18:04:04 maxv Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
@@ -206,12 +206,14 @@ gdt_reload_cpu(struct cpu_info *ci)
 #endif
 
 /*
- * Grow or shrink the GDT.
+ * Grow the GDT.
  */
 static void
 gdt_grow(void)
 {
 	size_t old_len, new_len;
+	CPU_INFO_ITERATOR cii;
+	struct cpu_info *ci;
 	struct vm_page *pg;
 	vaddr_t va;
 
@@ -221,15 +223,19 @@ gdt_grow(void)
 	gdt_dynavail =
 	(gdt_size - DYNSEL_START) / sizeof(struct sys_segment_descriptor);
 
-	for (va = (vaddr_t)gdtstore + old_len; va < (vaddr_t)gdtstore + new_len;
-	va += PAGE_SIZE) {
-		while ((pg = uvm_pagealloc(NULL, 0, NULL, UVM_PGA_ZERO)) ==
-		   NULL) {
-			uvm_wait("gdt_grow");
+	for (CPU_INFO_FOREACH(cii, ci)) {
+		for (va = (vaddr_t)(ci->ci_gdt) + old_len;
+		 va < (vaddr_t)(ci->ci_gdt) + new_len;
+		 va += PAGE_SIZE) {
+			while ((pg = uvm_pagealloc(NULL, 0, NULL, UVM_PGA_ZERO)) ==
+			NULL) {
+uvm_wait("gdt_grow");
+			}
+			pmap_kenter_pa(va, VM_PAGE_TO_PHYS(pg),
+			VM_PROT_READ | VM_PROT_WRITE, 0);
 		}
-		pmap_kenter_pa(va, VM_PAGE_TO_PHYS(pg),
-		VM_PROT_READ | VM_PROT_WRITE, 0);
 	}
+
 	pmap_update(pmap_kernel());
 }
 

CVS commit: src/sys/arch/amd64/amd64

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 20 17:34:24 UTC 2016

Modified Files:
src/sys/arch/amd64/amd64: gdt.c

Log Message:
fix the build.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/amd64/amd64/gdt.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/amd64/amd64/gdt.c
diff -u src/sys/arch/amd64/amd64/gdt.c:1.27 src/sys/arch/amd64/amd64/gdt.c:1.28
--- src/sys/arch/amd64/amd64/gdt.c:1.27	Sat Aug 20 12:05:48 2016
+++ src/sys/arch/amd64/amd64/gdt.c	Sat Aug 20 13:34:23 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdt.c,v 1.27 2016/08/20 16:05:48 maxv Exp $	*/
+/*	$NetBSD: gdt.c,v 1.28 2016/08/20 17:34:23 christos Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 2009 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.27 2016/08/20 16:05:48 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.28 2016/08/20 17:34:23 christos Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
@@ -65,8 +65,6 @@ int gdt_free;		/* next free slot; termin
 
 void gdt_init(void);
 static void gdt_grow(void);
-static int gdt_get_slot(void);
-static void gdt_put_slot(int);
 
 void
 update_descriptor(void *tp, void *ep)
@@ -235,6 +233,7 @@ gdt_grow(void)
 	pmap_update(pmap_kernel());
 }
 
+#if !defined(XEN) || defined(USER_LDT)
 /*
  * Allocate a GDT slot as follows:
  * 1) If there are entries on the free list, use those.
@@ -292,6 +291,7 @@ gdt_put_slot(int slot)
 	gdt[slot].sd_xx3 = gdt_free;
 	gdt_free = slot;
 }
+#endif
 
 int
 tss_alloc(struct x86_64_tss *tss)

CVS commit: src/doc

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sat Aug 20 17:09:34 UTC 2016

Modified Files:
src/doc: 3RDPARTY

Log Message:
binutils-2.27 out.


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

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1352 src/doc/3RDPARTY:1.1353
--- src/doc/3RDPARTY:1.1352	Sat Aug 20 11:25:45 2016
+++ src/doc/3RDPARTY	Sat Aug 20 17:09:34 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1352 2016/08/20 11:25:45 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1353 2016/08/20 17:09:34 wiz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -172,7 +172,7 @@ Todo[5]: Reconcile the doc directory.
 
 Package:	binutils
 Version:	2.23.2
-Current Vers:	2.26.1
+Current Vers:	2.27
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/binutils/
 Home Page:	http://www.gnu.org/software/binutils/

CVS commit: src/tests/rump/modautoload

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 20 17:06:18 UTC 2016

Modified Files:
src/tests/rump/modautoload: Makefile

Log Message:
add missing library dependencies.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/rump/modautoload/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/rump/modautoload/Makefile
diff -u src/tests/rump/modautoload/Makefile:1.3 src/tests/rump/modautoload/Makefile:1.4
--- src/tests/rump/modautoload/Makefile:1.3	Sun Dec 27 01:36:36 2015
+++ src/tests/rump/modautoload/Makefile	Sat Aug 20 13:06:18 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2015/12/27 06:36:36 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.4 2016/08/20 17:06:18 christos Exp $
 #
 
 TESTSDIR=	${TESTSBASE}/rump/modautoload
@@ -15,6 +15,7 @@ LDADD+=		-Wl,--whole-archive	${DESTDIR}/
 	${DESTDIR}/usr/lib/librump.a	\
 		-Wl,--no-whole-archive
 LDADD+=		-lrumpuser -lpthread
+DPADD+=		${LIBRUMPVFS} ${LIBRUMP} ${LIBRUMPUSER}
 
 WARNS=	4
 

CVS commit: xsrc/external/mit/xf86-video-chips/dist/src

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Sat Aug 20 16:21:09 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-chips/dist/src: ct_accel.c

Log Message:
make this compile


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c

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/xf86-video-chips/dist/src/ct_accel.c
diff -u xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c:1.3 xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c:1.4
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c:1.3	Fri Aug 19 23:30:29 2016
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c	Sat Aug 20 16:21:08 2016
@@ -164,7 +164,7 @@ static void  CTNAME(ReadPixmap)(ScrnInfo
 # define BE_SWAPON(pScrn,cPtr)
 # define BE_SWAPOFF(pScrn,cPtr)
 #endif
-#endif
+
 Bool 
 CTNAME(AccelInit)(ScreenPtr pScreen)
 {
@@ -1741,6 +1741,8 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, in
 }
 #endif /* ReadPixmap */
 
-#endif
+#endif /* writepixmap */
 
 #endif
+
+#endif /* HAVE_XAA_H */

CVS commit: src/share/mk

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 20 16:11:07 UTC 2016

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

Log Message:
mention the default for MKUNBOUND


To generate a diff of this commit:
cvs rdiff -u -r1.355 -r1.356 src/share/mk/bsd.README

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

Modified files:

Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.355 src/share/mk/bsd.README:1.356
--- src/share/mk/bsd.README:1.355	Sat Aug 20 07:23:33 2016
+++ src/share/mk/bsd.README	Sat Aug 20 12:11:07 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.355 2016/08/20 11:23:33 christos Exp $
+#	$NetBSD: bsd.README,v 1.356 2016/08/20 16:11:07 christos Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -413,6 +413,7 @@ MKTPM		If "no" then don't build the Trus
 		Default: no
 
 MKUNBOUND	If not "no", build and install the "unbound" DNS resolver.
+		Default: yes
 
 MKUNPRIVED	If not "no", don't set the owner/group/mode when installing
 		files or directories, and keep a metadata log of what

CVS commit: src/sys/arch

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Sat Aug 20 16:05:49 UTC 2016

Modified Files:
src/sys/arch/amd64/amd64: gdt.c
src/sys/arch/i386/i386: gdt.c
src/sys/arch/i386/include: gdt.h

Log Message:
Localify.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/amd64/amd64/gdt.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/i386/i386/gdt.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/include/gdt.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/amd64/amd64/gdt.c
diff -u src/sys/arch/amd64/amd64/gdt.c:1.26 src/sys/arch/amd64/amd64/gdt.c:1.27
--- src/sys/arch/amd64/amd64/gdt.c:1.26	Sun Nov 22 13:41:24 2015
+++ src/sys/arch/amd64/amd64/gdt.c	Sat Aug 20 16:05:48 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdt.c,v 1.26 2015/11/22 13:41:24 maxv Exp $	*/
+/*	$NetBSD: gdt.c,v 1.27 2016/08/20 16:05:48 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 2009 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.26 2015/11/22 13:41:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.27 2016/08/20 16:05:48 maxv Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
@@ -64,9 +64,9 @@ int gdt_next;		/* next available slot fo
 int gdt_free;		/* next free slot; terminated with GNULL_SEL */
 
 void gdt_init(void);
-void gdt_grow(void);
-int gdt_get_slot(void);
-void gdt_put_slot(int);
+static void gdt_grow(void);
+static int gdt_get_slot(void);
+static void gdt_put_slot(int);
 
 void
 update_descriptor(void *tp, void *ep)
@@ -88,8 +88,7 @@ update_descriptor(void *tp, void *ep)
 }
 
 void
-set_sys_gdt(int slot, void *base, size_t limit,
-	int type, int dpl, int gran)
+set_sys_gdt(int slot, void *base, size_t limit, int type, int dpl, int gran)
 {
 	union {
 		struct sys_segment_descriptor sd;
@@ -208,11 +207,10 @@ gdt_reload_cpu(struct cpu_info *ci)
 }
 #endif
 
-
 /*
  * Grow or shrink the GDT.
  */
-void
+static void
 gdt_grow(void)
 {
 	size_t old_len, new_len;
@@ -223,7 +221,7 @@ gdt_grow(void)
 	gdt_size <<= 1;
 	new_len = old_len << 1;
 	gdt_dynavail =
-	(gdt_size - DYNSEL_START) / sizeof (struct sys_segment_descriptor);
+	(gdt_size - DYNSEL_START) / sizeof(struct sys_segment_descriptor);
 
 	for (va = (vaddr_t)gdtstore + old_len; va < (vaddr_t)gdtstore + new_len;
 	va += PAGE_SIZE) {
@@ -245,7 +243,7 @@ gdt_grow(void)
  * 3) As a last resort, we increase the size of the GDT, and sweep through
  *the new slots.
  */
-int
+static int
 gdt_get_slot(void)
 {
 	int slot;
@@ -280,7 +278,7 @@ gdt_get_slot(void)
 /*
  * Deallocate a GDT slot, putting it on the free list.
  */
-void
+static void
 gdt_put_slot(int slot)
 {
 	struct sys_segment_descriptor *gdt;

Index: src/sys/arch/i386/i386/gdt.c
diff -u src/sys/arch/i386/i386/gdt.c:1.53 src/sys/arch/i386/i386/gdt.c:1.54
--- src/sys/arch/i386/i386/gdt.c:1.53	Fri Feb 24 08:06:07 2012
+++ src/sys/arch/i386/i386/gdt.c	Sat Aug 20 16:05:48 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdt.c,v 1.53 2012/02/24 08:06:07 cherry Exp $	*/
+/*	$NetBSD: gdt.c,v 1.54 2016/08/20 16:05:48 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.53 2012/02/24 08:06:07 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.54 2016/08/20 16:05:48 maxv Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
@@ -61,9 +61,9 @@ static int ldt_count;	/* number of LDTs 
 static int ldt_max = 1000;/* max number of LDTs */
 
 void gdt_init(void);
-void gdt_grow(int);
-int gdt_get_slot1(int);
-void gdt_put_slot1(int, int);
+static void gdt_grow(int);
+static int gdt_get_slot1(int);
+static void gdt_put_slot1(int, int);
 
 void
 update_descriptor(union descriptor *table, union descriptor *entry)
@@ -82,8 +82,8 @@ update_descriptor(union descriptor *tabl
 }
 
 void
-setgdt(int sel, const void *base, size_t limit,
-int type, int dpl, int def32, int gran)
+setgdt(int sel, const void *base, size_t limit, int type, int dpl, int def32,
+int gran)
 {
 	struct segment_descriptor *sd = [sel].sd;
 	CPU_INFO_ITERATOR cii;
@@ -201,23 +201,21 @@ gdt_init_cpu(struct cpu_info *ci)
 	pt_entry_t *ptp;
 	int f;
 
-	for (va = (vaddr_t)ci->ci_gdt, f = 0;
-	 va < (vaddr_t)ci->ci_gdt + len;
-	 va += PAGE_SIZE, f++) {
+	for (va = (vaddr_t)ci->ci_gdt, f = 0; va < (vaddr_t)ci->ci_gdt + len;
+	va += PAGE_SIZE, f++) {
 		KASSERT(va >= VM_MIN_KERNEL_ADDRESS);
 		ptp = kvtopte(va);
 		frames[f] = *ptp >> PAGE_SHIFT;
-		{ 
-		   /* 
-		* pmap_pte_clearbits(ptp, PG_RW);
-		* but without spl(), since %fs is not setup
-		* properly yet, ie; curcpu() won't work at this
-		* point and spl() will break.
-		*/
-			if (HYPERVISOR_update_va_mapping((vaddr_t)va,
-*ptp & ~PG_RW, UVMF_INVLPG) < 0) {
-panic("%s page RO update failed.\n", __func__);
-			}
+
+		/* 
+		 * 

CVS commit: src/sys/rump/librump/rumpkern

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 20 15:50:50 UTC 2016

Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern

Log Message:
need kern_ssp.c for a full SSP build.


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/sys/rump/librump/rumpkern/Makefile.rumpkern

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

Modified files:

Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.167 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.168
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.167	Mon Apr 11 02:49:11 2016
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern	Sat Aug 20 11:50:50 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.rumpkern,v 1.167 2016/04/11 06:49:11 ozaki-r Exp $
+#	$NetBSD: Makefile.rumpkern,v 1.168 2016/08/20 15:50:50 christos Exp $
 #
 
 .include "${RUMPTOP}/Makefile.rump"
@@ -87,6 +87,7 @@ SRCS+=	init_sysctl_base.c	\
 	kern_rndsink.c		\
 	kern_rwlock_obj.c	\
 	kern_stub.c		\
+	kern_ssp.c		\
 	kern_syscall.c		\
 	kern_sysctl.c		\
 	kern_tc.c		\

CVS commit: src/tests

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 20 15:49:08 UTC 2016

Modified Files:
src/tests: h_macros.h

Log Message:
provide an RL variant that prints an extra argument


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/h_macros.h

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

Modified files:

Index: src/tests/h_macros.h
diff -u src/tests/h_macros.h:1.12 src/tests/h_macros.h:1.13
--- src/tests/h_macros.h:1.12	Thu Aug  4 07:49:07 2016
+++ src/tests/h_macros.h	Sat Aug 20 11:49:08 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: h_macros.h,v 1.12 2016/08/04 11:49:07 jakllsch Exp $ */
+/* $NetBSD: h_macros.h,v 1.13 2016/08/20 15:49:08 christos Exp $ */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -45,6 +45,8 @@
 	ATF_CHECK_MSG((x) != (v), "%s: %s", #x, strerror(errno))
 
 #define RL(x) REQUIRE_LIBC(x, -1)
+#define RLF(x, fmt, arg) \
+	ATF_CHECK_MSG((x) != -1, "%s [" fmt "]: %s", #x, arg, strerror(errno))
 #define RZ(x)\
 do {	\
 	int RZ_rv = x;			\

CVS commit: src/external/bsd/unbound/lib/libunbound

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 20 15:24:29 UTC 2016

Modified Files:
src/external/bsd/unbound/lib/libunbound: Makefile

Log Message:
avoid yacc regeneration (lex does not need it, because their file is called
.lex and we don't have rules for that)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/unbound/lib/libunbound/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/unbound/lib/libunbound/Makefile
diff -u src/external/bsd/unbound/lib/libunbound/Makefile:1.1 src/external/bsd/unbound/lib/libunbound/Makefile:1.2
--- src/external/bsd/unbound/lib/libunbound/Makefile:1.1	Sat Aug 20 07:20:31 2016
+++ src/external/bsd/unbound/lib/libunbound/Makefile	Sat Aug 20 11:24:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/08/20 11:20:31 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/20 15:24:29 christos Exp $
 
 .include 
 
@@ -101,3 +101,6 @@ CLEANFILES+=libunbound.3
 libunbound.3: libunbound.3.in __subst
 
 .include 
+
+# Use the generated files
+.y.c:

CVS commit: src/share/man/man9

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sat Aug 20 12:41:31 UTC 2016

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

Log Message:
Bump date for previous.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/share/man/man9/vnode.9

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

Modified files:

Index: src/share/man/man9/vnode.9
diff -u src/share/man/man9/vnode.9:1.71 src/share/man/man9/vnode.9:1.72
--- src/share/man/man9/vnode.9:1.71	Sat Aug 20 12:37:06 2016
+++ src/share/man/man9/vnode.9	Sat Aug 20 12:41:31 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: vnode.9,v 1.71 2016/08/20 12:37:06 hannken Exp $
+.\" $NetBSD: vnode.9,v 1.72 2016/08/20 12:41:31 wiz Exp $
 .\"
 .\" Copyright (c) 2001, 2005, 2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd July 12, 2015
+.Dd August 20, 2016
 .Dt VNODE 9
 .Os
 .Sh NAME

CVS commit: src

[Juergen Hannken-Illjes]

Module Name:src
Committed By:   hannken
Date:   Sat Aug 20 12:37:10 UTC 2016

Modified Files:
src/distrib/sets/lists/comp: mi
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_znode.c
src/share/man/man9: Makefile vnode.9
src/sys/coda: coda_vnops.c
src/sys/fs/adosfs: advnops.c
src/sys/fs/cd9660: cd9660_node.c
src/sys/fs/efs: efs_vnops.c
src/sys/fs/filecorefs: filecore_node.c
src/sys/fs/hfs: hfs_vnops.c
src/sys/fs/msdosfs: msdosfs_denode.c
src/sys/fs/nilfs: nilfs_vnops.c
src/sys/fs/ntfs: ntfs_vnops.c
src/sys/fs/ptyfs: ptyfs_vnops.c
src/sys/fs/puffs: puffs_node.c
src/sys/fs/smbfs: smbfs_node.c
src/sys/fs/sysvbfs: sysvbfs_vnops.c
src/sys/fs/tmpfs: tmpfs_vnops.c
src/sys/fs/udf: udf_vnops.c
src/sys/fs/union: union_subr.c
src/sys/fs/v7fs: v7fs_vnops.c
src/sys/kern: vfs_vnode.c
src/sys/miscfs/fdesc: fdesc_vnops.c
src/sys/miscfs/genfs: layer_vnops.c
src/sys/miscfs/kernfs: kernfs_vnops.c
src/sys/miscfs/procfs: procfs_vnops.c
src/sys/miscfs/specfs: spec_vnops.c
src/sys/nfs: nfs_node.c
src/sys/rump/librump/rumpvfs: rumpfs.c
src/sys/sys: param.h vnode.h
src/sys/ufs/chfs: chfs_vnops.c
src/sys/ufs/lfs: ulfs_inode.c
src/sys/ufs/ufs: ufs_inode.c

Log Message:
Remove now obsolete operation vcache_remove().

Welcome to 7.99.36


To generate a diff of this commit:
cvs rdiff -u -r1.2057 -r1.2058 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.18 -r1.19 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
cvs rdiff -u -r1.396 -r1.397 src/share/man/man9/Makefile
cvs rdiff -u -r1.70 -r1.71 src/share/man/man9/vnode.9
cvs rdiff -u -r1.102 -r1.103 src/sys/coda/coda_vnops.c
cvs rdiff -u -r1.47 -r1.48 src/sys/fs/adosfs/advnops.c
cvs rdiff -u -r1.34 -r1.35 src/sys/fs/cd9660/cd9660_node.c
cvs rdiff -u -r1.35 -r1.36 src/sys/fs/efs/efs_vnops.c
cvs rdiff -u -r1.27 -r1.28 src/sys/fs/filecorefs/filecore_node.c
cvs rdiff -u -r1.32 -r1.33 src/sys/fs/hfs/hfs_vnops.c
cvs rdiff -u -r1.51 -r1.52 src/sys/fs/msdosfs/msdosfs_denode.c
cvs rdiff -u -r1.32 -r1.33 src/sys/fs/nilfs/nilfs_vnops.c
cvs rdiff -u -r1.59 -r1.60 src/sys/fs/ntfs/ntfs_vnops.c
cvs rdiff -u -r1.51 -r1.52 src/sys/fs/ptyfs/ptyfs_vnops.c
cvs rdiff -u -r1.36 -r1.37 src/sys/fs/puffs/puffs_node.c
cvs rdiff -u -r1.53 -r1.54 src/sys/fs/smbfs/smbfs_node.c
cvs rdiff -u -r1.59 -r1.60 src/sys/fs/sysvbfs/sysvbfs_vnops.c
cvs rdiff -u -r1.127 -r1.128 src/sys/fs/tmpfs/tmpfs_vnops.c
cvs rdiff -u -r1.101 -r1.102 src/sys/fs/udf/udf_vnops.c
cvs rdiff -u -r1.73 -r1.74 src/sys/fs/union/union_subr.c
cvs rdiff -u -r1.21 -r1.22 src/sys/fs/v7fs/v7fs_vnops.c
cvs rdiff -u -r1.55 -r1.56 src/sys/kern/vfs_vnode.c
cvs rdiff -u -r1.126 -r1.127 src/sys/miscfs/fdesc/fdesc_vnops.c
cvs rdiff -u -r1.58 -r1.59 src/sys/miscfs/genfs/layer_vnops.c
cvs rdiff -u -r1.155 -r1.156 src/sys/miscfs/kernfs/kernfs_vnops.c
cvs rdiff -u -r1.193 -r1.194 src/sys/miscfs/procfs/procfs_vnops.c
cvs rdiff -u -r1.162 -r1.163 src/sys/miscfs/specfs/spec_vnops.c
cvs rdiff -u -r1.118 -r1.119 src/sys/nfs/nfs_node.c
cvs rdiff -u -r1.141 -r1.142 src/sys/rump/librump/rumpvfs/rumpfs.c
cvs rdiff -u -r1.501 -r1.502 src/sys/sys/param.h
cvs rdiff -u -r1.263 -r1.264 src/sys/sys/vnode.h
cvs rdiff -u -r1.28 -r1.29 src/sys/ufs/chfs/chfs_vnops.c
cvs rdiff -u -r1.15 -r1.16 src/sys/ufs/lfs/ulfs_inode.c
cvs rdiff -u -r1.95 -r1.96 src/sys/ufs/ufs/ufs_inode.c

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

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2057 src/distrib/sets/lists/comp/mi:1.2058
--- src/distrib/sets/lists/comp/mi:1.2057	Sat Aug 20 11:34:49 2016
+++ src/distrib/sets/lists/comp/mi	Sat Aug 20 12:37:06 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2057 2016/08/20 11:34:49 christos Exp $
+#	$NetBSD: mi,v 1.2058 2016/08/20 12:37:06 hannken Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -1,7 +1,7 @@
 ./usr/share/man/cat9/vcache_new.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/vcache_rekey_enter.0	comp-sys-catman		.cat
 ./usr/share/man/cat9/vcache_rekey_exit.0	comp-sys-catman		.cat
-./usr/share/man/cat9/vcache_remove.0		comp-sys-catman		.cat
+./usr/share/man/cat9/vcache_remove.0		comp-sys-catman		obsolete
 ./usr/share/man/cat9/vcons.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/vcount.0			comp-obsolete		obsolete
 ./usr/share/man/cat9/vdead_check.0		comp-sys-catman		.cat
@@ -18226,7 +18226,7 @@
 ./usr/share/man/html9/vcache_new.html		comp-sys-htmlman	html
 ./usr/share/man/html9/vcache_rekey_enter.html	comp-sys-htmlman	html
 ./usr/share/man/html9/vcache_rekey_exit.html	comp-sys-htmlman	html
-./usr/share/man/html9/vcache_remove.html	comp-sys-htmlman	html

CVS commit: src/sys/kern

[Juergen Hannken-Illjes]

Module Name:src
Committed By:   hannken
Date:   Sat Aug 20 12:33:57 UTC 2016

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

Log Message:
Change vcache_reclaim() to remove vnode from vnode cache once the
vnode was reclaimed from the file system.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/kern/vfs_vnode.c

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

Modified files:

Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.54 src/sys/kern/vfs_vnode.c:1.55
--- src/sys/kern/vfs_vnode.c:1.54	Sat Aug 20 12:31:37 2016
+++ src/sys/kern/vfs_vnode.c	Sat Aug 20 12:33:57 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_vnode.c,v 1.54 2016/08/20 12:31:37 hannken Exp $	*/
+/*	$NetBSD: vfs_vnode.c,v 1.55 2016/08/20 12:33:57 hannken Exp $	*/
 
 /*-
  * Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -156,7 +156,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.54 2016/08/20 12:31:37 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.55 2016/08/20 12:33:57 hannken Exp $");
 
 #define _VFS_VNODE_PRIVATE
 
@@ -1495,6 +1495,10 @@ static void
 vcache_reclaim(vnode_t *vp)
 {
 	lwp_t *l = curlwp;
+	struct vcache_node *node = VP_TO_VN(vp);
+	uint32_t hash;
+	uint8_t temp_buf[64], *temp_key;
+	size_t temp_key_len;
 	bool recycle, active;
 	int error;
 
@@ -1504,6 +1508,7 @@ vcache_reclaim(vnode_t *vp)
 	KASSERT(vp->v_usecount != 0);
 
 	active = (vp->v_usecount > 1);
+	temp_key_len = node->vn_key.vk_key_len;
 	/*
 	 * Prevent the vnode from being recycled or brought into use
 	 * while we clean it out.
@@ -1516,6 +1521,17 @@ vcache_reclaim(vnode_t *vp)
 	vp->v_iflag &= ~(VI_TEXT|VI_EXECMAP);
 	mutex_exit(vp->v_interlock);
 
+	/* Replace the vnode key with a temporary copy. */
+	if (node->vn_key.vk_key_len > sizeof(temp_buf)) {
+		temp_key = kmem_alloc(temp_key_len, KM_SLEEP);
+	} else {
+		temp_key = temp_buf;
+	}
+	mutex_enter();
+	memcpy(temp_key, node->vn_key.vk_key, temp_key_len);
+	node->vn_key.vk_key = temp_key;
+	mutex_exit();
+
 	/*
 	 * Clean out any cached data associated with the vnode.
 	 * If purging an active vnode, it must be closed and
@@ -1564,6 +1580,16 @@ vcache_reclaim(vnode_t *vp)
 	atomic_inc_uint(_rootmount->mnt_refcnt);
 	vfs_insmntque(vp, dead_rootmount);
 
+	/* Remove from vnode cache. */
+	hash = vcache_hash(>vn_key);
+	mutex_enter();
+	KASSERT(node == vcache_hash_lookup(>vn_key, hash));
+	SLIST_REMOVE([hash & vcache.hashmask],
+	node, vcache_node, vn_hash);
+	mutex_exit();
+	if (temp_key != temp_buf)
+		kmem_free(temp_key, temp_key_len);
+
 	/* Done with purge, notify sleepers of the grim news. */
 	mutex_enter(vp->v_interlock);
 	vp->v_op = dead_vnodeop_p;
@@ -1581,6 +1607,7 @@ vcache_reclaim(vnode_t *vp)
 void
 vcache_remove(struct mount *mp, const void *key, size_t key_len)
 {
+#ifdef DIAGNOSTIC
 	uint32_t hash;
 	struct vcache_key vcache_key;
 	struct vcache_node *node;
@@ -1593,9 +1620,8 @@ vcache_remove(struct mount *mp, const vo
 	mutex_enter();
 	node = vcache_hash_lookup(_key, hash);
 	KASSERT(node != NULL);
-	SLIST_REMOVE([hash & vcache.hashmask],
-	node, vcache_node, vn_hash);
 	mutex_exit();
+#endif
 }
 
 /*

CVS commit: src/sys/kern

[Juergen Hannken-Illjes]

Module Name:src
Committed By:   hannken
Date:   Sat Aug 20 12:31:37 UTC 2016

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

Log Message:
Rename vclean() to vcache_reclaim().
No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/kern/vfs_vnode.c

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

Modified files:

Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.53 src/sys/kern/vfs_vnode.c:1.54
--- src/sys/kern/vfs_vnode.c:1.53	Thu Jul  7 06:55:43 2016
+++ src/sys/kern/vfs_vnode.c	Sat Aug 20 12:31:37 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_vnode.c,v 1.53 2016/07/07 06:55:43 msaitoh Exp $	*/
+/*	$NetBSD: vfs_vnode.c,v 1.54 2016/08/20 12:31:37 hannken Exp $	*/
 
 /*-
  * Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -89,8 +89,9 @@
  *	references, e.g. count of links, whether the file was removed).
  *
  *	Depending on indication, vnode can be put into a free list (cache),
- *	or cleaned via vclean(9), which calls VOP_RECLAIM(9) to disassociate
- *	underlying file system from the vnode, and finally destroyed.
+ *	or cleaned via vcache_reclaim, which calls VOP_RECLAIM(9) to
+ *	disassociate underlying file system from the vnode, and finally
+ *	destroyed.
  *
  * Vnode state
  *
@@ -113,10 +114,10 @@
  *			vcache_new() and is ready to use.
  *	ACTIVE -> RECLAIMING
  *			Vnode starts disassociation from underlying file
- *			system in vclean().
+ *			system in vcache_reclaim().
  *	RECLAIMING -> RECLAIMED
  *			Vnode finished disassociation from underlying file
- *			system in vclean().
+ *			system in vcache_reclaim().
  *	ACTIVE -> BLOCKED
  *			Either vcache_rekey*() is changing the vnode key or
  *			vrelel() is about to call VOP_INACTIVE().
@@ -155,7 +156,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.53 2016/07/07 06:55:43 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.54 2016/08/20 12:31:37 hannken Exp $");
 
 #define _VFS_VNODE_PRIVATE
 
@@ -242,7 +243,7 @@ static struct vcache_node *vcache_alloc(
 static void		vcache_free(struct vcache_node *);
 static void		vcache_init(void);
 static void		vcache_reinit(void);
-static void		vclean(vnode_t *);
+static void		vcache_reclaim(vnode_t *);
 static void		vrelel(vnode_t *, int);
 static void		vdrain_thread(void *);
 static void		vrele_thread(void *);
@@ -527,7 +528,7 @@ try_nextlist:
 	 * before doing this.
 	 */
 	vp->v_usecount = 1;
-	vclean(vp);
+	vcache_reclaim(vp);
 	vrelel(vp, 0);
 	fstrans_done(mp);
 
@@ -588,7 +589,7 @@ vremfree(vnode_t *vp)
  *
  * => Must be called with v_interlock held.
  *
- * If state is VN_RECLAIMING, the vnode may be eliminated in vgone()/vclean().
+ * If state is VN_RECLAIMING, the vnode may be eliminated in vcache_reclaim().
  * In that case, we cannot grab the vnode, so the process is awakened when
  * the transition is completed, and an error returned to indicate that the
  * vnode is no longer usable.
@@ -783,7 +784,7 @@ vrelel(vnode_t *vp, int flags)
 		 */
 		VOP_INACTIVE(vp, );
 		if (recycle) {
-			/* vclean() below will drop the lock. */
+			/* vcache_reclaim() below will drop the lock. */
 			if (vn_lock(vp, LK_EXCLUSIVE) != 0)
 recycle = false;
 		}
@@ -812,7 +813,7 @@ vrelel(vnode_t *vp, int flags)
 		 */
 		if (recycle) {
 			VSTATE_ASSERT(vp, VN_ACTIVE);
-			vclean(vp);
+			vcache_reclaim(vp);
 		}
 		KASSERT(vp->v_usecount > 0);
 	}
@@ -990,96 +991,6 @@ holdrelel(vnode_t *vp)
 }
 
 /*
- * Disassociate the underlying file system from a vnode.
- *
- * Must be called with vnode locked and will return unlocked.
- * Must be called with the interlock held, and will return with it held.
- */
-static void
-vclean(vnode_t *vp)
-{
-	lwp_t *l = curlwp;
-	bool recycle, active;
-	int error;
-
-	KASSERT((vp->v_vflag & VV_LOCKSWORK) == 0 ||
-	VOP_ISLOCKED(vp) == LK_EXCLUSIVE);
-	KASSERT(mutex_owned(vp->v_interlock));
-	KASSERT(vp->v_usecount != 0);
-
-	active = (vp->v_usecount > 1);
-	/*
-	 * Prevent the vnode from being recycled or brought into use
-	 * while we clean it out.
-	 */
-	VSTATE_CHANGE(vp, VN_ACTIVE, VN_RECLAIMING);
-	if (vp->v_iflag & VI_EXECMAP) {
-		atomic_add_int(, -vp->v_uobj.uo_npages);
-		atomic_add_int(, vp->v_uobj.uo_npages);
-	}
-	vp->v_iflag &= ~(VI_TEXT|VI_EXECMAP);
-	mutex_exit(vp->v_interlock);
-
-	/*
-	 * Clean out any cached data associated with the vnode.
-	 * If purging an active vnode, it must be closed and
-	 * deactivated before being reclaimed. Note that the
-	 * VOP_INACTIVE will unlock the vnode.
-	 */
-	error = vinvalbuf(vp, V_SAVE, NOCRED, l, 0, 0);
-	if (error != 0) {
-		if (wapbl_vphaswapbl(vp))
-			WAPBL_DISCARD(wapbl_vptomp(vp));
-		error = vinvalbuf(vp, 0, NOCRED, l, 0, 0);
-	}
-	KASSERTMSG((error == 0), "vinvalbuf failed: %d", error);
-	KASSERT((vp->v_iflag & VI_ONWORKLST) == 0);
-	if (active && (vp->v_type == VBLK || vp->v_type == VCHR)) {
-		 spec_node_revoke(vp);
-	}
-	if (active) {
-		

CVS commit: src/distrib/sets/lists

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 20 11:34:50 UTC 2016

Modified Files:
src/distrib/sets/lists/base: mi shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/debug: mi shl.mi
src/distrib/sets/lists/man: mi

Log Message:
add unbound stuff


To generate a diff of this commit:
cvs rdiff -u -r1.1133 -r1.1134 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.782 -r1.783 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2056 -r1.2057 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.292 -r1.293 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.163 -r1.164 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.142 -r1.143 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.1531 -r1.1532 src/distrib/sets/lists/man/mi

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1133 src/distrib/sets/lists/base/mi:1.1134
--- src/distrib/sets/lists/base/mi:1.1133	Sat Jul 30 22:14:12 2016
+++ src/distrib/sets/lists/base/mi	Sat Aug 20 07:34:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1133 2016/07/31 02:14:12 pgoyette Exp $
+# $NetBSD: mi,v 1.1134 2016/08/20 11:34:49 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -123,6 +123,7 @@
 ./etc/sliphome	base-slip-root
 ./etc/ssh	base-sys-root
 ./etc/systrace	base-obsolete		obsolete
+./etc/unbound	base-sys-root
 ./etc/uucp	base-obsolete		obsolete
 ./etc/zfs	base-zfs-root
 ./lib		base-sys-root		compatdir
@@ -942,6 +943,7 @@
 ./usr/bin/tty	base-util-bin
 ./usr/bin/ul	base-util-bin
 ./usr/bin/uname	base-util-bin
+./usr/bin/unbound-hostbase-netutil-bin	crypto,unbound
 ./usr/bin/uncompressbase-util-bin
 ./usr/bin/unexpandbase-util-bin
 ./usr/bin/uniq	base-util-bin
@@ -1927,6 +1929,11 @@
 ./usr/sbin/traceroute6base-netutil-bin	use_inet6
 ./usr/sbin/trpt	base-netutil-bin
 ./usr/sbin/trsp	base-obsolete		obsolete
+./usr/sbin/unboundbase-netutil-bin	crypto,unbound
+./usr/sbin/unbound-anchor			base-netutil-bin	crypto,unbound
+./usr/sbin/unbound-checkconf			base-netutil-bin	crypto,unbound
+./usr/sbin/unbound-control			base-netutil-bin	crypto,unbound
+./usr/sbin/unbound-control-setup		base-netutil-bin	crypto,unbound
 ./usr/sbin/unlinkbase-sysutil-bin
 ./usr/sbin/updatebase-obsolete		obsolete
 ./usr/sbin/usbdevsbase-sysutil-bin
@@ -5908,6 +5915,9 @@
 ./var/chroot/tcpdump/etc			base-obsolete		obsolete
 ./var/chroot/tcpdump/etc/protocols		base-obsolete		obsolete
 ./var/chroot/tftp-proxybase-sys-root
+./var/chroot/unboundbase-sys-root
+./var/chroot/unbound/etc			base-sys-root
+./var/chroot/unbound/etc/unbound		base-sys-root
 ./var/crash	base-sys-root
 ./var/cron	base-cron-root
 ./var/cron/tabs	base-cron-root

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.782 src/distrib/sets/lists/base/shl.mi:1.783
--- src/distrib/sets/lists/base/shl.mi:1.782	Fri Aug 19 21:05:39 2016
+++ src/distrib/sets/lists/base/shl.mi	Sat Aug 20 07:34:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.782 2016/08/20 01:05:39 jakllsch Exp $
+# $NetBSD: shl.mi,v 1.783 2016/08/20 11:34:49 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -803,6 +803,9 @@
 ./usr/lib/libukfs.sobase-sys-shlib		compatfile,rump
 ./usr/lib/libukfs.so.1base-sys-shlib		compatfile,rump
 ./usr/lib/libukfs.so.1.0			base-sys-shlib		compatfile,rump
+./usr/lib/libunbound.sobase-sys-shlib		compatfile,crypto,unbound
+./usr/lib/libunbound.so.6			base-sys-shlib		compatfile,crypto,unbound
+./usr/lib/libunbound.so.6.1			base-sys-shlib		compatfile,crypto,unbound
 ./usr/lib/libumem.sobase-zfs-shlib		compatfile,zfs
 ./usr/lib/libumem.so.0base-zfs-shlib		compatfile,zfs
 ./usr/lib/libumem.so.0.0			base-zfs-shlib		compatfile,zfs

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2056 src/distrib/sets/lists/comp/mi:1.2057
--- src/distrib/sets/lists/comp/mi:1.2056	Thu Aug 11 10:48:47 2016
+++ src/distrib/sets/lists/comp/mi	Sat Aug 20 07:34:49 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2056 2016/08/11 14:48:47 christos Exp $
+#	$NetBSD: mi,v 1.2057 2016/08/20 11:34:49 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -3057,6 +3057,7 @@
 ./usr/include/ufs/ufs/ufs_wapbl.h		comp-c-include
 ./usr/include/ufs/ufs/ufsmount.h		comp-c-include
 ./usr/include/ulimit.hcomp-c-include
+./usr/include/unbound.hcomp-c-include		crypto,unbound
 ./usr/include/unctrl.hcomp-c-include
 ./usr/include/unistd.hcomp-c-include
 ./usr/include/unwind.hcomp-c-include
@@ -3612,6 +3613,8 @@
 ./usr/lib/libtre_p.acomp-c-proflib		

CVS commit: src/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 20 11:25:45 UTC 2016

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
unbound additions


To generate a diff of this commit:
cvs rdiff -u -r1.1351 -r1.1352 src/doc/3RDPARTY
cvs rdiff -u -r1.2180 -r1.2181 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1351 src/doc/3RDPARTY:1.1352
--- src/doc/3RDPARTY:1.1351	Mon Aug 15 07:06:46 2016
+++ src/doc/3RDPARTY	Sat Aug 20 07:25:45 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1351 2016/08/15 11:06:46 roy Exp $
+#	$NetBSD: 3RDPARTY,v 1.1352 2016/08/20 11:25:45 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -131,6 +131,20 @@ Build bind to generate the include files
 Then binclude4netbsd script to import into src/external/bsd/bind/include.
 The libc and include parts of the resolver are now part of libbind.
 
+Package:	unbound 
+Version:	1.5.9
+Current Vers:	1.5.9
+Maintainer:	Christos Zoulas
+Archive Site:	https://www.unbound.net/downloads/unbound-latest.tar.gz
+Home Page:	https://www.unbound.net/
+Mailing List:	https://unbound.nlnetlabs.nl/mailman/listinfo/unbound-users
+Responsible:	christos
+License:	BSD-like
+Location:	external/bsd/unbound/dist
+Notes:
+Use cleantags to import
+run configure and update config files in include
+
 Package:	libbind [libc resolver and includes]
 Version:	libbind-6.0-rc1
 Current Vers:	libbind-6.0

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2180 src/doc/CHANGES:1.2181
--- src/doc/CHANGES:1.2180	Mon Aug 15 07:06:46 2016
+++ src/doc/CHANGES	Sat Aug 20 07:25:45 2016
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2180 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2181 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -339,3 +339,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	OpenSSH: Imported 7.3. [christos 20160802]
 	zoneinfo: Import tzdata2016f. [kre 20160807]
 	dhcpcd(8): Import dhcpcd-6.11.3. [roy 20160815]
+	unbound: Import 1.5.9. [christos 20160820]

CVS commit: src/external/bsd

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 20 11:24:49 UTC 2016

Modified Files:
src/external/bsd: Makefile

Log Message:
unbound additions


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/external/bsd/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/Makefile
diff -u src/external/bsd/Makefile:1.54 src/external/bsd/Makefile:1.55
--- src/external/bsd/Makefile:1.54	Mon Sep 28 13:12:46 2015
+++ src/external/bsd/Makefile	Sat Aug 20 07:24:48 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.54 2015/09/28 17:12:46 christos Exp $
+#	$NetBSD: Makefile,v 1.55 2016/08/20 11:24:48 christos Exp $
 
 .include 
 
@@ -39,6 +39,9 @@ SUBDIR+= pcc
 SUBDIR+= libproc
 SUBDIR+= librtld_db
 .endif
+.if (${MKCRYPTO} != "no" && ${MKUNBOUND} != "no")
+SUBDIR+= unbound
+.endif
 
 SUBDIR+= blacklist pdisk dhcp nvi ppp smbfs
 

CVS commit: src/usr.sbin/postinstall

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 20 11:24:13 UTC 2016

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

Log Message:
unbound additions


To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 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.202 src/usr.sbin/postinstall/postinstall:1.203
--- src/usr.sbin/postinstall/postinstall:1.202	Sat Jan 30 18:45:37 2016
+++ src/usr.sbin/postinstall/postinstall	Sat Aug 20 07:24:13 2016
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.202 2016/01/30 23:45:37 christos Exp $
+# $NetBSD: postinstall,v 1.203 2016/08/20 11:24:13 christos Exp $
 #
 # Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1045,7 +1045,8 @@ do_gid()
 	check_ids "$1" groups "${DEST_DIR}/etc/group" \
 	"${SRC_DIR}/etc/group" 14 \
 	named ntpd sshd SKIP _pflogd _rwhod staff _proxy _timedc \
-	_sdpd _httpd _mdnsd _tests _tcpdump _tss _gpio _rtadvd
+	_sdpd _httpd _mdnsd _tests _tcpdump _tss _gpio _rtadvd SKIP \
+	_unbound
 }
 
 #
@@ -1481,6 +1482,20 @@ sdpd sdpd_username
 sysctl defcorename
 "
 
+populate_rc()
+{
+	local op=$1
+	local dir=$2
+	local name=$3
+	local rcdir=$4
+	if ! find_file_in_dirlist "${name}" "${name}" \
+	"${rcdir}" "${SRC_DIR}/etc/rc.d"; then
+		return 1
+	fi
+	populate_dir "${op}" true "${dir}" "${DEST_DIR}/etc/rc.d" 555 "${name}"
+	return $?
+}
+
 additem rc "/etc/rc* and /etc/rc.d/ being up to date"
 do_rc()
 {
@@ -1507,15 +1522,13 @@ do_rc()
 		${extra_scripts}
 	failed=$(( ${failed} + $? ))
 
-	if ! find_file_in_dirlist blacklistd "blacklistd" \
-	"${SRC_DIR}/external/bsd/blacklist/etc/rc.d" \
-	"${SRC_DIR}/etc/rc.d"; then
-	failed=1
-	else
-	populate_dir "$op" true "${dir}" "${DEST_DIR}/etc/rc.d" 555 \
-		blacklistd
-	failed=$(( ${failed} + $? ))
-	fi
+	populate_rc "${op}" "${dir}" blacklistd \
+	"${SRC_DIR}/external/bsd/blacklist/etc/rc.d"
+	failed=$(( ${failed} + $? ))
+
+	populate_rc "${op}" "${dir}" unbound \
+	"${SRC_DIR}/external/bsd/unbound/etc/rc.d"
+	failed=$(( ${failed} + $? ))
 
 	if $SOURCEMODE && [ -n "${generated_scripts}" ]; then
 		# generate scripts
@@ -1864,7 +1877,8 @@ do_uid()
 	check_ids "$1" users "${DEST_DIR}/etc/master.passwd" \
 	"${SRC_DIR}/etc/master.passwd" 12 \
 	postfix SKIP named ntpd sshd SKIP _pflogd _rwhod SKIP _proxy \
-	_timedc _sdpd _httpd _mdnsd _tests _tcpdump _tss SKIP _rtadvd
+	_timedc _sdpd _httpd _mdnsd _tests _tcpdump _tss SKIP _rtadvd \
+	SKIP _unbound
 }
 
 

CVS commit: src/share/mk

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 20 11:23:33 UTC 2016

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

Log Message:
unbound additions


To generate a diff of this commit:
cvs rdiff -u -r1.354 -r1.355 src/share/mk/bsd.README
cvs rdiff -u -r1.944 -r1.945 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.299 -r1.300 src/share/mk/bsd.prog.mk

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

Modified files:

Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.354 src/share/mk/bsd.README:1.355
--- src/share/mk/bsd.README:1.354	Tue Jun 14 09:26:45 2016
+++ src/share/mk/bsd.README	Sat Aug 20 07:23:33 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.354 2016/06/14 13:26:45 christos Exp $
+#	$NetBSD: bsd.README,v 1.355 2016/08/20 11:23:33 christos Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -369,6 +369,10 @@ MKPOSTFIX	If "no", don't build or instal
 MKPROFILE	If "no", don't build or install the profiling (*_p.a) libraries.
 		Default: yes
 
+MKRADEONFIRMWARE If "no", install the /libdata/firmware/radeon directory,
+		which is necessary for the radeon DRM driver.
+		Default: yes on i386 and amd64, no elsewhere.
+
 MKRELRO		If "partial", set the non-PLT GOT to read-only. If "full"
 		also force immediate symbol binding.
 		Default: no
@@ -408,6 +412,8 @@ MKTPM		If "no" then don't build the Trus
 		infrastructure.
 		Default: no
 
+MKUNBOUND	If not "no", build and install the "unbound" DNS resolver.
+
 MKUNPRIVED	If not "no", don't set the owner/group/mode when installing
 		files or directories, and keep a metadata log of what
 		the owner/group/mode should be.  This allows a
@@ -433,10 +439,6 @@ MKX11MOTIF:	If "yes", build the native X
 		location can be specified using the X11MOTIFPATH variable.
 		Default: no
 
-MKRADEONFIRMWARE If "no", install the /libdata/firmware/radeon directory,
-		which is necessary for the radeon DRM driver.
-		Default: yes on i386 and amd64, no elsewhere.
-
 MKYP		If "no", disables building of YP (NIS)
 		infrastructure (libraries and support programs).
 		Default: yes
@@ -1640,6 +1642,7 @@ DPADD		Additional dependencies for the p
 		LIBSUPCXX?=	${DESTDIR}/usr/lib/libsupc++.a
 		LIBTERMINFO?=	${DESTDIR}/usr/lib/libterminfo.a
 		LIBTRE?=	${DESTDIR}/usr/lib/libtre.a
+		LIBUNBOUND?=	${DESTDIR}/usr/lib/libunbound.a
 		LIBUSBHID?=	${DESTDIR}/usr/lib/libusbhid.a
 		LIBUTIL?=	${DESTDIR}/usr/lib/libutil.a
 		LIBWIND?=	${DESTDIR}/usr/lib/libwind.a

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.944 src/share/mk/bsd.own.mk:1.945
--- src/share/mk/bsd.own.mk:1.944	Fri Aug 19 20:36:03 2016
+++ src/share/mk/bsd.own.mk	Sat Aug 20 07:23:33 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.944 2016/08/20 00:36:03 mrg Exp $
+#	$NetBSD: bsd.own.mk,v 1.945 2016/08/20 11:23:33 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1112,6 +1112,7 @@ _MKVARS.yes= \
 	MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
 	MKRUMP \
 	MKSHARE MKSKEY MKSTATICLIB \
+	MKUNBOUND \
 	MKX11FONTS \
 	MKYP
 .for var in ${_MKVARS.yes}

Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.299 src/share/mk/bsd.prog.mk:1.300
--- src/share/mk/bsd.prog.mk:1.299	Mon Apr  4 11:06:16 2016
+++ src/share/mk/bsd.prog.mk	Sat Aug 20 07:23:33 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.299 2016/04/04 15:06:16 joerg Exp $
+#	$NetBSD: bsd.prog.mk,v 1.300 2016/08/20 11:23:33 christos Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -199,6 +199,7 @@ LIBCRTI=	${DESTDIR}/usr/lib/${MLIBDIR:D$
 	supcxx \
 	terminfo \
 	tre \
+	unbound \
 	usbhid \
 	util \
 	wind \

CVS commit: src/lib

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 20 11:22:26 UTC 2016

Modified Files:
src/lib: Makefile

Log Message:
unbound additions


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

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

Modified files:

Index: src/lib/Makefile
diff -u src/lib/Makefile:1.245 src/lib/Makefile:1.246
--- src/lib/Makefile:1.245	Sat Jun  4 21:23:58 2016
+++ src/lib/Makefile	Sat Aug 20 07:22:26 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.245 2016/06/05 01:23:58 christos Exp $
+#	$NetBSD: Makefile,v 1.246 2016/08/20 11:22:26 christos Exp $
 #	from: @(#)Makefile	5.25.1.1 (Berkeley) 5/7/91
 
 .include 
@@ -224,6 +224,9 @@ SUBDIR+=	../external/bsd/openldap/lib	# 
 SUBDIR+=	.WAIT
 
 SUBDIR+=	../external/bsd/bind/lib	# depends on heimdal, libcrypto
+.if ${MKCRYPTO} != "no" && ${MKUNBOUND} != "no"
+SUBDIR+=	../external/bsd/unbound/lib	# depends on libcrypto
+.endif
 
 .if ${MKDTRACE} != "no"
 SUBDIR+=../external/cddl/osnet/lib/libdtrace	# depends on libproc

CVS commit: src/etc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 20 11:21:50 UTC 2016

Modified Files:
src/etc: group master.passwd
src/etc/defaults: rc.conf
src/etc/mtree: NetBSD.dist.base

Log Message:
unbound additions


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/etc/group
cvs rdiff -u -r1.47 -r1.48 src/etc/master.passwd
cvs rdiff -u -r1.136 -r1.137 src/etc/defaults/rc.conf
cvs rdiff -u -r1.153 -r1.154 src/etc/mtree/NetBSD.dist.base

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

Modified files:

Index: src/etc/group
diff -u src/etc/group:1.32 src/etc/group:1.33
--- src/etc/group:1.32	Tue Jul  9 05:34:58 2013
+++ src/etc/group	Sat Aug 20 07:21:50 2016
@@ -27,6 +27,7 @@ _tss:*:28:
 _gpio:*:29:
 _rtadvd:*:30:
 guest:*:31:root
+_unbound:*:32:
 nobody:*:39:
 utmp:*:45:
 authpf:*:72:

Index: src/etc/master.passwd
diff -u src/etc/master.passwd:1.47 src/etc/master.passwd:1.48
--- src/etc/master.passwd:1.47	Tue Jul  9 05:34:58 2013
+++ src/etc/master.passwd	Sat Aug 20 07:21:50 2016
@@ -19,5 +19,6 @@ _tests:*:26:26::0:0:& pseudo-user:/nonex
 _tcpdump:*:27:27::0:0:& pseudo-user:/var/chroot/tcpdump:/sbin/nologin
 _tss:*:28:28::0:0:& pseudo-user:/var/tpm:/sbin/nologin
 _rtadvd:*:30:30::0:0:& pseudo-user:/var/chroot/rtadvd:/sbin/nologin
+_unbound:*:32:32::0:0:& pseudo-user:/var/chroot/unbound:/sbin/nologin
 uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/nonexistent:/sbin/nologin
 nobody:*:32767:39::0:0:Unprivileged user:/nonexistent:/sbin/nologin

Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.136 src/etc/defaults/rc.conf:1.137
--- src/etc/defaults/rc.conf:1.136	Thu Jan  7 06:51:07 2016
+++ src/etc/defaults/rc.conf	Sat Aug 20 07:21:50 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: rc.conf,v 1.136 2016/01/07 11:51:07 roy Exp $
+#	$NetBSD: rc.conf,v 1.137 2016/08/20 11:21:50 christos Exp $
 #
 # /etc/defaults/rc.conf --
 #	default configuration of /etc/rc.conf
@@ -387,3 +387,7 @@ ip6addrctl=NO
 # ipv6_prefer, ipv4_prefer, auto
 ip6addrctl_policy=auto
 ip6addrctl_verbose=NO
+
+# Unbound
+unbound=NO
+unbound_chrootdir=/var/chroot/unbound

Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.153 src/etc/mtree/NetBSD.dist.base:1.154
--- src/etc/mtree/NetBSD.dist.base:1.153	Sat Mar 12 18:07:05 2016
+++ src/etc/mtree/NetBSD.dist.base	Sat Aug 20 07:21:50 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.153 2016/03/12 23:07:05 mrg Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.154 2016/08/20 11:21:50 christos Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -61,6 +61,7 @@
 ./etc/skel
 ./etc/sliphome
 ./etc/ssh
+./etc/unbound
 ./etc/zfs
 ./lib
 ./lib/npf
@@ -1283,6 +1284,9 @@
 ./var/chroot/sshd		mode=0755
 ./var/chroot/tcpdump		mode=0755
 ./var/chroot/tftp-proxy		mode=0755
+./var/chroot/unbound		mode=0755 uname=_unbound gname=_unbound
+./var/chroot/unbound/etc	mode=0755 uname=_unbound gname=_unbound
+./var/chroot/unbound/etc/unbound	mode=0755 uname=_unbound gname=_unbound
 ./var/crash			mode=0770
 ./var/cron
 ./var/cron/tabs			mode=0700

CVS commit: src/external/bsd/unbound

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 20 11:20:32 UTC 2016

Added Files:
src/external/bsd/unbound: Makefile Makefile.inc TODO
src/external/bsd/unbound/bin: Makefile Makefile.inc
src/external/bsd/unbound/bin/unbound-host: Makefile
src/external/bsd/unbound/etc: Makefile
src/external/bsd/unbound/etc/rc.d: Makefile unbound
src/external/bsd/unbound/include: config.h
src/external/bsd/unbound/include/dnstap: dnstap_config.h
src/external/bsd/unbound/lib: Makefile Makefile.inc
src/external/bsd/unbound/lib/libunbound: Makefile shlib_version
src/external/bsd/unbound/sbin: Makefile Makefile.inc
src/external/bsd/unbound/sbin/unbound: Makefile
src/external/bsd/unbound/sbin/unbound-anchor: Makefile
src/external/bsd/unbound/sbin/unbound-checkconf: Makefile
src/external/bsd/unbound/sbin/unbound-control: Makefile
src/external/bsd/unbound/sbin/unbound-control-setup: Makefile

Log Message:
Add bould glue


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/unbound/Makefile \
src/external/bsd/unbound/Makefile.inc src/external/bsd/unbound/TODO
cvs rdiff -u -r0 -r1.1 src/external/bsd/unbound/bin/Makefile \
src/external/bsd/unbound/bin/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/unbound/bin/unbound-host/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/unbound/etc/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/unbound/etc/rc.d/Makefile \
src/external/bsd/unbound/etc/rc.d/unbound
cvs rdiff -u -r0 -r1.1 src/external/bsd/unbound/include/config.h
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/unbound/include/dnstap/dnstap_config.h
cvs rdiff -u -r0 -r1.1 src/external/bsd/unbound/lib/Makefile \
src/external/bsd/unbound/lib/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/unbound/lib/libunbound/Makefile \
src/external/bsd/unbound/lib/libunbound/shlib_version
cvs rdiff -u -r0 -r1.1 src/external/bsd/unbound/sbin/Makefile \
src/external/bsd/unbound/sbin/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/unbound/sbin/unbound/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/unbound/sbin/unbound-anchor/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/unbound/sbin/unbound-checkconf/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/unbound/sbin/unbound-control/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/unbound/sbin/unbound-control-setup/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/unbound/Makefile
diff -u /dev/null src/external/bsd/unbound/Makefile:1.1
--- /dev/null	Sat Aug 20 07:20:32 2016
+++ src/external/bsd/unbound/Makefile	Sat Aug 20 07:20:31 2016
@@ -0,0 +1,5 @@
+#	$NetBSD: Makefile,v 1.1 2016/08/20 11:20:31 christos Exp $
+
+SUBDIR+= lib .WAIT sbin bin
+
+.include 
Index: src/external/bsd/unbound/Makefile.inc
diff -u /dev/null src/external/bsd/unbound/Makefile.inc:1.1
--- /dev/null	Sat Aug 20 07:20:32 2016
+++ src/external/bsd/unbound/Makefile.inc	Sat Aug 20 07:20:31 2016
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile.inc,v 1.1 2016/08/20 11:20:31 christos Exp $
+
+USE_FORT?= yes  # network client/server
+UNBOUND:=${.PARSEDIR}/dist
+
+.PATH: ${UNBOUND}/doc
+
+CPPFLAGS += -D_OPENBSD_SOURCE
+
+DPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
+DPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl
+DPLIBS+= crypt ${NETBSDSRCDIR}/lib/libcrypt
+DPLIBS+= util ${NETBSDSRCDIR}/lib/libutil
+DPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
+
+__subst: .USE
+	${TOOL_SED} \
+	-e s,@ub_conf_dir@,/etc/unbound, \
+	-e s,@ub_conf_file@,/etc/unbound/unbound.conf, \
+	-e s,@UNBOUND_CHROOT_DIR@,/var/chroot/unbound, \
+	-e s,@UNBOUND_PIDFILE@,/var/run/unbound.pid, \
+	-e s,@UNBOUND_ROOTCERT_FILE@,/etc/unbound/icannbundle.pem, \
+	-e s,@UNBOUND_ROOTKEY_FILE@,/etc/unbound/root.key, \
+	-e s,@UNBOUND_RUN_DIR@,/var/chroot/unbound/etc/unbound, \
+	-e s,@UNBOUND_SHARE_DIR@,/etc/unbound, \
+	-e s,@UNBOUND_USERNAME@,_unbound, < ${.ALLSRC} > ${.TARGET}
Index: src/external/bsd/unbound/TODO
diff -u /dev/null src/external/bsd/unbound/TODO:1.1
--- /dev/null	Sat Aug 20 07:20:32 2016
+++ src/external/bsd/unbound/TODO	Sat Aug 20 07:20:31 2016
@@ -0,0 +1,9 @@
+- consider compiling with libevent
+- convert man pages to mdoc
+- make optional features:
+	- without crypto
+	- non-pthreads
+	- without ipv6
+- consider adding:
+	- generating keys by default
+	- enabling control by default

Index: src/external/bsd/unbound/bin/Makefile
diff -u /dev/null src/external/bsd/unbound/bin/Makefile:1.1
--- /dev/null	Sat Aug 20 07:20:32 2016
+++ src/external/bsd/unbound/bin/Makefile	Sat Aug 20 07:20:31 2016
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2016/08/20 11:20:31 christos Exp $
+
+.include 
+
+SUBDIR+=\
+unbound-host
+
+.include 
Index: src/external/bsd/unbound/bin/Makefile.inc

CVS import: src/external/bsd/unbound/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 20 11:11:17 UTC 2016

Update of /cvsroot/src/external/bsd/unbound/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv28132

Log Message:
Import unbound 1.5.9

Status:

Vendor Tag: NLNETLABS
Release Tags:   unbound-1-5-9

N src/external/bsd/unbound/dist/aclocal.m4
N src/external/bsd/unbound/dist/LICENSE
N src/external/bsd/unbound/dist/config.sub
N src/external/bsd/unbound/dist/configure.ac
N src/external/bsd/unbound/dist/ltmain.sh
N src/external/bsd/unbound/dist/ac_pkg_swig.m4
N src/external/bsd/unbound/dist/Makefile.in
N src/external/bsd/unbound/dist/configure
N src/external/bsd/unbound/dist/ax_pthread.m4
N src/external/bsd/unbound/dist/.gitignore
N src/external/bsd/unbound/dist/acx_python.m4
N src/external/bsd/unbound/dist/config.guess
N src/external/bsd/unbound/dist/install-sh
N src/external/bsd/unbound/dist/acx_nlnetlabs.m4
N src/external/bsd/unbound/dist/config.h.in
N src/external/bsd/unbound/dist/README
N src/external/bsd/unbound/dist/doc/unbound.doxygen
N src/external/bsd/unbound/dist/doc/Changelog
N src/external/bsd/unbound/dist/doc/TODO
N src/external/bsd/unbound/dist/doc/LICENSE
N src/external/bsd/unbound/dist/doc/libunbound.3.in
N src/external/bsd/unbound/dist/doc/unbound-checkconf.8.in
N src/external/bsd/unbound/dist/doc/control_proto_spec.txt
N src/external/bsd/unbound/dist/doc/FEATURES
N src/external/bsd/unbound/dist/doc/ietf67-design-02.pdf
N src/external/bsd/unbound/dist/doc/ietf67-design-02.odp
N src/external/bsd/unbound/dist/doc/example.conf.in
N src/external/bsd/unbound/dist/doc/unbound-host.1.in
N src/external/bsd/unbound/dist/doc/README.tests
N src/external/bsd/unbound/dist/doc/README.DNS64
N src/external/bsd/unbound/dist/doc/unbound.8.in
N src/external/bsd/unbound/dist/doc/unbound.conf.5.in
N src/external/bsd/unbound/dist/doc/README.svn
N src/external/bsd/unbound/dist/doc/requirements.txt
N src/external/bsd/unbound/dist/doc/README
N src/external/bsd/unbound/dist/doc/unbound-control.8.in
N src/external/bsd/unbound/dist/doc/CREDITS
N src/external/bsd/unbound/dist/doc/unbound-anchor.8.in
N src/external/bsd/unbound/dist/cachedb/cachedb.c
N src/external/bsd/unbound/dist/cachedb/cachedb.h
N src/external/bsd/unbound/dist/util/net_help.h
N src/external/bsd/unbound/dist/util/alloc.c
N src/external/bsd/unbound/dist/util/tube.h
N src/external/bsd/unbound/dist/util/configlexer.c
N src/external/bsd/unbound/dist/util/log.c
N src/external/bsd/unbound/dist/util/config_file.c
N src/external/bsd/unbound/dist/util/ub_event.h
N src/external/bsd/unbound/dist/util/rtt.c
N src/external/bsd/unbound/dist/util/locks.c
N src/external/bsd/unbound/dist/util/configparser.h
N src/external/bsd/unbound/dist/util/iana_ports.inc
N src/external/bsd/unbound/dist/util/tube.c
N src/external/bsd/unbound/dist/util/ub_event.c
N src/external/bsd/unbound/dist/util/config_file.h
N src/external/bsd/unbound/dist/util/configparser.c
N src/external/bsd/unbound/dist/util/random.h
N src/external/bsd/unbound/dist/util/winsock_event.c
N src/external/bsd/unbound/dist/util/random.c
N src/external/bsd/unbound/dist/util/ub_event_pluggable.c
N src/external/bsd/unbound/dist/util/mini_event.h
N src/external/bsd/unbound/dist/util/regional.h
N src/external/bsd/unbound/dist/util/rtt.h
N src/external/bsd/unbound/dist/util/configyyrename.h
N src/external/bsd/unbound/dist/util/configparser.y
N src/external/bsd/unbound/dist/util/locks.h
N src/external/bsd/unbound/dist/util/alloc.h
N src/external/bsd/unbound/dist/util/winsock_event.h
N src/external/bsd/unbound/dist/util/module.h
N src/external/bsd/unbound/dist/util/as112.h
N src/external/bsd/unbound/dist/util/as112.c
N src/external/bsd/unbound/dist/util/netevent.h
N src/external/bsd/unbound/dist/util/rbtree.h
N src/external/bsd/unbound/dist/util/mini_event.c
N src/external/bsd/unbound/dist/util/regional.c
N src/external/bsd/unbound/dist/util/netevent.c
N src/external/bsd/unbound/dist/util/log.h
N src/external/bsd/unbound/dist/util/configlexer.lex
N src/external/bsd/unbound/dist/util/timehist.h
N src/external/bsd/unbound/dist/util/fptr_wlist.c
N src/external/bsd/unbound/dist/util/timehist.c
N src/external/bsd/unbound/dist/util/fptr_wlist.h
N src/external/bsd/unbound/dist/util/net_help.c
N src/external/bsd/unbound/dist/util/module.c
N src/external/bsd/unbound/dist/util/rbtree.c
N src/external/bsd/unbound/dist/util/data/packed_rrset.c
N src/external/bsd/unbound/dist/util/data/msgreply.c
N src/external/bsd/unbound/dist/util/data/msgencode.c
N src/external/bsd/unbound/dist/util/data/msgparse.h
N src/external/bsd/unbound/dist/util/data/msgreply.h
N src/external/bsd/unbound/dist/util/data/msgencode.h
N src/external/bsd/unbound/dist/util/data/dname.h
N src/external/bsd/unbound/dist/util/data/packed_rrset.h
N src/external/bsd/unbound/dist/util/data/dname.c
N src/external/bsd/unbound/dist/util/data/msgparse.c
N src/external/bsd/unbound/dist/util/storage/slabhash.h
N src/external/bsd/unbound/dist/util/storage/lruhash.h
N 

CVS commit: xsrc/external/mit/xf86-video-openchrome/dist/src

[Jonathan A. Kollasch]

Module Name:xsrc
Committed By:   jakllsch
Date:   Sat Aug 20 08:29:36 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-openchrome/dist/src: via_ums.c

Log Message:
align format string with argument type


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c

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/xf86-video-openchrome/dist/src/via_ums.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c:1.3 xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c:1.4
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c:1.3	Fri Aug 19 23:53:25 2016
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c	Sat Aug 20 08:29:36 2016
@@ -187,7 +187,7 @@ viaMapMMIO(ScrnInfoPtr pScrn)
 
 xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"Mapping the frame buffer at address 0x%lX with "
-   "size %u KB.\n",
+   "size %lu KB.\n",
pVia->FrameBufferBase, pVia->videoRambytes / 1024);
 
 #ifdef HAVE_PCIACCESS

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Aug 20 06:51:00 UTC 2016

Modified Files:
src/distrib/sets/lists/xdebug: md.macppc
src/distrib/sets/lists/xserver: md.macppc
src/external/mit/xorg/server/drivers: Makefile

Log Message:
turn off chips driver for macppc and xorg-server 1.18 (for now.)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/xdebug/md.macppc
cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/xserver/md.macppc
cvs rdiff -u -r1.84 -r1.85 src/external/mit/xorg/server/drivers/Makefile

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

Modified files:

Index: src/distrib/sets/lists/xdebug/md.macppc
diff -u src/distrib/sets/lists/xdebug/md.macppc:1.7 src/distrib/sets/lists/xdebug/md.macppc:1.8
--- src/distrib/sets/lists/xdebug/md.macppc:1.7	Fri Aug 19 22:37:03 2016
+++ src/distrib/sets/lists/xdebug/md.macppc	Sat Aug 20 06:51:00 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.7 2016/08/19 22:37:03 mrg Exp $
+# $NetBSD: md.macppc,v 1.8 2016/08/20 06:51:00 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libcfb32_g.a		-unknown-	obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb_g.a		-unknown-	obsolete
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	debuglib,xorg,obsolete
@@ -54,7 +54,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug	-unknown-		obsolete,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/tdfx_dri.so.0.debug	-unknown-		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug	-unknown-		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug	-unknown-		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libati_drv.so.6.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libchips_drv.so.1.debug	obsolete		xorg,obsolete

Index: src/distrib/sets/lists/xserver/md.macppc
diff -u src/distrib/sets/lists/xserver/md.macppc:1.70 src/distrib/sets/lists/xserver/md.macppc:1.71
--- src/distrib/sets/lists/xserver/md.macppc:1.70	Fri Aug 19 22:37:04 2016
+++ src/distrib/sets/lists/xserver/md.macppc	Sat Aug 20 06:51:00 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.70 2016/08/19 22:37:04 mrg Exp $
+# $NetBSD: md.macppc,v 1.71 2016/08/20 06:51:00 mrg Exp $
 ./usr/X11R7/bin/X	-unknown-	xorg
 ./usr/X11R7/bin/Xorg	-unknown-	xorg
 ./usr/X11R7/bin/cvt	-unknown-	xorg
@@ -29,8 +29,8 @@
 ./usr/X11R7/lib/modules/dri/tdfx_dri.so.0		-unknown-	obsolete
 ./usr/X11R7/lib/modules/drivers/ati_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/ati_drv.so.6		-unknown-	xorg
-./usr/X11R7/lib/modules/drivers/chips_drv.so		-unknown-	xorg
-./usr/X11R7/lib/modules/drivers/chips_drv.so.1		-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/chips_drv.so		-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/chips_drv.so.1		-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/imstt_drv.so		-unknown-	obsolete
 ./usr/X11R7/lib/modules/drivers/imstt_drv.so.1		-unknown-	obsolete
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		-unknown-	xorg
@@ -174,7 +174,7 @@
 ./usr/X11R7/man/cat1/scanpci.0-unknown-	obsolete
 ./usr/X11R7/man/cat1/xorgconfig.0			-unknown-	obsolete
 ./usr/X11R7/man/cat4/ati.0-unknown-	.cat,xorg
-./usr/X11R7/man/cat4/chips.0-unknown-	.cat,xorg
+./usr/X11R7/man/cat4/chips.0-unknown-	.cat,xorg,xorg_server_ver=110
 ./usr/X11R7/man/cat4/exa.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/imstt.0-unknown-	obsolete
 ./usr/X11R7/man/cat4/kbd.0-unknown-	.cat,xorg
@@ -195,7 +195,7 @@
 ./usr/X11R7/man/html1/scanpci.html			-unknown-	obsolete
 ./usr/X11R7/man/html1/xorgconfig.html			-unknown-	obsolete
 ./usr/X11R7/man/html4/ati.html-unknown-	html,xorg
-./usr/X11R7/man/html4/chips.html			-unknown-	html,xorg
+./usr/X11R7/man/html4/chips.html			-unknown-	html,xorg,xorg_server_ver=110
 ./usr/X11R7/man/html4/exa.html-unknown-	html,xorg
 ./usr/X11R7/man/html4/imstt.html			-unknown-	obsolete
 ./usr/X11R7/man/html4/kbd.html-unknown-	html,xorg
@@ -216,7 +216,7 @@
 ./usr/X11R7/man/man1/scanpci.1-unknown-	obsolete
 ./usr/X11R7/man/man1/xorgconfig.1			-unknown-	obsolete
 ./usr/X11R7/man/man4/ati.4-unknown-	.man,xorg
-./usr/X11R7/man/man4/chips.4-unknown-	.man,xorg
+./usr/X11R7/man/man4/chips.4-unknown-	.man,xorg,xorg_server_ver=110
 ./usr/X11R7/man/man4/exa.4-unknown-	.man,xorg
 ./usr/X11R7/man/man4/imstt.4-unknown-	obsolete
 ./usr/X11R7/man/man4/kbd.4-unknown-	.man,xorg

Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.84 src/external/mit/xorg/server/drivers/Makefile:1.85
--- src/external/mit/xorg/server/drivers/Makefile:1.84	

CVS commit: src/external/mit/xorg

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Aug 20 06:49:21 UTC 2016

Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile
src/external/mit/xorg/server/drivers/xf86-video-i128: Makefile
src/external/mit/xorg/server/drivers/xf86-video-i740: Makefile
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
src/external/mit/xorg/server/drivers/xf86-video-s3: Makefile
src/external/mit/xorg/server/drivers/xf86-video-tseng: Makefile

Log Message:
redo previous in a way that always works


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/libdrm/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-tseng/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/mit/xorg/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.12 src/external/mit/xorg/lib/libdrm/Makefile:1.13
--- src/external/mit/xorg/lib/libdrm/Makefile:1.12	Sat Aug 20 05:44:00 2016
+++ src/external/mit/xorg/lib/libdrm/Makefile	Sat Aug 20 06:49:21 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2016/08/20 05:44:00 mrg Exp $
+#	$NetBSD: Makefile,v 1.13 2016/08/20 06:49:21 mrg Exp $
 
 .include 
 
@@ -17,9 +17,7 @@ SUBDIR=	drm kms
 PKGCONFIG=	libdrm
 PKGDIST=	${LIB}
 
-.if ${ACTIVE_CC} == "gcc"
-COPTS.xf86drm.c+=	-Wno-error=cpp	# #warnings needing porting
-.endif
+COPTS.xf86drm.c+=	${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
 
 CWARNFLAGS.clang+=	-Wno-conversion -Wno-tautological-compare
 

Index: src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.4	Sat Aug 20 05:44:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile	Sat Aug 20 06:49:21 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2016/08/20 05:44:01 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2016/08/20 06:49:21 mrg Exp $
 
 DRIVER=		xf86-video-i128
 DRIVER_NAME=	i128_drv
@@ -7,8 +7,6 @@ SRCS=		i128accel.c i128dga.c i128exa.c i
 SRCS+=		i128IBMDAC.c i128init.c
 MAN=		i128.4
 
-.if ${ACTIVE_CC} == "gcc"
-COPTS+=		-Wno-error=cpp
-.endif
+COPTS+=		${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
 
 .include "../Makefile.xf86-driver"

Index: src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.6	Sat Aug 20 05:44:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile	Sat Aug 20 06:49:21 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2016/08/20 05:44:01 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2016/08/20 06:49:21 mrg Exp $
 
 DRIVER=		xf86-video-i740
 DRIVER_NAME=	i740_drv
@@ -7,8 +7,6 @@ SRCS=		i740_accel.c i740_cursor.c i740_d
 SRCS+=		i740_i2c.c i740_io.c i740_video.c
 MAN=		i740.4
 
-.if ${ACTIVE_CC} == "gcc"
-COPTS+=		-Wno-error=cpp
-.endif
+COPTS+=		${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
 
 .include "../Makefile.xf86-driver"

Index: src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.9	Sat Aug 20 05:44:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile	Sat Aug 20 06:49:21 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2016/08/20 05:44:01 mrg Exp $
+#	$NetBSD: Makefile,v 1.10 2016/08/20 06:49:21 mrg Exp $
 
 DRIVER=		xf86-video-nv
 DRIVER_NAME=	nv_drv
@@ -26,9 +26,7 @@ CPPFLAGS+= -DAVOID_VGAHW
 .endif
 
 # XXX
-.if ${ACTIVE_CC} == "gcc"
-COPTS+=	-Wno-error=cpp
-.endif
+COPTS+=		${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
 
 .include "../Makefile.xf86-driver"
 

Index: src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.14 src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.15
--- src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.14	Sat Aug 20 05:44:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile	Sat Aug 20 06:49:21 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2016/08/20 05:44:01 mrg Exp $
+#	$NetBSD: Makefile,v 1.15 2016/08/20 06:49:21 mrg Exp $
 
 DRIVER=		

CVS commit: src/sys/arch/mips/cavium/dev

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sat Aug 20 06:34:22 UTC 2016

Modified Files:
src/sys/arch/mips/cavium/dev: octeon_ciureg.h

Log Message:
Fix a couple of (unsed) definitions


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/cavium/dev/octeon_ciureg.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/cavium/dev/octeon_ciureg.h
diff -u src/sys/arch/mips/cavium/dev/octeon_ciureg.h:1.4 src/sys/arch/mips/cavium/dev/octeon_ciureg.h:1.5
--- src/sys/arch/mips/cavium/dev/octeon_ciureg.h:1.4	Sat Jun  6 20:15:35 2015
+++ src/sys/arch/mips/cavium/dev/octeon_ciureg.h	Sat Aug 20 06:34:22 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: octeon_ciureg.h,v 1.4 2015/06/06 20:15:35 matt Exp $	*/
+/*	$NetBSD: octeon_ciureg.h,v 1.5 2016/08/20 06:34:22 skrll Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -40,7 +40,7 @@
 #define	CIU_INT2_SUM0UINT64_C(0x00010710)
 #define	CIU_INT3_SUM0UINT64_C(0x00010718)
 #define	CIU_INT32_SUM0UINT64_C(0x000107000100)
-#define	CIU_INT_SUM1UINT64_C(0x00010708)
+#define	CIU_INT_SUM1UINT64_C(0x000107000108)
 #define	CIU_INT0_EN0UINT64_C(0x000107000200)
 #define	CIU_INT1_EN0UINT64_C(0x000107000210)
 #define	CIU_INT2_EN0UINT64_C(0x000107000220)
@@ -88,7 +88,7 @@
 #define	CIU_INT2_SUM0_OFFSET			0x0010
 #define	CIU_INT3_SUM0_OFFSET			0x0018
 #define	CIU_INT32_SUM0_OFFSET			0x0100
-#define	CIU_INT_SUM1_OFFSET			0x0008
+#define	CIU_INT_SUM1_OFFSET			0x0108
 #define	CIU_INT0_EN0_OFFSET			0x0200
 #define	CIU_INT1_EN0_OFFSET			0x0210
 #define	CIU_INT2_EN0_OFFSET			0x0220

CVS commit: src/sys/arch/mips/cavium

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sat Aug 20 06:31:15 UTC 2016

Modified Files:
src/sys/arch/mips/cavium: octeon_intr.c

Log Message:
Need to set ci_request_ipis otherwise they won't get delivered.

Correct the test for the IPL_HIGH ipis


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/cavium/octeon_intr.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/mips/cavium/octeon_intr.c
diff -u src/sys/arch/mips/cavium/octeon_intr.c:1.6 src/sys/arch/mips/cavium/octeon_intr.c:1.7
--- src/sys/arch/mips/cavium/octeon_intr.c:1.6	Tue Jul 12 06:13:39 2016
+++ src/sys/arch/mips/cavium/octeon_intr.c	Sat Aug 20 06:31:15 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: octeon_intr.c,v 1.6 2016/07/12 06:13:39 skrll Exp $	*/
+/*	$NetBSD: octeon_intr.c,v 1.7 2016/08/20 06:31:15 skrll Exp $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
@@ -45,7 +45,7 @@
 #define __INTR_PRIVATE
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: octeon_intr.c,v 1.6 2016/07/12 06:13:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_intr.c,v 1.7 2016/08/20 06:31:15 skrll Exp $");
 
 #include 
 #include 
@@ -616,7 +616,8 @@ octeon_send_ipi(struct cpu_info *ci, int
 	struct cpu_softc * const cpu = ci->ci_softc;
 	uint64_t ipi_mask = __BIT(req);
 
-	if (__BIT(req) == (__BIT(IPI_SUSPEND)|__BIT(IPI_WDOG))) {
+	atomic_or_64(>ci_request_ipis, ipi_mask);
+	if (req == IPI_SUSPEND || req == IPI_WDOG) {
 		ipi_mask <<= 16;
 	}