CVS commit: src/sys

[YAMAMOTO Takashi]

Module Name:src
Committed By:   yamt
Date:   Mon May  4 06:05:19 UTC 2009

Modified Files:
src/sys/kern: vfs_lookup.c
src/sys/nfs: nfs_srvsubs.c

Log Message:
when freeing cn_pnbuf, make it NULL if DIAGNOSTIC.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/kern/vfs_lookup.c
cvs rdiff -u -r1.2 -r1.3 src/sys/nfs/nfs_srvsubs.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.113 src/sys/kern/vfs_lookup.c:1.114
--- src/sys/kern/vfs_lookup.c:1.113	Wed Feb 11 00:19:11 2009
+++ src/sys/kern/vfs_lookup.c	Mon May  4 06:05:19 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_lookup.c,v 1.113 2009/02/11 00:19:11 enami Exp $	*/
+/*	$NetBSD: vfs_lookup.c,v 1.114 2009/05/04 06:05:19 yamt Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_lookup.c,v 1.113 2009/02/11 00:19:11 enami Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_lookup.c,v 1.114 2009/05/04 06:05:19 yamt Exp $);
 
 #include opt_magiclinks.h
 
@@ -356,10 +356,14 @@
 	vput(ndp-ni_dvp);
 }
 			}
-			if ((cnp-cn_flags  (SAVENAME | SAVESTART)) == 0)
+			if ((cnp-cn_flags  (SAVENAME | SAVESTART)) == 0) {
 PNBUF_PUT(cnp-cn_pnbuf);
-			else
+#if defined(DIAGNOSTIC)
+cnp-cn_pnbuf = NULL;
+#endif /* defined(DIAGNOSTIC) */
+			} else {
 cnp-cn_flags |= HASBUF;
+			}
 			return (0);
 		}
 

Index: src/sys/nfs/nfs_srvsubs.c
diff -u src/sys/nfs/nfs_srvsubs.c:1.2 src/sys/nfs/nfs_srvsubs.c:1.3
--- src/sys/nfs/nfs_srvsubs.c:1.2	Sat Mar 14 21:04:25 2009
+++ src/sys/nfs/nfs_srvsubs.c	Mon May  4 06:05:19 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_srvsubs.c,v 1.2 2009/03/14 21:04:25 dsl Exp $	*/
+/*	$NetBSD: nfs_srvsubs.c,v 1.3 2009/05/04 06:05:19 yamt Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -70,7 +70,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_srvsubs.c,v 1.2 2009/03/14 21:04:25 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_srvsubs.c,v 1.3 2009/05/04 06:05:19 yamt Exp $);
 
 #include sys/param.h
 #include sys/proc.h
@@ -284,10 +284,14 @@
 vput(ndp-ni_dvp);
 			}
 		}
-		if (cnp-cn_flags  (SAVENAME | SAVESTART))
+		if (cnp-cn_flags  (SAVENAME | SAVESTART)) {
 			cnp-cn_flags |= HASBUF;
-		else
+		} else {
 			PNBUF_PUT(cnp-cn_pnbuf);
+#if defined(DIAGNOSTIC)
+			cnp-cn_pnbuf = NULL;
+#endif /* defined(DIAGNOSTIC) */
+		}
 		return (0);
 	} else {
 		if (!pubflag) {

CVS commit: [yamt-nfs-mp] src/sys/arch/x86/x86

[YAMAMOTO Takashi]

Module Name:src
Committed By:   yamt
Date:   Mon May  4 10:32:18 UTC 2009

Modified Files:
src/sys/arch/x86/x86 [yamt-nfs-mp]: tsc.c

Log Message:
fix a merge botch.


To generate a diff of this commit:
cvs rdiff -u -r1.13.4.2 -r1.13.4.3 src/sys/arch/x86/x86/tsc.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/x86/x86/tsc.c
diff -u src/sys/arch/x86/x86/tsc.c:1.13.4.2 src/sys/arch/x86/x86/tsc.c:1.13.4.3
--- src/sys/arch/x86/x86/tsc.c:1.13.4.2	Mon May  4 08:12:11 2009
+++ src/sys/arch/x86/x86/tsc.c	Mon May  4 10:32:18 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: tsc.c,v 1.13.4.2 2009/05/04 08:12:11 yamt Exp $	*/
+/*	$NetBSD: tsc.c,v 1.13.4.3 2009/05/04 10:32:18 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -27,12 +27,7 @@
  */
 
 #include sys/cdefs.h
- tsc.c
-/* __FBSDID($FreeBSD: src/sys/i386/i386/tsc.c,v 1.204 2003/10/21 18:28:34 silby Exp $); */
-__KERNEL_RCSID(0, $NetBSD: tsc.c,v 1.13.4.2 2009/05/04 08:12:11 yamt Exp $);
-===
-__KERNEL_RCSID(0, $NetBSD: tsc.c,v 1.13.4.2 2009/05/04 08:12:11 yamt Exp $);
- 1.19
+__KERNEL_RCSID(0, $NetBSD: tsc.c,v 1.13.4.3 2009/05/04 10:32:18 yamt Exp $);
 
 #include sys/param.h
 #include sys/systm.h

CVS commit: [yamt-nfs-mp] src/sys/nfs

[YAMAMOTO Takashi]

Module Name:src
Committed By:   yamt
Date:   Mon May  4 10:48:39 UTC 2009

Modified Files:
src/sys/nfs [yamt-nfs-mp]: nfs_socket.c

Log Message:
fix a merge botch.


To generate a diff of this commit:
cvs rdiff -u -r1.170.2.3 -r1.170.2.4 src/sys/nfs/nfs_socket.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/nfs/nfs_socket.c
diff -u src/sys/nfs/nfs_socket.c:1.170.2.3 src/sys/nfs/nfs_socket.c:1.170.2.4
--- src/sys/nfs/nfs_socket.c:1.170.2.3	Mon May  4 10:28:53 2009
+++ src/sys/nfs/nfs_socket.c	Mon May  4 10:48:39 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_socket.c,v 1.170.2.3 2009/05/04 10:28:53 yamt Exp $	*/
+/*	$NetBSD: nfs_socket.c,v 1.170.2.4 2009/05/04 10:48:39 yamt Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_socket.c,v 1.170.2.3 2009/05/04 10:28:53 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_socket.c,v 1.170.2.4 2009/05/04 10:48:39 yamt Exp $);
 
 #ifdef _KERNEL_OPT
 #include fs_nfs.h
@@ -1778,9 +1778,8 @@
 		 *	Resend it
 		 * Set r_rtt to -1 in case we fail to send it now.
 		 */
-		/* solock(so);		XXX PR 40491 */
+		solock(so);
 		rep-r_rtt = -1;
-		/* XXX kernel_lock for sbspace? */
 		if (sbspace(so-so_snd) = rep-r_mreq-m_pkthdr.len 
 		   ((nmp-nm_flag  NFSMNT_DUMBTIMR) ||
 		(rep-r_rflags  RR_SENT) ||

CVS commit: src/sys/dev/pci

[Mark Davies]

Module Name:src
Committed By:   markd
Date:   Mon May  4 11:05:45 UTC 2009

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

Log Message:
Treat G4X like I915 and G33 for MSAC.  Fixes aperture setting.
Has been working successfully for me and snj for the last few months.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/pci/agp_i810.c

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

Modified files:

Index: src/sys/dev/pci/agp_i810.c
diff -u src/sys/dev/pci/agp_i810.c:1.63 src/sys/dev/pci/agp_i810.c:1.64
--- src/sys/dev/pci/agp_i810.c:1.63	Thu Feb 19 05:58:37 2009
+++ src/sys/dev/pci/agp_i810.c	Mon May  4 11:05:45 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: agp_i810.c,v 1.63 2009/02/19 05:58:37 markd Exp $	*/
+/*	$NetBSD: agp_i810.c,v 1.64 2009/05/04 11:05:45 markd Exp $	*/
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.63 2009/02/19 05:58:37 markd Exp $);
+__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.64 2009/05/04 11:05:45 markd Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -706,6 +706,7 @@
 		break;
 	case CHIP_I915:
 	case CHIP_G33:
+	case CHIP_G4X:
 		reg = pci_conf_read(sc-as_pc, sc-as_tag, AGP_I915_MSAC);
 		msac = (u_int16_t)(reg  16);
 		if (msac  AGP_I915_MSAC_APER_128M)
@@ -716,16 +717,6 @@
 	case CHIP_I965:
 		size = 512 * 1024 * 1024;
 		break;
-	case CHIP_G4X:
-		reg = pci_conf_read(sc-as_pc, sc-as_tag, AGP_G4X_MSAC);
-		msac = (u_int16_t)(reg  16);
-		switch (msac  AGP_G4X_MSAC_MASK) {
-		case AGP_G4X_MSAC_APER_256M:
-			size = 256 * 1024 * 1024;		
-		case AGP_G4X_MSAC_APER_512M:
-			size = 512 * 1024 * 1024;
-		}
-		break;
 	default:
 		aprint_error(: Unknown chipset\n);
 	}

CVS commit: [yamt-nfs-mp] src/sys/nfs

[YAMAMOTO Takashi]

Module Name:src
Committed By:   yamt
Date:   Mon May  4 10:28:53 UTC 2009

Modified Files:
src/sys/nfs [yamt-nfs-mp]: nfs_socket.c nfs_srvsocket.c nfs_var.h

Log Message:
fix merge botches.


To generate a diff of this commit:
cvs rdiff -u -r1.170.2.2 -r1.170.2.3 src/sys/nfs/nfs_socket.c
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/nfs/nfs_srvsocket.c
cvs rdiff -u -r1.78.4.3 -r1.78.4.4 src/sys/nfs/nfs_var.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/nfs/nfs_socket.c
diff -u src/sys/nfs/nfs_socket.c:1.170.2.2 src/sys/nfs/nfs_socket.c:1.170.2.3
--- src/sys/nfs/nfs_socket.c:1.170.2.2	Mon May  4 08:14:22 2009
+++ src/sys/nfs/nfs_socket.c	Mon May  4 10:28:53 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_socket.c,v 1.170.2.2 2009/05/04 08:14:22 yamt Exp $	*/
+/*	$NetBSD: nfs_socket.c,v 1.170.2.3 2009/05/04 10:28:53 yamt Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_socket.c,v 1.170.2.2 2009/05/04 08:14:22 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_socket.c,v 1.170.2.3 2009/05/04 10:28:53 yamt Exp $);
 
 #ifdef _KERNEL_OPT
 #include fs_nfs.h
@@ -488,7 +488,7 @@
  * - return EPIPE if a connection is lost for connection based sockets (TCP...)
  * - do any cleanup required by recoverable socket errors (? ? ?)
  */
-static int
+int
 nfs_send(struct socket *so, struct mbuf *nam, struct mbuf *top,
 struct nfsreq *rep)
 {
@@ -2299,7 +2299,6 @@
 	}
 	pool_put(nfs_srvdesc_pool, nd);
 }
-#endif /* defined(NFSSERVER) || (defined(NFS)  !defined(NFS_V2_ONLY)) */
 
 #if defined(NFS)
 void nfs_reqq_dump(void);

Index: src/sys/nfs/nfs_srvsocket.c
diff -u src/sys/nfs/nfs_srvsocket.c:1.3.2.2 src/sys/nfs/nfs_srvsocket.c:1.3.2.3
--- src/sys/nfs/nfs_srvsocket.c:1.3.2.2	Mon May  4 08:14:22 2009
+++ src/sys/nfs/nfs_srvsocket.c	Mon May  4 10:28:53 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_srvsocket.c,v 1.3.2.2 2009/05/04 08:14:22 yamt Exp $	*/
+/*	$NetBSD: nfs_srvsocket.c,v 1.3.2.3 2009/05/04 10:28:53 yamt Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_srvsocket.c,v 1.3.2.2 2009/05/04 08:14:22 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_srvsocket.c,v 1.3.2.3 2009/05/04 10:28:53 yamt Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -495,7 +495,7 @@
 	mutex_exit(slp-ns_lock);
 
 again:
-	error = nfs_send(slp-ns_so, nd-nd_nam2, nd-nd_mreq, NULL, curlwp);
+	error = nfs_send(slp-ns_so, nd-nd_nam2, nd-nd_mreq, NULL);
 	if (nd-nd_nam2) {
 		m_free(nd-nd_nam2);
 	}

Index: src/sys/nfs/nfs_var.h
diff -u src/sys/nfs/nfs_var.h:1.78.4.3 src/sys/nfs/nfs_var.h:1.78.4.4
--- src/sys/nfs/nfs_var.h:1.78.4.3	Mon May  4 08:14:22 2009
+++ src/sys/nfs/nfs_var.h	Mon May  4 10:28:53 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_var.h,v 1.78.4.3 2009/05/04 08:14:22 yamt Exp $	*/
+/*	$NetBSD: nfs_var.h,v 1.78.4.4 2009/05/04 10:28:53 yamt Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -168,6 +168,7 @@
 int nfs_reconnect(struct nfsreq *);
 void nfs_disconnect(struct nfsmount *);
 void nfs_safedisconnect(struct nfsmount *);
+int nfs_send(struct socket *, struct mbuf *, struct mbuf *, struct nfsreq *);
 int nfs_request(struct nfsnode *, struct mbuf *, int, struct lwp *,
 	kauth_cred_t, struct mbuf **, struct mbuf **, char **, int *);
 int nfs_rephead(int, struct nfsrv_descript *, struct nfssvc_sock *,

CVS commit: src/sbin/mount

[YAMAMOTO Takashi]

Module Name:src
Committed By:   yamt
Date:   Mon May  4 11:41:48 UTC 2009

Modified Files:
src/sbin/mount: mount.c

Log Message:
disable automatic mountd reloading for now because it makes the service
temporary unavailable.  PR/41331 from FUKAUMI Naoki.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sbin/mount/mount.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/mount/mount.c
diff -u src/sbin/mount/mount.c:1.88 src/sbin/mount/mount.c:1.89
--- src/sbin/mount/mount.c:1.88	Sun Jan 11 20:39:34 2009
+++ src/sbin/mount/mount.c	Mon May  4 11:41:48 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount.c,v 1.88 2009/01/11 20:39:34 pooka Exp $	*/
+/*	$NetBSD: mount.c,v 1.89 2009/05/04 11:41:48 yamt Exp $	*/
 
 /*
  * Copyright (c) 1980, 1989, 1993, 1994
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = @(#)mount.c	8.25 (Berkeley) 5/8/95;
 #else
-__RCSID($NetBSD: mount.c,v 1.88 2009/01/11 20:39:34 pooka Exp $);
+__RCSID($NetBSD: mount.c,v 1.89 2009/05/04 11:41:48 yamt Exp $);
 #endif
 #endif /* not lint */
 
@@ -99,7 +99,9 @@
 	const char *mntfromname, *mntonname, **vfslist, *vfstype;
 	struct fstab *fs;
 	struct statvfs *mntbuf;
+#if 0
 	FILE *mountdfp;
+#endif
 	int all, ch, forceall, i, init_flags, mntsize, rval;
 	char *options;
 	const char *mountopts, *fstypename;
@@ -301,6 +303,7 @@
 		/* NOTREACHED */
 	}
 
