CVS commit: othersrc/bin/fsu_cat
Module Name:othersrc Committed By: wiz Date: Tue Nov 17 08:34:02 UTC 2009 Modified Files: othersrc/bin/fsu_cat: fsu_cat.1 Log Message: New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 othersrc/bin/fsu_cat/fsu_cat.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/bin/fsu_cat/fsu_cat.1 diff -u othersrc/bin/fsu_cat/fsu_cat.1:1.2 othersrc/bin/fsu_cat/fsu_cat.1:1.3 --- othersrc/bin/fsu_cat/fsu_cat.1:1.2 Mon Nov 16 07:22:16 2009 +++ othersrc/bin/fsu_cat/fsu_cat.1 Tue Nov 17 08:34:02 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: fsu_cat.1,v 1.2 2009/11/16 07:22:16 stacktic Exp $ +.\ $NetBSD: fsu_cat.1,v 1.3 2009/11/17 08:34:02 wiz Exp $ .\ from .\ NetBSD: cat.1,v 1.32 2006/09/23 11:24:44 wiz Exp .\ @@ -42,10 +42,10 @@ .Nd concatenate and print files from a file system image through rump .Sh SYNOPSIS .Nm +.Op Fl f .Op Fl o Ar opt_args .Op Fl s Ar fs_spec_args .Op Fl t Ar fstype -.Op Fl f .Ar fsdevice .Op Fl benstv .Op - @@ -53,7 +53,8 @@ .Sh DESCRIPTION The .Nm -utility reads files sequentially, writing them to the standard output. The +utility reads files sequentially, writing them to the standard output. +The .Ar file operands are absolute path in the .Ar fstype
CVS commit: othersrc/bin/fsu_rm
Module Name:othersrc Committed By: wiz Date: Tue Nov 17 08:34:16 UTC 2009 Modified Files: othersrc/bin/fsu_rm: fsu_rm.1 Log Message: Sort sections. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 othersrc/bin/fsu_rm/fsu_rm.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/bin/fsu_rm/fsu_rm.1 diff -u othersrc/bin/fsu_rm/fsu_rm.1:1.2 othersrc/bin/fsu_rm/fsu_rm.1:1.3 --- othersrc/bin/fsu_rm/fsu_rm.1:1.2 Mon Nov 16 07:22:17 2009 +++ othersrc/bin/fsu_rm/fsu_rm.1 Tue Nov 17 08:34:16 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: fsu_rm.1,v 1.2 2009/11/16 07:22:17 stacktic Exp $ +.\ $NetBSD: fsu_rm.1,v 1.3 2009/11/17 08:34:16 wiz Exp $ .\ from .\ NetBSD: rm.1,v 1.24 2006/09/02 23:28:32 wiz Exp .\ @@ -159,24 +159,6 @@ .Xr fts 3 , .Xr getopt 3 , .Xr symlink 7 -.Sh BUGS -The -.Fl P -option assumes that the underlying file system is a fixed-block file -system. -FFS is a fixed-block file system, LFS is not. -In addition, only regular files are overwritten, other types of files -are not. -Recent research indicates that as many as 35 overwrite passes with -carefully chosen data patterns may be necessary to actually prevent -recovery of data from a magnetic disk. -Thus the -.Fl P -option is likely both insufficient for its design purpose and far -too costly for default operation. -However, it will at least prevent the recovery of data from FFS -volumes with -.Xr fsdb 8 . .Sh COMPATIBILITY The .Nm @@ -212,3 +194,21 @@ .Em Because these requirements are not met, the .Fl P .Em option does not conform to the standard . +.Sh BUGS +The +.Fl P +option assumes that the underlying file system is a fixed-block file +system. +FFS is a fixed-block file system, LFS is not. +In addition, only regular files are overwritten, other types of files +are not. +Recent research indicates that as many as 35 overwrite passes with +carefully chosen data patterns may be necessary to actually prevent +recovery of data from a magnetic disk. +Thus the +.Fl P +option is likely both insufficient for its design purpose and far +too costly for default operation. +However, it will at least prevent the recovery of data from FFS +volumes with +.Xr fsdb 8 .
CVS commit: src/sys/kern
Module Name:src Committed By: pooka Date: Tue Nov 17 14:38:31 UTC 2009 Modified Files: src/sys/kern: vfs_bio.c Log Message: Add a comment saying name to pool_init() is never freed (fixing requires touching pool implementation). No biggie, though, since the pools themselves are never freed. To generate a diff of this commit: cvs rdiff -u -r1.221 -r1.222 src/sys/kern/vfs_bio.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_bio.c diff -u src/sys/kern/vfs_bio.c:1.221 src/sys/kern/vfs_bio.c:1.222 --- src/sys/kern/vfs_bio.c:1.221 Wed Nov 11 09:15:42 2009 +++ src/sys/kern/vfs_bio.c Tue Nov 17 14:38:31 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_bio.c,v 1.221 2009/11/11 09:15:42 rmind Exp $ */ +/* $NetBSD: vfs_bio.c,v 1.222 2009/11/17 14:38:31 pooka Exp $ */ /*- * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -123,7 +123,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vfs_bio.c,v 1.221 2009/11/11 09:15:42 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: vfs_bio.c,v 1.222 2009/11/17 14:38:31 pooka Exp $); #include fs_ffs.h #include opt_bufcache.h @@ -492,7 +492,7 @@ struct pool_allocator *pa; struct pool *pp = bmempools[i]; u_int size = 1 (i + MEMPOOL_INDEX_OFFSET); - char *name = kmem_alloc(8, KM_SLEEP); + char *name = kmem_alloc(8, KM_SLEEP); /* XXX: never freed */ if (__predict_true(size = 1024)) (void)snprintf(name, 8, buf%dk, size / 1024); else
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: wiz Date: Tue Nov 17 14:52:21 UTC 2009 Modified Files: src/lib/libc/stdlib: getsubopt.3 Log Message: Mention that getsubopt is an XSI extension for IEEE Std 1003.1, 2004 Edition. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/libc/stdlib/getsubopt.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/stdlib/getsubopt.3 diff -u src/lib/libc/stdlib/getsubopt.3:1.12 src/lib/libc/stdlib/getsubopt.3:1.13 --- src/lib/libc/stdlib/getsubopt.3:1.12 Mon Oct 19 22:38:56 2009 +++ src/lib/libc/stdlib/getsubopt.3 Tue Nov 17 14:52:21 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: getsubopt.3,v 1.12 2009/10/19 22:38:56 joerg Exp $ +.\ $NetBSD: getsubopt.3,v 1.13 2009/11/17 14:52:21 wiz Exp $ .\ .\ Copyright (c) 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)getsubopt.3 8.1 (Berkeley) 6/9/93 .\ -.Dd October 19, 2009 +.Dd November 17, 2009 .Dt GETSUBOPT 3 .Os .Sh NAME @@ -143,4 +143,6 @@ The .Fn getsubopt function first appeared in -.Bx 4.4 . +.Bx 4.4 , +and is included as an XSI extension in +.St -p1003.1-2004 .
CVS commit: src/gnu/dist/groff/tmac
Module Name:src Committed By: wiz Date: Tue Nov 17 15:01:26 UTC 2009 Modified Files: src/gnu/dist/groff/tmac: groff_mdoc.man Log Message: Mention IEEE Std 1003.1-2008. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/gnu/dist/groff/tmac/groff_mdoc.man Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/groff/tmac/groff_mdoc.man diff -u src/gnu/dist/groff/tmac/groff_mdoc.man:1.11 src/gnu/dist/groff/tmac/groff_mdoc.man:1.12 --- src/gnu/dist/groff/tmac/groff_mdoc.man:1.11 Sun Oct 25 18:33:36 2009 +++ src/gnu/dist/groff/tmac/groff_mdoc.man Tue Nov 17 15:01:26 2009 @@ -44,7 +44,7 @@ .\ for an already extremely slow package. .\ . -.Dd August 28, 2005 +.Dd November 17, 2009 .Os .Dt GROFF_MDOC 7 . @@ -1967,6 +1967,8 @@ .St -p1003.1-2001 .It Li -p1003.1-2004 .St -p1003.1-2004 +.It Li -p1003.1-2008 +.St -p1003.1-2008 .El .Pp .
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: wiz Date: Tue Nov 17 15:02:08 UTC 2009 Modified Files: src/lib/libc/stdlib: getsubopt.3 Log Message: Mention that it is included in IEEE Std 1003.1-2008. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/lib/libc/stdlib/getsubopt.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/stdlib/getsubopt.3 diff -u src/lib/libc/stdlib/getsubopt.3:1.13 src/lib/libc/stdlib/getsubopt.3:1.14 --- src/lib/libc/stdlib/getsubopt.3:1.13 Tue Nov 17 14:52:21 2009 +++ src/lib/libc/stdlib/getsubopt.3 Tue Nov 17 15:02:08 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: getsubopt.3,v 1.13 2009/11/17 14:52:21 wiz Exp $ +.\ $NetBSD: getsubopt.3,v 1.14 2009/11/17 15:02:08 wiz Exp $ .\ .\ Copyright (c) 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -144,5 +144,5 @@ .Fn getsubopt function first appeared in .Bx 4.4 , -and is included as an XSI extension in -.St -p1003.1-2004 . +and is included in +.St -p1003.1-2008 .
CVS commit: othersrc/lib/libfsu_utils
Module Name:othersrc
Committed By: stacktic
Date: Tue Nov 17 15:10:13 UTC 2009
Modified Files:
othersrc/lib/libfsu_utils: fsu_dir.c
Log Message:
Fixed fsu_getcwd
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 othersrc/lib/libfsu_utils/fsu_dir.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/lib/libfsu_utils/fsu_dir.c
diff -u othersrc/lib/libfsu_utils/fsu_dir.c:1.4 othersrc/lib/libfsu_utils/fsu_dir.c:1.5
--- othersrc/lib/libfsu_utils/fsu_dir.c:1.4 Thu Nov 5 14:02:43 2009
+++ othersrc/lib/libfsu_utils/fsu_dir.c Tue Nov 17 15:10:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fsu_dir.c,v 1.4 2009/11/05 14:02:43 stacktic Exp $ */
+/* $NetBSD: fsu_dir.c,v 1.5 2009/11/17 15:10:13 stacktic Exp $ */
/*
* Copyright (c) 2008,2009 Arnaud Ysmal. All Rights Reserved.
@@ -242,10 +242,14 @@
if (dirname == NULL)
goto err;
-dirname[0] = '\0';
- for (; i = 0; --i) {
- strlcat(dirname, names[i], len);
+dirname[0] = '/';
+ dirname[1] = '\0';
+ free(names[0]);
+ for (--i; i = 0; --i) {
+ rv = strlcat(dirname, names[i], len);
free(names[i]);
+ dirname[rv] = '/';
+ dirname[rv + 1] = '\0';
}
free(names);
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Tue Nov 17 15:23:42 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: sleepq.c
Log Message:
init global cv only once
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpkern/sleepq.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/rumpkern/sleepq.c
diff -u src/sys/rump/librump/rumpkern/sleepq.c:1.5 src/sys/rump/librump/rumpkern/sleepq.c:1.6
--- src/sys/rump/librump/rumpkern/sleepq.c:1.5 Wed Oct 21 23:13:53 2009
+++ src/sys/rump/librump/rumpkern/sleepq.c Tue Nov 17 15:23:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sleepq.c,v 1.5 2009/10/21 23:13:53 rmind Exp $ */
+/* $NetBSD: sleepq.c,v 1.6 2009/11/17 15:23:42 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -26,11 +26,12 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sleepq.c,v 1.5 2009/10/21 23:13:53 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: sleepq.c,v 1.6 2009/11/17 15:23:42 pooka Exp $);
#include sys/param.h
#include sys/condvar.h
#include sys/mutex.h
+#include sys/once.h
#include sys/queue.h
#include sys/sleepq.h
#include sys/syncobj.h
@@ -46,13 +47,23 @@
syncobj_t sleep_syncobj;
static kcondvar_t sq_cv;
+static int
+sqinit1(void)
+{
+
+ cv_init(sq_cv, sleepq);
+
+ return 0;
+}
+
void
sleepq_init(sleepq_t *sq)
{
+ ONCE_DECL(sqctl);
- TAILQ_INIT(sq);
+ RUN_ONCE(sqctl, sqinit1);
- cv_init(sq_cv, sleepq); /* XXX */
+ TAILQ_INIT(sq);
}
void
CVS commit: othersrc/bin/fsu_ecp
Module Name:othersrc
Committed By: stacktic
Date: Tue Nov 17 15:27:39 UTC 2009
Modified Files:
othersrc/bin/fsu_ecp: fsu_ecp.c
Log Message:
Fixed fsu_ecp when source is '/'
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 othersrc/bin/fsu_ecp/fsu_ecp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/bin/fsu_ecp/fsu_ecp.c
diff -u othersrc/bin/fsu_ecp/fsu_ecp.c:1.10 othersrc/bin/fsu_ecp/fsu_ecp.c:1.11
--- othersrc/bin/fsu_ecp/fsu_ecp.c:1.10 Fri Nov 6 11:47:41 2009
+++ othersrc/bin/fsu_ecp/fsu_ecp.c Tue Nov 17 15:27:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fsu_ecp.c,v 1.10 2009/11/06 11:47:41 stacktic Exp $ */
+/* $NetBSD: fsu_ecp.c,v 1.11 2009/11/17 15:27:39 stacktic Exp $ */
/*
* Copyright (c) 2008 Arnaud Ysmal. All Rights Reserved.
@@ -102,8 +102,8 @@
for (rv = 0, cur_arg = 0; cur_arg argc-1; ++cur_arg) {
len = strlen(argv[cur_arg]);
- while (argv[cur_arg][--len] == '/')
- argv[cur_arg][len] = '\0';
+ while (len != 1 argv[cur_arg][len - 1] == '/')
+ argv[cur_arg][--len] = '\0';
rv |= fsu_ecp(ukfs, argv[cur_arg], argv[argc-1], flags);
}
@@ -208,6 +208,8 @@
warn(%s, to);
return -1;
}
+ if (to_p[tlen - 1] != '/')
+ to_p[tlen++] = '/';
if (flags FSU_ECP_GET)
rv = lstat(to, file_stat);
@@ -221,13 +223,6 @@
else
++filename;
- if (to_p[tlen - 1] == '/')
---tlen;
- else if (to_p[tlen - 1] != '/' filename[0] != '/') {
- to_p[tlen] = '/';
- to_p[tlen + 1] = '\0';
- }
-
flen = strlen(filename);
rv = strlcat(to_p, filename, PATH_MAX + 1);
@@ -485,10 +480,7 @@
/* NOTREACHED */
}
- if (rv != 0)
- return -1;
-
- if (flags FSU_ECP_GET)
+ if (rv != 0 || flags FSU_ECP_GET)
return rv;
if (!(flags FSU_ECP_NO_COPY_LINK))
@@ -578,7 +570,7 @@
struct stat file_stat;
if (flags FSU_ECP_VERBOSE)
- printf(Copying fifo %s - %s\n, from, to);
+ printf(%s - %s\n, from, to);
if (flags FSU_ECP_GET)
rv = lstat(to, file_stat);
@@ -676,7 +668,7 @@
target[rv] = '\0';
if (flags FSU_ECP_VERBOSE)
- printf(%s - %s : %s, from, to, target);
+ printf(%s - %s : %s\n, from, to, target);
if (flags FSU_ECP_GET)
rv = lstat(to, file_stat);
CVS commit: src/sys/rump/librump
Module Name:src Committed By: pooka Date: Tue Nov 17 15:36:28 UTC 2009 Modified Files: src/sys/rump/librump: Makefile Log Message: Don't build rumpuser if NORUMPUSER is set. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/rump/librump/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/rump/librump/Makefile diff -u src/sys/rump/librump/Makefile:1.6 src/sys/rump/librump/Makefile:1.7 --- src/sys/rump/librump/Makefile:1.6 Thu Sep 3 15:35:58 2009 +++ src/sys/rump/librump/Makefile Tue Nov 17 15:36:28 2009 @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2009/09/03 15:35:58 pooka Exp $ +# $NetBSD: Makefile,v 1.7 2009/11/17 15:36:28 pooka Exp $ # SUBDIR= rumpkern +.if !defined(NORUMPUSER) SUBDIR+= rumpuser +.endif SUBDIR+= rumpcrypto rumpdev rumpnet rumpvfs
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Tue Nov 17 16:17:06 UTC 2009
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
Don't link rump kernel libs against libc. They have no host system
dependencies apart from indirect ones via rumpuser.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/rump/Makefile.rump
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/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.41 src/sys/rump/Makefile.rump:1.42
--- src/sys/rump/Makefile.rump:1.41 Sun Sep 13 22:51:41 2009
+++ src/sys/rump/Makefile.rump Tue Nov 17 16:17:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.41 2009/09/13 22:51:41 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.42 2009/11/17 16:17:06 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -26,6 +26,9 @@
CPPFLAGS+= -nostdinc -I${RUMPTOP}/..
#CPPFLAGS+= -DDEBUG
+# kernel libs should not get linked against libc
+LDFLAGS+= -nodefaultlibs
+
# make sure __NetBSD__ gets defined (for builds on non-NetBSD)
CPPFLAGS+= -D__NetBSD__
CVS commit: src/share/man/man4
Module Name:src Committed By: dyoung Date: Tue Nov 17 17:54:15 UTC 2009 Modified Files: src/share/man/man4: options.4 Log Message: Describe 'options SPLDEBUG'. To generate a diff of this commit: cvs rdiff -u -r1.380 -r1.381 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/options.4 diff -u src/share/man/man4/options.4:1.380 src/share/man/man4/options.4:1.381 --- src/share/man/man4/options.4:1.380 Wed Jun 24 23:10:02 2009 +++ src/share/man/man4/options.4 Tue Nov 17 17:54:14 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: options.4,v 1.380 2009/06/24 23:10:02 zafer Exp $ +.\ $NetBSD: options.4,v 1.381 2009/11/17 17:54:14 dyoung Exp $ .\ .\ Copyright (c) 1996 .\ Perry E. Metzger. All rights reserved. @@ -30,7 +30,7 @@ .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ .\ -.Dd April 10, 2009 +.Dd November 17, 2009 .Dt OPTIONS 4 .Os .Sh NAME @@ -1168,6 +1168,22 @@ and .Xr vnconfig 8 for more information. +.It Cd options SPLDEBUG +Help the kernel programmer find bugs related to the interrupt priority +level. +When +.Fn spllower +or +.Fn splraise +changes the current CPU's interrupt priority level to or from +.Dv IPL_HIGH , +record a backtrace. +Read +.Xr return_address 9 +for caveats about collecting backtraces. +This feature is experimental, and it is only available on i386. +See +.Pa sys/kern/subr_spldebug.c . .It Cd options TFTPROOT Download the root memory disk through TFTP at root mount time. This enables the use of a root
CVS commit: src/usr.bin
Module Name:src
Committed By: drochner
Date: Tue Nov 17 18:31:13 UTC 2009
Modified Files:
src/usr.bin/locate/bigram: locate.bigram.c
src/usr.bin/mkstr: mkstr.c
src/usr.bin/rpcinfo: rpcinfo.c
src/usr.bin/xstr: xstr.c
Log Message:
ANSIfy, sprinkle const in some obvious cases
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/locate/bigram/locate.bigram.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/mkstr/mkstr.c
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/rpcinfo/rpcinfo.c
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/xstr/xstr.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/locate/bigram/locate.bigram.c
diff -u src/usr.bin/locate/bigram/locate.bigram.c:1.11 src/usr.bin/locate/bigram/locate.bigram.c:1.12
--- src/usr.bin/locate/bigram/locate.bigram.c:1.11 Mon Jul 21 14:19:23 2008
+++ src/usr.bin/locate/bigram/locate.bigram.c Tue Nov 17 18:31:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locate.bigram.c,v 1.11 2008/07/21 14:19:23 lukem Exp $ */
+/* $NetBSD: locate.bigram.c,v 1.12 2009/11/17 18:31:12 drochner Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)locate.bigram.c 8.2 (Berkeley) 4/28/95;
#endif
-__RCSID($NetBSD: locate.bigram.c,v 1.11 2008/07/21 14:19:23 lukem Exp $);
+__RCSID($NetBSD: locate.bigram.c,v 1.12 2009/11/17 18:31:12 drochner Exp $);
#endif /* not lint */
/*
@@ -57,9 +57,9 @@
#include string.h
#include sys/param.h /* for MAXPATHLEN */
-int main __P((int, char **));
-static int compare_bigrams __P((const void *, const void *));
-static void add_bigram __P((u_char, u_char));
+int main(int, char **);
+static int compare_bigrams(const void *, const void *);
+static void add_bigram(u_char, u_char);
static char buf1[MAXPATHLEN] = ;
static char buf2[MAXPATHLEN];
@@ -72,16 +72,14 @@
struct bigram bigrams[256 * 256];
static void
-add_bigram(i1, i2)
- u_char i1, i2;
+add_bigram(u_char i1, u_char i2)
{
if (i1 != '\n' i2 != '\n')
bigrams[(i18)+i2].count++;
}
static int
-compare_bigrams(item1, item2)
- const void *item1, *item2;
+compare_bigrams(const void *item1, const void *item2)
{
const struct bigram *it1=item1, *it2=item2;
@@ -94,9 +92,7 @@
}
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
char *cp;
char *oldpath = buf1, *path = buf2;
Index: src/usr.bin/mkstr/mkstr.c
diff -u src/usr.bin/mkstr/mkstr.c:1.14 src/usr.bin/mkstr/mkstr.c:1.15
--- src/usr.bin/mkstr/mkstr.c:1.14 Mon Apr 13 00:41:28 2009
+++ src/usr.bin/mkstr/mkstr.c Tue Nov 17 18:31:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mkstr.c,v 1.14 2009/04/13 00:41:28 lukem Exp $ */
+/* $NetBSD: mkstr.c,v 1.15 2009/11/17 18:31:13 drochner Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)mkstr.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: mkstr.c,v 1.14 2009/04/13 00:41:28 lukem Exp $);
+__RCSID($NetBSD: mkstr.c,v 1.15 2009/11/17 18:31:13 drochner Exp $);
#endif
#endif /* not lint */
@@ -81,19 +81,17 @@
const char usagestr[] = usage: %s [ - ] mesgfile prefix file ...\n;
char name[100], *np;
-void process __P((void));
-int main __P((int, char **));
-int match __P((const char *));
-int octdigit __P((char));
-void inithash __P((void));
-long hashit __P((char *, char, long));
-void copystr __P((void));
-int fgetNUL __P((char *, int, FILE *));
+void process(void);
+int main(int, char **);
+int match(const char *);
+int octdigit(char);
+void inithash(void);
+long hashit(const char *, char, long);
+void copystr(void);
+int fgetNUL(char *, int, FILE *);
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
char addon = 0;
@@ -150,8 +148,7 @@
}
int
-match(ocp)
- const char *ocp;
+match(const char *ocp)
{
const char *cp;
int c;
@@ -233,8 +230,7 @@
}
int
-octdigit(c)
- char c;
+octdigit(char c)
{
return (c = '0' c = '7');
@@ -262,16 +258,13 @@
} *bucket[NBUCKETS];
long
-hashit(str, really, fakept)
- char *str;
- char really;
- long fakept;
+hashit(const char *str, char really, long fakept)
{
int i;
struct hash *hp;
char buf[512];
long hashval = 0;
- char *cp;
+ const char *cp;
#ifdef __GNUC__
hp = NULL; /* XXX gcc */
@@ -315,10 +308,7 @@
#include sys/stat.h
int
-fgetNUL(obuf, rmdr, file)
- char *obuf;
- int rmdr;
- FILE *file;
+fgetNUL(char *obuf, int rmdr, FILE *file)
{
int c;
char *buf = obuf;
Index: src/usr.bin/rpcinfo/rpcinfo.c
diff -u src/usr.bin/rpcinfo/rpcinfo.c:1.28 src/usr.bin/rpcinfo/rpcinfo.c:1.29
--- src/usr.bin/rpcinfo/rpcinfo.c:1.28 Mon Apr 13 07:04:54 2009
+++ src/usr.bin/rpcinfo/rpcinfo.c Tue Nov 17 18:31:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcinfo.c,v 1.28 2009/04/13 07:04:54 lukem Exp $ */
+/* $NetBSD: rpcinfo.c,v 1.29 2009/11/17 18:31:13 drochner Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
CVS commit: src/usr.sbin
Module Name:src
Committed By: drochner
Date: Tue Nov 17 18:37:45 UTC 2009
Modified Files:
src/usr.sbin/rpc.pcnfsd: pcnfsd_misc.c
src/usr.sbin/sa: main.c
src/usr.sbin/sesd/srcs: eltsub.c
Log Message:
ANSIfy partially
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/rpc.pcnfsd/pcnfsd_misc.c
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/sa/main.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sesd/srcs/eltsub.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/rpc.pcnfsd/pcnfsd_misc.c
diff -u src/usr.sbin/rpc.pcnfsd/pcnfsd_misc.c:1.11 src/usr.sbin/rpc.pcnfsd/pcnfsd_misc.c:1.12
--- src/usr.sbin/rpc.pcnfsd/pcnfsd_misc.c:1.11 Tue Sep 30 05:20:42 2008
+++ src/usr.sbin/rpc.pcnfsd/pcnfsd_misc.c Tue Nov 17 18:37:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pcnfsd_misc.c,v 1.11 2008/09/30 05:20:42 dholland Exp $ */
+/* $NetBSD: pcnfsd_misc.c,v 1.12 2009/11/17 18:37:45 drochner Exp $ */
/* RE_SID: @(%)/usr/dosnfs/shades_SCCS/unix/pcnfsd/v2/src/SCCS/s.pcnfsd_misc.c 1.5 92/01/24 19:59:13 SMI */
/*
@@ -192,10 +192,7 @@
char *
-mapfont(f, i, b)
- charf;
- chari;
- charb;
+mapfont(char f, char i, char b)
{
static char fontname[64];
Index: src/usr.sbin/sa/main.c
diff -u src/usr.sbin/sa/main.c:1.24 src/usr.sbin/sa/main.c:1.25
--- src/usr.sbin/sa/main.c:1.24 Tue Apr 28 08:32:56 2009
+++ src/usr.sbin/sa/main.c Tue Nov 17 18:37:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.24 2009/04/28 08:32:56 lukem Exp $ */
+/* $NetBSD: main.c,v 1.25 2009/11/17 18:37:45 drochner Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -39,7 +39,7 @@
__COPYRIGHT(@(#) Copyright (c) 1994\
Christopher G. Demetriou. All rights reserved.);
-__RCSID($NetBSD: main.c,v 1.24 2009/04/28 08:32:56 lukem Exp $);
+__RCSID($NetBSD: main.c,v 1.25 2009/11/17 18:37:45 drochner Exp $);
#endif
/*
@@ -373,8 +373,7 @@
}
static u_quad_t
-decode_comp_t(comp)
- comp_t comp;
+decode_comp_t(comp_t comp)
{
u_quad_t rv;
Index: src/usr.sbin/sesd/srcs/eltsub.c
diff -u src/usr.sbin/sesd/srcs/eltsub.c:1.2 src/usr.sbin/sesd/srcs/eltsub.c:1.3
--- src/usr.sbin/sesd/srcs/eltsub.c:1.2 Tue Feb 22 06:06:07 2000
+++ src/usr.sbin/sesd/srcs/eltsub.c Tue Nov 17 18:37:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: eltsub.c,v 1.2 2000/02/22 06:06:07 mjacob Exp $ */
+/* $NetBSD: eltsub.c,v 1.3 2009/11/17 18:37:45 drochner Exp $ */
/* $FreeBSD: $ */
/* $OpenBSD: $ */
/*
@@ -122,8 +122,7 @@
}
static char *
-scode2ascii(code)
- u_char code;
+scode2ascii(u_char code)
{
static char rbuf[32];
switch (code 0xf) {
CVS commit: src
Module Name:src Committed By: skrll Date: Tue Nov 17 18:44:33 UTC 2009 Modified Files: src/libexec/ld.elf_so: rtld.c rtld.h src/usr.bin/ldd: ldd.c Log Message: Make _rtld_pagesz of type size_t. Fixes round_down for alpha which made ldd(1) break. To generate a diff of this commit: cvs rdiff -u -r1.125 -r1.126 src/libexec/ld.elf_so/rtld.c cvs rdiff -u -r1.81 -r1.82 src/libexec/ld.elf_so/rtld.h cvs rdiff -u -r1.10 -r1.11 src/usr.bin/ldd/ldd.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/rtld.c diff -u src/libexec/ld.elf_so/rtld.c:1.125 src/libexec/ld.elf_so/rtld.c:1.126 --- src/libexec/ld.elf_so/rtld.c:1.125 Thu Sep 24 21:21:34 2009 +++ src/libexec/ld.elf_so/rtld.c Tue Nov 17 18:44:33 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rtld.c,v 1.125 2009/09/24 21:21:34 pooka Exp $ */ +/* $NetBSD: rtld.c,v 1.126 2009/11/17 18:44:33 skrll Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -40,7 +40,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: rtld.c,v 1.125 2009/09/24 21:21:34 pooka Exp $); +__RCSID($NetBSD: rtld.c,v 1.126 2009/11/17 18:44:33 skrll Exp $); #endif /* not lint */ #include err.h @@ -92,7 +92,7 @@ .st_info = ELF_ST_INFO(STB_GLOBAL, STT_NOTYPE), .st_shndx = SHN_ABS, }; -unsigned int _rtld_pagesz; /* Page size, as provided by kernel */ +size_t _rtld_pagesz; /* Page size, as provided by kernel */ Search_Path*_rtld_default_paths; Search_Path*_rtld_paths; Index: src/libexec/ld.elf_so/rtld.h diff -u src/libexec/ld.elf_so/rtld.h:1.81 src/libexec/ld.elf_so/rtld.h:1.82 --- src/libexec/ld.elf_so/rtld.h:1.81 Thu Sep 24 21:21:34 2009 +++ src/libexec/ld.elf_so/rtld.h Tue Nov 17 18:44:33 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rtld.h,v 1.81 2009/09/24 21:21:34 pooka Exp $ */ +/* $NetBSD: rtld.h,v 1.82 2009/11/17 18:44:33 skrll Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -51,7 +51,7 @@ #endif #define _PATH_LD_HINTS /etc/ld.so.conf -extern unsigned int _rtld_pagesz; +extern size_t _rtld_pagesz; #define round_down(x) ((x) ~(_rtld_pagesz - 1)) #define round_up(x) round_down((x) + _rtld_pagesz - 1) Index: src/usr.bin/ldd/ldd.c diff -u src/usr.bin/ldd/ldd.c:1.10 src/usr.bin/ldd/ldd.c:1.11 --- src/usr.bin/ldd/ldd.c:1.10 Mon Sep 7 17:56:52 2009 +++ src/usr.bin/ldd/ldd.c Tue Nov 17 18:44:33 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ldd.c,v 1.10 2009/09/07 17:56:52 dholland Exp $ */ +/* $NetBSD: ldd.c,v 1.11 2009/11/17 18:44:33 skrll Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: ldd.c,v 1.10 2009/09/07 17:56:52 dholland Exp $); +__RCSID($NetBSD: ldd.c,v 1.11 2009/11/17 18:44:33 skrll Exp $); #endif /* not lint */ #include sys/types.h @@ -93,7 +93,7 @@ Obj_Entry **_rtld_objtail = _rtld_objlist; /* Link field of last object in list */ Obj_Entry *_rtld_objmain; /* The main program shared object */ -unsigned int _rtld_pagesz; +size_t _rtld_pagesz; Search_Path *_rtld_default_paths; Search_Path *_rtld_paths;
CVS commit: src/usr.sbin/mopd
Module Name:src
Committed By: drochner
Date: Tue Nov 17 18:58:07 UTC 2009
Modified Files:
src/usr.sbin/mopd/common: cmp.c cmp.h common.h device.c device.h dl.c
dl.h get.c get.h pf.c pf.h print.c print.h put.c put.h rc.c rc.h
src/usr.sbin/mopd/mopd: mopd.c process.c process.h
Log Message:
ANSIfy, sprinkle const
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/mopd/common/cmp.c \
src/usr.sbin/mopd/common/get.h
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/mopd/common/cmp.h \
src/usr.sbin/mopd/common/device.h src/usr.sbin/mopd/common/dl.h \
src/usr.sbin/mopd/common/get.c src/usr.sbin/mopd/common/pf.h \
src/usr.sbin/mopd/common/print.c src/usr.sbin/mopd/common/print.h \
src/usr.sbin/mopd/common/put.c src/usr.sbin/mopd/common/put.h \
src/usr.sbin/mopd/common/rc.c src/usr.sbin/mopd/common/rc.h
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/mopd/common/common.h
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/mopd/common/device.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/mopd/common/dl.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/mopd/common/pf.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/mopd/mopd/mopd.c
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/mopd/mopd/process.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/mopd/mopd/process.h
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/mopd/common/cmp.c
diff -u src/usr.sbin/mopd/common/cmp.c:1.4 src/usr.sbin/mopd/common/cmp.c:1.5
--- src/usr.sbin/mopd/common/cmp.c:1.4 Tue Oct 20 00:51:13 2009
+++ src/usr.sbin/mopd/common/cmp.c Tue Nov 17 18:58:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cmp.c,v 1.4 2009/10/20 00:51:13 snj Exp $ */
+/* $NetBSD: cmp.c,v 1.5 2009/11/17 18:58:07 drochner Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -26,15 +26,14 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: cmp.c,v 1.4 2009/10/20 00:51:13 snj Exp $);
+__RCSID($NetBSD: cmp.c,v 1.5 2009/11/17 18:58:07 drochner Exp $);
#endif
#include os.h
#include cmp.h
int
-mopCmpEAddr(addr1, addr2)
- u_char *addr1, *addr2;
+mopCmpEAddr(const u_char *addr1, const u_char *addr2)
{
-return(memcmp((char *)addr1, (char *)addr2, 6));
+return(memcmp(addr1, addr2, 6));
}
Index: src/usr.sbin/mopd/common/get.h
diff -u src/usr.sbin/mopd/common/get.h:1.4 src/usr.sbin/mopd/common/get.h:1.5
--- src/usr.sbin/mopd/common/get.h:1.4 Tue Oct 20 00:51:13 2009
+++ src/usr.sbin/mopd/common/get.h Tue Nov 17 18:58:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: get.h,v 1.4 2009/10/20 00:51:13 snj Exp $ */
+/* $NetBSD: get.h,v 1.5 2009/11/17 18:58:07 drochner Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $NetBSD: get.h,v 1.4 2009/10/20 00:51:13 snj Exp $
+ * $NetBSD: get.h,v 1.5 2009/11/17 18:58:07 drochner Exp $
*
*/
@@ -31,14 +31,14 @@
#define _GET_H_
__BEGIN_DECLS
-u_char mopGetChar __P((u_char *, int *));
-u_short mopGetShort __P((u_char *, int *));
-u_int32_t mopGetLong __P((u_char *, int *));
-void mopGetMulti __P((u_char *, int *, u_char *, int));
-int mopGetTrans __P((u_char *, int));
-void mopGetHeader __P((u_char *, int *, u_char **, u_char **,
+u_char mopGetChar __P((const u_char *, int *));
+u_short mopGetShort __P((const u_char *, int *));
+u_int32_t mopGetLong __P((const u_char *, int *));
+void mopGetMulti __P((const u_char *, int *, u_char *, int));
+int mopGetTrans __P((const u_char *, int));
+void mopGetHeader __P((const u_char *, int *, const u_char **, const u_char **,
u_short *, int *, int));
-u_short mopGetLength __P((u_char *, int));
+u_short mopGetLength __P((const u_char *, int));
__END_DECLS
#endif /* _GET_H_ */
Index: src/usr.sbin/mopd/common/cmp.h
diff -u src/usr.sbin/mopd/common/cmp.h:1.5 src/usr.sbin/mopd/common/cmp.h:1.6
--- src/usr.sbin/mopd/common/cmp.h:1.5 Tue Oct 20 00:51:13 2009
+++ src/usr.sbin/mopd/common/cmp.h Tue Nov 17 18:58:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cmp.h,v 1.5 2009/10/20 00:51:13 snj Exp $ */
+/* $NetBSD: cmp.h,v 1.6 2009/11/17 18:58:07 drochner Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $NetBSD: cmp.h,v 1.5 2009/10/20 00:51:13 snj Exp $
+ * $NetBSD: cmp.h,v 1.6 2009/11/17 18:58:07 drochner Exp $
*
*/
@@ -31,7 +31,7 @@
#define _CMP_H_
__BEGIN_DECLS
-int mopCmpEAddr __P((u_char *, u_char *));
+int mopCmpEAddr __P((const u_char *, const u_char *));
__END_DECLS
#endif /* _CMP_H_ */
Index: src/usr.sbin/mopd/common/device.h
diff -u src/usr.sbin/mopd/common/device.h:1.5 src/usr.sbin/mopd/common/device.h:1.6
---
CVS commit: src/sbin/raidctl
Module Name:src Committed By: jld Date: Tue Nov 17 19:09:38 UTC 2009 Modified Files: src/sbin/raidctl: raidctl.8 Log Message: Bump date; also fix typo pointed out by s...@. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sbin/raidctl/raidctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/raidctl/raidctl.8 diff -u src/sbin/raidctl/raidctl.8:1.57 src/sbin/raidctl/raidctl.8:1.58 --- src/sbin/raidctl/raidctl.8:1.57 Tue Nov 17 18:54:26 2009 +++ src/sbin/raidctl/raidctl.8 Tue Nov 17 19:09:38 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: raidctl.8,v 1.57 2009/11/17 18:54:26 jld Exp $ +.\ $NetBSD: raidctl.8,v 1.58 2009/11/17 19:09:38 jld Exp $ .\ .\ Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -53,7 +53,7 @@ .\ any improvements or extensions that they make and grant Carnegie the .\ rights to redistribute these changes. .\ -.Dd August 26, 2008 +.Dd November 17, 2009 .Dt RAIDCTL 8 .Os .Sh NAME @@ -1444,7 +1444,7 @@ Since there are 4 data sectors per stripe, the maximum data per stripe is 64 blocks (32K) or 128 blocks (64K). Again, empirical measurement will provide the best indicators of which -values will yeild better performance. +values will yield better performance. .Pp The parameters used for the file system are also critical to good performance. For
CVS commit: src/doc
Module Name:src Committed By: jld Date: Tue Nov 17 19:19:21 UTC 2009 Modified Files: src/doc: CHANGES Log Message: Note RAIDframe parity map commit. To generate a diff of this commit: cvs rdiff -u -r1.1316 -r1.1317 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.1316 src/doc/CHANGES:1.1317 --- src/doc/CHANGES:1.1316 Tue Nov 10 23:16:20 2009 +++ src/doc/CHANGES Tue Nov 17 19:19:21 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1316 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1317 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -437,3 +437,6 @@ xf86-video-igs: an Xorg driver for IGS CyberPro 20x0 graphics controllers, currently only for rev. 5 sharks [macallan 20091110] + raid(4): RAIDframe parity maps, which greatly improve parity rewrite + times after unclean shutdown; jld's GSoC 2009 project. + [jld 20091117]
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Tue Nov 17 19:34:29 UTC 2009 Modified Files: src/share/man/man9: spl.9 Log Message: Remove trailing space. Remove unnecessary Pp before Sh. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/share/man/man9/spl.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/spl.9 diff -u src/share/man/man9/spl.9:1.35 src/share/man/man9/spl.9:1.36 --- src/share/man/man9/spl.9:1.35 Tue Nov 17 18:36:07 2009 +++ src/share/man/man9/spl.9 Tue Nov 17 19:34:29 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: spl.9,v 1.35 2009/11/17 18:36:07 dyoung Exp $ +.\ $NetBSD: spl.9,v 1.36 2009/11/17 19:34:29 wiz Exp $ .\ .\ Copyright (c) 2000, 2001 Jason R. Thorpe. All rights reserved. .\ Copyright (c) 1997 Michael Long. @@ -237,11 +237,10 @@ .Fa s is greater than the current level, and returns the previous level. Otherwise, it does not change the level, and it returns the current level. -Except in extraordinary circumstances, +Except in extraordinary circumstances, do not use .Fn splraise . Use one of the priority-raising functions above, instead. -.Pp .Sh SEE ALSO .Xr condvar 9 , .Xr mutex 9 ,
CVS commit: src/sbin/raidctl
Module Name:src Committed By: wiz Date: Tue Nov 17 19:35:48 UTC 2009 Modified Files: src/sbin/raidctl: raidctl.8 Log Message: Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sbin/raidctl/raidctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/raidctl/raidctl.8 diff -u src/sbin/raidctl/raidctl.8:1.58 src/sbin/raidctl/raidctl.8:1.59 --- src/sbin/raidctl/raidctl.8:1.58 Tue Nov 17 19:09:38 2009 +++ src/sbin/raidctl/raidctl.8 Tue Nov 17 19:35:48 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: raidctl.8,v 1.58 2009/11/17 19:09:38 jld Exp $ +.\ $NetBSD: raidctl.8,v 1.59 2009/11/17 19:35:48 wiz Exp $ .\ .\ Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -256,11 +256,11 @@ Alter the parameters of the parity map; parameters to leave unchanged can be given as 0, and trailing zeroes may be omitted. .\XXX should this explanation be deferred to another section as well? -The RAID set is divided into +The RAID set is divided into .Ar regions regions; each region is marked dirty for at most .Ar cooldown -intervals of +intervals of .Ar tickms milliseconds each after a write to it, and at least .Ar cooldown
CVS commit: src/lib/libc/ssp
Module Name:src
Committed By: drochner
Date: Tue Nov 17 20:44:26 UTC 2009
Modified Files:
src/lib/libc/ssp: strcat_chk.c strncat_chk.c
Log Message:
make the src strings const as in the unchecked equivalents
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/ssp/strcat_chk.c \
src/lib/libc/ssp/strncat_chk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/ssp/strcat_chk.c
diff -u src/lib/libc/ssp/strcat_chk.c:1.3 src/lib/libc/ssp/strcat_chk.c:1.4
--- src/lib/libc/ssp/strcat_chk.c:1.3 Mon Apr 28 20:23:00 2008
+++ src/lib/libc/ssp/strcat_chk.c Tue Nov 17 20:44:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: strcat_chk.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
+/* $NetBSD: strcat_chk.c,v 1.4 2009/11/17 20:44:26 drochner Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: strcat_chk.c,v 1.3 2008/04/28 20:23:00 martin Exp $);
+__RCSID($NetBSD: strcat_chk.c,v 1.4 2009/11/17 20:44:26 drochner Exp $);
/*LINTLIBRARY*/
@@ -37,7 +37,7 @@
#include string.h
char *
-__strcat_chk(char * __restrict dst, char * __restrict src, size_t slen)
+__strcat_chk(char * __restrict dst, const char * __restrict src, size_t slen)
{
char *d;
Index: src/lib/libc/ssp/strncat_chk.c
diff -u src/lib/libc/ssp/strncat_chk.c:1.3 src/lib/libc/ssp/strncat_chk.c:1.4
--- src/lib/libc/ssp/strncat_chk.c:1.3 Mon Apr 28 20:23:00 2008
+++ src/lib/libc/ssp/strncat_chk.c Tue Nov 17 20:44:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: strncat_chk.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
+/* $NetBSD: strncat_chk.c,v 1.4 2009/11/17 20:44:26 drochner Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: strncat_chk.c,v 1.3 2008/04/28 20:23:00 martin Exp $);
+__RCSID($NetBSD: strncat_chk.c,v 1.4 2009/11/17 20:44:26 drochner Exp $);
/*LINTLIBRARY*/
@@ -38,7 +38,7 @@
#include stdio.h
char *
-__strncat_chk(char * __restrict dst, char * __restrict src, size_t len,
+__strncat_chk(char * __restrict dst, const char * __restrict src, size_t len,
size_t slen)
{
char *d;
CVS commit: src/doc/roadmaps
Module Name:src Committed By: agc Date: Tue Nov 17 21:09:54 UTC 2009 Modified Files: src/doc/roadmaps: storage system Log Message: Update with status for some projects. Add some new projects, and sync with reality. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/doc/roadmaps/storage src/doc/roadmaps/system Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/roadmaps/storage diff -u src/doc/roadmaps/storage:1.7 src/doc/roadmaps/storage:1.8 --- src/doc/roadmaps/storage:1.7 Fri Oct 2 07:43:01 2009 +++ src/doc/roadmaps/storage Tue Nov 17 21:09:54 2009 @@ -1,4 +1,4 @@ -$NetBSD: storage,v 1.7 2009/10/02 07:43:01 cegger Exp $ +$NetBSD: storage,v 1.8 2009/11/17 21:09:54 agc Exp $ NetBSD Storage Roadmap == @@ -9,13 +9,17 @@ The following elements and projects are pencilled in for 6.0, but please do not rely on them being there. -1. devfs +Features that will be in 6.0: 2. logical volume management 3. a native port of Sun's ZFS +7. rump extensions +10. RAIDframe parity map + +Features that are planned for 6.0: +1. devfs 4. ReFUSE-lowlevel 5. web-based management tools for storage subsystems 6. support for flash devices - NAND and MMC/SD -7. rump extensions 8. virtualised disks in userland 9. in-kernel iSCSI initiator @@ -103,6 +107,7 @@ Responsible: pooka + 8. Virtualised disks in Userland @@ -111,6 +116,7 @@ Responsible: jmcneill + 9. In-kernel iSCSI Initiator @@ -122,5 +128,20 @@ Responsible: core +10. RAIDframe parity map + + +Jed Davis successfully completed a Summer of Code project to implement +parity map zones for RAIDframe. Parity mapping drastically reduces +the amount of time spent rewriting parity after an unclean shutdown by +keeping better track of which regions might have had outstanding +writes. Enabled by default; can be disabled on a per-set basis, or +tuned, with the new raidctl(8) commands. + +Merged in 5.99.22 sources, and will be in 6.0. A separate set of +patches is available for NetBSD-5. + +Responsible: jld + Alistair Crooks -Tue 15 Sep 2009 08:44:14 PDT +Tue Nov 17 07:17:20 PST 2009 Index: src/doc/roadmaps/system diff -u src/doc/roadmaps/system:1.7 src/doc/roadmaps/system:1.8 --- src/doc/roadmaps/system:1.7 Mon Sep 21 19:41:23 2009 +++ src/doc/roadmaps/system Tue Nov 17 21:09:54 2009 @@ -1,4 +1,4 @@ -$NetBSD: system,v 1.7 2009/09/21 19:41:23 agc Exp $ +$NetBSD: system,v 1.8 2009/11/17 21:09:54 agc Exp $ NetBSD System Roadmap = @@ -6,13 +6,19 @@ This is a small roadmap document, and deals with the main system aspects of the operating system. -The following projects are expected to be included in NetBSD 6.0 +The following projects are already in NetBSD-current and will appear +in NetBSD 6.0: 1. 64-bit time values supported 2. Better Kernel Modules support +5. namei() tactical changes +10. emap (ephemeral mapping) support for i386 and amd64 +11. support for mDNSResponder + +The following projects are expected to be included in NetBSD 6.0 + 3. Full kernel preemption for real-time threads 4. POSIX shared memory -5. namei() tactical changes 6. Better resource controls 7. Improved observability: online crashdumps, remote debugging 8. Processor and cache topology aware scheduler @@ -46,7 +52,8 @@ from booting from modules, like ffs, was introduced at the same time. Some work has been done by Luke Mewburn in this area to define module locations and paths so that effective kernel development can be done -using modules. +using modules. Kernel modules have been moved out of base.tgz and a new +modules.tgz has been created. Responsible: ad, lukem @@ -116,6 +123,21 @@ Responsible: dholland +10. Ephemeral Mapping +- + +Responsible: rmind + + +11. Multicast DNS and DNS Service Discovery +--- + +mDNSResponder (also known as mdnsd on some systems) is a daemon invoked +at boot time to implement Multicast DNS and DNS Service Discovery. On Mac +OS X 10.6 (Snow Leopard), mDNSResponder is also the system-wide Unicast +DNS Resolver. Ty Sarna added support for mdnsd to NetBSD-current, and it +will appear in NetBSD 6.0. + Alistair Crooks -Mon 21 Sep 2009 08:39:16 BST +Thu Nov 5 07:47:34 PST 2009
CVS commit: src/sys/kern
Module Name:src Committed By: bouyer Date: Tue Nov 17 22:20:14 UTC 2009 Modified Files: src/sys/kern: vfs_subr.c Log Message: Fix getcleanvnode() in previous: in the if (vp-v_usecount != 0) case we didn't bump the refcount, so don't decrease it through vrelel(). call mutex_exit() on v_interlock directly instead. To generate a diff of this commit: cvs rdiff -u -r1.386 -r1.387 src/sys/kern/vfs_subr.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_subr.c diff -u src/sys/kern/vfs_subr.c:1.386 src/sys/kern/vfs_subr.c:1.387 --- src/sys/kern/vfs_subr.c:1.386 Thu Nov 5 08:18:02 2009 +++ src/sys/kern/vfs_subr.c Tue Nov 17 22:20:14 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_subr.c,v 1.386 2009/11/05 08:18:02 bouyer Exp $ */ +/* $NetBSD: vfs_subr.c,v 1.387 2009/11/17 22:20:14 bouyer Exp $ */ /*- * Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc. @@ -91,7 +91,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vfs_subr.c,v 1.386 2009/11/05 08:18:02 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: vfs_subr.c,v 1.387 2009/11/17 22:20:14 bouyer Exp $); #include opt_ddb.h #include opt_compat_netbsd.h @@ -377,7 +377,7 @@ * Don't return to freelist - the holder of the last * reference will destroy it. */ - vrelel(vp, 0); /* releases vp-v_interlock */ + mutex_exit(vp-v_interlock); mutex_enter(vnode_free_list_lock); goto retry; }
CVS commit: src/sys/arch/i386/i386
Module Name:src
Committed By: dyoung
Date: Tue Nov 17 23:45:40 UTC 2009
Modified Files:
src/sys/arch/i386/i386: bios32.c
Log Message:
Fix spelling in a comment, s/extentions/extensions/.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/i386/i386/bios32.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/i386/bios32.c
diff -u src/sys/arch/i386/i386/bios32.c:1.27 src/sys/arch/i386/i386/bios32.c:1.28
--- src/sys/arch/i386/i386/bios32.c:1.27 Sat Nov 7 07:27:44 2009
+++ src/sys/arch/i386/i386/bios32.c Tue Nov 17 23:45:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bios32.c,v 1.27 2009/11/07 07:27:44 cegger Exp $ */
+/* $NetBSD: bios32.c,v 1.28 2009/11/17 23:45:39 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bios32.c,v 1.27 2009/11/07 07:27:44 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: bios32.c,v 1.28 2009/11/17 23:45:39 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -156,7 +156,7 @@
bios32_entry.offset = (void *)ISA_HOLE_VADDR(entry);
bios32_entry.segment = GSEL(GCODE_SEL, SEL_KPL);
}
- /* see if we have SMBIOS extentions */
+ /* see if we have SMBIOS extensions */
for (p = ISA_HOLE_VADDR(SMBIOS_START);
p (char *)ISA_HOLE_VADDR(SMBIOS_END); p+= 16) {
struct smbhdr * sh = (struct smbhdr *)p;
CVS commit: src/sys/arch/i386
Module Name:src
Committed By: dyoung
Date: Tue Nov 17 23:46:27 UTC 2009
Modified Files:
src/sys/arch/i386/eisa: eisa_machdep.c
src/sys/arch/i386/include: eisa_machdep.h
Log Message:
Delete unused functions eisa_mem_alloc() and eisa_mem_free().
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/i386/eisa/eisa_machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/include/eisa_machdep.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/i386/eisa/eisa_machdep.c
diff -u src/sys/arch/i386/eisa/eisa_machdep.c:1.32 src/sys/arch/i386/eisa/eisa_machdep.c:1.33
--- src/sys/arch/i386/eisa/eisa_machdep.c:1.32 Fri Jun 27 11:12:06 2008
+++ src/sys/arch/i386/eisa/eisa_machdep.c Tue Nov 17 23:46:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: eisa_machdep.c,v 1.32 2008/06/27 11:12:06 cegger Exp $ */
+/* $NetBSD: eisa_machdep.c,v 1.33 2009/11/17 23:46:27 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: eisa_machdep.c,v 1.32 2008/06/27 11:12:06 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: eisa_machdep.c,v 1.33 2009/11/17 23:46:27 dyoung Exp $);
#include ioapic.h
@@ -237,27 +237,6 @@
}
int
-eisa_mem_alloc(bus_space_tag_t t, bus_size_t size, bus_size_t align,
-bus_addr_t boundary, int cacheable,
-bus_addr_t *addrp, bus_space_handle_t *bahp)
-{
- extern struct extent *iomem_ex;
-
- /*
- * Allocate physical address space after the ISA hole.
- */
- return bus_space_alloc(t, IOM_END, iomem_ex-ex_end, size, align,
- boundary, cacheable, addrp, bahp);
-}
-
-void
-eisa_mem_free(bus_space_tag_t t, bus_space_handle_t bah, bus_size_t size)
-{
-
- bus_space_free(t, bah, size);
-}
-
-int
eisa_conf_read_mem(eisa_chipset_tag_t ec, int slot,
int func, int entry, struct eisa_cfg_mem *ecm)
{
Index: src/sys/arch/i386/include/eisa_machdep.h
diff -u src/sys/arch/i386/include/eisa_machdep.h:1.11 src/sys/arch/i386/include/eisa_machdep.h:1.12
--- src/sys/arch/i386/include/eisa_machdep.h:1.11 Fri Jun 27 11:12:06 2008
+++ src/sys/arch/i386/include/eisa_machdep.h Tue Nov 17 23:46:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: eisa_machdep.h,v 1.11 2008/06/27 11:12:06 cegger Exp $ */
+/* $NetBSD: eisa_machdep.h,v 1.12 2009/11/17 23:46:27 dyoung Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -67,10 +67,6 @@
void *eisa_intr_establish(eisa_chipset_tag_t,
eisa_intr_handle_t, int, int, int (*)(void *), void *);
void eisa_intr_disestablish(eisa_chipset_tag_t, void *);
-int eisa_mem_alloc(bus_space_tag_t, bus_size_t, bus_size_t,
- bus_addr_t, int, bus_addr_t *, bus_space_handle_t *);
-void eisa_mem_free(bus_space_tag_t, bus_space_handle_t,
- bus_size_t);
int eisa_conf_read_mem(eisa_chipset_tag_t, int, int, int,
struct eisa_cfg_mem *);
CVS commit: src/sys/arch/i386/eisa
Module Name:src Committed By: dyoung Date: Tue Nov 17 23:51:59 UTC 2009 Modified Files: src/sys/arch/i386/eisa: eisa_machdep.c Log Message: Don't #include sys/extent.h any more because this module doesn't use struct extent any more. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/i386/eisa/eisa_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/i386/eisa/eisa_machdep.c diff -u src/sys/arch/i386/eisa/eisa_machdep.c:1.33 src/sys/arch/i386/eisa/eisa_machdep.c:1.34 --- src/sys/arch/i386/eisa/eisa_machdep.c:1.33 Tue Nov 17 23:46:27 2009 +++ src/sys/arch/i386/eisa/eisa_machdep.c Tue Nov 17 23:51:59 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: eisa_machdep.c,v 1.33 2009/11/17 23:46:27 dyoung Exp $ */ +/* $NetBSD: eisa_machdep.c,v 1.34 2009/11/17 23:51:59 dyoung Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: eisa_machdep.c,v 1.33 2009/11/17 23:46:27 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: eisa_machdep.c,v 1.34 2009/11/17 23:51:59 dyoung Exp $); #include ioapic.h @@ -75,7 +75,6 @@ #include sys/systm.h #include sys/errno.h #include sys/device.h -#include sys/extent.h #include machine/bus.h #include machine/bus_private.h
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src
Committed By: cliff
Date: Wed Nov 18 01:14:28 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]:
bus_space_alignstride_chipdep.c
Log Message:
- in BS(unmap), if handle is for addr mapped in page table,
free up the pmap and uvm resources. Otherwise manage
kseg[0,1] mapped handle as usual.
- also in BS(unmamp), use bus_addr_t addr (not the handle)
when calculating offset in extent.
- use PRIxBUSADDR, PRIxBUSSIZE and PRIxBSH formats as needed
- use function names instead of xxx in printfs
To generate a diff of this commit:
cvs rdiff -u -r1.10.18.7 -r1.10.18.8 \
src/sys/arch/mips/mips/bus_space_alignstride_chipdep.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/mips/mips/bus_space_alignstride_chipdep.c
diff -u src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.10.18.7 src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.10.18.8
--- src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.10.18.7 Tue Nov 17 07:56:27 2009
+++ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c Wed Nov 18 01:14:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.10.18.7 2009/11/17 07:56:27 matt Exp $ */
+/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.10.18.8 2009/11/18 01:14:27 cliff Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_space_alignstride_chipdep.c,v 1.10.18.7 2009/11/17 07:56:27 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_space_alignstride_chipdep.c,v 1.10.18.8 2009/11/18 01:14:27 cliff Exp $);
#ifdef CHIP_EXTENT
#include sys/extent.h
@@ -563,14 +563,15 @@
*/
if (CHIP_W1_BUS_START(v) == (bus_addr_t) -1) {
#ifdef EXTENT_DEBUG
- printf(xxx: this space is disabled\n);
+ printf(%s: this space is disabled\n, __S(__BS(init)));
#endif
return;
}
#ifdef EXTENT_DEBUG
- printf(xxx: freeing from 0x%x to 0x%x\n, CHIP_W1_BUS_START(v),
- CHIP_W1_BUS_END(v));
+ printf(%s: freeing from %#PRIxBUSADDR to %#PRIxBUSADDR\n,
+ __S(__BS(init)), (bus_addr_t)CHIP_W1_BUS_START(v),
+ (bus_addr_t)CHIP_W1_BUS_END(v));
#endif
extent_free(ex, CHIP_W1_BUS_START(v),
CHIP_W1_BUS_END(v) - CHIP_W1_BUS_START(v) + 1, EX_NOWAIT);
@@ -728,13 +729,14 @@
goto mapit;
#ifdef EXTENT_DEBUG
- printf(xxx: allocating 0x%lx to 0x%lx\n, addr, addr + size - 1);
+ printf(%s: allocating %#PRIxBUSADDR to %#PRIxBUSADDR\n,
+ __S(__BS(map)), addr, addr + size - 1);
#endif
error = extent_alloc_region(CHIP_EXTENT(v), addr, size,
EX_NOWAIT | (CHIP_EX_MALLOC_SAFE(v) ? EX_MALLOCOK : 0));
if (error) {
#ifdef EXTENT_DEBUG
- printf(xxx: allocation failed (%d)\n, error);
+ printf(%s: allocation failed (%d)\n, __S(__BS(map)), error);
extent_print(CHIP_EXTENT(v));
#endif
return (error);
@@ -761,6 +763,10 @@
UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
if (va == 0)
return ENOMEM;
+
+ /* check use of handle_is_kseg2 in BS(unmap) */
+ KASSERT((va ~MIPS_PHYS_MASK) == MIPS_KSEG2_START);
+
*hp = va + (addr PAGE_MASK);
pa = trunc_page(addr);
@@ -787,40 +793,76 @@
void
__BS(unmap)(void *v, bus_space_handle_t h, bus_size_t size, int acct)
{
+ bus_addr_t addr = 0; /* initialize to appease gcc */
+ bool handle_is_kseg2;
+
+ /* determine if h is addr obtained from uvm_km_alloc */
+ handle_is_kseg2 = ((h ~MIPS_PHYS_MASK) == MIPS_KSEG2_START);
+
+#if 0
+ printf(%s:%d: is_kseg2 %d\n, __func__, __LINE__, handle_is_kseg2);
+#endif
+
+ if (handle_is_kseg2 == true) {
+ paddr_t pa;
+ vaddr_t va = (vaddr_t)trunc_page(h);
+ vsize_t sz = (vsize_t)round_page((h % PAGE_SIZE) + size);
+ int s;
+
+ s = splhigh();
+
+ if (pmap_extract(pmap_kernel(), (vaddr_t)h, pa) == false)
+ panic(%s: pmap_extract failed, __func__);
+ addr = (bus_addr_t)pa;
+#if 0
+ printf(%s:%d: addr %#PRIxBUSADDR, sz %#PRIxVSIZE\n,
+ __func__, __LINE__, addr, sz);
+#endif
+ /* sanity check: this is why we couldn't map w/ kseg[0,1] */
+ KASSERT (((addr + sz) ~MIPS_PHYS_MASK) != 0);
+
+ pmap_kremove(va, sz);
+ pmap_update(pmap_kernel());
+ uvm_km_free(kernel_map, va, sz, UVM_KMF_VAONLY);
+
+ splx(s);
+ }
+
#ifdef CHIP_EXTENT
- bus_addr_t addr;
- int error;
if (acct == 0)
return;
#ifdef EXTENT_DEBUG
- printf(xxx: freeing handle 0x%lx for 0x%lx\n, h, size);
+ printf(%s: freeing handle %#PRIxBSH for %#PRIxBUSSIZE\n,
+ __S(__BS(unmap)), h, size);
#endif
+ if (handle_is_kseg2 == false) {
#ifdef _LP64
- KASSERT(MIPS_XKPHYS_P(h));
- h = MIPS_XKPHYS_TO_PHYS(h);
+ KASSERT(MIPS_XKPHYS_P(h));
+ addr = MIPS_XKPHYS_TO_PHYS(h);
#else
- if (MIPS_KSEG0_P(h))
- h = MIPS_KSEG0_TO_PHYS(h);
- else
- h = MIPS_KSEG1_TO_PHYS(h);
+ if (MIPS_KSEG0_P(h))
+ addr = MIPS_KSEG0_TO_PHYS(h);
+ else
+ addr = MIPS_KSEG1_TO_PHYS(h);
#endif
+ }
#ifdef CHIP_W1_BUS_START
- if (h = CHIP_W1_SYS_START(v) h =
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src Committed By: cliff Date: Wed Nov 18 01:15:32 UTC 2009 Modified Files: src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_pcie.c Log Message: - use PRIxBUSADDR as needed - make cfg_oba, ecfg_oba type bus_addr_t To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/mips/rmi/rmixl_pcie.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/mips/rmi/rmixl_pcie.c diff -u src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.3 src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.4 --- src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.3 Sun Nov 15 23:11:06 2009 +++ src/sys/arch/mips/rmi/rmixl_pcie.c Wed Nov 18 01:15:32 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rmixl_pcie.c,v 1.1.2.3 2009/11/15 23:11:06 cliff Exp $ */ +/* $NetBSD: rmixl_pcie.c,v 1.1.2.4 2009/11/18 01:15:32 cliff Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rmixl_pcie.c,v 1.1.2.3 2009/11/15 23:11:06 cliff Exp $); +__KERNEL_RCSID(0, $NetBSD: rmixl_pcie.c,v 1.1.2.4 2009/11/18 01:15:32 cliff Exp $); #include opt_pci.h #include pci.h @@ -188,7 +188,7 @@ ba *= (1024 * 1024); \ bar = RMIXL_PCIE_CONCAT3(RMIXL_PCIE_,reg,_BAR)(ba, 1); \ DPRINTF((PCIE %s BAR was not enabled by firmware\n \ - enabling %s at phys % PRIx64 , size %lu MB\n, \ + enabling %s at phys %# PRIxBUSADDR , size %lu MB\n, \ __STRING(reg), __STRING(reg), ba, size)); \ RMIXL_IOREG_WRITE(RMIXL_IO_DEV_BRIDGE + \ RMIXL_PCIE_CONCAT3(RMIXL_SBC_PCIE_,reg,_BAR), bar); \ @@ -843,9 +843,9 @@ bus_addr_t ba; int err; static bus_space_handle_t cfg_bsh; - static pcitag_t cfg_oba = -1; + static bus_addr_t cfg_oba = -1; static bus_space_handle_t ecfg_bsh; - static pcitag_t ecfg_oba = -1; + static bus_addr_t ecfg_oba = -1; /* * bus space depends on offset
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src Committed By: cliff Date: Wed Nov 18 01:16:07 UTC 2009 Modified Files: src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_obio_space.c rmixl_pcie_cfg_space.c rmixl_pcie_ecfg_space.c rmixl_pcie_io_space.c rmixl_pcie_mem_space.c rmixlvar.h Log Message: - add extents for bus spaces To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/mips/rmi/rmixl_obio_space.c cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c \ src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c \ src/sys/arch/mips/rmi/rmixl_pcie_io_space.c \ src/sys/arch/mips/rmi/rmixl_pcie_mem_space.c cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/sys/arch/mips/rmi/rmixlvar.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/mips/rmi/rmixl_obio_space.c diff -u src/sys/arch/mips/rmi/rmixl_obio_space.c:1.1.2.4 src/sys/arch/mips/rmi/rmixl_obio_space.c:1.1.2.5 --- src/sys/arch/mips/rmi/rmixl_obio_space.c:1.1.2.4 Sun Nov 15 22:58:15 2009 +++ src/sys/arch/mips/rmi/rmixl_obio_space.c Wed Nov 18 01:16:07 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rmixl_obio_space.c,v 1.1.2.4 2009/11/15 22:58:15 cliff Exp $ */ +/* $NetBSD: rmixl_obio_space.c,v 1.1.2.5 2009/11/18 01:16:07 cliff Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rmixl_obio_space.c,v 1.1.2.4 2009/11/15 22:58:15 cliff Exp $); +__KERNEL_RCSID(0, $NetBSD: rmixl_obio_space.c,v 1.1.2.5 2009/11/18 01:16:07 cliff Exp $); #include sys/types.h #include sys/param.h @@ -49,6 +49,10 @@ #define CHIP_ACCESS_SIZE 4 #define CHIP_BIG_ENDIAN +#define CHIP_EX_MALLOC_SAFE(v) (((struct rmixl_config *)(v))-rc_mallocsafe) +#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))-rc_obio_ex) + + /* MEM region 1 */ #define CHIP_W1_BUS_START(v) 0 #define CHIP_W1_BUS_END(v) (RMIXL_IO_DEV_SIZE - 1) Index: src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c diff -u src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c:1.1.2.1 src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c:1.1.2.2 --- src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c:1.1.2.1 Sun Nov 15 23:29:18 2009 +++ src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c Wed Nov 18 01:16:07 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.1 2009/11/15 23:29:18 cliff Exp $ */ +/* $NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.1 2009/11/15 23:29:18 cliff Exp $); +__KERNEL_RCSID(0, $NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $); #include sys/types.h #include sys/param.h @@ -50,6 +50,9 @@ #define CHIP_ACCESS_SIZE 1 #define CHIP_LITTLE_ENDIAN +#define CHIP_EX_MALLOC_SAFE(v) (((struct rmixl_config *)(v))-rc_mallocsafe) +#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))-rc_pcie_cfg_ex) + /* MEM region 1 */ #define CHIP_W1_BUS_START(v) \ (((struct rmixl_config *)(v))-rc_pcie_cfg_pbase) Index: src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c diff -u src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c:1.1.2.1 src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c:1.1.2.2 --- src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c:1.1.2.1 Sun Nov 15 23:29:18 2009 +++ src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c Wed Nov 18 01:16:07 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rmixl_pcie_ecfg_space.c,v 1.1.2.1 2009/11/15 23:29:18 cliff Exp $ */ +/* $NetBSD: rmixl_pcie_ecfg_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rmixl_pcie_ecfg_space.c,v 1.1.2.1 2009/11/15 23:29:18 cliff Exp $); +__KERNEL_RCSID(0, $NetBSD: rmixl_pcie_ecfg_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $); #include sys/types.h #include sys/param.h @@ -50,6 +50,9 @@ #define CHIP_ACCESS_SIZE 1 #define CHIP_LITTLE_ENDIAN +#define CHIP_EX_MALLOC_SAFE(v) (((struct rmixl_config *)(v))-rc_mallocsafe) +#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))-rc_pcie_ecfg_ex) + /* MEM region 1 */ #define CHIP_W1_BUS_START(v) \ (((struct rmixl_config *)(v))-rc_pcie_ecfg_pbase) Index: src/sys/arch/mips/rmi/rmixl_pcie_io_space.c diff -u src/sys/arch/mips/rmi/rmixl_pcie_io_space.c:1.1.2.1 src/sys/arch/mips/rmi/rmixl_pcie_io_space.c:1.1.2.2 --- src/sys/arch/mips/rmi/rmixl_pcie_io_space.c:1.1.2.1 Mon Nov 9 10:17:06 2009 +++ src/sys/arch/mips/rmi/rmixl_pcie_io_space.c Wed Nov 18 01:16:07 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rmixl_pcie_io_space.c,v 1.1.2.1 2009/11/09 10:17:06 cliff Exp $ */ +/* $NetBSD: rmixl_pcie_io_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD:
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: macallan
Date: Wed Nov 18 06:10:50 UTC 2009
Modified Files:
src/sys/dev/ic: igsfb_subr.c
Log Message:
Write something more sane into the pixel format register - it's not pixel size
in bytes although that works in 8 and 16 bit colour depth.
While there do some magic number reduction.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/igsfb_subr.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/ic/igsfb_subr.c
diff -u src/sys/dev/ic/igsfb_subr.c:1.10 src/sys/dev/ic/igsfb_subr.c:1.11
--- src/sys/dev/ic/igsfb_subr.c:1.10 Wed Nov 11 17:01:17 2009
+++ src/sys/dev/ic/igsfb_subr.c Wed Nov 18 06:10:50 2009
@@ -1,7 +1,8 @@
-/* $NetBSD: igsfb_subr.c,v 1.10 2009/11/11 17:01:17 macallan Exp $ */
+/* $NetBSD: igsfb_subr.c,v 1.11 2009/11/18 06:10:50 macallan Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
+ * 2009 Michael Lorenz
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -31,7 +32,7 @@
* Integraphics Systems IGA 168x and CyberPro series.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: igsfb_subr.c,v 1.10 2009/11/11 17:01:17 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: igsfb_subr.c,v 1.11 2009/11/18 06:10:50 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -471,7 +472,29 @@
int vblank_start, vblank_end, hblank_start, hblank_end;
uint8_t vclk1, vclk2, vclk3, overflow;
- bytes_per_pixel = depth 3;
+ switch (depth) {
+ case 8:
+ bytes_per_pixel = IGS_EXT_SEQ_8BPP;
+ break;
+ case 15:
+ bytes_per_pixel = IGS_EXT_SEQ_15BPP; /* 5-5-5 */
+ break;
+ case 16:
+ bytes_per_pixel = IGS_EXT_SEQ_16BPP; /* 5-6-5 */
+ break;
+ case 24:
+ bytes_per_pixel = IGS_EXT_SEQ_24BPP; /* 8-8-8 */
+ break;
+ case 32:
+ bytes_per_pixel = IGS_EXT_SEQ_32BPP;
+ break;
+ default:
+ aprint_error(igsfb: unsupported depth (%d), reverting
+ to 8 bit\n, depth);
+ depth = 8;
+ bytes_per_pixel = IGS_EXT_SEQ_8BPP;
+ }
+
hoffset = (mode-hdisplay 3) * bytes_per_pixel;
memfetch = hoffset + 1;
overflow = (((mode-vtotal - 2) 0x400) 10) |
@@ -565,16 +588,16 @@
igs_grfx_write(iot, ioh, 0x08, 0xff);
/* crank up memory clock to 95MHz - needed for higher resolutions */
- igs_ext_write(iot, ioh, 0xB2, 0x91);
- igs_ext_write(iot, ioh, 0xB3, 0x6a);
+ igs_ext_write(iot, ioh, IGS_EXT_MCLK0, 0x91);
+ igs_ext_write(iot, ioh, IGS_EXT_MCLK1, 0x6a);
igsfb_freq_latch(dc);
- igs_ext_write(iot, ioh, 0x11, overflow);
- igs_ext_write(iot, ioh, 0x77, bytes_per_pixel);
+ igs_ext_write(iot, ioh, IGS_EXT_VOVFL, overflow);
+ igs_ext_write(iot, ioh, IGS_EXT_SEQ_MISC, bytes_per_pixel);
igs_ext_write(iot, ioh, 0x14, memfetch 0xff);
igs_ext_write(iot, ioh, 0x15,
((memfetch 0x300) 8) | ((hoffset 0x300) 4));
- igs_ext_write(iot, ioh, 0x56, 0x00);
+ igs_ext_write(iot, ioh, IGS_EXT_SPRITE_CTL, 0x00);
/* finally set the dot clock */
igsfb_calc_pll(mode-dot_clock, m, n, p, 2047, 255, 7, IGS_MIN_VCO);
@@ -584,8 +607,8 @@
(mode-dot_clock 18 ? 0x20 : 0);
vclk3 = ((m 8) 0x7) | ((n 2) 0x38) | ((p 4) 0x40);
DPRINTF(clk: %02x %02x %02x\n, vclk1, vclk2, vclk3);
- igs_ext_write(iot, ioh, 0xB0, vclk1);
- igs_ext_write(iot, ioh, 0xB1, vclk2);
+ igs_ext_write(iot, ioh, IGS_EXT_VCLK0, vclk1);
+ igs_ext_write(iot, ioh, IGS_EXT_VCLK1, vclk2);
igs_ext_write(iot, ioh, 0xBA, vclk3);
igsfb_freq_latch(dc);
DPRINTF(clock: %d\n, IGS_CLOCK(m, n, p));
