CVS commit: src/sys/arch/m68k/fpe

[Tetsuya Isaki]

Module Name:src
Committed By:   isaki
Date:   Thu Aug  4 05:35:19 UTC 2016

Modified Files:
src/sys/arch/m68k/fpe: fpu_cordic.c fpu_emulate.h

Log Message:
Move fpu_cordit2() to #ifdef CORDIC_BOOTSTRAP section.
This reduces ~2KB text segment.
Reported by Krister Walfridsson on tech-kern two months ago.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/m68k/fpe/fpu_cordic.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/m68k/fpe/fpu_emulate.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/m68k/fpe/fpu_cordic.c
diff -u src/sys/arch/m68k/fpe/fpu_cordic.c:1.2 src/sys/arch/m68k/fpe/fpu_cordic.c:1.3
--- src/sys/arch/m68k/fpe/fpu_cordic.c:1.2	Sat Apr 20 01:48:20 2013
+++ src/sys/arch/m68k/fpe/fpu_cordic.c	Thu Aug  4 05:35:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu_cordic.c,v 1.2 2013/04/20 01:48:20 isaki Exp $	*/
+/*	$NetBSD: fpu_cordic.c,v 1.3 2016/08/04 05:35:18 isaki Exp $	*/
 
 /*
  * Copyright (c) 2013 Tetsuya Isaki. All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fpu_cordic.c,v 1.2 2013/04/20 01:48:20 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_cordic.c,v 1.3 2016/08/04 05:35:18 isaki Exp $");
 
 #include 
 
@@ -69,6 +69,9 @@ static struct sfpn atanh_table[EXT_FRACB
 static struct fpn inv_gain1;
 static struct fpn inv_gain2;
 
+static void fpu_cordit2(struct fpemu *,
+	struct fpn *, struct fpn *, struct fpn *, const struct fpn *);
+
 int
 main(int argc, char *argv[])
 {
@@ -548,7 +551,8 @@ fpu_cordit1(struct fpemu *fe, struct fpn
 	CPYFPN(z0, );
 }
 
-void
+#if defined(CORDIC_BOOTSTRAP)
+static void
 fpu_cordit2(struct fpemu *fe, struct fpn *x0, struct fpn *y0, struct fpn *z0,
 	const struct fpn *vecmode)
 {
@@ -644,3 +648,4 @@ fpu_cordit2(struct fpemu *fe, struct fpn
 	CPYFPN(y0, );
 	CPYFPN(z0, );
 }
+#endif /* CORDIC_BOOTSTRAP */