+#if 0	/* disabled because it interferes the service. */
 	/*
 	 * If the mount was successfully, and done by root, tell mountd the
 	 * good news.  Pid checks are probably unnecessary, but don't hurt.
@@ -314,6 +317,7 @@
 			err(1, signal mountd);
 		(void)fclose(mountdfp);
 	}
+#endif
 
 	exit(rval);
 	/* NOTREACHED */

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

[Andrew Doran]

Module Name:src
Committed By:   ad
Date:   Mon May  4 11:47:29 UTC 2009

Modified Files:
src/sys/arch/i386/i386: locore.S

Log Message:
PR kern/41342: BSDi binaries cause panic

XXX Manuel, please have a look as I am not sure what to do for XEN here!


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/i386/i386/locore.S

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

Modified files:

Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.86 src/sys/arch/i386/i386/locore.S:1.87
--- src/sys/arch/i386/i386/locore.S:1.86	Sat Mar 21 22:55:08 2009
+++ src/sys/arch/i386/i386/locore.S	Mon May  4 11:47:29 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.86 2009/03/21 22:55:08 ad Exp $	*/
+/*	$NetBSD: locore.S,v 1.87 2009/05/04 11:47:29 ad Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -134,7 +134,7 @@
  */
 
 #include machine/asm.h
-__KERNEL_RCSID(0, $NetBSD: locore.S,v 1.86 2009/03/21 22:55:08 ad Exp $);
+__KERNEL_RCSID(0, $NetBSD: locore.S,v 1.87 2009/05/04 11:47:29 ad Exp $);
 
 #include opt_compat_oldboot.h
 #include opt_ddb.h
@@ -1080,7 +1080,10 @@
  * Old call gate entry for syscall
  */
 IDTVEC(osyscall)
+#ifndef XEN
+	/* XXX we are in trouble! interrupts be off here. */
 	cli			# must be first instruction
+#endif
 	pushfl			# set eflags in trap frame
 	popl	8(%esp)
 	orl	$PSL_I,(%esp)	# re-enable ints on return to user

CVS commit: src/share/man/man9

[Andrew Doran]

Module Name:src
Committed By:   ad
Date:   Mon May  4 11:44:28 UTC 2009

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

Log Message:
Add a CONCURRENCY section with some food for thought.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/share/man/man9/callout.9

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

Modified files:

Index: src/share/man/man9/callout.9
diff -u src/share/man/man9/callout.9:1.22 src/share/man/man9/callout.9:1.23
--- src/share/man/man9/callout.9:1.22	Mon May  4 11:28:20 2009
+++ src/share/man/man9/callout.9	Mon May  4 11:44:28 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: callout.9,v 1.22 2009/05/04 11:28:20 ad Exp $
+.\	$NetBSD: callout.9,v 1.23 2009/05/04 11:44:28 ad Exp $
 .\
 .\ Copyright (c) 2000, 2003, 2009 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -92,7 +92,7 @@
 .Fn timeout
 and
 .Fn untimeout .
-.Pp
+.Sh FUNCTIONS
 The
 .Fn callout_init
 function initializes the callout handle
@@ -282,6 +282,20 @@
 This is used in situations where it is necessary to protect against
 the race condition described under
 .Fn callout_invoking .
+.Sh CONCURRENCY
+The callout facility performs locking internally in order to guarantee the
+atomicity of individual operations performed on callouts.
+It does not provide life cycle management of user-provided callout data
+structures, nor does it ensure that groups of operations (multiple function
+calls) are performed atomically.
+These aspects of callout management are the responsibility of the user of
+the callout facility.
+.Pp
+Scheduled callouts may be active concurrently in a context different to the
+user of the callout facility: on another CPU, or at a different interrupt
+priority level or thread on the current CPU.
+The callout facility provides only one guarantee in this regard: any given
+callout will never have multiple concurrent invocations.
 .Sh SEE ALSO
 .Xr hz 9
 .Sh HISTORY

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

[Christoph Egger]

Module Name:src
Committed By:   cegger
Date:   Mon May  4 12:13:19 UTC 2009

Modified Files:
src/sys/arch/i386/pnpbios: ess_pnpbios.c pnpbios.c pnpbiosvar.h
wss_pnpbios.c ym_pnpbios.c

Log Message:
struct device * - device_t, use device_private


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/pnpbios/ess_pnpbios.c \
src/sys/arch/i386/pnpbios/wss_pnpbios.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/i386/pnpbios/pnpbios.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/i386/pnpbios/pnpbiosvar.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/pnpbios/ym_pnpbios.c

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

Modified files:

Index: src/sys/arch/i386/pnpbios/ess_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.17 src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.18
--- src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.17	Mon Apr 28 20:23:25 2008
+++ src/sys/arch/i386/pnpbios/ess_pnpbios.c	Mon May  4 12:13:19 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ess_pnpbios.c,v 1.17 2008/04/28 20:23:25 martin Exp $	*/
+/*	$NetBSD: ess_pnpbios.c,v 1.18 2009/05/04 12:13:19 cegger Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ess_pnpbios.c,v 1.17 2008/04/28 20:23:25 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: ess_pnpbios.c,v 1.18 2009/05/04 12:13:19 cegger Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -55,14 +55,14 @@
 #include dev/isa/essreg.h
 #include dev/isa/essvar.h
 
-int ess_pnpbios_match(struct device *, struct cfdata *, void *);
-void ess_pnpbios_attach(struct device *, struct device *, void *);
+int ess_pnpbios_match(device_t, cfdata_t, void *);
+void ess_pnpbios_attach(device_t, device_t, void *);
 
 CFATTACH_DECL(ess_pnpbios, sizeof(struct ess_softc),
 ess_pnpbios_match, ess_pnpbios_attach, NULL, NULL);
 
 int
-ess_pnpbios_match(struct device *parent, struct cfdata *match,
+ess_pnpbios_match(device_t parent, cfdata_t match,
 void *aux)
 {
 	struct pnpbiosdev_attach_args *aa = aux;
@@ -82,10 +82,10 @@
 }
 
 void
-ess_pnpbios_attach(struct device *parent, struct device *self,
+ess_pnpbios_attach(device_t parent, device_t self,
 void *aux)
 {
-	struct ess_softc *sc = (void *)self;
+	struct ess_softc *sc = device_private(self);
 	struct pnpbiosdev_attach_args *aa = aux;
 
 	if (pnpbios_io_map(aa-pbt, aa-resc, 0, sc-sc_iot, sc-sc_ioh)) {
Index: src/sys/arch/i386/pnpbios/wss_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/wss_pnpbios.c:1.17 src/sys/arch/i386/pnpbios/wss_pnpbios.c:1.18
--- src/sys/arch/i386/pnpbios/wss_pnpbios.c:1.17	Sat Mar 14 15:36:07 2009
+++ src/sys/arch/i386/pnpbios/wss_pnpbios.c	Mon May  4 12:13:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_pnpbios.c,v 1.17 2009/03/14 15:36:07 dsl Exp $ */
+/* $NetBSD: wss_pnpbios.c,v 1.18 2009/05/04 12:13:19 cegger Exp $ */
 /*
  * Copyright (c) 1999
  * 	Matthias Drochner.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wss_pnpbios.c,v 1.17 2009/03/14 15:36:07 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: wss_pnpbios.c,v 1.18 2009/05/04 12:13:19 cegger Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -50,8 +50,8 @@
 #include dev/isa/wssreg.h
 #include dev/isa/wssvar.h
 
-int wss_pnpbios_match(struct device *, struct cfdata *, void *);
-void wss_pnpbios_attach(struct device *, struct device *, void *);
+int wss_pnpbios_match(device_t, cfdata_t, void *);
+void wss_pnpbios_attach(device_t, device_t, void *);
 int wss_pnpbios_hints_index(const char *);
 
 
@@ -88,8 +88,8 @@
 }
 
 int
-wss_pnpbios_match(struct device *parent,
-struct cfdata *match, void *aux)
+wss_pnpbios_match(device_t parent,
+cfdata_t match, void *aux)
 {
 	struct pnpbiosdev_attach_args *aa = aux;
 
@@ -100,10 +100,10 @@
 }
 
 void
-wss_pnpbios_attach(struct device *parent, struct device *self,
+wss_pnpbios_attach(device_t parent, device_t self,
 void *aux)
 {
-	struct wss_softc *sc = (void *)self;
+	struct wss_softc *sc = device_private(self);
 	struct pnpbiosdev_attach_args *aa = aux;
 	struct audio_attach_args arg;
 	struct wss_pnpbios_hint *wph;

Index: src/sys/arch/i386/pnpbios/pnpbios.c
diff -u src/sys/arch/i386/pnpbios/pnpbios.c:1.65 src/sys/arch/i386/pnpbios/pnpbios.c:1.66
--- src/sys/arch/i386/pnpbios/pnpbios.c:1.65	Wed Mar 11 10:30:52 2009
+++ src/sys/arch/i386/pnpbios/pnpbios.c	Mon May  4 12:13:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pnpbios.c,v 1.65 2009/03/11 10:30:52 cegger Exp $ */
+/* $NetBSD: pnpbios.c,v 1.66 2009/05/04 12:13:19 cegger Exp $ */
 
 /*
  * Copyright (c) 2000 Jason R. Thorpe.  All rights reserved.
@@ -41,7 +41,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pnpbios.c,v 1.65 2009/03/11 10:30:52 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: pnpbios.c,v 1.66 2009/05/04 12:13:19 cegger Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -126,10 +126,8 @@
 /* configuration stuff */
 

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

[Christoph Egger]

Module Name:src
Committed By:   cegger
Date:   Mon May  4 12:14:31 UTC 2009

Modified Files:
src/sys/arch/i386/isa: ahc_isa.c lms.c mms.c

Log Message:
struct device * - device_t
No functional changes intended.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/i386/isa/ahc_isa.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/i386/isa/lms.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/i386/isa/mms.c

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

Modified files:

Index: src/sys/arch/i386/isa/ahc_isa.c
diff -u src/sys/arch/i386/isa/ahc_isa.c:1.35 src/sys/arch/i386/isa/ahc_isa.c:1.36
--- src/sys/arch/i386/isa/ahc_isa.c:1.35	Mon Apr 28 20:23:24 2008
+++ src/sys/arch/i386/isa/ahc_isa.c	Mon May  4 12:14:31 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahc_isa.c,v 1.35 2008/04/28 20:23:24 martin Exp $	*/
+/*	$NetBSD: ahc_isa.c,v 1.36 2009/05/04 12:14:31 cegger Exp $	*/
 
 /*
  * Product specific probe and attach routines for:
@@ -110,7 +110,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ahc_isa.c,v 1.35 2008/04/28 20:23:24 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: ahc_isa.c,v 1.36 2009/05/04 12:14:31 cegger Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -162,8 +162,8 @@
 int	ahc_isa_idstring(bus_space_tag_t, bus_space_handle_t, char *);
 int	ahc_isa_match(struct isa_attach_args *, bus_addr_t);
 
-int	ahc_isa_probe(struct device *, struct cfdata *, void *);
-void	ahc_isa_attach(struct device *, struct device *, void *);
+int	ahc_isa_probe(device_t, cfdata_t, void *);
+void	ahc_isa_attach(device_t, device_t, void *);
 void	aha2840_load_seeprom(struct ahc_softc *ahc);
 static int verify_seeprom_cksum(struct seeprom_config *sc);
 
@@ -303,7 +303,7 @@
  * the actual probe routine to check it out.
  */
 int
-ahc_isa_probe(struct device *parent, struct cfdata *match, void *aux)
+ahc_isa_probe(device_t parent, cfdata_t match, void *aux)
 {   
 	struct isa_attach_args *ia = aux;
 	struct ahc_isa_slot *as;
@@ -360,9 +360,9 @@
 }
 
 void
-ahc_isa_attach(struct device *parent, struct device *self, void *aux)
+ahc_isa_attach(device_t parent, device_t self, void *aux)
 {
-	struct ahc_softc *ahc = (void *)self;
+	struct ahc_softc *ahc = device_private(self);
 	struct isa_attach_args *ia = aux;
 	bus_space_tag_t iot = ia-ia_iot;
 	bus_space_handle_t ioh;

Index: src/sys/arch/i386/isa/lms.c
diff -u src/sys/arch/i386/isa/lms.c:1.54 src/sys/arch/i386/isa/lms.c:1.55
--- src/sys/arch/i386/isa/lms.c:1.54	Wed Jul  9 20:50:41 2008
+++ src/sys/arch/i386/isa/lms.c	Mon May  4 12:14:31 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: lms.c,v 1.54 2008/07/09 20:50:41 joerg Exp $	*/
+/*	$NetBSD: lms.c,v 1.55 2009/05/04 12:14:31 cegger Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles M. Hannum.
@@ -24,7 +24,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lms.c,v 1.54 2008/07/09 20:50:41 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: lms.c,v 1.55 2009/05/04 12:14:31 cegger Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -55,7 +55,7 @@
 	int sc_enabled; /* device is open */
 	int oldbuttons;	/* mouse button status */
 
-	struct device *sc_wsmousedev;
+	device_t sc_wsmousedev;
 };
 
 static int lmsprobe(device_t, cfdata_t, void *);

Index: src/sys/arch/i386/isa/mms.c
diff -u src/sys/arch/i386/isa/mms.c:1.51 src/sys/arch/i386/isa/mms.c:1.52
--- src/sys/arch/i386/isa/mms.c:1.51	Wed Jul  9 20:54:13 2008
+++ src/sys/arch/i386/isa/mms.c	Mon May  4 12:14:31 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: mms.c,v 1.51 2008/07/09 20:54:13 joerg Exp $	*/
+/*	$NetBSD: mms.c,v 1.52 2009/05/04 12:14:31 cegger Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles M. Hannum.
@@ -24,7 +24,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mms.c,v 1.51 2008/07/09 20:54:13 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: mms.c,v 1.52 2009/05/04 12:14:31 cegger Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -52,7 +52,7 @@
 
 	int sc_enabled; /* device is open */
 
-	struct device *sc_wsmousedev;
+	device_t sc_wsmousedev;
 };
 
 static int mmsprobe(device_t, cfdata_t, void *);

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

[Christoph Egger]

Module Name:src
Committed By:   cegger
Date:   Mon May  4 12:15:51 UTC 2009

Modified Files:
src/sys/arch/i386/pci: gcscehci.c p64h2apic.c

Log Message:
struct device * - device_t, use device_private()
No functional changes intended.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/pci/gcscehci.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/pci/p64h2apic.c

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

Modified files:

