date:20120330

CVS commit: src

2012-03-30 Thread Jukka Ruohonen

Module Name:src
Committed By:   jruoho
Date:   Fri Mar 30 09:27:10 UTC 2012

Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
Added Files:
src/tests/bin/sleep: Makefile t_sleep.sh

Log Message:
Add regression tests for PR bin/3914 and PR bin/27140.


To generate a diff of this commit:
cvs rdiff -u -r1.461 -r1.462 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.70 -r1.71 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r0 -r1.1 src/tests/bin/sleep/Makefile \
src/tests/bin/sleep/t_sleep.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.461 src/distrib/sets/lists/tests/mi:1.462
--- src/distrib/sets/lists/tests/mi:1.461	Thu Mar 29 06:16:57 2012
+++ src/distrib/sets/lists/tests/mi	Fri Mar 30 09:27:10 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.461 2012/03/29 06:16:57 jruoho Exp $
+# $NetBSD: mi,v 1.462 2012/03/30 09:27:10 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -1381,6 +1381,9 @@
 ./usr/tests/bin/ps/Atffile			tests-bin-tests		atf
 ./usr/tests/bin/ps/keywords			tests-bin-tests		atf
 ./usr/tests/bin/ps/t_pstests-bin-tests		atf
+./usr/tests/bin/sleeptests-bin-tests
+./usr/tests/bin/sleep/Atffile			tests-bin-tests		atf
+./usr/tests/bin/sleep/t_sleep			tests-bin-tests		atf
 ./usr/tests/bin/shtests-bin-tests
 ./usr/tests/bin/sh/Atffile			tests-bin-tests		atf
 ./usr/tests/bin/sh/t_compexit			tests-bin-tests		atf

Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.70 src/etc/mtree/NetBSD.dist.tests:1.71
--- src/etc/mtree/NetBSD.dist.tests:1.70	Tue Mar 27 08:16:33 2012
+++ src/etc/mtree/NetBSD.dist.tests	Fri Mar 30 09:27:10 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.tests,v 1.70 2012/03/27 08:16:33 jruoho Exp $
+#	$NetBSD: NetBSD.dist.tests,v 1.71 2012/03/30 09:27:10 jruoho Exp $
 
 ./usr/libdata/debug/usr/tests
 ./usr/libdata/debug/usr/tests/atf
@@ -136,6 +136,7 @@
 ./usr/tests/bin/expr
 ./usr/tests/bin/pax
 ./usr/tests/bin/ps
+./usr/tests/bin/sleep
 ./usr/tests/bin/sh
 ./usr/tests/bin/tar
 ./usr/tests/crypto

Added files:

Index: src/tests/bin/sleep/Makefile
diff -u /dev/null src/tests/bin/sleep/Makefile:1.1
--- /dev/null	Fri Mar 30 09:27:10 2012
+++ src/tests/bin/sleep/Makefile	Fri Mar 30 09:27:10 2012
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2012/03/30 09:27:10 jruoho Exp $
+
+.include bsd.own.mk
+
+TESTSDIR=	${TESTSBASE}/bin/sleep
+TESTS_SH=	t_sleep
+
+.include bsd.test.mk
Index: src/tests/bin/sleep/t_sleep.sh
diff -u /dev/null src/tests/bin/sleep/t_sleep.sh:1.1
--- /dev/null	Fri Mar 30 09:27:10 2012
+++ src/tests/bin/sleep/t_sleep.sh	Fri Mar 30 09:27:10 2012
@@ -0,0 +1,72 @@
+# $NetBSD: t_sleep.sh,v 1.1 2012/03/30 09:27:10 jruoho Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+atf_test_case fraction
+fraction_head() {
+	atf_set descr Test that sleep(1) handles  \
+			fractions of a second (PR bin/3914)
+}
+
+fraction_body() {
+
+	atf_check -s exit:0 -o empty -e empty -x sleep 0.1
+	atf_check -s exit:0 -o empty -e empty -x sleep 0.2
+	atf_check -s exit:0 -o empty -e empty -x sleep 0.3
+}
+
+atf_test_case hex
+hex_head() {
+	atf_set descr Test that sleep(1) handles hexadecimal arguments
+}
+
+hex_body() {
+
+	atf_check -s exit:0 -o empty -e empty -x sleep 0x01
+}
+
+atf_test_case nonnumeric
+nonnumeric_head() {
+	atf_set descr Test that sleep(1) errors out with  \
+

CVS commit: src/tests/bin

2012-03-30 Thread Nicolas Joly

Module Name:src
Committed By:   njoly
Date:   Fri Mar 30 15:49:24 UTC 2012

Modified Files:
src/tests/bin: Makefile

Log Message:
Add sleep to the list.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/bin/Makefile

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

Modified files:

Index: src/tests/bin/Makefile
diff -u src/tests/bin/Makefile:1.2 src/tests/bin/Makefile:1.3
--- src/tests/bin/Makefile:1.2	Tue Mar 27 08:16:33 2012
+++ src/tests/bin/Makefile	Fri Mar 30 15:49:24 2012
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2012/03/27 08:16:33 jruoho Exp $
+# $NetBSD: Makefile,v 1.3 2012/03/30 15:49:24 njoly Exp $
 
 .include bsd.own.mk
 
 TESTSDIR=   ${TESTSBASE}/bin
 
-TESTS_SUBDIRS=	cat cp dd df expr pax ps sh tar
+TESTS_SUBDIRS=	cat cp dd df expr pax ps sh sleep tar
 
 .include bsd.test.mk

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

2012-03-30 Thread Nicolas Joly

Module Name:src
Committed By:   njoly
Date:   Fri Mar 30 18:09:12 UTC 2012

Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c

Log Message:
Do not ignore kauth errors when setting file flags.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/rump/librump/rumpvfs/rumpfs.c

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

Modified files:

Index: src/sys/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.109 src/sys/rump/librump/rumpvfs/rumpfs.c:1.110
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.109	Thu Mar 22 22:48:56 2012
+++ src/sys/rump/librump/rumpvfs/rumpfs.c	Fri Mar 30 18:09:12 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpfs.c,v 1.109 2012/03/22 22:48:56 njoly Exp $	*/
+/*	$NetBSD: rumpfs.c,v 1.110 2012/03/30 18:09:12 njoly Exp $	*/
 
 /*
  * Copyright (c) 2009, 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.109 2012/03/22 22:48:56 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.110 2012/03/30 18:09:12 njoly Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -930,6 +930,8 @@ rump_vop_setattr(void *v)
 		error = kauth_authorize_vnode(cred, KAUTH_VNODE_WRITE_FLAGS, vp,
 		NULL, genfs_can_chflags(cred, vp-v_type, attr-va_uid,
 		false));
+		if (error)
+			return error;
 	}
 
 	SETIFVAL(va_flags, u_long);

CVS commit: src/sys/miscfs/genfs

2012-03-30 Thread Nicolas Joly

Module Name:src
Committed By:   njoly
Date:   Fri Mar 30 18:24:08 UTC 2012

Modified Files:
src/sys/miscfs/genfs: genfs_vnops.c

Log Message:
uid mismatch for file flags changes is expected to fail with EPERM not
EACCES.


To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/sys/miscfs/genfs/genfs_vnops.c

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

Modified files:

Index: src/sys/miscfs/genfs/genfs_vnops.c
diff -u src/sys/miscfs/genfs/genfs_vnops.c:1.188 src/sys/miscfs/genfs/genfs_vnops.c:1.189
--- src/sys/miscfs/genfs/genfs_vnops.c:1.188	Tue Mar 13 18:40:57 2012
+++ src/sys/miscfs/genfs/genfs_vnops.c	Fri Mar 30 18:24:08 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: genfs_vnops.c,v 1.188 2012/03/13 18:40:57 elad Exp $	*/
+/*	$NetBSD: genfs_vnops.c,v 1.189 2012/03/30 18:24:08 njoly Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfs_vnops.c,v 1.188 2012/03/13 18:40:57 elad Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_vnops.c,v 1.189 2012/03/30 18:24:08 njoly Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -762,7 +762,7 @@ genfs_can_chflags(kauth_cred_t cred, enu
 
 	/* The user must own the file. */
 	if (kauth_cred_geteuid(cred) != owner_uid) {
-		return EACCES;
+		return EPERM;
 	}
 
 	if (changing_sysflags) {

CVS commit: src/sys/fs/sysvbfs

2012-03-30 Thread Nicolas Joly

Module Name:src
Committed By:   njoly
Date:   Fri Mar 30 18:27:55 UTC 2012

Modified Files:
src/sys/fs/sysvbfs: sysvbfs_vnops.c

Log Message:
sysvbfs do not support file flags; fail with EOPNOTSUPP.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/fs/sysvbfs/sysvbfs_vnops.c

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

Modified files:

Index: src/sys/fs/sysvbfs/sysvbfs_vnops.c
diff -u src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.42 src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.43
--- src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.42	Sun Mar 18 02:40:55 2012
+++ src/sys/fs/sysvbfs/sysvbfs_vnops.c	Fri Mar 30 18:27:55 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysvbfs_vnops.c,v 1.42 2012/03/18 02:40:55 christos Exp $	*/
+/*	$NetBSD: sysvbfs_vnops.c,v 1.43 2012/03/30 18:27:55 njoly Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysvbfs_vnops.c,v 1.42 2012/03/18 02:40:55 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysvbfs_vnops.c,v 1.43 2012/03/30 18:27:55 njoly Exp $);
 
 #include sys/param.h
 #include sys/kernel.h
@@ -345,6 +345,9 @@ sysvbfs_setattr(void *arg)
 	((int)vap-va_bytes != VNOVAL) || (vap-va_gen != VNOVAL))
 		return EINVAL;
 
+	if (vap-va_flags != VNOVAL)
+		return EOPNOTSUPP;
+
 	if (vap-va_uid != (uid_t)VNOVAL || vap-va_gid != (uid_t)VNOVAL) {
 		uid_t uid =
 		(vap-va_uid != (uid_t)VNOVAL) ? vap-va_uid : attr-uid;

CVS commit: [netbsd-5] src/libexec/ld.elf_so/arch

2012-03-30 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Fri Mar 30 19:23:35 UTC 2012

Modified Files:
src/libexec/ld.elf_so/arch/alpha [netbsd-5]: alpha_reloc.c
src/libexec/ld.elf_so/arch/arm [netbsd-5]: mdreloc.c
src/libexec/ld.elf_so/arch/hppa [netbsd-5]: hppa_reloc.c

Log Message:
Apply patch, requested by skrll in ticket #1724
src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c  patch
src/libexec/ld.elf_so/arch/arm/mdreloc.cpatch
src/libexec/ld.elf_so/arch/hppa/hppa_reloc.cpatch

Fix gcc uninitialized variable warning.


To generate a diff of this commit:
cvs rdiff -u -r1.31.4.1 -r1.31.4.2 \
src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c
cvs rdiff -u -r1.28.4.1 -r1.28.4.2 src/libexec/ld.elf_so/arch/arm/mdreloc.c
cvs rdiff -u -r1.27.4.1 -r1.27.4.2 \
src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c

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

Modified files:

Index: src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c
diff -u src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.31.4.1 src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.31.4.2
--- src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.31.4.1	Sat Mar 17 18:28:36 2012
+++ src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c	Fri Mar 30 19:23:34 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: alpha_reloc.c,v 1.31.4.1 2012/03/17 18:28:36 bouyer Exp $	*/
+/*	$NetBSD: alpha_reloc.c,v 1.31.4.2 2012/03/30 19:23:34 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -62,7 +62,7 @@
 
 #include sys/cdefs.h
 #ifndef lint
-__RCSID($NetBSD: alpha_reloc.c,v 1.31.4.1 2012/03/17 18:28:36 bouyer Exp $);
+__RCSID($NetBSD: alpha_reloc.c,v 1.31.4.2 2012/03/30 19:23:34 bouyer Exp $);
 #endif /* not lint */
 
 #include sys/types.h
@@ -479,7 +479,7 @@ caddr_t
 _rtld_bind(const Obj_Entry *obj, Elf_Word reloff)
 {
 	const Elf_Rela *rela = (const Elf_Rela *)((caddr_t)obj-pltrela + reloff);
-	Elf_Addr result;
+	Elf_Addr result = 0; /* XXX gcc */
 	int err;
 
 	err = _rtld_relocate_plt_object(obj, rela, result);

Index: src/libexec/ld.elf_so/arch/arm/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.28.4.1 src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.28.4.2
--- src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.28.4.1	Sat Mar 17 18:28:37 2012
+++ src/libexec/ld.elf_so/arch/arm/mdreloc.c	Fri Mar 30 19:23:35 2012
@@ -1,8 +1,8 @@
-/*	$NetBSD: mdreloc.c,v 1.28.4.1 2012/03/17 18:28:37 bouyer Exp $	*/
+/*	$NetBSD: mdreloc.c,v 1.28.4.2 2012/03/30 19:23:35 bouyer Exp $	*/
 
 #include sys/cdefs.h
 #ifndef lint
-__RCSID($NetBSD: mdreloc.c,v 1.28.4.1 2012/03/17 18:28:37 bouyer Exp $);
+__RCSID($NetBSD: mdreloc.c,v 1.28.4.2 2012/03/30 19:23:35 bouyer Exp $);
 #endif /* not lint */
 
 #include sys/types.h
@@ -253,7 +253,7 @@ caddr_t
 _rtld_bind(const Obj_Entry *obj, Elf_Word reloff)
 {
 	const Elf_Rel *rel = (const Elf_Rel *)((caddr_t)obj-pltrel + reloff);
-	Elf_Addr new_value;
+	Elf_Addr new_value = 0; /* XXX gcc */
 	int err;
 
 	err = _rtld_relocate_plt_object(obj, rel, new_value);

Index: src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c
diff -u src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.27.4.1 src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.27.4.2
--- src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.27.4.1	Sat Mar 17 18:28:37 2012
+++ src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c	Fri Mar 30 19:23:35 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: hppa_reloc.c,v 1.27.4.1 2012/03/17 18:28:37 bouyer Exp $	*/
+/*	$NetBSD: hppa_reloc.c,v 1.27.4.2 2012/03/30 19:23:35 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 #ifndef lint
-__RCSID($NetBSD: hppa_reloc.c,v 1.27.4.1 2012/03/17 18:28:37 bouyer Exp $);
+__RCSID($NetBSD: hppa_reloc.c,v 1.27.4.2 2012/03/30 19:23:35 bouyer Exp $);
 #endif /* not lint */
 
 #include stdlib.h
@@ -590,7 +590,7 @@ caddr_t
 _rtld_bind(const Obj_Entry *obj, Elf_Word reloff)
 {
 	const Elf_Rela *rela = (const Elf_Rela *)((caddr_t)obj-pltrela + reloff);
-	Elf_Addr new_value;
+	Elf_Addr new_value = 0; /* XXX gcc */
 	int err;
 
 	assert(ELF_R_SYM(rela-r_info) != 0);

CVS commit: [netbsd-5] src/doc

2012-03-30 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Fri Mar 30 19:24:44 UTC 2012

Modified Files:
src/doc [netbsd-5]: CHANGES-5.2

Log Message:
update entry for ticket #1724


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.153 -r1.1.2.154 src/doc/CHANGES-5.2

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

Modified files:

Index: src/doc/CHANGES-5.2
diff -u src/doc/CHANGES-5.2:1.1.2.153 src/doc/CHANGES-5.2:1.1.2.154
--- src/doc/CHANGES-5.2:1.1.2.153	Wed Mar 21 21:30:57 2012
+++ src/doc/CHANGES-5.2	Fri Mar 30 19:24:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.2,v 1.1.2.153 2012/03/21 21:30:57 jdc Exp $
+# $NetBSD: CHANGES-5.2,v 1.1.2.154 2012/03/30 19:24:44 bouyer Exp $
 
 A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2
 release:
@@ -6120,6 +6120,10 @@ sys/sys/exec_elf.h1.106 via patch
 usr.bin/ldd/ldd.c1.15 via patch
 libexec/ld.elf_so/headers.c			1.37 via patch
 libexec/ld.elf_so/arch/mips/mips_reloc.c	patch
+libexec/ld.elf_so/arch/alpha/alpha_reloc.c	patch
+libexec/ld.elf_so/arch/arm/mdreloc.c		patch
+libexec/ld.elf_so/arch/hppa/hppa_reloc.c	patch
+
 
 	PR/39240: Satoshi Suetake: Don't fail when attempting to resolve
 	weak symbols when we are doing immediate binding, leave them alone

CVS commit: [netbsd-5] src/sys/arch/hp700/hp700

2012-03-30 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Fri Mar 30 19:29:24 UTC 2012

Modified Files:
src/sys/arch/hp700/hp700 [netbsd-5]: intr.c

Log Message:
Pull up following revision(s) (requested by skrll in ticket #1745):
sys/arch/hp700/hp700/intr.c: revision 1.38
Check for HPPA_SID_KERNEL when checking for interrupt in the
mutex_enter critical section.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.10.1 src/sys/arch/hp700/hp700/intr.c

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

Modified files:

Index: src/sys/arch/hp700/hp700/intr.c
diff -u src/sys/arch/hp700/hp700/intr.c:1.15 src/sys/arch/hp700/hp700/intr.c:1.15.10.1
--- src/sys/arch/hp700/hp700/intr.c:1.15	Mon Apr 28 20:23:19 2008
+++ src/sys/arch/hp700/hp700/intr.c	Fri Mar 30 19:29:24 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.15 2008/04/28 20:23:19 martin Exp $	*/
+/*	$NetBSD: intr.c,v 1.15.10.1 2012/03/30 19:29:24 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.15 2008/04/28 20:23:19 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.15.10.1 2012/03/30 19:29:24 bouyer Exp $);
 
 #define __MUTEX_PRIVATE
 
@@ -399,7 +399,8 @@ hppa_intr(struct trapframe *frame)
 	 * handlers need to aquire the mutex, they could
 	 * deadlock if the owner value is left unset.
 	 */
-	if (frame-tf_iioq_head = (u_int)mutex_enter_crit_start 
+	if (frame-tf_iisq_head == HPPA_SID_KERNEL 
+	frame-tf_iioq_head = (u_int)mutex_enter_crit_start 
 	frame-tf_iioq_head = (u_int)mutex_enter_crit_end 
 	frame-tf_ret0 != 0)
 		((kmutex_t *)frame-tf_arg0)-mtx_owner = (uintptr_t)curlwp;

CVS commit: [netbsd-5] src/doc

2012-03-30 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Fri Mar 30 19:29:50 UTC 2012

Modified Files:
src/doc [netbsd-5]: CHANGES-5.2

Log Message:
ticket #1745


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.154 -r1.1.2.155 src/doc/CHANGES-5.2

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

Modified files:

Index: src/doc/CHANGES-5.2
diff -u src/doc/CHANGES-5.2:1.1.2.154 src/doc/CHANGES-5.2:1.1.2.155
--- src/doc/CHANGES-5.2:1.1.2.154	Fri Mar 30 19:24:44 2012
+++ src/doc/CHANGES-5.2	Fri Mar 30 19:29:49 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.2,v 1.1.2.154 2012/03/30 19:24:44 bouyer Exp $
+# $NetBSD: CHANGES-5.2,v 1.1.2.155 2012/03/30 19:29:49 bouyer Exp $
 
 A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2
 release:
@@ -6301,3 +6301,9 @@ src/sys/arch/i386/include/segments.h		pa
 	signal handlers would have the wrong %fs/%gs. Found by running atf
 	tests under Xen/i386.
 	[bouyer, ticket #1738]
+sys/arch/hp700/hp700/intr.c			1.38
+
+	Check for HPPA_SID_KERNEL when checking for interrupt in the
+	mutex_enter critical section.
+	[skrll, ticket #1745]
+

CVS commit: src/sys/dev

2012-03-30 Thread Matthias Drochner

Module Name:src
Committed By:   drochner
Date:   Fri Mar 30 20:15:19 UTC 2012

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

Log Message:
reorder initialization to improve error handling in case the system
runs out of file descriptors, avoids LOCKDEBUG panic due to double
mutex initialization


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/rndpseudo.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/rndpseudo.c
diff -u src/sys/dev/rndpseudo.c:1.6 src/sys/dev/rndpseudo.c:1.7
--- src/sys/dev/rndpseudo.c:1.6	Tue Dec 20 13:42:19 2011
+++ src/sys/dev/rndpseudo.c	Fri Mar 30 20:15:18 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: rndpseudo.c,v 1.6 2011/12/20 13:42:19 apb Exp $	*/
+/*	$NetBSD: rndpseudo.c,v 1.7 2012/03/30 20:15:18 drochner Exp $	*/
 
 /*-
  * Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rndpseudo.c,v 1.6 2011/12/20 13:42:19 apb Exp $);
+__KERNEL_RCSID(0, $NetBSD: rndpseudo.c,v 1.7 2012/03/30 20:15:18 drochner Exp $);
 
 #if defined(_KERNEL_OPT)
 #include opt_compat_netbsd.h
@@ -213,15 +213,14 @@ rndopen(dev_t dev, int flag, int ifmt,
 	default:
 		return ENXIO;
 	}
-	ctx = pool_cache_get(rp_cpc, PR_WAITOK);
-	ctx-cprng = NULL;
-	ctx-hard = hard;
-	mutex_init(ctx-interlock, MUTEX_DEFAULT, IPL_NONE);
-	
+	ctx = pool_cache_get(rp_cpc, PR_WAITOK);	
 	if ((error = fd_allocfile(fp, fd)) != 0) {
 	pool_cache_put(rp_cpc, ctx);
 	return error;
 	}
+	ctx-cprng = NULL;
+	ctx-hard = hard;
+	mutex_init(ctx-interlock, MUTEX_DEFAULT, IPL_NONE);
 
 	return fd_clone(fp, fd, flag, rnd_fileops, ctx);
 }

CVS commit: src/usr.bin/make

2012-03-30 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Mar 31 00:12:25 UTC 2012

Modified Files:
src/usr.bin/make: config.h parse.c

Log Message:
Add a gmake inspired export command


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/make/config.h
cvs rdiff -u -r1.181 -r1.182 src/usr.bin/make/parse.c

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

Modified files:

Index: src/usr.bin/make/config.h
diff -u src/usr.bin/make/config.h:1.20 src/usr.bin/make/config.h:1.21
--- src/usr.bin/make/config.h:1.20	Sun Oct 14 16:22:53 2007
+++ src/usr.bin/make/config.h	Fri Mar 30 20:12:24 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: config.h,v 1.20 2007/10/14 20:22:53 apb Exp $	*/
+/*	$NetBSD: config.h,v 1.21 2012/03/31 00:12:24 christos Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -133,6 +133,12 @@
 #define SYSVVARSUB
 
 /*
+ * GMAKEEXPORT
+ *	Recognize gmake like variable export directives [export VAR=VALUE]
+ */
+#define GMAKEEXPORT
+
+/*
  * SUNSHCMD
  *	Recognize SunOS and Solaris:
  *		VAR :sh= CMD	# Assign VAR to the command substitution of CMD

Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.181 src/usr.bin/make/parse.c:1.182
--- src/usr.bin/make/parse.c:1.181	Sat Mar 24 16:28:41 2012
+++ src/usr.bin/make/parse.c	Fri Mar 30 20:12:24 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.181 2012/03/24 20:28:41 sjg Exp $	*/
+/*	$NetBSD: parse.c,v 1.182 2012/03/31 00:12:24 christos Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: parse.c,v 1.181 2012/03/24 20:28:41 sjg Exp $;
+static char rcsid[] = $NetBSD: parse.c,v 1.182 2012/03/31 00:12:24 christos Exp $;
 #else
 #include sys/cdefs.h
 #ifndef lint
 #if 0
 static char sccsid[] = @(#)parse.c	8.3 (Berkeley) 3/19/94;
 #else
-__RCSID($NetBSD: parse.c,v 1.181 2012/03/24 20:28:41 sjg Exp $);
+__RCSID($NetBSD: parse.c,v 1.182 2012/03/31 00:12:24 christos Exp $);
 #endif
 #endif /* not lint */
 #endif
@@ -362,6 +362,9 @@ static void ParseSetParseFile(const char
 #ifdef SYSVINCLUDE
 static void ParseTraditionalInclude(char *);
 #endif
+#ifdef GMAKEEXPORT
+static void ParseGmakeExport(char *);
+#endif
 static int ParseEOF(void);
 static char *ParseReadLine(void);
 static void ParseFinishLine(void);
@@ -2402,6 +2405,55 @@ ParseTraditionalInclude(char *line)
 }
 #endif
 
+#ifdef SYSVINCLUDE
+/*-
+ *-
+ * ParseGmakeExport  --
+ *	Parse export variable=value
+ *
+ *	And set the environment with it.
+ *
+ * Results:
+ *	None
+ *
+ * Side Effects:
+ *	None
+ *-
+ */
+static void
+ParseGmakeExport(char *line)
+{
+char	  *variable = line[6];
+char	  *value;
+
+if (DEBUG(PARSE)) {
+	fprintf(debug_file, ParseTraditionalInclude: %s\n, variable);
+}
+
+/*
+ * Skip over whitespace
+ */
+while (isspace((unsigned char)*variable))
+	variable++;
+
+for (value = variable; *value  *value != '='; value++)
+	continue;
+
+if (*value != '=') {
+	Parse_Error(PARSE_FATAL,
+		 Variable/Value missing from \include\);
+	return;
+}
+
+/*
+ * Substitute for any variables in the file name before trying to
+ * find the thing.
+ */
+value = Var_Subst(NULL, value, VAR_CMD, FALSE);
+setenv(variable, value, 1);
+}
+#endif
+
 /*-
  *-
  * ParseEOF  --
@@ -2851,6 +2903,17 @@ Parse_File(const char *name, int fd)
 		continue;
 	}
 #endif
+#ifdef GMAKEEXPORT
+	if (strncmp(line, export, 6) == 0 
+		isspace((unsigned char) line[6]) 
+		strchr(line, ':') == NULL) {
+		/*
+		 * It's an Gmakeexport.
+		 */
+		ParseGmakeExport(line);
+		continue;
+	}
+#endif
 	if (Parse_IsVar(line)) {
 		ParseFinishLine();
 		Parse_DoVar(line, VAR_GLOBAL);

CVS commit: src/sys/arch/evbarm/marvell

2012-03-30 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Mar 31 02:36:31 UTC 2012

Modified Files:
src/sys/arch/evbarm/marvell: marvell_machdep.c

Log Message:
Make this compile NMVPEX  0  !ORION  KIRKWOOD.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/marvell/marvell_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/evbarm/marvell/marvell_machdep.c
diff -u src/sys/arch/evbarm/marvell/marvell_machdep.c:1.6 src/sys/arch/evbarm/marvell/marvell_machdep.c:1.7
--- src/sys/arch/evbarm/marvell/marvell_machdep.c:1.6	Fri Jan 27 15:28:32 2012
+++ src/sys/arch/evbarm/marvell/marvell_machdep.c	Sat Mar 31 02:36:31 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: marvell_machdep.c,v 1.6 2012/01/27 15:28:32 jakllsch Exp $ */
+/*	$NetBSD: marvell_machdep.c,v 1.7 2012/03/31 02:36:31 tsutsui Exp $ */
 /*
  * Copyright (c) 2007, 2008, 2010 KIYOHARA Takashi
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: marvell_machdep.c,v 1.6 2012/01/27 15:28:32 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: marvell_machdep.c,v 1.7 2012/03/31 02:36:31 tsutsui Exp $);
 
 #include opt_evbarm_boardtype.h
 #include opt_ddb.h
@@ -913,10 +913,14 @@ marvell_device_register(device_t dev, vo
 		extern struct bus_space
 		kirkwood_pex_io_bs_tag, kirkwood_pex_mem_bs_tag;
 #endif
-		extern struct arm32_pci_chipset
-		arm32_mvpex0_chipset, arm32_mvpex1_chipset;
+		extern struct arm32_pci_chipset arm32_mvpex0_chipset;
+#ifdef ORION
+		extern struct arm32_pci_chipset arm32_mvpex1_chipset;
+#endif
 
+#ifdef ORION
 		struct marvell_attach_args *mva = aux;
+#endif
 		struct bus_space *mvpex_io_bs_tag, *mvpex_mem_bs_tag;
 		struct arm32_pci_chipset *arm32_mvpex_chipset;
 		prop_data_t io_bs_tag, mem_bs_tag, pc;

CVS commit: src/sys/arch/evbarm/conf

2012-03-30 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Mar 31 02:41:05 UTC 2012

Added Files:
src/sys/arch/evbarm/conf: HPT5325

Log Message:
Add a config file for HP t5325 Thin Client (mostly taken from SHEEVAPLUG).
http://h50146.www5.hp.com/products/thinclient/t5325/

Demonstrated on NetBSD booth at Open Source Conference 2012 Ehime.
http://www.netbsd.org/gallery/events.html#opensourceconf2012-ehime


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/HPT5325

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

Added files:

Index: src/sys/arch/evbarm/conf/HPT5325
diff -u /dev/null src/sys/arch/evbarm/conf/HPT5325:1.1
--- /dev/null	Sat Mar 31 02:41:05 2012
+++ src/sys/arch/evbarm/conf/HPT5325	Sat Mar 31 02:41:05 2012
@@ -0,0 +1,522 @@
+#	$NetBSD: HPT5325,v 1.1 2012/03/31 02:41:05 tsutsui Exp $
+#
+#  This configuration supports for HP T5325 Thin Client
+#
+
+include 	arch/evbarm/conf/std.marvell
+
+options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
+
+# estimated number of users
+
+maxusers	32
+
+# Board Type
+makeoptions	BOARDTYPE=hpt5325
+options 	EVBARM_BOARDTYPE=hpt5325
+
+# CPU options
+options 	CPU_SHEEVA
+#options 	MV_L2_CACHE_ENABLE
+#options 	MV_L2_CACHE_WRITE_THROUGH
+options 	MV_CACHE_RANGE_OPS
+makeoptions	CPUFLAGS=-march=armv5te
+
+# Marvell SoC options
+options 	KIRKWOOD
+
+# Standard system options
+
+options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
+#options 	NTP		# NTP phase/frequency locked loop
+
+# File systems
+
+file-system 	FFS		# UFS
+file-system 	EXT2FS		# second extended file system (linux)
+#file-system 	LFS		# log-structured file system
+#file-system 	MFS		# memory file system
+file-system 	NFS		# Network File System client
+#file-system 	NTFS		# Windows/NT file system (experimental)
+#file-system 	CD9660		# ISO 9660 + Rock Ridge file system
+file-system 	MSDOSFS		# MS-DOS file system
+file-system 	FDESC		# /dev/fd
+file-system 	KERNFS		# /kern
+#file-system 	NULLFS		# loopback file system
+#file-system 	OVERLAY		# overlay file system
+#file-system 	PORTAL		# portal filesystem (still experimental)
+file-system 	PROCFS		# /proc
+#file-system 	UMAPFS		# NULLFS + uid and gid remapping
+#file-system 	UNION		# union file system
+#file-system 	CODA		# Coda File System; also needs vcoda (below)
+#file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
+file-system 	PTYFS		# /dev/ptm support
+file-system 	TMPFS		# Efficient memory file-system
+#file-system 	UDF		# experimental - OSTA UDF CD/DVD file-system
+#file-system 	HFS		# experimental - Apple HFS+ (read-only)
+
+# File system options
+#options 	QUOTA		# legacy UFS quotas
+#options 	QUOTA2		# new, in-filesystem UFS quotas
+#options 	FFS_EI		# FFS Endian Independent support
+options 	WAPBL		# File system journaling support
+# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
+# It is not recommended for general use.
+#options 	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
+options 	NFSSERVER	# Network File System server
+options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
+#options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
+# immutable) behave as system flags.
+
+# Networking options
+
+#options 	GATEWAY		# packet forwarding
+options 	INET		# IP + ICMP + TCP + UDP
+options 	INET6		# IPv6
+#options 	IPSEC		# IP security
+#options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
+#options 	IPSEC_NAT_T	# IPsec NAT traversal (NAT-T)
+#options 	IPSEC_DEBUG	# debug for IP security
+#options 	MROUTING	# IP multicast routing
+#options 	PIM		# Protocol Independent Multicast
+#options 	ISO,TPIP	# OSI
+#options 	EON		# OSI tunneling over IP
+#options 	NETATALK	# AppleTalk networking protocols
+#options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
+#options 	PPP_DEFLATE	# Deflate compression support for PPP
+#options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
+#options 	PFIL_HOOKS	# pfil(9) packet filter hooks
+#options 	IPFILTER_LOG	# ipmon(8) log support
+#options 	IPFILTER_LOOKUP	# ippool(8) support
+#options 	IPFILTER_COMPAT	# Compat for IP-Filter
+#options 	IPFILTER_DEFAULT_BLOCK	# block all packets by default
+#options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG
+
+#options 	NFS_BOOT_BOOTP
+options 	NFS_BOOT_DHCP
+#options 	NFS_BOOT_BOOTPARAM
+
+# Compatibility options
+
+#options 	COMPAT_09	# NetBSD 0.9 compatibility.
+#options 	COMPAT_10	# NetBSD 1.0 compatibility.
+#options 	COMPAT_11	# NetBSD 1.1 compatibility.
+#options 	COMPAT_12	# NetBSD 1.2 compatibility.
+#options 	COMPAT_13	# NetBSD 1.3 compatibility.
+#options 	COMPAT_14	# NetBSD 1.4 compatibility.
+#options 	COMPAT_15	# NetBSD 1.5 compatibility.
+#options 	COMPAT_16	# NetBSD 1.6 compatibility.
+#options 	COMPAT_20	# NetBSD 2.0 compatibility.
+#options 	COMPAT_30	# NetBSD 3.0 compatibility.
+#options 	COMPAT_40	# NetBSD

CVS commit: src/sys/arch/evbarm/conf

2012-03-30 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Mar 31 02:45:37 UTC 2012

Modified Files:
src/sys/arch/evbarm/conf: IGEPV2 MARVELL_NAS MINI2440 MV2120 SHEEVAPLUG

Log Message:
Remove obsolete System V semaphores and share memory limit options
(SEMMNI, SEMMNS, SEMUME and SHMMAXPGS).


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/IGEPV2
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/MARVELL_NAS
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/MINI2440
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/MV2120
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/SHEEVAPLUG

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/evbarm/conf/IGEPV2
diff -u src/sys/arch/evbarm/conf/IGEPV2:1.8 src/sys/arch/evbarm/conf/IGEPV2:1.9
--- src/sys/arch/evbarm/conf/IGEPV2:1.8	Sun Dec 18 05:49:25 2011
+++ src/sys/arch/evbarm/conf/IGEPV2	Sat Mar 31 02:45:37 2012
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: IGEPV2,v 1.8 2011/12/18 05:49:25 dholland Exp $
+#	$NetBSD: IGEPV2,v 1.9 2012/03/31 02:45:37 tsutsui Exp $
 #
 #	IGEPv2 -- TI OMAP 3530 Eval Board Kernel
 #
@@ -107,12 +107,7 @@ options 	COMPAT_30	# NetBSD 3.0 compatib
 
 options 	SYSVMSG		# System V-like message queues
 options 	SYSVSEM		# System V-like semaphores
-#options 	SEMMNI=10	# number of semaphore identifiers
-#options 	SEMMNS=60	# number of semaphores in system
-#options 	SEMUME=10	# max number of undo entries per process
-#options 	SEMMNU=30	# number of undo structures in system
 options 	SYSVSHM		# System V-like memory sharing
-#options 	SHMMAXPGS=1024	# 1024 pages is the default
 
 # Device options
 

Index: src/sys/arch/evbarm/conf/MARVELL_NAS
diff -u src/sys/arch/evbarm/conf/MARVELL_NAS:1.6 src/sys/arch/evbarm/conf/MARVELL_NAS:1.7
--- src/sys/arch/evbarm/conf/MARVELL_NAS:1.6	Sat Mar 10 21:51:51 2012
+++ src/sys/arch/evbarm/conf/MARVELL_NAS	Sat Mar 31 02:45:37 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: MARVELL_NAS,v 1.6 2012/03/10 21:51:51 joerg Exp $
+#	$NetBSD: MARVELL_NAS,v 1.7 2012/03/31 02:45:37 tsutsui Exp $
 #
 #  This configuration supports for generically Marvell NAS.
 
@@ -115,12 +115,7 @@ options 	COMPAT_BSDPTY	# /dev/[pt]ty?? p
 
 #options 	SYSVMSG		# System V-like message queues
 #options 	SYSVSEM		# System V-like semaphores
-#options 	SEMMNI=10	# number of semaphore identifiers
-#options 	SEMMNS=60	# number of semaphores in system
-#options 	SEMUME=10	# max number of undo entries per process
-#options 	SEMMNU=30	# number of undo structures in system
 #options 	SYSVSHM		# System V-like memory sharing
-#options 	SHMMAXPGS=1024	# 1024 pages is the default
 
 # Device options
 

Index: src/sys/arch/evbarm/conf/MINI2440
diff -u src/sys/arch/evbarm/conf/MINI2440:1.2 src/sys/arch/evbarm/conf/MINI2440:1.3
--- src/sys/arch/evbarm/conf/MINI2440:1.2	Tue Feb  7 09:07:47 2012
+++ src/sys/arch/evbarm/conf/MINI2440	Sat Mar 31 02:45:37 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: MINI2440,v 1.2 2012/02/07 09:07:47 nisimura Exp $
+#	$NetBSD: MINI2440,v 1.3 2012/03/31 02:45:37 tsutsui Exp $
 #
 #	MINI2440 -- Friendly ARM evaluation board based on Samsung S3C2440
 #
@@ -127,12 +127,7 @@ options 	COMPAT_BSDPTY	# /dev/[pt]ty?? p
 
 #options 	SYSVMSG		# System V-like message queues
 #options 	SYSVSEM		# System V-like semaphores
-#options 	SEMMNI=10	# number of semaphore identifiers
-#options 	SEMMNS=60	# number of semaphores in system
-#options 	SEMUME=10	# max number of undo entries per process
-#options 	SEMMNU=30	# number of undo structures in system
 #options 	SYSVSHM		# System V-like memory sharing
-#options 	SHMMAXPGS=1024	# 1024 pages is the default
 
 # Miscellaneous kernel options
 #options 	KTRACE		# system call tracing, a la ktrace(1)

Index: src/sys/arch/evbarm/conf/MV2120
diff -u src/sys/arch/evbarm/conf/MV2120:1.7 src/sys/arch/evbarm/conf/MV2120:1.8
--- src/sys/arch/evbarm/conf/MV2120:1.7	Sat Mar 10 21:51:51 2012
+++ src/sys/arch/evbarm/conf/MV2120	Sat Mar 31 02:45:37 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: MV2120,v 1.7 2012/03/10 21:51:51 joerg Exp $
+#	$NetBSD: MV2120,v 1.8 2012/03/31 02:45:37 tsutsui Exp $
 #
 #  This configuration supports for HP MV2120/MV5140/MV5150.
 
@@ -124,12 +124,7 @@ options 	COMPAT_BSDPTY	# /dev/[pt]ty?? p
 
 #options 	SYSVMSG		# System V-like message queues
 #options 	SYSVSEM		# System V-like semaphores
-#options 	SEMMNI=10	# number of semaphore identifiers
-#options 	SEMMNS=60	# number of semaphores in system
-#options 	SEMUME=10	# max number of undo entries per process
-#options 	SEMMNU=30	# number of undo structures in system
 #options 	SYSVSHM		# System V-like memory sharing
-#options 	SHMMAXPGS=1024	# 1024 pages is the default
 
 # Device options
 

Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.13 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.14
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.13	Sat Mar 10 21:51:51 2012
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG	Sat Mar 31

CVS commit: src

CVS commit: src/tests/bin

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

CVS commit: src/sys/miscfs/genfs

CVS commit: src/sys/fs/sysvbfs

CVS commit: [netbsd-5] src/libexec/ld.elf_so/arch

CVS commit: [netbsd-5] src/doc

CVS commit: [netbsd-5] src/sys/arch/hp700/hp700

CVS commit: [netbsd-5] src/doc

CVS commit: src/sys/dev

CVS commit: src/usr.bin/make

CVS commit: src/sys/arch/evbarm/marvell

CVS commit: src/sys/arch/evbarm/conf

CVS commit: src/sys/arch/evbarm/conf

14 matches

Site Navigation

Mail list logo

Footer information