CVS commit: src/usr.sbin/envstat

2010-08-25 Thread Jukka Ruohonen 
Module Name:src
Committed By:   jruoho
Date:   Thu Aug 26 05:25:57 UTC 2010

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

Log Message:
Use . Remove trailing white space.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/usr.sbin/envstat/envstat.c

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

Modified files:

Index: src/usr.sbin/envstat/envstat.c
diff -u src/usr.sbin/envstat/envstat.c:1.78 src/usr.sbin/envstat/envstat.c:1.79
--- src/usr.sbin/envstat/envstat.c:1.78	Sun Aug  1 15:39:52 2010
+++ src/usr.sbin/envstat/envstat.c	Thu Aug 26 05:25:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: envstat.c,v 1.78 2010/08/01 15:39:52 mlelstv Exp $ */
+/* $NetBSD: envstat.c,v 1.79 2010/08/26 05:25:57 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -27,7 +27,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: envstat.c,v 1.78 2010/08/01 15:39:52 mlelstv Exp $");
+__RCSID("$NetBSD: envstat.c,v 1.79 2010/08/26 05:25:57 jruoho Exp $");
 #endif /* not lint */
 
 #include 
@@ -38,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -46,8 +47,6 @@
 
 #include "envstat.h"
 
-#define _PATH_DEV_SYSMON	"/dev/sysmon"
-
 #define ENVSYS_DFLAG	0x0001	/* list registered devices */
 #define ENVSYS_FFLAG	0x0002	/* show temp in farenheit */
 #define ENVSYS_LFLAG	0x0004	/* list sensors */
@@ -94,7 +93,7 @@
 } *dvprops_t;
 
 /* A simple queue to manage all sensors */
-static SIMPLEQ_HEAD(, envsys_sensor) sensors_list = 
+static SIMPLEQ_HEAD(, envsys_sensor) sensors_list =
 SIMPLEQ_HEAD_INITIALIZER(sensors_list);
 
 /* A simple queue to manage statistics for all sensors */
@@ -156,7 +155,7 @@
 			flags |= ENVSYS_LFLAG;
 			break;
 		case 'r':
-			/* 
+			/*
 			 * This flag is noop.. it's only here for
 			 * compatibility with the old implementation.
 			 */
@@ -208,8 +207,8 @@
 		errx(EXIT_FAILURE, "-d flag cannot be used with -s");
 
 	/* Open the device in ro mode */