Index: src/sys/arch/i386/pci/gcscehci.c
diff -u src/sys/arch/i386/pci/gcscehci.c:1.4 src/sys/arch/i386/pci/gcscehci.c:1.5
--- src/sys/arch/i386/pci/gcscehci.c:1.4	Sun Jul  6 08:01:15 2008
+++ src/sys/arch/i386/pci/gcscehci.c	Mon May  4 12:15:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscehci.c,v 1.4 2008/07/06 08:01:15 cegger Exp $ */
+/* $NetBSD: gcscehci.c,v 1.5 2009/05/04 12:15:51 cegger Exp $ */
 
 /*
  * Copyright (c) 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gcscehci.c,v 1.4 2008/07/06 08:01:15 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: gcscehci.c,v 1.5 2009/05/04 12:15:51 cegger Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -73,7 +73,7 @@
 };
 
 static int
-gcscehci_match(struct device *parent, struct cfdata *match, void *aux)
+gcscehci_match(device_t parent, cfdata_t match, void *aux)
 {
 	struct pci_attach_args *pa = (struct pci_attach_args *) aux;
 
@@ -88,7 +88,7 @@
 }
 
 static void
-gcscehci_attach(struct device *parent, struct device *self, void *aux)
+gcscehci_attach(device_t parent, device_t self, void *aux)
 {
 	struct gcscehci_softc *sc = device_private(self);
 	struct pci_attach_args *pa = (struct pci_attach_args *)aux;

Index: src/sys/arch/i386/pci/p64h2apic.c
diff -u src/sys/arch/i386/pci/p64h2apic.c:1.14 src/sys/arch/i386/pci/p64h2apic.c:1.15
--- src/sys/arch/i386/pci/p64h2apic.c:1.14	Wed Jul  9 20:45:33 2008
+++ src/sys/arch/i386/pci/p64h2apic.c	Mon May  4 12:15:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: p64h2apic.c,v 1.14 2008/07/09 20:45:33 joerg Exp $ */
+/* $NetBSD: p64h2apic.c,v 1.15 2009/05/04 12:15:51 cegger Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: p64h2apic.c,v 1.14 2008/07/09 20:45:33 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: p64h2apic.c,v 1.15 2009/05/04 12:15:51 cegger Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -49,8 +49,8 @@
 #include dev/pci/pcivar.h
 #include dev/pci/pcidevs.h
 
-static int	p64h2match(struct device *, struct cfdata *, void *);
-static void	p64h2attach(struct device *, struct device *, void *);
+static int	p64h2match(device_t, cfdata_t, void *);
+static void	p64h2attach(device_t, device_t, void *);
 
 struct p64h2apic_softc {
 	pcitag_t sc_tag;

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

[Christoph Egger]

Module Name:src
Committed By:   cegger
Date:   Mon May  4 12:38:51 UTC 2009

Modified Files:
src/sys/arch/i386/isa: npx_isa.c

Log Message:
struct cfdata * - cfdata_t


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/i386/isa/npx_isa.c

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

Modified files:

Index: src/sys/arch/i386/isa/npx_isa.c
diff -u src/sys/arch/i386/isa/npx_isa.c:1.20 src/sys/arch/i386/isa/npx_isa.c:1.21
--- src/sys/arch/i386/isa/npx_isa.c:1.20	Thu Apr  2 00:09:32 2009
+++ src/sys/arch/i386/isa/npx_isa.c	Mon May  4 12:38:51 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: npx_isa.c,v 1.20 2009/04/02 00:09:32 dyoung Exp $	*/
+/*	$NetBSD: npx_isa.c,v 1.21 2009/05/04 12:38:51 cegger Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -67,7 +67,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npx_isa.c,v 1.20 2009/04/02 00:09:32 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: npx_isa.c,v 1.21 2009/05/04 12:38:51 cegger Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -83,7 +83,7 @@
 
 #include i386/isa/npxvar.h
 
-int npx_isa_probe(device_t, struct cfdata *, void *);
+int npx_isa_probe(device_t, cfdata_t, void *);
 void npx_isa_attach(device_t, device_t, void *);
 
 CFATTACH_DECL3_NEW(npx_isa, sizeof(struct npx_softc),
@@ -91,7 +91,7 @@
 DVF_DETACH_SHUTDOWN);
 
 int
-npx_isa_probe(device_t parent, struct cfdata *match, void *aux)
+npx_isa_probe(device_t parent, cfdata_t match, void *aux)
 {
 	struct isa_attach_args *ia = aux;
 	bus_space_handle_t ioh;

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

[Christoph Egger]

Module Name:src
Committed By:   cegger
Date:   Mon May  4 12:41:09 UTC 2009

Modified Files:
src/sys/arch/i386/pci: gcscpcib.c gscpcib.c

Log Message:
struct cfdata * - cfdata_t


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/i386/pci/gcscpcib.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/pci/gscpcib.c

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

Modified files:

Index: src/sys/arch/i386/pci/gcscpcib.c
diff -u src/sys/arch/i386/pci/gcscpcib.c:1.6 src/sys/arch/i386/pci/gcscpcib.c:1.7
--- src/sys/arch/i386/pci/gcscpcib.c:1.6	Sun Jul 20 22:57:19 2008
+++ src/sys/arch/i386/pci/gcscpcib.c	Mon May  4 12:41:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscpcib.c,v 1.6 2008/07/20 22:57:19 martin Exp $ */
+/* $NetBSD: gcscpcib.c,v 1.7 2009/05/04 12:41:09 cegger Exp $ */
 /* $OpenBSD: gcscpcib.c,v 1.6 2007/11/17 17:02:47 mbalmer Exp $	*/
 
 /*
@@ -24,7 +24,7 @@
  * AMD CS5535/CS5536 series LPC bridge also containing timer, watchdog and GPIO.
  */
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gcscpcib.c,v 1.6 2008/07/20 22:57:19 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: gcscpcib.c,v 1.7 2009/05/04 12:41:09 cegger Exp $);
 
 #include gpio.h
 
@@ -103,7 +103,7 @@
 #endif
 };
 
-static int	gcscpcib_match(device_t, struct cfdata *, void *);
+static int	gcscpcib_match(device_t, cfdata_t, void *);
 static void	gcscpcib_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(gcscpcib, sizeof(struct gcscpcib_softc),
@@ -125,7 +125,7 @@
 #endif
 
 static int
-gcscpcib_match(device_t parent, struct cfdata *match, void *aux)
+gcscpcib_match(device_t parent, cfdata_t match, void *aux)
 { 
 	struct pci_attach_args *pa = aux;
 

Index: src/sys/arch/i386/pci/gscpcib.c
diff -u src/sys/arch/i386/pci/gscpcib.c:1.11 src/sys/arch/i386/pci/gscpcib.c:1.12
--- src/sys/arch/i386/pci/gscpcib.c:1.11	Mon May  5 11:49:40 2008
+++ src/sys/arch/i386/pci/gscpcib.c	Mon May  4 12:41:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: gscpcib.c,v 1.11 2008/05/05 11:49:40 xtraeme Exp $	*/
+/*	$NetBSD: gscpcib.c,v 1.12 2009/05/04 12:41:09 cegger Exp $	*/
 /*	$OpenBSD: gscpcib.c,v 1.3 2004/10/05 19:02:33 grange Exp $	*/
 /*
  * Copyright (c) 2004 Alexander Yurchenko gra...@openbsd.org
@@ -23,7 +23,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gscpcib.c,v 1.11 2008/05/05 11:49:40 xtraeme Exp $);
+__KERNEL_RCSID(0, $NetBSD: gscpcib.c,v 1.12 2009/05/04 12:41:09 cegger Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -78,7 +78,7 @@
 }
 
 int
-gscpcib_match(device_t parent, struct cfdata *match, void *aux)
+gscpcib_match(device_t parent, cfdata_t match, void *aux)
 {
 	struct pci_attach_args *pa = aux;
 

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

[Christoph Egger]

Module Name:src
Committed By:   cegger
Date:   Mon May  4 12:48:26 UTC 2009

Modified Files:
src/sys/arch/x86/x86: x86_autoconf.c

Log Message:
struct cfdata * - cfdata_t


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/x86/x86/x86_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/arch/x86/x86/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.39 src/sys/arch/x86/x86/x86_autoconf.c:1.40
--- src/sys/arch/x86/x86/x86_autoconf.c:1.39	Fri May  1 09:20:02 2009
+++ src/sys/arch/x86/x86/x86_autoconf.c	Mon May  4 12:48:26 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: x86_autoconf.c,v 1.39 2009/05/01 09:20:02 cegger Exp $	*/
+/*	$NetBSD: x86_autoconf.c,v 1.40 2009/05/04 12:48:26 cegger Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: x86_autoconf.c,v 1.39 2009/05/01 09:20:02 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: x86_autoconf.c,v 1.40 2009/05/04 12:48:26 cegger Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -340,7 +340,7 @@
 
 	if ((biv = lookup_bootinfo(BTINFO_ROOTDEVICE)) != NULL) {
 		TAILQ_FOREACH(dv, alldevs, dv_list) {
-			struct cfdata *cd;
+			cfdata_t cd;
 			size_t len;
 
 			if (device_class(dv) != DV_DISK)

CVS commit: src/sys/rump

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Mon May  4 14:31:25 UTC 2009

Modified Files:
src/sys/rump/include/rump: rump.h
src/sys/rump/librump/rumpvfs: rump_vfs.c

Log Message:
Nuke RUMPCN_HASNTBUF.  The inspiration behind it must've been ... deep.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/rump/include/rump/rump.h
cvs rdiff -u -r1.20 -r1.21 src/sys/rump/librump/rumpvfs/rump_vfs.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/rump/include/rump/rump.h
diff -u src/sys/rump/include/rump/rump.h:1.16 src/sys/rump/include/rump/rump.h:1.17
--- src/sys/rump/include/rump/rump.h:1.16	Sun May  3 17:09:49 2009
+++ src/sys/rump/include/rump/rump.h	Mon May  4 14:31:25 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.h,v 1.16 2009/05/03 17:09:49 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.17 2009/05/04 14:31:25 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -84,7 +84,6 @@
 void			rump_freecn(struct componentname *, int);
 #define RUMPCN_ISLOOKUP 0x01
 #define RUMPCN_FREECRED 0x02
-#define RUMPCN_HASNTBUF 0x04
 int			rump_namei(uint32_t, uint32_t, const char *,
    struct vnode **, struct vnode **,
    struct componentname **);

Index: src/sys/rump/librump/rumpvfs/rump_vfs.c
diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.20 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.21
--- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.20	Sun May  3 17:09:49 2009
+++ src/sys/rump/librump/rumpvfs/rump_vfs.c	Mon May  4 14:31:25 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump_vfs.c,v 1.20 2009/05/03 17:09:49 pooka Exp $	*/
+/*	$NetBSD: rump_vfs.c,v 1.21 2009/05/04 14:31:25 pooka Exp $	*/
 
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
@@ -218,13 +218,11 @@
 	if (flags  RUMPCN_FREECRED)
 		rump_cred_put(cnp-cn_cred);
 
-	if ((flags  RUMPCN_HASNTBUF) == 0) {
-		if (cnp-cn_flags  SAVENAME) {
-			if (flags  RUMPCN_ISLOOKUP ||cnp-cn_flags  SAVESTART)
-PNBUF_PUT(cnp-cn_pnbuf);
-		} else {
+	if (cnp-cn_flags  SAVENAME) {
+		if (flags  RUMPCN_ISLOOKUP || cnp-cn_flags  SAVESTART)
 			PNBUF_PUT(cnp-cn_pnbuf);
-		}
+	} else {
+		PNBUF_PUT(cnp-cn_pnbuf);
 	}
 	kmem_free(cnp, sizeof(*cnp));
 }

CVS commit: src/share/man/man9

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 13:37:57 UTC 2009

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

Log Message:
Add missing word.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/share/man/man9/callout.9

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

Modified files:

Index: src/share/man/man9/callout.9
diff -u src/share/man/man9/callout.9:1.23 src/share/man/man9/callout.9:1.24
--- src/share/man/man9/callout.9:1.23	Mon May  4 11:44:28 2009
+++ src/share/man/man9/callout.9	Mon May  4 13:37:57 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: callout.9,v 1.23 2009/05/04 11:44:28 ad Exp $
+.\	$NetBSD: callout.9,v 1.24 2009/05/04 13:37:57 wiz Exp $
 .\
 .\ Copyright (c) 2000, 2003, 2009 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -159,7 +159,7 @@
 .Pp
 The
 .Fn callout_stop
-function requests that the timer associated the callout handle
+function requests that the timer associated with the callout handle
 .Fa c
 be stopped.
 The

CVS commit: src/sys/dev

[Emmanuel Dreyfus]

Module Name:src
Committed By:   manu
Date:   Mon May  4 16:20:41 UTC 2009

Modified Files:
src/sys/dev: md.c

Log Message:
TFTPROOT loads the RAMdisk through TFTP at boot time. It needs the
network to be functionnal, and therefore must be called after
config_finalize(). Unfortunately, config_finalize() attaches md0
through mdattach(), and when tftproot_getfile() attempts to attach it
later by calling mdattach() again, it gets a failure.

This change checks for the RAMdisk size in mdattach(). If it is zero, then
the RAMdisk has not been loaded yet, and nothing is done. It will be
attached later when tftproot_getfile() will call mdattach()


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/md.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/md.c
diff -u src/sys/dev/md.c:1.57 src/sys/dev/md.c:1.58
--- src/sys/dev/md.c:1.57	Tue Jan 13 13:35:52 2009
+++ src/sys/dev/md.c	Mon May  4 16:20:41 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.57 2009/01/13 13:35:52 yamt Exp $	*/
+/*	$NetBSD: md.c,v 1.58 2009/05/04 16:20:41 manu Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -46,9 +46,10 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: md.c,v 1.57 2009/01/13 13:35:52 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: md.c,v 1.58 2009/05/04 16:20:41 manu Exp $);
 
 #include opt_md.h
+#include opt_tftproot.h
 
 #include sys/param.h
 #include sys/kernel.h
@@ -118,6 +119,8 @@
 CFATTACH_DECL_NEW(md, sizeof(struct md_softc),
 	0, md_attach, 0, NULL);
 
+extern size_t md_root_size;
+
 /*
  * This is called if we are configured as a pseudo-device
  */
@@ -127,6 +130,14 @@
 	int i;
 	cfdata_t cf;
 
+#ifdef TFTPROOT
+	/* 
+	 * Attachement of md0 must be done after md_root_setconf(), 
+	 * because the RAMdisk is not loaded yet.
+	 */
+	if (md_root_size == 0)
+		return;
+#endif
 	if (config_cfattach_attach(md, md_ca)) {
 		printf(md: cfattach_attach failed\n);
 		return;

CVS commit: src/gnu/dist/binutils/bfd

[Michael L. Hitch]

Module Name:src
Committed By:   mhitch
Date:   Mon May  4 17:56:36 UTC 2009

Modified Files:
src/gnu/dist/binutils/bfd: elf32-vax.c

Log Message:
Allocate relocation section using bfd_zalloc() to ensure no garbage
relocations when not all the entries are used.  Fixes PR port-vax/39182.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/gnu/dist/binutils/bfd/elf32-vax.c

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

Modified files:

Index: src/gnu/dist/binutils/bfd/elf32-vax.c
diff -u src/gnu/dist/binutils/bfd/elf32-vax.c:1.8 src/gnu/dist/binutils/bfd/elf32-vax.c:1.9
--- src/gnu/dist/binutils/bfd/elf32-vax.c:1.8	Sat Nov  1 15:09:11 2008
+++ src/gnu/dist/binutils/bfd/elf32-vax.c	Mon May  4 17:56:35 2009
@@ -1310,7 +1310,12 @@
 	}
 
   /* Allocate memory for the section contents.  */
-  s-contents = (bfd_byte *) bfd_alloc (dynobj, s-size);
+  /* FIXME: This should be a call to bfd_alloc not bfd_zalloc.
+	 Unused entries should be reclaimed before the section's contents
+	 are written out, but at the moment this does not happen.  Thus in
+	 order to prevent writing out garbage, we initialise the section's
+	 contents to zero.  */
+  s-contents = (bfd_byte *) bfd_zalloc (dynobj, s-size);
   if (s-contents == NULL  s-size != 0)
 	return FALSE;
 }

CVS commit: src/sbin/disklabel

[Michael L. Hitch]

Module Name:src
Committed By:   mhitch
Date:   Mon May  4 18:09:04 UTC 2009

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

Log Message:
fix sign-compare issues in vax-specific code.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sbin/disklabel/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/disklabel/main.c
diff -u src/sbin/disklabel/main.c:1.19 src/sbin/disklabel/main.c:1.20
--- src/sbin/disklabel/main.c:1.19	Sun Jul 20 01:20:22 2008
+++ src/sbin/disklabel/main.c	Mon May  4 18:09:04 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.19 2008/07/20 01:20:22 lukem Exp $	*/
+/*	$NetBSD: main.c,v 1.20 2009/05/04 18:09:04 mhitch Exp $	*/
 
 /*
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
 static char sccsid[] = @(#)disklabel.c	8.4 (Berkeley) 5/4/95;
 /* from static char sccsid[] = @(#)disklabel.c	1.2 (Symmetric) 11/28/85; */
 #else
-__RCSID($NetBSD: main.c,v 1.19 2008/07/20 01:20:22 lukem Exp $);
+__RCSID($NetBSD: main.c,v 1.20 2009/05/04 18:09:04 mhitch Exp $);
 #endif
 #endif	/* not lint */
 
@@ -549,7 +549,7 @@
 		}
 
 		alt = lab.d_ncylinders * lab.d_secpercyl - lab.d_nsectors;
