CVS commit: src/sys/arch/hpcmips/vr

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Sun Jun  6 06:10:03 UTC 2010

Modified Files:
src/sys/arch/hpcmips/vr: vr4181aiu.c

Log Message:
Add missing close-parenthesis; reported by Henning Petersen in PR 42526.
(HI CEGGER!)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpcmips/vr/vr4181aiu.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/hpcmips/vr/vr4181aiu.c
diff -u src/sys/arch/hpcmips/vr/vr4181aiu.c:1.6 src/sys/arch/hpcmips/vr/vr4181aiu.c:1.7
--- src/sys/arch/hpcmips/vr/vr4181aiu.c:1.6	Wed Jun 11 23:53:15 2008
+++ src/sys/arch/hpcmips/vr/vr4181aiu.c	Sun Jun  6 06:10:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vr4181aiu.c,v 1.6 2008/06/11 23:53:15 cegger Exp $ */
+/* $NetBSD: vr4181aiu.c,v 1.7 2010/06/06 06:10:03 dholland Exp $ */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vr4181aiu.c,v 1.6 2008/06/11 23:53:15 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: vr4181aiu.c,v 1.7 2010/06/06 06:10:03 dholland Exp $);
 
 #include sys/param.h
 #include sys/conf.h
@@ -235,7 +235,7 @@
 {
 	struct vr4181aiu_softc	*sc;
 
-	sc = device_lookup_private(vr4181aiu_cd, minor(dev);
+	sc = device_lookup_private(vr4181aiu_cd, minor(dev));
 	if (sc == NULL)
 		return ENXIO;
 

CVS commit: src/sys/kern

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Sun Jun  6 06:20:16 UTC 2010

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

Log Message:
Improve previous: there were two printfs and I'd only noticed and fixed
one of them. PR 43217.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/kern/exec_elf.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/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.21 src/sys/kern/exec_elf.c:1.22
--- src/sys/kern/exec_elf.c:1.21	Sun May  2 06:35:21 2010
+++ src/sys/kern/exec_elf.c	Sun Jun  6 06:20:16 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_elf.c,v 1.21 2010/05/02 06:35:21 dholland Exp $	*/
+/*	$NetBSD: exec_elf.c,v 1.22 2010/06/06 06:20:16 dholland Exp $	*/
 
 /*-
  * Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.21 2010/05/02 06:35:21 dholland Exp $);
+__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.22 2010/06/06 06:20:16 dholland Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_pax.h
@@ -902,7 +902,7 @@
 
 		default:
 #ifdef DIAGNOSTIC
-			printf(%s: unknown note type %d\n, epp-ep_name,
+			printf(%s: unknown note type %d\n, epp-ep_kname,
 			np-n_type);
 #endif
 			break;

CVS commit: src/sys/kern

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Jun  6 07:46:18 UTC 2010

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

Log Message:
Follow the correct locking protocol when creating an LWP and the process
is stopping.

Problem found by running the gdb testsuite (gdb didn't have pthreads
support)

Thanks to rmind for help with this.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/kern/sys_lwp.c

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

Modified files:

Index: src/sys/kern/sys_lwp.c
diff -u src/sys/kern/sys_lwp.c:1.49 src/sys/kern/sys_lwp.c:1.50
--- src/sys/kern/sys_lwp.c:1.49	Fri Apr 23 19:18:09 2010
+++ src/sys/kern/sys_lwp.c	Sun Jun  6 07:46:17 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_lwp.c,v 1.49 2010/04/23 19:18:09 rmind Exp $	*/
+/*	$NetBSD: sys_lwp.c,v 1.50 2010/06/06 07:46:17 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_lwp.c,v 1.49 2010/04/23 19:18:09 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_lwp.c,v 1.50 2010/06/06 07:46:17 skrll Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -82,6 +82,7 @@
 	} */
 	struct proc *p = l-l_proc;
 	struct lwp *l2;
+	struct schedstate_percpu *spc;
 	vaddr_t uaddr;
 	ucontext_t *newuc;
 	int error, lid;
@@ -133,20 +134,23 @@
 	 */
 	mutex_enter(p-p_lock);
 	lwp_lock(l2);
+	spc = l2-l_cpu-ci_schedstate;
 	if ((SCARG(uap, flags)  LWP_SUSPENDED) == 0 
 	(l-l_flag  (LW_WREBOOT | LW_WSUSPEND | LW_WEXIT)) == 0) {
-		if (p-p_stat == SSTOP || (p-p_sflag  PS_STOPPING) != 0)
+		if (p-p_stat == SSTOP || (p-p_sflag  PS_STOPPING) != 0) {
+			KASSERT(l2-l_wchan == NULL);
 			l2-l_stat = LSSTOP;
-		else {
-			KASSERT(lwp_locked(l2, l2-l_cpu-ci_schedstate.spc_mutex));
+			lwp_unlock_to(l2, spc-spc_lwplock);
+		} else {
+			KASSERT(lwp_locked(l2, spc-spc_mutex));
 			p-p_nrlwps++;
 			l2-l_stat = LSRUN;
 			sched_enqueue(l2, false);
+			lwp_unlock(l2);
 		}
-		lwp_unlock(l2);
 	} else {
 		l2-l_stat = LSSUSPENDED;
-		lwp_unlock_to(l2, l2-l_cpu-ci_schedstate.spc_lwplock);
+		lwp_unlock_to(l2, spc-spc_lwplock);
 	}
 	mutex_exit(p-p_lock);
 

CVS commit: src

[Juergen Hannken-Illjes]

Module Name:src
Committed By:   hannken
Date:   Sun Jun  6 08:01:32 UTC 2010

Modified Files:
src/doc: CHANGES
src/share/man/man9: vnode.9
src/sys/fs/udf: udf_subr.c
src/sys/fs/union: union_subr.c
src/sys/fs/unionfs: unionfs_subr.c
src/sys/kern: vfs_subr.c vfs_vnops.c
src/sys/miscfs/genfs: genfs_vnops.c layer.h layer_subr.c layer_vnops.c
src/sys/miscfs/umapfs: umap_vnops.c
src/sys/sys: param.h vnode.h

Log Message:
Change layered file systems to always pass the locking VOP's down to the
leaf file system.  Remove now unused member v_vnlock from struct vnode.
Welcome to 5.99.30

Discussed on tech-kern.


To generate a diff of this commit:
cvs rdiff -u -r1.1399 -r1.1400 src/doc/CHANGES
cvs rdiff -u -r1.48 -r1.49 src/share/man/man9/vnode.9
cvs rdiff -u -r1.104 -r1.105 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.35 -r1.36 src/sys/fs/union/union_subr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/fs/unionfs/unionfs_subr.c
cvs rdiff -u -r1.403 -r1.404 src/sys/kern/vfs_subr.c
cvs rdiff -u -r1.171 -r1.172 src/sys/kern/vfs_vnops.c
cvs rdiff -u -r1.177 -r1.178 src/sys/miscfs/genfs/genfs_vnops.c
cvs rdiff -u -r1.13 -r1.14 src/sys/miscfs/genfs/layer.h
cvs rdiff -u -r1.28 -r1.29 src/sys/miscfs/genfs/layer_subr.c
cvs rdiff -u -r1.39 -r1.40 src/sys/miscfs/genfs/layer_vnops.c
cvs rdiff -u -r1.48 -r1.49 src/sys/miscfs/umapfs/umap_vnops.c
cvs rdiff -u -r1.364 -r1.365 src/sys/sys/param.h
cvs rdiff -u -r1.218 -r1.219 src/sys/sys/vnode.h

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

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1399 src/doc/CHANGES:1.1400
--- src/doc/CHANGES:1.1399	Fri Jun  4 09:10:53 2010
+++ src/doc/CHANGES	Sun Jun  6 08:01:30 2010
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1399 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1400 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -624,3 +624,4 @@
 		[mrg 20100527]
 	atf(7): Import 0.9.  [jmmv 20100604]
 	dhcpcd(8): Import dhcpcd-5.2.4. [roy 20100604]
+	vnode(9): Remove member v_vnlock. [hannken 20100605]

Index: src/share/man/man9/vnode.9
diff -u src/share/man/man9/vnode.9:1.48 src/share/man/man9/vnode.9:1.49
--- src/share/man/man9/vnode.9:1.48	Sun May 30 13:50:16 2010
+++ src/share/man/man9/vnode.9	Sun Jun  6 08:01:31 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: vnode.9,v 1.48 2010/05/30 13:50:16 ahoka Exp $
+.\ $NetBSD: vnode.9,v 1.49 2010/06/06 08:01:31 hannken Exp $
 .\
 .\ Copyright (c) 2001, 2005, 2006 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -27,7 +27,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd May 30, 2010
+.Dd June 6, 2010
 .Dt VNODE 9
 .Os
 .Sh NAME
@@ -161,7 +161,6 @@
 	enum vtype	v_type;			/* vnode type */
 	enum vtagtype	v_tag;			/* type of underlying data */
 	struct vnlock	v_lock;			/* lock for this vnode */
-	struct vnlock	*v_vnlock;		/* pointer to lock */
 	void 		*v_data;		/* private data for fs */
 	struct klist	v_klist;		/* notes attached to vnode */
 };
@@ -434,7 +433,7 @@
 .El
 .Pp
 All vnode locking operations use
-.Em v_vnlock .
+.Em v_lock .
 This lock is acquired by calling
 .Xr vn_lock 9
 and released by calling
@@ -462,7 +461,7 @@
 of big-lock SMP locking or a uni-processor machine.
 The lock may be held while sleeping.
 While the
-.Em v_vnlock
+.Em v_lock
 is acquired, the holder is guaranteed that the vnode will not be
 reclaimed or invalidated.
 Most file system functions require that you hold the vnode lock on entry.
@@ -470,23 +469,6 @@
 .Xr lock 9
 for details on the kernel locking API.
 .Pp
-For leaf file systems (such as ffs, lfs, msdosfs, etc),
-.Em v_vnlock
-will point to
-.Em v_lock .
-For stacked file systems,
-.Em v_vnlock
-will generally point to
-.Em v_vlock
-of the lowest file system.
-Additionally, the implementation of the vnode lock is the
-responsibility of the individual file systems and
-.Em v_vnlock
-may also be NULL indicating that a leaf node does not export a lock
-for vnode locking.
-In this case, stacked file systems (such as nullfs) must call the
-underlying file system directly for locking.
-.Pp
 Each file system underlying a vnode allocates its own private area and
 hangs it from
 .Em v_data .

Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.104 src/sys/fs/udf/udf_subr.c:1.105
--- src/sys/fs/udf/udf_subr.c:1.104	Thu Feb 25 16:15:57 2010
+++ src/sys/fs/udf/udf_subr.c	Sun Jun  6 08:01:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.104 2010/02/25 16:15:57 reinoud Exp $ */
+/* $NetBSD: udf_subr.c,v 1.105 2010/06/06 08:01:31 hannken Exp $ */
 
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
 
 #include sys/cdefs.h
 #ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_subr.c,v 1.104 2010/02/25 16:15:57 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: 

CVS commit: src/sys/arch

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Jun  6 09:12:39 UTC 2010

Modified Files:
src/sys/arch/hp700/hp700: machdep.c
src/sys/arch/hppa/hppa: vm_machdep.c

Log Message:
Pullup across/adapt fix from OpenBSD:

Properly initialize the members of `struct mdproc' that deal with
single-stepping when we fork and reset them upon exec.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/hp700/hp700/machdep.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/hppa/hppa/vm_machdep.c

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

Modified files:

Index: src/sys/arch/hp700/hp700/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.85 src/sys/arch/hp700/hp700/machdep.c:1.86
--- src/sys/arch/hp700/hp700/machdep.c:1.85	Tue Jun  1 10:20:29 2010
+++ src/sys/arch/hp700/hp700/machdep.c	Sun Jun  6 09:12:39 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.85 2010/06/01 10:20:29 skrll Exp $	*/
+/*	$NetBSD: machdep.c,v 1.86 2010/06/06 09:12:39 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.85 2010/06/01 10:20:29 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.86 2010/06/06 09:12:39 skrll Exp $);
 
 #include opt_cputype.h
 #include opt_ddb.h
@@ -1880,6 +1880,8 @@
 	pcb-pcb_fpregs-fpr_regs[2] = 0;
 	pcb-pcb_fpregs-fpr_regs[3] = 0;
 
+	l-l_md.md_bpva = 0;
+
 	/* setup terminal stack frame */
 	stack = (u_long)STACK_ALIGN(stack, 63);
 	tf-tf_r3 = stack;

Index: src/sys/arch/hppa/hppa/vm_machdep.c
diff -u src/sys/arch/hppa/hppa/vm_machdep.c:1.44 src/sys/arch/hppa/hppa/vm_machdep.c:1.45
--- src/sys/arch/hppa/hppa/vm_machdep.c:1.44	Sat Apr  3 07:46:02 2010
+++ src/sys/arch/hppa/hppa/vm_machdep.c	Sun Jun  6 09:12:39 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.44 2010/04/03 07:46:02 skrll Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.45 2010/06/06 09:12:39 skrll Exp $	*/
 
 /*	$OpenBSD: vm_machdep.c,v 1.64 2008/09/30 18:54:26 miod Exp $	*/
 
@@ -29,7 +29,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.44 2010/04/03 07:46:02 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.45 2010/06/06 09:12:39 skrll Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -112,6 +112,10 @@
 	pcb2-pcb_fpregs-fpr_regs[2] = 0;
 	pcb2-pcb_fpregs-fpr_regs[3] = 0;
 
+	l2-l_md.md_bpva = l1-l_md.md_bpva;
+	l2-l_md.md_bpsave[0] = l1-l_md.md_bpsave[0];
+	l2-l_md.md_bpsave[1] = l1-l_md.md_bpsave[1];
+
 	uv = uvm_lwp_getuarea(l2);
 	sp = (register_t)uv + PAGE_SIZE;
 	l2-l_md.md_regs = tf = (struct trapframe *)sp;

CVS commit: src/sys/arch/hp700

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Jun  6 10:15:51 UTC 2010

Modified Files:
src/sys/arch/hp700/hp700: machdep.c
src/sys/arch/hp700/include: cpu.h


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/hp700/hp700/machdep.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/hp700/include/cpu.h

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

Modified files:

Index: src/sys/arch/hp700/hp700/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.86 src/sys/arch/hp700/hp700/machdep.c:1.87
--- src/sys/arch/hp700/hp700/machdep.c:1.86	Sun Jun  6 09:12:39 2010
+++ src/sys/arch/hp700/hp700/machdep.c	Sun Jun  6 10:15:51 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.86 2010/06/06 09:12:39 skrll Exp $	*/
+/*	$NetBSD: machdep.c,v 1.87 2010/06/06 10:15:51 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.86 2010/06/06 09:12:39 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.87 2010/06/06 10:15:51 skrll Exp $);
 
 #include opt_cputype.h
 #include opt_ddb.h
@@ -256,8 +256,7 @@
 /* Virtual page frame for /dev/mem (see mem.c) */
 vaddr_t vmmap;
 
-/* Our exported CPU info; we can have only one. */
-struct cpu_info cpu_info_store = {
+struct cpu_info cpus[HPPA_MAXCPUS] = {
 #ifdef MULTIPROCESSOR
 	.ci_curlwp = lwp0
 #endif

Index: src/sys/arch/hp700/include/cpu.h
diff -u src/sys/arch/hp700/include/cpu.h:1.49 src/sys/arch/hp700/include/cpu.h:1.50
--- src/sys/arch/hp700/include/cpu.h:1.49	Fri Jun  4 06:39:38 2010
+++ src/sys/arch/hp700/include/cpu.h	Sun Jun  6 10:15:51 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.49 2010/06/04 06:39:38 skrll Exp $	*/
+/*	$NetBSD: cpu.h,v 1.50 2010/06/06 10:15:51 skrll Exp $	*/
 
 /*	$OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $	*/
 
@@ -243,25 +243,28 @@
 } __aligned(64);
 
 
-extern struct cpu_info cpu_info_store;
-
 /*
  * definitions of cpu-dependent requirements
  * referenced in generic code
  */
 
-#define	curcpu()			(cpu_info_store)
-#define	cpu_number()			0
-
 #define	cpu_proc_fork(p1, p2)
 
 #ifdef MULTIPROCESSOR
-#define	CPU_IS_PRIMARY(ci)		1
+
+#define	HPPA_MAXCPUS	4
+#define	cpu_number()			(curcpu()-ci_cpuid)
+
+#define	CPU_IS_PRIMARY(ci)		((ci)-ci_cpuid == 0)
 #define	CPU_INFO_ITERATOR		int
-#define	CPU_INFO_FOREACH(cii, ci)	cii = 0; ci = curcpu(), cii  1; cii++
+#define	CPU_INFO_FOREACH(cii, ci)	cii = 0; ci =  cpu_info[0], cii  ncpus; cii++, ci++
 
 void	cpu_boot_secondary_processors(void);
-#endif /* MULTIPROCESSOR */
+#else /* MULTIPROCESSOR */
+
+#define	HPPA_MAXCPUS	1
+#define	curcpu()			(cpus[0])
+#define	cpu_number()			0
 
 static __inline struct lwp *
 hppa_curlwp(void)
@@ -275,6 +278,10 @@
 
 #define	curlwphppa_curlwp()
 
+#endif /* MULTIPROCESSOR */
+
+extern struct cpu_info cpus[HPPA_MAXCPUS];
+
 #define	DELAY(x) delay(x)
 
 static __inline paddr_t

CVS commit: src/sys/arch/hp700/include

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Jun  6 10:22:43 UTC 2010

Modified Files:
src/sys/arch/hp700/include: cpu.h

Log Message:
Fix CPU_INFO_FOREACH in previous.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/hp700/include/cpu.h

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

Modified files:

Index: src/sys/arch/hp700/include/cpu.h
diff -u src/sys/arch/hp700/include/cpu.h:1.50 src/sys/arch/hp700/include/cpu.h:1.51
--- src/sys/arch/hp700/include/cpu.h:1.50	Sun Jun  6 10:15:51 2010
+++ src/sys/arch/hp700/include/cpu.h	Sun Jun  6 10:22:43 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.50 2010/06/06 10:15:51 skrll Exp $	*/
+/*	$NetBSD: cpu.h,v 1.51 2010/06/06 10:22:43 skrll Exp $	*/
 
 /*	$OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $	*/
 
@@ -257,7 +257,7 @@
 
 #define	CPU_IS_PRIMARY(ci)		((ci)-ci_cpuid == 0)
 #define	CPU_INFO_ITERATOR		int
-#define	CPU_INFO_FOREACH(cii, ci)	cii = 0; ci =  cpu_info[0], cii  ncpus; cii++, ci++
+#define	CPU_INFO_FOREACH(cii, ci)	cii = 0; ci =  cpus[0], cii  ncpus; cii++, ci++
 
 void	cpu_boot_secondary_processors(void);
 #else /* MULTIPROCESSOR */

CVS commit: src/sys/dev/acpi

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Sun Jun  6 10:44:41 UTC 2010

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

Log Message:
Although sysmon_pswitch_unregister(9) does not currently do anything, in
order to be ready for possible future API changes, call it if we failed to
install the fixed event handlers. Also small ACPI_DEBUG_PRINT clarifications.


To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/sys/dev/acpi/acpi.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/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.198 src/sys/dev/acpi/acpi.c:1.199
--- src/sys/dev/acpi/acpi.c:1.198	Sat Jun  5 06:07:12 2010
+++ src/sys/dev/acpi/acpi.c	Sun Jun  6 10:44:40 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi.c,v 1.198 2010/06/05 06:07:12 jruoho Exp $	*/
+/*	$NetBSD: acpi.c,v 1.199 2010/06/06 10:44:40 jruoho Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.198 2010/06/05 06:07:12 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.199 2010/06/06 10:44:40 jruoho Exp $);
 
 #include opt_acpi.h
 #include opt_pcifixup.h
@@ -1252,8 +1252,10 @@
 	rv = AcpiInstallFixedEventHandler(event,
 	acpi_fixed_button_handler, smpsw);
 
-	if (ACPI_FAILURE(rv))
+	if (ACPI_FAILURE(rv)) {
+		sysmon_pswitch_unregister(smpsw);
 		goto fail;
+	}
 
 	aprint_debug_dev(sc-sc_dev, fixed %s button present\n,
 	(type != ACPI_EVENT_SLEEP_BUTTON) ? power : sleep);
@@ -1316,8 +1318,6 @@
 	static const int handler = OSL_NOTIFY_HANDLER;
 	struct sysmon_pswitch *smpsw = context;
 
-	ACPI_DEBUG_PRINT((ACPI_DB_INFO, fixed event\n));
-
 	(void)AcpiOsExecute(handler, acpi_fixed_button_pressed, smpsw);
 
 	return ACPI_INTERRUPT_HANDLED;
@@ -1328,8 +1328,9 @@
 {
 	struct sysmon_pswitch *smpsw = context;
 
-	ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-		%s fixed button pressed\n, smpsw-smpsw_name));
+	ACPI_DEBUG_PRINT((ACPI_DB_INFO, %s fixed button pressed\n,
+		(smpsw-smpsw_type != ACPI_EVENT_SLEEP_BUTTON) ?
+		power : sleep));
 
 	sysmon_pswitch_event(smpsw, PSWITCH_EVENT_PRESSED);
 }

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

[Havard Eidnes]

Module Name:src
Committed By:   he
Date:   Sun Jun  6 11:41:06 UTC 2010

Modified Files:
src/sys/arch/m68k/include: pmap_motorola.h

Log Message:
Only include opt_m68k_arch.h if _KERNEL_OPT is defined, so that librump
builds again.  OK'ed by m...@.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/m68k/include/pmap_motorola.h

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

Modified files:

Index: src/sys/arch/m68k/include/pmap_motorola.h
diff -u src/sys/arch/m68k/include/pmap_motorola.h:1.29 src/sys/arch/m68k/include/pmap_motorola.h:1.30
--- src/sys/arch/m68k/include/pmap_motorola.h:1.29	Sun Jun  6 04:50:07 2010
+++ src/sys/arch/m68k/include/pmap_motorola.h	Sun Jun  6 11:41:06 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_motorola.h,v 1.29 2010/06/06 04:50:07 mrg Exp $	*/
+/*	$NetBSD: pmap_motorola.h,v 1.30 2010/06/06 11:41:06 he Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -76,7 +76,9 @@
 #ifndef	_M68K_PMAP_MOTOROLA_H_
 #define	_M68K_PMAP_MOTOROLA_H_
 
+#ifdef _KERNEL_OPT
 #include opt_m68k_arch.h
+#endif
 
 #include sys/simplelock.h
 #include machine/cpu.h

CVS commit: src/sys/arch

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Jun  6 12:13:36 UTC 2010

Modified Files:
src/sys/arch/hp700/dev: cpu.c
src/sys/arch/hp700/hp700: locore.S machdep.c
src/sys/arch/hp700/include: cpu.h
src/sys/arch/hppa/hppa: copy.S trap.S
src/sys/arch/hppa/include: reg.h

Log Message:
MULTIPROCESSOR fixes

- provide curcpu in a control register instead of curlwp
- define {GET,SET}_CURLWP and GET_CURCPU and use whereever possible.
- define a cpu count and use it in CPU_INFO_FOREACH

XXX hppa_ncpus isn't valid yet.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp700/dev/cpu.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/hp700/hp700/locore.S
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/hp700/hp700/machdep.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/hp700/include/cpu.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hppa/hppa/copy.S
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/hppa/hppa/trap.S
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hppa/include/reg.h

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

Modified files:

Index: src/sys/arch/hp700/dev/cpu.c
diff -u src/sys/arch/hp700/dev/cpu.c:1.14 src/sys/arch/hp700/dev/cpu.c:1.15
--- src/sys/arch/hp700/dev/cpu.c:1.14	Tue Mar 30 07:58:02 2010
+++ src/sys/arch/hp700/dev/cpu.c	Sun Jun  6 12:13:35 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.14 2010/03/30 07:58:02 skrll Exp $	*/
+/*	$NetBSD: cpu.c,v 1.15 2010/06/06 12:13:35 skrll Exp $	*/
 
 /*	$OpenBSD: cpu.c,v 1.28 2004/12/28 05:18:25 mickey Exp $	*/
 
@@ -29,7 +29,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.14 2010/03/30 07:58:02 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.15 2010/06/06 12:13:35 skrll Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -51,6 +51,10 @@
 	void *sc_ih;
 };
 
+#ifdef MULTIPROCESSOR
+int hppa_ncpus;
+#endif
+
 int	cpumatch(device_t, cfdata_t, void *);
 void	cpuattach(device_t, device_t, void *);
 

Index: src/sys/arch/hp700/hp700/locore.S
diff -u src/sys/arch/hp700/hp700/locore.S:1.46 src/sys/arch/hp700/hp700/locore.S:1.47
--- src/sys/arch/hp700/hp700/locore.S:1.46	Mon Apr  5 12:56:51 2010
+++ src/sys/arch/hp700/hp700/locore.S	Sun Jun  6 12:13:35 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.46 2010/04/05 12:56:51 skrll Exp $	*/
+/*	$NetBSD: locore.S,v 1.47 2010/06/06 12:13:35 skrll Exp $	*/
 /*	$OpenBSD: locore.S,v 1.158 2008/07/28 19:08:46 miod Exp $	*/
 
 /*
@@ -142,6 +142,16 @@
 #define	MTCPU_U(x,r)	.word	0x14001840 | ((r)  21) | ((x)  16)
 #endif
 
+#ifdef MULTIPROCESSOR
+#define	GET_CURCPU(r)	mfctl	CR_CURCPU, r
+#define	GET_CURLWP(r)	mfctl	CR_CURCPU, r ! ldw	CI_CURLWP(r), r
+#define	SET_CURLWP(r,s)	mfctl	CR_CURCPU, s ! stw	r, CI_CURLWP(s)
+#else
+#define	GET_CURCPU(r)	mfctl	CR_CURLWP, r ! ldw	L_CPU(r), r
+#define	GET_CURLWP(r)	mfctl	CR_CURLWP, r
+#define	SET_CURLWP(r,s)	mtctl	r, CR_CURLWP
+#endif
+
 	.import	$global$, data
 	.import pdc, data
 	.import	boothowto, data
@@ -537,8 +547,7 @@
  * int splraise(int ncpl);
  */
 LEAF_ENTRY(splraise)
-	mfctl	CR_CURLWP, %t1
-	ldw	L_CPU(%t1),%t1
+	GET_CURCPU(%t1)
 	ldw	CI_CPL(%t1), %ret0
 	or	%ret0, %arg0, %arg0
 	bv	%r0(%rp)
@@ -549,8 +558,7 @@
  * int spllower(int ncpl);
  */
 ENTRY(spllower,HPPA_FRAME_SIZE)
-	mfctl	CR_CURLWP, %t1
-	ldw	L_CPU(%t1),%t1
+	GET_CURCPU(%t1)
 
 	ldw	CI_IPENDING(%t1), %r1	; load ipending
 	andcm, %r1, %arg0, %r1	; and with complement of new cpl
@@ -615,8 +623,7 @@
  * void hp700_intr_schedule(int mask);
  */
 ENTRY(hp700_intr_schedule,0)
-	mfctl	CR_CURLWP, %t1
-	ldw	L_CPU(%t1),%t2
+	GET_CURCPU(%t2)
 	mfctl	%eiem, %arg1
 	mtctl	%r0, %eiem			; disable interrupts
 	ldw	CI_IPENDING(%t2), %r1		; load ipending
@@ -870,12 +877,7 @@
 	ldw	TF_CR30(%t1), %t2		/* pmap_activate? */
 	mtctl	%t2, CR_FPPADDR			/* pmap_activate? */
 
-	mtctl	%arg1, CR_CURLWP
-
-#ifdef MULTIPROCESSOR
-	ldw	L_CPU(%arg1),%t2		; %t2 = curcpu()
-	stw	%arg1, CI_CURLWP(%t2)
-#endif
+	SET_CURLWP(%arg1, %t2)
 
 	ldo	-(HPPA_FRAME_SIZE+16*4)(%sp), %r3
 
@@ -991,7 +993,7 @@
 	 * this LWP was created by the fork()
 	 * syscall, which we now return from.
 	 */
-	mfctl	CR_CURLWP, %t2
+	GET_CURLWP(%t2)
 	.call
 	b	syscall_return
 	ldw	L_MD(%t2), %t3

Index: src/sys/arch/hp700/hp700/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.87 src/sys/arch/hp700/hp700/machdep.c:1.88
--- src/sys/arch/hp700/hp700/machdep.c:1.87	Sun Jun  6 10:15:51 2010
+++ src/sys/arch/hp700/hp700/machdep.c	Sun Jun  6 12:13:35 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.87 2010/06/06 10:15:51 skrll Exp $	*/
+/*	$NetBSD: machdep.c,v 1.88 2010/06/06 12:13:35 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.87 2010/06/06 10:15:51 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.88 2010/06/06 12:13:35 skrll Exp $);
 
 #include opt_cputype.h
 #include opt_ddb.h
@@ -256,10 +256,13 @@
 /* Virtual page 

CVS commit: src/etc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Jun  6 12:37:57 UTC 2010

Modified Files:
src/etc: rc.subr

Log Message:
fix conditional, from dholland.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/etc/rc.subr

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

Modified files:

Index: src/etc/rc.subr
diff -u src/etc/rc.subr:1.82 src/etc/rc.subr:1.83
--- src/etc/rc.subr:1.82	Fri Jun  4 14:42:54 2010
+++ src/etc/rc.subr	Sun Jun  6 08:37:57 2010
@@ -1,4 +1,4 @@
-# $NetBSD: rc.subr,v 1.82 2010/06/04 18:42:54 christos Exp $
+# $NetBSD: rc.subr,v 1.83 2010/06/06 12:37:57 christos Exp $
 #
 # Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1181,10 +1181,10 @@
 #
 human_exit_code()
 {
-	if [ $1 -lt 127 ]
+	if [ $1 -lt 127 ]
 	then
 		echo exited with code $1
-	elif [ $1 -eq 127 ]
+	elif [ $(expr $1  255) -eq 127 ]
 	then
 		echo stopped with signal $(expr $1 / 256)
 	else

CVS commit: src/usr.bin/make

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sun Jun  6 17:28:48 UTC 2010

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

Log Message:
Bump date for previous.


To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 src/usr.bin/make/make.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/make/make.1
diff -u src/usr.bin/make/make.1:1.173 src/usr.bin/make/make.1:1.174
--- src/usr.bin/make/make.1:1.173	Sun Jun  6 01:13:12 2010
+++ src/usr.bin/make/make.1	Sun Jun  6 17:28:48 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: make.1,v 1.173 2010/06/06 01:13:12 sjg Exp $
+.\	$NetBSD: make.1,v 1.174 2010/06/06 17:28:48 wiz Exp $
 .\
 .\ Copyright (c) 1990, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\
 .\	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\
-.Dd April 21, 2010
+.Dd June 6, 2010
 .Dt MAKE 1
 .Os
 .Sh NAME

CVS commit: src/sys/external/intel-public/acpica/dist

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Sun Jun  6 18:18:09 UTC 2010

Update of /cvsroot/src/sys/external/intel-public/acpica/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv11458

Log Message:
Import ACPICA 20100528.


Status:

Vendor Tag: intel
Release Tags:   acpica-20100528

U src/sys/external/intel-public/acpica/dist/changes.txt
U src/sys/external/intel-public/acpica/dist/osunixxf.c
U src/sys/external/intel-public/acpica/dist/README
U src/sys/external/intel-public/acpica/dist/common/adfile.c
U src/sys/external/intel-public/acpica/dist/common/adisasm.c
U src/sys/external/intel-public/acpica/dist/common/adwalk.c
U src/sys/external/intel-public/acpica/dist/common/dmextern.c
U src/sys/external/intel-public/acpica/dist/common/dmrestag.c
U src/sys/external/intel-public/acpica/dist/common/dmtable.c
U src/sys/external/intel-public/acpica/dist/common/dmtbdump.c
C src/sys/external/intel-public/acpica/dist/common/dmtbinfo.c
U src/sys/external/intel-public/acpica/dist/common/getopt.c
U src/sys/external/intel-public/acpica/dist/compiler/aslanalyze.c
U src/sys/external/intel-public/acpica/dist/compiler/aslcodegen.c
U src/sys/external/intel-public/acpica/dist/compiler/aslcompile.c
U src/sys/external/intel-public/acpica/dist/compiler/aslcompiler.h
U src/sys/external/intel-public/acpica/dist/compiler/aslcompiler.l
U src/sys/external/intel-public/acpica/dist/compiler/aslcompiler.y
U src/sys/external/intel-public/acpica/dist/compiler/asldefine.h
U src/sys/external/intel-public/acpica/dist/compiler/aslerror.c
U src/sys/external/intel-public/acpica/dist/compiler/aslfiles.c
U src/sys/external/intel-public/acpica/dist/compiler/aslfold.c
U src/sys/external/intel-public/acpica/dist/compiler/aslglobal.h
U src/sys/external/intel-public/acpica/dist/compiler/asllength.c
U src/sys/external/intel-public/acpica/dist/compiler/asllisting.c
U src/sys/external/intel-public/acpica/dist/compiler/aslload.c
U src/sys/external/intel-public/acpica/dist/compiler/asllookup.c
U src/sys/external/intel-public/acpica/dist/compiler/aslmain.c
U src/sys/external/intel-public/acpica/dist/compiler/aslmap.c
U src/sys/external/intel-public/acpica/dist/compiler/aslopcodes.c
U src/sys/external/intel-public/acpica/dist/compiler/asloperands.c
U src/sys/external/intel-public/acpica/dist/compiler/aslopt.c
N src/sys/external/intel-public/acpica/dist/compiler/aslpredef.c
U src/sys/external/intel-public/acpica/dist/compiler/aslstubs.c
U src/sys/external/intel-public/acpica/dist/compiler/aslresource.c
U src/sys/external/intel-public/acpica/dist/compiler/aslrestype1.c
N src/sys/external/intel-public/acpica/dist/compiler/aslrestype1i.c
U src/sys/external/intel-public/acpica/dist/compiler/aslrestype2.c
N src/sys/external/intel-public/acpica/dist/compiler/aslrestype2d.c
N src/sys/external/intel-public/acpica/dist/compiler/aslrestype2e.c
N src/sys/external/intel-public/acpica/dist/compiler/aslrestype2q.c
N src/sys/external/intel-public/acpica/dist/compiler/aslrestype2w.c
U src/sys/external/intel-public/acpica/dist/compiler/aslstartup.c
U src/sys/external/intel-public/acpica/dist/compiler/asltransform.c
U src/sys/external/intel-public/acpica/dist/compiler/asltree.c
U src/sys/external/intel-public/acpica/dist/compiler/asltypes.h
U src/sys/external/intel-public/acpica/dist/compiler/aslutils.c
N src/sys/external/intel-public/acpica/dist/compiler/dtcompile.c
N src/sys/external/intel-public/acpica/dist/compiler/dtcompiler.h
N src/sys/external/intel-public/acpica/dist/compiler/dtfield.c
N src/sys/external/intel-public/acpica/dist/compiler/dtio.c
N src/sys/external/intel-public/acpica/dist/compiler/dtsubtable.c
N src/sys/external/intel-public/acpica/dist/compiler/dttable.c
N src/sys/external/intel-public/acpica/dist/compiler/dtutils.c
U src/sys/external/intel-public/acpica/dist/compiler/Makefile
U src/sys/external/intel-public/acpica/dist/compiler/readme.txt
C src/sys/external/intel-public/acpica/dist/debugger/dbcmds.c
U src/sys/external/intel-public/acpica/dist/debugger/dbdisply.c
C src/sys/external/intel-public/acpica/dist/debugger/dbexec.c
U src/sys/external/intel-public/acpica/dist/debugger/dbfileio.c
U src/sys/external/intel-public/acpica/dist/debugger/dbhistry.c
C src/sys/external/intel-public/acpica/dist/debugger/dbinput.c
U src/sys/external/intel-public/acpica/dist/debugger/dbstats.c
C src/sys/external/intel-public/acpica/dist/debugger/dbutils.c
U src/sys/external/intel-public/acpica/dist/debugger/dbxface.c
U src/sys/external/intel-public/acpica/dist/disassembler/dmbuffer.c
U src/sys/external/intel-public/acpica/dist/disassembler/dmnames.c
U src/sys/external/intel-public/acpica/dist/disassembler/dmobject.c
U src/sys/external/intel-public/acpica/dist/disassembler/dmopcode.c
C src/sys/external/intel-public/acpica/dist/disassembler/dmresrc.c
U src/sys/external/intel-public/acpica/dist/disassembler/dmresrcl.c
U src/sys/external/intel-public/acpica/dist/disassembler/dmresrcs.c
U 

CVS commit: src/sys/external/intel-public/acpica/dist

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Sun Jun  6 18:33:15 UTC 2010

Modified Files:
src/sys/external/intel-public/acpica/dist/debugger: dbdisply.c
src/sys/external/intel-public/acpica/dist/include: acutils.h
src/sys/external/intel-public/acpica/dist/utilities: utglobal.c

Log Message:
ACPICA does not understand the const type qualifier.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/sys/external/intel-public/acpica/dist/debugger/dbdisply.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/intel-public/acpica/dist/include/acutils.h
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/intel-public/acpica/dist/utilities/utglobal.c

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

Modified files:

Index: src/sys/external/intel-public/acpica/dist/debugger/dbdisply.c
diff -u src/sys/external/intel-public/acpica/dist/debugger/dbdisply.c:1.1.1.3 src/sys/external/intel-public/acpica/dist/debugger/dbdisply.c:1.2
--- src/sys/external/intel-public/acpica/dist/debugger/dbdisply.c:1.1.1.3	Sun Jun  6 18:16:59 2010
+++ src/sys/external/intel-public/acpica/dist/debugger/dbdisply.c	Sun Jun  6 18:33:14 2010
@@ -816,7 +816,7 @@
 ACPI_GPE_XRUPT_INFO *GpeXruptInfo;
 ACPI_GPE_EVENT_INFO *GpeEventInfo;
 ACPI_GPE_REGISTER_INFO  *GpeRegisterInfo;
-char*GpeType;
+const char  *GpeType;
 UINT32  GpeIndex;
 UINT32  Block = 0;
 UINT32  i;

Index: src/sys/external/intel-public/acpica/dist/include/acutils.h
diff -u src/sys/external/intel-public/acpica/dist/include/acutils.h:1.3 src/sys/external/intel-public/acpica/dist/include/acutils.h:1.4
--- src/sys/external/intel-public/acpica/dist/include/acutils.h:1.3	Thu Apr  8 04:31:49 2010
+++ src/sys/external/intel-public/acpica/dist/include/acutils.h	Sun Jun  6 18:33:14 2010
@@ -213,7 +213,7 @@
 AcpiUtGetNodeName (
 void*Object);
 
-char *
+const char *
 AcpiUtGetDescriptorName (
 void*Object);
 

Index: src/sys/external/intel-public/acpica/dist/utilities/utglobal.c
diff -u src/sys/external/intel-public/acpica/dist/utilities/utglobal.c:1.4 src/sys/external/intel-public/acpica/dist/utilities/utglobal.c:1.5
--- src/sys/external/intel-public/acpica/dist/utilities/utglobal.c:1.4	Sun Jun  6 18:28:36 2010
+++ src/sys/external/intel-public/acpica/dist/utilities/utglobal.c	Sun Jun  6 18:33:14 2010
@@ -644,14 +644,14 @@
 };
 
 
-char *
+const char *
 AcpiUtGetDescriptorName (
 void*Object)
 {
 
 if (!Object)
 {
-return __UNCONST(NULL OBJECT);
+return (NULL OBJECT);
 }
 
 if (ACPI_GET_DESCRIPTOR_TYPE (Object)  ACPI_DESC_TYPE_MAX)

CVS commit: src/sys/external/intel-public/acpica/conf

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Sun Jun  6 18:34:45 UTC 2010

Modified Files:
src/sys/external/intel-public/acpica/conf: files.acpica

Log Message:
Add new files from ACPICA 20100528.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/intel-public/acpica/conf/files.acpica

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

Modified files:

Index: src/sys/external/intel-public/acpica/conf/files.acpica
diff -u src/sys/external/intel-public/acpica/conf/files.acpica:1.2 src/sys/external/intel-public/acpica/conf/files.acpica:1.3
--- src/sys/external/intel-public/acpica/conf/files.acpica:1.2	Thu Apr  8 04:37:14 2010
+++ src/sys/external/intel-public/acpica/conf/files.acpica	Sun Jun  6 18:34:45 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: files.acpica,v 1.2 2010/04/08 04:37:14 jruoho Exp $
+#	$NetBSD: files.acpica,v 1.3 2010/06/06 18:34:45 jruoho Exp $
 
 define		acpica
 makeoptions	acpi	CPPFLAGS+=-I$S/external/intel-public/acpica/dist/include
@@ -42,6 +42,8 @@
 file	external/intel-public/acpica/dist/events/evevent.c		acpica
 file	external/intel-public/acpica/dist/events/evgpe.c		acpica
 file	external/intel-public/acpica/dist/events/evgpeblk.c		acpica
+file	external/intel-public/acpica/dist/events/evgpeinit.c		acpica
+file	external/intel-public/acpica/dist/events/evgpeutil.c		acpica
 file	external/intel-public/acpica/dist/events/evmisc.c		acpica
 file	external/intel-public/acpica/dist/events/evregion.c		acpica
 file	external/intel-public/acpica/dist/events/evrgnini.c		acpica
@@ -54,6 +56,7 @@
 file	external/intel-public/acpica/dist/executer/exconfig.c		acpica
 file	external/intel-public/acpica/dist/executer/exconvrt.c		acpica
 file	external/intel-public/acpica/dist/executer/excreate.c		acpica
+file	external/intel-public/acpica/dist/executer/exdebug.c		acpica
 file	external/intel-public/acpica/dist/executer/exdump.c		acpica
 file	external/intel-public/acpica/dist/executer/exfield.c		acpica
 file	external/intel-public/acpica/dist/executer/exfldio.c		acpica

CVS commit: src/sys/dev/acpi

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Sun Jun  6 18:40:51 UTC 2010

Modified Files:
src/sys/dev/acpi: acpi_ec.c acpi_wakedev.c

Log Message:
ACPICA 20100331:

Completed a major update for the GPE support in order to improve
support for shared GPEs and to simplify both host OS and ACPICA
code. Added a reference count mechanism to support shared GPEs that
require multiple device drivers.  Several external interfaces have
changed. One external interface has been removed. One new external
interface was added. Most of the GPE external interfaces now use the
GPE spinlock instead of the events mutex (and the Flags parameter
for many GPE interfaces has been removed.) See the updated ACPICA
Programmer Reference for details. Matthew Garrett, Bob Moore, Rafael
Wysocki. ACPICA BZ 831.

Changed:
AcpiEnableGpe, AcpiDisableGpe, AcpiClearGpe, AcpiGetGpeStatus
Removed:
AcpiSetGpeType
New:
AcpiSetGpe


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/acpi/acpi_ec.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/acpi/acpi_wakedev.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/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.65 src/sys/dev/acpi/acpi_ec.c:1.66
--- src/sys/dev/acpi/acpi_ec.c:1.65	Wed Apr 14 19:27:28 2010
+++ src/sys/dev/acpi/acpi_ec.c	Sun Jun  6 18:40:51 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_ec.c,v 1.65 2010/04/14 19:27:28 jruoho Exp $	*/
+/*	$NetBSD: acpi_ec.c,v 1.66 2010/06/06 18:40:51 jruoho Exp $	*/
 
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger jo...@netbsd.org.
@@ -59,7 +59,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_ec.c,v 1.65 2010/04/14 19:27:28 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_ec.c,v 1.66 2010/06/06 18:40:51 jruoho Exp $);
 
 #include sys/param.h
 #include sys/callout.h
@@ -366,14 +366,7 @@
 		goto post_csr_map;
 	}
 
-	rv = AcpiSetGpeType(sc-sc_gpeh, sc-sc_gpebit, ACPI_GPE_TYPE_RUNTIME);
-	if (rv != AE_OK) {
-		aprint_error_dev(self, unable to set GPE type: %s\n,
-		AcpiFormatException(rv));
-		goto post_csr_map;
-	}
-
-	rv = AcpiEnableGpe(sc-sc_gpeh, sc-sc_gpebit, ACPI_ISR);
+	rv = AcpiEnableGpe(sc-sc_gpeh, sc-sc_gpebit, ACPI_GPE_TYPE_RUNTIME);
 	if (rv != AE_OK) {
 		aprint_error_dev(self, unable to enable GPE: %s\n,
 		AcpiFormatException(rv));
@@ -582,7 +575,7 @@
 		}
 		if (sc-sc_state != EC_STATE_FREE) {
 			mutex_exit(sc-sc_mtx);
-			AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit, ACPI_NOT_ISR);
+			AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit);
 			acpiec_unlock(dv);
 			aprint_error_dev(dv, command timed out, state %d\n,
 			sc-sc_state);
@@ -590,7 +583,7 @@
 		}
 	} else if (cv_timedwait(sc-sc_cv, sc-sc_mtx, EC_CMD_TIMEOUT * hz)) {
 		mutex_exit(sc-sc_mtx);
-		AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit, ACPI_NOT_ISR);
+		AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit);
 		acpiec_unlock(dv);
 		aprint_error_dev(dv, command takes over %d sec...\n, EC_CMD_TIMEOUT);
 		return AE_ERROR;
@@ -631,7 +624,7 @@
 		}
 		if (sc-sc_state != EC_STATE_FREE) {
 			mutex_exit(sc-sc_mtx);
-			AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit, ACPI_NOT_ISR);
+			AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit);
 			acpiec_unlock(dv);
 			aprint_error_dev(dv, command timed out, state %d\n,
 			sc-sc_state);
@@ -639,7 +632,7 @@
 		}
 	} else if (cv_timedwait(sc-sc_cv, sc-sc_mtx, EC_CMD_TIMEOUT * hz)) {
 		mutex_exit(sc-sc_mtx);
-		AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit, ACPI_NOT_ISR);
+		AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit);
 		acpiec_unlock(dv);
 		aprint_error_dev(dv, command takes over %d sec...\n, EC_CMD_TIMEOUT);
 		return AE_ERROR;
@@ -849,7 +842,7 @@
 	device_t dv = arg;
 	struct acpiec_softc *sc = device_private(dv);
 
-	AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit, ACPI_NOT_ISR);
+	AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit);
 
 	mutex_enter(sc-sc_mtx);
 	acpiec_gpe_state_machine(dv);
@@ -862,7 +855,7 @@
 	device_t dv = arg;
 	struct acpiec_softc *sc = device_private(dv);
 
-	AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit, ACPI_ISR);
+	AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit);
 
 	mutex_enter(sc-sc_mtx);
 	acpiec_gpe_state_machine(dv);

Index: src/sys/dev/acpi/acpi_wakedev.c
diff -u src/sys/dev/acpi/acpi_wakedev.c:1.14 src/sys/dev/acpi/acpi_wakedev.c:1.15
--- src/sys/dev/acpi/acpi_wakedev.c:1.14	Sat Jun  5 15:47:59 2010
+++ src/sys/dev/acpi/acpi_wakedev.c	Sun Jun  6 18:40:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakedev.c,v 1.14 2010/06/05 15:47:59 jruoho Exp $ */
+/* $NetBSD: acpi_wakedev.c,v 1.15 2010/06/06 18:40:51 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2009, 2010 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_wakedev.c,v 1.14 2010/06/05 15:47:59 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_wakedev.c,v 1.15 2010/06/06 18:40:51 jruoho Exp $);
 
 

CVS commit: src/sys/dev/acpi

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Sun Jun  6 18:56:10 UTC 2010

Modified Files:
src/sys/dev/acpi: acpi_ec.c

Log Message:
We can no longer explicitly clear a GPE by calling AcpiClearGpe() in the
interrupt handler. However, all edge-triggered GPEs should already be
cleared before our GPE handler has a chance to run.

The reason can be found from the changes in the locking primitives of
ACPICA. All GPE operations now use a spin mutex on AcpiGbl_GpeLock, acquired
via AcpiOsAcquireLock(). This same lock is now acquired unconditionally in
the AcpiClearGpe() function. This causes a deadlock of the following form:

  ...

  AcpiEvGpeDetect() : acquire AcpiGbl_GpeLock;

  - AcpiEvGpeDispatch();

  - acpiec_gpe_handler();

  - AcpiClearGpe() : acquire AcpiGbl_GpeLock;

  - panic.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/acpi/acpi_ec.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/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.66 src/sys/dev/acpi/acpi_ec.c:1.67
--- src/sys/dev/acpi/acpi_ec.c:1.66	Sun Jun  6 18:40:51 2010
+++ src/sys/dev/acpi/acpi_ec.c	Sun Jun  6 18:56:10 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_ec.c,v 1.66 2010/06/06 18:40:51 jruoho Exp $	*/
+/*	$NetBSD: acpi_ec.c,v 1.67 2010/06/06 18:56:10 jruoho Exp $	*/
 
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger jo...@netbsd.org.
@@ -59,7 +59,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_ec.c,v 1.66 2010/06/06 18:40:51 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_ec.c,v 1.67 2010/06/06 18:56:10 jruoho Exp $);
 
 #include sys/param.h
 #include sys/callout.h
@@ -575,7 +575,6 @@
 		}
 		if (sc-sc_state != EC_STATE_FREE) {
 			mutex_exit(sc-sc_mtx);
-			AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit);
 			acpiec_unlock(dv);
 			aprint_error_dev(dv, command timed out, state %d\n,
 			sc-sc_state);
@@ -583,7 +582,6 @@
 		}
 	} else if (cv_timedwait(sc-sc_cv, sc-sc_mtx, EC_CMD_TIMEOUT * hz)) {
 		mutex_exit(sc-sc_mtx);
-		AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit);
 		acpiec_unlock(dv);
 		aprint_error_dev(dv, command takes over %d sec...\n, EC_CMD_TIMEOUT);
 		return AE_ERROR;
@@ -624,7 +622,6 @@
 		}
 		if (sc-sc_state != EC_STATE_FREE) {
 			mutex_exit(sc-sc_mtx);
-			AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit);
 			acpiec_unlock(dv);
 			aprint_error_dev(dv, command timed out, state %d\n,
 			sc-sc_state);
@@ -632,7 +629,6 @@
 		}
 	} else if (cv_timedwait(sc-sc_cv, sc-sc_mtx, EC_CMD_TIMEOUT * hz)) {
 		mutex_exit(sc-sc_mtx);
-		AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit);
 		acpiec_unlock(dv);
 		aprint_error_dev(dv, command takes over %d sec...\n, EC_CMD_TIMEOUT);
 		return AE_ERROR;
@@ -842,8 +838,6 @@
 	device_t dv = arg;
 	struct acpiec_softc *sc = device_private(dv);
 
-	AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit);
-
 	mutex_enter(sc-sc_mtx);
 	acpiec_gpe_state_machine(dv);
 	mutex_exit(sc-sc_mtx);
@@ -855,8 +849,6 @@
 	device_t dv = arg;
 	struct acpiec_softc *sc = device_private(dv);
 
-	AcpiClearGpe(sc-sc_gpeh, sc-sc_gpebit);
-
 	mutex_enter(sc-sc_mtx);
 	acpiec_gpe_state_machine(dv);
 	mutex_exit(sc-sc_mtx);

CVS commit: src/sys/dev/mii

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sun Jun  6 18:58:22 UTC 2010

Modified Files:
src/sys/dev/mii: mii_physubr.c mii_verbose.c mii_verbose.h ukphy.c

Log Message:
Update miiverbose module to use module_autoload() rather than module_load().
Load the module right before each attempt to use its features, and let the
module subsystem handle unloading.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/mii/mii_physubr.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/mii/mii_verbose.c \
src/sys/dev/mii/mii_verbose.h
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/mii/ukphy.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/mii/mii_physubr.c
diff -u src/sys/dev/mii/mii_physubr.c:1.69 src/sys/dev/mii/mii_physubr.c:1.70
--- src/sys/dev/mii/mii_physubr.c:1.69	Wed Jun  2 19:47:34 2010
+++ src/sys/dev/mii/mii_physubr.c	Sun Jun  6 18:58:22 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: mii_physubr.c,v 1.69 2010/06/02 19:47:34 martin Exp $	*/
+/*	$NetBSD: mii_physubr.c,v 1.70 2010/06/06 18:58:22 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mii_physubr.c,v 1.69 2010/06/02 19:47:34 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: mii_physubr.c,v 1.70 2010/06/06 18:58:22 pgoyette Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -55,29 +55,29 @@
 
 const char *(*mii_get_descr)(int, int) = mii_get_descr_stub;
 
+int mii_verbose_loaded = 0;
+
 const char *mii_get_descr_stub(int oui, int model)
 {
-	return NULL;
+	mii_load_verbose();
+	if (mii_verbose_loaded)
+		return mii_get_descr(oui, model);
+	else
+		return NULL;
 }
 
 /*
- * Routine to load/unload the miiverbose kernel module as needed
+ * Routine to load the miiverbose kernel module as needed
  */
-void mii_verbose_ctl(bool load)
+void mii_load_verbose(void)
 {
-	static int loaded = 0;
- 
-	if (load) {
-		if (loaded++ == 0)
-			if (module_load(miiverbose, MODCTL_LOAD_FORCE,
-	NULL, MODULE_CLASS_MISC) !=0 )
-loaded = 0;
-		return; 
-	}
-	if (loaded == 0)
-		return; 
-	if (--loaded == 0)
-		module_unload(miiverbose);
+	if (mii_verbose_loaded)
+		return;
+
+	mutex_enter(module_lock);
+	if (module_autoload(miiverbose, MODULE_CLASS_MISC) ==0)
+		mii_verbose_loaded++;
+	mutex_exit(module_lock);
 }  
 
 static void mii_phy_statusmsg(struct mii_softc *);

Index: src/sys/dev/mii/mii_verbose.c
diff -u src/sys/dev/mii/mii_verbose.c:1.1 src/sys/dev/mii/mii_verbose.c:1.2
--- src/sys/dev/mii/mii_verbose.c:1.1	Sun May 30 17:44:07 2010
+++ src/sys/dev/mii/mii_verbose.c	Sun Jun  6 18:58:22 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: mii_verbose.c,v 1.1 2010/05/30 17:44:07 pgoyette Exp $ */
+/*	$NetBSD: mii_verbose.c,v 1.2 2010/06/06 18:58:22 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mii_verbose.c,v 1.1 2010/05/30 17:44:07 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: mii_verbose.c,v 1.2 2010/06/06 18:58:22 pgoyette Exp $);
 
 #include sys/module.h
 #include dev/mii/mii_verbose.h
@@ -75,12 +75,16 @@
 static int
 miiverbose_modcmd(modcmd_t cmd, void *arg)
 {
+	static const char *(*saved_mii_get_descr)(int, int);
+
 	switch (cmd) {
 	case MODULE_CMD_INIT:
+		saved_mii_get_descr = mii_get_descr;
 		mii_get_descr = mii_get_descr_real;
 		return 0;
 	case MODULE_CMD_FINI:
-		mii_get_descr = mii_get_descr_stub;
+		mii_get_descr = saved_mii_get_descr;
+		mii_verbose_loaded = 0;
 		return 0;
 	default:
 		return ENOTTY;
Index: src/sys/dev/mii/mii_verbose.h
diff -u src/sys/dev/mii/mii_verbose.h:1.1 src/sys/dev/mii/mii_verbose.h:1.2
--- src/sys/dev/mii/mii_verbose.h:1.1	Sun May 30 17:44:08 2010
+++ src/sys/dev/mii/mii_verbose.h	Sun Jun  6 18:58:22 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: mii_verbose.h,v 1.1 2010/05/30 17:44:08 pgoyette Exp $ */
+/*	$NetBSD: mii_verbose.h,v 1.2 2010/06/06 18:58:22 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -40,7 +40,9 @@
 extern const char *	(*mii_get_descr)(int, int);
 
 const char *	mii_get_descr_stub(int, int);
-void		mii_verbose_ctl(bool);
+void		mii_load_verbose(void);
+
+extern int	mii_verbose_loaded;
 
 #endif /* _KERNEL */
 

Index: src/sys/dev/mii/ukphy.c
diff -u src/sys/dev/mii/ukphy.c:1.42 src/sys/dev/mii/ukphy.c:1.43
--- src/sys/dev/mii/ukphy.c:1.42	Wed Jun  2 19:47:34 2010
+++ src/sys/dev/mii/ukphy.c	Sun Jun  6 18:58:22 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: ukphy.c,v 1.42 2010/06/02 19:47:34 martin Exp $	*/
+/*	$NetBSD: ukphy.c,v 1.43 2010/06/06 18:58:22 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ukphy.c,v 1.42 2010/06/02 19:47:34 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: ukphy.c,v 1.43 2010/06/06 18:58:22 pgoyette Exp 

CVS commit: src/sys/dev/usb

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sun Jun  6 18:58:26 UTC 2010

Modified Files:
src/sys/dev/usb: ohci.c usb.c usb_subr.c usb_verbose.c usb_verbose.h

Log Message:
Update usbverbose module to use module_autoload() rather than module_load().
Load the module right before each attempt to use its features, and let the
module subsystem handle unloading.


To generate a diff of this commit:
cvs rdiff -u -r1.206 -r1.207 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.121 -r1.122 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.170 -r1.171 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/usb_verbose.c \
src/sys/dev/usb/usb_verbose.h

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

Modified files:

Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.206 src/sys/dev/usb/ohci.c:1.207
--- src/sys/dev/usb/ohci.c:1.206	Wed Feb 24 22:38:09 2010
+++ src/sys/dev/usb/ohci.c	Sun Jun  6 18:58:26 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: ohci.c,v 1.206 2010/02/24 22:38:09 dyoung Exp $	*/
+/*	$NetBSD: ohci.c,v 1.207 2010/06/06 18:58:26 pgoyette Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.206 2010/02/24 22:38:09 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.207 2010/06/06 18:58:26 pgoyette Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -1291,7 +1291,8 @@
 			DPRINTFN(5,(add ITD %p\n, sitd));
 			continue;
 		}
-		panic(ohci_softintr: addr 0x%08lx not found, (u_long)done);
+		printf(ohci_softintr: addr 0x%08lx not found, (u_long)done);
+		return;
 	}
 
 	DPRINTFN(10,(ohci_softintr: sdone=%p sidone=%p\n, sdone, sidone));

Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.121 src/sys/dev/usb/usb.c:1.122
--- src/sys/dev/usb/usb.c:1.121	Sat May 29 01:14:29 2010
+++ src/sys/dev/usb/usb.c	Sun Jun  6 18:58:26 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb.c,v 1.121 2010/05/29 01:14:29 pgoyette Exp $	*/
+/*	$NetBSD: usb.c,v 1.122 2010/06/06 18:58:26 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1998, 2002, 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.121 2010/05/29 01:14:29 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.122 2010/06/06 18:58:26 pgoyette Exp $);
 
 #include opt_compat_netbsd.h
 
@@ -189,9 +189,6 @@
 	}
 	aprint_normal(\n);
 
-	/* Try to load the usbverbose module */
-	usb_verbose_ctl(true);
-
 	config_interrupts(self, usb_doattach);
 }
 
@@ -986,9 +983,6 @@
 	ue-u.ue_ctrlr.ue_bus = device_unit(self);
 	usb_add_event(USB_EVENT_CTRLR_DETACH, ue);
 
-	/* Try to unload the usbverbose module */
-	usb_verbose_ctl(false);
-
 	return (0);
 }
 

Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.170 src/sys/dev/usb/usb_subr.c:1.171
--- src/sys/dev/usb/usb_subr.c:1.170	Sat May 29 06:44:22 2010
+++ src/sys/dev/usb/usb_subr.c	Sun Jun  6 18:58:26 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_subr.c,v 1.170 2010/05/29 06:44:22 cegger Exp $	*/
+/*	$NetBSD: usb_subr.c,v 1.171 2010/06/06 18:58:26 pgoyette Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb_subr.c,v 1.170 2010/05/29 06:44:22 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb_subr.c,v 1.171 2010/06/06 18:58:26 pgoyette Exp $);
 
 #include opt_compat_netbsd.h
 #include opt_usbverbose.h
@@ -106,33 +106,43 @@
 	XXX,
 };
 
-void (*get_usb_vendor)(char *, usb_vendor_id_t) = (void *)get_usb_none;
+void usb_load_verbose(void);
+
+void get_usb_vendor_stub(char *, usb_vendor_id_t);
+void get_usb_product_stub(char *, usb_vendor_id_t, usb_product_id_t);
+
+void (*get_usb_vendor)(char *, usb_vendor_id_t) = get_usb_vendor_stub;
 void (*get_usb_product)(char *, usb_vendor_id_t, usb_product_id_t) =
-	(void *)get_usb_none;
+	get_usb_product_stub;
 
-void get_usb_none(void)
-{
-	/* Nothing happens */
-}
+int usb_verbose_loaded = 0;
 
 /*
- * Load/unload the usbverbose module
+ * Load the usbverbose module
  */
-void usb_verbose_ctl(bool load)
+void usb_load_verbose(void)
+{
+	if (usb_verbose_loaded)
+		return;
+
+	mutex_enter(module_lock);
+	if (module_autoload(usbverbose, MODULE_CLASS_MISC) == 0)
+		usb_verbose_loaded++;
+	mutex_exit(module_lock);
+}
+
+void get_usb_vendor_stub(char *v, usb_vendor_id_t v_id)
+{
+	usb_load_verbose();
+	if (usb_verbose_loaded)
+		get_usb_vendor(v, v_id);
+}
+
+void get_usb_product_stub(char *p, usb_vendor_id_t v_id, usb_product_id_t p_id)
 {
-	static int loaded = 0;
- 
-	if (load) {
-		if (loaded++ == 0)
-			if (module_load(usbverbose, MODCTL_LOAD_FORCE,
-	NULL, MODULE_CLASS_MISC) != 0)
-loaded = 0;
-		return; 
-	}
-	if (loaded == 0)
-		return; 
-	if (--loaded == 0)
-		module_unload(usbverbose);
+	usb_load_verbose();
+	if (usb_verbose_loaded)
+		get_usb_product(p, v_id, p_id);
 }
 
 

CVS commit: src/sys/dev/pci

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sun Jun  6 18:58:24 UTC 2010

Modified Files:
src/sys/dev/pci: pci.c pci_subr.c pci_verbose.c pci_verbose.h

Log Message:
Update pciverbose module to use module_autoload() rather than module_load().
Load the module right before each attempt to use its features, and let the
module subsystem handle unloading.


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/dev/pci/pci.c
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/pci_verbose.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/pci_verbose.h

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

Modified files:

Index: src/sys/dev/pci/pci.c
diff -u src/sys/dev/pci/pci.c:1.128 src/sys/dev/pci/pci.c:1.129
--- src/sys/dev/pci/pci.c:1.128	Mon May 24 20:29:41 2010
+++ src/sys/dev/pci/pci.c	Sun Jun  6 18:58:23 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci.c,v 1.128 2010/05/24 20:29:41 pgoyette Exp $	*/
+/*	$NetBSD: pci.c,v 1.129 2010/06/06 18:58:23 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1997, 1998
@@ -36,13 +36,12 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci.c,v 1.128 2010/05/24 20:29:41 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci.c,v 1.129 2010/06/06 18:58:23 pgoyette Exp $);
 
 #include opt_pci.h
 
 #include sys/param.h
 #include sys/malloc.h
-#include sys/module.h
 #include sys/systm.h
 #include sys/device.h
 
@@ -107,12 +106,8 @@
 	KASSERT(ifattr  !strcmp(ifattr, pci));
 	KASSERT(locators);
 
-	pci_verbose_ctl(true);	/* Try to load the pciverbose module */
-
 	pci_enumerate_bus(sc, locators, NULL, NULL);
 
-	pci_verbose_ctl(false);	/* Now try to unload it */
-
 	return 0;
 }
 

Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.82 src/sys/dev/pci/pci_subr.c:1.83
--- src/sys/dev/pci/pci_subr.c:1.82	Wed May 26 09:42:42 2010
+++ src/sys/dev/pci/pci_subr.c	Sun Jun  6 18:58:23 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_subr.c,v 1.82 2010/05/26 09:42:42 martin Exp $	*/
+/*	$NetBSD: pci_subr.c,v 1.83 2010/06/06 18:58:23 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_subr.c,v 1.82 2010/05/26 09:42:42 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_subr.c,v 1.83 2010/06/06 18:58:23 pgoyette Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_pci.h
@@ -61,8 +61,6 @@
 #include dev/pci/pcireg.h
 #ifdef _KERNEL
 #include dev/pci/pcivar.h
-#else
-const char *pci_null(pcireg_t);
 #endif
 
 /*
@@ -295,13 +293,18 @@
 	NULL,		},
 };
 
+void pci_load_verbose(void);
+
 #if defined(_KERNEL)
 /*
  * In kernel, these routines are provided and linked via the
  * pciverbose module.
  */
-const char *(*pci_findvendor)(pcireg_t id_reg) = pci_null;
-const char *(*pci_findproduct)(pcireg_t id_reg) = pci_null;
+const char *pci_findvendor_stub(pcireg_t);
+const char *pci_findproduct_stub(pcireg_t);
+
+const char *(*pci_findvendor)(pcireg_t) = pci_findvendor_stub;
+const char *(*pci_findproduct)(pcireg_t) = pci_findproduct_stub;
 const char *pci_unmatched = ;
 #else
 /*
@@ -312,31 +315,39 @@
 const char *pci_unmatched = unmatched ;
 #endif
 
-const char *
-pci_null(pcireg_t id_reg)
-{
-	return (NULL);
-}
+int pciverbose_loaded = 0;
 
 #if defined(_KERNEL)
 /*
- * Routine to load/unload the pciverbose kernel module as needed
+ * Routine to load the pciverbose kernel module as needed
  */
-void pci_verbose_ctl(bool load)
+void pci_load_verbose(void)
 {
-	static int loaded = 0;
-
-	if (load) {
-		if (loaded++ == 0)
-			if (module_load(pciverbose, MODCTL_LOAD_FORCE, NULL,
-MODULE_CLASS_MISC) !=0 )
-loaded = 0;
-		return;
-	}
-	if (loaded == 0)
+	if (pciverbose_loaded)
 		return;
-	if (--loaded == 0)
-		module_unload(pciverbose);
+
+	mutex_enter(module_lock);
+	if (module_autoload(pciverbose, MODULE_CLASS_MISC) == 0 )
+		pciverbose_loaded++;
+	mutex_exit(module_lock);
+}
+
+const char *pci_findvendor_stub(pcireg_t id_reg)
+{
+	pci_load_verbose();
+	if (pciverbose_loaded)
+		return pci_findvendor(id_reg);
+	else
+		return NULL;
+}
+
+const char *pci_findproduct_stub(pcireg_t id_reg)
+{
+	pci_load_verbose();
+	if (pciverbose_loaded)
+		return pci_findproduct(id_reg);
+	else
+		return NULL;
 }
 #endif
 

Index: src/sys/dev/pci/pci_verbose.c
diff -u src/sys/dev/pci/pci_verbose.c:1.5 src/sys/dev/pci/pci_verbose.c:1.6
--- src/sys/dev/pci/pci_verbose.c:1.5	Fri May 28 02:38:41 2010
+++ src/sys/dev/pci/pci_verbose.c	Sun Jun  6 18:58:24 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_verbose.c,v 1.5 2010/05/28 02:38:41 pgoyette Exp $	*/
+/*	$NetBSD: pci_verbose.c,v 1.6 2010/06/06 18:58:24 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_verbose.c,v 1.5 2010/05/28 02:38:41 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_verbose.c,v 1.6 

CVS commit: src/doc

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Sun Jun  6 19:19:58 UTC 2010

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Note the ACPICA update to 20100528.


To generate a diff of this commit:
cvs rdiff -u -r1.763 -r1.764 src/doc/3RDPARTY
cvs rdiff -u -r1.1400 -r1.1401 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.763 src/doc/3RDPARTY:1.764
--- src/doc/3RDPARTY:1.763	Fri Jun  4 09:10:53 2010
+++ src/doc/3RDPARTY	Sun Jun  6 19:19:58 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.763 2010/06/04 09:10:53 roy Exp $
+#	$NetBSD: 3RDPARTY,v 1.764 2010/06/06 19:19:58 jruoho Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -25,7 +25,7 @@
 # remaining lines until the end of the record are notes.
 
 Package:	acpica
-Version:	20100121
+Version:	20100528
 Current Vers:	20100528
 Maintainer:	INTEL
 Archive Site:	http://www.acpica.org/downloads/unix_source_code.php

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1400 src/doc/CHANGES:1.1401
--- src/doc/CHANGES:1.1400	Sun Jun  6 08:01:30 2010
+++ src/doc/CHANGES	Sun Jun  6 19:19:58 2010
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1400 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1401 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -625,3 +625,4 @@
 	atf(7): Import 0.9.  [jmmv 20100604]
 	dhcpcd(8): Import dhcpcd-5.2.4. [roy 20100604]
 	vnode(9): Remove member v_vnlock. [hannken 20100605]
+	acpi(4): Updated ACPICA to 20100528. [jruoho 20100606]

CVS commit: src/external/intel-public/acpica/bin/iasl

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Sun Jun  6 19:35:39 UTC 2010

Modified Files:
src/external/intel-public/acpica/bin/iasl: Makefile

Log Message:
Add missing files required for iASL from ACPICA 20100528.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/intel-public/acpica/bin/iasl/Makefile

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

Modified files:

Index: src/external/intel-public/acpica/bin/iasl/Makefile
diff -u src/external/intel-public/acpica/bin/iasl/Makefile:1.5 src/external/intel-public/acpica/bin/iasl/Makefile:1.6
--- src/external/intel-public/acpica/bin/iasl/Makefile:1.5	Sun May 23 14:08:05 2010
+++ src/external/intel-public/acpica/bin/iasl/Makefile	Sun Jun  6 19:35:38 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2010/05/23 14:08:05 veego Exp $
+#	$NetBSD: Makefile,v 1.6 2010/06/06 19:35:38 jruoho Exp $
 
 .if (${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64)
 PROG=	iasl
@@ -35,9 +35,15 @@
 SRCS+=	aslmap.c
 SRCS+=	aslopcodes.c
 SRCS+=	asloperands.c
+SRCS+=	aslpredef.c
 SRCS+=	aslresource.c
 SRCS+=	aslrestype1.c
+SRCS+=	aslrestype1i.c
 SRCS+=	aslrestype2.c
+SRCS+=	aslrestype2d.c
+SRCS+=	aslrestype2e.c
+SRCS+=	aslrestype2q.c
+SRCS+=	aslrestype2w.c
 SRCS+=	aslstartup.c
 SRCS+=	asltree.c
 SRCS+=	aslutils.c
@@ -45,6 +51,12 @@
 SRCS+=	aslfold.c
 SRCS+=	aslstubs.c
 SRCS+=	aslopt.c
+SRCS+=	dtcompile.c
+SRCS+=	dtfield.c
+SRCS+=	dtio.c
+SRCS+=	dtsubtable.c
+SRCS+=	dttable.c
+SRCS+=	dtutils.c
 .PATH: ${TOPDIR}/../common
 SRCS+=	getopt.c
 .PATH: ${TOPDIR}/../utilities

CVS commit: src/sys/external/intel-public/acpica/dist/common

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Sun Jun  6 19:42:16 UTC 2010

Modified Files:
src/sys/external/intel-public/acpica/dist/common: dmtbinfo.c

Log Message:
Fix a build failure.

Apparently upstream does not bother to test-build their own releases.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/intel-public/acpica/dist/common/dmtbinfo.c

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

Modified files:

Index: src/sys/external/intel-public/acpica/dist/common/dmtbinfo.c
diff -u src/sys/external/intel-public/acpica/dist/common/dmtbinfo.c:1.4 src/sys/external/intel-public/acpica/dist/common/dmtbinfo.c:1.5
--- src/sys/external/intel-public/acpica/dist/common/dmtbinfo.c:1.4	Sun Jun  6 18:28:35 2010
+++ src/sys/external/intel-public/acpica/dist/common/dmtbinfo.c	Sun Jun  6 19:42:16 2010
@@ -1416,7 +1416,7 @@
 {ACPI_DMT_FLAG0,ACPI_SRAT0_FLAG_OFFSET (Flags,0),   Enabled, 0},
 {ACPI_DMT_UINT8,ACPI_SRAT0_OFFSET (LocalSapicEid),  Local Sapic EID, 0},
 {ACPI_DMT_UINT24,   ACPI_SRAT0_OFFSET (ProximityDomainHi[0]),   Proximity Domain High(24), 0},
-{ACPI_DMT_UINT32,   ACPI_SRAT0_OFFSET (Reserved),   Reserved, 0},
+{ACPI_DMT_UINT32,   ACPI_SRAT0_OFFSET (ClockDomain),Clock Domain, 0},
 ACPI_DMT_TERMINATOR
 };
 

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

[Nicolas Joly]

Module Name:src
Committed By:   njoly
Date:   Sun Jun  6 20:09:38 UTC 2010

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

Log Message:
Make vers.c depend on sys/param.h too, to ensure that this file is
regenerated for on kernel version bump. Avoids __NetBSD_Version__ and
osrelease out of sync problem for mkupdate builds.

ok from po...@.


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

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

Modified files:

Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.87 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.88
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.87	Tue May 18 16:30:22 2010
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern	Sun Jun  6 20:09:38 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.rumpkern,v 1.87 2010/05/18 16:30:22 pooka Exp $
+#	$NetBSD: Makefile.rumpkern,v 1.88 2010/06/06 20:09:38 njoly Exp $
 #
 
 .include ${RUMPTOP}/Makefile.rump
@@ -24,7 +24,7 @@
 SRCS+=	locks.c
 #SRCS+=	locks_up.c
 
-vers.c: ${RUMPTOP}/../conf/newvers.sh ${RUMPTOP}/../conf/osrelease.sh
+vers.c: ${RUMPTOP}/../conf/newvers.sh ${RUMPTOP}/../conf/osrelease.sh ${RUMPTOP}/../sys/param.h
 	${_MKMSG_CREATE} vers.c
 	${HOST_SH} ${RUMPTOP}/../conf/newvers.sh -i RUMP-ROAST -n
 SRCS+=		vers.c

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/glint

[Joerg Sonnenberger]

Module Name:xsrc
Committed By:   joerg
Date:   Sun Jun  6 20:10:03 UTC 2010

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/glint: glint.man

Log Message:
Kill empty .TP.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man

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

Modified files:

Index: xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man
diff -u xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man:1.1.1.4 xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man:1.1.1.4	Fri Mar 18 13:11:40 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man	Sun Jun  6 20:10:03 2010
@@ -102,7 +102,6 @@
 .TP
 .BI Option \*qFireGL3000\*q \*q boolean \*q
 If you have a card of the same name, turn this on.  Default: off.
-.TP
 .SH SEE ALSO
 XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS

CVS commit: src/lib/libp2k

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Sun Jun  6 22:46:17 UTC 2010

Modified Files:
src/lib/libp2k: p2k.c

Log Message:
Pass VOP_PATHCONF to backend file server.  inspired by njoly.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/lib/libp2k/p2k.c

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

Modified files:

Index: src/lib/libp2k/p2k.c
diff -u src/lib/libp2k/p2k.c:1.38 src/lib/libp2k/p2k.c:1.39
--- src/lib/libp2k/p2k.c:1.38	Fri May 21 10:52:17 2010
+++ src/lib/libp2k/p2k.c	Sun Jun  6 22:46:17 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: p2k.c,v 1.38 2010/05/21 10:52:17 pooka Exp $	*/
+/*	$NetBSD: p2k.c,v 1.39 2010/06/06 22:46:17 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008, 2009  Antti Kantee.  All Rights Reserved.
@@ -310,6 +310,8 @@
 	PUFFSOP_SET(pops, p2k, node, read);
 	PUFFSOP_SET(pops, p2k, node, write);
 
+	PUFFSOP_SET(pops, p2k, node, pathconf);
+
 	PUFFSOP_SET(pops, p2k, node, inactive);
 	PUFFSOP_SET(pops, p2k, node, reclaim);
 	PUFFSOP_SET(pops, p2k, node, abortop);
@@ -1304,6 +1306,21 @@
 
 /*ARGSUSED*/
 int
+p2k_node_pathconf(struct puffs_usermount *pu, puffs_cookie_t opc,
+	int name, int *retval)
+{
+	struct vnode *vp = OPC2VP(opc);
+	int rv;
+
+	RUMP_VOP_LOCK(vp, LK_EXCLUSIVE);
+	rv = RUMP_VOP_PATHCONF(vp, name, (register_t *)retval);
+	RUMP_VOP_UNLOCK(vp, 0);
+
+	return rv;
+}
+
+/*ARGSUSED*/
+int
 p2k_node_getextattr(struct puffs_usermount *pu, puffs_cookie_t opc,
 	int attrnamespace, const char *attrname, size_t *attrsize,
 	uint8_t *attr, size_t *resid, const struct puffs_cred *pcr)

CVS commit: src/sys/dev/usb

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Sun Jun  6 23:01:05 UTC 2010

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
Add Philips SA235 Digital Audio Player.

This USB Mass Storage Class device stops responding after a
SCSI PREVENT ALLOW MEDIUM REMOVAL command.


To generate a diff of this commit:
cvs rdiff -u -r1.551 -r1.552 src/sys/dev/usb/usbdevs

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

Modified files:

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.551 src/sys/dev/usb/usbdevs:1.552
--- src/sys/dev/usb/usbdevs:1.551	Sun Jun  6 22:56:48 2010
+++ src/sys/dev/usb/usbdevs	Sun Jun  6 23:01:05 2010
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.551 2010/06/06 22:56:48 jakllsch Exp $
+$NetBSD: usbdevs,v 1.552 2010/06/06 23:01:05 jakllsch Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1866,6 +1866,7 @@
 /* Philips products */
 product PHILIPS DSS350		0x0101	DSS 350 Digital Speaker System
 product PHILIPS DSS		0x0104	DSS XXX Digital Speaker System
+product PHILIPS SA235		0x016a	SA235
 product PHILIPS HUB		0x0201	hub
 product PHILIPS PCA645VC	0x0302	PCA645VC PC Camera
 product PHILIPS PCA646VC	0x0303	PCA646VC PC Camera

CVS commit: src/sys/dev/usb

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Sun Jun  6 23:02:32 UTC 2010

Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h

Log Message:
Regenerate.


To generate a diff of this commit:
cvs rdiff -u -r1.545 -r1.546 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.546 -r1.547 src/sys/dev/usb/usbdevs_data.h

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

Modified files:

Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.545 src/sys/dev/usb/usbdevs.h:1.546
--- src/sys/dev/usb/usbdevs.h:1.545	Sat May 22 18:51:19 2010
+++ src/sys/dev/usb/usbdevs.h	Sun Jun  6 23:02:31 2010
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.545 2010/05/22 18:51:19 plunky Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.546 2010/06/06 23:02:31 jakllsch Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.549 2010/04/19 21:55:20 jmcneill Exp
+ *	NetBSD: usbdevs,v 1.552 2010/06/06 23:01:05 jakllsch Exp
  */
 
 /*
@@ -1873,6 +1873,7 @@
 /* Philips products */
 #define	USB_PRODUCT_PHILIPS_DSS350	0x0101		/* DSS 350 Digital Speaker System */
 #define	USB_PRODUCT_PHILIPS_DSS	0x0104		/* DSS XXX Digital Speaker System */
+#define	USB_PRODUCT_PHILIPS_SA235	0x016a		/* SA235 */
 #define	USB_PRODUCT_PHILIPS_HUB	0x0201		/* hub */
 #define	USB_PRODUCT_PHILIPS_PCA645VC	0x0302		/* PCA645VC PC Camera */
 #define	USB_PRODUCT_PHILIPS_PCA646VC	0x0303		/* PCA646VC PC Camera */
@@ -2174,8 +2175,8 @@
 #define	USB_PRODUCT_SIGMATEL_VFIR4220	0x4220		/* StIR4220 VFIR */
 #define	USB_PRODUCT_SIGMATEL_I_BEAD100	0x8008		/* i-Bead 100 MP3 Player */
 #define	USB_PRODUCT_SIGMATEL_I_BEAD150	0x8009		/* i-Bead 150 MP3 Player */
-#define	USB_PRODUCT_SIGMATEL_MUSICSTICK	0x8134		/* TrekStor Musicstick */
 #define	USB_PRODUCT_SIGMATEL_DNSSF7X	0x8020		/* Datum Networks SSF-7X Multi Players */
+#define	USB_PRODUCT_SIGMATEL_MUSICSTICK	0x8134		/* TrekStor Musicstick */
 
 /* SIIG products */
 #define	USB_PRODUCT_SIIG_DIGIFILMREADER	0x0004		/* DigiFilm-Combo Reader */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.546 src/sys/dev/usb/usbdevs_data.h:1.547
--- src/sys/dev/usb/usbdevs_data.h:1.546	Sat May 22 18:51:19 2010
+++ src/sys/dev/usb/usbdevs_data.h	Sun Jun  6 23:02:31 2010
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.546 2010/05/22 18:51:19 plunky Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.547 2010/06/06 23:02:31 jakllsch Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.549 2010/04/19 21:55:20 jmcneill Exp
+ *	NetBSD: usbdevs,v 1.552 2010/06/06 23:01:05 jakllsch Exp
  */
 
 /*
@@ -5499,6 +5499,10 @@
 	DSS XXX Digital Speaker System,
 	},
 	{
+	USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_SA235,
+	SA235,
+	},
+	{
 	USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_HUB,
 	hub,
 	},
@@ -6343,14 +6347,14 @@
 	i-Bead 150 MP3 Player,
 	},
 	{
-	USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_MUSICSTICK,
-	TrekStor Musicstick,
-	},
-	{
 	USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_DNSSF7X,
 	Datum Networks SSF-7X Multi Players,
 	},
 	{
+	USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_MUSICSTICK,
+	TrekStor Musicstick,
+	},
+	{
 	USB_VENDOR_SIIG, USB_PRODUCT_SIIG_DIGIFILMREADER,
 	DigiFilm-Combo Reader,
 	},
@@ -7167,4 +7171,4 @@
 	Prestige,
 	},
 };
-const int usb_nproducts = 1315;
+const int usb_nproducts = 1316;

CVS commit: src/lib/libpuffs

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Sun Jun  6 23:11:05 UTC 2010

Modified Files:
src/lib/libpuffs: puffs.c

Log Message:
Actually, disable pathconf for a while longer: the retval needs a
little finetuning (not that everyone is jumping right to using it,
but fixing will have to wait until tomorrow, and who knows what
i'll forget during the night and how long it will eventually take).


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/lib/libpuffs/puffs.c

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

Modified files:

Index: src/lib/libpuffs/puffs.c
diff -u src/lib/libpuffs/puffs.c:1.108 src/lib/libpuffs/puffs.c:1.109
--- src/lib/libpuffs/puffs.c:1.108	Sun Jun  6 22:44:54 2010
+++ src/lib/libpuffs/puffs.c	Sun Jun  6 23:11:05 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs.c,v 1.108 2010/06/06 22:44:54 pooka Exp $	*/
+/*	$NetBSD: puffs.c,v 1.109 2010/06/06 23:11:05 pooka Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 #if !defined(lint)
-__RCSID($NetBSD: puffs.c,v 1.108 2010/06/06 22:44:54 pooka Exp $);
+__RCSID($NetBSD: puffs.c,v 1.109 2010/06/06 23:11:05 pooka Exp $);
 #endif /* !lint */
 
 #include sys/param.h
@@ -101,7 +101,10 @@
 	FILLOP(read, READ);
 	FILLOP(write,WRITE);
 	FILLOP(abortop,  ABORTOP);
+#if 0
+	/* make pvnr_retval container sensible */
 	FILLOP(pathconf, PATHCONF);
+#endif
 
 	FILLOP(getextattr,  GETEXTATTR);
 	FILLOP(setextattr,  SETEXTATTR);

CVS commit: src/sys/dev/scsipi

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Jun  7 01:41:40 UTC 2010

Modified Files:
src/sys/dev/scsipi: atapiconf.c scsiconf.c scsipi_base.c
scsipi_verbose.c scsipiconf.c scsipiconf.h

Log Message:
Update scsiverbose module to use module_autoload() rather than module_load().
Load the module right before each attempt to use its features, and let the
module subsystem handle unloading.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/scsipi/atapiconf.c
cvs rdiff -u -r1.257 -r1.258 src/sys/dev/scsipi/scsiconf.c
cvs rdiff -u -r1.152 -r1.153 src/sys/dev/scsipi/scsipi_base.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/scsipi/scsipi_verbose.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/scsipi/scsipiconf.c
cvs rdiff -u -r1.117 -r1.118 src/sys/dev/scsipi/scsipiconf.h

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

Modified files:

Index: src/sys/dev/scsipi/atapiconf.c
diff -u src/sys/dev/scsipi/atapiconf.c:1.82 src/sys/dev/scsipi/atapiconf.c:1.83
--- src/sys/dev/scsipi/atapiconf.c:1.82	Sun May 30 04:38:04 2010
+++ src/sys/dev/scsipi/atapiconf.c	Mon Jun  7 01:41:39 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: atapiconf.c,v 1.82 2010/05/30 04:38:04 pgoyette Exp $	*/
+/*	$NetBSD: atapiconf.c,v 1.83 2010/06/07 01:41:39 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1996, 2001 Manuel Bouyer.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: atapiconf.c,v 1.82 2010/05/30 04:38:04 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: atapiconf.c,v 1.83 2010/06/07 01:41:39 pgoyette Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -160,7 +160,6 @@
 		aprint_error_dev(self, couldn't establish power handler\n);
 
 	/* Probe the bus for devices. */
-	scsipi_verbose_ctl(true);
 	atapi_probe_bus(sc, -1);
 }
 
@@ -207,7 +206,6 @@
 			return (error);
 		KASSERT(scsipi_lookup_periph(chan, target, 0) == NULL);
 	}
-	scsipi_verbose_ctl(false);
 	return (0);
 }
 

Index: src/sys/dev/scsipi/scsiconf.c
diff -u src/sys/dev/scsipi/scsiconf.c:1.257 src/sys/dev/scsipi/scsiconf.c:1.258
--- src/sys/dev/scsipi/scsiconf.c:1.257	Sun May 30 04:38:04 2010
+++ src/sys/dev/scsipi/scsiconf.c	Mon Jun  7 01:41:39 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsiconf.c,v 1.257 2010/05/30 04:38:04 pgoyette Exp $	*/
+/*	$NetBSD: scsiconf.c,v 1.258 2010/06/07 01:41:39 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scsiconf.c,v 1.257 2010/05/30 04:38:04 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: scsiconf.c,v 1.258 2010/06/07 01:41:39 pgoyette Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -182,7 +182,6 @@
 	scsi_initq = malloc(sizeof(struct scsi_initq), M_DEVBUF, M_WAITOK);
 	scsi_initq-sc_channel = chan;
 	TAILQ_INSERT_TAIL(scsi_initq_head, scsi_initq, scsi_initq);
-	scsipi_verbose_ctl(true);
 config_pending_incr();
 	if (scsipi_channel_init(chan)) {
 		aprint_error_dev(sc-sc_dev, failed to init channel\n);
@@ -226,7 +225,6 @@
 	simple_lock(scsibus_interlock);
 	TAILQ_REMOVE(scsi_initq_head, scsi_initq, scsi_initq);
 	simple_unlock(scsibus_interlock);
-	scsipi_verbose_ctl(false);
 
 	free(scsi_initq, M_DEVBUF);
 	wakeup(scsi_initq_head);

Index: src/sys/dev/scsipi/scsipi_base.c
diff -u src/sys/dev/scsipi/scsipi_base.c:1.152 src/sys/dev/scsipi/scsipi_base.c:1.153
--- src/sys/dev/scsipi/scsipi_base.c:1.152	Sun May 30 04:38:04 2010
+++ src/sys/dev/scsipi/scsipi_base.c	Mon Jun  7 01:41:39 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsipi_base.c,v 1.152 2010/05/30 04:38:04 pgoyette Exp $	*/
+/*	$NetBSD: scsipi_base.c,v 1.153 2010/06/07 01:41:39 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scsipi_base.c,v 1.152 2010/05/30 04:38:04 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: scsipi_base.c,v 1.153 2010/06/07 01:41:39 pgoyette Exp $);
 
 #include opt_scsi.h
 
@@ -47,7 +47,6 @@
 #include sys/proc.h
 #include sys/kthread.h
 #include sys/hash.h
-#include sys/module.h
 
 #include uvm/uvm_extern.h
 
@@ -83,27 +82,6 @@
 
 static struct pool scsipi_xfer_pool;
 
-/*  
- * Load/unload the scsiverbose module
- */
-void
-scsipi_verbose_ctl(bool load)
-{
-	static int loaded = 0;
- 
-	if (load) {
-		if (loaded++ == 0)
-			if (module_load(scsiverbose, MODCTL_LOAD_FORCE,
-	NULL, MODULE_CLASS_MISC) != 0)
-		loaded = 0;
-		return;
-	}
-	if (loaded == 0)
-		return;
-	if (--loaded == 0)
-		module_unload(scsiverbose);
-} 
-
 /*
  * scsipi_init:
  *

Index: src/sys/dev/scsipi/scsipi_verbose.c
diff -u src/sys/dev/scsipi/scsipi_verbose.c:1.30 src/sys/dev/scsipi/scsipi_verbose.c:1.31
--- src/sys/dev/scsipi/scsipi_verbose.c:1.30	Sun May 30 04:38:04 2010
+++ src/sys/dev/scsipi/scsipi_verbose.c	Mon Jun  7 01:41:39 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsipi_verbose.c,v 1.30 

CVS commit: src/sys/dev/acpi

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Jun  7 01:45:28 UTC 2010

Modified Files:
src/sys/dev/acpi: acpi.c acpi_verbose.c acpivar.h

Log Message:
Update acpiverbose module to use module_autoload() rather than module_load().
Load the module right before each attempt to use its features, and let the
module subsystem handle unloading.


To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/acpi_verbose.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/acpi/acpivar.h

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

Modified files:

Index: src/sys/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.199 src/sys/dev/acpi/acpi.c:1.200
--- src/sys/dev/acpi/acpi.c:1.199	Sun Jun  6 10:44:40 2010
+++ src/sys/dev/acpi/acpi.c	Mon Jun  7 01:45:27 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi.c,v 1.199 2010/06/06 10:44:40 jruoho Exp $	*/
+/*	$NetBSD: acpi.c,v 1.200 2010/06/07 01:45:27 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.199 2010/06/06 10:44:40 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.200 2010/06/07 01:45:27 pgoyette Exp $);
 
 #include opt_acpi.h
 #include opt_pcifixup.h
@@ -203,13 +203,19 @@
 extern struct cfdriver acpi_cd;
 
 /* Handle routine vectors and loading for acpiverbose module */
-void acpi_verbose_ctl(bool load);
 void acpi_null(void);
 
-void (*acpi_print_devnodes)(struct acpi_softc *) = (void *)acpi_null;
-void (*acpi_print_tree)(struct acpi_devnode *, uint32_t) = (void *)acpi_null;
-void (*acpi_print_dev)(const char *) = (void *)acpi_null;
-void (*acpi_wmidump)(void *) = (void *)acpi_null;
+void acpi_print_devnodes_stub(struct acpi_softc *);
+void acpi_print_tree_stub(struct acpi_devnode *, uint32_t);
+void acpi_print_dev_stub(const char *);
+void acpi_wmidump_stub(void *);
+
+void (*acpi_print_devnodes)(struct acpi_softc *) = acpi_print_devnodes_stub;
+void (*acpi_print_tree)(struct acpi_devnode *, uint32_t) = acpi_print_tree_stub;
+void (*acpi_print_dev)(const char *) = acpi_print_dev_stub;
+void (*acpi_wmidump)(void *) = acpi_wmidump_stub;
+
+int acpi_verbose_loaded = 0;
 
 /* acpiverbose support */
 void
@@ -219,23 +225,44 @@
 }
 
 void
-acpi_verbose_ctl(bool load)
+acpi_load_verbose(void)
 {
-	static int loaded = 0;
-
-	if (load) {
-		if (loaded++ == 0)
-			if (module_load(acpiverbose, MODCTL_LOAD_FORCE,
-	NULL, MODULE_CLASS_MISC) != 0)
-loaded = 0;
+	if (acpi_verbose_loaded)
 		return;
-	}
-	if (loaded == 0)
-		return;
-	if (--loaded == 0)
-		module_unload(acpiverbose);
+
+	mutex_enter(module_lock);
+	if (module_autoload(acpiverbose, MODULE_CLASS_MISC) == 0)
+		acpi_verbose_loaded++;
+	mutex_exit(module_lock);
+}  
+
+void acpi_print_devnodes_stub(struct acpi_softc *sc)
+{
+	acpi_load_verbose();
+	if (acpi_verbose_loaded)
+		acpi_print_devnodes(sc);
 }
 
+void acpi_print_tree_stub(struct acpi_devnode *ad, uint32_t level)
+{
+	acpi_load_verbose();
+	if (acpi_verbose_loaded)
+		acpi_print_tree(ad, level);
+}
+
+void acpi_print_dev_stub(const char *pnpstr)
+{
+	acpi_load_verbose();
+	if (acpi_verbose_loaded)
+		acpi_print_dev(pnpstr);
+}
+
+void acpi_wmidump_stub(void *arg)
+{
+	acpi_load_verbose();
+	if (acpi_verbose_loaded)
+		acpi_wmidump(arg);
+}
 
 CFATTACH_DECL2_NEW(acpi, sizeof(struct acpi_softc),
 acpi_match, acpi_attach, acpi_detach, NULL, acpi_rescan, acpi_childdet);
@@ -401,8 +428,6 @@
 	if (acpi_softc != NULL)
 		panic(%s: already attached, __func__);
 
-	acpi_verbose_ctl(true);
-
 	rsdt = acpi_map_rsdt();
 
 	if (rsdt == NULL)
@@ -567,8 +592,6 @@
 
 	acpi_softc = NULL;
 
-	acpi_verbose_ctl(false);
-
 	return 0;
 }
 

Index: src/sys/dev/acpi/acpi_verbose.c
diff -u src/sys/dev/acpi/acpi_verbose.c:1.2 src/sys/dev/acpi/acpi_verbose.c:1.3
--- src/sys/dev/acpi/acpi_verbose.c:1.2	Sat Jun  5 06:07:12 2010
+++ src/sys/dev/acpi/acpi_verbose.c	Mon Jun  7 01:45:27 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_verbose.c,v 1.2 2010/06/05 06:07:12 jruoho Exp $ */
+/*	$NetBSD: acpi_verbose.c,v 1.3 2010/06/07 01:45:27 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_verbose.c,v 1.2 2010/06/05 06:07:12 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_verbose.c,v 1.3 2010/06/07 01:45:27 pgoyette Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -88,18 +88,28 @@
 static int
 acpiverbose_modcmd(modcmd_t cmd, void *arg)
 {
+	static void	(*saved_print_devnodes)(struct acpi_softc *);
+	static void	(*saved_print_tree)(struct acpi_devnode *, uint32_t);
+	static void	(*saved_print_dev)(const char *);
+	static void	(*saved_wmidump)(void *);
+
 	switch (cmd) {
 	case MODULE_CMD_INIT:
+		saved_print_devnodes = acpi_print_devnodes;
+		saved_print_tree = acpi_print_tree;
+		saved_print_dev = 

CVS commit: src/tests/fs/tmpfs

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Mon Jun  7 03:39:41 UTC 2010

Modified Files:
src/tests/fs/tmpfs: t_create.sh t_mkdir.sh

Log Message:
Use atf_check to su in a couple cases, to make the test failure
easier to understand when the unprivileged user has /sbin/nologin
for a shell.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/tmpfs/t_create.sh \
src/tests/fs/tmpfs/t_mkdir.sh

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

Modified files:

Index: src/tests/fs/tmpfs/t_create.sh
diff -u src/tests/fs/tmpfs/t_create.sh:1.4 src/tests/fs/tmpfs/t_create.sh:1.5
--- src/tests/fs/tmpfs/t_create.sh:1.4	Fri Jun  4 08:39:40 2010
+++ src/tests/fs/tmpfs/t_create.sh	Mon Jun  7 03:39:41 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_create.sh,v 1.4 2010/06/04 08:39:40 jmmv Exp $
+# $NetBSD: t_create.sh,v 1.5 2010/06/07 03:39:41 riz Exp $
 #
 # Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -86,12 +86,12 @@
 	[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail Incorrect owner
 	[ ${st_gid} -eq 100 ] || atf_fail Incorrect group
 
-	su ${user} -c 'touch b/a'
+	atf_check -s eq:0 -o empty -e empty su ${user} -c 'touch b/a'
 	eval $(stat -s b/a)
 	[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail Incorrect owner
 	[ ${st_gid} -eq 0 ] || atf_fail Incorrect group
 
-	su ${user} -c 'touch c/a'
+	atf_check -s eq:0 -o empty -e empty su ${user} -c 'touch c/a'
 	eval $(stat -s c/a)
 	[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail Incorrect owner
 	[ ${st_gid} -eq 100 ] || atf_fail Incorrect group
Index: src/tests/fs/tmpfs/t_mkdir.sh
diff -u src/tests/fs/tmpfs/t_mkdir.sh:1.4 src/tests/fs/tmpfs/t_mkdir.sh:1.5
--- src/tests/fs/tmpfs/t_mkdir.sh:1.4	Fri Jun  4 08:39:40 2010
+++ src/tests/fs/tmpfs/t_mkdir.sh	Mon Jun  7 03:39:41 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_mkdir.sh,v 1.4 2010/06/04 08:39:40 jmmv Exp $
+# $NetBSD: t_mkdir.sh,v 1.5 2010/06/07 03:39:41 riz Exp $
 #
 # Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -115,12 +115,12 @@
 	[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail Incorrect owner
 	[ ${st_gid} -eq 100 ] || atf_fail Incorrect group
 
-	su ${user} -c 'mkdir b/a'
+	atf_check -s eq:0 -o empty -e empty su ${user} -c 'mkdir b/a'
 	eval $(stat -s b/a)
 	[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail Incorrect owner
 	[ ${st_gid} -eq 0 ] || atf_fail Incorrect group
 
-	su ${user} -c 'mkdir c/a'
+	atf_check -s eq:0 -o empty -e empty su ${user} -c 'mkdir c/a'
 	eval $(stat -s c/a)
 	[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail Incorrect owner
 	[ ${st_gid} -eq 100 ] || atf_fail Incorrect group

CVS commit: src

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Mon Jun  7 03:43:51 UTC 2010

Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/fs/tmpfs: Atffile Makefile
Removed Files:
src/tests/fs/tmpfs: t_id_gen.sh

Log Message:
Remove a test (that a created directory had a predictable inode number)
that no longer makes sense since the vmlocking2 branch was merged.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/tmpfs/Atffile \
src/tests/fs/tmpfs/Makefile
cvs rdiff -u -r1.4 -r0 src/tests/fs/tmpfs/t_id_gen.sh

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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.79 src/distrib/sets/lists/tests/mi:1.80
--- src/distrib/sets/lists/tests/mi:1.79	Sat Jun  5 22:39:18 2010
+++ src/distrib/sets/lists/tests/mi	Mon Jun  7 03:43:50 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.79 2010/06/05 22:39:18 dholland Exp $
+# $NetBSD: mi,v 1.80 2010/06/07 03:43:50 riz Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -725,7 +725,7 @@
 ./usr/tests/fs/tmpfs/t_devices			tests-fs-tests		atf
 ./usr/tests/fs/tmpfs/t_dots			tests-fs-tests		atf
 ./usr/tests/fs/tmpfs/t_exec			tests-fs-tests		atf
-./usr/tests/fs/tmpfs/t_id_gen			tests-fs-tests		atf
+./usr/tests/fs/tmpfs/t_id_gen			tests-obsolete		obsolete
 ./usr/tests/fs/tmpfs/t_link			tests-fs-tests		atf
 ./usr/tests/fs/tmpfs/t_mkdir			tests-fs-tests		atf
 ./usr/tests/fs/tmpfs/t_mknod			tests-fs-tests		atf

Index: src/tests/fs/tmpfs/Atffile
diff -u src/tests/fs/tmpfs/Atffile:1.5 src/tests/fs/tmpfs/Atffile:1.6
--- src/tests/fs/tmpfs/Atffile:1.5	Tue Apr  7 20:51:46 2009
+++ src/tests/fs/tmpfs/Atffile	Mon Jun  7 03:43:51 2010
@@ -1,5 +1,5 @@
 Content-Type: application/X-atf-atffile; version=1
-X-NetBSD-Id: $NetBSD: Atffile,v 1.5 2009/04/07 20:51:46 pooka Exp $
+X-NetBSD-Id: $NetBSD: Atffile,v 1.6 2010/06/07 03:43:51 riz Exp $
 
 prop: test-suite = NetBSD
 
@@ -9,7 +9,6 @@
 tp: t_vnode_leak
 tp: t_setattr
 tp: t_rmdir
-tp: t_id_gen
 tp: t_trail_slash
 tp: t_dots
 tp: t_create
Index: src/tests/fs/tmpfs/Makefile
diff -u src/tests/fs/tmpfs/Makefile:1.5 src/tests/fs/tmpfs/Makefile:1.6
--- src/tests/fs/tmpfs/Makefile:1.5	Sun Apr 26 15:15:38 2009
+++ src/tests/fs/tmpfs/Makefile	Mon Jun  7 03:43:51 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/04/26 15:15:38 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/07 03:43:51 riz Exp $
 
 TESTSDIR=	${TESTSBASE}/fs/tmpfs
 WARNS=		4
@@ -7,7 +7,6 @@
 TESTS_SH+=	t_devices
 TESTS_SH+=	t_dots
 TESTS_SH+=	t_exec
-TESTS_SH+=	t_id_gen
 TESTS_SH+=	t_link
 TESTS_SH+=	t_mkdir
 TESTS_SH+=	t_mknod

CVS commit: src/lib/libpthread

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Mon Jun  7 04:36:34 UTC 2010

Modified Files:
src/lib/libpthread: pthread_create.3

Log Message:
Improve wording describing the behavior of the attributes argument, and
add reference to pthread_attr(3), as requested in PR 42871. The text
added is different from but based on a suggestion by Matthew Mondor.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libpthread/pthread_create.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/libpthread/pthread_create.3
diff -u src/lib/libpthread/pthread_create.3:1.5 src/lib/libpthread/pthread_create.3:1.6
--- src/lib/libpthread/pthread_create.3:1.5	Fri May  2 18:11:04 2008
+++ src/lib/libpthread/pthread_create.3	Mon Jun  7 04:36:34 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: pthread_create.3,v 1.5 2008/05/02 18:11:04 martin Exp $
+.\ $NetBSD: pthread_create.3,v 1.6 2010/06/07 04:36:34 dholland Exp $
 .\
 .\ Copyright (c) 2002 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -54,7 +54,7 @@
 .\
 .\ $FreeBSD: src/lib/libpthread/man/pthread_create.3,v 1.16 2002/09/16 19:29:28 mini Exp $
 .\
-.Dd January 30, 2003
+.Dd June 6, 2010
 .Dt PTHREAD_CREATE 3
 .Os
 .Sh NAME
@@ -77,20 +77,29 @@
 is
 .Dv NULL ,
 the default attributes are used.
-If the attribute object pointed to by
+.Pp
+The attributes specified via
+.Fa attr
+are copied into the new thread.
+Any subsequent modifications to the attributes object
+.Fa attr
+points to will have no effect upon already-created threads.
+It is thus also safe to pass the same
 .Fa attr
-are modified later, the thread's attributes are not affected.
+to multiple calls to
+.Fn pthread_create .
+.Pp
 Upon
 successful completion
 .Fn pthread_create
 will store the ID of the created thread in the location specified by
 .Fa thread .
-.Pp
 The thread is created executing
 .Fa start_routine
 with
 .Fa arg
 as its sole argument.
+.Pp
 If the
 .Fa start_routine
 returns, the effect is as if there was an implicit call to
@@ -138,6 +147,7 @@
 .El
 .Sh SEE ALSO
 .Xr fork 2 ,
+.Xr pthread_attr 3 ,
 .Xr pthread_cleanup_pop 3 ,
 .Xr pthread_cleanup_push 3 ,
 .Xr pthread_exit 3 ,

CVS commit: src/etc/mtree

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Mon Jun  7 04:48:47 UTC 2010

Modified Files:
src/etc/mtree: special

Log Message:
Add optional keyword to rc.d/xdm and rc.d/xfs. Fixes PR misc/43307.


To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/etc/mtree/special

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

Modified files:

Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.131 src/etc/mtree/special:1.132
--- src/etc/mtree/special:1.131	Tue Sep 29 23:56:27 2009
+++ src/etc/mtree/special	Mon Jun  7 04:48:47 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: special,v 1.131 2009/09/29 23:56:27 tsarna Exp $
+#	$NetBSD: special,v 1.132 2010/06/07 04:48:47 jruoho Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
 # This file may be overwritten on upgrades.
@@ -285,8 +285,8 @@
 ./etc/rc.d/wpa_supplicant	type=file mode=0555
 ./etc/rc.d/wscons		type=file mode=0555
 ./etc/rc.d/wsmoused		type=file mode=0555
-./etc/rc.d/xdm			type=file mode=0555
-./etc/rc.d/xfs			type=file mode=0555
+./etc/rc.d/xdm			type=file mode=0555 optional
+./etc/rc.d/xfs			type=file mode=0555 optional
 ./etc/rc.d/ypbind		type=file mode=0555
 ./etc/rc.d/yppasswdd		type=file mode=0555
 ./etc/rc.d/ypserv		type=file mode=0555