-	if ((fd = open(_PATH_DEV_SYSMON, O_RDONLY)) == -1)
-		err(EXIT_FAILURE, "%s", _PATH_DEV_SYSMON);
+	if ((fd = open(_PATH_SYSMON, O_RDONLY)) == -1)
+		err(EXIT_FAILURE, "%s", _PATH_SYSMON);
 
 	/* Print dictionary in raw mode */
 	if (flags & ENVSYS_XFLAG) {
@@ -227,13 +226,13 @@
 		(void)close(fd);
 
 		/* open the fd in rw mode */
-		if ((fd = open(_PATH_DEV_SYSMON, O_RDWR)) == -1)
-			err(EXIT_FAILURE, "%s", _PATH_DEV_SYSMON);
+		if ((fd = open(_PATH_SYSMON, O_RDWR)) == -1)
+			err(EXIT_FAILURE, "%s", _PATH_SYSMON);
 
 		dict = prop_dictionary_create();
 		if (!dict)
 			err(EXIT_FAILURE, "prop_dictionary_create");
-		
+
 		rval = prop_dictionary_set_bool(dict,
 		"envsys-remove-props",
 	true);
@@ -304,13 +303,13 @@
 	 * Close the read only descriptor and open a new one read write.
 	 */
 	(void)close(fd);
-	if ((fd = open(_PATH_DEV_SYSMON, O_RDWR)) == -1) {
+	if ((fd = open(_PATH_SYSMON, O_RDWR)) == -1) {
 		error = errno;
-		warn("%s", _PATH_DEV_SYSMON);
+		warn("%s", _PATH_SYSMON);
 		return error;
 	}
 
-	/* 
+	/*
 	 * Send our sensor properties dictionary to the kernel then.
 	 */
 	error = prop_dictionary_send_ioctl(udict, fd, ENVSYS_SETDICTIONARY);
@@ -326,7 +325,7 @@
 {
 	sensor_stats_t stats;
 
-	/* 
+	/*
 	 * If we matched a sensor by its description return it, otherwise
 	 * allocate a new one.
 	 */
@@ -418,7 +417,7 @@
 	(void)printf("%d seconds)\n",
 	(int)edp->refresh_timo);
 			}
-			
+
 			free(edp);
 			edp = NULL;
 		}
@@ -732,14 +731,14 @@
 	if (width)
 		maxlen = width;
 
-	/* 
+	/*
 	 * Print a header at the bottom only once showing different
 	 * members if the statistics flag is set or not.
 	 *
 	 * As bonus if -s is set, only print this header every 10 iterations
 	 * to avoid redundancy... like vmstat(1).
 	 */
-	
+
 	a = "Current";
 	units = "Unit";
 	if (statistics) {

CVS commit: src/bin/pax

2010-08-25 Thread Simon J. Gerraty 
Module Name:src
Committed By:   sjg
Date:   Wed Aug 25 21:36:03 UTC 2010

Modified Files:
src/bin/pax: options.c

Log Message:
Do not throw a usage message for -i followed by -t
since 'cpio -itv' is a valid command.


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/bin/pax/options.c

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

Modified files:

Index: src/bin/pax/options.c
diff -u src/bin/pax/options.c:1.107 src/bin/pax/options.c:1.108
--- src/bin/pax/options.c:1.107	Sat Jun 19 00:43:57 2010
+++ src/bin/pax/options.c	Wed Aug 25 21:36:02 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: options.c,v 1.107 2010/06/19 00:43:57 christos Exp $	*/
+/*	$NetBSD: options.c,v 1.108 2010/08/25 21:36:02 sjg Exp $	*/
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: options.c,v 1.107 2010/06/19 00:43:57 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.108 2010/08/25 21:36:02 sjg Exp $");
 #endif
 #endif /* not lint */
 
@@ -1462,6 +1462,8 @@
 {
 	if ((act == APPND && op == ARCHIVE) || (act == ARCHIVE && op == APPND))
 		act = APPND;
+	else if (act == EXTRACT && op == LIST)
+		act = op;
 	else if (act != ERROR && act != op)
 		cpio_usage();
 	else

CVS commit: src/sys/arch/sparc/stand

2010-08-25 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Aug 25 20:16:49 UTC 2010

Modified Files:
src/sys/arch/sparc/stand: Makefile.buildboot
src/sys/arch/sparc/stand/boot: boot.c
src/sys/arch/sparc/stand/common: promdev.c promdev.h
src/sys/arch/sparc/stand/ofwboot: Makefile boot.c
Added Files:
src/sys/arch/sparc/stand/common: isfloppy.c isfloppy.h

Log Message:
factor out the floppy detection code.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sparc/stand/Makefile.buildboot
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sparc/stand/boot/boot.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc/stand/common/isfloppy.c \
src/sys/arch/sparc/stand/common/isfloppy.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sparc/stand/common/promdev.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc/stand/common/promdev.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sparc/stand/ofwboot/Makefile \
src/sys/arch/sparc/stand/ofwboot/boot.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/sparc/stand/Makefile.buildboot
diff -u src/sys/arch/sparc/stand/Makefile.buildboot:1.27 src/sys/arch/sparc/stand/Makefile.buildboot:1.28
--- src/sys/arch/sparc/stand/Makefile.buildboot:1.27	Thu May 27 02:58:15 2010
+++ src/sys/arch/sparc/stand/Makefile.buildboot	Wed Aug 25 16:16:48 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.buildboot,v 1.27 2010/05/27 06:58:15 dholland Exp $
+#	$NetBSD: Makefile.buildboot,v 1.28 2010/08/25 20:16:48 christos Exp $
 #
 # This file is for the sparc `boot' and `bootxx' only; it does not
 # currently play well on a 64-bit system.
@@ -7,7 +7,7 @@
 
 .PATH: ${.CURDIR}/../common ${.CURDIR}/../../sparc
 
-COMMONSOURCE=	srt0.S promdev.c dvma.c promlib.c
+COMMONSOURCE=	srt0.S promdev.c dvma.c promlib.c isfloppy.c
 
 SRCS=		${COMMONSOURCE} ${PROGSOURCE}
 NOMAN=		# defined

Index: src/sys/arch/sparc/stand/boot/boot.c
diff -u src/sys/arch/sparc/stand/boot/boot.c:1.25 src/sys/arch/sparc/stand/boot/boot.c:1.26
--- src/sys/arch/sparc/stand/boot/boot.c:1.25	Wed Aug 25 14:11:54 2010
+++ src/sys/arch/sparc/stand/boot/boot.c	Wed Aug 25 16:16:48 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.25 2010/08/25 18:11:54 christos Exp $ */
+/*	$NetBSD: boot.c,v 1.26 2010/08/25 20:16:48 christos Exp $ */
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -42,6 +42,7 @@
 
 #include 
 #include 
+#include 
 
 #include "bootinfo.h"
 
@@ -225,7 +226,7 @@
 		loadaddrmask = 0x07ffUL;
 	}
 
-	if (promdev_isfloppy())
+	if (bootdev_isfloppy(prom_bootdevice))
 		flags &= ~LOAD_BACKWARDS;
 
 	marks[MARK_START] = 0;

Index: src/sys/arch/sparc/stand/common/promdev.c
diff -u src/sys/arch/sparc/stand/common/promdev.c:1.24 src/sys/arch/sparc/stand/common/promdev.c:1.25
--- src/sys/arch/sparc/stand/common/promdev.c:1.24	Wed Aug 25 14:11:54 2010
+++ src/sys/arch/sparc/stand/common/promdev.c	Wed Aug 25 16:16:49 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: promdev.c,v 1.24 2010/08/25 18:11:54 christos Exp $ */
+/*	$NetBSD: promdev.c,v 1.25 2010/08/25 20:16:49 christos Exp $ */
 
 /*
  * Copyright (c) 1993 Paul Kranenburg
@@ -48,6 +48,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #ifndef BOOTXX
 #include 
@@ -105,15 +106,6 @@
 static daddr_t doffset = 0;
 #endif
 
-
-int
-bootdev_isfloppy(void)
-{
-	return strncmp(prom_bootdevice, "fd", 2) == 0 ||
-		strstr(prom_bootdevice, "SUNW,fdtwo") != NULL ||
-		strstr(prom_bootdevice, "fdthree") != NULL;
-}
-
 void
 putchar(int c)
 {
@@ -227,7 +219,7 @@
 		 * Don't check disklabel on floppy boot since
 		 * reopening it could cause Data Access Exception later.
 		 */
-		if (bootdev_isfloppy())
+		if (bootdev_isfloppy(prom_bootdevice))
 			return 0;
 
 		/*

Index: src/sys/arch/sparc/stand/common/promdev.h
diff -u src/sys/arch/sparc/stand/common/promdev.h:1.15 src/sys/arch/sparc/stand/common/promdev.h:1.16
--- src/sys/arch/sparc/stand/common/promdev.h:1.15	Wed Aug 25 14:11:54 2010
+++ src/sys/arch/sparc/stand/common/promdev.h	Wed Aug 25 16:16:49 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: promdev.h,v 1.15 2010/08/25 18:11:54 christos Exp $ */
+/*	$NetBSD: promdev.h,v 1.16 2010/08/25 20:16:49 christos Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -70,9 +70,6 @@
 extern int	(*pmap_map)(vaddr_t, paddr_t, psize_t);
 extern int	(*pmap_extract)(vaddr_t, paddr_t *);
 
-/* In promdev.c */
-extern int	bootdev_isfloppy(void);
-
 /* In str0.S: */
 extern void	sparc_noop(void);
 extern void	*romp;

Index: src/sys/arch/sparc/stand/ofwboot/Makefile
diff -u src/sys/arch/sparc/stand/ofwboot/Makefile:1.24 src/sys/arch/sparc/stand/ofwboot/Makefile:1.25
--- src/sys/arch/sparc/stand/ofwboot/Makefile:1.24	Thu May 27 02:58:15 2010
+++ src/sys/arch/sparc/stand/ofwboot/Makefile	Wed Aug 25 16:16:49 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.24 2010/05/27 06:58:15 dholland Exp $
+#	$NetBSD: Makefile,v 1.25 2010/08/25 20:16:49 christos Exp $
 
 CURDIR=	${.CURDIR}
 S=	${CURDIR}/.

CVS commit: src/tests/fs/common

2010-08-25 Thread Antti Kantee 
Module Name:src
Committed By:   pooka
Date:   Wed Aug 25 18:16:06 UTC 2010

Modified Files:
src/tests/fs/common: h_fsmacros.h

Log Message:
* fail with errnos
* in case unmount fails, call rump_pub_vfs_mount_print() to print
  mountpoint status and dump active vnodes.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/tests/fs/common/h_fsmacros.h

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/common/h_fsmacros.h
diff -u src/tests/fs/common/h_fsmacros.h:1.18 src/tests/fs/common/h_fsmacros.h:1.19
--- src/tests/fs/common/h_fsmacros.h:1.18	Mon Aug  9 19:32:26 2010
+++ src/tests/fs/common/h_fsmacros.h	Wed Aug 25 18:16:06 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: h_fsmacros.h,v 1.18 2010/08/09 19:32:26 pooka Exp $	*/
+/*	$NetBSD: h_fsmacros.h,v 1.19 2010/08/25 18:16:06 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -68,26 +68,28 @@
 do {	\
 	if (_fs_##_fstest_newfs(_tc_, &_args_,\
 	FSTEST_IMGNAME, FSTEST_IMGSIZE, NULL) != 0)			\
-		atf_tc_fail("newfs failed");\
+		atf_tc_fail_errno("newfs failed");			\
 	if (_fs_##_fstest_mount(_tc_, _args_, FSTEST_MNTNAME, 0) != 0)	\
-		atf_tc_fail("mount failed");\
+		atf_tc_fail_errno("mount failed");			\
 } while (/*CONSTCOND*/0);
 
 #define FSTEST_CONSTRUCTOR_FSPRIV(_tc_, _fs_, _args_, _privargs_)	\
 do {	\
 	if (_fs_##_fstest_newfs(_tc_, &_args_,\
 	FSTEST_IMGNAME, FSTEST_IMGSIZE, _privargs_) != 0)		\
-		atf_tc_fail("newfs failed");\
+		atf_tc_fail_errno("newfs failed");			\
 	if (_fs_##_fstest_mount(_tc_, _args_, FSTEST_MNTNAME, 0) != 0)	\
-		atf_tc_fail("mount failed");\
+		atf_tc_fail_errno("mount failed");			\
 } while (/*CONSTCOND*/0);
 
 #define FSTEST_DESTRUCTOR(_tc_, _fs_, _args_)\
 do {	\
-	if (_fs_##_fstest_unmount(_tc_, FSTEST_MNTNAME, 0) != 0)	\
-		atf_tc_fail("unmount failed");\
+	if (_fs_##_fstest_unmount(_tc_, FSTEST_MNTNAME, 0) != 0) {	\
+		rump_pub_vfs_mount_print(FSTEST_MNTNAME, 1);		\
+		atf_tc_fail_errno("unmount failed");			\
+	}\
 	if (_fs_##_fstest_delfs(_tc_, _args_) != 0)			\
-		atf_tc_fail("delfs failed");\
+		atf_tc_fail_errno("delfs failed");			\
 } while (/*CONSTCOND*/0);
 
 #define ATF_TC_FSADD(fs,type,func,desc) \
@@ -105,15 +107,17 @@
   atf_tc_skip("filesystem not selected"); \
 FSTEST_CONSTRUCTOR(tc,fs,fs##func##tmp); \
 func(tc,FSTEST_MNTNAME); \
-if (fs##_fstest_unmount(tc, FSTEST_MNTNAME, 0) != 0) \
-  atf_tc_fail("unmount failed"); \
+if (fs##_fstest_unmount(tc, FSTEST_MNTNAME, 0) != 0) { \
+  rump_pub_vfs_mount_print(FSTEST_MNTNAME, 1); \
+  atf_tc_fail_errno("unmount failed"); \
+} \
   } \
   ATF_TC_CLEANUP(fs##_##func,tc) \
   { \
 if (!atf_check_fstype(tc, type)) \
   return; \
 if (fs##_fstest_delfs(tc, fs##func##tmp) != 0) \
-  atf_tc_fail("delfs failed"); \
+  atf_tc_fail_errno("delfs failed"); \
   }
 
 #define ATF_TP_FSADD(fs,func) \

CVS commit: src/sys/arch/sparc/stand

2010-08-25 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Aug 25 18:11:54 UTC 2010

Modified Files:
src/sys/arch/sparc/stand/boot: boot.c
src/sys/arch/sparc/stand/common: promdev.c promdev.h

Log Message:
Don't LOAD_BACKWARDS for floppies.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sparc/stand/boot/boot.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sparc/stand/common/promdev.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sparc/stand/common/promdev.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/sparc/stand/boot/boot.c
diff -u src/sys/arch/sparc/stand/boot/boot.c:1.24 src/sys/arch/sparc/stand/boot/boot.c:1.25
--- src/sys/arch/sparc/stand/boot/boot.c:1.24	Sun Mar  4 01:00:47 2007
+++ src/sys/arch/sparc/stand/boot/boot.c	Wed Aug 25 14:11:54 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.24 2007/03/04 06:00:47 christos Exp $ */
+/*	$NetBSD: boot.c,v 1.25 2010/08/25 18:11:54 christos Exp $ */
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -170,6 +170,7 @@
 	vaddr_t va;
 	paddr_t pa;
 	u_long size;
+	int flags = LOAD_KERNEL;
 
 	if ((fd = open(kernel, 0)) < 0)
 		return (errno ? errno : ENOENT);
@@ -224,8 +225,11 @@
 		loadaddrmask = 0x07ffUL;
 	}
 
+	if (promdev_isfloppy())
+		flags &= ~LOAD_BACKWARDS;
+
 	marks[MARK_START] = 0;
-	error = fdloadfile(fd, marks, LOAD_KERNEL);
+	error = fdloadfile(fd, marks, flags);
 out:
 	close(fd);
 	return (error);

Index: src/sys/arch/sparc/stand/common/promdev.c
diff -u src/sys/arch/sparc/stand/common/promdev.c:1.23 src/sys/arch/sparc/stand/common/promdev.c:1.24
--- src/sys/arch/sparc/stand/common/promdev.c:1.23	Sun Oct 18 02:24:21 2009
+++ src/sys/arch/sparc/stand/common/promdev.c	Wed Aug 25 14:11:54 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: promdev.c,v 1.23 2009/10/18 06:24:21 tsutsui Exp $ */
+/*	$NetBSD: promdev.c,v 1.24 2010/08/25 18:11:54 christos Exp $ */
 
 /*
  * Copyright (c) 1993 Paul Kranenburg
@@ -106,6 +106,14 @@
 #endif
 
 
+int
+bootdev_isfloppy(void)
+{
+	return strncmp(prom_bootdevice, "fd", 2) == 0 ||
+		strstr(prom_bootdevice, "SUNW,fdtwo") != NULL ||
+		strstr(prom_bootdevice, "fdthree") != NULL;
+}
+
 void
 putchar(int c)
 {
@@ -219,9 +227,7 @@
 		 * Don't check disklabel on floppy boot since
 		 * reopening it could cause Data Access Exception later.
 		 */
-		if (strncmp(prom_bootdevice, "fd", 2) == 0 ||
-		strstr(prom_bootdevice, "SUNW,fdtwo") != NULL ||
-		strstr(prom_bootdevice, "fdthree") != NULL)
+		if (bootdev_isfloppy())
 			return 0;
 
 		/*

Index: src/sys/arch/sparc/stand/common/promdev.h
diff -u src/sys/arch/sparc/stand/common/promdev.h:1.14 src/sys/arch/sparc/stand/common/promdev.h:1.15
--- src/sys/arch/sparc/stand/common/promdev.h:1.14	Mon Jan 12 06:32:44 2009
+++ src/sys/arch/sparc/stand/common/promdev.h	Wed Aug 25 14:11:54 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: promdev.h,v 1.14 2009/01/12 11:32:44 tsutsui Exp $ */
+/*	$NetBSD: promdev.h,v 1.15 2010/08/25 18:11:54 christos Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -70,6 +70,9 @@
 extern int	(*pmap_map)(vaddr_t, paddr_t, psize_t);
 extern int	(*pmap_extract)(vaddr_t, paddr_t *);
 
+/* In promdev.c */
+extern int	bootdev_isfloppy(void);
+
 /* In str0.S: */
 extern void	sparc_noop(void);
 extern void	*romp;

CVS commit: src/tests/fs/vfs

2010-08-25 Thread Antti Kantee 
Module Name:src
Committed By:   pooka
Date:   Wed Aug 25 18:11:20 UTC 2010

Modified Files:
src/tests/fs/vfs: t_renamerace.c

Log Message:
Start many more threads for the renamerace since it seems to catch
more errors.

Add a sleepkludge to deal with NFS's sillyrename brokenness.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/fs/vfs/t_renamerace.c

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/vfs/t_renamerace.c
diff -u src/tests/fs/vfs/t_renamerace.c:1.8 src/tests/fs/vfs/t_renamerace.c:1.9
--- src/tests/fs/vfs/t_renamerace.c:1.8	Fri Jul 16 19:16:41 2010
+++ src/tests/fs/vfs/t_renamerace.c	Wed Aug 25 18:11:20 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_renamerace.c,v 1.8 2010/07/16 19:16:41 pooka Exp $	*/
+/*	$NetBSD: t_renamerace.c,v 1.9 2010/08/25 18:11:20 pooka Exp $	*/
 
 /*
  * Modified for rump and atf from a program supplied
@@ -37,7 +37,7 @@
 	while (!quittingtime) {
 		fd = rump_sys_open("rename.test1",
 		O_WRONLY|O_CREAT|O_TRUNC, 0666);
-		if (fd == -1)
+		if (fd == -1 && errno != EEXIST)
 			atf_tc_fail_errno("create");
 		rump_sys_unlink("rename.test1");
 		rump_sys_close(fd);
@@ -82,10 +82,12 @@
 	return NULL;
 }
 
+#define NWRK 8
 static void
 renamerace(const atf_tc_t *tc, const char *mp)
 {
-	pthread_t pt1, pt2;
+	pthread_t pt1[NWRK], pt2[NWRK];
+	int i;
 
 	if (FSTYPE_LFS(tc))
 		atf_tc_expect_signal(-1, "PR kern/43582");
@@ -93,14 +95,19 @@
 	if (FSTYPE_MSDOS(tc))
 		atf_tc_skip("test fails in some setups, reason unknown");
 
-	pthread_create(&pt1, NULL, w1, __UNCONST(mp));
-	pthread_create(&pt2, NULL, w2, __UNCONST(mp));
+	for (i = 0; i < NWRK; i++)
+		pthread_create(&pt1[i], NULL, w1, __UNCONST(mp));
+
+	for (i = 0; i < NWRK; i++)
+		pthread_create(&pt2[i], NULL, w2, __UNCONST(mp));
 
 	sleep(5);
 	quittingtime = 1;
 
-	pthread_join(pt1, NULL);
-	pthread_join(pt2, NULL);
+	for (i = 0; i < NWRK; i++)
+		pthread_join(pt1[i], NULL);
+	for (i = 0; i < NWRK; i++)
+		pthread_join(pt2[i], NULL);
 
 	/*
 	 * XXX: does not always fail on LFS, especially for unicpu
@@ -108,6 +115,14 @@
 	 */
 	if (FSTYPE_LFS(tc))
 		abort();
+
+	/*
+	 * NFS sillyrename is broken and may linger on in the file system.
+	 * This sleep lets them finish so we don't get transient unmount
+	 * failures.
+	 */
+	if (FSTYPE_NFS(tc))
+		sleep(1);
 }
 
 static void

CVS commit: src/regress/lib

2010-08-25 Thread Julio Merino 
Module Name:src
Committed By:   jmmv
Date:   Wed Aug 25 16:47:44 UTC 2010

Modified Files:
src/regress/lib: Makefile
Removed Files:
src/regress/lib/libdes: Makefile destest.c

Log Message:
The libdes tests have been converted to atf and now live in tests/lib/libdes.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/regress/lib/Makefile
cvs rdiff -u -r1.1 -r0 src/regress/lib/libdes/Makefile \
src/regress/lib/libdes/destest.c

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

Modified files:

Index: src/regress/lib/Makefile
diff -u src/regress/lib/Makefile:1.25 src/regress/lib/Makefile:1.26
--- src/regress/lib/Makefile:1.25	Sat Jul 17 19:29:35 2010
+++ src/regress/lib/Makefile	Wed Aug 25 16:47:43 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.25 2010/07/17 19:29:35 jmmv Exp $
+#	$NetBSD: Makefile,v 1.26 2010/08/25 16:47:43 jmmv Exp $
 
 .include 
 
@@ -10,8 +10,4 @@
 #SUBDIR+= libssp
 .endif
 
-.if ${MKCRYPTO} != "no"
-SUBDIR+= libdes
-.endif
-
 .include

CVS commit: src/distrib/sets/lists/tests

2010-08-25 Thread Julio Merino 
Module Name:src
Committed By:   jmmv
Date:   Wed Aug 25 16:46:48 UTC 2010

Modified Files:
src/distrib/sets/lists/tests: mi

Log Message:
Add entries for the libdes tests.


To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 src/distrib/sets/lists/tests/mi

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.138 src/distrib/sets/lists/tests/mi:1.139
--- src/distrib/sets/lists/tests/mi:1.138	Tue Aug 24 11:31:48 2010
+++ src/distrib/sets/lists/tests/mi	Wed Aug 25 16:46:48 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.138 2010/08/24 11:31:48 pooka Exp $
+# $NetBSD: mi,v 1.139 2010/08/25 16:46:48 jmmv Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -290,6 +290,8 @@
 ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_mi_vector_hash.debug	tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/stringtests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/string/t_popcount.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/lib/libdestests-lib-debug
+./usr/libdata/debug/usr/tests/lib/libdes/t_destests-lib-debug		debug,atf,crypto
 ./usr/libdata/debug/usr/tests/lib/semaphoretests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/semaphore/pthread			tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/semaphore/pthread/t_sem_pth.debug	tests-lib-debug		debug,atf
@@ -1431,6 +1433,9 @@
 ./usr/tests/lib/libc/string			tests-obsolete		obsolete
 ./usr/tests/lib/libc/string/Atffile		tests-obsolete		obsolete
 ./usr/tests/lib/libc/string/t_popcount		tests-obsolete		obsolete
+./usr/tests/lib/libdestests-lib-tests
+./usr/tests/lib/libdes/Atffile			tests-lib-tests		atf,crypto
+./usr/tests/lib/libdes/t_des			tests-lib-tests		atf,crypto
 ./usr/tests/lib/semaphore			tests-lib-tests
 ./usr/tests/lib/semaphore/Atffile		tests-lib-tests		atf
 ./usr/tests/lib/semaphore/pthread		tests-lib-tests

CVS commit: src/tests/lib

2010-08-25 Thread Julio Merino 
Module Name:src
Committed By:   jmmv
Date:   Wed Aug 25 16:46:36 UTC 2010

Modified Files:
src/tests/lib: Makefile
Added Files:
src/tests/lib/libdes: Makefile t_des.c

Log Message:
Convert the libdes tests to atf.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libdes/Makefile \
src/tests/lib/libdes/t_des.c

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

Modified files:

Index: src/tests/lib/Makefile
diff -u src/tests/lib/Makefile:1.8 src/tests/lib/Makefile:1.9
--- src/tests/lib/Makefile:1.8	Sun Jul 18 12:41:51 2010
+++ src/tests/lib/Makefile	Wed Aug 25 16:46:36 2010
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.8 2010/07/18 12:41:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2010/08/25 16:46:36 jmmv Exp $
 
 .include 
 
 TESTS_SUBDIRS=	csu libc libevent libobjc libposix libprop librt libpthread \
 		libutil semaphore
 
+.if ${MKCRYPTO} != "no"
+TESTS_SUBDIRS+= libdes
+.endif
+
 .if (${MKSKEY} != "no")
 TESTS_SUBDIRS+= libskey
 .endif

Added files:

Index: src/tests/lib/libdes/Makefile
diff -u /dev/null src/tests/lib/libdes/Makefile:1.1
--- /dev/null	Wed Aug 25 16:46:36 2010
+++ src/tests/lib/libdes/Makefile	Wed Aug 25 16:46:36 2010
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2010/08/25 16:46:36 jmmv Exp $
+
+NOMAN=		# defined 
+
+.include 
+
+TESTSDIR=	${TESTSBASE}/lib/libdes
+
+LDADD+=		-ldes
+WARNS?=		4
+
+TESTS_C=	t_des
+
+.include 
Index: src/tests/lib/libdes/t_des.c
diff -u /dev/null src/tests/lib/libdes/t_des.c:1.1
--- /dev/null	Wed Aug 25 16:46:36 2010
+++ src/tests/lib/libdes/t_des.c	Wed Aug 25 16:46:36 2010
@@ -0,0 +1,989 @@
+/* $NetBSD: t_des.c,v 1.1 2010/08/25 16:46:36 jmmv Exp $ */
+
+/*
+ * Copyright (C) 1995-1998 Eric Young (e...@cryptsoft.com) All rights
+ * reserved.
+ * 
+ * This package is an SSL implementation written by Eric Young
+ * (e...@cryptsoft.com). The implementation was written so as to conform with
+ * Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as the
+ * following conditions are aheared to.  The following conditions apply to
+ * all code found in this distribution, be it the RC4, RSA, lhash, DES, etc.,
+ * code; not just the SSL code.  The SSL documentation included with this
+ * distribution is covered by the same copyright terms except that the holder
+ * is Tim Hudson (t...@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in the code
+ * are not to be removed. If this package is used in a product, Eric Young
+ * should be given attribution as the author of the parts of the library
+ * used. This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * 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 copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions
+ * in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. All advertising materials
+ * mentioning features or use of this software must display the following
+ * acknowledgement: "This product includes cryptographic software written by
+ * Eric Young (e...@cryptsoft.com)" The word 'cryptographic' can be left out
+ * if the rouines from the library being used are not cryptographic related
+ * :-). 4. If you include any Windows specific code (or a derivative thereof)
+ * from the apps directory (application code) you must include an
+ * acknowledgement: "This product includes software written by Tim Hudson
+ * (t...@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply
+ * be copied and put under another distribution licence [including the GNU
+ * Public Licence.]
+ */
+
+#include 
+#includ

CVS commit: src/etc/mtree

2010-08-25 Thread Julio Merino 
Module Name:src
Committed By:   jmmv
Date:   Wed Aug 25 16:44:25 UTC 2010

Modified Files:
src/etc/mtree: NetBSD.dist.base

Log Message:
Add tests dir for libdes.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/etc/mtree/NetBSD.dist.base

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/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.48 src/etc/mtree/NetBSD.dist.base:1.49
--- src/etc/mtree/NetBSD.dist.base:1.48	Tue Aug 24 11:31:48 2010
+++ src/etc/mtree/NetBSD.dist.base	Wed Aug 25 16:44:25 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.48 2010/08/24 11:31:48 pooka Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.49 2010/08/25 16:44:25 jmmv Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -233,6 +233,7 @@
 ./usr/libdata/debug/usr/tests/lib/libc
 ./usr/libdata/debug/usr/tests/lib/libc/hash
 ./usr/libdata/debug/usr/tests/lib/libc/stdlib
+./usr/libdata/debug/usr/tests/lib/libdes
 ./usr/libdata/debug/usr/tests/lib/libevent
 ./usr/libdata/debug/usr/tests/lib/semaphore
 ./usr/libdata/debug/usr/tests/lib/semaphore/pthread
@@ -1168,6 +1169,7 @@
 ./usr/tests/lib/libc
 ./usr/tests/lib/libc/hash
 ./usr/tests/lib/libc/stdlib
+./usr/tests/lib/libdes
 ./usr/tests/lib/semaphore
 ./usr/tests/lib/semaphore/pthread
 ./usr/tests/lib/libevent

CVS commit: src/sys/arch/sparc/stand/ofwboot

2010-08-25 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Aug 25 16:38:04 UTC 2010

Modified Files:
src/sys/arch/sparc/stand/ofwboot: boot.c

Log Message:
kill LOAD_MINIMAL.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sparc/stand/ofwboot/boot.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/sparc/stand/ofwboot/boot.c
diff -u src/sys/arch/sparc/stand/ofwboot/boot.c:1.23 src/sys/arch/sparc/stand/ofwboot/boot.c:1.24
--- src/sys/arch/sparc/stand/ofwboot/boot.c:1.23	Wed Aug 25 12:24:45 2010
+++ src/sys/arch/sparc/stand/ofwboot/boot.c	Wed Aug 25 12:38:04 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.23 2010/08/25 16:24:45 christos Exp $	*/
+/*	$NetBSD: boot.c,v 1.24 2010/08/25 16:38:04 christos Exp $	*/
 
 /*
  * Copyright (c) 1997, 1999 Eduardo E. Horvath.  All rights reserved.
@@ -354,7 +354,9 @@
 {
 	int fd;
 	u_long marks[MARK_MAX];
-	int flags = isfloppy ? LOAD_MINIMAL : LOAD_ALL;
+	int flags = LOAD_ALL;
+	if (isfloppy)
+		flags &= ~LOAD_BACKWARDS;
 
 	/*
 	 * First, load headers using default allocator and check whether kernel

CVS commit: src/sys/arch/x68k/stand/boot

2010-08-25 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Aug 25 16:37:02 UTC 2010

Modified Files:
src/sys/arch/x68k/stand/boot: boot.c

Log Message:
s/LOAD_NOTE/LOAD_BACKWARDS/


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x68k/stand/boot/boot.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/x68k/stand/boot/boot.c
diff -u src/sys/arch/x68k/stand/boot/boot.c:1.14 src/sys/arch/x68k/stand/boot/boot.c:1.15
--- src/sys/arch/x68k/stand/boot/boot.c:1.14	Sat Jan 31 09:22:21 2009
+++ src/sys/arch/x68k/stand/boot/boot.c	Wed Aug 25 12:37:02 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.14 2009/01/31 14:22:21 tsutsui Exp $	*/
+/*	$NetBSD: boot.c,v 1.15 2010/08/25 16:37:02 christos Exp $	*/
 
 /*
  * Copyright (c) 2001 Minoura Makoto
@@ -111,7 +111,7 @@
 
 	loadflag = LOAD_KERNEL;
 	if (file[0] == 'f')
-		loadflag &= ~LOAD_NOTE;
+		loadflag &= ~LOAD_BACKWARDS;
 		
 	marks[MARK_START] = 0x10;
 	if ((fd = loadfile(file, marks, loadflag)) == -1) {

CVS commit: src/sys/arch/newsmips/stand/boot

2010-08-25 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Aug 25 16:35:57 UTC 2010

Modified Files:
src/sys/arch/newsmips/stand/boot: boot.c

Log Message:
s/LOAD_NOTE/LOAD_BACKWARDS/


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/newsmips/stand/boot/boot.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/newsmips/stand/boot/boot.c
diff -u src/sys/arch/newsmips/stand/boot/boot.c:1.17 src/sys/arch/newsmips/stand/boot/boot.c:1.18
--- src/sys/arch/newsmips/stand/boot/boot.c:1.17	Tue Jan 20 08:12:26 2009
+++ src/sys/arch/newsmips/stand/boot/boot.c	Wed Aug 25 12:35:57 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.17 2009/01/20 13:12:26 tsutsui Exp $	*/
+/*	$NetBSD: boot.c,v 1.18 2010/08/25 16:35:57 christos Exp $	*/
 
 /*-
  * Copyright (C) 1999 Tsubai Masanari.  All rights reserved.
@@ -161,10 +161,9 @@
 		kernels[1] = NULL;
 	}
 
-	/* disable LOAD_NOTE on floppy to avoid backward seek across volumes */
 	loadflag = LOAD_KERNEL;
 	if (devname[0] == 'f')	/* XXX */
-		loadflag &= ~LOAD_NOTE;
+		loadflag &= ~LOAD_BACKWARDS;
 
 	marks[MARK_START] = 0;

CVS commit: src/sys/arch/news68k/stand/boot

2010-08-25 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Aug 25 16:35:02 UTC 2010

Modified Files:
src/sys/arch/news68k/stand/boot: boot.c

Log Message:
s/LOAD_NOTE/LOAD_BACKWARDS


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/news68k/stand/boot/boot.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/news68k/stand/boot/boot.c
diff -u src/sys/arch/news68k/stand/boot/boot.c:1.17 src/sys/arch/news68k/stand/boot/boot.c:1.18
--- src/sys/arch/news68k/stand/boot/boot.c:1.17	Tue Jan 20 08:35:28 2009
+++ src/sys/arch/news68k/stand/boot/boot.c	Wed Aug 25 12:35:02 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.17 2009/01/20 13:35:28 tsutsui Exp $	*/
+/*	$NetBSD: boot.c,v 1.18 2010/08/25 16:35:02 christos Exp $	*/
 
 /*-
  * Copyright (c) 1999 Izumi Tsutsui.  All rights reserved.
@@ -123,10 +123,9 @@
 		kernels[1] = NULL;
 	}
 
-	/* disable LOAD_NOTE on floppy to avoid backward seek across volumes */
 	loadflag = LOAD_KERNEL;
 	if (devname[0] == 'f')	/* XXX */
-		loadflag &= ~LOAD_NOTE;
+		loadflag &= ~LOAD_BACKWARDS;
 
 	for (i = 0; kernels[i]; i++) {
 		sprintf(file, "%s%s", devname, kernels[i]);

CVS commit: src/sys/arch/macppc/stand/ofwboot

2010-08-25 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Aug 25 16:33:51 UTC 2010

Modified Files:
src/sys/arch/macppc/stand/ofwboot: boot.c

Log Message:
s/LOAD_NOTE/LOAD_BACKWARDS/


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/macppc/stand/ofwboot/boot.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/macppc/stand/ofwboot/boot.c
diff -u src/sys/arch/macppc/stand/ofwboot/boot.c:1.24 src/sys/arch/macppc/stand/ofwboot/boot.c:1.25
--- src/sys/arch/macppc/stand/ofwboot/boot.c:1.24	Sun Mar 28 20:13:32 2010
+++ src/sys/arch/macppc/stand/ofwboot/boot.c	Wed Aug 25 12:33:51 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.24 2010/03/29 00:13:32 mrg Exp $	*/
+/*	$NetBSD: boot.c,v 1.25 2010/08/25 16:33:51 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -288,7 +288,7 @@
 
 			loadflag = LOAD_KERNEL;
 			if (floppyboot)
-loadflag &= ~LOAD_NOTE;
+loadflag &= ~LOAD_BACKWARDS;
 
 			marks[MARK_START] = 0;
 			if (loadfile(kernels[i], marks, loadflag) >= 0)

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

2010-08-25 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Aug 25 16:32:51 UTC 2010

Modified Files:
src/sys/arch/i386/stand/lib: exec.c

Log Message:
use LOAD_BACKWARDS instead of LOAD_NOTE for floppy book.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/i386/stand/lib/exec.c

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

Modified files:

Index: src/sys/arch/i386/stand/lib/exec.c
diff -u src/sys/arch/i386/stand/lib/exec.c:1.43 src/sys/arch/i386/stand/lib/exec.c:1.44
--- src/sys/arch/i386/stand/lib/exec.c:1.43	Fri Jun 25 11:35:08 2010
+++ src/sys/arch/i386/stand/lib/exec.c	Wed Aug 25 12:32:51 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec.c,v 1.43 2010/06/25 15:35:08 tsutsui Exp $	 */
+/*	$NetBSD: exec.c,v 1.44 2010/08/25 16:32:51 christos Exp $	 */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -228,7 +228,7 @@
 #endif
 	marks[MARK_START] = loadaddr;
 	if ((fd = loadfile(file, marks,
-	LOAD_KERNEL & ~(floppy ? LOAD_NOTE : 0))) == -1)
+	LOAD_KERNEL & ~(floppy ? LOAD_BACKWARDS : 0))) == -1)
 		return EIO;
 
 	close(fd);

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

2010-08-25 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Aug 25 16:30:44 UTC 2010

Modified Files:
src/sys/arch/alpha/stand/common: boot.c
src/sys/arch/alpha/stand/ustarboot: Makefile

Log Message:
change LOAD_NOTE to LOAD_BACKWARDS


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/alpha/stand/common/boot.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/alpha/stand/ustarboot/Makefile

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

Modified files:

Index: src/sys/arch/alpha/stand/common/boot.c
diff -u src/sys/arch/alpha/stand/common/boot.c:1.30 src/sys/arch/alpha/stand/common/boot.c:1.31
--- src/sys/arch/alpha/stand/common/boot.c:1.30	Tue Feb  3 07:49:00 2009
+++ src/sys/arch/alpha/stand/common/boot.c	Wed Aug 25 12:30:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.30 2009/02/03 12:49:00 tsutsui Exp $ */
+/* $NetBSD: boot.c,v 1.31 2010/08/25 16:30:44 christos Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -122,8 +122,8 @@
 		gets(boot_file);
 	}
 
-#ifdef NO_LOAD_NOTE
-	loadflag = LOAD_KERNEL & ~LOAD_NOTE;
+#ifdef NO_LOAD_BACKWARDS
+	loadflag = LOAD_KERNEL & ~LOAD_BACKWARDS;
 #else
 	loadflag = LOAD_KERNEL;
 #endif

Index: src/sys/arch/alpha/stand/ustarboot/Makefile
diff -u src/sys/arch/alpha/stand/ustarboot/Makefile:1.7 src/sys/arch/alpha/stand/ustarboot/Makefile:1.8
--- src/sys/arch/alpha/stand/ustarboot/Makefile:1.7	Tue Feb  3 07:49:00 2009
+++ src/sys/arch/alpha/stand/ustarboot/Makefile	Wed Aug 25 12:30:44 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/02/03 12:49:00 tsutsui Exp $
+# $NetBSD: Makefile,v 1.8 2010/08/25 16:30:44 christos Exp $
 
 PROG = ustarboot
 
@@ -12,7 +12,7 @@
 		-DLIBSA_SINGLE_DEVICE=blkdev \
 		  -D"blkdevioctl(x,y,z)=EINVAL" \
 		-DLIBSA_SINGLE_FILESYSTEM=ustarfs \
-		-DNO_LOAD_NOTE
+		-DNO_LOAD_BACKWARDS
 
 CLEANFILES+= ${PROG}.sym

CVS commit: src/sys/lib/libsa

2010-08-25 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Aug 25 16:30:01 UTC 2010

Modified Files:
src/sys/lib/libsa: loadfile.h

Log Message:
add a LOAD_BACKWARDS flag on sections that might load backwards.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/lib/libsa/loadfile.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/lib/libsa/loadfile.h
diff -u src/sys/lib/libsa/loadfile.h:1.11 src/sys/lib/libsa/loadfile.h:1.12
--- src/sys/lib/libsa/loadfile.h:1.11	Wed Aug 25 12:23:23 2010
+++ src/sys/lib/libsa/loadfile.h	Wed Aug 25 12:30:01 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: loadfile.h,v 1.11 2010/08/25 16:23:23 christos Exp $	 */
+/*	$NetBSD: loadfile.h,v 1.12 2010/08/25 16:30:01 christos Exp $	 */
 
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -52,6 +52,7 @@
 #define LOAD_NOTE	0x0040
 #define LOAD_ALL	0x007f
 #define LOAD_MINIMAL	0x002f
+#define LOAD_BACKWARDS	0x0050
 
 #define	COUNT_TEXT	0x0100
 #define	COUNT_TEXTA	0x0200

CVS commit: src/sys/arch/sparc/stand/ofwboot

2010-08-25 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Aug 25 16:24:45 UTC 2010

Modified Files:
src/sys/arch/sparc/stand/ofwboot: boot.c

Log Message:
Try to detect if we are doing a floppy boot from the device name and if
we are, load the minimal set to avoid backwards seeks.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sparc/stand/ofwboot/boot.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/sparc/stand/ofwboot/boot.c
diff -u src/sys/arch/sparc/stand/ofwboot/boot.c:1.22 src/sys/arch/sparc/stand/ofwboot/boot.c:1.23
--- src/sys/arch/sparc/stand/ofwboot/boot.c:1.22	Fri Apr  2 14:39:44 2010
+++ src/sys/arch/sparc/stand/ofwboot/boot.c	Wed Aug 25 12:24:45 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.22 2010/04/02 18:39:44 martin Exp $	*/
+/*	$NetBSD: boot.c,v 1.23 2010/08/25 16:24:45 christos Exp $	*/
 
 /*
  * Copyright (c) 1997, 1999 Eduardo E. Horvath.  All rights reserved.
@@ -350,10 +350,11 @@
 }
 
 static void
-start_kernel(char *kernel, char *bootline, void *ofw)
+start_kernel(char *kernel, char *bootline, void *ofw, int isfloppy)
 {
 	int fd;
 	u_long marks[MARK_MAX];
+	int flags = isfloppy ? LOAD_MINIMAL : LOAD_ALL;
 
 	/*
 	 * First, load headers using default allocator and check whether kernel
@@ -371,7 +372,7 @@
 		}
 		(void)printf("Loading %s: ", kernel);
 
-		if (fdloadfile(fd, marks, LOAD_ALL) != -1) {
+		if (fdloadfile(fd, marks, flags) != -1) {
 			close(fd);
 			jump_to_kernel(marks, kernel, bootline, ofw);
 		}
@@ -488,7 +489,7 @@
 void
 main(void *ofw)
 {
-	int boothowto, i = 0;
+	int boothowto, i = 0, isfloppy;
 
 	char kernel[PROM_MAX_PATH];
 	char bootline[PROM_MAX_PATH];
@@ -503,6 +504,7 @@
 	/* Figure boot arguments */
 	strncpy(bootdev, prom_getbootpath(), sizeof(bootdev) - 1);
 	boothowto = bootoptions(prom_getbootargs(), bootdev, kernel, bootline);
+	isfloppy = strstr(bootdev, "fd") || strstr(bootdev, "floppy");
 
 	for (;; *kernel = '\0') {
 		if (boothowto & RB_ASKNAME) {
@@ -541,7 +543,7 @@
 		}
 
 		check_boot_config();
-		start_kernel(kernel, bootline, ofw);
+		start_kernel(kernel, bootline, ofw, isfloppy);
 
 		/*
 		 * Try next name from kernel name list if not in askname mode,

CVS commit: src/sys/lib/libsa

2010-08-25 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Aug 25 16:23:23 UTC 2010

Modified Files:
src/sys/lib/libsa: loadfile.h

Log Message:
Add a new LOAD_MINIMAL flag to avoid loading sections that might seek backwards
and are not really needed like the note and the symbol section.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/lib/libsa/loadfile.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/lib/libsa/loadfile.h
diff -u src/sys/lib/libsa/loadfile.h:1.10 src/sys/lib/libsa/loadfile.h:1.11
--- src/sys/lib/libsa/loadfile.h:1.10	Thu Sep 25 16:59:38 2008
+++ src/sys/lib/libsa/loadfile.h	Wed Aug 25 12:23:23 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: loadfile.h,v 1.10 2008/09/25 20:59:38 christos Exp $	 */
+/*	$NetBSD: loadfile.h,v 1.11 2010/08/25 16:23:23 christos Exp $	 */
 
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -51,6 +51,7 @@
 #define	LOAD_HDR	0x0020
 #define LOAD_NOTE	0x0040
 #define LOAD_ALL	0x007f
+#define LOAD_MINIMAL	0x002f
 
 #define	COUNT_TEXT	0x0100
 #define	COUNT_TEXTA	0x0200

CVS commit: src/etc

2010-08-25 Thread Jeremy C. Reed 
Module Name:src
Committed By:   reed
Date:   Wed Aug 25 15:38:44 UTC 2010

Modified Files:
src/etc: aliases

Log Message:
mail(8) is no longer in /bin.
(Trivia: this sentence is from the 4.0BSD from 1980.)


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/etc/aliases

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

Modified files:

Index: src/etc/aliases
diff -u src/etc/aliases:1.21 src/etc/aliases:1.22
--- src/etc/aliases:1.21	Fri Jul 18 21:12:03 2008
+++ src/etc/aliases	Wed Aug 25 15:38:44 2010
@@ -1,9 +1,9 @@
-#	$NetBSD: aliases,v 1.21 2008/07/18 21:12:03 apb Exp $
+#	$NetBSD: aliases,v 1.22 2010/08/25 15:38:44 reed Exp $
 #
 #	from: @(#)aliases	8.2 (Berkeley) 3/5/94
 #
 #  Aliases in this file will NOT be expanded in the header from
-#  Mail, but WILL be visible over networks or from /bin/mail.
+#  Mail, but WILL be visible over networks or from /usr/bin/mail.
 #
 #	>>	The program "newaliases" must be run after
 #	>> NOTE >>	this file is updated for any changes to

CVS commit: [uebayasi-xip] src/sys/dev/microcode/radeon

2010-08-25 Thread Masao Uebayashi 
Module Name:src
Committed By:   uebayasi
Date:   Wed Aug 25 15:36:28 UTC 2010

Added Files:
src/sys/dev/microcode/radeon [uebayasi-xip]: CEDAR_me.bin CEDAR_pfp.bin
CEDAR_rlc.bin CYPRESS_me.bin CYPRESS_pfp.bin CYPRESS_rlc.bin
JUNIPER_me.bin JUNIPER_pfp.bin JUNIPER_rlc.bin R100_cp.bin
R200_cp.bin R300_cp.bin R420_cp.bin R520_cp.bin R600_me.bin
R600_pfp.bin R600_rlc.bin R700_rlc.bin REDWOOD_me.bin
REDWOOD_pfp.bin REDWOOD_rlc.bin RS600_cp.bin RS690_cp.bin
RS780_me.bin RS780_pfp.bin RV610_me.bin RV610_pfp.bin RV620_me.bin
RV620_pfp.bin RV630_me.bin RV630_pfp.bin RV635_me.bin RV635_pfp.bin
RV670_me.bin RV670_pfp.bin RV710_me.bin RV710_pfp.bin RV730_me.bin
RV730_pfp.bin RV770_me.bin RV770_pfp.bin

Log Message:
Sync with HEAD.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.4.2 src/sys/dev/microcode/radeon/CEDAR_me.bin \
src/sys/dev/microcode/radeon/CEDAR_pfp.bin \
src/sys/dev/microcode/radeon/CEDAR_rlc.bin \
src/sys/dev/microcode/radeon/CYPRESS_me.bin \
src/sys/dev/microcode/radeon/CYPRESS_pfp.bin \
src/sys/dev/microcode/radeon/CYPRESS_rlc.bin \
src/sys/dev/microcode/radeon/JUNIPER_me.bin \
src/sys/dev/microcode/radeon/JUNIPER_pfp.bin \
src/sys/dev/microcode/radeon/JUNIPER_rlc.bin \
src/sys/dev/microcode/radeon/R100_cp.bin \
src/sys/dev/microcode/radeon/R200_cp.bin \
src/sys/dev/microcode/radeon/R300_cp.bin \
src/sys/dev/microcode/radeon/R420_cp.bin \
src/sys/dev/microcode/radeon/R520_cp.bin \
src/sys/dev/microcode/radeon/R600_me.bin \
src/sys/dev/microcode/radeon/R600_pfp.bin \
src/sys/dev/microcode/radeon/R600_rlc.bin \
src/sys/dev/microcode/radeon/R700_rlc.bin \
src/sys/dev/microcode/radeon/REDWOOD_me.bin \
src/sys/dev/microcode/radeon/REDWOOD_pfp.bin \
src/sys/dev/microcode/radeon/REDWOOD_rlc.bin \
src/sys/dev/microcode/radeon/RS600_cp.bin \
src/sys/dev/microcode/radeon/RS690_cp.bin \
src/sys/dev/microcode/radeon/RS780_me.bin \
src/sys/dev/microcode/radeon/RS780_pfp.bin \
src/sys/dev/microcode/radeon/RV610_me.bin \
src/sys/dev/microcode/radeon/RV610_pfp.bin \
src/sys/dev/microcode/radeon/RV620_me.bin \
src/sys/dev/microcode/radeon/RV620_pfp.bin \
src/sys/dev/microcode/radeon/RV630_me.bin \
src/sys/dev/microcode/radeon/RV630_pfp.bin \
src/sys/dev/microcode/radeon/RV635_me.bin \
src/sys/dev/microcode/radeon/RV635_pfp.bin \
src/sys/dev/microcode/radeon/RV670_me.bin \
src/sys/dev/microcode/radeon/RV670_pfp.bin \
src/sys/dev/microcode/radeon/RV710_me.bin \
src/sys/dev/microcode/radeon/RV710_pfp.bin \
src/sys/dev/microcode/radeon/RV730_me.bin \
src/sys/dev/microcode/radeon/RV730_pfp.bin \
src/sys/dev/microcode/radeon/RV770_me.bin \
src/sys/dev/microcode/radeon/RV770_pfp.bin

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

Added files:

Index: src/sys/dev/microcode/radeon/CEDAR_me.bin
Index: src/sys/dev/microcode/radeon/CEDAR_pfp.bin
Index: src/sys/dev/microcode/radeon/CEDAR_rlc.bin
Index: src/sys/dev/microcode/radeon/CYPRESS_me.bin
Index: src/sys/dev/microcode/radeon/CYPRESS_pfp.bin
Index: src/sys/dev/microcode/radeon/CYPRESS_rlc.bin
Index: src/sys/dev/microcode/radeon/JUNIPER_me.bin
Index: src/sys/dev/microcode/radeon/JUNIPER_pfp.bin
Index: src/sys/dev/microcode/radeon/JUNIPER_rlc.bin
Index: src/sys/dev/microcode/radeon/R100_cp.bin
Index: src/sys/dev/microcode/radeon/R200_cp.bin
Index: src/sys/dev/microcode/radeon/R300_cp.bin
Index: src/sys/dev/microcode/radeon/R420_cp.bin
Index: src/sys/dev/microcode/radeon/R520_cp.bin
Index: src/sys/dev/microcode/radeon/R600_me.bin
Index: src/sys/dev/microcode/radeon/R600_pfp.bin
Index: src/sys/dev/microcode/radeon/R600_rlc.bin
Index: src/sys/dev/microcode/radeon/R700_rlc.bin
Index: src/sys/dev/microcode/radeon/REDWOOD_me.bin
Index: src/sys/dev/microcode/radeon/REDWOOD_pfp.bin
Index: src/sys/dev/microcode/radeon/REDWOOD_rlc.bin
Index: src/sys/dev/microcode/radeon/RS600_cp.bin
Index: src/sys/dev/microcode/radeon/RS690_cp.bin
Index: src/sys/dev/microcode/radeon/RS780_me.bin
Index: src/sys/dev/microcode/radeon/RS780_pfp.bin
Index: src/sys/dev/microcode/radeon/RV610_me.bin
Index: src/sys/dev/microcode/radeon/RV610_pfp.bin
Index: src/sys/dev/microcode/radeon/RV620_me.bin
Index: src/sys/dev/microcode/radeon/RV620_pfp.bin
Index: src/sys/dev/microcode/radeon/RV630_me.bin
Index: src/sys/dev/microcode/radeon/RV630_pfp.bin
Index: src/sys/dev/microcode/radeon/RV635_me.bin
Index: src/sys/dev/microcode/radeon/RV635_pfp.bin
Index: src/sys/dev/microcode/radeon/RV670_me.bin
Index: src/sys/dev/microcode/radeon/RV670_pfp.bin
Index: src/sys/dev/microcode/radeon/RV710_me.bin
Index: src/sys/dev/microcode/radeon/RV710_pfp.bin
Index: src/sys/dev/microcode/radeon/RV730_me.bin
Index: src/sys/dev/microcode/radeon/RV730_pfp.bin
Index: src/sys/dev/mi

CVS commit: src/share/mk

2010-08-25 Thread Jeremy C. Reed 
Module Name:src
Committed By:   reed
Date:   Wed Aug 25 15:24:29 UTC 2010

Modified Files:
src/share/mk: bsd.README

Log Message:
For MLINKS description, remove sentence saying they
are soft-linked (as it is not accurate).


To generate a diff of this commit:
cvs rdiff -u -r1.275 -r1.276 src/share/mk/bsd.README

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

Modified files:

Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.275 src/share/mk/bsd.README:1.276
--- src/share/mk/bsd.README:1.275	Sun Aug 22 18:56:20 2010
+++ src/share/mk/bsd.README	Wed Aug 25 15:24:29 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.275 2010/08/22 18:56:20 rmind Exp $
+#	$NetBSD: bsd.README,v 1.276 2010/08/25 15:24:29 reed Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -1143,7 +1143,7 @@
 
 MLINKS		List of manual page links (using a .1 - .9 suffix).  The
 		linked-to file must come first, the linked file second,
-		and there may be multiple pairs.  The files are soft-linked.
+		and there may be multiple pairs.
 
 The include file  includes a file named "../Makefile.inc" if
 it exists.

CVS commit: src/crypto/dist/heimdal/kpasswd

2010-08-25 Thread Jeremy C. Reed 
Module Name:src
Committed By:   reed
Date:   Wed Aug 25 15:08:22 UTC 2010

Modified Files:
src/crypto/dist/heimdal/kpasswd: kpasswdd.8

Log Message:
Add copyright and license.
I reported this in October 2009 and it was fixed upstream.
http://github.com/heimdal/heimdal/commits/master/kpasswd/kpasswdd.8


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/crypto/dist/heimdal/kpasswd/kpasswdd.8

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

Modified files:

Index: src/crypto/dist/heimdal/kpasswd/kpasswdd.8
diff -u src/crypto/dist/heimdal/kpasswd/kpasswdd.8:1.9 src/crypto/dist/heimdal/kpasswd/kpasswdd.8:1.10
--- src/crypto/dist/heimdal/kpasswd/kpasswdd.8:1.9	Wed Oct 14 23:37:33 2009
+++ src/crypto/dist/heimdal/kpasswd/kpasswdd.8	Wed Aug 25 15:08:22 2010
@@ -1,5 +1,36 @@
+.\" Copyright (c) 1997, 2000 - 2005 Kungliga Tekniska Högskolan
+.\" (Royal Institute of Technology, Stockholm, Sweden). 
+.\" All rights reserved. 
+.\"
+.\" Redistribution and use in source and binary forms, with or without 
+.\" modification, are permitted provided that the following conditions 
+.\" are met: 
+.\"
+.\" 1. Redistributions of source code must retain the above copyright 
+.\"notice, this list of conditions and the following disclaimer. 
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright 
+.\"notice, this list of conditions and the following disclaimer in the 
+.\"documentation and/or other materials provided with the distribution. 
+.\"
+.\" 3. Neither the name of the Institute nor the names of its contributors 
+.\"may be used to endorse or promote products derived from this software 
+.\"without specific prior written permission. 
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE INSTITUTE 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 INSTITUTE 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. 
+.\"
 .\" $Heimdal: kpasswdd.8 14481 2005-01-05 18:07:44Z lha $
-.\" $NetBSD: kpasswdd.8,v 1.9 2009/10/14 23:37:33 joerg Exp $
+.\" $NetBSD: kpasswdd.8,v 1.10 2010/08/25 15:08:22 reed Exp $
 .\"
 .Dd April 19, 1999
 .Dt KPASSWDD 8

CVS commit: src/doc

2010-08-25 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Wed Aug 25 14:57:26 UTC 2010

Modified Files:
src/doc: CHANGES

Log Message:
Mention mips64 support (from the first branch merge) by matt@,
so details wont be forgotten in the release notes.


To generate a diff of this commit:
cvs rdiff -u -r1.1429 -r1.1430 src/doc/CHANGES

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

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1429 src/doc/CHANGES:1.1430
--- src/doc/CHANGES:1.1429	Wed Aug 25 14:02:51 2010
+++ src/doc/CHANGES	Wed Aug 25 14:57:26 2010
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1429 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1430 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -507,6 +507,10 @@
 		ICMP replies to the broadcast address. [christos 20091207]
 	ntp:	Import ntp-4-2-4p8. [kardel 20091208]
 	zaurus: Add support Xorg. [nonaka 20091213]
+	mips: First merge of the matt-nb5-mips64 branch.  Added support for
+		64-bit MIPS processors (O32, N32, N64 ABIs are supported).
+		Added support for RMI XLS6ATX_7A board and XL SoC family.
+		[matt 20091214]
 	sysinst(8): Make SHA1 the default option for cyphers.  [ahoka 20091216]
 	atf(7): Import 0.7.  [jmmv 20091222]
 	dhcpcd(8): Import dhcpcd-5.1.4. [roy 20091223]

CVS commit: [uebayasi-xip] src/sys/arch/powerpc/conf

2010-08-25 Thread Masao Uebayashi 
Module Name:src
Committed By:   uebayasi
Date:   Wed Aug 25 14:33:07 UTC 2010

Modified Files:
src/sys/arch/powerpc/conf [uebayasi-xip]: files.powerpc

Log Message:
Indent.


To generate a diff of this commit:
cvs rdiff -u -r1.71.4.3 -r1.71.4.4 src/sys/arch/powerpc/conf/files.powerpc

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/powerpc/conf/files.powerpc
diff -u src/sys/arch/powerpc/conf/files.powerpc:1.71.4.3 src/sys/arch/powerpc/conf/files.powerpc:1.71.4.4
--- src/sys/arch/powerpc/conf/files.powerpc:1.71.4.3	Thu Aug 19 12:36:58 2010
+++ src/sys/arch/powerpc/conf/files.powerpc	Wed Aug 25 14:33:07 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: files.powerpc,v 1.71.4.3 2010/08/19 12:36:58 uebayasi Exp $
+#	$NetBSD: files.powerpc,v 1.71.4.4 2010/08/25 14:33:07 uebayasi Exp $
 
 defflag	opt_altivec.h	ALTIVEC K_ALTIVEC
 defflag	opt_openpic.h	OPENPIC OPENPIC_SERIAL_MODE
@@ -95,4 +95,4 @@
 file arch/powerpc/powerpc/linux_trap.c			compat_linux
 file arch/powerpc/powerpc/linux_syscall.c		compat_linux
 
-file arch/powerpc/powerpc/xmd_machdep.c			xmd
+file	arch/powerpc/powerpc/xmd_machdep.c		xmd

CVS commit: [uebayasi-xip] src/sys/arch/powerpc/powerpc

2010-08-25 Thread Masao Uebayashi 
Module Name:src
Committed By:   uebayasi
Date:   Wed Aug 25 14:32:54 UTC 2010

Modified Files:
src/sys/arch/powerpc/powerpc [uebayasi-xip]: xmd_machdep.c

Log Message:
RCS id.  Minor clean up.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/powerpc/powerpc/xmd_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/powerpc/powerpc/xmd_machdep.c
diff -u src/sys/arch/powerpc/powerpc/xmd_machdep.c:1.1.2.1 src/sys/arch/powerpc/powerpc/xmd_machdep.c:1.1.2.2
--- src/sys/arch/powerpc/powerpc/xmd_machdep.c:1.1.2.1	Thu Aug 19 12:36:58 2010
+++ src/sys/arch/powerpc/powerpc/xmd_machdep.c	Wed Aug 25 14:32:54 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: xmd_machdep.c,v 1.1.2.1 2010/08/19 12:36:58 uebayasi Exp $	*/
+/*	$NetBSD: xmd_machdep.c,v 1.1.2.2 2010/08/25 14:32:54 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -26,8 +26,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include 
+__KERNEL_RCSID(0, "$NetBSD: xmd_machdep.c,v 1.1.2.2 2010/08/25 14:32:54 uebayasi Exp $");
+
 #include "opt_xip.h"
 
+#ifndef XIP
+#error xmd(4) needs options XIP
+#endif
+
 #include 
 #include 
 
@@ -49,16 +56,16 @@
 void *
 xmd_machdep_physload(vaddr_t addr, size_t size)
 {
-	paddr_t s, e, as, ae;
+	paddr_t start, end;
 
 	/* addr is in PA == VA RAM area. */
 	KASSERT(addr >= 0x);
 	KASSERT(addr < 0x8000);
 
-	s = as = (addr) >> PAGE_SHIFT;
-	e = ae = (addr + size) >> PAGE_SHIFT;
+	start = (addr) >> PAGE_SHIFT;
+	end = (addr + size) >> PAGE_SHIFT;
 
-	return uvm_page_physload_device(s, e, as, ae, PROT_READ, 0);
+	return uvm_page_physload_device(start, end, start, end, PROT_READ, 0);
 }
 
 void

CVS commit: [uebayasi-xip] src/sys/conf

2010-08-25 Thread Masao Uebayashi 
Module Name:src
Committed By:   uebayasi
Date:   Wed Aug 25 14:32:30 UTC 2010

Modified Files:
src/sys/conf [uebayasi-xip]: files

Log Message:
Indent.


To generate a diff of this commit:
cvs rdiff -u -r1.974.2.8 -r1.974.2.9 src/sys/conf/files

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.974.2.8 src/sys/conf/files:1.974.2.9
--- src/sys/conf/files:1.974.2.8	Thu Aug 19 12:36:58 2010
+++ src/sys/conf/files	Wed Aug 25 14:32:30 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.974.2.8 2010/08/19 12:36:58 uebayasi Exp $
+#	$NetBSD: files,v 1.974.2.9 2010/08/25 14:32:30 uebayasi Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20100430
@@ -273,7 +273,7 @@
 
 # XIP memory (ram) disk options
 #
-defflag	opt_xmd.h		XMD_ROOT_SIZE
+defparam opt_xmd.h		XMD_ROOT_SIZE
 
 defflag opt_tftproot.h		TFTPROOT TFTPROOT_DEBUG

CVS commit: [uebayasi-xip] src/sys/miscfs/genfs

2010-08-25 Thread Masao Uebayashi 
Module Name:src
Committed By:   uebayasi
Date:   Wed Aug 25 14:29:12 UTC 2010

Modified Files:
src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c

Log Message:
Fix UVMHIST build.

Remove a comment about xip getpages optimization; quick profiling showed
that this routine is not expensive.  It'd be better to concentrate on
reducing TLB miss.


To generate a diff of this commit:
cvs rdiff -u -r1.36.2.21 -r1.36.2.22 src/sys/miscfs/genfs/genfs_io.c

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

Modified files:

Index: src/sys/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.36.2.21 src/sys/miscfs/genfs/genfs_io.c:1.36.2.22
--- src/sys/miscfs/genfs/genfs_io.c:1.36.2.21	Tue Aug 17 06:47:36 2010
+++ src/sys/miscfs/genfs/genfs_io.c	Wed Aug 25 14:29:12 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: genfs_io.c,v 1.36.2.21 2010/08/17 06:47:36 uebayasi Exp $	*/
+/*	$NetBSD: genfs_io.c,v 1.36.2.22 2010/08/25 14:29:12 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.36.2.21 2010/08/17 06:47:36 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.36.2.22 2010/08/25 14:29:12 uebayasi Exp $");
 
 #include "opt_xip.h"
 
@@ -824,7 +824,6 @@
 	if ((flags & PGO_LOCKED) == 0)
 		mutex_exit(&uobj->vmobjlock);
 
-	/* XXX optimize */
 	off = offset;
 	for (i = 0; i < npages; i++) {
 		daddr_t lbn, blkno;
@@ -867,7 +866,7 @@
 
 		UVMHIST_LOG(ubchist, "xip pgs %d => phys_addr=0x%lx (%p)",
 			i,
-			(long)pg->phys_addr,
+			(long)pps[i]->phys_addr,
 			pps[i],
 			0);

CVS commit: [uebayasi-xip] src/sys/uvm

2010-08-25 Thread Masao Uebayashi 
Module Name:src
Committed By:   uebayasi
Date:   Wed Aug 25 14:23:16 UTC 2010

Modified Files:
src/sys/uvm [uebayasi-xip]: uvm_page.c

Log Message:
Fix DIAGNOSTIC build.  Sprinkle some assertions.


To generate a diff of this commit:
cvs rdiff -u -r1.153.2.53 -r1.153.2.54 src/sys/uvm/uvm_page.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/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.153.2.53 src/sys/uvm/uvm_page.c:1.153.2.54
--- src/sys/uvm/uvm_page.c:1.153.2.53	Wed Aug 11 13:14:55 2010
+++ src/sys/uvm/uvm_page.c	Wed Aug 25 14:23:16 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_page.c,v 1.153.2.53 2010/08/11 13:14:55 uebayasi Exp $	*/
+/*	$NetBSD: uvm_page.c,v 1.153.2.54 2010/08/25 14:23:16 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.153.2.53 2010/08/11 13:14:55 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.153.2.54 2010/08/25 14:23:16 uebayasi Exp $");
 
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
@@ -873,7 +873,10 @@
 #endif
 	}
 
+#ifdef DIAGNOSTIC
+	extern int uvm_physseg_inited;
 	KASSERT(uvm_physseg_inited);
+#endif
 
 #ifdef __HAVE_PMAP_PHYSSEG
 #ifdef __HAVE_PMAP_PHYSSEG_INIT
@@ -902,13 +905,14 @@
 }
 #endif
 
+int uvm_physseg_inited;
+
 static struct vm_physseg *
 uvm_physseg_alloc(struct vm_physseg_freelist *freelist,
 struct vm_physseg **segs, int nsegs,
 const paddr_t start, const paddr_t end)
 {
 	struct vm_physseg *ps;
-	static int uvm_physseg_inited;
 
 	if (uvmexp.pagesize == 0)
 		panic("uvm_page_physload: page size not set!");
@@ -1584,6 +1588,8 @@
 			pmap_zero_page(VM_PAGE_TO_PHYS(pg));
 	}
 
+	KASSERT((pg->pqflags & PQ_FIXED) == 0);
+
 	return(pg);
 
  fail:
@@ -2111,6 +2117,7 @@
 {
 
 	KASSERT(mutex_owned(&uvm_pageqlock));
+	KASSERT((pg->pqflags & PQ_FIXED) == 0);
 	KASSERT(pg->wire_count != 0 || uvmpdpol_pageisqueued_p(pg));
 	uvmpdpol_pagedeactivate(pg);
 }
@@ -2126,6 +2133,7 @@
 {
 
 	KASSERT(mutex_owned(&uvm_pageqlock));
+	KASSERT((pg->pqflags & PQ_FIXED) == 0);
 #if defined(READAHEAD_STATS)
 	if ((pg->pqflags & PQ_READAHEAD) != 0) {
 		uvm_ra_hit.ev_count++;
@@ -2146,6 +2154,7 @@
 uvm_pagedequeue(struct vm_page *pg)
 {
 
+	KASSERT((pg->pqflags & PQ_FIXED) == 0);
 	if (uvmpdpol_pageisqueued_p(pg)) {
 		KASSERT(mutex_owned(&uvm_pageqlock));
 	}
@@ -2163,6 +2172,7 @@
 {
 
 	KASSERT(mutex_owned(&uvm_pageqlock));
+	KASSERT((pg->pqflags & PQ_FIXED) == 0);
 	if (pg->wire_count != 0) {
 		return;
 	}

CVS commit: [uebayasi-xip] src/sys/uvm

2010-08-25 Thread Masao Uebayashi 
Module Name:src
Committed By:   uebayasi
Date:   Wed Aug 25 14:21:23 UTC 2010

Modified Files:
src/sys/uvm [uebayasi-xip]: uvm_vnode.c

Log Message:
Actually make this build with options XIP.


To generate a diff of this commit:
cvs rdiff -u -r1.93.2.1 -r1.93.2.2 src/sys/uvm/uvm_vnode.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/uvm/uvm_vnode.c
diff -u src/sys/uvm/uvm_vnode.c:1.93.2.1 src/sys/uvm/uvm_vnode.c:1.93.2.2
--- src/sys/uvm/uvm_vnode.c:1.93.2.1	Thu Feb 11 06:26:47 2010
+++ src/sys/uvm/uvm_vnode.c	Wed Aug 25 14:21:23 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_vnode.c,v 1.93.2.1 2010/02/11 06:26:47 uebayasi Exp $	*/
+/*	$NetBSD: uvm_vnode.c,v 1.93.2.2 2010/08/25 14:21:23 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -50,9 +50,10 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.93.2.1 2010/02/11 06:26:47 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.93.2.2 2010/08/25 14:21:23 uebayasi Exp $");
 
 #include "opt_uvmhist.h"
+#include "opt_xip.h"
 
 #include 
 #include 
@@ -178,7 +179,7 @@
 	UVMHIST_LOG(ubchist, "vp %p off 0x%x", vp, (int)offset, 0,0);
 
 #ifdef XIP
-	if ((vp->v_flag & VV_XIP) != 0)
+	if ((vp->v_vflag & VV_XIP) != 0)
 		goto uvn_get_ra_done;
 #endif
 	if ((access_type & VM_PROT_WRITE) == 0 && (flags & PGO_LOCKED) == 0) {

CVS commit: src/doc

2010-08-25 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Wed Aug 25 14:02:52 UTC 2010

Modified Files:
src/doc: CHANGES

Log Message:
Note some recent changes.


To generate a diff of this commit:
cvs rdiff -u -r1.1428 -r1.1429 src/doc/CHANGES

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

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1428 src/doc/CHANGES:1.1429
--- src/doc/CHANGES:1.1428	Sun Aug 15 09:26:57 2010
+++ src/doc/CHANGES	Wed Aug 25 14:02:51 2010
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1428 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1429 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -331,8 +331,6 @@
 		filesystems in an orderly fashion during shutdown,
 		detaching the devices and unmounting the filesystems.
 		i386 and sparc64 are finished. [dyoung 20090625]
-	kernel: Ephemeral mapping (emap) implementation, i386/amd64 support.
-		[rmind 20090628]
 	dhcpcd(8): Import dhcpcd-5.0.5 [roy 20090704]
 	dhcpcd(8): Import dhcpcd-5.0.6 [roy 20090708]
 	sysmon_envsys(8): Enhancements to allow access to driver-internal
@@ -677,6 +675,7 @@
 	mkubootimage(1): Added tool to generate u-boot kernel images.
 		[jmcneill 20100618]
 	httpd(8): Import bozohttpd-20100621. [mrg 20100621]
+	kernel: Add high-priority xcall(9) support. [rmind 20100622]
 	hp700: Add support for uturn(4) based machines. [skrll 20100624]
 	network: Add mpls(4) - MultiProtocol Label Switching support
 		[kefren 20100626]
@@ -686,6 +685,7 @@
 		FUKAUMI Naoki. [tsutsui 20100704]
 	compat_linux(8): Update linux emulation to support NPTL.
 		We now claim to be linux kernel version 2.6.18.  [chs 20100706]
+	kernel: Add direct select()/poll() support. [rmind 20100708]
 	prep: Support xserver.  It tested only on-board s3(864).
 		[kiyohara 20100712]
 	tests: Convert the libposix, libprop, libpthread, librt, libskey and
@@ -704,3 +704,4 @@
 	bind: Update to 9.7.2b1. [christos 20100806]
 	acpicpu(4): add a driver for ACPI-based processor functionality.
 		[jruoho 20100815]
+	network: Added NPF - a new packet filter. [rmind 20100822]

CVS commit: src/sys/kern

2010-08-25 Thread Antti Kantee 
Module Name:src
Committed By:   pooka
Date:   Wed Aug 25 13:51:50 UTC 2010

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

Log Message:
I'm not even going to describe this change.  I'll just say that
churn creates interesting code.

Fixes open(O_CREAT|O_TRUNC) on at least tmpfs and nfs to not fail
with ENOENT due to a racy removal of the newly created file.

Caught, as most bugs these days are, by a test run.


To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/kern/vfs_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/kern/vfs_vnops.c
diff -u src/sys/kern/vfs_vnops.c:1.176 src/sys/kern/vfs_vnops.c:1.177
--- src/sys/kern/vfs_vnops.c:1.176	Wed Jul 28 09:30:21 2010
+++ src/sys/kern/vfs_vnops.c	Wed Aug 25 13:51:50 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_vnops.c,v 1.176 2010/07/28 09:30:21 hannken Exp $	*/
+/*	$NetBSD: vfs_vnops.c,v 1.177 2010/08/25 13:51:50 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.176 2010/07/28 09:30:21 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.177 2010/08/25 13:51:50 pooka Exp $");
 
 #include "veriexec.h"
 
@@ -215,9 +215,6 @@
 	}
 
 	if (fmode & O_TRUNC) {
-		VOP_UNLOCK(vp);			/* XXX */
-
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);	/* XXX */
 		vattr_null(&va);
 		va.va_size = 0;
 		error = VOP_SETATTR(vp, &va, cred);

CVS commit: [uebayasi-xip] src/sys/arch/x86/x86

2010-08-25 Thread Masao Uebayashi 
Module Name:src
Committed By:   uebayasi
Date:   Wed Aug 25 13:36:09 UTC 2010

Modified Files:
src/sys/arch/x86/x86 [uebayasi-xip]: xmd_machdep.c

Log Message:
PA != VA here, use vtophys() to convert VA to PA.

(I hate x86.)


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/x86/x86/xmd_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/x86/x86/xmd_machdep.c
diff -u src/sys/arch/x86/x86/xmd_machdep.c:1.1.2.1 src/sys/arch/x86/x86/xmd_machdep.c:1.1.2.2
--- src/sys/arch/x86/x86/xmd_machdep.c:1.1.2.1	Fri Aug 20 07:04:38 2010
+++ src/sys/arch/x86/x86/xmd_machdep.c	Wed Aug 25 13:36:09 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: xmd_machdep.c,v 1.1.2.1 2010/08/20 07:04:38 uebayasi Exp $	*/
+/*	$NetBSD: xmd_machdep.c,v 1.1.2.2 2010/08/25 13:36:09 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: xmd_machdep.c,v 1.1.2.1 2010/08/20 07:04:38 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xmd_machdep.c,v 1.1.2.2 2010/08/25 13:36:09 uebayasi Exp $");
 
 #include "opt_xip.h"
 
@@ -46,7 +46,7 @@
 xmd_machdep_mmap(vaddr_t addr, off_t off, int prot)
 {
 
-	return x86_btop(addr + off);
+	return x86_btop(vtophys(addr + off));
 }
 
 void *
@@ -54,8 +54,8 @@
 {
 	paddr_t start, end;
 
-	start = x86_btop(addr);
-	end = x86_btop(addr + size);
+	start = x86_btop(vtophys(addr));
+	end = x86_btop(vtophys(addr + size));
 
 	return uvm_page_physload_device(start, end, start, end, PROT_READ, 0);
 }

CVS commit: src/sys/dev/usb

2010-08-25 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Wed Aug 25 12:43:56 UTC 2010

Modified Files:
src/sys/dev/usb: if_upgt.c

Log Message:
If firmware_load() returns ENOENT (i.e. No such file or directory),
explicitly mention that firmware file is not in the default distribution.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/if_upgt.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/usb/if_upgt.c
diff -u src/sys/dev/usb/if_upgt.c:1.2 src/sys/dev/usb/if_upgt.c:1.3
--- src/sys/dev/usb/if_upgt.c:1.2	Mon Jul  5 14:27:26 2010
+++ src/sys/dev/usb/if_upgt.c	Wed Aug 25 12:43:56 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_upgt.c,v 1.2 2010/07/05 14:27:26 tsutsui Exp $	*/
+/*	$NetBSD: if_upgt.c,v 1.3 2010/08/25 12:43:56 tsutsui Exp $	*/
 /*	$OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.2 2010/07/05 14:27:26 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.3 2010/08/25 12:43:56 tsutsui Exp $");
 
 #include 
 #include 
@@ -664,10 +664,26 @@
 		error = firmware_load("upgt", name, &sc->sc_fw,
 		&sc->sc_fw_size);
 		if (error != 0) {
-			aprint_error_dev(sc->sc_dev,
-			"could not read firmware %s\n", name);
-			aprint_error_dev(sc->sc_dev,
-			"see upgt(4) man page for details\n");
+			if (error == ENOENT) {
+/*
+ * The firmware file for upgt(4) is not in
+ * the default distribution due to its lisence
+ * so explicitly notify it if the firmware file
+ * is not found.
+ */
+aprint_error_dev(sc->sc_dev,
+"firmware file %s is not installed\n",
+name);
+aprint_error_dev(sc->sc_dev,
+"(it is not included in the default"
+" distribution)\n");
+aprint_error_dev(sc->sc_dev,
+"see upgt(4) man page for details about "
+"firmware installation\n");
+			} else {
+aprint_error_dev(sc->sc_dev,
+"could not read firmware %s\n", name);
+			}
 			return EIO;
 		}
 	}