-		for (i = 1; i  11  i  lab.d_nsectors; i += 2) {
+		for (i = 1; i  11  (uint32_t)i  lab.d_nsectors; i += 2) {
 			if (pwrite(f, sec0, 512, (off_t)(alt + i) * 512)  512)
 warn(alternate label %d write, i/2);
 		}

CVS commit: src/usr.sbin/powerd

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 19:11:49 UTC 2009

Modified Files:
src/usr.sbin/powerd: powerd.8

Log Message:
New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/powerd/powerd.8

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/powerd/powerd.8
diff -u src/usr.sbin/powerd/powerd.8:1.18 src/usr.sbin/powerd/powerd.8:1.19
--- src/usr.sbin/powerd/powerd.8:1.18	Sat Dec 22 18:40:21 2007
+++ src/usr.sbin/powerd/powerd.8	Mon May  4 19:11:49 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: powerd.8,v 1.18 2007/12/22 18:40:21 jmcneill Exp $
+.\	$NetBSD: powerd.8,v 1.19 2009/05/04 19:11:49 wiz Exp $
 .\
 .\ Copyright (c) 2003 Wasabi Systems, Inc.
 .\ All rights reserved.
@@ -190,9 +190,10 @@
 .It low-power
 System is running in low power, that means that there is not
 any AC Adapter connected and all batteries are in critical or
-low capacity. When this event is received there's no much time
-so you should only suspend or shutdown the system. The script
-shutdowns the system gracefully by default.
+low capacity.
+When this event is received there's no much time so you should only
+suspend or shutdown the system.
+The script shutdowns the system gracefully by default.
 .El
 .Pp
 The following events are defined for drive and battery sensors:

CVS commit: src/lib/libutil

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 19:15:37 UTC 2009

Modified Files:
src/lib/libutil: efun.3

Log Message:
Sort SEE ALSO.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libutil/efun.3

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

Modified files:

Index: src/lib/libutil/efun.3
diff -u src/lib/libutil/efun.3:1.8 src/lib/libutil/efun.3:1.9
--- src/lib/libutil/efun.3:1.8	Wed Apr 30 13:10:52 2008
+++ src/lib/libutil/efun.3	Mon May  4 19:15:36 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: efun.3,v 1.8 2008/04/30 13:10:52 martin Exp $
+.\ $NetBSD: efun.3,v 1.9 2009/05/04 19:15:36 wiz Exp $
 .\
 .\ Copyright (c) 2006 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -110,7 +110,7 @@
 .Xr malloc 3 ,
 .Xr realloc 3 ,
 .Xr strdup 3 ,
-.Xr strndup 3 ,
 .Xr strlcat 3 ,
 .Xr strlcpy 3 ,
+.Xr strndup 3 ,
 .Xr vasprintf 3

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 19:16:41 UTC 2009

Modified Files:
src/share/man/man4: ipmi.4

Log Message:
Add an article.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/ipmi.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/ipmi.4
diff -u src/share/man/man4/ipmi.4:1.6 src/share/man/man4/ipmi.4:1.7
--- src/share/man/man4/ipmi.4:1.6	Mon Sep  8 16:18:37 2008
+++ src/share/man/man4/ipmi.4	Mon May  4 19:16:41 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: ipmi.4,v 1.6 2008/09/08 16:18:37 wiz Exp $
+.\	$NetBSD: ipmi.4,v 1.7 2009/05/04 19:16:41 wiz Exp $
 .\
 .\ Copyright (c) 2006 Manuel Bouyer.
 .\
@@ -49,7 +49,7 @@
 .Nm
 driver is able to send events to
 .Xr powerd 8
-when sensor's state has changed.
+when a sensor's state has changed.
 Intrusion sensors will send a
 .Em critical
 event when state is not ok.

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 19:17:49 UTC 2009

Modified Files:
src/share/man/man4: acpibat.4

Log Message:
New sentence, new line. Use Pa for paths.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/acpibat.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/acpibat.4
diff -u src/share/man/man4/acpibat.4:1.6 src/share/man/man4/acpibat.4:1.7
--- src/share/man/man4/acpibat.4:1.6	Wed Apr 30 13:10:53 2008
+++ src/share/man/man4/acpibat.4	Mon May  4 19:17:49 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: acpibat.4,v 1.6 2008/04/30 13:10:53 martin Exp $
+.\ $NetBSD: acpibat.4,v 1.7 2009/05/04 19:17:49 wiz Exp $
 .\
 .\ Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -47,12 +47,13 @@
 .Nm
 driver is able to send events to
 .Xr powerd 8
-when capacity state has been changed. The new state will be reported
-as the
+when capacity state has been changed.
+The new state will be reported as the
 .Em fourth
 argument to the
-.Fa /etc/powerd/scripts/sensor_battery
-script. If a custom capacity limit was set via
+.Pa /etc/powerd/scripts/sensor_battery
+script.
+If a custom capacity limit was set via
 .Xr envstat 8 ,
 the
 .Nm

CVS commit: src/share/man/man9

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 19:40:02 UTC 2009

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

Log Message:
Sort SEE ALSO. Drop trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/share/man/man9/opencrypto.9

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

Modified files:

Index: src/share/man/man9/opencrypto.9
diff -u src/share/man/man9/opencrypto.9:1.6 src/share/man/man9/opencrypto.9:1.7
--- src/share/man/man9/opencrypto.9:1.6	Thu Mar 12 12:43:13 2009
+++ src/share/man/man9/opencrypto.9	Mon May  4 19:40:02 2009
@@ -1,5 +1,5 @@
 .\	$OpenBSD: crypto.9,v 1.25 2003/07/11 13:47:41 jmc Exp $
-.\	$NetBSD: opencrypto.9,v 1.6 2009/03/12 12:43:13 joerg Exp $
+.\	$NetBSD: opencrypto.9,v 1.7 2009/05/04 19:40:02 wiz Exp $
 .\
 .\ The author of this man page is Angelos D. Keromytis (ange...@cis.upenn.edu)
 .\
@@ -137,7 +137,7 @@
 input and output parameters.
 .Pp
 Since the consumers may not be associated with a process, drivers may
-not use condition variables: 
+not use condition variables:
 .Xr condvar 9 .
 The same holds for the framework.
 Thus, a callback mechanism is used
@@ -564,9 +564,9 @@
 most of the framework code
 .El
 .Sh SEE ALSO
-.Xr condvar 9 ,
 .Xr ipsec 4 ,
 .Xr pcmcia 4 ,
+.Xr condvar 9 ,
 .Xr malloc 9
 .Rs
 .%A Angelos D. Keromytis

CVS commit: src/share/man/man9

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 19:41:10 UTC 2009

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

Log Message:
Prepare for HTML output.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/share/man/man9/dmover.9

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

Modified files:

Index: src/share/man/man9/dmover.9
diff -u src/share/man/man9/dmover.9:1.12 src/share/man/man9/dmover.9:1.13
--- src/share/man/man9/dmover.9:1.12	Wed Dec  5 04:48:57 2007
+++ src/share/man/man9/dmover.9	Mon May  4 19:41:09 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: dmover.9,v 1.12 2007/12/05 04:48:57 ad Exp $
+.\	$NetBSD: dmover.9,v 1.13 2009/05/04 19:41:09 wiz Exp $
 .\
 .\ Copyright (c) 2002 Wasabi Systems, Inc.
 .\ All rights reserved.
@@ -575,7 +575,7 @@
 	struct dmover_request *dreq;
 	int error;
 
-	error = dmover_session_create(DMOVER_FUNC_ZERO, dses);
+	error = dmover_session_create(DMOVER_FUNC_ZERO, \*[Am]dses);
 	if (error)
 		return (error);
 
@@ -585,16 +585,16 @@
 		return (ENOMEM);
 	}
 
-	dreq-dreq_flags = DMOVER_REQ_WAIT;
-	dreq-dreq_callback = NULL;
-	dreq-dreq_outbuf.dreq_outbuf_type = DMOVER_BUF_LINEAR;
-	dreq-dreq_outbuf.dmbuf_linear.l_addr = buf;
-	dreq-dreq_outbuf.dmbuf_linear.l_len = len;
+	dreq-\*[Gt]dreq_flags = DMOVER_REQ_WAIT;
+	dreq-\*[Gt]dreq_callback = NULL;
+	dreq-\*[Gt]dreq_outbuf.dreq_outbuf_type = DMOVER_BUF_LINEAR;
+	dreq-\*[Gt]dreq_outbuf.dmbuf_linear.l_addr = buf;
+	dreq-\*[Gt]dreq_outbuf.dmbuf_linear.l_len = len;
 
 	dmover_process(dreq);
 
-	error = (dreq-dreq_flags  DMOVER_REQ_ERROR) ?
-	dreq-dreq_error : 0;
+	error = (dreq-\*[Gt]dreq_flags \*[Am] DMOVER_REQ_ERROR) ?
+	dreq-\*[Gt]dreq_error : 0;
 
 	dmover_request_free(dreq);
 	dmover_session_destroy(dses);

CVS commit: src/share/man/man9

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 19:42:14 UTC 2009

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

Log Message:
s/ctxsw/mi_switch/


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/share/man/man9/intro.9

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

Modified files:

Index: src/share/man/man9/intro.9
diff -u src/share/man/man9/intro.9:1.10 src/share/man/man9/intro.9:1.11
--- src/share/man/man9/intro.9:1.10	Wed Mar 11 13:52:49 2009
+++ src/share/man/man9/intro.9	Mon May  4 19:42:14 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: intro.9,v 1.10 2009/03/11 13:52:49 joerg Exp $
+.\ $NetBSD: intro.9,v 1.11 2009/05/04 19:42:14 wiz Exp $
 .\
 .\ Copyright (c) 1997, 2007 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -93,7 +93,7 @@
 .Pp
 Switch to another light weight process.
 See
-.Xr ctxsw 9 .
+.Xr mi_switch 9 .
 .Pp
 Current process and processor.
 See

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 19:45:51 UTC 2009

Modified Files:
src/share/man/man4: ahc.4

Log Message:
New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/share/man/man4/ahc.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/ahc.4
diff -u src/share/man/man4/ahc.4:1.32 src/share/man/man4/ahc.4:1.33
--- src/share/man/man4/ahc.4:1.32	Fri Apr 10 15:05:06 2009
+++ src/share/man/man4/ahc.4	Mon May  4 19:45:51 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: ahc.4,v 1.32 2009/04/10 15:05:06 joerg Exp $
+.\	$NetBSD: ahc.4,v 1.33 2009/05/04 19:45:51 wiz Exp $
 .\
 .\ Copyright (c) 1995, 1996, 1997, 1998, 2000
 .\ 	Justin T. Gibbs.  All rights reserved.
@@ -162,7 +162,8 @@
 .\ Individual controllers may be configured to operate in the target role
 .\ through the
 .\ .Dq Dv AHC_TMODE_ENABLE
-.\ configuration option.  The value assigned to this option should be a bitmap
+.\ configuration option.
+.\ The value assigned to this option should be a bitmap
 .\ of all units where target mode is desired.
 .\ For example, a value of 0x25, would enable target mode on units 0, 2, and 5.
 .\ .Pp
@@ -202,7 +203,8 @@
 .Pq Tn VESA No local bus controller
 in an
 .Tn EISA
-system.  The jumpers setting the I/O area for the 284x should match the
+system.
+The jumpers setting the I/O area for the 284x should match the
 .Tn EISA
 slot into which the card is inserted to prevent conflicts with other
 .Tn EISA
@@ -212,9 +214,10 @@
 The following table provides a comparison of the different chips supported
 by the
 .Nm
-driver.  Note that wide and twin channel features, although always supported
-by a particular chip, may be disabled in a particular motherboard or card
-design.
+driver.
+Note that wide and twin channel features, although always supported
+by a particular chip, may be disabled in a particular motherboard
+or card design.
 .Pp
 .Bl -column aic7895c MIPS EISA/VL MaxSync MaxWidth SCBs 2 3 4 5 6 7 8
 .It Sy Chip  Ta Sy MIPS Ta Sy Bus Ta Sy MaxSync Ta Sy MaxWidth Ta Sy SCBs Ta Sy Features
@@ -394,11 +397,14 @@
 .Sh SCSI CONTROL BLOCKS (SCBs)
 Every transaction sent to a device on the SCSI bus is assigned a
 .Sq SCSI Control Block