Index: src/sys/arch/m68k/fpe/fpu_emulate.h
diff -u src/sys/arch/m68k/fpe/fpu_emulate.h:1.24 src/sys/arch/m68k/fpe/fpu_emulate.h:1.25
--- src/sys/arch/m68k/fpe/fpu_emulate.h:1.24	Fri Apr 19 13:31:11 2013
+++ src/sys/arch/m68k/fpe/fpu_emulate.h	Thu Aug  4 05:35:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu_emulate.h,v 1.24 2013/04/19 13:31:11 isaki Exp $	*/
+/*	$NetBSD: fpu_emulate.h,v 1.25 2016/08/04 05:35:18 isaki Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross
@@ -251,8 +251,6 @@ extern const struct fpn fpu_cordic_inv_g
 extern const struct fpn fpu_cordic_inv_gain2;
 void fpu_cordit1(struct fpemu *,
 	struct fpn *, struct fpn *, struct fpn *, const struct fpn *);
-void fpu_cordit2(struct fpemu *,
-	struct fpn *, struct fpn *, struct fpn *, const struct fpn *);
 
 /*
  * "helper" functions

CVS commit: src/sys/arch/m68k/fpe

[Tetsuya Isaki]

Module Name:src
Committed By:   isaki
Date:   Thu Aug  4 05:35:19 UTC 2016

Modified Files:
src/sys/arch/m68k/fpe: fpu_cordic.c fpu_emulate.h

Log Message:
Move fpu_cordit2() to #ifdef CORDIC_BOOTSTRAP section.
This reduces ~2KB text segment.
Reported by Krister Walfridsson on tech-kern two months ago.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/m68k/fpe/fpu_cordic.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/m68k/fpe/fpu_emulate.h

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

CVS commit: src/sys/ufs/ext2fs

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Thu Aug  4 04:05:14 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs_dinode.h

Log Message:
include stddef.h for offsetof.

fix newfs_ext2fs build failure on evbppc.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/ufs/ext2fs/ext2fs_dinode.h

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

Modified files:

Index: src/sys/ufs/ext2fs/ext2fs_dinode.h
diff -u src/sys/ufs/ext2fs/ext2fs_dinode.h:1.30 src/sys/ufs/ext2fs/ext2fs_dinode.h:1.31
--- src/sys/ufs/ext2fs/ext2fs_dinode.h:1.30	Thu Aug  4 02:49:50 2016
+++ src/sys/ufs/ext2fs/ext2fs_dinode.h	Thu Aug  4 04:05:14 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_dinode.h,v 1.30 2016/08/04 02:49:50 nonaka Exp $	*/
+/*	$NetBSD: ext2fs_dinode.h,v 1.31 2016/08/04 04:05:14 nonaka Exp $	*/
 
 /*
  * Copyright (c) 1982, 1989, 1993
@@ -67,6 +67,10 @@
 #ifndef _UFS_EXT2FS_EXT2FS_DINODE_H_
 #define _UFS_EXT2FS_EXT2FS_DINODE_H_
 
+#if !defined(_KERNEL) && !defined(_STANDALONE)
+#include  /* for offsetof */
+#endif
+
 #include 
 
 /*

CVS commit: src/sys/ufs/ext2fs

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Thu Aug  4 04:05:14 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs_dinode.h

Log Message:
include stddef.h for offsetof.

fix newfs_ext2fs build failure on evbppc.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/ufs/ext2fs/ext2fs_dinode.h

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

CVS commit: src

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Aug  4 03:50:55 UTC 2016

Modified Files:
src/distrib/sets/lists/base: rescue.mi
src/rescue: list

Log Message:
vnconfig(8) was renamed to vndconfig(8) some time ago, and most places
keep both names around.

One place that got missed is /rescue so let's update it for consistency
with all the other places.

(Pointed out in private Email by kre@)


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/base/rescue.mi
cvs rdiff -u -r1.47 -r1.48 src/rescue/list

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/rescue.mi
diff -u src/distrib/sets/lists/base/rescue.mi:1.38 src/distrib/sets/lists/base/rescue.mi:1.39
--- src/distrib/sets/lists/base/rescue.mi:1.38	Fri Jul  1 22:52:06 2016
+++ src/distrib/sets/lists/base/rescue.mi	Thu Aug  4 03:50:55 2016
@@ -1,4 +1,4 @@
-# $NetBSD: rescue.mi,v 1.38 2016/07/01 22:52:06 christos Exp $
+# $NetBSD: rescue.mi,v 1.39 2016/08/04 03:50:55 pgoyette Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -155,6 +155,7 @@
 ./rescue/veriexecctlbase-rescue-root
 ./rescue/vi	base-rescue-root
 ./rescue/vnconfigbase-rescue-root
+./rescue/vndconfigbase-rescue-root
 ./rescue/wdogctlbase-rescue-root
 ./rescue/wsconsctlbase-rescue-root
 ./rescue/zcat	base-rescue-root

Index: src/rescue/list
diff -u src/rescue/list:1.47 src/rescue/list:1.48
--- src/rescue/list:1.47	Sat Jul  2 15:59:21 2016
+++ src/rescue/list	Thu Aug  4 03:50:55 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.47 2016/07/02 15:59:21 christos Exp $
+#	$NetBSD: list,v 1.48 2016/08/04 03:50:55 pgoyette Exp $
 
 SRCDIRS	bin
 
@@ -144,7 +144,7 @@ PROG	chroot
 PROG	dumpfs
 PROG	dumplfs
 PROG	installboot
-PROG	vnconfig
+PROG	vnconfig	vndconfig
 
 SRCDIRS	games
 

CVS commit: src

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Aug  4 03:50:55 UTC 2016

Modified Files:
src/distrib/sets/lists/base: rescue.mi
src/rescue: list

Log Message:
vnconfig(8) was renamed to vndconfig(8) some time ago, and most places
keep both names around.

One place that got missed is /rescue so let's update it for consistency
with all the other places.

(Pointed out in private Email by kre@)


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/base/rescue.mi
cvs rdiff -u -r1.47 -r1.48 src/rescue/list

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

CVS commit: src/sys/lib/libsa

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Thu Aug  4 03:16:00 UTC 2016

Modified Files:
src/sys/lib/libsa: ext2fs.c

Log Message:
pass EXT2_DINODE_SIZE(fs) as isize to e2fs_iload().
should fix build failure.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/lib/libsa/ext2fs.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/lib/libsa/ext2fs.c
diff -u src/sys/lib/libsa/ext2fs.c:1.21 src/sys/lib/libsa/ext2fs.c:1.22
--- src/sys/lib/libsa/ext2fs.c:1.21	Wed Aug  3 09:11:18 2016
+++ src/sys/lib/libsa/ext2fs.c	Thu Aug  4 03:16:00 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs.c,v 1.21 2016/08/03 09:11:18 rjs Exp $	*/
+/*	$NetBSD: ext2fs.c,v 1.22 2016/08/04 03:16:00 nonaka Exp $	*/
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.
@@ -187,7 +187,7 @@ read_inode(ino32_t inumber, struct open_
 
 	dip = (struct ext2fs_dinode *)(buf +
 	EXT2_DINODE_SIZE(fs) * ino_to_fsbo(fs, inumber));
-	e2fs_iload(dip, >f_di);
+	e2fs_iload(dip, >f_di, EXT2_DINODE_SIZE(fs));
 
 	/*
 	 * Clear out the old buffers

CVS commit: src/sys/lib/libsa

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Thu Aug  4 03:16:00 UTC 2016

Modified Files:
src/sys/lib/libsa: ext2fs.c

Log Message:
pass EXT2_DINODE_SIZE(fs) as isize to e2fs_iload().
should fix build failure.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/lib/libsa/ext2fs.c

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

CVS commit: src/sbin/newfs_ext2fs

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Thu Aug  4 03:01:39 UTC 2016

Modified Files:
src/sbin/newfs_ext2fs: mke2fs.c

Log Message:
pass EXT2_DINODE_SIZE() as isize to e2fs_isave().


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sbin/newfs_ext2fs/mke2fs.c

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

Modified files:

Index: src/sbin/newfs_ext2fs/mke2fs.c
diff -u src/sbin/newfs_ext2fs/mke2fs.c:1.22 src/sbin/newfs_ext2fs/mke2fs.c:1.23
--- src/sbin/newfs_ext2fs/mke2fs.c:1.22	Tue Jun 16 23:18:55 2015
+++ src/sbin/newfs_ext2fs/mke2fs.c	Thu Aug  4 03:01:38 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: mke2fs.c,v 1.22 2015/06/16 23:18:55 christos Exp $	*/
+/*	$NetBSD: mke2fs.c,v 1.23 2016/08/04 03:01:38 nonaka Exp $	*/
 
 /*-
  * Copyright (c) 2007 Izumi Tsutsui.  All rights reserved.
@@ -100,7 +100,7 @@
 #if 0
 static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
 #else
-__RCSID("$NetBSD: mke2fs.c,v 1.22 2015/06/16 23:18:55 christos Exp $");
+__RCSID("$NetBSD: mke2fs.c,v 1.23 2016/08/04 03:01:38 nonaka Exp $");
 #endif
 #endif /* not lint */
 
@@ -1367,7 +1367,7 @@ iput(struct ext2fs_dinode *ip, ino_t ino
 
 	dp = (struct ext2fs_dinode *)(bp +
 	inodesize * ino_to_fsbo(, ino));
-	e2fs_isave(ip, dp);
+	e2fs_isave(ip, dp, EXT2_DINODE_SIZE());
 	/* e2fs_i_bswap() doesn't swap e2di_blocks addrs */
 	if ((ip->e2di_mode & EXT2_IFMT) != EXT2_IFLNK) {
 		for (i = 0; i < EXT2FS_NDADDR + EXT2FS_NIADDR; i++)

CVS commit: src/sbin/newfs_ext2fs

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Thu Aug  4 03:01:39 UTC 2016

Modified Files:
src/sbin/newfs_ext2fs: mke2fs.c

Log Message:
pass EXT2_DINODE_SIZE() as isize to e2fs_isave().


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sbin/newfs_ext2fs/mke2fs.c

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

CVS commit: src/sys/ufs/ext2fs

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Thu Aug  4 02:49:50 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs_dinode.h

Log Message:
pass isize to e2fs_i_bswap() if BYTE_ORDER != LITTLE_ENDIAN.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/ufs/ext2fs/ext2fs_dinode.h

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

Modified files:

Index: src/sys/ufs/ext2fs/ext2fs_dinode.h
diff -u src/sys/ufs/ext2fs/ext2fs_dinode.h:1.29 src/sys/ufs/ext2fs/ext2fs_dinode.h:1.30
--- src/sys/ufs/ext2fs/ext2fs_dinode.h:1.29	Wed Aug  3 23:29:05 2016
+++ src/sys/ufs/ext2fs/ext2fs_dinode.h	Thu Aug  4 02:49:50 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_dinode.h,v 1.29 2016/08/03 23:29:05 jdolecek Exp $	*/
+/*	$NetBSD: ext2fs_dinode.h,v 1.30 2016/08/04 02:49:50 nonaka Exp $	*/
 
 /*
  * Copyright (c) 1982, 1989, 1993
@@ -253,8 +253,8 @@ ext2fs_dinode_time_set(const struct time
 		memcpy((new),(old),(isize))
 #else
 void e2fs_i_bswap(struct ext2fs_dinode *, struct ext2fs_dinode *, size_t);
-#	define e2fs_iload(old, new, isize) e2fs_i_bswap((old), (new))
-#	define e2fs_isave(old, new, isize) e2fs_i_bswap((old), (new))
+#	define e2fs_iload(old, new, isize) e2fs_i_bswap((old), (new), (isize))
+#	define e2fs_isave(old, new, isize) e2fs_i_bswap((old), (new), (isize))
 #endif
 
 #endif /* !_UFS_EXT2FS_EXT2FS_DINODE_H_ */

CVS commit: src/sys/ufs/ext2fs

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Thu Aug  4 02:49:50 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs_dinode.h

Log Message:
pass isize to e2fs_i_bswap() if BYTE_ORDER != LITTLE_ENDIAN.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/ufs/ext2fs/ext2fs_dinode.h

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

CVS commit: src/sbin/modstat

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Wed Aug  3 23:55:47 UTC 2016

Modified Files:
src/sbin/modstat: main.c

Log Message:
Right-align numeric columns REFS and SIZE for easier viewing


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sbin/modstat/main.c

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

CVS commit: src/sbin/modstat

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Wed Aug  3 23:55:47 UTC 2016

Modified Files:
src/sbin/modstat: main.c

Log Message:
Right-align numeric columns REFS and SIZE for easier viewing


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sbin/modstat/main.c

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

Modified files:

Index: src/sbin/modstat/main.c
diff -u src/sbin/modstat/main.c:1.21 src/sbin/modstat/main.c:1.22
--- src/sbin/modstat/main.c:1.21	Wed Dec  2 00:56:09 2015
+++ src/sbin/modstat/main.c	Wed Aug  3 23:55:47 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.21 2015/12/02 00:56:09 pgoyette Exp $	*/
+/*	$NetBSD: main.c,v 1.22 2016/08/03 23:55:47 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: main.c,v 1.21 2015/12/02 00:56:09 pgoyette Exp $");
+__RCSID("$NetBSD: main.c,v 1.22 2016/08/03 23:55:47 pgoyette Exp $");
 #endif /* !lint */
 
 #include 
@@ -184,11 +184,11 @@ main(int argc, char **argv)
 		if (maxnamelen < namelen)
 			maxnamelen = namelen;
 	}
-	printf("%-*s %-8s %-8s %-4s %-5s ",
+	printf("%-*s %-8s %-8s %-4s %5s ",
 	(int)maxnamelen, "NAME", "CLASS", "SOURCE", "FLAG", "REFS");
 	if (address)
 		printf("%-16s ", "ADDRESS");
-	printf("%-7s %s \n", "SIZE", "REQUIRES");
+	printf("%7s %s \n", "SIZE", "REQUIRES");
 	for (ms = iov.iov_base; len != 0; ms++, len--) {
 		const char *class;
 		const char *source;
@@ -215,13 +215,13 @@ main(int argc, char **argv)
 		else
 			source = "UNKNOWN";
 
-		printf("%-*s %-8s %-8s %-4s %-5d ",
+		printf("%-*s %-8s %-8s %-4s %5d ",
 		(int)maxnamelen, ms->ms_name, class, source, 
 		modflags[ms->ms_flags & (__arraycount(modflags) - 1)],
 		ms->ms_refcnt);
 		if (address)
 			printf("%-16" PRIx64 " ", ms->ms_addr);
-		printf("%-7s %s\n", sbuf, ms->ms_required);
+		printf("%7s %s\n", sbuf, ms->ms_required);
 	}
 
 	exit(EXIT_SUCCESS);

CVS commit: src/tests/dev/fss

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Wed Aug  3 23:53:50 UTC 2016

Modified Files:
src/tests/dev/fss: Makefile

Log Message:
We don't have any FILES, so no need for a FILESDIR


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/dev/fss/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/dev/fss/Makefile
diff -u src/tests/dev/fss/Makefile:1.1 src/tests/dev/fss/Makefile:1.2
--- src/tests/dev/fss/Makefile:1.1	Fri Jul 29 06:13:39 2016
+++ src/tests/dev/fss/Makefile	Wed Aug  3 23:53:50 2016
@@ -1,10 +1,9 @@
-#	$NetBSD: Makefile,v 1.1 2016/07/29 06:13:39 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.2 2016/08/03 23:53:50 pgoyette Exp $
 #
 
 .include 
 
 TESTSDIR=	${TESTSBASE}/dev/fss
-FILESDIR=	${TESTSDIR}
 
 TESTS_SH=	t_fss
 

CVS commit: src/tests/dev/fss

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Wed Aug  3 23:53:50 UTC 2016

Modified Files:
src/tests/dev/fss: Makefile

Log Message:
We don't have any FILES, so no need for a FILESDIR


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/dev/fss/Makefile

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

CVS commit: src/sys/ufs/ext2fs

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Wed Aug  3 23:33:59 UTC 2016

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

Log Message:
Update previous.  Since original format was %llu, replace it with
% PRIu64 (unsigned).


To generate a diff of this commit:
cvs rdiff -u -r1.195 -r1.196 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.

CVS commit: src/sys/ufs/ext2fs

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Wed Aug  3 23:33:59 UTC 2016

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

Log Message:
Update previous.  Since original format was %llu, replace it with
% PRIu64 (unsigned).


To generate a diff of this commit:
cvs rdiff -u -r1.195 -r1.196 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.195 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.196
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.195	Wed Aug  3 23:28:01 2016
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c	Wed Aug  3 23:33:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_vfsops.c,v 1.195 2016/08/03 23:28:01 pgoyette Exp $	*/
+/*	$NetBSD: ext2fs_vfsops.c,v 1.196 2016/08/03 23:33:59 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1994
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.195 2016/08/03 23:28:01 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.196 2016/08/03 23:33:59 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -510,7 +510,7 @@ ext2fs_loadvnode_content(struct m_ext2fs
 	if (EXT2_DINODE_FITS(din, e2di_extra_isize, EXT2_DINODE_SIZE(fs))
 	&& (EXT2_DINODE_SIZE(fs) - EXT2_REV0_DINODE_SIZE) < din->e2di_extra_isize)
 	{
-		printf("ext2fs: inode %"PRId64" bad extra_isize %u",
+		printf("ext2fs: inode %"PRIu64" bad extra_isize %u",
 			ino, din->e2di_extra_isize);
 		error = EINVAL;
 		goto bad;

CVS commit: src/sys/ufs/ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Wed Aug  3 23:29:05 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs_dinode.h ext2fs_subr.c ext2fs_vnops.c

Log Message:
get and set expanded timestamp if the inode contains the extra information, add 
support for create time


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/ufs/ext2fs/ext2fs_dinode.h
cvs rdiff -u -r1.31 -r1.32 src/sys/ufs/ext2fs/ext2fs_subr.c
cvs rdiff -u -r1.118 -r1.119 src/sys/ufs/ext2fs/ext2fs_vnops.c

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

CVS commit: src/sys/ufs/ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Wed Aug  3 23:29:05 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs_dinode.h ext2fs_subr.c ext2fs_vnops.c

Log Message:
get and set expanded timestamp if the inode contains the extra information, add 
support for create time


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/ufs/ext2fs/ext2fs_dinode.h
cvs rdiff -u -r1.31 -r1.32 src/sys/ufs/ext2fs/ext2fs_subr.c
cvs rdiff -u -r1.118 -r1.119 src/sys/ufs/ext2fs/ext2fs_vnops.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_dinode.h
diff -u src/sys/ufs/ext2fs/ext2fs_dinode.h:1.28 src/sys/ufs/ext2fs/ext2fs_dinode.h:1.29
--- src/sys/ufs/ext2fs/ext2fs_dinode.h:1.28	Wed Aug  3 21:53:02 2016
+++ src/sys/ufs/ext2fs/ext2fs_dinode.h	Wed Aug  3 23:29:05 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_dinode.h,v 1.28 2016/08/03 21:53:02 jdolecek Exp $	*/
+/*	$NetBSD: ext2fs_dinode.h,v 1.29 2016/08/03 23:29:05 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1982, 1989, 1993
@@ -189,6 +189,52 @@ struct ext2fs_dinode {
 	)
 
 /*
+ * Time encoding
+ * Lower two bits of extra field are extra high bits for epoch; unfortunately still, Linux kernels treat 11 there as 00 for compatibility
+ * Rest of extra fields are nanoseconds
+ */
+static __inline void
+ext2fs_dinode_time_get(struct timespec *ts, uint32_t epoch, uint32_t extra)
+{
+	ts->tv_sec = (signed) epoch;
+
+	if (extra) {
+		uint64_t epoch_bits = extra & 0x3;
+		/* XXX compatibility with linux kernel < 4.20 */
+		if (epoch_bits == 3 && ts->tv_sec < 0)
+			epoch_bits = 0;
+
+		ts->tv_sec |= epoch_bits << 32;
+
+		ts->tv_nsec = extra >> 2;
+	} else {
+		ts->tv_nsec = 0;
+	}
+}
+#define EXT2_DINODE_TIME_GET(ts, dinode, field, isize) \
+	ext2fs_dinode_time_get(ts, (dinode)->field, \
+		EXT2_DINODE_FITS(dinode, field ## _extra, isize) \
+			? (dinode)->field ## _extra : 0 \
+	)
+
+static __inline void
+ext2fs_dinode_time_set(const struct timespec *ts, uint32_t *epoch, uint32_t *extra)
+{
+	*epoch = (int32_t) ts->tv_sec;
+
+	if (extra) {
+		uint32_t epoch_bits = (ts->tv_sec >> 32) & 0x3;
+
+		*extra = (ts->tv_nsec << 2) | epoch_bits;
+	}
+}
+#define EXT2_DINODE_TIME_SET(ts, dinode, field, isize) \
+	ext2fs_dinode_time_set(ts, &(dinode)->field, \
+		EXT2_DINODE_FITS(dinode, field ## _extra, isize) \
+			? &(dinode)->field ## _extra : NULL \
+	)
+
+/*
  * The e2di_blocks fields may be overlaid with other information for
  * file types that do not have associated disk storage. Block
  * and character devices overlay the first data block with their

Index: src/sys/ufs/ext2fs/ext2fs_subr.c
diff -u src/sys/ufs/ext2fs/ext2fs_subr.c:1.31 src/sys/ufs/ext2fs/ext2fs_subr.c:1.32
--- src/sys/ufs/ext2fs/ext2fs_subr.c:1.31	Sat Mar 28 19:24:04 2015
+++ src/sys/ufs/ext2fs/ext2fs_subr.c	Wed Aug  3 23:29:05 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_subr.c,v 1.31 2015/03/28 19:24:04 maxv Exp $	*/
+/*	$NetBSD: ext2fs_subr.c,v 1.32 2016/08/03 23:29:05 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_subr.c,v 1.31 2015/03/28 19:24:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_subr.c,v 1.32 2016/08/03 23:29:05 jdolecek Exp $");
 
 #include 
 #include 
@@ -115,18 +115,18 @@ ext2fs_itimes(struct inode *ip, const st
 	if (ip->i_flag & IN_ACCESS) {
 		if (acc == NULL)
 			acc = 
-		ip->i_e2fs_atime = acc->tv_sec;
+		EXT2_DINODE_TIME_SET(acc, ip->i_din.e2fs_din, e2di_atime, EXT2_DINODE_SIZE(ip->i_e2fs));
 	}
 	if (ip->i_flag & (IN_UPDATE | IN_MODIFY)) {
 		if (mod == NULL)
 			mod = 
-		ip->i_e2fs_mtime = mod->tv_sec;
+		EXT2_DINODE_TIME_SET(mod, ip->i_din.e2fs_din, e2di_mtime, EXT2_DINODE_SIZE(ip->i_e2fs));
 		ip->i_modrev++;
 	}
 	if (ip->i_flag & (IN_CHANGE | IN_MODIFY)) {
 		if (cre == NULL)
 			cre = 
-		ip->i_e2fs_ctime = cre->tv_sec;
+		EXT2_DINODE_TIME_SET(cre, ip->i_din.e2fs_din, e2di_ctime, EXT2_DINODE_SIZE(ip->i_e2fs));
 	}
 	if (ip->i_flag & (IN_ACCESS | IN_MODIFY))
 		ip->i_flag |= IN_ACCESSED;

Index: src/sys/ufs/ext2fs/ext2fs_vnops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vnops.c:1.118 src/sys/ufs/ext2fs/ext2fs_vnops.c:1.119
--- src/sys/ufs/ext2fs/ext2fs_vnops.c:1.118	Wed Aug  3 21:53:03 2016
+++ src/sys/ufs/ext2fs/ext2fs_vnops.c	Wed Aug  3 23:29:05 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_vnops.c,v 1.118 2016/08/03 21:53:03 jdolecek Exp $	*/
+/*	$NetBSD: ext2fs_vnops.c,v 1.119 2016/08/03 23:29:05 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.118 2016/08/03 21:53:03 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.119 2016/08/03 23:29:05 jdolecek Exp $");
 
 #include 
 #include 
@@ -305,12 +305,12 @@ ext2fs_getattr(void *v)
 	vap->va_gid = ip->i_gid;
 	vap->va_rdev = (dev_t)fs2h32(ip->i_din.e2fs_din->e2di_rdev);
 	vap->va_size = vp->v_size;

CVS commit: src/sys/ufs/ext2fs

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Wed Aug  3 23:28:01 UTC 2016

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

Log Message:
Use correct printf() format for inode (fixes build for me)


To generate a diff of this commit:
cvs rdiff -u -r1.194 -r1.195 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.194 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.195
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.194	Wed Aug  3 21:53:02 2016
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c	Wed Aug  3 23:28:01 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_vfsops.c,v 1.194 2016/08/03 21:53:02 jdolecek Exp $	*/
+/*	$NetBSD: ext2fs_vfsops.c,v 1.195 2016/08/03 23:28:01 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1994
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.194 2016/08/03 21:53:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.195 2016/08/03 23:28:01 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -510,7 +510,7 @@ ext2fs_loadvnode_content(struct m_ext2fs
 	if (EXT2_DINODE_FITS(din, e2di_extra_isize, EXT2_DINODE_SIZE(fs))
 	&& (EXT2_DINODE_SIZE(fs) - EXT2_REV0_DINODE_SIZE) < din->e2di_extra_isize)
 	{
-		printf("ext2fs: inode %llu bad extra_isize %u",
+		printf("ext2fs: inode %"PRId64" bad extra_isize %u",
 			ino, din->e2di_extra_isize);
 		error = EINVAL;
 		goto bad;

CVS commit: src/sys/ufs/ext2fs

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Wed Aug  3 23:28:01 UTC 2016

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

Log Message:
Use correct printf() format for inode (fixes build for me)


To generate a diff of this commit:
cvs rdiff -u -r1.194 -r1.195 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.

CVS commit: src/sys/ufs/ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Wed Aug  3 21:53:03 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs.h ext2fs_alloc.c ext2fs_bswap.c
ext2fs_dinode.h ext2fs_inode.c ext2fs_vfsops.c ext2fs_vnops.c

Log Message:
support arbitrary ext3/ext4 inode size, add all the new ext4 fields 
ext2fs_dinode, and add support for loading the extra inode data


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/ufs/ext2fs/ext2fs.h
cvs rdiff -u -r1.46 -r1.47 src/sys/ufs/ext2fs/ext2fs_alloc.c
cvs rdiff -u -r1.20 -r1.21 src/sys/ufs/ext2fs/ext2fs_bswap.c
cvs rdiff -u -r1.27 -r1.28 src/sys/ufs/ext2fs/ext2fs_dinode.h
cvs rdiff -u -r1.82 -r1.83 src/sys/ufs/ext2fs/ext2fs_inode.c
cvs rdiff -u -r1.193 -r1.194 src/sys/ufs/ext2fs/ext2fs_vfsops.c
cvs rdiff -u -r1.117 -r1.118 src/sys/ufs/ext2fs/ext2fs_vnops.c

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

CVS commit: src/sys/ufs/ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Wed Aug  3 21:53:03 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs.h ext2fs_alloc.c ext2fs_bswap.c
ext2fs_dinode.h ext2fs_inode.c ext2fs_vfsops.c ext2fs_vnops.c

Log Message:
support arbitrary ext3/ext4 inode size, add all the new ext4 fields 
ext2fs_dinode, and add support for loading the extra inode data


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/ufs/ext2fs/ext2fs.h
cvs rdiff -u -r1.46 -r1.47 src/sys/ufs/ext2fs/ext2fs_alloc.c
cvs rdiff -u -r1.20 -r1.21 src/sys/ufs/ext2fs/ext2fs_bswap.c
cvs rdiff -u -r1.27 -r1.28 src/sys/ufs/ext2fs/ext2fs_dinode.h
cvs rdiff -u -r1.82 -r1.83 src/sys/ufs/ext2fs/ext2fs_inode.c
cvs rdiff -u -r1.193 -r1.194 src/sys/ufs/ext2fs/ext2fs_vfsops.c
cvs rdiff -u -r1.117 -r1.118 src/sys/ufs/ext2fs/ext2fs_vnops.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.38 src/sys/ufs/ext2fs/ext2fs.h:1.39
--- src/sys/ufs/ext2fs/ext2fs.h:1.38	Fri Jun 24 17:21:30 2016
+++ src/sys/ufs/ext2fs/ext2fs.h	Wed Aug  3 21:53:02 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs.h,v 1.38 2016/06/24 17:21:30 christos Exp $	*/
+/*	$NetBSD: ext2fs.h,v 1.39 2016/08/03 21:53:02 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -327,7 +327,8 @@ struct m_ext2fs {
 #define EXT2F_COMPAT_SUPP		0x
 #define EXT2F_ROCOMPAT_SUPP		(EXT2F_ROCOMPAT_SPARSESUPER \
 	 | EXT2F_ROCOMPAT_LARGEFILE \
-	 | EXT2F_ROCOMPAT_HUGE_FILE)
+	 | EXT2F_ROCOMPAT_HUGE_FILE \
+	 | EXT2F_ROCOMPAT_EXTRA_ISIZE)
 #define EXT2F_INCOMPAT_SUPP		(EXT2F_INCOMPAT_FTYPE \
 	 | EXT2F_INCOMPAT_EXTENTS)
 

Index: src/sys/ufs/ext2fs/ext2fs_alloc.c
diff -u src/sys/ufs/ext2fs/ext2fs_alloc.c:1.46 src/sys/ufs/ext2fs/ext2fs_alloc.c:1.47
--- src/sys/ufs/ext2fs/ext2fs_alloc.c:1.46	Sat Mar 28 19:24:04 2015
+++ src/sys/ufs/ext2fs/ext2fs_alloc.c	Wed Aug  3 21:53:02 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_alloc.c,v 1.46 2015/03/28 19:24:04 maxv Exp $	*/
+/*	$NetBSD: ext2fs_alloc.c,v 1.47 2016/08/03 21:53:02 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.46 2015/03/28 19:24:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.47 2016/08/03 21:53:02 jdolecek Exp $");
 
 #include 
 #include 
@@ -198,7 +198,7 @@ ext2fs_valloc(struct vnode *pvp, int mod
 		panic("ext2fs_valloc: dup alloc");
 	}
 
-	memset(ip->i_din.e2fs_din, 0, sizeof(struct ext2fs_dinode));
+	memset(ip->i_din.e2fs_din, 0, EXT2_DINODE_SIZE(fs));
 
 	/*
 	 * Set up a new generation number for this inode.

Index: src/sys/ufs/ext2fs/ext2fs_bswap.c
diff -u src/sys/ufs/ext2fs/ext2fs_bswap.c:1.20 src/sys/ufs/ext2fs/ext2fs_bswap.c:1.21
--- src/sys/ufs/ext2fs/ext2fs_bswap.c:1.20	Tue Aug  2 17:24:24 2016
+++ src/sys/ufs/ext2fs/ext2fs_bswap.c	Wed Aug  3 21:53:02 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_bswap.c,v 1.20 2016/08/02 17:24:24 jdolecek Exp $	*/
+/*	$NetBSD: ext2fs_bswap.c,v 1.21 2016/08/03 21:53:02 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_bswap.c,v 1.20 2016/08/02 17:24:24 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_bswap.c,v 1.21 2016/08/03 21:53:02 jdolecek Exp $");
 
 #include 
 #include 
@@ -81,7 +81,8 @@ e2fs_sb_bswap(struct ext2fs *old, struct
 	new->e2fs_reserved_ngdb	=	bswap16(old->e2fs_reserved_ngdb);
 }
 
-void e2fs_cg_bswap(struct ext2_gd *old, struct ext2_gd *new, int size)
+void
+e2fs_cg_bswap(struct ext2_gd *old, struct ext2_gd *new, int size)
 {
 	int i;
 
@@ -95,9 +96,13 @@ void e2fs_cg_bswap(struct ext2_gd *old, 
 	}
 }
 
-void e2fs_i_bswap(struct ext2fs_dinode *old, struct ext2fs_dinode *new)
+void
+e2fs_i_bswap(struct ext2fs_dinode *old, struct ext2fs_dinode *new, size_t isize)
 {
+	/* preserve non-swapped and unused fields */ 
+	memcpy(new, old, isize);
 
+	/* swap what needs to be swapped */
 	new->e2di_mode		=	bswap16(old->e2di_mode);
 	new->e2di_uid		=	bswap16(old->e2di_uid);
 	new->e2di_gid		=	bswap16(old->e2di_gid);
@@ -117,7 +122,32 @@ void e2fs_i_bswap(struct ext2fs_dinode *
 	new->e2di_facl_high	=	bswap16(old->e2di_facl_high);
 	new->e2di_uid_high	=	bswap16(old->e2di_uid_high);
 	new->e2di_gid_high	=	bswap16(old->e2di_gid_high);
-	memcpy(>e2di_blocks[0], >e2di_blocks[0],
-	(EXT2FS_NDADDR + EXT2FS_NIADDR) * sizeof(uint32_t));
+	new->e2di_checksum_low  = 	bswap16(old->e2di_checksum_low);
+
+	/*
+	 * Following fields are only supported for inode sizes bigger
+	 * than the old ext2 one
+	 */
+	if (isize == EXT2_REV0_DINODE_SIZE)
+		return;
+
+	new->e2di_extra_isize   = bswap16(old->e2di_extra_isize);
+	new->e2di_checksum_high = bswap16(old->e2di_checksum_high);
+
+	/* Following fields are ext4, might not be actually present */
+	if (EXT2_DINODE_FITS(new, e2di_ctime_extra, 

CVS commit: src/sys/dev/pci

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Wed Aug  3 19:59:57 UTC 2016

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

Log Message:
be quiet about regular intermediate authentication states.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/dev/pci/if_iwi.c

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

CVS commit: src/sys/dev/pci

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Wed Aug  3 19:59:57 UTC 2016

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

Log Message:
be quiet about regular intermediate authentication states.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/dev/pci/if_iwi.c

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

Modified files:

Index: src/sys/dev/pci/if_iwi.c
diff -u src/sys/dev/pci/if_iwi.c:1.99 src/sys/dev/pci/if_iwi.c:1.100
--- src/sys/dev/pci/if_iwi.c:1.99	Fri Jun 10 13:27:14 2016
+++ src/sys/dev/pci/if_iwi.c	Wed Aug  3 19:59:57 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_iwi.c,v 1.99 2016/06/10 13:27:14 ozaki-r Exp $  */
+/*	$NetBSD: if_iwi.c,v 1.100 2016/08/03 19:59:57 mlelstv Exp $  */
 /*	$OpenBSD: if_iwi.c,v 1.111 2010/11/15 19:11:57 damien Exp $	*/
 
 /*-
@@ -19,7 +19,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.99 2016/06/10 13:27:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.100 2016/08/03 19:59:57 mlelstv Exp $");
 
 /*-
  * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
@@ -1284,6 +1284,14 @@ iwi_notification_intr(struct iwi_softc *
 		case IWI_AUTH_FAIL:
 			break;
 
+		case IWI_AUTH_SENT_1:
+		case IWI_AUTH_RECV_2:
+		case IWI_AUTH_SEQ1_PASS:
+			break;
+
+		case IWI_AUTH_SEQ1_FAIL:
+			break;
+
 		default:
 			aprint_error_dev(sc->sc_dev,
 			"unknown authentication state %u\n", auth->state);

CVS commit: src/sys/dev/pci

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Wed Aug  3 19:56:41 UTC 2016

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

Log Message:
be less noisy with concurrent scan requests.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/pci/if_iwn.c

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

Modified files:

Index: src/sys/dev/pci/if_iwn.c
diff -u src/sys/dev/pci/if_iwn.c:1.78 src/sys/dev/pci/if_iwn.c:1.79
--- src/sys/dev/pci/if_iwn.c:1.78	Fri Jun 10 13:27:14 2016
+++ src/sys/dev/pci/if_iwn.c	Wed Aug  3 19:56:41 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_iwn.c,v 1.78 2016/06/10 13:27:14 ozaki-r Exp $	*/
+/*	$NetBSD: if_iwn.c,v 1.79 2016/08/03 19:56:41 mlelstv Exp $	*/
 /*	$OpenBSD: if_iwn.c,v 1.135 2014/09/10 07:22:09 dcoppa Exp $	*/
 
 /*-
@@ -22,7 +22,7 @@
  * adapters.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.78 2016/06/10 13:27:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.79 2016/08/03 19:56:41 mlelstv Exp $");
 
 #define IWN_USE_RBUF	/* Use local storage for RX */
 #undef IWN_HWCRYPTO	/* XXX does not even compile yet */
@@ -1858,7 +1858,7 @@ iwn_newstate(struct ieee80211com *ic, en
 		/* XXX Do not abort a running scan. */
 		if (sc->sc_flags & IWN_FLAG_SCANNING) {
 			if (ic->ic_state != nstate)
-aprint_error_dev(sc->sc_dev, "scan request(%d) "
+aprint_debug_dev(sc->sc_dev, "scan request(%d) "
 "while scanning(%d) ignored\n", nstate,
 ic->ic_state);
 			break;

CVS commit: src/sys/dev/pci

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Wed Aug  3 19:56:41 UTC 2016

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

Log Message:
be less noisy with concurrent scan requests.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/pci/if_iwn.c

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

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Aug  3 17:16:07 UTC 2016

Modified Files:
src/sys/arch/alpha/tc: tc_bus_mem.c

Log Message:
More cleanups from Felix Deichmann (code) and me (panics).


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/alpha/tc/tc_bus_mem.c

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

Modified files:

Index: src/sys/arch/alpha/tc/tc_bus_mem.c
diff -u src/sys/arch/alpha/tc/tc_bus_mem.c:1.36 src/sys/arch/alpha/tc/tc_bus_mem.c:1.37
--- src/sys/arch/alpha/tc/tc_bus_mem.c:1.36	Mon Jul 25 23:09:55 2016
+++ src/sys/arch/alpha/tc/tc_bus_mem.c	Wed Aug  3 13:16:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_bus_mem.c,v 1.36 2016/07/26 03:09:55 christos Exp $ */
+/* $NetBSD: tc_bus_mem.c,v 1.37 2016/08/03 17:16:07 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: tc_bus_mem.c,v 1.36 2016/07/26 03:09:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_bus_mem.c,v 1.37 2016/08/03 17:16:07 christos Exp $");
 
 #include 
 #include 
@@ -277,7 +277,7 @@ tc_mem_map(void *v, bus_addr_t memaddr, 
 		return (EOPNOTSUPP);
 
 	if (memaddr & 0x7)
-		panic("tc_mem_map needs 8 byte alignment");
+		panic("%s: need 8 byte alignment", __func__);
 	if (cacheable)
 		*memhp = ALPHA_PHYS_TO_K0SEG(memaddr);
 	else
@@ -314,7 +314,7 @@ tc_mem_alloc(void *v, bus_addr_t rstart,
 {
 
 	/* XXX XXX XXX XXX XXX XXX */
-	panic("tc_mem_alloc unimplemented");
+	panic("%s: unimplemented", __func__);
 }
 
 void
@@ -322,7 +322,7 @@ tc_mem_free(void *v, bus_space_handle_t 
 {
 
 	/* XXX XXX XXX XXX XXX XXX */
-	panic("tc_mem_free unimplemented");
+	panic("%s: unimplemented", __func__);
 }
 
 void *
@@ -334,7 +334,7 @@ tc_mem_vaddr(void *v, bus_space_handle_t
 		 * tc_mem_map() catches linear && !cacheable,
 		 * so we shouldn't come here
 		 */
-		panic("tc_mem_vaddr");
+		panic("%s: can't do sparse", __func__);
 	}
 #endif
 	return ((void *)bsh);
@@ -369,7 +369,7 @@ tc_mem_barrier(void *v, bus_space_handle
  * http://h20565.www2.hpe.com/hpsc/doc/public/display?docId=emr_na-c04623255
  */
 #define TC_SPARSE_PTR(memh, off) \
-((void *)((memh)+ ((off & ((bus_size_t)-1 << 2)) << 1)))
+((void *)((memh) + ((off & ((bus_size_t)-1 << 2)) << 1)))
 
 static inline uint8_t
 tc_mem_read_1(void *v, bus_space_handle_t memh, bus_size_t off)
@@ -381,7 +381,7 @@ tc_mem_read_1(void *v, bus_space_handle_
 		volatile uint32_t *p;
 
 		p = TC_SPARSE_PTR(memh, off);
-		return ((*p >> ((off & 3) * 8)) & 0xff);
+		return ((*p >> ((off & 3) << 3)) & 0xff);
 	} else {
 		volatile uint8_t *p;
 
@@ -400,7 +400,7 @@ tc_mem_read_2(void *v, bus_space_handle_
 		volatile uint32_t *p;
 
 		p = TC_SPARSE_PTR(memh, off);
-		return ((*p >> ((off & 2) * 8)) & 0x);
+		return ((*p >> ((off & 2) << 3)) & 0x);
 	} else {
 		volatile uint16_t *p;
 
@@ -420,6 +420,12 @@ tc_mem_read_4(void *v, bus_space_handle_
 		/* Nothing special to do for 4-byte sparse space accesses */
 		p = (uint32_t *)(memh + (off << 1));
 	else
+		/*
+		 * LDL to a dense space address always results in two
+		 * TURBOchannel I/O read transactions to consecutive longword
+		 * addresses. Use caution in dense space if the option has
+		 * registers with read side effects.
+		 */
 		p = (uint32_t *)(memh + off);
 	return (*p);
 }
@@ -432,7 +438,7 @@ tc_mem_read_8(void *v, bus_space_handle_
 	alpha_mb();		/* XXX XXX XXX */
 
 	if ((memh & TC_SPACE_SPARSE) != 0)
-		panic("tc_mem_read_8 not implemented for sparse space");
+		panic("%s: not implemented for sparse space", __func__);
 
 	p = (uint64_t *)(memh + off);
 	return (*p);
@@ -478,18 +484,20 @@ tc_mem_read_region_N(2,uint16_t)
 tc_mem_read_region_N(4,uint32_t)
 tc_mem_read_region_N(8,uint64_t)
 
+#define TC_SPARSE_WR_PVAL(msk, b, v) \
+((UINT64_C(msk) << (32 + (b))) | ((uint64_t)(v) << ((b) << 3)))
+
 static inline void
 tc_mem_write_1(void *v, bus_space_handle_t memh, bus_size_t off, uint8_t val)
 {
 
 	if ((memh & TC_SPACE_SPARSE) != 0) {
 		volatile uint64_t *p;
-		uint64_t mask = UINT64_C(0x1) << (32 + (off & 3));
 
 		p = TC_SPARSE_PTR(memh, off);
-		*p = mask | ((uint64_t)val << ((off & 3) * 8));
+		*p = TC_SPARSE_WR_PVAL(0x1, off & 3, val);
 	} else
-		panic("tc_mem_write_1 not implemented for dense space");
+		panic("%s: not implemented for dense space", __func__);
 
 	alpha_mb();		/* XXX XXX XXX */
 }
@@ -500,12 +508,11 @@ tc_mem_write_2(void *v, bus_space_handle
 
 	if ((memh & TC_SPACE_SPARSE) != 0) {
 		volatile uint64_t *p;
-		uint64_t mask = UINT64_C(0x3) << (32 + (off & 2));
 
 		p = TC_SPARSE_PTR(memh, off);
-		*p = mask | ((uint64_t)val << ((off & 2) * 8));
+		*p = TC_SPARSE_WR_PVAL(0x3, off & 2, val);
 	} else
-		panic("tc_mem_write_2 not implemented for dense space");
+		panic("%s: not implemented for dense space", __func__);
 
 	alpha_mb();		/* XXX XXX XXX */
 }
@@ 

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Aug  3 17:16:07 UTC 2016

Modified Files:
src/sys/arch/alpha/tc: tc_bus_mem.c

Log Message:
More cleanups from Felix Deichmann (code) and me (panics).


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/alpha/tc/tc_bus_mem.c

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

CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Aug  3 16:37:02 UTC 2016

Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_module.c

Log Message:
machdep.booted_kernel is not an absolute path, make it so. Now u_int is
found but its parent is not :-)


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c

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

Modified files:

Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c:1.14 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c:1.15
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c:1.14	Wed Jun 29 20:23:36 2016
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c	Wed Aug  3 12:37:02 2016
@@ -1180,8 +1180,9 @@ dt_module_update(dtrace_hdl_t *dtp, stru
 	size_t len;
 
 	if (strcmp("netbsd", name) == 0) {
-		/* want the kernel */
-		dt_bootfile(fname, sizeof(fname));
+		/* want the kernel, but it is not absolute */
+		dt_bootfile(machine, sizeof(machine));
+		snprintf(fname, sizeof(fname), "/%s", machine);
 	} else {
 
 		/* build stand module path from system */

CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Aug  3 16:37:02 UTC 2016

Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_module.c

Log Message:
machdep.booted_kernel is not an absolute path, make it so. Now u_int is
found but its parent is not :-)


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c

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

CVS commit: src/sys/arch/arm/arm32

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Aug  3 15:59:58 UTC 2016

Modified Files:
src/sys/arch/arm/arm32: pmap.c

Log Message:
Don't touch pm_onproc at all in pmap_{update,destroy} and adjust KASSERT
to suit.

Update to cover the PMAP_TLB_MAX > 1 case as well while I'm here.


To generate a diff of this commit:
cvs rdiff -u -r1.338 -r1.339 src/sys/arch/arm/arm32/pmap.c

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

Modified files:

Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.338 src/sys/arch/arm/arm32/pmap.c:1.339
--- src/sys/arch/arm/arm32/pmap.c:1.338	Mon Aug  1 18:28:38 2016
+++ src/sys/arch/arm/arm32/pmap.c	Wed Aug  3 15:59:58 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.338 2016/08/01 18:28:38 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.339 2016/08/03 15:59:58 skrll Exp $	*/
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -217,7 +217,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.338 2016/08/01 18:28:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.339 2016/08/03 15:59:58 skrll Exp $");
 
 //#define PMAP_DEBUG
 #ifdef PMAP_DEBUG
@@ -5014,24 +5014,45 @@ pmap_remove_all_complete(pmap_t pm)
 	 */
 #ifdef MULTIPROCESSOR
 	// This should be the last CPU with this pmap onproc
-	KASSERT(!kcpuset_isotherset(pm->pm_onproc, cpu_index(curcpu(;
-	if (kcpuset_isset(pm->pm_onproc, cpu_index(curcpu( {
-		struct cpu_info * const ci = curcpu();
-		KASSERT(!cpu_intr_p());
-		/*
-		 * The bits in pm_onproc that belong to this
-		 * TLB can be changed while this TLBs lock is
-		 * not held as long as we use atomic ops.
-		 */
-		kcpuset_atomic_clear(pm->pm_onproc, cpu_index(ci));
+//	KASSERT(!kcpuset_isotherset(pm->pm_onproc, cpu_index(curcpu(;
+#if PMAP_TLB_MAX > 1
+	for (u_int i = 0; !kcpuset_iszero(pm->pm_active); i++) {
+		KASSERT(i < pmap_ntlbs);
+		struct pmap_tlb_info * const ti = pmap_tlbs[i];
+#else
+		struct pmap_tlb_info * const ti = _tlb0_info;
+#endif
+		TLBINFO_LOCK(ti);
+		struct pmap_asid_info * const pai = PMAP_PAI(pm, ti);
+		if (PMAP_PAI_ASIDVALID_P(pai, ti)) {
+			if (kcpuset_isset(pm->pm_onproc, cpu_index(curcpu( {
+#if PMAP_TLB_MAX == 1
+KASSERT(cpu_tlb_info(ci) == ti);
+
+tlb_invalidate_asids(pai->pai_asid,
+	pai->pai_asid);
+#else
+if (cpu_tlb_info(ci) == ti) {
+	tlb_invalidate_asids(pai->pai_asid,
+		pai->pai_asid);
+} else {
+	pm->pm_shootdown_needed = 1;
+}
+#endif
+			}
+		}
+		TLBINFO_UNLOCK(ti);
+
+#if PMAP_TLB_MAX > 1
 	}
-	KASSERT(kcpuset_iszero(pm->pm_onproc));
-#endif /* MULTIPROCESSOR */
+#endif
+#else /* MULTIPROCESSOR */
 
 	struct pmap_asid_info * const pai =
 	PMAP_PAI(pm, cpu_tlb_info(ci));
 
 	tlb_invalidate_asids(pai->pai_asid, pai->pai_asid);
+#endif /* MULTIPROCESSOR */
 }
 #endif
 

CVS commit: src/sys/arch/arm/arm32

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Aug  3 15:59:58 UTC 2016

Modified Files:
src/sys/arch/arm/arm32: pmap.c

Log Message:
Don't touch pm_onproc at all in pmap_{update,destroy} and adjust KASSERT
to suit.

Update to cover the PMAP_TLB_MAX > 1 case as well while I'm here.


To generate a diff of this commit:
cvs rdiff -u -r1.338 -r1.339 src/sys/arch/arm/arm32/pmap.c

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

CVS commit: src/crypto/external/bsd/openssh/dist

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Wed Aug  3 15:24:28 UTC 2016

Modified Files:
src/crypto/external/bsd/openssh/dist: utf8.c utf8.h

Log Message:
Add some missing __attribute__((format(printf annotations.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/utf8.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/crypto/external/bsd/openssh/dist/utf8.h

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

Modified files:

Index: src/crypto/external/bsd/openssh/dist/utf8.c
diff -u src/crypto/external/bsd/openssh/dist/utf8.c:1.2 src/crypto/external/bsd/openssh/dist/utf8.c:1.3
--- src/crypto/external/bsd/openssh/dist/utf8.c:1.2	Tue Aug  2 13:45:12 2016
+++ src/crypto/external/bsd/openssh/dist/utf8.c	Wed Aug  3 15:24:28 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: utf8.c,v 1.2 2016/08/02 13:45:12 christos Exp $	*/
+/*	$NetBSD: utf8.c,v 1.3 2016/08/03 15:24:28 jakllsch Exp $	*/
 /* $OpenBSD: utf8.c,v 1.3 2016/05/30 12:57:21 schwarze Exp $ */
 /*
  * Copyright (c) 2016 Ingo Schwarze 
@@ -17,7 +17,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: utf8.c,v 1.2 2016/08/02 13:45:12 christos Exp $");
+__RCSID("$NetBSD: utf8.c,v 1.3 2016/08/03 15:24:28 jakllsch Exp $");
 /*
  * Utility functions for multibyte-character handling,
  * in particular to sanitize untrusted strings for terminal output.
@@ -37,7 +37,8 @@ __RCSID("$NetBSD: utf8.c,v 1.2 2016/08/0
 
 static int	 dangerous_locale(void);
 static int	 grow_dst(char **, size_t *, size_t, char **, size_t);
-static int	 vasnmprintf(char **, size_t, int *, const char *, va_list);
+static int	 vasnmprintf(char **, size_t, int *, const char *, va_list)
+		 __attribute__((format(printf, 4, 0)));
 
 
 /*

Index: src/crypto/external/bsd/openssh/dist/utf8.h
diff -u src/crypto/external/bsd/openssh/dist/utf8.h:1.1.1.1 src/crypto/external/bsd/openssh/dist/utf8.h:1.2
--- src/crypto/external/bsd/openssh/dist/utf8.h:1.1.1.1	Tue Aug  2 13:30:06 2016
+++ src/crypto/external/bsd/openssh/dist/utf8.h	Wed Aug  3 15:24:28 2016
@@ -19,6 +19,7 @@ int	 mprintf(const char *, ...)
 	 __attribute__((format(printf, 1, 2)));
 int	 fmprintf(FILE *, const char *, ...)
 	 __attribute__((format(printf, 2, 3)));
-int	 vfmprintf(FILE *, const char *, va_list);
+int	 vfmprintf(FILE *, const char *, va_list)
+	 __attribute__((format(printf, 2, 0)));
 int	 snmprintf(char *, size_t, int *, const char *, ...)
 	 __attribute__((format(printf, 4, 5)));

CVS commit: src/crypto/external/bsd/openssh/dist

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Wed Aug  3 15:24:28 UTC 2016

Modified Files:
src/crypto/external/bsd/openssh/dist: utf8.c utf8.h

Log Message:
Add some missing __attribute__((format(printf annotations.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/utf8.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/crypto/external/bsd/openssh/dist/utf8.h

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

CVS commit: [pgoyette-localcount] src/share/man/man9

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Wed Aug  3 13:11:37 UTC 2016

Modified Files:
src/share/man/man9 [pgoyette-localcount]: localcount.9

Log Message:
As suggested in private Email, rename BUGS section to CAVEATS.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/share/man/man9/localcount.9

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

CVS commit: [pgoyette-localcount] src/share/man/man9

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Wed Aug  3 13:11:37 UTC 2016

Modified Files:
src/share/man/man9 [pgoyette-localcount]: localcount.9

Log Message:
As suggested in private Email, rename BUGS section to CAVEATS.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/share/man/man9/localcount.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/localcount.9
diff -u src/share/man/man9/localcount.9:1.1.2.5 src/share/man/man9/localcount.9:1.1.2.6
--- src/share/man/man9/localcount.9:1.1.2.5	Mon Aug  1 12:02:00 2016
+++ src/share/man/man9/localcount.9	Wed Aug  3 13:11:36 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: localcount.9,v 1.1.2.5 2016/08/01 12:02:00 pgoyette Exp $
+.\"	$NetBSD: localcount.9,v 1.1.2.6 2016/08/03 13:11:36 pgoyette Exp $
 .\"
 .\" Copyright (c) 2016
 .\" All rights reserved.
@@ -173,7 +173,7 @@ was written by
 .An Taylor R. Campbell .
 This manual page was compiled by
 .An Paul Goyette .
-.Sh BUGS
+.Sh CAVEATS
 The
 .Nm
 facility does not provide any way to examine the reference count without

CVS commit: src/usr.bin/systat

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Wed Aug  3 13:09:44 UTC 2016

Modified Files:
src/usr.bin/systat: systat.1

Log Message:
Bump date for new ifstat command.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/usr.bin/systat/systat.1

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

Modified files:

Index: src/usr.bin/systat/systat.1
diff -u src/usr.bin/systat/systat.1:1.45 src/usr.bin/systat/systat.1:1.46
--- src/usr.bin/systat/systat.1:1.45	Tue Aug  2 15:56:09 2016
+++ src/usr.bin/systat/systat.1	Wed Aug  3 13:09:43 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: systat.1,v 1.45 2016/08/02 15:56:09 scole Exp $
+.\"	$NetBSD: systat.1,v 1.46 2016/08/03 13:09:43 wiz Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
 .\"
-.Dd October 19, 2012
+.Dd August 2, 2016
 .Dt SYSTAT 1
 .Os
 .Sh NAME

CVS commit: src/usr.bin/systat

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Wed Aug  3 13:09:44 UTC 2016

Modified Files:
src/usr.bin/systat: systat.1

Log Message:
Bump date for new ifstat command.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/usr.bin/systat/systat.1

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

CVS commit: src/lib/libc/gen

[Ryo ONODERA]

Module Name:src
Committed By:   ryoon
Date:   Wed Aug  3 12:40:42 UTC 2016

Modified Files:
src/lib/libc/gen: sysconf.3

Log Message:
Fix _SC_TIMER_MAX listing, bump date


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/lib/libc/gen/sysconf.3

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

Modified files:

Index: src/lib/libc/gen/sysconf.3
diff -u src/lib/libc/gen/sysconf.3:1.50 src/lib/libc/gen/sysconf.3:1.51
--- src/lib/libc/gen/sysconf.3:1.50	Tue Jul  5 09:51:10 2016
+++ src/lib/libc/gen/sysconf.3	Wed Aug  3 12:40:42 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sysconf.3,v 1.50 2016/07/05 09:51:10 wiz Exp $
+.\"	$NetBSD: sysconf.3,v 1.51 2016/08/03 12:40:42 ryoon Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)sysconf.3	8.3 (Berkeley) 4/19/94
 .\"
-.Dd July 3, 2016
+.Dd August 3, 2016
 .Dt SYSCONF 3
 .Os
 .Sh NAME
@@ -294,7 +294,7 @@ The number of processors online (capable
 The amount of physical memory on the system in
 .Li _SC_PAGESIZE
 bytes.
-.Li _SC_TIMER_MAX
+.It Li _SC_TIMER_MAX
 The number of timers available for
 .Xr timer_create 2 .
 This is also known as

CVS commit: src/lib/libc/gen

[Ryo ONODERA]

Module Name:src
Committed By:   ryoon
Date:   Wed Aug  3 12:40:42 UTC 2016

Modified Files:
src/lib/libc/gen: sysconf.3

Log Message:
Fix _SC_TIMER_MAX listing, bump date


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/lib/libc/gen/sysconf.3

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

CVS commit: src/usr.bin/ftp

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Wed Aug  3 12:33:56 UTC 2016

Modified Files:
src/usr.bin/ftp: fetch.c

Log Message:
Do globbing for FTP URLs of the form ftp://... too

ok christos


To generate a diff of this commit:
cvs rdiff -u -r1.223 -r1.224 src/usr.bin/ftp/fetch.c

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

CVS commit: src/usr.bin/ftp

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Wed Aug  3 12:33:56 UTC 2016

Modified Files:
src/usr.bin/ftp: fetch.c

Log Message:
Do globbing for FTP URLs of the form ftp://... too

ok christos


To generate a diff of this commit:
cvs rdiff -u -r1.223 -r1.224 src/usr.bin/ftp/fetch.c

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

Modified files:

Index: src/usr.bin/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.223 src/usr.bin/ftp/fetch.c:1.224
--- src/usr.bin/ftp/fetch.c:1.223	Mon Apr  4 23:59:41 2016
+++ src/usr.bin/ftp/fetch.c	Wed Aug  3 12:33:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fetch.c,v 1.223 2016/04/04 23:59:41 christos Exp $	*/
+/*	$NetBSD: fetch.c,v 1.224 2016/08/03 12:33:56 maya Exp $	*/
 
 /*-
  * Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.223 2016/04/04 23:59:41 christos Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.224 2016/08/03 12:33:56 maya Exp $");
 #endif /* not lint */
 
 /*
@@ -1899,7 +1899,8 @@ fetch_ftp(const char *url)
 	STRorNULL(ui.path), STRorNULL(dir), STRorNULL(file));
 
 	dirhasglob = filehasglob = 0;
-	if (doglob && ui.utype == CLASSIC_URL_T) {
+	if (doglob &&
+	(ui.utype == CLASSIC_URL_T || ui.utype == FTP_URL_T)) {
 		if (! EMPTYSTRING(dir) && strpbrk(dir, "*?[]{}") != NULL)
 			dirhasglob = 1;
 		if (! EMPTYSTRING(file) && strpbrk(file, "*?[]{}") != NULL)

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

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Wed Aug  3 11:51:18 UTC 2016

Modified Files:
src/sys/arch/xen/x86: x86_xpmap.c

Log Message:
Map the recursive slot and page table pages as non-executable on Xen. Same
as normal x86.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/xen/x86/x86_xpmap.c

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

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

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Wed Aug  3 11:51:18 UTC 2016

Modified Files:
src/sys/arch/xen/x86: x86_xpmap.c

Log Message:
Map the recursive slot and page table pages as non-executable on Xen. Same
as normal x86.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/xen/x86/x86_xpmap.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/xen/x86/x86_xpmap.c
diff -u src/sys/arch/xen/x86/x86_xpmap.c:1.57 src/sys/arch/xen/x86/x86_xpmap.c:1.58
--- src/sys/arch/xen/x86/x86_xpmap.c:1.57	Tue Aug  2 14:21:53 2016
+++ src/sys/arch/xen/x86/x86_xpmap.c	Wed Aug  3 11:51:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: x86_xpmap.c,v 1.57 2016/08/02 14:21:53 maxv Exp $	*/
+/*	$NetBSD: x86_xpmap.c,v 1.58 2016/08/03 11:51:18 maxv Exp $	*/
 
 /*
  * Copyright (c) 2006 Mathieu Ropert 
@@ -69,7 +69,7 @@
 
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.57 2016/08/02 14:21:53 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.58 2016/08/03 11:51:18 maxv Exp $");
 
 #include "opt_xen.h"
 #include "opt_ddb.h"
@@ -918,7 +918,7 @@ xen_bootstrap_tables(vaddr_t old_pgd, va
 
 			pte[pl1_pi(page)] |= PG_k | PG_V;
 			if (page < (vaddr_t)&__rodata_start) {
-/* Map kernel text RX. */
+/* Map the kernel text RX. */
 pte[pl1_pi(page)] |= PG_RO;
 			} else if (page >= (vaddr_t)&__rodata_start &&
 			page < (vaddr_t)&__data_start) {
@@ -930,12 +930,12 @@ xen_bootstrap_tables(vaddr_t old_pgd, va
 pte[pl1_pi(page)] |= PG_RW | pg_nx;
 			} else if (page >= old_pgd &&
 			page < old_pgd + (old_count * PAGE_SIZE)) {
-/* map old page tables RO */
-pte[pl1_pi(page)] |= PG_RO;
+/* Map the old page tables R. */
+pte[pl1_pi(page)] |= PG_RO | pg_nx;
 			} else if (page >= new_pgd &&
 			page < new_pgd + ((new_count + l2_4_count) * PAGE_SIZE)) {
-/* map new page tables RO */
-pte[pl1_pi(page)] |= PG_RO;
+/* Map the new page tables R. */
+pte[pl1_pi(page)] |= PG_RO | pg_nx;
 #ifdef i386
 			} else if (page == (vaddr_t)tmpgdt) {
 /*
@@ -1028,15 +1028,19 @@ xen_bootstrap_tables(vaddr_t old_pgd, va
 	xpq_queue_pin_l2_table(xpmap_ptom_masked(addr));
 #endif
 #else /* PAE */
-	/* recursive entry in higher-level per-cpu PD and pmap_kernel() */
-	bt_pgd[PDIR_SLOT_PTE] = xpmap_ptom_masked((paddr_t)bt_pgd - KERNBASE) | PG_k | PG_V;
+
+	/* Recursive entry in pmap_kernel(). */
+	bt_pgd[PDIR_SLOT_PTE] = xpmap_ptom_masked((paddr_t)bt_pgd - KERNBASE)
+	| PG_k | PG_RO | PG_V | pg_nx;
 #ifdef __x86_64__
-	   bt_cpu_pgd[PDIR_SLOT_PTE] =
-		   xpmap_ptom_masked((paddr_t)bt_cpu_pgd - KERNBASE) | PG_k | PG_V;
-#endif /* __x86_64__ */
+	/* Recursive entry in higher-level per-cpu PD. */
+	bt_cpu_pgd[PDIR_SLOT_PTE] = xpmap_ptom_masked((paddr_t)bt_cpu_pgd - KERNBASE)
+	| PG_k | PG_RO | PG_V | pg_nx;
+#endif
 	__PRINTK(("bt_pgd[PDIR_SLOT_PTE] va %#" PRIxVADDR " pa %#" PRIxPADDR
 	" entry %#" PRIxPADDR "\n", new_pgd, (paddr_t)new_pgd - KERNBASE,
 	bt_pgd[PDIR_SLOT_PTE]));
+
 	/* Mark tables RO */
 	xen_bt_set_readonly((vaddr_t) pde);
 #endif
@@ -1046,6 +1050,7 @@ xen_bootstrap_tables(vaddr_t old_pgd, va
 #if PTP_LEVELS > 3
 	xen_bt_set_readonly(new_pgd);
 #endif
+
 	/* Pin the PGD */
 	__PRINTK(("pin PGD: %"PRIxVADDR"\n", new_pgd - KERNBASE));
 #ifdef __x86_64__

CVS commit: src/sys/lib/libsa

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Wed Aug  3 09:11:18 UTC 2016

Modified Files:
src/sys/lib/libsa: ext2fs.c

Log Message:
Adjust for change to kernel ext2fs headers.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/lib/libsa/ext2fs.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/lib/libsa/ext2fs.c
diff -u src/sys/lib/libsa/ext2fs.c:1.20 src/sys/lib/libsa/ext2fs.c:1.21
--- src/sys/lib/libsa/ext2fs.c:1.20	Thu Mar 20 03:13:18 2014
+++ src/sys/lib/libsa/ext2fs.c	Wed Aug  3 09:11:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs.c,v 1.20 2014/03/20 03:13:18 christos Exp $	*/
+/*	$NetBSD: ext2fs.c,v 1.21 2016/08/03 09:11:18 rjs Exp $	*/
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.
@@ -956,7 +956,7 @@ void e2fs_i_bswap(struct ext2fs_dinode *
 	new->e2di_gen		=	bswap32(old->e2di_gen);
 	new->e2di_facl		=	bswap32(old->e2di_facl);
 	new->e2di_dacl		=	bswap32(old->e2di_dacl);
-	new->e2di_faddr		=	bswap32(old->e2di_faddr);
+	new->e2di_obso_faddr	=	bswap32(old->e2di_obso_faddr);
 	memcpy(>e2di_blocks[0], >e2di_blocks[0],
 	(EXT2FS_NDADDR + EXT2FS_NIADDR) * sizeof(uint32_t));
 }

CVS commit: src/sys/lib/libsa

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Wed Aug  3 09:11:18 UTC 2016

Modified Files:
src/sys/lib/libsa: ext2fs.c

Log Message:
Adjust for change to kernel ext2fs headers.


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

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

CVS commit: src/usr.sbin/intrctl

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Wed Aug  3 08:34:21 UTC 2016

Modified Files:
src/usr.sbin/intrctl: intrctl.c

Log Message:
intrctl(8): pretty printing intrctl list.

e.g.
== before ==
interrupt id  CPU#00  CPU#01device name(s)
irq 9  0*  0pq3pcie1
irq 10 0*  0pq3pcie0
irq 1230*  0usb1
irq 1379*  0etsec1-tx
irq 14   268*  0etsec1-rx
irq 15 0*  0etsec3-tx
irq 16 0*  0etsec3-rx
irq 17 0*  0etsec3-err
irq 18 0*  0etsec1-err
irq 26  1030*  0duart
irq 27 0*  0i2c
irq 56680437*  0esdhc
msigroup 0 0*  0msi 0-31
== before ==

== after ==
interrupt id CPU0  CPU1  device name(s)
irq 9   0*0  pq3pcie1
irq 10  0*0  pq3pcie0
irq 12 30*0  usb1
irq 13 79*0  etsec1-tx
irq 14310*0  etsec1-rx
irq 15  0*0  etsec3-tx
irq 16  0*0  etsec3-rx
irq 17  0*0  etsec3-err
irq 18  0*0  etsec1-err
irq 26   1629*0  duart
irq 27  0*0  i2c
irq 56 730617*0  esdhc
msigroup 0  018* msi 0-31
== after ==

This patch is implemented by nonaka@n.o. Thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/intrctl/intrctl.c

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

Modified files:

Index: src/usr.sbin/intrctl/intrctl.c
diff -u src/usr.sbin/intrctl/intrctl.c:1.1 src/usr.sbin/intrctl/intrctl.c:1.2
--- src/usr.sbin/intrctl/intrctl.c:1.1	Mon Aug 17 06:42:46 2015
+++ src/usr.sbin/intrctl/intrctl.c	Wed Aug  3 08:34:21 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: intrctl.c,v 1.1 2015/08/17 06:42:46 knakahara Exp $	*/
+/*	$NetBSD: intrctl.c,v 1.2 2016/08/03 08:34:21 knakahara Exp $	*/
 
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: intrctl.c,v 1.1 2015/08/17 06:42:46 knakahara Exp $");
+__RCSID("$NetBSD: intrctl.c,v 1.2 2016/08/03 08:34:21 knakahara Exp $");
 
 #include 
 #include 
@@ -115,29 +115,40 @@ intrctl_list(int argc, char **argv)
 	struct intrio_list_line *illine;
 	int i, ncpus;
 	void *handle;
+	size_t intridlen;
 
 	handle = intrctl_io_alloc(intrctl_io_alloc_retry_count);
 	if (handle == NULL)
 		err(EXIT_FAILURE, "intrctl_io_alloc");
 
-	/* header */
+	/* calc columns */
 	ncpus = intrctl_io_ncpus(handle);
-	printf("interrupt id\t");
+	intridlen = strlen("interrupt id");
+	illine = intrctl_io_firstline(handle);
+	for (; illine != NULL; illine = intrctl_io_nextline(handle, illine)) {
+		size_t len = strlen(illine->ill_intrid);
+		if (intridlen < len)
+			intridlen = len;
+	}
+
+	/* header */
+	printf("%-*s", (int)intridlen, "interrupt id");
 	for (i = 0; i < ncpus; i++) {
-		printf("  CPU#%02u\t", i);
+		char buf[64];
+		snprintf(buf, sizeof(buf), "CPU%u", i);
+		printf(" %20s ", buf);
 	}
-	printf("device name(s)\n");
+	printf(" device name(s)\n");
 
 	/* body */
 	illine = intrctl_io_firstline(handle);
 	for (; illine != NULL; illine = intrctl_io_nextline(handle, illine)) {
-		printf("%s\t", illine->ill_intrid);
+		printf("%-*s ", (int)intridlen, illine->ill_intrid);
 		for (i = 0; i < ncpus; i++) {
 			struct intrio_list_line_cpu *illc = >ill_cpu[i];
-			printf("%8" PRIu64 "%c\t", illc->illc_count,
+			printf("%20" PRIu64 "%c ", illc->illc_count,
 			illc->illc_assigned ? '*' : ' ');
 		}
-
 		printf("%s\n", illine->ill_xname);
 	}
 

CVS commit: src/usr.sbin/intrctl

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Wed Aug  3 08:34:21 UTC 2016

Modified Files:
src/usr.sbin/intrctl: intrctl.c

Log Message:
intrctl(8): pretty printing intrctl list.

e.g.
== before ==
interrupt id  CPU#00  CPU#01device name(s)
irq 9  0*  0pq3pcie1
irq 10 0*  0pq3pcie0
irq 1230*  0usb1
irq 1379*  0etsec1-tx
irq 14   268*  0etsec1-rx
irq 15 0*  0etsec3-tx
irq 16 0*  0etsec3-rx
irq 17 0*  0etsec3-err
irq 18 0*  0etsec1-err
irq 26  1030*  0duart
irq 27 0*  0i2c
irq 56680437*  0esdhc
msigroup 0 0*  0msi 0-31
== before ==

== after ==
interrupt id CPU0  CPU1  device name(s)
irq 9   0*0  pq3pcie1
irq 10  0*0  pq3pcie0
irq 12 30*0  usb1
irq 13 79*0  etsec1-tx
irq 14310*0  etsec1-rx
irq 15  0*0  etsec3-tx
irq 16  0*0  etsec3-rx
irq 17  0*0  etsec3-err
irq 18  0*0  etsec1-err
irq 26   1629*0  duart
irq 27  0*0  i2c
irq 56 730617*0  esdhc
msigroup 0  018* msi 0-31
== after ==

This patch is implemented by nonaka@n.o. Thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/intrctl/intrctl.c

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

CVS commit: src/usr.sbin/intrctl

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Wed Aug  3 08:28:09 UTC 2016

Modified Files:
src/usr.sbin/intrctl: intrctl_io.c

Log Message:
fix: incorrect sysctlbyname(3) error handling.

pointed out by nonaka@n.o


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/intrctl/intrctl_io.c

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

CVS commit: src/usr.sbin/intrctl

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Wed Aug  3 08:28:09 UTC 2016

Modified Files:
src/usr.sbin/intrctl: intrctl_io.c

Log Message:
fix: incorrect sysctlbyname(3) error handling.

pointed out by nonaka@n.o


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/intrctl/intrctl_io.c

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

Modified files:

Index: src/usr.sbin/intrctl/intrctl_io.c
diff -u src/usr.sbin/intrctl/intrctl_io.c:1.1 src/usr.sbin/intrctl/intrctl_io.c:1.2
--- src/usr.sbin/intrctl/intrctl_io.c:1.1	Mon Aug 17 06:42:46 2015
+++ src/usr.sbin/intrctl/intrctl_io.c	Wed Aug  3 08:28:09 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: intrctl_io.c,v 1.1 2015/08/17 06:42:46 knakahara Exp $	*/
+/*	$NetBSD: intrctl_io.c,v 1.2 2016/08/03 08:28:09 knakahara Exp $	*/
 
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: intrctl_io.c,v 1.1 2015/08/17 06:42:46 knakahara Exp $");
+__RCSID("$NetBSD: intrctl_io.c,v 1.2 2016/08/03 08:28:09 knakahara Exp $");
 
 #include 
 #include 
@@ -63,7 +63,7 @@ intrctl_io_alloc(int retry)
 		error = sysctlbyname("kern.intr.list", buf, _size, NULL, 0);
 		if (error >= 0)
 			return buf;
-		else if (error == -ENOMEM) {
+		else if (errno == ENOMEM) {
 			void *temp;
 
 			temp = realloc(buf, buf_size);

CVS commit: src/sys/sys

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Wed Aug  3 08:25:38 UTC 2016

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

Log Message:
intrid and dev_xname must be NUL terminated by kernel.

pointed out by nonaka@n.o


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/sys/intrio.h

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

Modified files:

Index: src/sys/sys/intrio.h
diff -u src/sys/sys/intrio.h:1.1 src/sys/sys/intrio.h:1.2
--- src/sys/sys/intrio.h:1.1	Mon Aug 17 06:16:03 2015
+++ src/sys/sys/intrio.h	Wed Aug  3 08:25:38 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: intrio.h,v 1.1 2015/08/17 06:16:03 knakahara Exp $	*/
+/*	$NetBSD: intrio.h,v 1.2 2016/08/03 08:25:38 knakahara Exp $	*/
 
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
@@ -47,9 +47,12 @@ struct intrio_list_line_cpu {
 };
 
 struct intrio_list_line {
-	char ill_intrid[INTRIDBUF];
-	char ill_xname[INTRDEVNAMEBUF];
-	struct intrio_list_line_cpu ill_cpu[1]; /* Array size is overwritten to ncpu. */
+	char ill_intrid[INTRIDBUF];		/* NUL terminated. */
+	char ill_xname[INTRDEVNAMEBUF];		/* NUL terminated. */
+	struct intrio_list_line_cpu ill_cpu[1];	/*
+		 * Array size is overwritten
+		 * to ncpu.
+		 */
 };
 
 struct intrio_list {

CVS commit: src/sys/sys

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Wed Aug  3 08:25:38 UTC 2016

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

Log Message:
intrid and dev_xname must be NUL terminated by kernel.

pointed out by nonaka@n.o


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/sys/intrio.h

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