CVS commit: src/sys/kern
Module Name:src
Committed By: hannken
Date: Tue Aug 9 06:36:52 UTC 2011
Modified Files:
src/sys/kern: sys_select.c
Log Message:
No need to lock the selcluster in selscan() if either
NO_DIRECT_SELECT is defined or all polls return an event.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/kern/sys_select.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_select.c
diff -u src/sys/kern/sys_select.c:1.34 src/sys/kern/sys_select.c:1.35
--- src/sys/kern/sys_select.c:1.34 Sat Aug 6 11:04:25 2011
+++ src/sys/kern/sys_select.c Tue Aug 9 06:36:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_select.c,v 1.34 2011/08/06 11:04:25 hannken Exp $ */
+/* $NetBSD: sys_select.c,v 1.35 2011/08/09 06:36:51 hannken Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc.
@@ -84,7 +84,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_select.c,v 1.34 2011/08/06 11:04:25 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_select.c,v 1.35 2011/08/09 06:36:51 hannken Exp $);
#include sys/param.h
#include sys/systm.h
@@ -390,7 +390,7 @@
for (i = 0; i nfd; i += NFDBITS) {
fd_mask ibits, obits;
- ibits = *ibitp++;
+ ibits = *ibitp;
obits = 0;
while ((j = ffs(ibits)) (fd = i + --j) nfd) {
ibits = ~(1 j);
@@ -408,10 +408,17 @@
fd_putfile(fd);
}
if (obits != 0) {
-mutex_spin_enter(lock);
+#ifndef NO_DIRECT_SELECT
+if (obits != *ibitp)
+ mutex_spin_enter(lock);
*obitp |= obits;
-mutex_spin_exit(lock);
+if (obits != *ibitp)
+ mutex_spin_exit(lock);
+#else
+*obitp |= obits;
+#endif
}
+ ibitp++;
obitp++;
}
}
CVS commit: src/lib/libperfuse
Module Name:src Committed By: manu Date: Tue Aug 9 06:58:33 UTC 2011 Modified Files: src/lib/libperfuse: perfuse.c Log Message: Remove PUFFS_KFLAG_WTCACHE, which caused data corruption and slowdown To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/lib/libperfuse/perfuse.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libperfuse/perfuse.c diff -u src/lib/libperfuse/perfuse.c:1.16 src/lib/libperfuse/perfuse.c:1.17 --- src/lib/libperfuse/perfuse.c:1.16 Tue Jun 28 16:19:16 2011 +++ src/lib/libperfuse/perfuse.c Tue Aug 9 06:58:33 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: perfuse.c,v 1.16 2011/06/28 16:19:16 manu Exp $ */ +/* $NetBSD: perfuse.c,v 1.17 2011/08/09 06:58:33 manu Exp $ */ /*- * Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved. @@ -484,7 +484,25 @@ PUFFSOP_SET(pops, perfuse, node, deleteextattr); #endif /* PUFFS_EXTNAMELEN */ - puffs_flags = PUFFS_KFLAG_WTCACHE; + /* + * We used to have PUFFS_KFLAG_WTCACHE here, which uses the + * page cache (highly desirable to get mmap(2)), but still sends + * all writes to the filesystem. In fact it does not send the + * data written, but the pages that contain it. + * + * There is a nasty bug hidden somewhere, possibly in libpuffs' + * VOP_FSYNC, which sends an asynchronous PUFFS_SETATTR that + * update file size. When writes are in progress, it will cause + * the file to be truncated and we get a zero-filled chunk at the + * beginning of a page. Removing PUFFS_KFLAG_WTCACHE fixes that + * problem. + * + * The other consequences are that changes will not be propagated + * immediatly to the filesystem, and we get a huge performance gain + * because much less requests are sent. A test case for the above + * mentioned bug got its execution time slashed by factor 50. + */ + puffs_flags = 0; if (perfuse_diagflags PDF_PUFFS) puffs_flags |= PUFFS_FLAG_OPDUMP;
CVS commit: src/usr.sbin/perfused
Module Name:src Committed By: manu Date: Tue Aug 9 07:00:13 UTC 2011 Modified Files: src/usr.sbin/perfused: msg.c Log Message: Fix warning To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/perfused/msg.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/perfused/msg.c diff -u src/usr.sbin/perfused/msg.c:1.14 src/usr.sbin/perfused/msg.c:1.15 --- src/usr.sbin/perfused/msg.c:1.14 Tue Aug 2 14:53:38 2011 +++ src/usr.sbin/perfused/msg.c Tue Aug 9 07:00:13 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: msg.c,v 1.14 2011/08/02 14:53:38 manu Exp $ */ +/* $NetBSD: msg.c,v 1.15 2011/08/09 07:00:13 manu Exp $ */ /*- * Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved. @@ -539,7 +539,7 @@ len = foh.len; #ifdef PERFUSE_DEBUG - if (len FUSE_BUFSIZE) + if (len (size_t)FUSE_BUFSIZE) DERRX(EX_SOFTWARE, %s: foh.len = %zu, __func__, len); #endif
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Tue Aug 9 07:09:33 UTC 2011 Modified Files: src/share/man/man4: acpicpu.4 Log Message: Add few papers to SEE ALSO. Particularly the first one demonstrates the diminishing value of P-states compared to C-states on new CPUs. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/share/man/man4/acpicpu.4 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/man4/acpicpu.4 diff -u src/share/man/man4/acpicpu.4:1.31 src/share/man/man4/acpicpu.4:1.32 --- src/share/man/man4/acpicpu.4:1.31 Sat Apr 9 17:25:28 2011 +++ src/share/man/man4/acpicpu.4 Tue Aug 9 07:09:33 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: acpicpu.4,v 1.31 2011/04/09 17:25:28 jruoho Exp $ +.\ $NetBSD: acpicpu.4,v 1.32 2011/08/09 07:09:33 jruoho Exp $ .\ .\ Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd April 9, 2011 +.Dd August 6, 2011 .Dt ACPICPU 4 .Os .Sh NAME @@ -294,6 +294,30 @@ .Xr odcm 4 , .Xr powernow 4 , .Xr cpu_idle 9 +.Rs +.%A Etienne Le Sueur +.%A Gernot Heiser +.%T Dynamic Voltage and Frequency Scaling: The Laws of Diminishing Returns +.%O Proceedings of the 2010 Workshop on \ +Power Aware Computing and Systems (HotPower'10) +.%D October, 2010 +.%U http://www.ertos.nicta.com.au/publications/papers/LeSueur_Heiser_10.pdf +.Re +.Rs +.%A Microsoft Corporation +.%T Windows Native Processor Performance Control +.%N Version 1.1a +.%D November, 2002 +.%U http://msdn.microsoft.com/en-us/windows/hardware/gg463343 +.Re +.Rs +.%A Venkatesh Pallipadi +.%A Alexey Starikovskiy +.%T The Ondemand Governor. Past, Present, and Future +.%I Intel Open Source Technology Center +.%O Proceedings of the Linux Symposium +.%U http://www.kernel.org/doc/ols/2006/ols2006v2-pages-223-238.pdf +.Re .Sh HISTORY The .Nm @@ -323,7 +347,7 @@ .Nm nor by .Xr est 4 -and +or .Xr powernow 4 . .It There is currently neither a well-defined, machine-independent
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Tue Aug 9 07:16:27 UTC 2011 Modified Files: src/share/man/man4: acpicpu.4 Log Message: One more. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/share/man/man4/acpicpu.4 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/man4/acpicpu.4 diff -u src/share/man/man4/acpicpu.4:1.32 src/share/man/man4/acpicpu.4:1.33 --- src/share/man/man4/acpicpu.4:1.32 Tue Aug 9 07:09:33 2011 +++ src/share/man/man4/acpicpu.4 Tue Aug 9 07:16:27 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: acpicpu.4,v 1.32 2011/08/09 07:09:33 jruoho Exp $ +.\ $NetBSD: acpicpu.4,v 1.33 2011/08/09 07:16:27 jruoho Exp $ .\ .\ Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi .\ All rights reserved. @@ -304,6 +304,14 @@ .%U http://www.ertos.nicta.com.au/publications/papers/LeSueur_Heiser_10.pdf .Re .Rs +.%A David C. Snowdon +.%T Operating System Directed Power Management +.%O PhD Thesis +.%I School of Computer Science and Engineering, University of New South Wales +.%D March, 2010 +.%U http://ertos.nicta.com.au/publications/papers/Snowdon:phd.pdf +.Re +.Rs .%A Microsoft Corporation .%T Windows Native Processor Performance Control .%N Version 1.1a
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Tue Aug 9 07:18:54 UTC 2011 Modified Files: src/share/man/man4: acpicpu.4 Log Message: Finally, add missing %D. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/share/man/man4/acpicpu.4 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/man4/acpicpu.4 diff -u src/share/man/man4/acpicpu.4:1.33 src/share/man/man4/acpicpu.4:1.34 --- src/share/man/man4/acpicpu.4:1.33 Tue Aug 9 07:16:27 2011 +++ src/share/man/man4/acpicpu.4 Tue Aug 9 07:18:54 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: acpicpu.4,v 1.33 2011/08/09 07:16:27 jruoho Exp $ +.\ $NetBSD: acpicpu.4,v 1.34 2011/08/09 07:18:54 jruoho Exp $ .\ .\ Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi .\ All rights reserved. @@ -324,6 +324,7 @@ .%T The Ondemand Governor. Past, Present, and Future .%I Intel Open Source Technology Center .%O Proceedings of the Linux Symposium +.%D July, 2006 .%U http://www.kernel.org/doc/ols/2006/ols2006v2-pages-223-238.pdf .Re .Sh HISTORY
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Tue Aug 9 07:24:49 UTC 2011 Modified Files: src/share/man/man4: hpacel.4 Log Message: Fix a typo. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/hpacel.4 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/man4/hpacel.4 diff -u src/share/man/man4/hpacel.4:1.2 src/share/man/man4/hpacel.4:1.3 --- src/share/man/man4/hpacel.4:1.2 Wed Jul 13 08:38:16 2011 +++ src/share/man/man4/hpacel.4 Tue Aug 9 07:24:49 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: hpacel.4,v 1.2 2011/07/13 08:38:16 wiz Exp $ +.\ $NetBSD: hpacel.4,v 1.3 2011/08/09 07:24:49 jruoho Exp $ .\ .\ Copyright (c) 2011 Jukka Ruohonen jruoho...@iki.fi .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd June 23, 2011 +.Dd August 9, 2011 .Dt HPACEL 4 .Os .Sh NAME @@ -61,7 +61,7 @@ .Xr wmihp 4 .Rs .%A STMicroelectronics -.%T TLIS3LV02DL: 3-Axis - \*(Pm\* 2g/\*(Pm\* 6g digital output \ +.%T LIS3LV02DL: 3-Axis - \*(Pm\* 2g/\*(Pm\* 6g digital output \ low voltage linear accelerometer. AN2381 Application Note .%N Revision 1 .%D June, 2006
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Tue Aug 9 07:33:02 UTC 2011 Modified Files: src/share/man/man4: acpi.4 Log Message: Add the USENIX paper of Watanabe. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/share/man/man4/acpi.4 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/man4/acpi.4 diff -u src/share/man/man4/acpi.4:1.71 src/share/man/man4/acpi.4:1.72 --- src/share/man/man4/acpi.4:1.71 Wed Jul 13 12:22:36 2011 +++ src/share/man/man4/acpi.4 Tue Aug 9 07:33:01 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: acpi.4,v 1.71 2011/07/13 12:22:36 jruoho Exp $ +.\ $NetBSD: acpi.4,v 1.72 2011/08/09 07:33:01 jruoho Exp $ .\ .\ Copyright (c) 2002, 2004, 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -623,6 +623,15 @@ .%P 127-134 .%U http://2008.asiabsdcon.org/papers/P9A-paper.pdf .Re +.Rs +.%A Takanori Watanabe +.%T ACPI Implementation on FreeBSD +.%I USENIX Association +.%B Proceedings of the FREENIX Track: 2002 USENIX Annual Technical Conference +.%P 121-131 +.%D June 10-15, 2002 +.%U http://www.usenix.org/event/usenix02/tech/freenix/full_papers/watanabe/watanabe.pdf +.Re .Sh HISTORY The .Nm
CVS commit: src/etc/rc.d
Module Name:src Committed By: mbalmer Date: Tue Aug 9 08:08:10 UTC 2011 Modified Files: src/etc/rc.d: wscons Log Message: Print 'Keyboard encoding - sg' instead of just 'encoding - sg' on the console. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/etc/rc.d/wscons Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/rc.d/wscons diff -u src/etc/rc.d/wscons:1.12 src/etc/rc.d/wscons:1.13 --- src/etc/rc.d/wscons:1.12 Mon Apr 2 12:42:42 2007 +++ src/etc/rc.d/wscons Tue Aug 9 08:08:10 2011 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: wscons,v 1.12 2007/04/02 12:42:42 mishka Exp $ +# $NetBSD: wscons,v 1.13 2011/08/09 08:08:10 mbalmer Exp $ # # PROVIDE: wscons @@ -132,6 +132,7 @@ encoding) map=$arg1 cmd=$wsctl -w \encoding=$map\ +echo -n 'Keyboard ' eval $DOIT $cmd ;;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: mbalmer Date: Tue Aug 9 08:26:19 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add the QUANCOM PWDOG1. To generate a diff of this commit: cvs rdiff -u -r1.1092 -r1.1093 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1092 src/sys/dev/pci/pcidevs:1.1093 --- src/sys/dev/pci/pcidevs:1.1092 Sat Aug 6 14:53:24 2011 +++ src/sys/dev/pci/pcidevs Tue Aug 9 08:26:18 2011 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1092 2011/08/06 14:53:24 jakllsch Exp $ +$NetBSD: pcidevs,v 1.1093 2011/08/09 08:26:18 mbalmer Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3902,6 +3902,9 @@ product QLOGIC ISP2100 0x2100 ISP2100 product QLOGIC QLA200 0x0119 QLA200 +/* QUANCOM Electronic GmbH products */ +product QUANCOM PWDOG1 0x0010 PWDOG1 + /* Quantum Designs products */ product QUANTUMDESIGNS 8500 0x0001 8500 product QUANTUMDESIGNS 8580 0x0002 8580
CVS commit: src
Module Name:src
Committed By: jruoho
Date: Tue Aug 9 08:36:05 UTC 2011
Modified Files:
src/distrib/sets/lists/modules: md.amd64
src/sys/modules: Makefile
Log Message:
As wmieeepc(4) was added to amd64 GENERIC, build it also as a amd64 module.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.82 -r1.83 src/sys/modules/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/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.25 src/distrib/sets/lists/modules/md.amd64:1.26
--- src/distrib/sets/lists/modules/md.amd64:1.25 Sun Jul 31 17:55:41 2011
+++ src/distrib/sets/lists/modules/md.amd64 Tue Aug 9 08:36:05 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.25 2011/07/31 17:55:41 jmcneill Exp $
+# $NetBSD: md.amd64,v 1.26 2011/08/09 08:36:05 jruoho Exp $
./@MODULEDIR@/acpiacadbase-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibatbase-kernel-modules kmod
@@ -83,6 +83,8 @@
./@MODULEDIR@/tprof_pmi/tprof_pmi.kmod base-kernel-modules kmod
./@MODULEDIR@/wmidellbase-kernel-modules kmod
./@MODULEDIR@/wmidell/wmidell.kmod base-kernel-modules kmod
+./@MODULEDIR@/wmieeepcbase-kernel-modules kmod
+./@MODULEDIR@/wmieeepc/wmieeepc.kmod base-kernel-modules kmod
./@MODULEDIR@/wmihpbase-kernel-modules kmod
./@MODULEDIR@/wmihp/wmihp.kmod base-kernel-modules kmod
./@MODULEDIR@/wmimsibase-kernel-modules kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.82 src/sys/modules/Makefile:1.83
--- src/sys/modules/Makefile:1.82 Tue Aug 9 01:42:24 2011
+++ src/sys/modules/Makefile Tue Aug 9 08:36:05 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2011/08/09 01:42:24 jmcneill Exp $
+# $NetBSD: Makefile,v 1.83 2011/08/09 08:36:05 jruoho Exp $
.include bsd.own.mk
@@ -130,6 +130,7 @@
SUBDIR+= hpqlb
SUBDIR+= thinkpad
SUBDIR+= wmidell
+SUBDIR+= wmieeepc
SUBDIR+= wmihp
SUBDIR+= wmimsi
.endif
@@ -158,7 +159,6 @@
SUBDIR+= pad
SUBDIR+= padlock
SUBDIR+= viac7temp
-SUBDIR+= wmieeepc
.endif
.if ${MACHINE_ARCH} == i386 || \
CVS commit: src/lib/libperfuse
Module Name:src
Committed By: manu
Date: Tue Aug 9 09:06:52 UTC 2011
Modified Files:
src/lib/libperfuse: ops.c
Log Message:
Fix uninitiaized variable usage (never though lint would miss that when
used by return statement) that caused unprivilegied user to fail on
unlink(2) and rename(2) operations.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/lib/libperfuse/ops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.37 src/lib/libperfuse/ops.c:1.38
--- src/lib/libperfuse/ops.c:1.37 Tue Aug 2 16:57:16 2011
+++ src/lib/libperfuse/ops.c Tue Aug 9 09:06:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.37 2011/08/02 16:57:16 manu Exp $ */
+/* $NetBSD: ops.c,v 1.38 2011/08/09 09:06:52 manu Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -241,7 +241,7 @@
{
uid_t uid;
struct puffs_node *tdir;
- int sticky, owner, error;
+ int sticky, owner;
tdir = PERFUSE_NODE_DATA(targ)-pnd_parent;
@@ -264,9 +264,9 @@
owner = puffs_pn_getvap(targ)-va_uid == uid;
if (sticky !owner)
- error = EACCES;
+ return EACCES;
- return error;
+ return 0;
}
CVS commit: src/sbin/newfs_v7fs
Module Name:src
Committed By: uch
Date: Tue Aug 9 09:12:07 UTC 2011
Modified Files:
src/sbin/newfs_v7fs: main.c
Log Message:
Check whether superblock is writable sector.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sbin/newfs_v7fs/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/newfs_v7fs/main.c
diff -u src/sbin/newfs_v7fs/main.c:1.7 src/sbin/newfs_v7fs/main.c:1.8
--- src/sbin/newfs_v7fs/main.c:1.7 Fri Jul 22 09:15:10 2011
+++ src/sbin/newfs_v7fs/main.c Tue Aug 9 09:12:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.7 2011/07/22 09:15:10 uch Exp $ */
+/* $NetBSD: main.c,v 1.8 2011/08/09 09:12:07 uch Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: main.c,v 1.7 2011/07/22 09:15:10 uch Exp $);
+__RCSID($NetBSD: main.c,v 1.8 2011/08/09 09:12:07 uch Exp $);
#endif /* not lint */
#include sys/param.h
@@ -72,6 +72,26 @@
}
static int
+partition_check(struct v7fs_self *fs)
+{
+ struct v7fs_superblock *sb = fs-superblock;
+ int error;
+
+ if ((error = v7fs_superblock_load(fs))) {
+ warnx(Can't read superblock sector.);
+ }
+ sb-modified = 1;
+ if ((error = v7fs_superblock_writeback(fs))) {
+ if (errno == EROFS) {
+ warnx(Overwriting disk label? );
+ }
+ warnx(Can't write superblock sector.);
+ }
+
+ return error;
+}
+
+static int
make_root(struct v7fs_self *fs)
{
struct v7fs_inode inode;
@@ -126,7 +146,7 @@
v7fs_inode_writeback(fs, inode);
if ((error = v7fs_superblock_writeback(fs))) {
errno = error;
- warn(Can't write superblock.);
+ warnx(Can't write superblock.);
}
return error;
@@ -272,6 +292,10 @@
fs-endian = mount-endian;
v7fs_endian_init(fs);
+ if ((error = partition_check(fs))) {
+ return error;
+ }
+
/* Construct filesystem. */
if ((error = make_filesystem(fs, volume_size, ilist_size))) {
return error;
CVS commit: src/sys/dev
Module Name:src Committed By: jmcneill Date: Tue Aug 9 10:53:10 UTC 2011 Modified Files: src/sys/dev/i2c: lg3303.c Added Files: src/sys/dev/dtv: dtv_math.h Log Message: add dtv_math.h To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/dev/dtv/dtv_math.h cvs rdiff -u -r1.5 -r1.6 src/sys/dev/i2c/lg3303.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/i2c/lg3303.c diff -u src/sys/dev/i2c/lg3303.c:1.5 src/sys/dev/i2c/lg3303.c:1.6 --- src/sys/dev/i2c/lg3303.c:1.5 Fri Jul 15 20:28:38 2011 +++ src/sys/dev/i2c/lg3303.c Tue Aug 9 10:53:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lg3303.c,v 1.5 2011/07/15 20:28:38 jmcneill Exp $ */ +/* $NetBSD: lg3303.c,v 1.6 2011/08/09 10:53:09 jmcneill Exp $ */ /*- * Copyright 2007 Jason Harmening @@ -28,7 +28,7 @@ */ #include sys/param.h -__KERNEL_RCSID(0, $NetBSD: lg3303.c,v 1.5 2011/07/15 20:28:38 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: lg3303.c,v 1.6 2011/08/09 10:53:09 jmcneill Exp $); #include sys/types.h #include sys/kmem.h @@ -38,6 +38,7 @@ #include dev/i2c/i2cvar.h #include dev/i2c/lg3303var.h #include dev/dtv/dtvif.h +#include dev/dtv/dtv_math.h #define REG_TOP_CONTROL 0x00 #define REG_IRQ_MASK0x01 Added files: Index: src/sys/dev/dtv/dtv_math.h diff -u /dev/null src/sys/dev/dtv/dtv_math.h:1.1 --- /dev/null Tue Aug 9 10:53:10 2011 +++ src/sys/dev/dtv/dtv_math.h Tue Aug 9 10:53:10 2011 @@ -0,0 +1,40 @@ +/* $NetBSD: dtv_math.h,v 1.1 2011/08/09 10:53:10 jmcneill Exp $ */ + +/*- + * Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca + * All rights reserved. + * + * 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. + * 3. All advertising materials mentioning features or use of this software + *must display the following acknowledgement: + *This product includes software developed by Jared D. McNeill. + * 4. Neither the name of The NetBSD Foundation nor the names of its + *contributors may be used to endorse or promote products derived + *from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _DEV_DTV_DTV_MATH_H +#define _DEV_DTV_DTV_MATH_H + +uint32_t dtv_intlog10(uint32_t); + +#endif /* !_DEV_DTV_DTV_MATH_H */
CVS commit: src/sys/dev/i2c
Module Name:src Committed By: jmcneill Date: Tue Aug 9 10:54:22 UTC 2011 Modified Files: src/sys/dev/i2c: lg3303.c xc3028.c Log Message: lg3303 should depend on dtv_math, not xc3028 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/i2c/lg3303.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/i2c/xc3028.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/i2c/lg3303.c diff -u src/sys/dev/i2c/lg3303.c:1.6 src/sys/dev/i2c/lg3303.c:1.7 --- src/sys/dev/i2c/lg3303.c:1.6 Tue Aug 9 10:53:09 2011 +++ src/sys/dev/i2c/lg3303.c Tue Aug 9 10:54:22 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lg3303.c,v 1.6 2011/08/09 10:53:09 jmcneill Exp $ */ +/* $NetBSD: lg3303.c,v 1.7 2011/08/09 10:54:22 jmcneill Exp $ */ /*- * Copyright 2007 Jason Harmening @@ -28,7 +28,7 @@ */ #include sys/param.h -__KERNEL_RCSID(0, $NetBSD: lg3303.c,v 1.6 2011/08/09 10:53:09 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: lg3303.c,v 1.7 2011/08/09 10:54:22 jmcneill Exp $); #include sys/types.h #include sys/kmem.h @@ -351,7 +351,7 @@ return (buffer[0] 8) | buffer[1]; } -MODULE(MODULE_CLASS_DRIVER, lg3303, NULL); +MODULE(MODULE_CLASS_DRIVER, lg3303, dtv_math); static int lg3303_modcmd(modcmd_t cmd, void *opaque) Index: src/sys/dev/i2c/xc3028.c diff -u src/sys/dev/i2c/xc3028.c:1.3 src/sys/dev/i2c/xc3028.c:1.4 --- src/sys/dev/i2c/xc3028.c:1.3 Tue Aug 9 01:42:24 2011 +++ src/sys/dev/i2c/xc3028.c Tue Aug 9 10:54:22 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: xc3028.c,v 1.3 2011/08/09 01:42:24 jmcneill Exp $ */ +/* $NetBSD: xc3028.c,v 1.4 2011/08/09 10:54:22 jmcneill Exp $ */ /*- * Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: xc3028.c,v 1.3 2011/08/09 01:42:24 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: xc3028.c,v 1.4 2011/08/09 10:54:22 jmcneill Exp $); #include sys/param.h #include sys/systm.h @@ -564,7 +564,7 @@ return 0; } -MODULE(MODULE_CLASS_DRIVER, xc3028, dtv_math); +MODULE(MODULE_CLASS_DRIVER, xc3028, NULL); static int xc3028_modcmd(modcmd_t cmd, void *opaque)
CVS commit: src
Module Name:src Committed By: jmcneill Date: Tue Aug 9 11:12:02 UTC 2011 Modified Files: src/distrib/sets/lists/modules: md.amd64 md.i386 src/sys/modules: Makefile Log Message: include cx24227, lg3303, mt2131, nxt2k, tvpll, xc3028, coram, cxdtv, and emdtv modules in x86 build To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.83 -r1.84 src/sys/modules/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/modules/md.amd64 diff -u src/distrib/sets/lists/modules/md.amd64:1.26 src/distrib/sets/lists/modules/md.amd64:1.27 --- src/distrib/sets/lists/modules/md.amd64:1.26 Tue Aug 9 08:36:05 2011 +++ src/distrib/sets/lists/modules/md.amd64 Tue Aug 9 11:12:02 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.26 2011/08/09 08:36:05 jruoho Exp $ +# $NetBSD: md.amd64,v 1.27 2011/08/09 11:12:02 jmcneill Exp $ ./@MODULEDIR@/acpiacadbase-kernel-modules kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod ./@MODULEDIR@/acpibatbase-kernel-modules kmod @@ -45,8 +45,16 @@ ./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules kmod ./@MODULEDIR@/coretempbase-kernel-modules kmod ./@MODULEDIR@/coretemp/coretemp.kmod base-kernel-modules kmod +./@MODULEDIR@/corambase-kernel-modules kmod +./@MODULEDIR@/coram/coram.kmod base-kernel-modules kmod +./@MODULEDIR@/cx24227base-kernel-modules kmod +./@MODULEDIR@/cx24227/cx24227.kmod base-kernel-modules kmod +./@MODULEDIR@/cxdtvbase-kernel-modules kmod +./@MODULEDIR@/cxdtv/cxdtv.kmod base-kernel-modules kmod ./@MODULEDIR@/drmbase-kernel-modules kmod ./@MODULEDIR@/drm/drm.kmod base-kernel-modules kmod +./@MODULEDIR@/emdtvbase-kernel-modules kmod +./@MODULEDIR@/emdtv/emdtv.kmod base-kernel-modules kmod ./@MODULEDIR@/estbase-kernel-modules kmod ./@MODULEDIR@/est/est.kmod base-kernel-modules kmod ./@MODULEDIR@/exec_elf32 base-kernel-modules kmod @@ -69,6 +77,12 @@ ./@MODULEDIR@/i915drm/i915drm.kmod base-kernel-modules kmod ./@MODULEDIR@/itesiobase-kernel-modules kmod ./@MODULEDIR@/itesio/itesio.kmod base-kernel-modules kmod +./@MODULEDIR@/lg3303base-kernel-modules kmod +./@MODULEDIR@/lg3303/lg3303.kmod base-kernel-modules kmod +./@MODULEDIR@/mt2131base-kernel-modules kmod +./@MODULEDIR@/mt2131/mt2131.kmod base-kernel-modules kmod +./@MODULEDIR@/nxt2kbase-kernel-modules kmod +./@MODULEDIR@/nxt2k/nxt2k.kmod base-kernel-modules kmod ./@MODULEDIR@/odcmbase-kernel-modules kmod ./@MODULEDIR@/odcm/odcm.kmod base-kernel-modules kmod ./@MODULEDIR@/padbase-kernel-modules kmod @@ -81,6 +95,8 @@ ./@MODULEDIR@/tprof_amdpmi/tprof_amdpmi.kmod base-kernel-modules kmod ./@MODULEDIR@/tprof_pmibase-kernel-modules kmod ./@MODULEDIR@/tprof_pmi/tprof_pmi.kmod base-kernel-modules kmod +./@MODULEDIR@/tvpllbase-kernel-modules kmod +./@MODULEDIR@/tvpll/tvpll.kmod base-kernel-modules kmod ./@MODULEDIR@/wmidellbase-kernel-modules kmod ./@MODULEDIR@/wmidell/wmidell.kmod base-kernel-modules kmod ./@MODULEDIR@/wmieeepcbase-kernel-modules kmod @@ -89,5 +105,7 @@ ./@MODULEDIR@/wmihp/wmihp.kmod base-kernel-modules kmod ./@MODULEDIR@/wmimsibase-kernel-modules kmod ./@MODULEDIR@/wmimsi/wmimsi.kmod base-kernel-modules kmod +./@MODULEDIR@/xc3028base-kernel-modules kmod +./@MODULEDIR@/xc3028/xc3028.kmod base-kernel-modules kmod ./@MODULEDIR@/xc5kbase-kernel-modules kmod ./@MODULEDIR@/xc5k/xc5k.kmod base-kernel-modules kmod Index: src/distrib/sets/lists/modules/md.i386 diff -u src/distrib/sets/lists/modules/md.i386:1.30 src/distrib/sets/lists/modules/md.i386:1.31 --- src/distrib/sets/lists/modules/md.i386:1.30 Sun Jul 31 17:55:41 2011 +++ src/distrib/sets/lists/modules/md.i386 Tue Aug 9 11:12:02 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.30 2011/07/31 17:55:41 jmcneill Exp $ +# $NetBSD: md.i386,v 1.31 2011/08/09 11:12:02 jmcneill Exp $ ./@MODULEDIR@/acpiacadbase-kernel-modules kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod ./@MODULEDIR@/acpibatbase-kernel-modules kmod @@ -45,10 +45,18 @@ ./@MODULEDIR@/compat_linux/compat_linux.kmod base-kernel-modules kmod ./@MODULEDIR@/compat_svr4 base-kernel-modules kmod ./@MODULEDIR@/compat_svr4/compat_svr4.kmod base-kernel-modules kmod +./@MODULEDIR@/corambase-kernel-modules kmod +./@MODULEDIR@/coram/coram.kmod base-kernel-modules kmod ./@MODULEDIR@/coretempbase-kernel-modules kmod ./@MODULEDIR@/coretemp/coretemp.kmod base-kernel-modules kmod +./@MODULEDIR@/cx24227base-kernel-modules kmod +./@MODULEDIR@/cx24227/cx24227.kmod base-kernel-modules kmod +./@MODULEDIR@/cxdtvbase-kernel-modules kmod +./@MODULEDIR@/cxdtv/cxdtv.kmod base-kernel-modules kmod ./@MODULEDIR@/drm
CVS commit: src/sbin/newfs_v7fs
Module Name:src
Committed By: uch
Date: Tue Aug 9 11:18:29 UTC 2011
Modified Files:
src/sbin/newfs_v7fs: main.c
Log Message:
Fix warning message.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/newfs_v7fs/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/newfs_v7fs/main.c
diff -u src/sbin/newfs_v7fs/main.c:1.8 src/sbin/newfs_v7fs/main.c:1.9
--- src/sbin/newfs_v7fs/main.c:1.8 Tue Aug 9 09:12:07 2011
+++ src/sbin/newfs_v7fs/main.c Tue Aug 9 11:18:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.8 2011/08/09 09:12:07 uch Exp $ */
+/* $NetBSD: main.c,v 1.9 2011/08/09 11:18:28 uch Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: main.c,v 1.8 2011/08/09 09:12:07 uch Exp $);
+__RCSID($NetBSD: main.c,v 1.9 2011/08/09 11:18:28 uch Exp $);
#endif /* not lint */
#include sys/param.h
@@ -78,7 +78,10 @@
int error;
if ((error = v7fs_superblock_load(fs))) {
- warnx(Can't read superblock sector.);
+ if (error != EINVAL) {
+ /* Invalid superblock information is OK. */
+ warnx(Can't read superblock sector.);
+ }
}
sb-modified = 1;
if ((error = v7fs_superblock_writeback(fs))) {
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jmcneill Date: Tue Aug 9 11:26:40 UTC 2011 Modified Files: src/sys/dev/pci: cx23885reg.h Log Message: add CLK_DELAY To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/cx23885reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/cx23885reg.h diff -u src/sys/dev/pci/cx23885reg.h:1.1 src/sys/dev/pci/cx23885reg.h:1.2 --- src/sys/dev/pci/cx23885reg.h:1.1 Thu Aug 4 14:43:55 2011 +++ src/sys/dev/pci/cx23885reg.h Tue Aug 9 11:26:40 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cx23885reg.h,v 1.1 2011/08/04 14:43:55 jakllsch Exp $ */ +/* $NetBSD: cx23885reg.h,v 1.2 2011/08/09 11:26:40 jmcneill Exp $ */ /* * Copyright (c) 2008, 2011 Jonathan A. Kollasch @@ -55,6 +55,7 @@ #define GPIO_ISM 0x110014 #define SOFT_RESET 0x11001c +#define CLK_DELAY 0x110048 #define PAD_CTRL 0x11004c /* Video C Interface */
CVS commit: src/sys/modules
Module Name:src
Committed By: jruoho
Date: Tue Aug 9 12:09:56 UTC 2011
Modified Files:
src/sys/modules: Makefile
Log Message:
Two placeholder comments.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/modules/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.84 src/sys/modules/Makefile:1.85
--- src/sys/modules/Makefile:1.84 Tue Aug 9 11:12:02 2011
+++ src/sys/modules/Makefile Tue Aug 9 12:09:55 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2011/08/09 11:12:02 jmcneill Exp $
+# $NetBSD: Makefile,v 1.85 2011/08/09 12:09:55 jruoho Exp $
.include bsd.own.mk
@@ -101,6 +101,9 @@
SUBDIR+= tprof_amdpmi
.endif
+#
+# ACPI modules
+#
.if ${MACHINE_ARCH} == i386 || \
${MACHINE_ARCH} == ia64 || \
${MACHINE_ARCH} == x86_64
@@ -159,6 +162,9 @@
SUBDIR+= viac7temp
.endif
+#
+# ISA modules
+#
.if ${MACHINE_ARCH} == i386 || \
${MACHINE_ARCH} == x86_64
SUBDIR+= aps
CVS commit: src
Module Name:src Committed By: jruoho Date: Tue Aug 9 12:16:04 UTC 2011 Modified Files: src/distrib/sets/lists/modules: md.amd64 md.i386 src/sys/modules: Makefile Log Message: Build acpiwdrt(4) as a module on x86. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.85 -r1.86 src/sys/modules/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/modules/md.amd64 diff -u src/distrib/sets/lists/modules/md.amd64:1.27 src/distrib/sets/lists/modules/md.amd64:1.28 --- src/distrib/sets/lists/modules/md.amd64:1.27 Tue Aug 9 11:12:02 2011 +++ src/distrib/sets/lists/modules/md.amd64 Tue Aug 9 12:16:03 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.27 2011/08/09 11:12:02 jmcneill Exp $ +# $NetBSD: md.amd64,v 1.28 2011/08/09 12:16:03 jruoho Exp $ ./@MODULEDIR@/acpiacadbase-kernel-modules kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod ./@MODULEDIR@/acpibatbase-kernel-modules kmod @@ -21,6 +21,8 @@ ./@MODULEDIR@/acpiverbose/acpiverbose.kmod base-kernel-modules kmod ./@MODULEDIR@/acpivgabase-kernel-modules kmod ./@MODULEDIR@/acpivga/acpivga.kmod base-kernel-modules kmod +./@MODULEDIR@/acpiwdrtbase-kernel-modules kmod +./@MODULEDIR@/acpiwdrt/acpiwdrt.kmod base-kernel-modules kmod ./@MODULEDIR@/acpiwmibase-kernel-modules kmod ./@MODULEDIR@/acpiwmi/acpiwmi.kmod base-kernel-modules kmod ./@MODULEDIR@/aibsbase-kernel-modules kmod Index: src/distrib/sets/lists/modules/md.i386 diff -u src/distrib/sets/lists/modules/md.i386:1.31 src/distrib/sets/lists/modules/md.i386:1.32 --- src/distrib/sets/lists/modules/md.i386:1.31 Tue Aug 9 11:12:02 2011 +++ src/distrib/sets/lists/modules/md.i386 Tue Aug 9 12:16:03 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.31 2011/08/09 11:12:02 jmcneill Exp $ +# $NetBSD: md.i386,v 1.32 2011/08/09 12:16:03 jruoho Exp $ ./@MODULEDIR@/acpiacadbase-kernel-modules kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod ./@MODULEDIR@/acpibatbase-kernel-modules kmod @@ -21,6 +21,8 @@ ./@MODULEDIR@/acpiverbose/acpiverbose.kmod base-kernel-modules kmod ./@MODULEDIR@/acpivgabase-kernel-modules kmod ./@MODULEDIR@/acpivga/acpivga.kmod base-kernel-modules kmod +./@MODULEDIR@/acpiwdrtbase-kernel-modules kmod +./@MODULEDIR@/acpiwdrt/acpiwdrt.kmod base-kernel-modules kmod ./@MODULEDIR@/acpiwmibase-kernel-modules kmod ./@MODULEDIR@/acpiwmi/acpiwmi.kmod base-kernel-modules kmod ./@MODULEDIR@/aibsbase-kernel-modules kmod Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.85 src/sys/modules/Makefile:1.86 --- src/sys/modules/Makefile:1.85 Tue Aug 9 12:09:55 2011 +++ src/sys/modules/Makefile Tue Aug 9 12:16:03 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2011/08/09 12:09:55 jruoho Exp $ +# $NetBSD: Makefile,v 1.86 2011/08/09 12:16:03 jruoho Exp $ .include bsd.own.mk @@ -122,6 +122,7 @@ SUBDIR+= acpipmtr SUBDIR+= acpitz SUBDIR+= acpivga +SUBDIR+= acpiwdrt SUBDIR+= acpiwmi SUBDIR+= aibs SUBDIR+= asus
CVS commit: src/external/bsd/llvm
Module Name:src
Committed By: joerg
Date: Tue Aug 9 12:30:47 UTC 2011
Modified Files:
src/external/bsd/llvm: Makefile.inc
src/external/bsd/llvm/bin/clang: Makefile
src/external/bsd/llvm/lib/libLLVMipo: Makefile
src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers: Makefile
Log Message:
Update LLVM/Clang snapshot to r137038. This brings in the extended array
boundary checker and the white listing of pre-c99 flexible array member
idiom foo[1] as last element of a struct.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/llvm/bin/clang/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/llvm/lib/libLLVMipo/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/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/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.19 src/external/bsd/llvm/Makefile.inc:1.20
--- src/external/bsd/llvm/Makefile.inc:1.19 Tue Aug 2 17:12:38 2011
+++ src/external/bsd/llvm/Makefile.inc Tue Aug 9 12:30:46 2011
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.19 2011/08/02 17:12:38 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.20 2011/08/09 12:30:46 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
.include bsd.own.mk
-LLVM_REVISION= 136592
-CLANG_REVISION= 136592
+LLVM_REVISION= 137038
+CLANG_REVISION= 137038
LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm
CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang
Index: src/external/bsd/llvm/bin/clang/Makefile
diff -u src/external/bsd/llvm/bin/clang/Makefile:1.14 src/external/bsd/llvm/bin/clang/Makefile:1.15
--- src/external/bsd/llvm/bin/clang/Makefile:1.14 Sun Jul 17 20:07:57 2011
+++ src/external/bsd/llvm/bin/clang/Makefile Tue Aug 9 12:30:47 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2011/07/17 20:07:57 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2011/08/09 12:30:47 joerg Exp $
PROG_CXX= clang
NOMAN= yes
@@ -36,6 +36,7 @@
clangBasic
LLVM_LIBS+= \
+ ipo \
AsmParser \
BitReader \
BitWriter \
@@ -72,7 +73,6 @@
MCDisassembler \
MCParser \
MC \
- ipo \
TransformsUtils \
ipa \
Core \
Index: src/external/bsd/llvm/lib/libLLVMipo/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMipo/Makefile:1.3 src/external/bsd/llvm/lib/libLLVMipo/Makefile:1.4
--- src/external/bsd/llvm/lib/libLLVMipo/Makefile:1.3 Wed Jul 13 23:48:30 2011
+++ src/external/bsd/llvm/lib/libLLVMipo/Makefile Tue Aug 9 12:30:47 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/07/13 23:48:30 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/09 12:30:47 joerg Exp $
LIB= LLVMipo
@@ -20,9 +20,9 @@
Inliner.cpp \
Internalize.cpp \
LoopExtractor.cpp \
- LowerSetJmp.cpp \
MergeFunctions.cpp \
PartialInlining.cpp \
+ PassManagerBuilder.cpp \
PruneEH.cpp \
StripDeadPrototypes.cpp \
StripSymbols.cpp
Index: src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile
diff -u src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile:1.4 src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile:1.5
--- src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile:1.4 Fri Mar 18 23:32:04 2011
+++ src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile Tue Aug 9 12:30:47 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/03/18 23:32:04 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2011/08/09 12:30:47 joerg Exp $
LIB= clangStaticAnalyzerCheckers
@@ -31,8 +31,10 @@
IdempotentOperationChecker.cpp \
IteratorsChecker.cpp \
LLVMConventionsChecker.cpp \
+ MacOSKeychainAPIChecker.cpp \
MacOSXAPIChecker.cpp \
MallocChecker.cpp \
+ MallocOverflowSecurityChecker.cpp \
NSAutoreleasePoolChecker.cpp \
NSErrorChecker.cpp \
NoReturnFunctionChecker.cpp \
CVS commit: src
Module Name:src
Committed By: joerg
Date: Tue Aug 9 12:55:19 UTC 2011
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSCore: DNSCommon.c
src/sbin/ping: ping.c
Log Message:
Don't use array access to compute addresses that are definitely beyond
the static array boundaries.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
cvs rdiff -u -r1.93 -r1.94 src/sbin/ping/ping.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/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.1.1.1 src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.2
--- src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.1.1.1 Tue Sep 29 22:14:07 2009
+++ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c Tue Aug 9 12:55:18 2011
@@ -2635,7 +2635,7 @@
case kDNSType_OPT: {
rdataOPT *opt = rr-resrec.rdata-u.opt;
rr-resrec.rdlength = 0;
- while (ptr end (mDNSu8 *)(opt+1) rr-resrec.rdata-u.data[MaximumRDSize])
+ while (ptr end (mDNSu8 *)(opt+1) rr-resrec.rdata-u.data + MaximumRDSize)
{
if (ptr + 4 end) { LogMsg(GetLargeResourceRecord: OPT RDATA ptr + 4 end); return(mDNSNULL); }
opt-opt= getVal16(ptr);
Index: src/sbin/ping/ping.c
diff -u src/sbin/ping/ping.c:1.93 src/sbin/ping/ping.c:1.94
--- src/sbin/ping/ping.c:1.93 Fri Mar 11 09:59:56 2011
+++ src/sbin/ping/ping.c Tue Aug 9 12:55:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ping.c,v 1.93 2011/03/11 09:59:56 pooka Exp $ */
+/* $NetBSD: ping.c,v 1.94 2011/08/09 12:55:19 joerg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -58,7 +58,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: ping.c,v 1.93 2011/03/11 09:59:56 pooka Exp $);
+__RCSID($NetBSD: ping.c,v 1.94 2011/08/09 12:55:19 joerg Exp $);
#endif
#include stdio.h
@@ -1069,8 +1069,8 @@
/* check the data */
if (datalen (int)PHDR_LEN
!(pingflags F_PING_RANDOM)
- memcmp(icp-icmp_data[PHDR_LEN],
- opack_icmp.icmp_data[PHDR_LEN],
+ memcmp(icp-icmp_data + PHDR_LEN,
+ opack_icmp.icmp_data + PHDR_LEN,
datalen-PHDR_LEN)) {
for (i=PHDR_LEN; idatalen; i++) {
if (icp-icmp_data[i] !=
CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src
Committed By: joerg
Date: Tue Aug 9 12:56:42 UTC 2011
Modified Files:
src/external/gpl3/gcc/usr.bin/cc1: Makefile
src/external/gpl3/gcc/usr.bin/cc1obj: Makefile
src/external/gpl3/gcc/usr.bin/cc1plus: Makefile
Log Message:
Since cproj and friends are used, link explicitly against libm.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/cc1/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/cc1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.4 src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.5
--- src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.4 Thu Jul 21 03:13:32 2011
+++ src/external/gpl3/gcc/usr.bin/cc1/Makefile Tue Aug 9 12:56:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/07/21 03:13:32 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/08/09 12:56:41 joerg Exp $
PROG= cc1
SRCS= ${G_C_OBJS:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -13,7 +13,7 @@
COPTS+= -Wno-stack-protector
-LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz
-DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ}
+LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm
+DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM}
.PATH: ${DIST}/gcc ${G_out_file:H}
Index: src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.4 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.5
--- src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.4 Thu Jul 21 03:13:32 2011
+++ src/external/gpl3/gcc/usr.bin/cc1obj/Makefile Tue Aug 9 12:56:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/07/21 03:13:32 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/08/09 12:56:41 joerg Exp $
MYOBJS= ${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS}
PROG= cc1obj
@@ -16,7 +16,7 @@
COPTS+= -Wno-stack-protector
-LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz
-DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ}
+LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm
+DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM}
.PATH: ${DIST}/gcc/objc ${DIST}/gcc ${G_out_file:H}
Index: src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.4 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.5
--- src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.4 Thu Jul 21 03:13:32 2011
+++ src/external/gpl3/gcc/usr.bin/cc1plus/Makefile Tue Aug 9 12:56:42 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/07/21 03:13:32 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/08/09 12:56:42 joerg Exp $
PROG= cc1plus
SRCS= ${G_CXX_OBJS:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -16,7 +16,7 @@
# YUCK. but see timevar.h:POP_TIMEVAR_AND_RETURN
CFLAGS+= -Wno-error # not good enough: -Wno-return-type
-LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz
-DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ}
+LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm
+DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM}
.PATH: ${DIST}/gcc/cp ${DIST}/gcc ${G_out_file:H}
CVS commit: src/external/gpl3/gcc/lib/libiberty
Module Name:src
Committed By: joerg
Date: Tue Aug 9 12:58:55 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/libiberty: Makefile
Log Message:
Disable -Wunused-value for clang, it triggers on the bcopy replacement.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libiberty/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libiberty/Makefile
diff -u src/external/gpl3/gcc/lib/libiberty/Makefile:1.2 src/external/gpl3/gcc/lib/libiberty/Makefile:1.3
--- src/external/gpl3/gcc/lib/libiberty/Makefile:1.2 Thu Jun 23 11:47:12 2011
+++ src/external/gpl3/gcc/lib/libiberty/Makefile Tue Aug 9 12:58:55 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:12 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/08/09 12:58:55 joerg Exp $
LIBISPRIVATE= yes
@@ -22,6 +22,8 @@
COPTS.make-relative-prefix.c = -Wno-stack-protector
COPTS.regex.c = -Wno-stack-protector
+CWARNFLAGS.clang+= -Wno-unused-value
+
.PATH: ${DIST}/libiberty
.include bsd.lib.mk
CVS commit: src/external/gpl3/gcc/lib
Module Name:src
Committed By: joerg
Date: Tue Aug 9 13:00:05 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
src/external/gpl3/gcc/lib/libsupc++: Makefile
Log Message:
Can't build libstdc++ and libsupc++ with clang since it depends on using
volatiles as initializers of non-volatile fields, void * arithmetic and
some new attributes for the unwinding.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/libsupc++/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.4 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.5
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.4 Wed Jun 29 02:01:37 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Tue Aug 9 13:00:04 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/06/29 02:01:37 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/08/09 13:00:04 joerg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -10,6 +10,7 @@
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
+UNSUPPORTED_COMPILER.clang= # defined
CWARNFLAGS.clang+= -Wno-logical-op-parentheses \
-Wno-deprecated-writable-strings -Wno-parentheses
Index: src/external/gpl3/gcc/lib/libsupc++/Makefile
diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile:1.3 src/external/gpl3/gcc/lib/libsupc++/Makefile:1.4
--- src/external/gpl3/gcc/lib/libsupc++/Makefile:1.3 Tue Jun 28 04:03:16 2011
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile Tue Aug 9 13:00:04 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/06/28 04:03:16 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/09 13:00:04 joerg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -6,6 +6,7 @@
NOPROFILE= # defined
CWARNFLAGS.clang+= -Wno-parentheses
+UNSUPPORTED_COMPILER.clang= # defined
.include bsd.own.mk
CVS commit: src/external/bsd
Module Name:src
Committed By: joerg
Date: Tue Aug 9 13:00:59 UTC 2011
Modified Files:
src/external/bsd/fetch/lib: Makefile
src/external/bsd/ntp: Makefile.inc
Log Message:
-Wno-array-bounds is no longer needed for clang here
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/fetch/lib/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/fetch/lib/Makefile
diff -u src/external/bsd/fetch/lib/Makefile:1.6 src/external/bsd/fetch/lib/Makefile:1.7
--- src/external/bsd/fetch/lib/Makefile:1.6 Tue Jun 21 02:32:55 2011
+++ src/external/bsd/fetch/lib/Makefile Tue Aug 9 13:00:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/06/21 02:32:55 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2011/08/09 13:00:58 joerg Exp $
LIB= fetch
SRCS= fetch.c common.c ftp.c http.c file.c
@@ -40,5 +40,5 @@
.if ${HAVE_GCC} == 45
# XXX
-COPTS.ftp.c+= -Wno-array-bounds
+COPTS.ftp.c+= ${${ACTIVE_CC} == gcc:?-Wno-array-bounds:}
.endif
Index: src/external/bsd/ntp/Makefile.inc
diff -u src/external/bsd/ntp/Makefile.inc:1.6 src/external/bsd/ntp/Makefile.inc:1.7
--- src/external/bsd/ntp/Makefile.inc:1.6 Thu May 26 12:56:25 2011
+++ src/external/bsd/ntp/Makefile.inc Tue Aug 9 13:00:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2011/05/26 12:56:25 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.7 2011/08/09 13:00:59 joerg Exp $
.if !defined(NTP_MAKEFILE_INC)
NTP_MAKEFILE_INC=yes
@@ -6,7 +6,7 @@
USE_FORT?= yes # network client/server
CWARNFLAGS.clang+= -Wno-unneeded-internal-declaration \
- -Wno-format-security -Wno-array-bounds \
+ -Wno-format-security \
-Wno-parentheses -Wno-constant-logical-operand
WARNS?= 5
CVS commit: src/external/lgpl3/gmp/lib/libgmp
Module Name:src Committed By: joerg Date: Tue Aug 9 13:01:34 UTC 2011 Modified Files: src/external/lgpl3/gmp/lib/libgmp: Makefile Log Message: Requires -Wno-unused-value -Wno-tautological-compare when building with clang. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/lgpl3/gmp/lib/libgmp/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/lgpl3/gmp/lib/libgmp/Makefile diff -u src/external/lgpl3/gmp/lib/libgmp/Makefile:1.10 src/external/lgpl3/gmp/lib/libgmp/Makefile:1.11 --- src/external/lgpl3/gmp/lib/libgmp/Makefile:1.10 Thu Jul 21 03:13:30 2011 +++ src/external/lgpl3/gmp/lib/libgmp/Makefile Tue Aug 9 13:01:34 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2011/07/21 03:13:30 mrg Exp $ +# $NetBSD: Makefile,v 1.11 2011/08/09 13:01:34 joerg Exp $ .include bsd.init.mk @@ -189,3 +189,5 @@ .if defined(HAVE_GCC) || defined(HAVE_PCC) COPTS += -Wno-stack-protector .endif + +CWARNFLAGS.clang+= -Wno-unused-value -Wno-tautological-compare
CVS commit: src/gnu/usr.bin/gdb6
Module Name:src Committed By: joerg Date: Tue Aug 9 13:02:11 UTC 2011 Modified Files: src/gnu/usr.bin/gdb6: Makefile.inc Log Message: Passes relaxed array boundary checks with clang now. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/gnu/usr.bin/gdb6/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/gdb6/Makefile.inc diff -u src/gnu/usr.bin/gdb6/Makefile.inc:1.2 src/gnu/usr.bin/gdb6/Makefile.inc:1.3 --- src/gnu/usr.bin/gdb6/Makefile.inc:1.2 Thu May 26 12:56:28 2011 +++ src/gnu/usr.bin/gdb6/Makefile.inc Tue Aug 9 13:02:11 2011 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.inc,v 1.2 2011/05/26 12:56:28 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.3 2011/08/09 13:02:11 joerg Exp $ USE_LIBEDIT=no USE_TUI=yes WARNS?= 0 -CWARNFLAGS.clang+= -Wno-unused-value -Wno-conversion -Wno-array-bounds \ +CWARNFLAGS.clang+= -Wno-unused-value -Wno-conversion \ -Wno-switch-enum -Wno-parentheses -Wno-comment \ -Wno-tautological-compare -Wno-format-extra-args
CVS commit: src/sys/conf
Module Name:src
Committed By: joerg
Date: Tue Aug 9 13:02:53 UTC 2011
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Restrict -Wno-array-bounds to tulip.c with gcc.
To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.143 src/sys/conf/Makefile.kern.inc:1.144
--- src/sys/conf/Makefile.kern.inc:1.143 Thu Jul 28 13:42:16 2011
+++ src/sys/conf/Makefile.kern.inc Tue Aug 9 13:02:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.143 2011/07/28 13:42:16 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.144 2011/08/09 13:02:53 joerg Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -81,7 +81,7 @@
.endif
CWARNFLAGS.clang+= -Wno-unknown-pragmas -Wno-conversion \
- -Wno-self-assign -Wno-array-bounds
+ -Wno-self-assign
CFLAGS+= -ffreestanding -fno-zero-initialized-in-bss
CFLAGS+= ${DEBUG} ${COPTS}
@@ -518,7 +518,7 @@
# XXX ugly ugly to fix
.if defined(HAVE_GCC) ${HAVE_GCC} == 45
-CWARNFLAGS.tulip.c+= -Wno-array-bounds
+CWARNFLAGS.tulip.c+= ${${ACTIVE_CC} == gcc:?-Wno-array-bounds:}
CWARNFLAGS.radeonfb.c+= -Wno-cast-qual
CWARNFLAGS.dbcool.c+= -Wno-cast-qual
CWARNFLAGS.adb_kbd.c+= -Wno-cast-qual
CVS commit: src/lib/libc/db
Module Name:src
Committed By: joerg
Date: Tue Aug 9 13:03:36 UTC 2011
Modified Files:
src/lib/libc/db: Makefile.inc
Log Message:
libc passes the relaxed array boundary check in clang now.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/db/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/db/Makefile.inc
diff -u src/lib/libc/db/Makefile.inc:1.7 src/lib/libc/db/Makefile.inc:1.8
--- src/lib/libc/db/Makefile.inc:1.7 Thu May 26 12:56:29 2011
+++ src/lib/libc/db/Makefile.inc Tue Aug 9 13:03:36 2011
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.7 2011/05/26 12:56:29 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.8 2011/08/09 13:03:36 joerg Exp $
# @(#)Makefile.inc 8.2 (Berkeley) 2/21/94
#
CPPFLAGS+=-D__DBINTERFACE_PRIVATE
-CWARNFLAGS.clang+= -Wno-array-bounds
-
.include ${.CURDIR}/db/btree/Makefile.inc
.include ${.CURDIR}/db/db/Makefile.inc
.include ${.CURDIR}/db/hash/Makefile.inc
CVS commit: src/usr.sbin
Module Name:src
Committed By: joerg
Date: Tue Aug 9 13:04:28 UTC 2011
Modified Files:
src/usr.sbin/altq/altqd: Makefile
src/usr.sbin/dhcp: Makefile.inc
Log Message:
Passes with the relaxed array boundary check in clang
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/altq/altqd/Makefile
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/dhcp/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/altq/altqd/Makefile
diff -u src/usr.sbin/altq/altqd/Makefile:1.5 src/usr.sbin/altq/altqd/Makefile:1.6
--- src/usr.sbin/altq/altqd/Makefile:1.5 Wed Jun 22 05:23:54 2011
+++ src/usr.sbin/altq/altqd/Makefile Tue Aug 9 13:04:28 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/06/22 05:23:54 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2011/08/09 13:04:28 joerg Exp $
.include bsd.own.mk
@@ -20,5 +20,5 @@
# XXX
.if ${HAVE_GCC} == 45
-COPTS.altqd.c+= -Wno-array-bounds
+COPTS.altqd.c+= ${${ACTIVE_CC} == gcc:?-Wno-array-bounds:}
.endif
Index: src/usr.sbin/dhcp/Makefile.inc
diff -u src/usr.sbin/dhcp/Makefile.inc:1.25 src/usr.sbin/dhcp/Makefile.inc:1.26
--- src/usr.sbin/dhcp/Makefile.inc:1.25 Mon Jun 20 07:44:02 2011
+++ src/usr.sbin/dhcp/Makefile.inc Tue Aug 9 13:04:28 2011
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.25 2011/06/20 07:44:02 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.26 2011/08/09 13:04:28 joerg Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
.include bsd.own.mk
USE_FORT?= yes # network client/server
-CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-array-bounds \
+CWARNFLAGS.clang+= -Wno-tautological-compare \
-Wno-conversion -Wno-constant-logical-operand \
-Wno-format-security
CVS commit: src/usr.sbin/ipf
Module Name:src Committed By: joerg Date: Tue Aug 9 13:06:10 UTC 2011 Modified Files: src/usr.sbin/ipf: Makefile.inc Log Message: Requires -Wno-array-bounds with clang now. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/ipf/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/ipf/Makefile.inc diff -u src/usr.sbin/ipf/Makefile.inc:1.20 src/usr.sbin/ipf/Makefile.inc:1.21 --- src/usr.sbin/ipf/Makefile.inc:1.20 Thu May 26 12:56:34 2011 +++ src/usr.sbin/ipf/Makefile.inc Tue Aug 9 13:06:10 2011 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.inc,v 1.20 2011/05/26 12:56:34 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.21 2011/08/09 13:06:10 joerg Exp $ WARNS?= 1 # XXX -Wcast-qual -Wshadow CWARNFLAGS.clang+= -Wno-format -Wno-tautological-compare \ - -Wno-self-assign + -Wno-self-assign -Wno-array-bounds .include bsd.own.mk
CVS commit: src/external/historical/nawk/bin
Module Name:src Committed By: joerg Date: Tue Aug 9 13:06:31 UTC 2011 Modified Files: src/external/historical/nawk/bin: Makefile Log Message: No longer needs -Wno-array-bounds with clang. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/historical/nawk/bin/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/historical/nawk/bin/Makefile diff -u src/external/historical/nawk/bin/Makefile:1.6 src/external/historical/nawk/bin/Makefile:1.7 --- src/external/historical/nawk/bin/Makefile:1.6 Mon Jun 20 07:43:57 2011 +++ src/external/historical/nawk/bin/Makefile Tue Aug 9 13:06:31 2011 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2011/06/20 07:43:57 mrg Exp $ +# $NetBSD: Makefile,v 1.7 2011/08/09 13:06:31 joerg Exp $ WARNS?= 4 -CWARNFLAGS.clang+= -Wno-array-bounds -Wno-self-assign +CWARNFLAGS.clang+= -Wno-self-assign .include bsd.own.mk
CVS commit: src/tests/dev/raidframe
Module Name:src
Committed By: martin
Date: Tue Aug 9 13:48:56 UTC 2011
Modified Files:
src/tests/dev/raidframe: t_raid.sh
Log Message:
Add missing RUMP_SERVER export, so the normal test does not fail with
a stupid error.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/dev/raidframe/t_raid.sh
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/raidframe/t_raid.sh
diff -u src/tests/dev/raidframe/t_raid.sh:1.9 src/tests/dev/raidframe/t_raid.sh:1.10
--- src/tests/dev/raidframe/t_raid.sh:1.9 Fri Jul 29 19:57:38 2011
+++ src/tests/dev/raidframe/t_raid.sh Tue Aug 9 13:48:55 2011
@@ -1,5 +1,5 @@
#! /usr/bin/atf-sh
-# $NetBSD: t_raid.sh,v 1.9 2011/07/29 19:57:38 oster Exp $
+# $NetBSD: t_raid.sh,v 1.10 2011/08/09 13:48:55 martin Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -170,6 +170,7 @@
raid1_normal_body()
{
makecfg 1 2
+ export RUMP_SERVER=unix://sock
atf_check -s exit:0 ${raidserver} \
-d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE} \
-d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE} \
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jakllsch Date: Tue Aug 9 14:18:17 UTC 2011 Modified Files: src/sys/arch/i386/conf: MONOLITHIC Log Message: While the GENERIC/MONOLITHIC/MODULAR issue remains to be sorted out, MONOLITHIC is still a part of the release build and needs to remain config(1)urable. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/conf/MONOLITHIC 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/conf/MONOLITHIC diff -u src/sys/arch/i386/conf/MONOLITHIC:1.15 src/sys/arch/i386/conf/MONOLITHIC:1.16 --- src/sys/arch/i386/conf/MONOLITHIC:1.15 Sun Mar 6 17:08:26 2011 +++ src/sys/arch/i386/conf/MONOLITHIC Tue Aug 9 14:18:17 2011 @@ -1,68 +1,7 @@ -# $NetBSD: MONOLITHIC,v 1.15 2011/03/06 17:08:26 bouyer Exp $ +# $NetBSD: MONOLITHIC,v 1.16 2011/08/09 14:18:17 jakllsch Exp $ # -# Non MODULAR, used mostly as a reference as to what we modularized. +# Non MODULAR # include arch/i386/conf/GENERIC no options MODULAR - -options EXEC_AOUT # exec a.out binaries -options EXEC_ELF32 # exec ELF binaries -options EXEC_SCRIPT # exec #! scripts -options COREDUMP - -options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options AIO # POSIX asynchronous I/O, built as a module -options MQUEUE # POSIX messsage queues, built as a module - -options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility -options COMPAT_SVR4 # binary compatibility with SVR4 -options COMPAT_IBCS2 # binary compatibility with SCO and ISC -options COMPAT_LINUX # binary compatibility with Linux -options COMPAT_FREEBSD # binary compatibility with FreeBSD - -#file-system FFS # UFS -#file-system NFS # Network File System client -# File systems -file-system EXT2FS # second extended file system (linux) -file-system LFS # log-structured file system -file-system MFS # memory file system -file-system NTFS # Windows/NT file system (experimental) -file-system CD9660 # ISO 9660 + Rock Ridge file system -file-system MSDOSFS # MS-DOS file system -file-system FDESC # /dev/fd -file-system KERNFS # /kern -file-system NULLFS # loopback file system -file-system OVERLAY # overlay file system -file-system PROCFS # /proc -file-system UMAPFS # NULLFS + uid and gid remapping -file-system UNION # union file system -file-system CODA # Coda File System; also needs vcoda (below) -file-system SMBFS # experimental - CIFS; also needs nsmb (below) -file-system PTYFS # /dev/ptm support -file-system TMPFS # Efficient memory file-system -file-system PUFFS # Userspace file systems (e.g. ntfs-3g sshfs) - -options QUOTA # legacy UFS quotas -options QUOTA2 # new, in-filesystem UFS quotas - -options NFSSERVER - -options PPP_BSDCOMP # BSD-Compress compression support for PPP -options PPP_DEFLATE # Deflate compression support for PPP - -# NPF -#pseudo-device npf - -pseudo-device accf_data # dataready accept filter -pseudo-device accf_http # httpready accept filter - -pseudo-device vcoda 4 # coda minicache - venus comm. - -pseudo-device nsmb # experimental - SMB requester - -pseudo-device putter # for puffs and pud - -pseudo-device pad # pseudo audio device driver - -pseudo-device dm # device-mapper device driver
CVS commit: src/distrib/sets
Module Name:src
Committed By: jmcneill
Date: Tue Aug 9 15:02:30 UTC 2011
Modified Files:
src/distrib/sets: Makefile
Log Message:
when sorting the metalog for unpriv builds, first run it through sort so
mtree doesn't fail with:
nbmtree: .: missing directory in specification
nbmtree: failed at line 1 of the specification
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/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/Makefile
diff -u src/distrib/sets/Makefile:1.83 src/distrib/sets/Makefile:1.84
--- src/distrib/sets/Makefile:1.83 Wed Feb 16 06:14:01 2011
+++ src/distrib/sets/Makefile Tue Aug 9 15:02:30 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2011/02/16 06:14:01 uebayasi Exp $
+# $NetBSD: Makefile,v 1.84 2011/08/09 15:02:30 jmcneill Exp $
# Experimental RCS METALOG versioning
# (Needs host's rcs(1) commands)
@@ -124,7 +124,8 @@
METALOG.unpriv= -M ${METALOG}.sanitised
sanitise_METALOG: .PHONY ${METALOG}.sanitised
${METALOG}.sanitised: ${METALOG}
- ${TOOL_MTREE} -CSM -k all -N ${NETBSDSRCDIR}/etc ${METALOG} \
+ sort ${METALOG} | \
+ ${TOOL_MTREE} -CSM -k all -N ${NETBSDSRCDIR}/etc \
${METALOG}.new
mv ${METALOG}.new ${METALOG}.sanitised
.if defined(RCSMETALOG)
CVS commit: [netbsd-5] src/usr.bin/extattr
Module Name:src Committed By: riz Date: Tue Aug 9 15:55:55 UTC 2011 Modified Files: src/usr.bin/extattr [netbsd-5]: getextattr.1 getextattr.c Log Message: Pull up following revision(s) (requested by manu in ticket #1651): usr.bin/extattr/getextattr.1: revision 1.4 usr.bin/extattr/getextattr.c: revision 1.8 Improve extended attribute commands: - allow namespace to be omitted when using a namespace-prefixed attribute name, a la Linux. - Improve hexdump for getextattr -x - Add more display option for binary attributes, using vis(3) - Add a -i option to setextattr to get the attribute value from file, so that we can set binary values To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.34.1 src/usr.bin/extattr/getextattr.1 cvs rdiff -u -r1.3 -r1.3.26.1 src/usr.bin/extattr/getextattr.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/extattr/getextattr.1 diff -u src/usr.bin/extattr/getextattr.1:1.2 src/usr.bin/extattr/getextattr.1:1.2.34.1 --- src/usr.bin/extattr/getextattr.1:1.2 Sun Jan 2 18:41:23 2005 +++ src/usr.bin/extattr/getextattr.1 Tue Aug 9 15:55:55 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: getextattr.1,v 1.2 2005/01/02 18:41:23 wiz Exp $ +.\ $NetBSD: getextattr.1,v 1.2.34.1 2011/08/09 15:55:55 riz Exp $ .\ .\- .\ Copyright (c) 2000, 2001 Robert N. M. Watson @@ -44,35 +44,61 @@ .Nd manipulate extended attributes .Sh SYNOPSIS .Nm getextattr -.Op Fl fhqsx -.Ar attrnamespace +.Op Fl fhq +.Op Fl s | Fl x | Fl v Ar style +.Op Ar namespace .Ar attrname .Ar filename ... .Nm lsextattr .Op Fl fhq -.Ar attrnamespace +.Ar namespace .Ar filename ... .Nm rmextattr .Op Fl fhq -.Ar attrnamespace +.Op Ar namespace .Ar attrname .Ar filename ... .Nm setextattr .Op Fl fhnq -.Ar attrnamespace +.Op Ar namespace .Ar attrname .Ar attrvalue .Ar filename ... +.Nm setextattr +.Op Fl fhnq +.Fl i Ar valuefile +.Op Ar namespace +.Ar attrname +.Ar filename ... .Sh DESCRIPTION These utilities are user tools to manipulate the named extended attributes on files and directories. +.Pp The -.Ar attrnamespace +.Ar namespace argument should be the namespace of the attribute to retrieve: legal values are .Cm user and .Cm system . +For all operations except +.Nm lsextattr , +the namespace argument may be omitted if the attribute name is namespace +prefixed, like in +.Cm user.test . +In that later case, the +.Cm user +namespace prefix obviously selects +.Cm user +namespace. +.Cm system , +.Cm security , +and +.Cm trusted +namespace prefixes select the +.Cm system +namespace. +.Pp The .Ar attrname argument should be the name of the attribute, @@ -91,6 +117,11 @@ (No follow.) If the file is a symbolic link, perform the operation on the link itself rather than the file that the link points to. +.It Fl i Ar valuefile +(Input file.) +Read the attribute value from file +.Ar valuefile . +Use this flag in order to set a binary value for an attribute. .It Fl n .Dv ( NUL Ns -terminate.) @@ -102,6 +133,39 @@ .It Fl s (Stringify.) Escape nonprinting characters and put quotes around the output. +.It Fl v Ar style +(Visual.) +Process the attribute value through +.Xr vis 3 , +using +.Ar style . +Valid values for +.Ar style +are: +.Bl -tag -width indent +.It Ar default +Use default +.Xr vis 3 +encoding. +.It Ar c +Use C-style backslash sequences, like in +.Nm vis Fl c . +.It Ar http +Use URI encoding from RFC 1808, like in +.Nm vis Fl h . +.It Ar octal +Display in octal, like in +.Nm vis Fl o . +.It Ar vis +Alias for +.Ar default . +.It Ar cstyle +Alias for +.Ar c . +.It Ar httpstyle +Alias for +.Ar http . +.El .It Fl x (Hex.) Print the output in hexadecimal. @@ -113,6 +177,12 @@ lsextattr system /boot/kernel/kernel rmextattr system md5 /boot/kernel/kernel .Ed +.Pp +Examples omitting namespace (and attribute value) argument: +.Bd -literal +setextattr -i valuefile trusted.gfid /export/wd3a +getextattr -x trusted.gfid /export/wd3a +.Ed .Sh SEE ALSO .Xr extattr 2 , .Xr extattr 3 , @@ -128,10 +198,10 @@ .Nx 3.0 . It was developed to support security extensions requiring additional labels to be associated with each file or directory. +.Pp +Exented attribute support was resurected and made more usable in +.Nx 5.2 . .Sh AUTHORS .An Robert N M Watson .An Poul-Henning Kamp -.Sh BUGS -The -.Nm setextattr -utility can only be used to set attributes to strings. +.An Emmanuel Dreyfus Index: src/usr.bin/extattr/getextattr.c diff -u src/usr.bin/extattr/getextattr.c:1.3 src/usr.bin/extattr/getextattr.c:1.3.26.1 --- src/usr.bin/extattr/getextattr.c:1.3 Sat Jun 17 08:32:42 2006 +++ src/usr.bin/extattr/getextattr.c Tue Aug 9 15:55:55 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: getextattr.c,v 1.3 2006/06/17 08:32:42 elad Exp $ */ +/* $NetBSD: getextattr.c,v 1.3.26.1 2011/08/09 15:55:55 riz Exp $ */ /*- * Copyright (c) 2002, 2003 Networks Associates Technology,
CVS commit: src/doc
Module Name:src Committed By: jruoho Date: Tue Aug 9 16:10:10 UTC 2011 Modified Files: src/doc: TODO Log Message: Remove few entries that clearly have been done (aio(3), ssp(3), tests(7)). To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/doc/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO diff -u src/doc/TODO:1.15 src/doc/TODO:1.16 --- src/doc/TODO:1.15 Wed Nov 12 12:35:52 2008 +++ src/doc/TODO Tue Aug 9 16:10:10 2011 @@ -1,4 +1,4 @@ -# $NetBSD: TODO,v 1.15 2008/11/12 12:35:52 ad Exp $ +# $NetBSD: TODO,v 1.16 2011/08/09 16:10:10 jruoho Exp $ THINGS TO BE DONE: @@ -62,7 +62,6 @@ + autoconf version of nawk, for use in non-NetBSD pkgsrc + port valgrind to NetBSD for pkgsrc, then use it to do an audit of any memory leakage -+ implement POSIX async IO + help in implementing various things in pkgsrc + simplify some of the quirks in our build system + help out with scripts for tgm/autobuild @@ -75,13 +74,11 @@ + write a BSD-licensed privacy guard like gnupg or pgp (see http://netbsd-soc.sourceforge.net/projects/bpg/) + perhaps look at putting wonka into src/ (with uuencoded class lib?) -+ investigate ProPolice + document autoconf framework + write an overview document for openssl and certificates + documentation project help + investigate which userland utilities and daemons would benefit from kqueue, and rewrite them -+ better testing in general; in particular, more regression tests + add a native scheme interpreter + add platform support for TenDRA compiler suite + merge moused(8) with wsmoused(8) as a new work mode (i.e. serial)
CVS commit: [netbsd-5] src/sys
Module Name:src
Committed By: riz
Date: Tue Aug 9 16:18:23 UTC 2011
Modified Files:
src/sys/kern [netbsd-5]: kern_kthread.c
src/sys/sys [netbsd-5]: kthread.h
Log Message:
Pull up following revision(s) (requested by matt in ticket #1652):
sys/sys/kthread.h: revision 1.7.10.1.8.1
sys/kern/kern_kthread.c: revision 1.24.10.2.8.1
Pullup a rel=nofollow
href=http://mail-index.netbsd.org/source-changes/2010/05/11/msg009810.html;http://mail-index.netbsd.org/source-changes/2010/05/11/msg009810.html/a
to this branch because the new flash framework will need it.
To generate a diff of this commit:
cvs rdiff -u -r1.24.10.2 -r1.24.10.3 src/sys/kern/kern_kthread.c
cvs rdiff -u -r1.7.10.1 -r1.7.10.2 src/sys/sys/kthread.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_kthread.c
diff -u src/sys/kern/kern_kthread.c:1.24.10.2 src/sys/kern/kern_kthread.c:1.24.10.3
--- src/sys/kern/kern_kthread.c:1.24.10.2 Mon Feb 2 22:02:24 2009
+++ src/sys/kern/kern_kthread.c Tue Aug 9 16:18:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_kthread.c,v 1.24.10.2 2009/02/02 22:02:24 snj Exp $ */
+/* $NetBSD: kern_kthread.c,v 1.24.10.3 2011/08/09 16:18:23 riz Exp $ */
/*-
* Copyright (c) 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_kthread.c,v 1.24.10.2 2009/02/02 22:02:24 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_kthread.c,v 1.24.10.3 2011/08/09 16:18:23 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -52,6 +52,12 @@
/*
* Fork a kernel thread. Any process can request this to be done.
+ *
+ * With joinable kthreads KTHREAD_JOINABLE flag this should be known.
+ * 1. If you specify KTHREAD_JOINABLE, you must call kthread_join() to reap the thread.
+ *It will not be automatically reaped by the system.
+ * 2. For any given call to kthread_create(KTHREAD_JOINABLE), you may call kthread_join()
+ *only once on the returned lwp_t *.
*/
int
kthread_create(pri_t pri, int flag, struct cpu_info *ci,
@@ -61,9 +67,10 @@
lwp_t *l;
vaddr_t uaddr;
bool inmem;
- int error;
+ int error, lc, lwp_flags;
va_list ap;
- int lc;
+
+ lwp_flags = LWP_DETACHED;
inmem = uvm_uarea_alloc(uaddr);
if (uaddr == 0)
@@ -73,7 +80,10 @@
} else {
lc = SCHED_RR;
}
- error = lwp_create(lwp0, proc0, uaddr, inmem, LWP_DETACHED, NULL,
+ if ((flag KTHREAD_JOINABLE) != 0) {
+ lwp_flags = ~LWP_DETACHED;
+ }
+ error = lwp_create(lwp0, proc0, uaddr, inmem, lwp_flags, NULL,
0, func, arg, l, lc);
if (error) {
uvm_uarea_free(uaddr, curcpu());
@@ -83,7 +93,7 @@
if (fmt != NULL) {
l-l_name = kmem_alloc(MAXCOMLEN, KM_SLEEP);
if (l-l_name == NULL) {
- lwp_exit(l);
+ kthread_destroy(l);
return ENOMEM;
}
va_start(ap, fmt);
@@ -98,6 +108,11 @@
KASSERT((flag KTHREAD_MPSAFE) != 0);
}
+ /* Joinable kthread can't be NULL. */
+ if ((flag KTHREAD_JOINABLE) != 0) {
+ KASSERT(l != NULL);
+ }
+
if (pri == PRI_NONE) {
if ((flag KTHREAD_TS) != 0) {
/* Maximum user priority level. */
@@ -183,9 +198,39 @@
void
kthread_destroy(lwp_t *l)
{
-
+ proc_t *p;
+
KASSERT((l-l_flag LW_SYSTEM) != 0);
KASSERT(l-l_stat == LSIDL);
+ p = l-l_proc;
+
+ /* Add LRP_DETACHED flag because we can have joinable kthread now. */
+ mutex_enter(p-p_lock);
+ l-l_prflag |= LPR_DETACHED;
+ mutex_exit(p-p_lock);
+
lwp_exit(l);
}
+
+/*
+ * Wait for a kthread to exit, as pthread_join().
+ */
+int
+kthread_join(lwp_t *l)
+{
+ lwpid_t departed;
+ proc_t *p;
+ int error;
+
+ KASSERT((l-l_flag LW_SYSTEM) != 0);
+ KASSERT((l-l_prflag LPR_DETACHED) == 0);
+
+ p = l-l_proc;
+
+ mutex_enter(p-p_lock);
+ error = lwp_wait1(curlwp, l-l_lid, departed, LWPWAIT_EXITCONTROL);
+ mutex_exit(p-p_lock);
+
+ return error;
+}
Index: src/sys/sys/kthread.h
diff -u src/sys/sys/kthread.h:1.7.10.1 src/sys/sys/kthread.h:1.7.10.2
--- src/sys/sys/kthread.h:1.7.10.1 Mon Feb 2 22:01:34 2009
+++ src/sys/sys/kthread.h Tue Aug 9 16:18:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kthread.h,v 1.7.10.1 2009/02/02 22:01:34 snj Exp $ */
+/* $NetBSD: kthread.h,v 1.7.10.2 2011/08/09 16:18:23 riz Exp $ */
/*-
* Copyright (c) 1998, 2007, 2009 The NetBSD Foundation, Inc.
@@ -44,6 +44,7 @@
#define KTHREAD_MPSAFE 0x02 /* does not need kernel_lock */
#define KTHREAD_INTR 0x04 /* interrupt handler */
#define KTHREAD_TS 0x08 /* timeshared */
+#define KTHREAD_JOINABLE 0x10 /* joinable thread */
int kthread_create(pri_t, int, struct cpu_info *,
void (*)(void *), void *,
@@ -51,6 +52,7 @@
__attribute__((__format__(__printf__,7,8)));
void kthread_exit(int) __dead;
void kthread_destroy(lwp_t *);
+int kthread_join(lwp_t *);
#endif /* _KERNEL */
#endif /* _SYS_KTHREAD_H_ */
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Tue Aug 9 16:20:55 UTC 2011 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1651, 1652. To generate a diff of this commit: cvs rdiff -u -r1.1.2.96 -r1.1.2.97 src/doc/CHANGES-5.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.96 src/doc/CHANGES-5.2:1.1.2.97 --- src/doc/CHANGES-5.2:1.1.2.96 Mon Aug 8 19:57:46 2011 +++ src/doc/CHANGES-5.2 Tue Aug 9 16:20:55 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.96 2011/08/08 19:57:46 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.97 2011/08/09 16:20:55 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -5452,3 +5452,15 @@ Call the FUSE init operation before we try to access the file-system. [tron, ticket #1650] +usr.bin/extattr/getextattr.1 1.4 via patch +usr.bin/extattr/getextattr.c 1.8 via patch + + Improve extended attribute commands. + [manu, ticket #1651] + +sys/kern/kern_kthread.c1.28 via patch +sys/sys/kthread.h1.9 via patch + + Add support for kthread_join in our kernel thread implementation. + [matt, ticket #1652] +
CVS commit: src
Module Name:src Committed By: jruoho Date: Tue Aug 9 17:58:28 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man3: Makefile Added Files: src/share/man/man3: limits.3 Log Message: Add a summary page for limits.h. To generate a diff of this commit: cvs rdiff -u -r1.1659 -r1.1660 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.78 -r1.79 src/share/man/man3/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man3/limits.3 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.1659 src/distrib/sets/lists/comp/mi:1.1660 --- src/distrib/sets/lists/comp/mi:1.1659 Mon Aug 8 12:08:52 2011 +++ src/distrib/sets/lists/comp/mi Tue Aug 9 17:58:27 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1659 2011/08/08 12:08:52 manu Exp $ +# $NetBSD: mi,v 1.1660 2011/08/09 17:58:27 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -7649,6 +7649,7 @@ ./usr/share/man/cat3/libsaslc.0 comp-c-catman crypto,.cat ./usr/share/man/cat3/libusb.0 comp-obsolete obsolete ./usr/share/man/cat3/libusbhid.0 comp-c-catman .cat +./usr/share/man/cat3/limits.0 comp-c-catman .cat ./usr/share/man/cat3/link_addr.0 comp-c-catman .cat ./usr/share/man/cat3/link_field.0 comp-c-catman .cat ./usr/share/man/cat3/link_fieldtype.0 comp-c-catman .cat @@ -13738,6 +13739,7 @@ ./usr/share/man/html3/libradius.html comp-c-htmlman html ./usr/share/man/html3/libsaslc.html comp-c-htmlman crypto,html ./usr/share/man/html3/libusbhid.html comp-c-htmlman html +./usr/share/man/html3/limits.html comp-c-htmlman html ./usr/share/man/html3/link_addr.html comp-c-htmlman html ./usr/share/man/html3/link_field.html comp-c-htmlman html ./usr/share/man/html3/link_fieldtype.html comp-c-htmlman html @@ -19788,6 +19790,7 @@ ./usr/share/man/man3/libsaslc.3 comp-c-man crypto,.man ./usr/share/man/man3/libusb.3 comp-obsolete obsolete ./usr/share/man/man3/libusbhid.3 comp-c-man .man +./usr/share/man/man3/limits.3 comp-c-man .man ./usr/share/man/man3/link_addr.3 comp-c-man .man ./usr/share/man/man3/link_field.3 comp-c-man .man ./usr/share/man/man3/link_fieldtype.3 comp-c-man .man Index: src/share/man/man3/Makefile diff -u src/share/man/man3/Makefile:1.78 src/share/man/man3/Makefile:1.79 --- src/share/man/man3/Makefile:1.78 Sun Jul 17 20:54:34 2011 +++ src/share/man/man3/Makefile Tue Aug 9 17:58:27 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2011/07/17 20:54:34 joerg Exp $ +# $NetBSD: Makefile,v 1.79 2011/08/09 17:58:27 jruoho Exp $ # @(#)Makefile 8.2 (Berkeley) 12/13/93 MAN= _DIAGASSERT.3 __CONCAT.3 __UNCONST.3 CMSG_DATA.3 \ @@ -9,7 +9,7 @@ assert.3 attribute.3 bitops.3 bits.3 bitstring.3 \ cdefs.3 dirent.3 dlfcn.3 dl_iterate_phdr.3 end.3 \ fast_divide32.3 ffs32.3 gcq.3 \ - ilog2.3 intro.3 inttypes.3 iso646.3 \ + ilog2.3 intro.3 inttypes.3 iso646.3 limits.3 \ makedev.3 offsetof.3 param.3 paths.3 queue.3 rbtree.3 sigevent.3 \ stdarg.3 stdbool.3 stddef.3 stdint.3 stdlib.3 sysexits.3 \ tgmath.3 timeradd.3 timeval.3 tm.3 tree.3 typeof.3 types.3 \ Added files: Index: src/share/man/man3/limits.3 diff -u /dev/null src/share/man/man3/limits.3:1.1 --- /dev/null Tue Aug 9 17:58:28 2011 +++ src/share/man/man3/limits.3 Tue Aug 9 17:58:27 2011 @@ -0,0 +1,171 @@ +.\ $NetBSD: limits.3,v 1.1 2011/08/09 17:58:27 jruoho Exp $ +.\ +.\ Copyright (c) 2011 Jukka Ruohonen jruoho...@iki.fi +.\ All rights reserved. +.\ +.\ This code is derived from software contributed to The NetBSD Foundation +.\ by Jukka Ruohonen. +.\ +.\ 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 BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
CVS commit: src/doc
Module Name:src Committed By: jruoho Date: Tue Aug 9 18:03:11 UTC 2011 Modified Files: src/doc: CHANGES Log Message: Note the over fifty new manual pages. To generate a diff of this commit: cvs rdiff -u -r1.1591 -r1.1592 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/CHANGES diff -u src/doc/CHANGES:1.1591 src/doc/CHANGES:1.1592 --- src/doc/CHANGES:1.1591 Sun Aug 7 20:44:32 2011 +++ src/doc/CHANGES Tue Aug 9 18:03:10 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1591 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1592 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1100,4 +1100,5 @@ the system module area. [mbalmer 20110806] amd64: Switch to GCC 4.5.3 [mrg 20110806] i386: Switch to GCC 4.5.3 [mrg 20110806] + userland: Over 50 new manual pages. [jruoho 20110809]
CVS commit: src
Module Name:src Committed By: jruoho Date: Tue Aug 9 18:11:38 UTC 2011 Modified Files: src/lib/libc/gen: sysconf.3 src/share/man/man3: stdint.3 unistd.3 src/usr.bin/getconf: getconf.1 Log Message: Xref limits(3). To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/lib/libc/gen/sysconf.3 cvs rdiff -u -r1.5 -r1.6 src/share/man/man3/stdint.3 cvs rdiff -u -r1.3 -r1.4 src/share/man/man3/unistd.3 cvs rdiff -u -r1.11 -r1.12 src/usr.bin/getconf/getconf.1 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.38 src/lib/libc/gen/sysconf.3:1.39 --- src/lib/libc/gen/sysconf.3:1.38 Fri Apr 29 09:43:28 2011 +++ src/lib/libc/gen/sysconf.3 Tue Aug 9 18:11:38 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: sysconf.3,v 1.38 2011/04/29 09:43:28 wiz Exp $ +.\ $NetBSD: sysconf.3,v 1.39 2011/08/09 18:11:38 jruoho 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 August 6, 2008 +.Dd August 9, 2011 .Dt SYSCONF 3 .Os .Sh NAME @@ -309,6 +309,8 @@ argument is invalid. .El .Sh SEE ALSO +.Xr getconf 1 , +.Xr limits 3 , .Xr sysctl 3 .Sh STANDARDS The Index: src/share/man/man3/stdint.3 diff -u src/share/man/man3/stdint.3:1.5 src/share/man/man3/stdint.3:1.6 --- src/share/man/man3/stdint.3:1.5 Sun Apr 10 10:02:34 2011 +++ src/share/man/man3/stdint.3 Tue Aug 9 18:11:37 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: stdint.3,v 1.5 2011/04/10 10:02:34 jruoho Exp $ +.\ $NetBSD: stdint.3,v 1.6 2011/08/09 18:11:37 jruoho Exp $ .\ .\ Copyright (c) 2002 Mike Barcroft m...@freebsd.org .\ All rights reserved. @@ -26,7 +26,7 @@ .\ .\ $FreeBSD: src/share/man/man7/stdint.7,v 1.5 2003/09/08 19:57:21 ru Exp $ .\ -.Dd April 10, 2011 +.Dd August 9, 2011 .Dt STDINT 3 .Os .Sh NAME @@ -122,6 +122,7 @@ .Vt void . .Sh SEE ALSO .Xr inttypes 3 , +.Xr limits 3 , .Xr stdbool 3 , .Xr unistd 3 .Sh STANDARDS Index: src/share/man/man3/unistd.3 diff -u src/share/man/man3/unistd.3:1.3 src/share/man/man3/unistd.3:1.4 --- src/share/man/man3/unistd.3:1.3 Tue Apr 12 04:27:02 2011 +++ src/share/man/man3/unistd.3 Tue Aug 9 18:11:38 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: unistd.3,v 1.3 2011/04/12 04:27:02 jruoho Exp $ +.\ $NetBSD: unistd.3,v 1.4 2011/08/09 18:11:38 jruoho Exp $ .\ .\ Copyright (c) 2011 Jukka Ruohonen jruoho...@iki.fi .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd April 12, 2011 +.Dd August 9, 2011 .Dt UNISTD 3 .Os .Sh NAME @@ -89,6 +89,7 @@ .Xr aio 3 . .El .Sh SEE ALSO +.Xr limits 3 , .Xr stddef 3 , .Xr stdint 3 , .Xr stdlib 3 , Index: src/usr.bin/getconf/getconf.1 diff -u src/usr.bin/getconf/getconf.1:1.11 src/usr.bin/getconf/getconf.1:1.12 --- src/usr.bin/getconf/getconf.1:1.11 Wed Apr 30 13:11:01 2008 +++ src/usr.bin/getconf/getconf.1 Tue Aug 9 18:11:38 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: getconf.1,v 1.11 2008/04/30 13:11:01 martin Exp $ +.\ $NetBSD: getconf.1,v 1.12 2011/08/09 18:11:38 jruoho Exp $ .\ .\ Copyright (c) 1996 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 October 7, 2006 +.Dd August 9, 2011 .Dt GETCONF 1 .Os .Sh NAME @@ -87,6 +87,7 @@ .Sh SEE ALSO .Xr pathconf 2 , .Xr confstr 3 , +.Xr limits 3 , .Xr sysconf 3 .Sh STANDARDS The
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: jmmv
Date: Tue Aug 9 18:24:46 UTC 2011
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Check (and fix) that unprivileged-user has been changed from _atf to _tests
in /etc/atf/common.conf. Requested by martin@.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 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.121 src/usr.sbin/postinstall/postinstall:1.122
--- src/usr.sbin/postinstall/postinstall:1.121 Fri Aug 5 14:43:41 2011
+++ src/usr.sbin/postinstall/postinstall Tue Aug 9 18:24:46 2011
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.121 2011/08/05 14:43:41 jmmv Exp $
+# $NetBSD: postinstall,v 1.122 2011/08/09 18:24:46 jmmv Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1524,6 +1524,37 @@
#
+# atf
+#
+additem atf validate the _atf to _tests user/group renaming
+do_atf()
+{
+ [ -n $1 ] || err 3 USAGE: do_atf fix|check
+ op=$1
+ failed=0
+
+ if grep '[^#]*unprivileged-user[ \t]*=.*_atf' /etc/atf/common.conf \
+ /dev/null
+ then
+ if [ $1 = fix ]; then
+ sed -e \
+ /[^#]*unprivileged-user[\ t]*=/s/_atf/_tests/ \
+ /etc/atf/common.conf /etc/atf/common.conf.new
+ failed=$(( ${failed} + $? ))
+ mv /etc/atf/common.conf.new /etc/atf/common.conf
+ failed=$(( ${failed} + $? ))
+ else
+ msg unprivileged-user=_atf in /etc/atf/common.conf \
+ should be _tests
+ failed=1
+ fi
+ fi
+
+ return ${failed}
+}
+
+
+#
# obsolete
# (this item is last to allow other items to move obsolete files)
#
CVS commit: src/sys/kern
Module Name:src
Committed By: dholland
Date: Tue Aug 9 18:37:56 UTC 2011
Modified Files:
src/sys/kern: vfs_lookup.c
Log Message:
Simplify handling of slashes. Provides a proper fix for PR 44961.
To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/sys/kern/vfs_lookup.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_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.184 src/sys/kern/vfs_lookup.c:1.185
--- src/sys/kern/vfs_lookup.c:1.184 Mon May 16 15:09:31 2011
+++ src/sys/kern/vfs_lookup.c Tue Aug 9 18:37:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.184 2011/05/16 15:09:31 dholland Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.185 2011/08/09 18:37:56 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_lookup.c,v 1.184 2011/05/16 15:09:31 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_lookup.c,v 1.185 2011/08/09 18:37:56 dholland Exp $);
#include opt_magiclinks.h
@@ -1078,7 +1078,6 @@
struct nameidata *ndp = state-ndp;
struct componentname *cnp = state-cnp;
struct vnode *searchdir, *foundobj;
- const char *cp;
int error;
error = namei_start(state, forcecwd, searchdir);
@@ -1087,6 +1086,7 @@
ndp-ni_vp = NULL;
return error;
}
+ KASSERT(searchdir-v_type == VDIR);
/*
* Setup: break out flag bits into variables.
@@ -1100,11 +1100,28 @@
* Keep going until we run out of path components.
*/
cnp-cn_nameptr = ndp-ni_pnbuf;
+
+ /* drop leading slashes (already used them to choose startdir) */
+ while (cnp-cn_nameptr[0] == '/') {
+ cnp-cn_nameptr++;
+ ndp-ni_pathlen--;
+ }
+ /* was it just /? */
+ if (cnp-cn_nameptr[0] == '\0') {
+ foundobj = searchdir;
+ searchdir = NULL;
+ cnp-cn_flags |= ISLASTCN;
+
+ /* bleh */
+ goto skiploop;
+ }
+
for (;;) {
/*
* If the directory we're on is unmounted, bail out.
* XXX: should this also check if it's unlinked?
+ * XXX: yes it should... but how?
*/
if (searchdir-v_mount == NULL) {
vput(searchdir);
@@ -1118,40 +1135,11 @@
* (currently, this may consume more than one)
*/
- /*
- * If we have a leading string of slashes, remove
- * them, and just make sure the current node is a
- * directory.
- */
- cp = cnp-cn_nameptr;
- if (*cp == '/') {
- do {
-cp++;
- } while (*cp == '/');
- ndp-ni_pathlen -= cp - cnp-cn_nameptr;
- cnp-cn_nameptr = cp;
+ /* There should be no slashes here. */
+ KASSERT(cnp-cn_nameptr[0] != '/');
- if (searchdir-v_type != VDIR) {
-vput(searchdir);
-ndp-ni_dvp = NULL;
-ndp-ni_vp = NULL;
-state-attempt_retry = 1;
-return ENOTDIR;
- }
- }
-
- /*
- * If we've exhausted the path name, then just return the
- * current node.
- */
- if (cnp-cn_nameptr[0] == '\0') {
- foundobj = searchdir;
- searchdir = NULL;
- cnp-cn_flags |= ISLASTCN;
-
- /* bleh */
- break;
- }
+ /* and we shouldn't have looped around if we were done */
+ KASSERT(cnp-cn_nameptr[0] != '\0');
error = lookup_parsepath(state);
if (error) {
@@ -1266,6 +1254,8 @@
foundobj = NULL;
}
+ skiploop:
+
if (foundobj != NULL) {
if (foundobj == ndp-ni_erootdir) {
/*
CVS commit: [netbsd-5] src/external/ibm-public/postfix/dist
Module Name:src Committed By: riz Date: Tue Aug 9 18:58:18 UTC 2011 Modified Files: src/external/ibm-public/postfix/dist [netbsd-5]: HISTORY makedefs postfix-install src/external/ibm-public/postfix/dist/src/cleanup [netbsd-5]: cleanup_milter.c src/external/ibm-public/postfix/dist/src/global [netbsd-5]: abounce.c abounce.h mail_version.h src/external/ibm-public/postfix/dist/src/local [netbsd-5]: Makefile.in bounce_workaround.c mailbox.c unknown.c src/external/ibm-public/postfix/dist/src/master [netbsd-5]: master_ent.c src/external/ibm-public/postfix/dist/src/milter [netbsd-5]: milter8.c src/external/ibm-public/postfix/dist/src/oqmgr [netbsd-5]: qmgr_active.c src/external/ibm-public/postfix/dist/src/postdrop [netbsd-5]: postdrop.c src/external/ibm-public/postfix/dist/src/qmgr [netbsd-5]: qmgr_active.c src/external/ibm-public/postfix/dist/src/smtpd [netbsd-5]: smtpd_check.c src/external/ibm-public/postfix/dist/src/util [netbsd-5]: sys_defs.h Log Message: Apply patches (requested by tron in ticket #1653): external/ibm-public/postfix/dist/HISTORYpatch external/ibm-public/postfix/dist/makedefs patch external/ibm-public/postfix/dist/postfix-install patch external/ibm-public/postfix/dist/src/cleanup/cleanup_milter.c patch external/ibm-public/postfix/dist/src/global/abounce.c patch external/ibm-public/postfix/dist/src/global/abounce.h patch external/ibm-public/postfix/dist/src/global/mail_version.h patch external/ibm-public/postfix/dist/src/local/Makefile.in patch external/ibm-public/postfix/dist/src/local/bounce_workaround.c patch external/ibm-public/postfix/dist/src/local/mailbox.c patch external/ibm-public/postfix/dist/src/local/unknown.c patch external/ibm-public/postfix/dist/src/master/master_ent.c patch external/ibm-public/postfix/dist/src/milter/milter8.c patch external/ibm-public/postfix/dist/src/oqmgr/qmgr_active.c patch external/ibm-public/postfix/dist/src/postdrop/postdrop.c patch external/ibm-public/postfix/dist/src/qmgr/qmgr_active.c patch external/ibm-public/postfix/dist/src/smtpd/smtpd_check.c patch external/ibm-public/postfix/dist/src/util/sys_defs.h patch Update Postfix to version 2.7.5. Changes since version 2.7.4: - Performance: a high load of DSN success notification requests could slow down the queue manager. Solution: make the trace client asynchronous, just like the bounce and defer clients. - The local(8) delivery agent ignored table lookup errors in mailbox_command_maps, mailbox_transport_maps, fallback_transport_maps and (while bouncing mail to alias) alias owner lookup. - Workaround: dbl.spamhaus.org rejects lookups with No IP queries even if the name has an alphanumerical prefix. We play safe, and skip both RHSBL and RHSWL queries for names ending in a numerical suffix. - The Postfix Milter client reported a temporary error instead of file too large in three cases. - The sendmail -t command reported protocol error instead of file too large, no space left on device etc. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2.2.6 -r1.1.1.2.2.7 \ src/external/ibm-public/postfix/dist/HISTORY cvs rdiff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5 \ src/external/ibm-public/postfix/dist/makedefs cvs rdiff -u -r1.2.2.2 -r1.2.2.3 \ src/external/ibm-public/postfix/dist/postfix-install cvs rdiff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5 \ src/external/ibm-public/postfix/dist/src/cleanup/cleanup_milter.c cvs rdiff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 \ src/external/ibm-public/postfix/dist/src/global/abounce.c \ src/external/ibm-public/postfix/dist/src/global/abounce.h cvs rdiff -u -r1.1.1.2.2.6 -r1.1.1.2.2.7 \ src/external/ibm-public/postfix/dist/src/global/mail_version.h cvs rdiff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 \ src/external/ibm-public/postfix/dist/src/local/Makefile.in \ src/external/ibm-public/postfix/dist/src/local/bounce_workaround.c \ src/external/ibm-public/postfix/dist/src/local/mailbox.c \ src/external/ibm-public/postfix/dist/src/local/unknown.c cvs rdiff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5 \ src/external/ibm-public/postfix/dist/src/master/master_ent.c cvs rdiff -u -r1.1.1.2.2.4 -r1.1.1.2.2.5 \ src/external/ibm-public/postfix/dist/src/milter/milter8.c cvs rdiff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 \ src/external/ibm-public/postfix/dist/src/oqmgr/qmgr_active.c cvs rdiff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5 \ src/external/ibm-public/postfix/dist/src/postdrop/postdrop.c cvs rdiff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 \ src/external/ibm-public/postfix/dist/src/qmgr/qmgr_active.c cvs rdiff -u -r1.1.1.2.2.4 -r1.1.1.2.2.5 \ src/external/ibm-public/postfix/dist/src/smtpd/smtpd_check.c cvs rdiff -u -r1.1.1.1.2.5
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Tue Aug 9 19:04:14 UTC 2011 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Ticket 1653. To generate a diff of this commit: cvs rdiff -u -r1.1.2.97 -r1.1.2.98 src/doc/CHANGES-5.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.97 src/doc/CHANGES-5.2:1.1.2.98 --- src/doc/CHANGES-5.2:1.1.2.97 Tue Aug 9 16:20:55 2011 +++ src/doc/CHANGES-5.2 Tue Aug 9 19:04:14 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.97 2011/08/09 16:20:55 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.98 2011/08/09 19:04:14 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -5464,3 +5464,40 @@ Add support for kthread_join in our kernel thread implementation. [matt, ticket #1652] +external/ibm-public/postfix/dist/HISTORY patch +external/ibm-public/postfix/dist/makedefs patch +external/ibm-public/postfix/dist/postfix-install patch +external/ibm-public/postfix/dist/src/cleanup/cleanup_milter.c patch +external/ibm-public/postfix/dist/src/global/abounce.c patch +external/ibm-public/postfix/dist/src/global/abounce.h patch +external/ibm-public/postfix/dist/src/global/mail_version.h patch +external/ibm-public/postfix/dist/src/local/Makefile.in patch +external/ibm-public/postfix/dist/src/local/bounce_workaround.c patch +external/ibm-public/postfix/dist/src/local/mailbox.c patch +external/ibm-public/postfix/dist/src/local/unknown.c patch +external/ibm-public/postfix/dist/src/master/master_ent.c patch +external/ibm-public/postfix/dist/src/milter/milter8.c patch +external/ibm-public/postfix/dist/src/oqmgr/qmgr_active.c patch +external/ibm-public/postfix/dist/src/postdrop/postdrop.c patch +external/ibm-public/postfix/dist/src/qmgr/qmgr_active.c patch +external/ibm-public/postfix/dist/src/smtpd/smtpd_check.c patch +external/ibm-public/postfix/dist/src/util/sys_defs.h patch + + Update Postfix to version 2.7.5. Changes since version 2.7.4: + - Performance: a high load of DSN success notification requests could + slow down the queue manager. Solution: make the trace client + asynchronous, just like the bounce and defer clients. + - The local(8) delivery agent ignored table lookup errors in + mailbox_command_maps, mailbox_transport_maps, + fallback_transport_maps and (while bouncing mail to alias) alias + owner lookup. + - Workaround: dbl.spamhaus.org rejects lookups with No IP queries + even if the name has an alphanumerical prefix. We play safe, and + skip both RHSBL and RHSWL queries for names ending in a numerical + suffix. + - The Postfix Milter client reported a temporary error instead of + file too large in three cases. + - The sendmail -t command reported protocol error instead of + file too large, no space left on device etc. + [tron, ticket #1653] +
CVS commit: src/sys/sys
Module Name:src Committed By: dholland Date: Tue Aug 9 20:05:05 UTC 2011 Modified Files: src/sys/sys: dirent.h Log Message: __typeof__, not __typeof, to avoid confusing passersby. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/sys/dirent.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/dirent.h diff -u src/sys/sys/dirent.h:1.26 src/sys/sys/dirent.h:1.27 --- src/sys/sys/dirent.h:1.26 Tue Jul 5 07:32:33 2011 +++ src/sys/sys/dirent.h Tue Aug 9 20:05:04 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dirent.h,v 1.26 2011/07/05 07:32:33 dholland Exp $ */ +/* $NetBSD: dirent.h,v 1.27 2011/08/09 20:05:04 dholland Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -91,7 +91,7 @@ * struct dirent */ #if __GNUC_PREREQ__(4, 0) -#define _DIRENT_NAMEOFF(dp) __builtin_offsetof(__typeof(*dp), d_name) +#define _DIRENT_NAMEOFF(dp) __builtin_offsetof(__typeof__(*dp), d_name) #else #define _DIRENT_NAMEOFF(dp) \ ((char *)(void *)(dp)-d_name - (char *)(void *)dp)
CVS commit: src/sys/kern
Module Name:src Committed By: dyoung Date: Tue Aug 9 21:07:14 UTC 2011 Modified Files: src/sys/kern: subr_autoconf.c Log Message: Correct a comment on config_found_sm_loc(). To generate a diff of this commit: cvs rdiff -u -r1.217 -r1.218 src/sys/kern/subr_autoconf.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/subr_autoconf.c diff -u src/sys/kern/subr_autoconf.c:1.217 src/sys/kern/subr_autoconf.c:1.218 --- src/sys/kern/subr_autoconf.c:1.217 Tue Aug 2 21:23:24 2011 +++ src/sys/kern/subr_autoconf.c Tue Aug 9 21:07:14 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_autoconf.c,v 1.217 2011/08/02 21:23:24 jmcneill Exp $ */ +/* $NetBSD: subr_autoconf.c,v 1.218 2011/08/09 21:07:14 dyoung Exp $ */ /* * Copyright (c) 1996, 2000 Christopher G. Demetriou @@ -77,7 +77,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_autoconf.c,v 1.217 2011/08/02 21:23:24 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_autoconf.c,v 1.218 2011/08/09 21:07:14 dyoung Exp $); #ifdef _KERNEL_OPT #include opt_ddb.h @@ -1030,8 +1030,8 @@ * on the given parent, but not necessarily configured. Locate the * configuration data for that device (using the submatch function * provided, or using candidates' cd_match configuration driver - * functions) and attach it, and return true. If the device was - * not configured, call the given `print' function and return 0. + * functions) and attach it, and return its device_t. If the device was + * not configured, call the given `print' function and return NULL. */ device_t config_found_sm_loc(device_t parent,
CVS commit: src/sys/arch/usermode
Module Name:src Committed By: jmcneill Date: Wed Aug 10 01:32:44 UTC 2011 Modified Files: src/sys/arch/usermode/conf: GENERIC Makefile.usermode src/sys/arch/usermode/dev: clock.c cpu.c src/sys/arch/usermode/include: bus.h src/sys/arch/usermode/usermode: machdep.c pmap.c vm_machdep.c Log Message: fix build To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/usermode/conf/GENERIC cvs rdiff -u -r1.4 -r1.5 src/sys/arch/usermode/conf/Makefile.usermode cvs rdiff -u -r1.4 -r1.5 src/sys/arch/usermode/dev/clock.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/usermode/dev/cpu.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/usermode/include/bus.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/usermode/usermode/machdep.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/usermode/usermode/pmap.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/usermode/usermode/vm_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/usermode/conf/GENERIC diff -u src/sys/arch/usermode/conf/GENERIC:1.5 src/sys/arch/usermode/conf/GENERIC:1.6 --- src/sys/arch/usermode/conf/GENERIC:1.5 Tue Nov 23 11:14:07 2010 +++ src/sys/arch/usermode/conf/GENERIC Wed Aug 10 01:32:43 2011 @@ -1,9 +1,9 @@ -# $NetBSD: GENERIC,v 1.5 2010/11/23 11:14:07 hannken Exp $ +# $NetBSD: GENERIC,v 1.6 2011/08/10 01:32:43 jmcneill Exp $ include arch/usermode/conf/std.usermode options INCLUDE_CONFIG_FILE -#ident GENERIC-$Revision: 1.5 $ +#ident GENERIC-$Revision: 1.6 $ maxusers 32 makeoptions DEBUG=-g3 makeoptions COPTS=-O2 -fno-omit-frame-pointer @@ -43,15 +43,3 @@ ttycons0 at mainbus? pseudo-device loop -pseudo-device md - -# -# accept filters -pseudo-device accf_data # dataready accept filter -pseudo-device accf_http # httpready accept filter - -options MEMORY_DISK_HOOKS -options MEMORY_DISK_IS_ROOT -options MEMORY_DISK_SERVER=0 -options MEMORY_DISK_ROOT_SIZE=1 -options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode Index: src/sys/arch/usermode/conf/Makefile.usermode diff -u src/sys/arch/usermode/conf/Makefile.usermode:1.4 src/sys/arch/usermode/conf/Makefile.usermode:1.5 --- src/sys/arch/usermode/conf/Makefile.usermode:1.4 Fri Jan 21 15:59:09 2011 +++ src/sys/arch/usermode/conf/Makefile.usermode Wed Aug 10 01:32:43 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.usermode,v 1.4 2011/01/21 15:59:09 joerg Exp $ +# $NetBSD: Makefile.usermode,v 1.5 2011/08/10 01:32:43 jmcneill Exp $ MACHINE_ARCH= usermode USETOOLS?= no @@ -17,7 +17,7 @@ ## (2) compile settings ## DEFCOPTS= -O2 -CPPFLAGS+= -Dusermode -Dmalloc=kernmalloc -Dfree=kernfree +CPPFLAGS+= -Dusermode CPPFLAGS.init_main.c+= -Dmain=kernmain AFLAGS+= -x assembler-with-cpp Index: src/sys/arch/usermode/dev/clock.c diff -u src/sys/arch/usermode/dev/clock.c:1.4 src/sys/arch/usermode/dev/clock.c:1.5 --- src/sys/arch/usermode/dev/clock.c:1.4 Fri Nov 27 03:23:14 2009 +++ src/sys/arch/usermode/dev/clock.c Wed Aug 10 01:32:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.4 2009/11/27 03:23:14 rmind Exp $ */ +/* $NetBSD: clock.c,v 1.5 2011/08/10 01:32:44 jmcneill Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca @@ -27,13 +27,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.4 2009/11/27 03:23:14 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.5 2011/08/10 01:32:44 jmcneill Exp $); #include sys/param.h #include sys/proc.h #include sys/systm.h #include sys/device.h #include sys/timetc.h +#include sys/time.h #include machine/mainbus.h Index: src/sys/arch/usermode/dev/cpu.c diff -u src/sys/arch/usermode/dev/cpu.c:1.7 src/sys/arch/usermode/dev/cpu.c:1.8 --- src/sys/arch/usermode/dev/cpu.c:1.7 Mon Feb 8 19:02:32 2010 +++ src/sys/arch/usermode/dev/cpu.c Wed Aug 10 01:32:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.7 2010/02/08 19:02:32 joerg Exp $ */ +/* $NetBSD: cpu.c,v 1.8 2011/08/10 01:32:44 jmcneill Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.7 2010/02/08 19:02:32 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.8 2011/08/10 01:32:44 jmcneill Exp $); #include sys/param.h #include sys/conf.h @@ -43,6 +43,7 @@ #include machine/cpu.h #include machine/mainbus.h +#include machine/pcb.h #include uvm/uvm_extern.h #include uvm/uvm_page.h Index: src/sys/arch/usermode/include/bus.h diff -u src/sys/arch/usermode/include/bus.h:1.1 src/sys/arch/usermode/include/bus.h:1.2 --- src/sys/arch/usermode/include/bus.h:1.1 Tue Jan 18 23:03:29 2011 +++ src/sys/arch/usermode/include/bus.h Wed Aug 10 01:32:44 2011 @@ -0,0 +1,37 @@ +/* $NetBSD: bus.h,v 1.2 2011/08/10 01:32:44 jmcneill Exp $ */ + +/*- + * Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + *
CVS commit: src/sys/kern
Module Name:src
Committed By: dholland
Date: Wed Aug 10 05:42:32 UTC 2011
Modified Files:
src/sys/kern: vfs_lookup.c
Log Message:
Revert previous, it breaks nullfs. (And I guess there are no tests for
nullfs?)
To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 src/sys/kern/vfs_lookup.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_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.187 src/sys/kern/vfs_lookup.c:1.188
--- src/sys/kern/vfs_lookup.c:1.187 Tue Aug 9 23:46:05 2011
+++ src/sys/kern/vfs_lookup.c Wed Aug 10 05:42:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.187 2011/08/09 23:46:05 dholland Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.188 2011/08/10 05:42:32 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_lookup.c,v 1.187 2011/08/09 23:46:05 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_lookup.c,v 1.188 2011/08/10 05:42:32 dholland Exp $);
#include opt_magiclinks.h
@@ -1123,10 +1123,11 @@
for (;;) {
/*
- * If the directory we're on is unmounted, or has been
- * rmdir'd, bail out.
+ * If the directory we're on is unmounted, bail out.
+ * XXX: should this also check if it's unlinked?
+ * XXX: yes it should... but how?
*/
- if (searchdir-v_mount == NULL || searchdir-v_size == 0) {
+ if (searchdir-v_mount == NULL) {
vput(searchdir);
ndp-ni_dvp = NULL;
ndp-ni_vp = NULL;