CVS commit: src/usr.sbin/perfused

2010-08-25 Thread Emmanuel Dreyfus 
Module Name:src
Committed By:   manu
Date:   Wed Aug 25 07:18:01 UTC 2010

Added Files:
src/usr.sbin/perfused: Makefile debug.c msg.c perfused.8 perfused.c
perfused.h

Log Message:
perfused(8) creates a /dev/fuse socket and performs PUFFS to FUSE relaying.
This is still a work in progress.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/usr.sbin/perfused/Makefile \
src/usr.sbin/perfused/debug.c src/usr.sbin/perfused/msg.c \
src/usr.sbin/perfused/perfused.8 src/usr.sbin/perfused/perfused.c \
src/usr.sbin/perfused/perfused.h

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

Added files:

Index: src/usr.sbin/perfused/Makefile
diff -u /dev/null src/usr.sbin/perfused/Makefile:1.1
--- /dev/null	Wed Aug 25 07:18:01 2010
+++ src/usr.sbin/perfused/Makefile	Wed Aug 25 07:18:01 2010
@@ -0,0 +1,13 @@
+PROG=perfused
+
+PERFUSE_OPT_DEBUG_FLAGS=   -g -DPERFUSE_DEBUG
+
+CFLAGS=${PERFUSE_OPT_DEBUG_FLAGS}
+SRCS=   perfused.c msg.c debug.c
+MAN=		perfused.8
+WARNS=  4
+
+LDADD+= -lperfuse -lpuffs #-L/usr/pkg/lib -lefence
+DPADD+= ${LIBPUFFS}
+
+.include 
Index: src/usr.sbin/perfused/debug.c
diff -u /dev/null src/usr.sbin/perfused/debug.c:1.1
--- /dev/null	Wed Aug 25 07:18:01 2010
+++ src/usr.sbin/perfused/debug.c	Wed Aug 25 07:18:01 2010
@@ -0,0 +1,74 @@
+/*  $NetBSD: debug.c,v 1.1 2010/08/25 07:18:01 manu Exp $ */
+
+/*-
+ *  Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
+ * 
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ *  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.
+ */ 
+#include 
+#include 
+#include 
+#include 
+
+#include "perfused.h"
+
+#ifdef PERFUSE_DEBUG
+void
+perfuse_hexdump(addr, len)
+	char *addr;
+	size_t len;
+{
+	unsigned int i, j, k;
+
+	for (i = 0; i < len; i += 16) {
+		DPRINTF("%p  ", &addr[i]);
+		for (j = 0; j < 16; j += 4) {
+			for (k = 0; k < 4; k++) {
+if (i + j + k < len) {
+	DPRINTF("%02x ", 
+	   *(addr + i + j + k) & 0xff);
+} else {
+	DPRINTF("   ");
+}
+			}
+		}
+
+		DPRINTF("  ");
+		for (j = 0; j < 16; j++) {
+			char c;
+
+			if (i + j < len) {
+c = *(addr + i + j);
+DPRINTF("%c", isprint((int)c) ? c : '.');
+			} else {
+DPRINTF(" ");
+			}
+		}
+		DPRINTF("\n");
+	}
+
+	return;
+}
+
+
+
+#endif /* PERFUSE_DEBUG */
Index: src/usr.sbin/perfused/msg.c
diff -u /dev/null src/usr.sbin/perfused/msg.c:1.1
--- /dev/null	Wed Aug 25 07:18:01 2010
+++ src/usr.sbin/perfused/msg.c	Wed Aug 25 07:18:01 2010
@@ -0,0 +1,599 @@
+/*  $NetBSD: msg.c,v 1.1 2010/08/25 07:18:01 manu Exp $ */
+
+/*-
+ *  Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
+ * 
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ *  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 SERV