-(SCB).  The SCB contains all of the information required by the
-controller to process a transaction.  The chip feature table lists
-the number of SCBs that can be stored in on-chip memory.  All chips
-with model numbers greater than or equal to 7870 allow for the on chip
-SCB space to be augmented with external SRAM up to a maximum of 255 SCBs.
+(SCB).
+The SCB contains all of the information required by the controller
+to process a transaction.
+The chip feature table lists the number of SCBs that can be stored
+in on-chip memory.
+All chips with model numbers greater than or equal to 7870 allow
+for the on chip SCB space to be augmented with external SRAM up to
+a maximum of 255 SCBs.
 Very few Adaptec controller configurations have external SRAM.
 .Pp
 If external SRAM is not available, SCBs are a limited resource.
@@ -408,20 +414,23 @@
 requires much more concurrency.
 The solution to this problem is
 .Em SCB Paging ,
-a concept similar to memory paging.  SCB paging takes advantage of
-the fact that devices usually disconnect from the SCSI bus for long
-periods of time without talking to the controller.  The SCBs
-for disconnected transactions are only of use to the controller
-when the transfer is resumed.  When the host queues another transaction
-for the controller to execute, the controller firmware will use a
-free SCB if one is available.  Otherwise, the state of the most recently
-disconnected (and therefor most likely to stay disconnected) SCB is
-saved, via DMA, to host memory, and the local SCB reused to start
-the new transaction.  This allows the controller to queue up to
-255 transactions regardless of the amount of SCB space.  Since the
-local SCB space serves as a cache for disconnected transactions, the
-more SCB space available, the less host bus traffic consumed saving
-and restoring SCB data.
+a concept similar to memory paging.
+SCB paging takes advantage of the fact that devices usually disconnect
+from the SCSI bus for long periods of time without talking to the
+controller.
+The SCBs for disconnected transactions are only of use to the
+controller when the transfer is resumed.
+When the host queues another transaction for the controller to
+execute, the controller firmware will use a free SCB if one is
+available.
+Otherwise, the state of the most recently disconnected (and therefor
+most likely to stay disconnected) SCB is saved, via DMA, to host
+memory, and the local SCB reused to start the new transaction.
+This allows the controller to queue up to
+255 transactions regardless of the amount of SCB space.
+Since the local SCB space serves as a cache for disconnected
+transactions, the more SCB 

CVS commit: src/share/man/man9

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 19:48:15 UTC 2009

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

Log Message:
New sentence, new line. Prepare for HTML output.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/man/man9/mi_switch.9

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

Modified files:

Index: src/share/man/man9/mi_switch.9
diff -u src/share/man/man9/mi_switch.9:1.2 src/share/man/man9/mi_switch.9:1.3
--- src/share/man/man9/mi_switch.9:1.2	Wed Apr 30 13:10:58 2008
+++ src/share/man/man9/mi_switch.9	Mon May  4 19:48:15 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: mi_switch.9,v 1.2 2008/04/30 13:10:58 martin Exp $
+.\	$NetBSD: mi_switch.9,v 1.3 2009/05/04 19:48:15 wiz Exp $
 .\
 .\ Copyright (c) 1996, 2002 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -40,9 +40,11 @@
 The
 .Fn mi_switch
 function implements the machine-independent prelude to an LWP context
-switch. It is called from only a few distinguished places in the
-kernel code as a result of the principle of non-preemptable kernel
-mode execution. The three major uses of
+switch.
+It is called from only a few distinguished places in the kernel
+code as a result of the principle of non-preemptable kernel mode
+execution.
+The three major uses of
 .Fn mi_switch
 can be enumerated as follows:
 .Bl -enum -offset indent
@@ -75,14 +77,14 @@
 .Dv SIGKILL .
 .Pp
 Unless
-.Fa l-l_switchto
+.Fa l-\*[Gt]l_switchto
 is not
 .Dv NULL ,
 .Fn mi_switch
 will call
 .Fn sched_nextlwp
-to select a new LWP from the scheduler's runqueue structures. If no
-runnable LWP is found, the idle LWP is used.
+to select a new LWP from the scheduler's runqueue structures.
+If no runnable LWP is found, the idle LWP is used.
 If the new LWP is not equal to the current one,
 .Fn mi_switch
 will hand over control to the machine-dependent function
@@ -91,11 +93,12 @@
 .Pp
 .Fn mi_switch
 has to be called with the LWP lock held
-(through calling 
+(through calling
 .Fn lwp_lock
 first) and at the
 .Xr splsched 9
-interrupt protection level. It returns with the LWP lock released.
+interrupt protection level.
+It returns with the LWP lock released.
 .Sh RETURN VALUES
 .Fn mi_switch
 returns 1 if a context switch was performed to a

CVS commit: src/dist/pppd/chat

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 19:52:34 UTC 2009

Modified Files:
src/dist/pppd/chat: chat.8

Log Message:
New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/dist/pppd/chat/chat.8

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

Modified files:

Index: src/dist/pppd/chat/chat.8
diff -u src/dist/pppd/chat/chat.8:1.3 src/dist/pppd/chat/chat.8:1.4
--- src/dist/pppd/chat/chat.8:1.3	Wed Jul 18 18:36:57 2007
+++ src/dist/pppd/chat/chat.8	Mon May  4 19:52:34 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: chat.8,v 1.3 2007/07/18 18:36:57 christos Exp $
+.\	$NetBSD: chat.8,v 1.4 2009/05/04 19:52:34 wiz Exp $
 .\
 .\ -*- nroff -*-
 .\ manual page [] for chat 1.8
@@ -20,35 +20,45 @@
 .SH DESCRIPTION
 .LP
 The \fIchat\fR program defines a conversational exchange between the
-computer and the modem. Its primary purpose is to establish the
+computer and the modem.
+Its primary purpose is to establish the
 connection between the Point-to-Point Protocol Daemon (\fIpppd\fR) and
 the remote's \fIpppd\fR process.
 .SH OPTIONS
 .TP
 .B \-f \fI\*[Lt]chat file\*[Gt]
-Read the chat script from the chat \fIfile\fR. The use of this option
-is mutually exclusive with the chat script parameters. The user must
-have read access to the file. Multiple lines are permitted in the
-file. Space or horizontal tab characters should be used to separate
+Read the chat script from the chat \fIfile\fR.
+The use of this option
+is mutually exclusive with the chat script parameters.
+The user must have read access to the file.
+Multiple lines are permitted in the file.
+Space or horizontal tab characters should be used to separate
 the strings.
 .TP
 .B \-t \fI\*[Lt]timeout\*[Gt]
-Set the timeout for the expected string to be received. If the string
+Set the timeout for the expected string to be received.
+If the string
 is not received within the time limit then the reply string is not
-sent. An alternate reply may be sent or the script will fail if there
-is no alternate reply string. A failed script will cause the
+sent.
+An alternate reply may be sent or the script will fail if there
+is no alternate reply string.
+A failed script will cause the
 \fIchat\fR program to terminate with a non-zero error code.
 .TP
 .B \-r \fI\*[Lt]report file\*[Gt]
-Set the file for output of the report strings. If you use the keyword
-\fIREPORT\fR, the resulting strings are written to this file. If this
+Set the file for output of the report strings.
+If you use the keyword
+\fIREPORT\fR, the resulting strings are written to this file.
+If this
 option is not used and you still use \fIREPORT\fR keywords, the
 \fIstderr\fR file is used for the report strings.
 .TP
 .B \-e
-Start with the echo option turned on. Echoing may also be turned on
+Start with the echo option turned on.
+Echoing may also be turned on
 or off at specific points in the chat script by using the \fIECHO\fR
-keyword. When echoing is enabled, all output from the modem is echoed
+keyword.
+When echoing is enabled, all output from the modem is echoed
 to \fIstderr\fR.
 .TP
 .B \-E
@@ -56,27 +66,32 @@
 standard \fI$xxx\fR syntax.
 .TP
 .B \-v
-Request that the \fIchat\fR script be executed in a verbose mode. The
+Request that the \fIchat\fR script be executed in a verbose mode.
+The
 \fIchat\fR program will then log the execution state of the chat
 script as well as all text received from the modem and the output
-strings sent to the modem.  The default is to log through the SYSLOG;
-the logging method may be altered with the \-S and \-s flags. SYSLOGs
-are logged to facility LOG_LOCAL2.
+strings sent to the modem.
+The default is to log through the SYSLOG;
+the logging method may be altered with the \-S and \-s flags.
+SYSLOGs are logged to facility LOG_LOCAL2.
 .TP
 .B \-V
 Request that the \fIchat\fR script be executed in a stderr verbose
-mode. The \fIchat\fR program will then log all text received from the
-modem and the output strings sent to the modem to the stderr device. This
-device is usually the local console at the station running the chat or
+mode.
+The \fIchat\fR program will then log all text received from the
+modem and the output strings sent to the modem to the stderr device.
+This device is usually the local console at the station running the chat or
 pppd program.
 .TP
 .B \-s
-Use stderr.  All log messages from '\-v' and all error messages will be
+Use stderr.
+All log messages from '\-v' and all error messages will be
 sent to stderr.
 .TP
 .B \-S
-Do not use the SYSLOG.  By default, error messages are sent to the
-SYSLOG.  The use of \-S will prevent both log messages from '\-v' and
+Do not use the SYSLOG.
+By default, error messages are sent to the SYSLOG.
+The use of \-S will prevent both log messages from '\-v' and
 error messages from being sent to the SYSLOG (to facility LOG_LOCAL2).
 .TP
 .B \-T \fI\*[Lt]phone number\*[Gt]
@@ -103,29 

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 20:09:10 UTC 2009

Modified Files:
src/share/man/man4: options.4

Log Message:
Uppercase CPU.


To generate a diff of this commit:
cvs rdiff -u -r1.378 -r1.379 src/share/man/man4/options.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/options.4
diff -u src/share/man/man4/options.4:1.378 src/share/man/man4/options.4:1.379
--- src/share/man/man4/options.4:1.378	Fri Apr 10 22:58:33 2009
+++ src/share/man/man4/options.4	Mon May  4 20:09:10 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: options.4,v 1.378 2009/04/10 22:58:33 perry Exp $
+.\	$NetBSD: options.4,v 1.379 2009/05/04 20:09:10 wiz Exp $
 .\
 .\ Copyright (c) 1996
 .\ 	Perry E. Metzger.  All rights reserved.
@@ -2420,7 +2420,7 @@
 if supported.
 .It Cd options POWERNOW_K8
 Include support for AMD Athlon 64 PowerNow! and Cool`n'Quiet
-Technology, used to change the cpu voltage and frequency
+Technology, used to change the CPU voltage and frequency
 on the fly.
 .El
 .Ss atari-specific Options

CVS commit: src/share/man/man9

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 20:10:20 UTC 2009

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

Log Message:
Use Aq instead of \*[Lt]\*[Gt].


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/share/man/man9/scsipi.9

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

Modified files:

Index: src/share/man/man9/scsipi.9
diff -u src/share/man/man9/scsipi.9:1.22 src/share/man/man9/scsipi.9:1.23
--- src/share/man/man9/scsipi.9:1.22	Thu Apr  2 19:02:42 2009
+++ src/share/man/man9/scsipi.9	Mon May  4 20:10:19 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: scsipi.9,v 1.22 2009/04/02 19:02:42 mjf Exp $
+.\	$NetBSD: scsipi.9,v 1.23 2009/05/04 20:10:19 wiz Exp $
 .\
 .\
 .\ Copyright (c) 2001 Manuel Bouyer.
@@ -194,7 +194,7 @@
 .It Va int chan_defquirks
 default device quirks.
 Quirks are defined in
-.Pa \*[Lt]dev/scsipi/scsipiconf.h\*[Gt]
+.Aq Pa dev/scsipi/scsipiconf.h
 and are usually set in the middle layer based on the device's inquiry
 data.
 For some kinds of adapters it may be convenient to have a set of

CVS commit: src/sbin/mount_union

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 20:11:31 UTC 2009

Modified Files:
src/sbin/mount_union: mount_union.8

Log Message:
Fix typo in Dd argument.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sbin/mount_union/mount_union.8

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

Modified files:

Index: src/sbin/mount_union/mount_union.8
diff -u src/sbin/mount_union/mount_union.8:1.18 src/sbin/mount_union/mount_union.8:1.19
--- src/sbin/mount_union/mount_union.8:1.18	Tue Feb  5 16:54:07 2008
+++ src/sbin/mount_union/mount_union.8	Mon May  4 20:11:30 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: mount_union.8,v 1.18 2008/02/05 16:54:07 ad Exp $
+.\	$NetBSD: mount_union.8,v 1.19 2009/05/04 20:11:30 wiz Exp $
 .\
 .\ Copyright (c) 1994
 .\ The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\
 .\	@(#)mount_union.8	8.7 (Berkeley) 5/1/95
 .\
-.Dd Febuary 5, 2008
+.Dd February 5, 2008
 .Dt MOUNT_UNION 8
 .Os
 .Sh NAME

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 20:37:07 UTC 2009

Modified Files:
src/share/man/man4: raid.4

Log Message:
New sentence, new line. Sort SEE ALSO.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/share/man/man4/raid.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/raid.4
diff -u src/share/man/man4/raid.4:1.35 src/share/man/man4/raid.4:1.36
--- src/share/man/man4/raid.4:1.35	Fri May  2 18:11:05 2008
+++ src/share/man/man4/raid.4	Mon May  4 20:37:07 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: raid.4,v 1.35 2008/05/02 18:11:05 martin Exp $
+.\ $NetBSD: raid.4,v 1.36 2009/05/04 20:37:07 wiz Exp $
 .\
 .\ Copyright (c) 1998 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -87,7 +87,8 @@
 .Nx .
 This
 document assumes that the reader has at least some familiarity with RAID
-and RAID concepts.  The reader is also assumed to know how to configure
+and RAID concepts.
+The reader is also assumed to know how to configure
 disks and pseudo-devices into kernels, how to generate kernels, and how
 to partition disks.
 .Pp
@@ -110,12 +111,16 @@
 at the end of this section.
 .Pp
 Depending on the parity level configured, the device driver can
-support the failure of component drives.  The number of failures
-allowed depends on the parity level selected.  If the driver is able
+support the failure of component drives.
+The number of failures
+allowed depends on the parity level selected.
+If the driver is able
 to handle drive failures, and a drive does fail, then the system is
-operating in degraded mode.  In this mode, all missing data must be
+operating in degraded mode.
+In this mode, all missing data must be
 reconstructed from the data and parity present on the other
-components.  This results in much slower data accesses, but
+components.
+This results in much slower data accesses, but
 does mean that a failure need not bring the system to a complete halt.
 .Pp
 The RAID driver supports and enforces the use of
@@ -139,7 +144,8 @@
 or that the component label is not consistent with its assigned place
 in the set (e.g. the component label claims the component should be
 the 3rd one in a 6-disk set, but the RAID set has it as the 3rd component
-in a 5-disk set) then the device will fail to configure.  If the
+in a 5-disk set) then the device will fail to configure.
+If the
 driver determines that exactly one component label seems to be
 incorrect, and the RAID set is being configured as a set that supports
 a single failure, then the RAID set will be allowed to configure, but
@@ -150,17 +156,21 @@
 will configure normally.
 .Pp
 Component labels are also used to support the auto-detection and
-autoconfiguration of RAID sets.  A RAID set can be flagged as
+autoconfiguration of RAID sets.
+A RAID set can be flagged as
 autoconfigurable, in which case it will be configured automatically
-during the kernel boot process.  RAID file systems which are
+during the kernel boot process.
+RAID file systems which are
 automatically configured are also eligible to be the root file system.
 There is currently only limited support (alpha, amd64, i386, pmax,
 sparc, sparc64, and vax architectures)
 for booting a kernel directly from a RAID 1 set, and no support for
-booting from any other RAID sets.  To use a RAID set as the root
+booting from any other RAID sets.
+To use a RAID set as the root
 file system, a kernel is usually obtained from a small non-RAID
 partition, after which any autoconfiguring RAID set can be used for the
-root file system.  See
+root file system.
+See
 .Xr raidctl 8
 for more information on autoconfiguration of RAID sets.
 Note that with autoconfiguration of RAID sets, it is no longer
@@ -172,14 +182,17 @@
 The driver supports
 .Sq hot spares ,
 disks which are on-line, but are not
-actively used in an existing file system.  Should a disk fail, the
+actively used in an existing file system.
+Should a disk fail, the
 driver is capable of reconstructing the failed disk onto a hot spare
 or back onto a replacement drive.
 If the components are hot swappable, the failed disk can then be
 removed, a new disk put in its place, and a copyback operation
-performed.  The copyback operation, as its name indicates, will copy
+performed.
+The copyback operation, as its name indicates, will copy
 the reconstructed data from the hot spare to the previously failed
-(and now replaced) disk.  Hot spares can also be hot-added using
+(and now replaced) disk.
+Hot spares can also be hot-added using
 .Xr raidctl 8 .
 .Pp
 If a component cannot be detected when the RAID device is configured,
@@ -194,11 +207,14 @@
 .Xr raidctl 8
 must be used with the
 .Fl i
-option to initialize all RAID sets.  In particular, this
-initialization includes re-building the parity data.  This rebuilding
+option to initialize all RAID sets.
+In particular, this
+initialization 

CVS commit: src/games/wtf

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 20:37:28 UTC 2009

Modified Files:
src/games/wtf: wtf.6

Log Message:
Remove trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/games/wtf/wtf.6

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

Modified files:

Index: src/games/wtf/wtf.6
diff -u src/games/wtf/wtf.6:1.12 src/games/wtf/wtf.6:1.13
--- src/games/wtf/wtf.6:1.12	Mon Aug  6 21:14:37 2007
+++ src/games/wtf/wtf.6	Mon May  4 20:37:28 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: wtf.6,v 1.12 2007/08/06 21:14:37 hubertf Exp $
+.\	$NetBSD: wtf.6,v 1.13 2009/05/04 20:37:28 wiz Exp $
 .\
 .\ Public Domain
 .\
@@ -20,7 +20,7 @@
 specified on the command line.
 If the acronym is not in any of the acronyms databases,
 .Nm
-will check to see if the acronym is known by 
+will check to see if the acronym is known by
 .Xr whatis 1 ,
 .Xr pkg_info 1 ,
 or via pkgsrc's internal help mechanism,

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 20:39:46 UTC 2009

Modified Files:
src/share/man/man4: slhci.4

Log Message:
Remove trailing whitespace. Sort SEE ALSO.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/slhci.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/slhci.4
diff -u src/share/man/man4/slhci.4:1.6 src/share/man/man4/slhci.4:1.7
--- src/share/man/man4/slhci.4:1.6	Fri Apr 10 15:09:08 2009
+++ src/share/man/man4/slhci.4	Mon May  4 20:39:46 2009
@@ -1,10 +1,10 @@
-.\ $NetBSD: slhci.4,v 1.6 2009/04/10 15:09:08 joerg Exp $
+.\ $NetBSD: slhci.4,v 1.7 2009/05/04 20:39:46 wiz Exp $
 .\
 .\ Not (c) 2007 Matthew Orgass
-.\ This file is public domain, meaning anyone can make any use of part or all 
-.\ of this file including copying into other works without credit.  Any use, 
-.\ modified or not, is solely the responsibility of the user.  If this file is 
-.\ part of a collection then use in the collection is governed by the terms of 
+.\ This file is public domain, meaning anyone can make any use of part or all
+.\ of this file including copying into other works without credit.  Any use,
+.\ modified or not, is solely the responsibility of the user.  If this file is
+.\ part of a collection then use in the collection is governed by the terms of
 .\ the collection.
 .\
 .Dd April 24, 2007
@@ -31,38 +31,38 @@
 .Nm
 driver provides support for Cypress/ScanLogic SL811HS USB Host Controller.
 .Pp
-The driver supports control, bulk, and interrupt transfers but not 
-isochronous (audio), which cannot be supported by this chip without perfectly 
+The driver supports control, bulk, and interrupt transfers but not
+isochronous (audio), which cannot be supported by this chip without perfectly
 reliable 1ms interrupts.
 USB is polled and this chip requires the driver to initiate all transfers.
-The driver interrupts at least once every ms when a device is attached even 
+The driver interrupts at least once every ms when a device is attached even
 if no data is transferred.
 The driver polls the chip when the transfer is expected to be completed soon;
 with maximum use of the bus, the driver will not exit for most of each ms.
-Use of this driver can easily have a significant performance impact on any 
+Use of this driver can easily have a significant performance impact on any
 system.
 .Pp
-The chip is unreliable in some conditions, possibly due in part to difficulty 
-meeting timing restrictions (this is likely to be worse on multiprocessor 
+The chip is unreliable in some conditions, possibly due in part to difficulty
+meeting timing restrictions (this is likely to be worse on multiprocessor
 systems).
-Unexpected device behavior may trigger some problems;  power cycling 
+Unexpected device behavior may trigger some problems;  power cycling
 externally powered devices may help resolve persistent problems.
 Detection of invalid chip state will usually cause the driver to halt,
 however is recommended that all data transfers be verified.
 Data corruption due to controller error will not be detected automatically.
-Unmounting and remounting a device is necessary to prevent use of cached data. 
+Unmounting and remounting a device is necessary to prevent use of cached data.
 .Pp
-The driver currently will start the next incoming packet before copying in the 
-previous packet but will not copy the next outgoing packet before the previous 
+The driver currently will start the next incoming packet before copying in the
+previous packet but will not copy the next outgoing packet before the previous
 packet is transferred.
-Reading or writing the chip is about the same speed as the USB bus, so this 
+Reading or writing the chip is about the same speed as the USB bus, so this
 means that one outgoing transfer is half the speed of one incoming transfer
 and two outgoing transfers are needed to use the full available bandwidth.
 .Pp
-All revisions of the SL811HS have trouble with low speed devices attached to 
+All revisions of the SL811HS have trouble with low speed devices attached to
 some (likely most) hubs.
-Low speed traffic via hub is not allowed by default, but can be enabled with 
-.Cd options SLHCI_TRY_LSVH 
+Low speed traffic via hub is not allowed by default, but can be enabled with
+.Cd options SLHCI_TRY_LSVH
 in the kernel config file or by setting the
 .Va slhci_try_lsvh
 variable to non-zero using
@@ -71,17 +71,17 @@
 .Xr gdb 1 .
 .Pp
 Many USB keyboards have built in hubs and may be low speed devices.
-All USB mice I have seen are low speed devices, however a serial mouse should 
+All USB mice I have seen are low speed devices, however a serial mouse should
 be usable on a hub with a full speed Serial-USB converter.
-A PS2-USB keyboard and mouse converter is likely to be a single low speed 
+A PS2-USB keyboard and mouse converter is 

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 20:42:00 UTC 2009

Modified Files:
src/share/man/man4: bluetooth.4

Log Message:
New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/share/man/man4/bluetooth.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/bluetooth.4
diff -u src/share/man/man4/bluetooth.4:1.12 src/share/man/man4/bluetooth.4:1.13
--- src/share/man/man4/bluetooth.4:1.12	Fri Apr 10 15:14:06 2009
+++ src/share/man/man4/bluetooth.4	Mon May  4 20:42:00 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: bluetooth.4,v 1.12 2009/04/10 15:14:06 joerg Exp $
+.\	$NetBSD: bluetooth.4,v 1.13 2009/05/04 20:42:00 wiz Exp $
 .\
 .\ Copyright (c) 2006 Itronix Inc.
 .\ All rights reserved.
@@ -70,9 +70,11 @@
 This gives raw access to the Host Controller Interface of local devices
 using the HCI protocol as described in the Bluetooth Core Specification.
 Any user may open an HCI socket but there are limitations on what
-unprivileged users can send and receive. The local address specified by
+unprivileged users can send and receive.
+The local address specified by
 .Xr bind 2
-may be used to select the device that the socket will receive packets from. If
+may be used to select the device that the socket will receive packets from.
+If
 .Dv BDADDR_ANY
 is specified then the socket will receive packets from all
 devices on the system.
@@ -93,13 +95,16 @@
 HCI socket options:
 .Bl -tag -width XX
 .It Dv SO_HCI_EVT_FILTER Op Ar struct hci_filter
-This filter controls which events will be received at the socket. See
+This filter controls which events will be received at the socket.
+See
 .In netbt/hci.h
-for available events. By default, Command_Complete and Command_Status
+for available events.
+By default, Command_Complete and Command_Status
 events only are enabled.
 .It Dv SO_HCI_PKT_FILTER Op Ar struct hci_filter
 This filter controls the type of packets that will be received at the
-socket. By default, Event packets only are enabled.
+socket.
+By default, Event packets only are enabled.
 .It Dv SO_HCI_DIRECTION Op Ar int
 When set, this enables control messages on packets received at the socket
 indicating the direction of travel of the packet.
@@ -115,11 +120,12 @@
 Default receive buffer size for HCI sockets
 .It Dv net.bluetooth.hci.acl_expiry
 If set, this is the time in seconds after which unused ACL data connections
-will be expired. If zero, connections will not be closed.
+will be expired.
+If zero, connections will not be closed.
 .It Dv net.bluetooth.hci.memo_expiry
 Time, in seconds, that the system will keep records of Bluetooth devices
-in the vicinity after an Inquiry Response packet has been received. This
-information is used for routing purposes.
+in the vicinity after an Inquiry Response packet has been received.
+This information is used for routing purposes.
 .It Dv net.bluetooth.hci.eventq_max
 The maximum number of packets on the low level Event queue.
 .It Dv net.bluetooth.hci.aclrxq_max
@@ -278,11 +284,13 @@
 .Sh INFORMATION
 The following
 .Xr ioctl 2
-calls may be used to manipulate Bluetooth devices. The
+calls may be used to manipulate Bluetooth devices.
+The
 .Xr ioctl 2
 must be made on
 .Cm BTPROTO_HCI
-sockets. All of the requests take a
+sockets.
+All of the requests take a
 .Ar btreq
 structure defined as follows as their parameter and unless otherwise
 specified, use the
@@ -347,25 +355,30 @@
 .Ed
 .Bl -tag -width SIOCGBTPOLICY
 .It Dv SIOCGBTINFO
-Get Bluetooth device Info. Given the device name, fill in the
+Get Bluetooth device Info.
+Given the device name, fill in the
 btreq structure including the address field for use with socket addressing
 as above.
 .It Dv SIOCGBTINFOA
-Get Bluetooth device Info from Address. Given the device address, fill in the
+Get Bluetooth device Info from Address.
+Given the device address, fill in the
 btreq structure including the name field.
 .It Dv SIOCNBTINFO
-Next Bluetooth device Info . If name field is empty, the first device
-will be returned. Otherwise, the next device will be returned. Thus, you
-can cycle through all devices in the system.
+Next Bluetooth device Info.
+If name field is empty, the first device will be returned.
+Otherwise, the next device will be returned.
+Thus, you can cycle through all devices in the system.
 .It Dv SIOCSBTFLAGS
-Set Bluetooth device Flags. Not all flags are settable.
+Set Bluetooth device Flags.
+Not all flags are settable.
 .It Dv SIOCSBTPOLICY
-Set Bluetooth device Link Policy. Link Policy bits are defined in
+Set Bluetooth device Link Policy.
+Link Policy bits are defined in
 .In netbt/hci.h ,
 though you can only set bits that the device supports.
 .It Dv SIOCSBTPTYPE
-Set Bluetooth device Packet Types. You can only set packet types
-that the device supports.
+Set Bluetooth device Packet Types.
+You can only set packet types that the 

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 20:42:34 UTC 2009

Modified Files:
src/share/man/man4: usb.4

Log Message:
New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/share/man/man4/usb.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/usb.4
diff -u src/share/man/man4/usb.4:1.89 src/share/man/man4/usb.4:1.90
--- src/share/man/man4/usb.4:1.89	Fri Apr 10 15:02:03 2009
+++ src/share/man/man4/usb.4	Mon May  4 20:42:34 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: usb.4,v 1.89 2009/04/10 15:02:03 joerg Exp $
+.\ $NetBSD: usb.4,v 1.90 2009/05/04 20:42:34 wiz Exp $
 .\
 .\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -100,13 +100,14 @@
 Normally, only the USB host controller and the
 .Va usb
 device are detected during the autoconfiguration when the
-machine is booted.  The rest of the devices are detected once
+machine is booted.
+The rest of the devices are detected once
 the system becomes functional and the kernel thread for the
 .Va usb
 device is started.
 Sometimes it is desirable to have a device detected early in the
-boot process, e.g., the console keyboard.  To achieve this use
-a
+boot process, e.g., the console keyboard.
+To achieve this use a
 .Va flags
 value of 1.
 .Pp
@@ -470,7 +471,8 @@
 .Tn USB
 events are reported via the
 .Pa /dev/usb
-device.  This devices can be opened for reading and each
+device.
+This devices can be opened for reading and each
 .Xr read 2
 will yield an event record (if something has happened).
 The
@@ -506,7 +508,8 @@
 .Va ue_type
 field identifies the type of event that is described.
 The possible events are attach/detach of a host controller,
-a device, or a device driver.  The union contains information
+a device, or a device driver.
+The union contains information
 pertinent to the different types of events.
 .Pp
 The
@@ -530,8 +533,10 @@
 kernel messages.
 .Pp
 Note that there is a separation between device and device
-driver events.  A device event is generated when a physical
-USB device is attached or detached.  A single USB device may
+driver events.
+A device event is generated when a physical
+USB device is attached or detached.
+A single USB device may
 have zero, one, or many device drivers associated with it.
 .Sh KERNEL THREADS
 For each USB bus, i.e., for each host controller, there is

CVS commit: src/lib/libutil

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 20:43:48 UTC 2009

Modified Files:
src/lib/libutil: getmntopts.3

Log Message:
Sort sections.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libutil/getmntopts.3

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

Modified files:

Index: src/lib/libutil/getmntopts.3
diff -u src/lib/libutil/getmntopts.3:1.8 src/lib/libutil/getmntopts.3:1.9
--- src/lib/libutil/getmntopts.3:1.8	Sun Aug 26 22:53:01 2007
+++ src/lib/libutil/getmntopts.3	Mon May  4 20:43:48 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: getmntopts.3,v 1.8 2007/08/26 22:53:01 pooka Exp $
+.\	$NetBSD: getmntopts.3,v 1.9 2009/05/04 20:43:48 wiz Exp $
 .\
 .\ Copyright (c) 1994
 .\	The Regents of the University of California.  All rights reserved.
@@ -157,6 +157,24 @@
 .Fn freemntopts
 frees the storage used by
 .Fn getmntopts .
+.Sh RETURN VALUES
+.Fn getmntopts
+returns
+.Dv NULL
+if an error occurred.
+Note that some bits may already have been set in
+.Va flagp
+and
+.Va altflagp
+even if
+.Dv NULL
+is returned.
+.Fn getmntoptstr
+returns
+.Dv NULL
+if the option does not have an argument, or the option string.
+.Fn getmntoptnum
+returns \-1 if an error occurred.
 .Sh EXAMPLES
 Most commands will use the standard option set.
 Local filesystems which support the
@@ -185,24 +203,6 @@
 val = getmntoptnum(mp, rsize);
 freemntopts(mp);
 .Ed
-.Sh RETURN VALUE
-.Fn getmntopts
-returns
-.Dv NULL
-if an error occurred.
-Note that some bits may already have been set in
-.Va flagp
-and
-.Va altflagp
-even if
-.Dv NULL
-is returned.
-.Fn getmntoptstr
-returns
-.Dv NULL
-if the option does not have an argument, or the option string.
-.Fn getmntoptnum
-returns \-1 if an error occurred.
 .Sh DIAGNOSTICS
 If the external integer variable
 .Va getmnt_silent

CVS commit: src/usr.sbin/wlanctl

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 20:47:48 UTC 2009

Modified Files:
src/usr.sbin/wlanctl: wlanctl.8

Log Message:
Fix formatting. New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/wlanctl/wlanctl.8

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/wlanctl/wlanctl.8
diff -u src/usr.sbin/wlanctl/wlanctl.8:1.5 src/usr.sbin/wlanctl/wlanctl.8:1.6
--- src/usr.sbin/wlanctl/wlanctl.8:1.5	Wed Mar 11 18:47:52 2009
+++ src/usr.sbin/wlanctl/wlanctl.8	Mon May  4 20:47:48 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: wlanctl.8,v 1.5 2009/03/11 18:47:52 joerg Exp $
+.\ $NetBSD: wlanctl.8,v 1.6 2009/05/04 20:47:48 wiz Exp $
 .\ Copyright (c) 2004 David Young.  All rights reserved.
 .\
 .\ This code was written by David Young.
@@ -49,7 +49,8 @@
 Use the
 .Fl a
 flag to print the nodes for all interfaces, or list one or more
-802.11 interfaces to select their tables for examination. The
+802.11 interfaces to select their tables for examination.
+The
 .Fl p
 flag causes only nodes that do not have encryption enabled to be printed.
 For example, to examine the node tables for atw0, use:
@@ -103,9 +104,10 @@
 by Basic Service Set Identifier (BSSID) 02:02:6f:20:f6:2e.
 .It Fa node flags
 Only three node flags,
-.Dq bss, sta,
+.Dq bss ,
+.Dq sta ,
 and
-.Dq scan,
+.Dq scan ,
 are presently defined.
 The first node is distinguished from the rest by its node flags:
 flag

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 20:48:06 UTC 2009

Modified Files:
src/share/man/man4: wm.4

Log Message:
New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/share/man/man4/wm.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/wm.4
diff -u src/share/man/man4/wm.4:1.19 src/share/man/man4/wm.4:1.20
--- src/share/man/man4/wm.4:1.19	Wed Aug 29 09:04:04 2007
+++ src/share/man/man4/wm.4	Mon May  4 20:48:06 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: wm.4,v 1.19 2007/08/29 09:04:04 xtraeme Exp $
+.\	$NetBSD: wm.4,v 1.20 2009/05/04 20:48:06 wiz Exp $
 .\
 .\ Copyright 2002, 2003 Wasabi Systems, Inc.
 .\ All rights reserved.
@@ -42,7 +42,8 @@
 .Sh SYNOPSIS
 .Cd wm* at pci? dev ? function ?
 .Pp
-Configuration of PHYs may also be necessary.  See
+Configuration of PHYs may also be necessary.
+See
 .Xr mii 4 .
 .Sh DESCRIPTION
 The

CVS commit: src/share/man/man7

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 20:54:16 UTC 2009

Modified Files:
src/share/man/man7: release.7

Log Message:
New sentence, new line. Use Aq instead of \*[Lt]\*[Gt].


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/share/man/man7/release.7

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/man7/release.7
diff -u src/share/man/man7/release.7:1.27 src/share/man/man7/release.7:1.28
--- src/share/man/man7/release.7:1.27	Thu Apr  9 03:02:21 2009
+++ src/share/man/man7/release.7	Mon May  4 20:54:16 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: release.7,v 1.27 2009/04/09 03:02:21 joerg Exp $
+.\	$NetBSD: release.7,v 1.28 2009/05/04 20:54:16 wiz Exp $
 .\
 .\ Copyright (c) 1997, 2000, 2005 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -42,14 +42,14 @@
 .Pp
 In this document, the following special words have these definitions:
 .Bl -tag -width \*[Lt]machine_arch\*[Gt]
-.It Em \*[Lt]machine\*[Gt]
+.It Aq Em machine
 The platform for which the release was built, corresponding to the
 .Em hw.machine
 sysctl variable, e.g.
 .Em i386
 or
 .Em amiga .
-.It Em \*[Lt]machine_arch\*[Gt]
+.It Aq Em machine_arch
 The architecture for which a particular installation set was built,
 corresponding to the
 .Em hw.machine_arch
@@ -57,7 +57,7 @@
 .Em i386
 or
 .Em m68k .
-.It Em \*[Lt]rel\*[Gt]
+.It Aq Em rel
 The target release.
 .El
 .Pp
@@ -81,19 +81,19 @@
 .Bx
 checksums for the various files in that directory,
 in the format produced by the command:
-.Sy cksum -o 1 \*[Lt]file\*[Gt] .
+.Sy cksum -o 1 Aq Sy file .
 .Pp
 All
 .Sy CKSUM
 files are POSIX checksums for the various files in that directory, in the
 format produced by the command:
-.Sy cksum \*[Lt]file\*[Gt] .
+.Sy cksum Aq Sy file .
 .Pp
 All
 .Sy MD5
 files are MD5 digests for the various files in that directory, in the
 format produced by the command:
-.Sy cksum -m \*[Lt]file\*[Gt] .
+.Sy cksum -m Aq Sy file .
 .Pp
 All
 .Sy SYSVSUM
@@ -101,7 +101,7 @@
 .At V
 checksums for the various files in
 that directory, in the format produced by the command:
-.Sy cksum -o 2 \*[Lt]file\*[Gt] .
+.Sy cksum -o 2 Aq Sy file .
 .Pp
 The MD5 digest is the safest checksum, followed by the POSIX checksum.
 The other two checksums are provided only to ensure that the widest possible
@@ -109,7 +109,8 @@
 .Pp
 Files that end in
 .Sy .tgz
-are gzipped tar archives.  This is used in lieu of
+are gzipped tar archives.
+This is used in lieu of
 .Sy .tar.gz
 because the software used to download the sets may incorrectly auto-unpack
 files ending in
@@ -132,7 +133,7 @@
 .Sm off
 .Xo
 .Sy .../NetBSD-
-.Em \*[Lt]rel\*[Gt]
+.Aq Em rel
 .Sy / .
 .Xc
 .Sm on
@@ -165,9 +166,9 @@
 .Sm off
 .Xo
 .Sy .../NetBSD-
-.Em \*[Lt]rel\*[Gt]
+.Aq Em rel
 .Sy /
-.Em \*[Lt]machine\*[Gt]
+.Aq Em machine
 .Sy /installation/cdrom/
 .Xc
 .Sm on
@@ -186,41 +187,41 @@
 .It Sy MD5
 .It Sy README
 .It Sy SYSVSUM
-.It Em \*[Lt]machine_arch\*[Gt] Ns Sy cd.iso
+.It Ao Em machine_arch Ac Ns Sy cd.iso
 .El
 .
 .It Sy shared/
 Files shared by two or more machine types.
 .Bl -tag -width \*[Lt]machine_arch\*[Gt]
-.It Em \*[Lt]machine_arch\*[Gt] Ns Pa /
+.It Ao Em machine_arch Ac Ns Pa /
 Files which may be shared by all systems of the same
-.Em \*[Lt]machine_arch\*[Gt]
+.Aq Em machine_arch
 will be located in
 .Sm off
 .Xo
 .Sy .../NetBSD-
-.Em \*[Lt]rel\*[Gt]
+.Aq Em rel
 .Sy /shared/
-.Em \*[Lt]machine_arch\*[Gt]
+.Aq Em machine_arch
 .Sy /
 .Xc
 .Sm on
 with symbolic links pointing to these files from the
-.Em \*[Lt]machine\*[Gt]
+.Aq Em machine
 subdirectory.
 .It Sy ALL/
 Files which are completely machine-independent will be
 located in
-.Sy .../NetBSD- Ns Em \*[Lt]rel\*[Gt] Ns Sy /shared/ALL/
+.Sy .../NetBSD- Ns Ao Em rel Ac Ns Sy /shared/ALL/
 with symbolic links pointing to these files from the
-.Em \*[Lt]machine\*[Gt]
+.Aq Em machine
 subdirectory.
 .El
 .
 .It Sy source/
 Source codes of the operating system and patches for it
 should be put into
-.Sy .../NetBSD- Ns Em \*[Lt]rel\*[Gt] Ns Sy /source/
+.Sy .../NetBSD- Ns Ao Em rel Ac Ns Sy /source/
 using the following layout:
 .Pp
 .Bl -tag -width patches/
@@ -234,11 +235,12 @@
 .It Sy MD5
 .It Sy README
 .It Sy SYSVSUM
-.It Sy diff- Ns Em \*[Lt]lastrel\*[Gt] Ns Sy - Ns Em \*[Lt]rel\*[Gt] Ns Sy .gz
+.It Sy diff- Ns Ao Em lastrel Ac Ns Sy - Ns Ao Em rel Ac Ns Sy .gz
 Diff against the last release, usually generated by
 .Ic cvs rdiff .
 For patch releases, diffs against the last release
-are included.  If the last release was a patch release itself, the
+are included.
+If the last release was a patch release itself, the
 diff is against that patch release is included.
 .El
 .It Sy sets/
@@ -256,8 +258,10 @@
 contains restrictions in their licensing that prevent others from
 using these programs in closed-source environments.
 .It Sy pkgsrc.tgz
-Package-sources for third party software ready to compile. See

CVS commit: src/sys/ufs/ufs

[Mindaugas Rasiukevicius]

Module Name:src
Committed By:   rmind
Date:   Mon May  4 20:54:25 UTC 2009

Modified Files:
src/sys/ufs/ufs: ufs_dirhash.c

Log Message:
ufsdirhash_recycle():
- Fix ufs_dirhashmem modification (do it atomically).
- Fix a memory leak.

OK by ad.


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

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

Modified files:

Index: src/sys/ufs/ufs/ufs_dirhash.c
diff -u src/sys/ufs/ufs/ufs_dirhash.c:1.30 src/sys/ufs/ufs/ufs_dirhash.c:1.31
--- src/sys/ufs/ufs/ufs_dirhash.c:1.30	Wed Mar 18 15:14:32 2009
+++ src/sys/ufs/ufs/ufs_dirhash.c	Mon May  4 20:54:25 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ufs_dirhash.c,v 1.30 2009/03/18 15:14:32 cegger Exp $	*/
+/*	$NetBSD: ufs_dirhash.c,v 1.31 2009/05/04 20:54:25 rmind Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Ian Dowse.  All rights reserved.
@@ -28,7 +28,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ufs_dirhash.c,v 1.30 2009/03/18 15:14:32 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: ufs_dirhash.c,v 1.31 2009/05/04 20:54:25 rmind Exp $);
 
 /*
  * This implements a hash-based lookup scheme for UFS directories.
@@ -1083,10 +1083,11 @@
 			DIRHASH_BLKFREE(hash[i]);
 		kmem_free(hash, hashsz);
 		kmem_free(blkfree, blkfreesz);
+		pool_cache_put(ufsdirhash_cache, dh);
 
 		/* Account for the returned memory, and repeat if necessary. */
 		DIRHASHLIST_LOCK();
-		ufs_dirhashmem -= mem;
+		atomic_add_int(ufs_dirhashmem, -mem);
 	}
 	/* Success. */
 	return (0);

CVS commit: src/usr.sbin/trpt

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 20:54:50 UTC 2009

Modified Files:
src/usr.sbin/trpt: trpt.8

Log Message:
Remove superfluous comma.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/trpt/trpt.8

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/trpt/trpt.8
diff -u src/usr.sbin/trpt/trpt.8:1.16 src/usr.sbin/trpt/trpt.8:1.17
--- src/usr.sbin/trpt/trpt.8:1.16	Thu Aug 30 18:53:54 2007
+++ src/usr.sbin/trpt/trpt.8	Mon May  4 20:54:50 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: trpt.8,v 1.16 2007/08/30 18:53:54 jnemeth Exp $
+.\	$NetBSD: trpt.8,v 1.17 2009/05/04 20:54:50 wiz Exp $
 .\
 .\ Copyright (c) 1983, 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -144,7 +144,7 @@
 .El
 .Sh SEE ALSO
 .Xr netstat 1 ,
-.Xr setsockopt 2 ,
+.Xr setsockopt 2
 .Sh HISTORY
 The
 .Nm

CVS commit: src/dist/iscsi/src

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 21:09:12 UTC 2009

Modified Files:
src/dist/iscsi/src: iscsi-target.8

Log Message:
Remove trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/dist/iscsi/src/iscsi-target.8

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

Modified files:

Index: src/dist/iscsi/src/iscsi-target.8
diff -u src/dist/iscsi/src/iscsi-target.8:1.6 src/dist/iscsi/src/iscsi-target.8:1.7
--- src/dist/iscsi/src/iscsi-target.8:1.6	Sat May 27 21:21:04 2006
+++ src/dist/iscsi/src/iscsi-target.8	Mon May  4 21:09:12 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: iscsi-target.8,v 1.6 2006/05/27 21:21:04 agc Exp $
+.\ $NetBSD: iscsi-target.8,v 1.7 2009/05/04 21:09:12 wiz Exp $
 .\
 .\ Copyright © 2006 Alistair Crooks.  All rights reserved.
 .\
@@ -91,7 +91,7 @@
 using this flag.
 .It Fl V
 .Nm
-will print the utility name and version number, 
+will print the utility name and version number,
 and the address for bug reports, and then exit.
 .It Fl v Ar argument
 The amount of information shown can be varied by using this command.

CVS commit: src/usr.bin/config

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 21:11:54 UTC 2009

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

Log Message:
Use Sx. Remove superfluous .Pp.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/config/config.1

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

Modified files:

Index: src/usr.bin/config/config.1
diff -u src/usr.bin/config/config.1:1.7 src/usr.bin/config/config.1:1.8
--- src/usr.bin/config/config.1:1.7	Tue Mar 24 00:14:01 2009
+++ src/usr.bin/config/config.1	Mon May  4 21:11:53 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: config.1,v 1.7 2009/03/24 00:14:01 joerg Exp $
+.\	$NetBSD: config.1,v 1.8 2009/05/04 21:11:53 wiz Exp $
 .\
 .\ Copyright (c) 1980, 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -55,7 +55,9 @@
 creates a kernel build directory from the machine description file
 .Ar config-file ,
 which describes the system to configure.
-Refer to section KERNEL BUILD CONFIGURATION for the details of that use
+Refer to section
+.Sx KERNEL BUILD CONFIGURATION
+for the details of that use
 of
 .Nm .
 .Pp
@@ -104,8 +106,8 @@
 .It Fl p
 Generate a build directory suited for kernel profiling.
 However, this options should be avoided in favor of the relevant options
-inside the configuration file as described in section KERNEL BUILD
-CONFIGURATION.
+inside the configuration file as described in section
+.Sx KERNEL BUILD CONFIGURATION .
 .It Fl s Ar srcdir
 Point to the top of the kernel source tree.
 It must be an absolute path when
@@ -120,7 +122,6 @@
 Extract the configuration embedded in a kernel binary.
 .El
 .Ss KERNEL BUILD CONFIGURATION
-.Pp
 There are several different ways to run the
 .Nm
 program.

CVS commit: src/usr.bin/whois

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 21:13:58 UTC 2009

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

Log Message:
Punctuation.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/whois/whois.1

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

Modified files:

Index: src/usr.bin/whois/whois.1
diff -u src/usr.bin/whois/whois.1:1.24 src/usr.bin/whois/whois.1:1.25
--- src/usr.bin/whois/whois.1:1.24	Sun Sep  9 18:31:45 2007
+++ src/usr.bin/whois/whois.1	Mon May  4 21:13:58 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: whois.1,v 1.24 2007/09/09 18:31:45 christos Exp $
+.\ $NetBSD: whois.1,v 1.25 2009/05/04 21:13:58 wiz Exp $
 .\	$OpenBSD: whois.1,v 1.22 2003/09/02 18:50:07 jmc Exp $
 .\
 .\ Copyright (c) 1985, 1990, 1993
@@ -70,8 +70,8 @@
 database.
 It contains network numbers used in those parts of the world
 not covered by
-.Tn AfriNIC,
-.Tn APNIC,
+.Tn AfriNIC ,
+.Tn APNIC ,
 .Tn LACNIC
 or by
 .Tn RIPE .
@@ -93,7 +93,7 @@
 Use the African Network Information Center
 .Pq Tn AfriNIC
 database.
-It contains network numbers used in Africa
+It contains network numbers used in Africa.
 .It Fl g
 Use the US non-military federal government database, which contains points of
 contact for subdomains of

CVS commit: src

[Andrew Doran]

Module Name:src
Committed By:   ad
Date:   Mon May  4 21:32:32 UTC 2009

Modified Files:
src/gnu/usr.bin/gcc4/arch/i386: configargs.h
src/gnu/usr.bin/gcc4/arch/x86_64: configargs.h
src/share/mk: bsd.own.mk
src/tools/gcc: Makefile

Log Message:
Enable -mtune=nocona by default on x86. I have tested on a range of CPUs
and this seems to give the best results.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/gnu/usr.bin/gcc4/arch/i386/configargs.h
cvs rdiff -u -r1.10 -r1.11 src/gnu/usr.bin/gcc4/arch/x86_64/configargs.h
cvs rdiff -u -r1.562 -r1.563 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.31 -r1.32 src/tools/gcc/Makefile

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/gcc4/arch/i386/configargs.h
diff -u src/gnu/usr.bin/gcc4/arch/i386/configargs.h:1.14 src/gnu/usr.bin/gcc4/arch/i386/configargs.h:1.15
--- src/gnu/usr.bin/gcc4/arch/i386/configargs.h:1.14	Fri Mar 27 19:38:43 2009
+++ src/gnu/usr.bin/gcc4/arch/i386/configargs.h	Mon May  4 21:32:31 2009
@@ -3,9 +3,9 @@
 /* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
 
 /* Generated automatically. */
-static const char configuration_arguments[] = /home/drochner/netbsd/work.src.usbdev/tools/gcc/../../gnu/dist/gcc4/configure --target=i486--netbsdelf --enable-long-long --enable-threads --enable-__cxa_atexit --with-arch=i486 --disable-multilib --disable-symvers --build=i386-unknown-netbsdelf5.99.8 --host=i486--netbsdelf;
+static const char configuration_arguments[] = /home/drochner/netbsd/work.src.usbdev/tools/gcc/../../gnu/dist/gcc4/configure --target=i486--netbsdelf --enable-long-long --enable-threads --enable-__cxa_atexit --with-arch=i486 --with-tune=nocona --disable-multilib --disable-symvers --build=i386-unknown-netbsdelf5.99.8 --host=i486--netbsdelf;
 static const char thread_model[] = posix;
 
 static const struct {
   const char *name, *value;
-} configure_default_options[] = { { cpu, i486 }, { arch, i486 } };
+} configure_default_options[] = { { cpu, i486 }, { arch, i486 }, { tune, nocona } };

Index: src/gnu/usr.bin/gcc4/arch/x86_64/configargs.h
diff -u src/gnu/usr.bin/gcc4/arch/x86_64/configargs.h:1.10 src/gnu/usr.bin/gcc4/arch/x86_64/configargs.h:1.11
--- src/gnu/usr.bin/gcc4/arch/x86_64/configargs.h:1.10	Mon Sep  1 23:52:24 2008
+++ src/gnu/usr.bin/gcc4/arch/x86_64/configargs.h	Mon May  4 21:32:31 2009
@@ -3,9 +3,9 @@
 /* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
 
 /* Generated automatically. */
-static const char configuration_arguments[] = /usr/src/tools/gcc/../../gnu/dist/gcc4/configure --enable-long-long --disable-multilib --enable-threads --disable-symvers --build=x86_64-unknown-netbsd4.99.72 --host=x86_64--netbsd --target=x86_64--netbsd --enable-__cxa_atexit;
+static const char configuration_arguments[] = /usr/src/tools/gcc/../../gnu/dist/gcc4/configure --enable-long-long --disable-multilib --enable-threads --disable-symvers --build=x86_64-unknown-netbsd4.99.72 --host=x86_64--netbsd --target=x86_64--netbsd --enable-__cxa_atexit --with-tune=nocona;
 static const char thread_model[] = posix;
 
 static const struct {
   const char *name, *value;
-} configure_default_options[] = { { cpu, k8 } };
+} configure_default_options[] = { { cpu, k8 }, { tune, nocona } };

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.562 src/share/mk/bsd.own.mk:1.563
--- src/share/mk/bsd.own.mk:1.562	Fri May  1 20:47:53 2009
+++ src/share/mk/bsd.own.mk	Mon May  4 21:32:31 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.562 2009/05/01 20:47:53 apb Exp $
+#	$NetBSD: bsd.own.mk,v 1.563 2009/05/04 21:32:31 ad Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -538,6 +538,8 @@
 GNU_ARCH.coldfire=m68k
 GNU_ARCH.i386=i486
 GCC_CONFIG_ARCH.i386=i486
+GCC_CONFIG_TUNE.i386=nocona
+GCC_CONFIG_TUNE.x86_64=nocona
 GNU_ARCH.m68000=m68010
 GNU_ARCH.sh3eb=sh
 GNU_ARCH.sh3el=shle

Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.31 src/tools/gcc/Makefile:1.32
--- src/tools/gcc/Makefile:1.31	Fri Mar 27 19:19:49 2009
+++ src/tools/gcc/Makefile	Mon May  4 21:32:31 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.31 2009/03/27 19:19:49 drochner Exp $
+#	$NetBSD: Makefile,v 1.32 2009/05/04 21:32:31 ad Exp $
 
 .include bsd.own.mk
 
@@ -24,6 +24,9 @@
 .if defined(GCC_CONFIG_ARCH.${MACHINE_ARCH})
 COMMON_CONFIGURE_ARGS+=	--with-arch=${GCC_CONFIG_ARCH.${MACHINE_ARCH}}
 .endif
+.if defined(GCC_CONFIG_TUNE.${MACHINE_ARCH})
+COMMON_CONFIGURE_ARGS+=	--with-tune=${GCC_CONFIG_TUNE.${MACHINE_ARCH}}
+.endif
 
 CONFIGURE_ARGS=	${COMMON_CONFIGURE_ARGS} \
 		--disable-nls \

CVS commit: src

[Andrew Doran]

Module Name:src
Committed By:   ad
Date:   Mon May  4 21:33:02 UTC 2009

Modified Files:
src/distrib/sets/lists/comp: mi
src/share/man/man9: Makefile

Log Message:
+ callout_halt


To generate a diff of this commit:
cvs rdiff -u -r1.1251 -r1.1252 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.278 -r1.279 src/share/man/man9/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/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1251 src/distrib/sets/lists/comp/mi:1.1252
--- src/distrib/sets/lists/comp/mi:1.1251	Sun May  3 14:58:52 2009
+++ src/distrib/sets/lists/comp/mi	Mon May  4 21:33:00 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1251 2009/05/03 14:58:52 agc Exp $
+#	$NetBSD: mi,v 1.1252 2009/05/04 21:33:00 ad Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -8210,6 +8210,7 @@
 ./usr/share/man/cat9/callout_deactivate.0	comp-obsolete		obsolete
 ./usr/share/man/cat9/callout_destroy.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/callout_expired.0		comp-sys-catman		.cat
+./usr/share/man/cat9/callout_halt.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/callout_init.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/callout_invoking.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/callout_pending.0		comp-sys-catman		.cat
@@ -13482,6 +13483,7 @@
 ./usr/share/man/html9/callout_ack.html		comp-sys-htmlman	html
 ./usr/share/man/html9/callout_destroy.html	comp-sys-htmlman	html
 ./usr/share/man/html9/callout_expired.html	comp-sys-htmlman	html
+./usr/share/man/html9/callout_halt.html		comp-sys-htmlman	html
 ./usr/share/man/html9/callout_init.html		comp-sys-htmlman	html
 ./usr/share/man/html9/callout_invoking.html	comp-sys-htmlman	html
 ./usr/share/man/html9/callout_pending.html	comp-sys-htmlman	html
@@ -18870,6 +18872,7 @@
 ./usr/share/man/man9/callout_deactivate.9	comp-obsolete		obsolete
 ./usr/share/man/man9/callout_destroy.9		comp-sys-man		.man
 ./usr/share/man/man9/callout_expired.9		comp-sys-man		.man
+./usr/share/man/man9/callout_halt.9		comp-sys-man		.man
 ./usr/share/man/man9/callout_init.9		comp-sys-man		.man
 ./usr/share/man/man9/callout_invoking.9		comp-sys-man		.man
 ./usr/share/man/man9/callout_pending.9		comp-sys-man		.man

Index: src/share/man/man9/Makefile
diff -u src/share/man/man9/Makefile:1.278 src/share/man/man9/Makefile:1.279
--- src/share/man/man9/Makefile:1.278	Tue Mar 31 16:12:00 2009
+++ src/share/man/man9/Makefile	Mon May  4 21:33:00 2009
@@ -1,4 +1,4 @@
-#   $NetBSD: Makefile,v 1.278 2009/03/31 16:12:00 tsutsui Exp $
+#   $NetBSD: Makefile,v 1.279 2009/05/04 21:33:00 ad Exp $
 
 #	Makefile for section 9 (kernel function and variable) manual pages.
 
@@ -166,7 +166,8 @@
 	callout.9 callout_setfunc.9 callout.9 callout_stop.9 \
 	callout.9 callout_pending.9 callout.9 callout_expired.9 \
 	callout.9 callout_invoking.9 callout.9 callout_ack.9 \
-	callout.9 timeout.9 callout.9 untimeout.9
+	callout.9 timeout.9 callout.9 untimeout.9 \
+	callout.9 callout_halt.9
 MLINKS+=cardbus.9 cardbus_attach_card.9 \
 	cardbus.9 cardbus_detach_card.9 \
 	cardbus.9 cardbus_function_enable.9 \

CVS commit: src/crypto/dist/ipsec-tools/src/racoon

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 22:28:31 UTC 2009

Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: racoon.conf.5

Log Message:
Remove superfluous spaces around parentheses.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 \
src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5

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

Modified files:

Index: src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5
diff -u src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5:1.55 src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5:1.56
--- src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5:1.55	Thu Mar 12 15:18:57 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5	Mon May  4 22:28:30 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: racoon.conf.5,v 1.55 2009/03/12 15:18:57 wiz Exp $
+.\	$NetBSD: racoon.conf.5,v 1.56 2009/05/04 22:28:30 wiz Exp $
 .\
 .\	Id: racoon.conf.5,v 1.54 2006/08/22 18:17:17 manubsd Exp
 .\
@@ -1028,7 +1028,7 @@
 The
 .Ic clientaddr
 keyword can be used to match a remote id that is equal to either the peer
-ip address or the mode_cfg ip address ( if assigned ).
+ip address or the mode_cfg ip address (if assigned).
 This can be useful
 to restrict policy generation when racoon is acting as a client gateway
 for peers with dynamic ip addresses.

CVS commit: src/usr.sbin/envstat

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon May  4 22:31:36 UTC 2009

Modified Files:
src/usr.sbin/envstat: envstat.8

Log Message:
Add missing apostrophe.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/usr.sbin/envstat/envstat.8

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/envstat/envstat.8
diff -u src/usr.sbin/envstat/envstat.8:1.50 src/usr.sbin/envstat/envstat.8:1.51
--- src/usr.sbin/envstat/envstat.8:1.50	Sun Feb 15 00:01:19 2009
+++ src/usr.sbin/envstat/envstat.8	Mon May  4 22:31:36 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: envstat.8,v 1.50 2009/02/15 00:01:19 wiz Exp $
+.\	$NetBSD: envstat.8,v 1.51 2009/05/04 22:31:36 wiz Exp $
 .\
 .\ Copyright (c) 2000, 2007, 2008, 2009 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -88,7 +88,7 @@
 .Ar interval
 seconds.
 Note that some devices do not provide fresh values on demand.
-See the individual devices manual page for meaningful values for
+See the individual device's manual page for meaningful values for
 .Ar interval .
 If not specified, or specified as 0,
 .Nm