CVS commit: src/crypto/external/bsd/netpgp/dist/bindings/perl
Module Name:src
Committed By: agc
Date: Tue Dec 1 08:02:50 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/bindings/perl: netpgp.pl
Log Message:
Turns out that swig and tainted don't play well together - perl has no way
of knowing whether the memory will be modified. For now, the gross hack is
to switch off tainting
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl
diff -u src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl:1.1 src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl:1.2
--- src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl:1.1 Tue Dec 1 06:43:57 2009
+++ src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl Tue Dec 1 08:02:50 2009
@@ -1,4 +1,4 @@
-#! /usr/pkg/bin/perl -wT
+#! /usr/pkg/bin/perl -w
# netpgp bindings for perl
@@ -8,7 +8,7 @@
# initializations
$n = netpgpperlc::new_netpgp_t();
-netpgpperlc::netpgp_setvar($n, homedir, /home/agc/.gnupg);
+netpgpperlc::netpgp_setvar($n, homedir, $ENV{'HOME'}./.gnupg);
netpgpperlc::netpgp_setvar($n, hash, SHA256);
netpgpperlc::netpgp_init($n);
@@ -17,13 +17,12 @@
foreach $i (0 .. $#ARGV) {
# set up file names
- #my $in = $ARGV[$i];
- #my $out = $in . .gpg;
+ my $in = $ARGV[$i];
+ my $out = $in . .gpg;
# sign the file, output is in $out
- #netpgpperlc::netpgp_sign_file($n, $userid, $in, $out, 0, 0, 0);
- netpgpperlc::netpgp_sign_file($n, $userid, a, a.gpg, 0, 0, 0);
+ netpgpperlc::netpgp_sign_file($n, $userid, $in, $out, 0, 0, 0);
# verify the signed file $out
- netpgpperlc::netpgp_verify_file($n, a.gpg, /dev/null, 0);
+ netpgpperlc::netpgp_verify_file($n, $out, /dev/null, 0);
}
CVS commit: src/lib/libc/stdio
Module Name:src Committed By: wiz Date: Tue Dec 1 08:15:50 UTC 2009 Modified Files: src/lib/libc/stdio: getdelim.3 Log Message: Make HTML-ready, use standard section headers, fix Xr. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/libc/stdio/getdelim.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/stdio/getdelim.3 diff -u src/lib/libc/stdio/getdelim.3:1.5 src/lib/libc/stdio/getdelim.3:1.6 --- src/lib/libc/stdio/getdelim.3:1.5 Mon Nov 30 23:23:29 2009 +++ src/lib/libc/stdio/getdelim.3 Tue Dec 1 08:15:50 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: getdelim.3,v 1.5 2009/11/30 23:23:29 roy Exp $ +.\ $NetBSD: getdelim.3,v 1.6 2009/12/01 08:15:50 wiz Exp $ .\ .\ Copyright (c) 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -73,7 +73,7 @@ must be representable as an unsigned char, and .Fa *lineptr must be a -.Xr free(3) Ns No able +.Xr free 3 Ns No able buffer. .Pp .Fa getline @@ -98,14 +98,14 @@ and .Xr ferror 3 to determine which occurred. -.Sh EXAMPLE +.Sh EXAMPLES The following code fragment reads lines from a file and writes them to standard output. .Bd -literal -offset indent char *line = NULL; size_t linesize = 0; ssize_t linelen; -while ((linelen = getline(line, linesize, fp)) != -1) +while ((linelen = getline(\*[Am]line, \*[Am]linesize, fp)) != -1) fwrite(line, linelen, 1, stdout); if (ferror(fp))
CVS commit: src/sbin/newfs_ext2fs
Module Name:src Committed By: pooka Date: Tue Dec 1 08:47:25 UTC 2009 Modified Files: src/sbin/newfs_ext2fs: newfs_ext2fs.8 Log Message: Remove vinum-removal sentence fragment, similarly to newfs(8). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sbin/newfs_ext2fs/newfs_ext2fs.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/newfs_ext2fs/newfs_ext2fs.8 diff -u src/sbin/newfs_ext2fs/newfs_ext2fs.8:1.6 src/sbin/newfs_ext2fs/newfs_ext2fs.8:1.7 --- src/sbin/newfs_ext2fs/newfs_ext2fs.8:1.6 Sun Oct 25 18:34:04 2009 +++ src/sbin/newfs_ext2fs/newfs_ext2fs.8 Tue Dec 1 08:47:25 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: newfs_ext2fs.8,v 1.6 2009/10/25 18:34:04 joerg Exp $ +.\ $NetBSD: newfs_ext2fs.8,v 1.7 2009/12/01 08:47:25 pooka Exp $ .\ .\ Copyright (c) 1983, 1987, 1991, 1993, 1994 .\ The Regents of the University of California. All rights reserved. @@ -265,7 +265,6 @@ only if the last character of .Ar special references the same partition as the minor device number. -that provide disk like block and character devices. .Sh SEE ALSO .Xr fstat 2 , .Xr disklabel 5 ,
CVS commit: src/sys/rump/dev/lib/libcgd
Module Name:src Committed By: pooka Date: Tue Dec 1 09:04:21 UTC 2009 Modified Files: src/sys/rump/dev/lib/libcgd: component.c Log Message: whitespace To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libcgd/component.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/dev/lib/libcgd/component.c diff -u src/sys/rump/dev/lib/libcgd/component.c:1.2 src/sys/rump/dev/lib/libcgd/component.c:1.3 --- src/sys/rump/dev/lib/libcgd/component.c:1.2 Mon Sep 7 11:23:39 2009 +++ src/sys/rump/dev/lib/libcgd/component.c Tue Dec 1 09:04:21 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: component.c,v 1.2 2009/09/07 11:23:39 pooka Exp $ */ +/* $NetBSD: component.c,v 1.3 2009/12/01 09:04:21 pooka Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: component.c,v 1.2 2009/09/07 11:23:39 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: component.c,v 1.3 2009/12/01 09:04:21 pooka Exp $); #include sys/param.h #include sys/conf.h @@ -56,7 +56,7 @@ if ((error = rump_vfs_makedevnodes(S_IFBLK, cgd0, 'a', bmaj, 0, 7)) != 0) panic(cannot create cooked cgd dev nodes: %d, error); - if ((error = rump_vfs_makedevnodes(S_IFCHR, rcgd0,'a', + if ((error = rump_vfs_makedevnodes(S_IFCHR, rcgd0, 'a', cmaj, 0, 7)) != 0) panic(cannot create raw cgd dev nodes: %d, error);
CVS commit: src/sys
Module Name:src Committed By: skrll Date: Tue Dec 1 09:06:17 UTC 2009 Modified Files: src/sys/arch/hp700/hp700: genassym.cf locore.S src/sys/arch/hppa/hppa: copy.S trap.S src/sys/lib/libkern/arch/hppa: bcopy.S Log Message: Remove U_PCB as requested by rmind. Same code before and after. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hp700/hp700/genassym.cf cvs rdiff -u -r1.37 -r1.38 src/sys/arch/hp700/hp700/locore.S cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hppa/hppa/copy.S cvs rdiff -u -r1.30 -r1.31 src/sys/arch/hppa/hppa/trap.S cvs rdiff -u -r1.8 -r1.9 src/sys/lib/libkern/arch/hppa/bcopy.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/hp700/genassym.cf diff -u src/sys/arch/hp700/hp700/genassym.cf:1.18 src/sys/arch/hp700/hp700/genassym.cf:1.19 --- src/sys/arch/hp700/hp700/genassym.cf:1.18 Thu May 7 15:34:49 2009 +++ src/sys/arch/hp700/hp700/genassym.cf Tue Dec 1 09:06:16 2009 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.18 2009/05/07 15:34:49 skrll Exp $ +# $NetBSD: genassym.cf,v 1.19 2009/12/01 09:06:16 skrll Exp $ # $OpenBSD: genassym.cf,v 1.18 2001/09/20 18:31:14 mickey Exp $ @@ -193,9 +193,6 @@ member PCB_UVA pcb_uva member PCB_KSP pcb_ksp -struct user -member U_PCB u_pcb - # system calls export SYSCALLGATE export SYS_exit Index: src/sys/arch/hp700/hp700/locore.S diff -u src/sys/arch/hp700/hp700/locore.S:1.37 src/sys/arch/hp700/hp700/locore.S:1.38 --- src/sys/arch/hp700/hp700/locore.S:1.37 Fri Nov 27 03:23:09 2009 +++ src/sys/arch/hp700/hp700/locore.S Tue Dec 1 09:06:16 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.37 2009/11/27 03:23:09 rmind Exp $ */ +/* $NetBSD: locore.S,v 1.38 2009/12/01 09:06:16 skrll Exp $ */ /* $OpenBSD: locore.S,v 1.158 2008/07/28 19:08:46 miod Exp $ */ /* @@ -248,9 +248,9 @@ mtctl %t3, CR_UPADDR /* initialize the pcb */ - stw %r0, U_PCB+PCB_ONFAULT(%t3) - stw %r0, U_PCB+PCB_SPACE(%t3) /* XXX HPPA_SID_KERNEL == 0 */ - stw %t3, U_PCB+PCB_UVA(%t3) + stw %r0, PCB_ONFAULT(%t3) + stw %r0, PCB_SPACE(%t3) /* XXX HPPA_SID_KERNEL == 0 */ + stw %t3, PCB_UVA(%t3) /* * Setup various pointers. @@ -806,7 +806,7 @@ * Check that the stack is above this value for curl. */ ldw L_ADDR(%arg1), %arg2 - ldw U_PCB+PCB_KSP(%arg2), %t1 /* t1 for switch_error */ + ldw PCB_KSP(%arg2), %t1 /* t1 for switch_error */ ldo NBPG(%arg2), %arg2 comb,,n %arg2, %t1, switch_error nop @@ -831,8 +831,8 @@ */ ldw L_ADDR(%arg0), %t3 /* curl pcb */ - stw %sp, U_PCB+PCB_KSP(%t3) - fdc %r0(%t3) /* flush curl pcb - surely fdc U_PCB+PCB_KSP(%t3) */ + stw %sp, PCB_KSP(%t3) + fdc %r0(%t3) /* flush curl pcb - surely fdc PCB_KSP(%t3) */ /* * Save the callee-save registers. We don't need to do @@ -863,7 +863,7 @@ switch_exited: ldw L_MD(%arg1), %t1 ldw L_ADDR(%arg1), %t3 - ldw U_PCB+PCB_KSP(%t3), %sp /* restore stack of newl */ + ldw PCB_KSP(%t3), %sp /* restore stack of newl */ fdc %r0(%t3) /* Flush newl PCB - why? */ Index: src/sys/arch/hppa/hppa/copy.S diff -u src/sys/arch/hppa/hppa/copy.S:1.13 src/sys/arch/hppa/hppa/copy.S:1.14 --- src/sys/arch/hppa/hppa/copy.S:1.13 Tue Nov 3 05:07:26 2009 +++ src/sys/arch/hppa/hppa/copy.S Tue Dec 1 09:06:17 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: copy.S,v 1.13 2009/11/03 05:07:26 snj Exp $ */ +/* $NetBSD: copy.S,v 1.14 2009/12/01 09:06:17 skrll Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -102,27 +102,27 @@ ldw L_ADDR(%t1), %t1 ! \ ldil L%fusufault, %t2 ! \ ldo R%fusufault(%t2), %t2 ! \ - ldw U_PCB+PCB_ONFAULT(%t1), %t3 ! \ - stw %t2, U_PCB+PCB_ONFAULT(%t1) ! \ - ldw U_PCB+PCB_SPACE(%t1), %t2 ! \ + ldw PCB_ONFAULT(%t1), %t3 ! \ + stw %t2, PCB_ONFAULT(%t1) ! \ + ldw PCB_SPACE(%t1), %t2 ! \ mtsp %t2, %sr1 #define FUX(name,insn) \ FUSUX(name)! \ insn 0(%sr1, %arg0), %ret0 ! \ bv %r0(%rp) ! \ - stw %r0, U_PCB+PCB_ONFAULT(%t1) ! \ + stw %r0, PCB_ONFAULT(%t1) ! \ EXIT(name) #define SUX(name,insn) \ FUSUX(name)! \ insn %arg1, 0(%sr1, %arg0) ! \ bv %r0(%rp) ! \ - stw %r0, U_PCB+PCB_ONFAULT(%t1) ! \ + stw %r0, PCB_ONFAULT(%t1) ! \ EXIT(name) LEAF_ENTRY_NOPROFILE(fusufault) - stw %r0, U_PCB+PCB_ONFAULT(%t1) + stw %r0, PCB_ONFAULT(%t1) ALTENTRY(fusubadaddr) bv 0(%rp) ldi -1, %ret0 @@ -141,7 +141,7 @@ LEAF_ENTRY_NOPROFILE(_copy_on_fault) /* reset fault handler */ - stw %r0, PCB_ONFAULT+U_PCB(%r31) + stw %r0, PCB_ONFAULT(%r31) ALTENTRY(copy_on_fault) bv 0(%rp) ldi EFAULT, %ret0 @@ -161,7 +161,7 @@ ldw L_ADDR(%r31), %r31 ldil L%_copy_on_fault, %t2 ldo R%_copy_on_fault(%t2), %t2 - stw %t2, PCB_ONFAULT+U_PCB(%r31) + stw %t2, PCB_ONFAULT(%r31) ldw HPPA_FRAME_ARG(4)(%sp), %ret1 /* size */ mfsp %sr2, %ret0 /* XXX need this? */ @@ -178,7 +178,7 @@ L$spstrcpy_exit: /* reset fault handler */ - stw %r0, PCB_ONFAULT+U_PCB(%r31) + stw
CVS commit: src/tools/pkg_install
Module Name:src
Committed By: uebayasi
Date: Tue Dec 1 09:01:46 UTC 2009
Added Files:
src/tools/pkg_install: Makefile Makefile.inc
src/tools/pkg_install/pkg_add: Makefile
src/tools/pkg_install/pkg_admin: Makefile
src/tools/pkg_install/pkg_create: Makefile
src/tools/pkg_install/pkg_delete: Makefile
src/tools/pkg_install/pkg_info: Makefile
Log Message:
Add pkg_install as a tool.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/tools/pkg_install/Makefile \
src/tools/pkg_install/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/tools/pkg_install/pkg_add/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/pkg_install/pkg_admin/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/pkg_install/pkg_create/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/pkg_install/pkg_delete/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/pkg_install/pkg_info/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/tools/pkg_install/Makefile
diff -u /dev/null src/tools/pkg_install/Makefile:1.1
--- /dev/null Tue Dec 1 09:01:46 2009
+++ src/tools/pkg_install/Makefile Tue Dec 1 09:01:45 2009
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2009/12/01 09:01:45 uebayasi Exp $
+
+SUBDIR= lib .WAIT pkg_add pkg_create pkg_delete pkg_info
+# XXX pkg_admin
+
+.include bsd.subdir.mk
Index: src/tools/pkg_install/Makefile.inc
diff -u /dev/null src/tools/pkg_install/Makefile.inc:1.1
--- /dev/null Tue Dec 1 09:01:46 2009
+++ src/tools/pkg_install/Makefile.inc Tue Dec 1 09:01:45 2009
@@ -0,0 +1,3 @@
+HOST_LDFLAGS:= -L../lib -linstall
+
+.include ${NETBSDSRCDIR}/external/bsd/pkg_install/sbin/Makefile.inc
Index: src/tools/pkg_install/pkg_add/Makefile
diff -u /dev/null src/tools/pkg_install/pkg_add/Makefile:1.1
--- /dev/null Tue Dec 1 09:01:46 2009
+++ src/tools/pkg_install/pkg_add/Makefile Tue Dec 1 09:01:46 2009
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2009/12/01 09:01:46 uebayasi Exp $
+
+HOSTPROGNAME= ${_TOOL_PREFIX}pkg_add
+HOST_SRCDIR= external/bsd/pkg_install/sbin/pkg_add
+
+.include ${.CURDIR}/../Makefile.inc
+
+.include ${.CURDIR}/../../Makefile.host
Index: src/tools/pkg_install/pkg_admin/Makefile
diff -u /dev/null src/tools/pkg_install/pkg_admin/Makefile:1.1
--- /dev/null Tue Dec 1 09:01:46 2009
+++ src/tools/pkg_install/pkg_admin/Makefile Tue Dec 1 09:01:46 2009
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2009/12/01 09:01:46 uebayasi Exp $
+
+HOSTPROGNAME= ${_TOOL_PREFIX}pkg_admin
+HOST_SRCDIR= external/bsd/pkg_install/sbin/pkg_admin
+
+.include ${.CURDIR}/../Makefile.inc
+
+.include ${.CURDIR}/../../Makefile.host
Index: src/tools/pkg_install/pkg_create/Makefile
diff -u /dev/null src/tools/pkg_install/pkg_create/Makefile:1.1
--- /dev/null Tue Dec 1 09:01:46 2009
+++ src/tools/pkg_install/pkg_create/Makefile Tue Dec 1 09:01:46 2009
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2009/12/01 09:01:46 uebayasi Exp $
+
+HOSTPROGNAME= ${_TOOL_PREFIX}pkg_create
+HOST_SRCDIR= external/bsd/pkg_install/sbin/pkg_create
+
+.include ${.CURDIR}/../Makefile.inc
+
+.include ${.CURDIR}/../../Makefile.host
Index: src/tools/pkg_install/pkg_delete/Makefile
diff -u /dev/null src/tools/pkg_install/pkg_delete/Makefile:1.1
--- /dev/null Tue Dec 1 09:01:46 2009
+++ src/tools/pkg_install/pkg_delete/Makefile Tue Dec 1 09:01:46 2009
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2009/12/01 09:01:46 uebayasi Exp $
+
+HOSTPROGNAME= ${_TOOL_PREFIX}pkg_delete
+HOST_SRCDIR= external/bsd/pkg_install/sbin/pkg_delete
+
+.include ${.CURDIR}/../Makefile.inc
+
+.include ${.CURDIR}/../../Makefile.host
Index: src/tools/pkg_install/pkg_info/Makefile
diff -u /dev/null src/tools/pkg_install/pkg_info/Makefile:1.1
--- /dev/null Tue Dec 1 09:01:46 2009
+++ src/tools/pkg_install/pkg_info/Makefile Tue Dec 1 09:01:46 2009
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2009/12/01 09:01:46 uebayasi Exp $
+
+HOSTPROGNAME= ${_TOOL_PREFIX}pkg_info
+HOST_SRCDIR= external/bsd/pkg_install/sbin/pkg_info
+
+.include ${.CURDIR}/../Makefile.inc
+
+.include ${.CURDIR}/../../Makefile.host
CVS commit: src/tools
Module Name:src
Committed By: uebayasi
Date: Tue Dec 1 09:08:25 UTC 2009
Modified Files:
src/tools: Makefile.host
Log Message:
Use ${NETBSDSRCDIR} for deep tools/* directories.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/tools/Makefile.host
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile.host
diff -u src/tools/Makefile.host:1.24 src/tools/Makefile.host:1.25
--- src/tools/Makefile.host:1.24 Sun Oct 19 19:38:55 2008
+++ src/tools/Makefile.host Tue Dec 1 09:08:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.host,v 1.24 2008/10/19 19:38:55 apb Exp $
+# $NetBSD: Makefile.host,v 1.25 2009/12/01 09:08:25 uebayasi Exp $
NOINFO= # defined
NOLINT= # defined
@@ -7,7 +7,7 @@
.include bsd.own.mk
.ifndef NOCOMPATLIB
-COMPATOBJ!= cd ${.CURDIR}/../compat ${PRINTOBJDIR}
+COMPATOBJ!= cd ${NETBSDSRCDIR}/compat ${PRINTOBJDIR}
.-include ${COMPATOBJ}/defs.mk
.endif
@@ -18,7 +18,7 @@
.endfor
# Switch over to the real Makefile.
-.PROGDIR:= ${.CURDIR}/../../${HOST_SRCDIR}
+.PROGDIR:= ${NETBSDSRCDIR}/${HOST_SRCDIR}
_CURDIR:= ${.CURDIR}
HOSTPROG?= ${PROG}
CVS commit: src/share/mk
Module Name:src
Committed By: uebayasi
Date: Tue Dec 1 09:09:40 UTC 2009
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Add ${TOOL_PKG_CREATE}.
To generate a diff of this commit:
cvs rdiff -u -r1.598 -r1.599 src/share/mk/bsd.own.mk
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.own.mk
diff -u src/share/mk/bsd.own.mk:1.598 src/share/mk/bsd.own.mk:1.599
--- src/share/mk/bsd.own.mk:1.598 Mon Nov 30 16:13:23 2009
+++ src/share/mk/bsd.own.mk Tue Dec 1 09:09:40 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.598 2009/11/30 16:13:23 uebayasi Exp $
+# $NetBSD: bsd.own.mk,v 1.599 2009/12/01 09:09:40 uebayasi Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -268,6 +268,7 @@
TOOL_MTREE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mtree
TOOL_PAX= ${TOOLDIR}/bin/${_TOOL_PREFIX}pax
TOOL_PIC= ${TOOLDIR}/bin/${_TOOL_PREFIX}pic
+TOOL_PKG_CREATE= ${TOOLDIR}/bin/${_TOOL_PREFIX}pkg_create
TOOL_POWERPCMKBOOTIMAGE=${TOOLDIR}/bin/${_TOOL_PREFIX}powerpc-mkbootimage
TOOL_PWD_MKDB= ${TOOLDIR}/bin/${_TOOL_PREFIX}pwd_mkdb
TOOL_REFER= ${TOOLDIR}/bin/${_TOOL_PREFIX}refer
@@ -337,6 +338,7 @@
TOOL_MTREE= mtree
TOOL_PAX= pax
TOOL_PIC= pic
+TOOL_PKG_CREATE= pkg_create
TOOL_POWERPCMKBOOTIMAGE= powerpc-mkbootimage
TOOL_PWD_MKDB= pwd_mkdb
TOOL_REFER= refer
CVS commit: src/distrib/sets
Module Name:src
Committed By: uebayasi
Date: Tue Dec 1 09:11:45 UTC 2009
Modified Files:
src/distrib/sets: Makefile
Log Message:
Pass ${TOOL_PKG_CREATE} to scripts for syspkg creation.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/Makefile
diff -u src/distrib/sets/Makefile:1.71 src/distrib/sets/Makefile:1.72
--- src/distrib/sets/Makefile:1.71 Mon Nov 30 16:13:23 2009
+++ src/distrib/sets/Makefile Tue Dec 1 09:11:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2009/11/30 16:13:23 uebayasi Exp $
+# $NetBSD: Makefile,v 1.72 2009/12/01 09:11:45 uebayasi Exp $
# The `all' target must appear before bsd.own.mk is pulled in.
all:
@@ -20,6 +20,7 @@
MKTEMP=${TOOL_MKTEMP:Q} \
MTREE=${TOOL_MTREE:Q} \
PAX=${TOOL_PAX:Q} \
+ PKG_CREATE=${TOOL_PKG_CREATE:Q} \
SED=${TOOL_SED:Q} \
TSORT=${TSORT:Q} \
${HOST_SH}
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: martin Date: Tue Dec 1 09:26:36 UTC 2009 Modified Files: src/sys/arch/sparc64/sparc64: cpu.c Log Message: Revert part of previous - the removal of the first cpu to attach is bootstrap cpu requirement already fixed everything - no need to use cf_unit for a bogus test here. To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 src/sys/arch/sparc64/sparc64/cpu.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/sparc64/sparc64/cpu.c diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.86 src/sys/arch/sparc64/sparc64/cpu.c:1.87 --- src/sys/arch/sparc64/sparc64/cpu.c:1.86 Tue Dec 1 00:06:31 2009 +++ src/sys/arch/sparc64/sparc64/cpu.c Tue Dec 1 09:26:36 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.86 2009/12/01 00:06:31 martin Exp $ */ +/* $NetBSD: cpu.c,v 1.87 2009/12/01 09:26:36 martin Exp $ */ /* * Copyright (c) 1996 @@ -52,7 +52,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.86 2009/12/01 00:06:31 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.87 2009/12/01 09:26:36 martin Exp $); #include opt_multiprocessor.h @@ -190,12 +190,14 @@ if (strcmp(cf-cf_name, ma-ma_name) != 0) return 0; +#ifndef MULTIPROCESSOR /* - * Make sure cpu0 attaches to the currently running cpu (which - * is the boot cpu always, as we did not fire up others at this point) + * If we are going to only attach a single cpu, make sure + * to pick the one we are running on right now. */ - if (cf-cf_unit == 0 upaid_from_node(ma-ma_node) != CPU_UPAID) + if (upaid_from_node(ma-ma_node) != CPU_UPAID) return 0; +#endif return 1; }
CVS commit: src/sys/fs/sysvbfs
Module Name:src
Committed By: pooka
Date: Tue Dec 1 09:28:02 UTC 2009
Modified Files:
src/sys/fs/sysvbfs: sysvbfs_vfsops.c
Log Message:
Call VOP_CLOSE() in mount error branch with the device locked to
prevent crash when specfs attempts to unlock the vnode.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/fs/sysvbfs/sysvbfs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/sysvbfs/sysvbfs_vfsops.c
diff -u src/sys/fs/sysvbfs/sysvbfs_vfsops.c:1.30 src/sys/fs/sysvbfs/sysvbfs_vfsops.c:1.31
--- src/sys/fs/sysvbfs/sysvbfs_vfsops.c:1.30 Mon Jun 29 05:08:17 2009
+++ src/sys/fs/sysvbfs/sysvbfs_vfsops.c Tue Dec 1 09:28:02 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sysvbfs_vfsops.c,v 1.30 2009/06/29 05:08:17 dholland Exp $ */
+/* $NetBSD: sysvbfs_vfsops.c,v 1.31 2009/12/01 09:28:02 pooka Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysvbfs_vfsops.c,v 1.30 2009/06/29 05:08:17 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysvbfs_vfsops.c,v 1.31 2009/12/01 09:28:02 pooka Exp $);
#include sys/types.h
#include sys/param.h
@@ -165,37 +165,36 @@
struct sysvbfs_mount *bmp;
struct partinfo dpart;
int error, oflags;
+ bool devopen = false;
vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
error = vinvalbuf(devvp, V_SAVE, cred, l, 0, 0);
- VOP_UNLOCK(devvp, 0);
if (error)
- return error;
+ goto out;
/* Open block device */
oflags = FREAD;
if ((mp-mnt_flag MNT_RDONLY) == 0)
oflags |= FWRITE;
if ((error = VOP_OPEN(devvp, oflags, NOCRED)) != 0)
- return error;
+ goto out;
+ devopen = true;
/* Get partition information */
if ((error = VOP_IOCTL(devvp, DIOCGPART, dpart, FREAD, cred)) != 0) {
- VOP_CLOSE(devvp, oflags, NOCRED);
- return error;
+ goto out;
}
bmp = malloc(sizeof(struct sysvbfs_mount), M_SYSVBFS_VFS, M_WAITOK);
if (bmp == NULL) {
- VOP_CLOSE(devvp, oflags, NOCRED);
- return ENOMEM;
+ error = ENOMEM;
+ goto out;
}
bmp-devvp = devvp;
bmp-mountp = mp;
if ((error = sysvbfs_bfs_init(bmp-bfs, devvp)) != 0) {
- VOP_CLOSE(devvp, oflags, NOCRED);
free(bmp, M_SYSVBFS_VFS);
- return error;
+ goto out;
}
LIST_INIT(bmp-bnode_head);
@@ -210,7 +209,11 @@
DPRINTF(fstype=%d dtype=%d bsize=%d\n, dpart.part-p_fstype,
dpart.disklab-d_type, dpart.disklab-d_secsize);
- return 0;
+ out:
+ if (devopen error)
+ VOP_CLOSE(devvp, oflags, NOCRED);
+ VOP_UNLOCK(devvp, 0);
+ return error;
}
int
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Tue Dec 1 09:50:51 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: intr.c locks.c rump.c rump_private.h
scheduler.c threads.c
Log Message:
Almost there for virtual CPU MP support:
* support bound kernel threads
* bind softint threads to specific virtual cpus
+ remove now-unnecessary locks from softint code
Now, if we only had MI CPU_INFO_FOREACH() (hi rmind ;)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/rump/librump/rumpkern/intr.c
cvs rdiff -u -r1.35 -r1.36 src/sys/rump/librump/rumpkern/locks.c
cvs rdiff -u -r1.142 -r1.143 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.36 -r1.37 src/sys/rump/librump/rumpkern/rump_private.h
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/librump/rumpkern/scheduler.c
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpkern/threads.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/intr.c
diff -u src/sys/rump/librump/rumpkern/intr.c:1.21 src/sys/rump/librump/rumpkern/intr.c:1.22
--- src/sys/rump/librump/rumpkern/intr.c:1.21 Wed Nov 11 16:46:50 2009
+++ src/sys/rump/librump/rumpkern/intr.c Tue Dec 1 09:50:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.21 2009/11/11 16:46:50 pooka Exp $ */
+/* $NetBSD: intr.c,v 1.22 2009/12/01 09:50:51 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.21 2009/11/11 16:46:50 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.22 2009/12/01 09:50:51 pooka Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -58,10 +58,10 @@
};
static struct rumpuser_mtx *si_mtx;
-static struct softint_lev {
+struct softint_lev {
struct rumpuser_cv *si_cv;
LIST_HEAD(, softint) si_pending;
-} softints[SOFTINT_COUNT];
+};
/* rumpuser structures since we call rumpuser interfaces directly */
static struct rumpuser_cv *clockcv;
@@ -117,15 +117,17 @@
for (;;) {
callout_hardclock();
- if (++ticks == hz) {
- time_uptime++;
- ticks = 0;
- }
-
/* wait until the next tick. XXX: what if the clock changes? */
while (rumpuser_cv_timedwait(clockcv, clockmtx,
curtime.tv_sec, curtime.tv_nsec) == 0)
continue;
+
+ /* if !maincpu: continue */
+
+ if (++ticks == hz) {
+ time_uptime++;
+ ticks = 0;
+ }
clkgen++;
timespecadd(clockup, tick, clockup);
@@ -147,11 +149,18 @@
void *funarg;
bool mpsafe;
int mylevel = (uintptr_t)arg;
- struct softint_lev *si_lvl;
+ struct softint_lev *si_lvlp, *si_lvl;
+ struct cpu_data *cd = curcpu()-ci_data;
rump_unschedule();
- si_lvl = softints[mylevel];
+ si_lvlp = cd-cpu_softcpu;
+ si_lvl = si_lvlp[mylevel];
+
+ /*
+ * XXX: si_mtx is unnecessary, and should open an interface
+ * which allows to use schedmtx for the cv wait
+ */
rumpuser_mutex_enter_nowrap(si_mtx);
for (;;) {
if (!LIST_EMPTY(si_lvl-si_pending)) {
@@ -191,38 +200,54 @@
}
void
+rump_intr_init()
+{
+
+ rumpuser_mutex_init(si_mtx);
+ rumpuser_cv_init(clockcv);
+ rumpuser_mutex_init(clockmtx);
+}
+
+void
softint_init(struct cpu_info *ci)
{
+ struct cpu_data *cd = ci-ci_data;
+ struct softint_lev *slev;
int rv, i;
- rumpuser_mutex_init(si_mtx);
+ if (!rump_threads)
+ return;
+
+ slev = kmem_alloc(sizeof(struct softint_lev) * SOFTINT_COUNT, KM_SLEEP);
for (i = 0; i SOFTINT_COUNT; i++) {
- rumpuser_cv_init(softints[i].si_cv);
- LIST_INIT(softints[i].si_pending);
+ rumpuser_cv_init(slev[i].si_cv);
+ LIST_INIT(slev[i].si_pending);
}
+ cd-cpu_softcpu = slev;
- rumpuser_cv_init(clockcv);
- rumpuser_mutex_init(clockmtx);
-
- /* XXX: should have separate wanttimer control */
- if (rump_threads) {
- for (i = 0; i SOFTINT_COUNT; i++) {
- rv = kthread_create(PRI_NONE,
- KTHREAD_MPSAFE | KTHREAD_INTR, NULL,
- sithread, (void *)(uintptr_t)i,
- NULL, rumpsi%d, i);
- }
+ for (i = 0; i SOFTINT_COUNT; i++) {
+ rv = kthread_create(PRI_NONE,
+ KTHREAD_MPSAFE | KTHREAD_INTR, NULL,
+ sithread, (void *)(uintptr_t)i,
+ NULL, rumpsi%d, i);
+ }
- rumpuser_mutex_enter(clockmtx);
- rv = kthread_create(PRI_NONE, KTHREAD_MPSAFE | KTHREAD_INTR,
- NULL, doclock, NULL, NULL, rumpclk);
+ rumpuser_mutex_enter(clockmtx);
+ for (i = 0; i ncpu; i++) {
+ rv = kthread_create(PRI_NONE,
+ KTHREAD_MPSAFE | KTHREAD_INTR,
+ cpu_lookup(i), doclock, NULL, NULL,
+ rumpclk%d, i);
if (rv)
panic(clock thread creation failed: %d, rv);
-
- /* make sure we have a clocktime before returning */
- rumpuser_cv_wait(clockcv, clockmtx);
- rumpuser_mutex_exit(clockmtx);
}
+
+ /*
+ * Make sure we have a clocktime before returning.
+ * XXX: mp
+ */
+ rumpuser_cv_wait(clockcv, clockmtx);
+ rumpuser_mutex_exit(clockmtx);
}
/*
@@ -254,17 +279,17 @@
softint_schedule(void *arg)
{
struct softint *si = arg;
+ struct
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Tue Dec 1 09:52:29 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern emul.c
Log Message:
Include cpu crosscall support (instead of stubbing it out).
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.110 -r1.111 src/sys/rump/librump/rumpkern/emul.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/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.65 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.66
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.65 Fri Nov 27 13:45:15 2009
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Tue Dec 1 09:52:29 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.65 2009/11/27 13:45:15 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.66 2009/12/01 09:52:29 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -41,7 +41,7 @@
SRCS+= subr_devsw.c subr_callback.c subr_copy.c subr_evcnt.c \
subr_extent.c subr_hash.c subr_humanize.c subr_iostat.c \
subr_kobj.c subr_log.c subr_once.c subr_prf.c \
- subr_specificdata.c subr_time.c subr_workqueue.c
+ subr_specificdata.c subr_time.c subr_workqueue.c subr_xcall.c
# sys/uvm
SRCS+= uvm_readahead.c
Index: src/sys/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.110 src/sys/rump/librump/rumpkern/emul.c:1.111
--- src/sys/rump/librump/rumpkern/emul.c:1.110 Thu Nov 26 20:58:51 2009
+++ src/sys/rump/librump/rumpkern/emul.c Tue Dec 1 09:52:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.110 2009/11/26 20:58:51 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.111 2009/12/01 09:52:29 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.110 2009/11/26 20:58:51 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.111 2009/12/01 09:52:29 pooka Exp $);
#include sys/param.h
#include sys/null.h
@@ -492,17 +492,3 @@
return 0;
}
-
-/* crosscalls not done, no other hardware CPUs */
-uint64_t
-xc_broadcast(u_int flags, xcfunc_t func, void *arg1, void *arg2)
-{
-
- return -1;
-}
-
-void
-xc_wait(uint64_t where)
-{
-
-}
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src
Committed By: pooka
Date: Tue Dec 1 09:56:59 UTC 2009
Modified Files:
src/sys/rump/librump/rumpvfs: rump_vfs.c
Log Message:
call cache_cpu_init() for all cpus
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/rump/librump/rumpvfs/rump_vfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpvfs/rump_vfs.c
diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.37 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.38
--- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.37 Fri Nov 27 16:43:51 2009
+++ src/sys/rump/librump/rumpvfs/rump_vfs.c Tue Dec 1 09:56:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_vfs.c,v 1.37 2009/11/27 16:43:51 pooka Exp $ */
+/* $NetBSD: rump_vfs.c,v 1.38 2009/12/01 09:56:59 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump_vfs.c,v 1.37 2009/11/27 16:43:51 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump_vfs.c,v 1.38 2009/12/01 09:56:59 pooka Exp $);
#include sys/param.h
#include sys/buf.h
@@ -77,7 +77,7 @@
{
char buf[64];
int error;
- int rv;
+ int rv, i;
extern int dovfsusermount; /* XXX */
dovfsusermount = 1; /* XXX */
@@ -90,7 +90,10 @@
rumpblk_init();
- cache_cpu_init(rump_cpu);
+ for (i = 0; i ncpu; i++) {
+ struct cpu_info *ci = cpu_lookup(i);
+ cache_cpu_init(ci);
+ }
vfsinit();
bufinit();
wapbl_init();
CVS commit: src/sbin/newfs
Module Name:src Committed By: pooka Date: Tue Dec 1 10:56:33 UTC 2009 Modified Files: src/sbin/newfs: newfs.8 Log Message: Add note saying that special must be a raw device. PR bin/42391 To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sbin/newfs/newfs.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/newfs/newfs.8 diff -u src/sbin/newfs/newfs.8:1.74 src/sbin/newfs/newfs.8:1.75 --- src/sbin/newfs/newfs.8:1.74 Wed Jul 1 02:43:34 2009 +++ src/sbin/newfs/newfs.8 Tue Dec 1 10:56:33 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: newfs.8,v 1.74 2009/07/01 02:43:34 uwe Exp $ +.\ $NetBSD: newfs.8,v 1.75 2009/12/01 10:56:33 pooka Exp $ .\ .\ Copyright (c) 1983, 1987, 1991, 1993, 1994 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)newfs.8 8.6 (Berkeley) 5/3/95 .\ -.Dd May 10, 2009 +.Dd December 1, 2009 .Dt NEWFS 8 .Os .Sh NAME @@ -347,6 +347,18 @@ only if the last character of .Ar special references the same partition as the minor device number. +.Pp +Unless +.Fl F +is specified, +.Ar special +must be a raw device. +This means that for example +.Pa wd0a +or +.Pa /dev/rwd0a +must be specified instead of +.Pa /dev/wd0a . .Sh SEE ALSO .Xr fstat 2 , .Xr disktab 5 ,
CVS commit: src/distrib/sets
Module Name:src
Committed By: apb
Date: Tue Dec 1 15:49:21 UTC 2009
Modified Files:
src/distrib/sets: regpkg regpkgset sets.subr
Log Message:
There's no point in adding _PKGTOOLS_VER=$(${PKG_CREATE} -V)
to any syspkg +BUILD_INFO files, since we don't use the pkg_* tools
to create syspkgs. Also remove the definition of PKG_CREATE
from sets.subr, since nothing uses it now.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/regpkg
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/regpkgset
cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/sets.subr
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/regpkg
diff -u src/distrib/sets/regpkg:1.17 src/distrib/sets/regpkg:1.18
--- src/distrib/sets/regpkg:1.17 Sat Oct 17 23:43:22 2009
+++ src/distrib/sets/regpkg Tue Dec 1 15:49:21 2009
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: regpkg,v 1.17 2009/10/17 23:43:22 agc Exp $
+# $NetBSD: regpkg,v 1.18 2009/12/01 15:49:21 apb Exp $
#
# Copyright (c) 2003,2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -603,10 +603,6 @@
@echo MACHINE_ARCH=${MACHINE_ARCH}
@echo MACHINE_GNU_ARCH=${MACHINE_GNU_ARCH}
EOF
- # XXX: what's the point of reporting _PKGTOOLS_VER
- # when we roll everything by hand without using
- # the pkg tools?
- echo _PKGTOOLS_VER=$(${PKG_CREATE} -V)
} ${SYSPKG_DB_SUBDIR}/+BUILD_INFO
else
cp ${BUILD_INFO_CACHE} ${SYSPKG_DB_SUBDIR}/+BUILD_INFO
@@ -632,7 +628,7 @@
# @name line and a lot of @comment MD5: lines.
#
{
- rcsid='$NetBSD: regpkg,v 1.17 2009/10/17 23:43:22 agc Exp $'
+ rcsid='$NetBSD: regpkg,v 1.18 2009/12/01 15:49:21 apb Exp $'
utcdate=$(${ENV_CMD} TZ=UTC LOCALE=C \
${DATE} '+%Y-%m-%d %H:%M')
user=${USER:-root}
Index: src/distrib/sets/regpkgset
diff -u src/distrib/sets/regpkgset:1.11 src/distrib/sets/regpkgset:1.12
--- src/distrib/sets/regpkgset:1.11 Sat Oct 17 23:43:22 2009
+++ src/distrib/sets/regpkgset Tue Dec 1 15:49:21 2009
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: regpkgset,v 1.11 2009/10/17 23:43:22 agc Exp $
+# $NetBSD: regpkgset,v 1.12 2009/12/01 15:49:21 apb Exp $
#
# Copyright (c) 2003,2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -142,10 +142,6 @@
@echo MACHINE_ARCH=${MACHINE_ARCH}
@echo MACHINE_GNU_ARCH=${MACHINE_GNU_ARCH}
EOF
- # XXX: what's the point of reporting _PKGTOOLS_VER
- # when we roll everything by hand without using
- # the pkg tools?
- echo _PKGTOOLS_VER=$(${PKG_CREATE} -V)
} ${BUILD_INFO_CACHE}
fi
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.92 src/distrib/sets/sets.subr:1.93
--- src/distrib/sets/sets.subr:1.92 Mon Nov 30 16:13:23 2009
+++ src/distrib/sets/sets.subr Tue Dec 1 15:49:21 2009
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.92 2009/11/30 16:13:23 uebayasi Exp $
+# $NetBSD: sets.subr,v 1.93 2009/12/01 15:49:21 apb Exp $
#
#
@@ -101,7 +101,6 @@
: ${MTREE:=mtree}
: ${PASTE:=paste}
: ${PAX:=pax}
-: ${PKG_CREATE:=pkg_create}
: ${PRINTF:=printf}
: ${SED:=sed}
: ${SORT:=sort}
@@ -242,7 +241,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.92 2009/11/30 16:13:23 uebayasi Exp $
+# # $NetBSD: sets.subr,v 1.93 2009/12/01 15:49:21 apb Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
CVS commit: src/sys/arch/hp700/hp700
Module Name:src Committed By: skrll Date: Tue Dec 1 16:20:52 UTC 2009 Modified Files: src/sys/arch/hp700/hp700: machdep.c Log Message: Add a missing '\n' from a printf. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sys/arch/hp700/hp700/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/hp700/machdep.c diff -u src/sys/arch/hp700/hp700/machdep.c:1.75 src/sys/arch/hp700/hp700/machdep.c:1.76 --- src/sys/arch/hp700/hp700/machdep.c:1.75 Fri Nov 27 03:23:09 2009 +++ src/sys/arch/hp700/hp700/machdep.c Tue Dec 1 16:20:52 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.75 2009/11/27 03:23:09 rmind Exp $ */ +/* $NetBSD: machdep.c,v 1.76 2009/12/01 16:20:52 skrll Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.75 2009/11/27 03:23:09 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.76 2009/12/01 16:20:52 skrll Exp $); #include opt_cputype.h #include opt_ddb.h @@ -1640,7 +1640,7 @@ PIM_BUS_BITS); PIM_WORD(\nAssist Check, checks-pim_check_assist, PIM_ASSIST_BITS); - printf(Assist State %u, checks-pim_check_assist_state); + printf(\nAssist State %u, checks-pim_check_assist_state); printf(\nSystem Responder 0x%016lx, (unsigned long)checks-pim_check_responder); printf(\nSystem Requestor 0x%016lx,
CVS commit: src/tools
Module Name:src
Committed By: uebayasi
Date: Tue Dec 1 17:06:34 UTC 2009
Modified Files:
src/tools: Makefile.host
Log Message:
Revert previous, which caused tools build to fail.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/tools/Makefile.host
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile.host
diff -u src/tools/Makefile.host:1.25 src/tools/Makefile.host:1.26
--- src/tools/Makefile.host:1.25 Tue Dec 1 09:08:25 2009
+++ src/tools/Makefile.host Tue Dec 1 17:06:34 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.host,v 1.25 2009/12/01 09:08:25 uebayasi Exp $
+# $NetBSD: Makefile.host,v 1.26 2009/12/01 17:06:34 uebayasi Exp $
NOINFO= # defined
NOLINT= # defined
@@ -7,7 +7,7 @@
.include bsd.own.mk
.ifndef NOCOMPATLIB
-COMPATOBJ!= cd ${NETBSDSRCDIR}/compat ${PRINTOBJDIR}
+COMPATOBJ!= cd ${.CURDIR}/../compat ${PRINTOBJDIR}
.-include ${COMPATOBJ}/defs.mk
.endif
@@ -18,7 +18,7 @@
.endfor
# Switch over to the real Makefile.
-.PROGDIR:= ${NETBSDSRCDIR}/${HOST_SRCDIR}
+.PROGDIR:= ${.CURDIR}/../../${HOST_SRCDIR}
_CURDIR:= ${.CURDIR}
HOSTPROG?= ${PROG}
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: martin
Date: Tue Dec 1 18:51:20 UTC 2009
Modified Files:
src/sys/arch/sparc64/sparc64: db_interface.c
Log Message:
Remove restriction of mach prom to cpu0 - it does not make sense now
that cpu0 is not always the bootstrap cpu, and in the majority of cases
the prom abort will just work fine on any cpu.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/sparc64/sparc64/db_interface.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/sparc64/sparc64/db_interface.c
diff -u src/sys/arch/sparc64/sparc64/db_interface.c:1.118 src/sys/arch/sparc64/sparc64/db_interface.c:1.119
--- src/sys/arch/sparc64/sparc64/db_interface.c:1.118 Sat Nov 21 04:16:52 2009
+++ src/sys/arch/sparc64/sparc64/db_interface.c Tue Dec 1 18:51:20 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.118 2009/11/21 04:16:52 rmind Exp $ */
+/* $NetBSD: db_interface.c,v 1.119 2009/12/01 18:51:20 martin Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.118 2009/11/21 04:16:52 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.119 2009/12/01 18:51:20 martin Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -568,12 +568,6 @@
void
db_prom_cmd(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
{
-
- if (cpu_number()) {
- printf(this command is not safe while running on another
- CPU, please do\n\mach cpu 0\ and then try again\n);
- return;
- }
prom_abort();
}
CVS commit: [netbsd-5] src/sys/arch/amd64
Module Name:src
Committed By: snj
Date: Tue Dec 1 19:29:54 UTC 2009
Modified Files:
src/sys/arch/amd64/amd64 [netbsd-5]: machdep.c
src/sys/arch/amd64/include [netbsd-5]: vmparam.h
Log Message:
Apply patch (requested by bouyer in ticket 1158):
On amd64, add a third free list distinct from the default free list, holding
RAM between 16Mb and 4Gb. This helps preventing bus_dma(9) memory
allocation failures for 32bit DMA on large-memory machines.
To generate a diff of this commit:
cvs rdiff -u -r1.102.4.11 -r1.102.4.12 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.18 -r1.18.20.1 src/sys/arch/amd64/include/vmparam.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/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.102.4.11 src/sys/arch/amd64/amd64/machdep.c:1.102.4.12
--- src/sys/arch/amd64/amd64/machdep.c:1.102.4.11 Sat Oct 3 23:49:50 2009
+++ src/sys/arch/amd64/amd64/machdep.c Tue Dec 1 19:29:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.102.4.11 2009/10/03 23:49:50 snj Exp $ */
+/* $NetBSD: machdep.c,v 1.102.4.12 2009/12/01 19:29:54 snj Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008
@@ -112,7 +112,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.102.4.11 2009/10/03 23:49:50 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.102.4.12 2009/12/01 19:29:54 snj Exp $);
/* #define XENDEBUG_LOW */
@@ -1375,7 +1375,7 @@
struct mem_segment_descriptor *ldt_segp;
int x;
#ifndef XEN
- int first16q, ist;
+ int first16q, first4gq, ist;
extern struct extent *iomem_ex;
uint64_t seg_start, seg_end;
uint64_t seg_start1, seg_end1;
@@ -1585,11 +1585,19 @@
* all of the ISA DMA'able memory won't be eaten up
* first-off).
*/
- if (avail_end = (16 * 1024 * 1024))
+#define ADDR_16M (16 * 1024 * 1024)
+#define ADDR_4G (4ULL * 1024 * 1024 * 1024)
+
+ if (avail_end = ADDR_16M)
first16q = VM_FREELIST_DEFAULT;
else
first16q = VM_FREELIST_FIRST16;
+ if (avail_end = ADDR_4G)
+ first4gq = VM_FREELIST_DEFAULT;
+ else
+ first4gq = VM_FREELIST_FIRST4G;
+
/* Make sure the end of the space used by the kernel is rounded. */
first_avail = round_page(first_avail);
@@ -1636,19 +1644,19 @@
/* First hunk */
if (seg_start != seg_end) {
- if (seg_start (16 * 1024 * 1024)
+ if (seg_start ADDR_16M
first16q != VM_FREELIST_DEFAULT) {
uint64_t tmp;
-if (seg_end (16 * 1024 * 1024))
- tmp = (16 * 1024 * 1024);
+if (seg_end ADDR_16M)
+ tmp = ADDR_16M;
else
tmp = seg_end;
if (tmp != seg_start) {
#ifdef DEBUG_MEMLOAD
- printf(loading 0x%PRIx64-0x%PRIx64
- (0x%lx-0x%lx)\n,
+ printf(loading first16q 0x%PRIx64
+ -0x%PRIx64 (0x%lx-0x%lx)\n,
seg_start, tmp,
atop(seg_start), atop(tmp));
#endif
@@ -1658,10 +1666,32 @@
}
seg_start = tmp;
}
+ if (seg_start ADDR_4G
+ first4gq != VM_FREELIST_DEFAULT) {
+uint64_t tmp;
+
+if (seg_end ADDR_4G)
+ tmp = ADDR_4G;
+else
+ tmp = seg_end;
+
+if (tmp != seg_start) {
+#ifdef DEBUG_MEMLOAD
+ printf(loading first4gq 0x%PRIx64
+ -0x%PRIx64 (0x%lx-0x%lx)\n,
+ seg_start, tmp,
+ atop(seg_start), atop(tmp));
+#endif
+ uvm_page_physload(atop(seg_start),
+ atop(tmp), atop(seg_start),
+ atop(tmp), first4gq);
+}
+seg_start = tmp;
+ }
if (seg_start != seg_end) {
#ifdef DEBUG_MEMLOAD
-printf(loading 0x%PRIx64-0x%PRIx64
+printf(loading default 0x%PRIx64-0x%PRIx64
(0x%lx-0x%lx)\n,
seg_start, seg_end,
atop(seg_start), atop(seg_end));
@@ -1674,19 +1704,19 @@
/* Second hunk */
if (seg_start1 != seg_end1) {
- if (seg_start1 (16 * 1024 * 1024)
+ if (seg_start1 ADDR_16M
first16q != VM_FREELIST_DEFAULT) {
uint64_t tmp;
-if (seg_end1 (16 * 1024 * 1024))
- tmp = (16 * 1024 * 1024);
+if (seg_end1 ADDR_16M)
+ tmp = ADDR_16M;
else
tmp = seg_end1;
if (tmp != seg_start1) {
#ifdef DEBUG_MEMLOAD
- printf(loading 0x%PRIx64-0x%PRIx64
- (0x%lx-0x%lx)\n,
+ printf(loading first16q 0x%PRIx64
+ -0x%PRIx64 (0x%lx-0x%lx)\n,
seg_start1, tmp,
atop(seg_start1), atop(tmp));
#endif
@@ -1696,10 +1726,32 @@
}
seg_start1 = tmp;
}
+ if (seg_start1 ADDR_4G
+ first4gq != VM_FREELIST_DEFAULT) {
+uint64_t tmp;
+
+if (seg_end1 ADDR_4G)
+ tmp = ADDR_4G;
+else
+ tmp = seg_end1;
+
+if (tmp != seg_start1) {
+#ifdef DEBUG_MEMLOAD
+ printf(loading first4gq 0x%PRIx64
+ -0x%PRIx64 (0x%lx-0x%lx)\n,
+ seg_start1, tmp,
+ atop(seg_start1), atop(tmp));
+#endif
+ uvm_page_physload(atop(seg_start1),
+ atop(tmp), atop(seg_start1),
+ atop(tmp), first4gq);
+}
+
CVS commit: [netbsd-5] xsrc/external/mit/xf86-video-radeonhd/include
Module Name:xsrc Committed By: snj Date: Tue Dec 1 19:34:32 UTC 2009 Modified Files: xsrc/external/mit/xf86-video-radeonhd/include [netbsd-5]: config.h Log Message: Apply patch (requested by rafal in ticket 1160): Regenerate xf86-video-radeonhd's config.h. To generate a diff of this commit: cvs rdiff -u -r1.2.2.1 -r1.2.2.2 \ xsrc/external/mit/xf86-video-radeonhd/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-radeonhd/include/config.h diff -u xsrc/external/mit/xf86-video-radeonhd/include/config.h:1.2.2.1 xsrc/external/mit/xf86-video-radeonhd/include/config.h:1.2.2.2 --- xsrc/external/mit/xf86-video-radeonhd/include/config.h:1.2.2.1 Thu Sep 17 03:34:13 2009 +++ xsrc/external/mit/xf86-video-radeonhd/include/config.h Tue Dec 1 19:34:32 2009 @@ -20,7 +20,7 @@ #define HAVE_DLFCN_H 1 /* have RotateFreeShadow API */ -/* #undef HAVE_FREE_SHADOW */ +#define HAVE_FREE_SHADOW 1 /* Define to 1 if you have the inttypes.h header file. */ #define HAVE_INTTYPES_H 1 @@ -99,7 +99,7 @@ #define STDC_HEADERS 1 /* Build support for DRI */ -/* #undef USE_DRI */ +#define USE_DRI 1 /* Build support for Exa */ #define USE_EXA 1 @@ -108,6 +108,6 @@ #define VERSION 1.2.5 /* xf86CrtcFuncsRec has member set_mode_major */ -/* #undef XF86CRTCFUNCS_HAS_SETMODEMAJOR */ +#define XF86CRTCFUNCS_HAS_SETMODEMAJOR 1 #endif
CVS commit: [netbsd-5] src/sys/arch/i386/pnpbios
Module Name:src Committed By: snj Date: Tue Dec 1 19:37:03 UTC 2009 Modified Files: src/sys/arch/i386/pnpbios [netbsd-5]: fdc_pnpbios.c Log Message: Pull up following revision(s) (requested by cube in ticket #1161): sys/arch/i386/pnpbios/fdc_pnpbios.c: revision 1.15 Properly fix f...@pnpbios as shown by Brian Buhrow in PR#42374. I think it tells a lot about the relevancy of that attachment when it took 20 months for someone to experience the issue and even then, acpi had to be disabled. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.14.10.1 src/sys/arch/i386/pnpbios/fdc_pnpbios.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/pnpbios/fdc_pnpbios.c diff -u src/sys/arch/i386/pnpbios/fdc_pnpbios.c:1.14 src/sys/arch/i386/pnpbios/fdc_pnpbios.c:1.14.10.1 --- src/sys/arch/i386/pnpbios/fdc_pnpbios.c:1.14 Mon Apr 28 20:23:25 2008 +++ src/sys/arch/i386/pnpbios/fdc_pnpbios.c Tue Dec 1 19:37:03 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: fdc_pnpbios.c,v 1.14 2008/04/28 20:23:25 martin Exp $ */ +/* $NetBSD: fdc_pnpbios.c,v 1.14.10.1 2009/12/01 19:37:03 snj Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: fdc_pnpbios.c,v 1.14 2008/04/28 20:23:25 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: fdc_pnpbios.c,v 1.14.10.1 2009/12/01 19:37:03 snj Exp $); #include rnd.h @@ -92,6 +92,7 @@ aprint_normal(\n); + fdc-sc_dev = self; fdc-sc_ic = aa-ic; if (pnpbios_io_map(aa-pbt, aa-resc, 0, fdc-sc_iot,
CVS commit: [netbsd-5] src/sys/arch/amiga/amiga
Module Name:src
Committed By: snj
Date: Tue Dec 1 19:40:10 UTC 2009
Modified Files:
src/sys/arch/amiga/amiga [netbsd-5]: machdep.c
Log Message:
Pull up following revision(s) (requested by mhitch in ticket #1166):
sys/arch/amiga/amiga/machdep.c: revision 1.222
Remove old legacy IPL_* settings in ipl2spl_table - they are redundant
and in the case of IPL_AUDIO, results in IPL_VM blocking all interrupts.
[IPL_AUDIO is now the same as IPL_VM, and was setting the IPL_VM entry
to PSL_IPL6. IPL_SERIAL had a duplicate entry for some reason, and
serial drivers that check and modify IPL_SERIAL now shouldn't be affected
since IPL_SERIAL is now the same as IPL_HIGH. I'm hoping this will fix
or at least help the problem of serial interrupts being blocked too long.
To generate a diff of this commit:
cvs rdiff -u -r1.209.6.1 -r1.209.6.2 src/sys/arch/amiga/amiga/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/amiga/amiga/machdep.c
diff -u src/sys/arch/amiga/amiga/machdep.c:1.209.6.1 src/sys/arch/amiga/amiga/machdep.c:1.209.6.2
--- src/sys/arch/amiga/amiga/machdep.c:1.209.6.1 Mon Feb 2 03:30:32 2009
+++ src/sys/arch/amiga/amiga/machdep.c Tue Dec 1 19:40:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.209.6.1 2009/02/02 03:30:32 snj Exp $ */
+/* $NetBSD: machdep.c,v 1.209.6.2 2009/12/01 19:40:09 snj Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -85,7 +85,7 @@
#include opt_panicbutton.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.209.6.1 2009/02/02 03:30:32 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.209.6.2 2009/12/01 19:40:09 snj Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1497,19 +1497,12 @@
int ipl2spl_table[_NIPL] = {
[IPL_NONE] = PSL_IPL0|PSL_S,
[IPL_SOFTCLOCK] = PSL_IPL1|PSL_S,
- [IPL_BIO] = PSL_IPL3|PSL_S,
- [IPL_NET] = PSL_IPL3|PSL_S,
- [IPL_TTY] = PSL_IPL4|PSL_S,
- [IPL_SERIAL] = PSL_IPL5|PSL_S,
[IPL_VM] = PSL_IPL4|PSL_S,
- [IPL_SERIAL] = PSL_IPL4|PSL_S, /* patched by some devices at attach
- time (currently, only the coms) */
- [IPL_AUDIO] = PSL_IPL6|PSL_S,
#if defined(LEV6_DEFER)
- [IPL_CLOCK] = PSL_IPL4|PSL_S,
+ [IPL_SCHED] = PSL_IPL4|PSL_S,
[IPL_HIGH] = PSL_IPL4|PSL_S,
#else /* defined(LEV6_DEFER) */
- [IPL_CLOCK] = PSL_IPL6|PSL_S,
+ [IPL_SCHED] = PSL_IPL6|PSL_S,
[IPL_HIGH] = PSL_IPL7|PSL_S,
#endif /* defined(LEV6_DEFER) */
};
CVS commit: [netbsd-5] xsrc/external/mit/xf86-video-ati/include
Module Name:xsrc Committed By: snj Date: Tue Dec 1 19:44:53 UTC 2009 Modified Files: xsrc/external/mit/xf86-video-ati/include [netbsd-5]: config.h Log Message: Apply patch (requested by rafal in ticket 1176): Regenerate xf86-video-ati's config.h. To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 \ xsrc/external/mit/xf86-video-ati/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-ati/include/config.h diff -u xsrc/external/mit/xf86-video-ati/include/config.h:1.1.2.1 xsrc/external/mit/xf86-video-ati/include/config.h:1.1.2.2 --- xsrc/external/mit/xf86-video-ati/include/config.h:1.1.2.1 Thu Sep 17 03:33:47 2009 +++ xsrc/external/mit/xf86-video-ati/include/config.h Tue Dec 1 19:44:53 2009 @@ -16,7 +16,7 @@ #define HAVE_DLFCN_H 1 /* have new FreeShadow API */ -/* #undef HAVE_FREE_SHADOW */ +#define HAVE_FREE_SHADOW 1 /* Define to 1 if you have the inttypes.h header file. */ #define HAVE_INTTYPES_H 1 @@ -25,7 +25,7 @@ #define HAVE_MEMORY_H 1 /* Have pci_device_enable prototype */ -/* #undef HAVE_PCI_DEVICE_ENABLE */ +#define HAVE_PCI_DEVICE_ENABLE 1 /* Define to 1 if you have the stdint.h header file. */ #define HAVE_STDINT_H 1 @@ -49,10 +49,10 @@ #define HAVE_UNISTD_H 1 /* Have xf86_crtc_clip_video_helper prototype */ -/* #undef HAVE_XF86CRTCCLIPVIDEOHELPER */ +#define HAVE_XF86CRTCCLIPVIDEOHELPER 1 /* Have xf86ModeBandwidth prototype */ -/* #undef HAVE_XF86MODEBANDWIDTH */ +#define HAVE_XF86MODEBANDWIDTH 1 /* Have xf86XVFillKeyHelperDrawable prototype */ #define HAVE_XV_DRAWABLE_HELPER 1
CVS commit: [netbsd-5] src/usr.sbin/rpc.lockd
Module Name:src
Committed By: snj
Date: Tue Dec 1 19:48:05 UTC 2009
Modified Files:
src/usr.sbin/rpc.lockd [netbsd-5]: lockd_lock.c
Log Message:
Pull up following revision(s) (requested by tron in ticket #1174):
usr.sbin/rpc.lockd/lockd_lock.c: revision 1.31
allow comparing v2 and v3 filehandles.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.12.1 src/usr.sbin/rpc.lockd/lockd_lock.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.lockd/lockd_lock.c
diff -u src/usr.sbin/rpc.lockd/lockd_lock.c:1.28 src/usr.sbin/rpc.lockd/lockd_lock.c:1.28.12.1
--- src/usr.sbin/rpc.lockd/lockd_lock.c:1.28 Sun Nov 4 23:12:50 2007
+++ src/usr.sbin/rpc.lockd/lockd_lock.c Tue Dec 1 19:48:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lockd_lock.c,v 1.28 2007/11/04 23:12:50 christos Exp $ */
+/* $NetBSD: lockd_lock.c,v 1.28.12.1 2009/12/01 19:48:05 snj Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -62,11 +62,7 @@
static int
fhcmp(const nfs_fhandle_t *fh1, const nfs_fhandle_t *fh2)
{
-
- if (fh1-fhsize != fh2-fhsize) {
- return 1;
- }
- return memcmp(fh1-fhdata, fh2-fhdata, fh1-fhsize);
+ return memcmp(fh1-fhdata, fh2-fhdata, MIN(fh1-fhsize, fh2-fhsize));
}
static int
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Tue Dec 1 19:51:22 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Tickets 1158, 1160, 1161, 1166, 1174, and 1176. To generate a diff of this commit: cvs rdiff -u -r1.1.2.148 -r1.1.2.149 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.148 src/doc/CHANGES-5.1:1.1.2.149 --- src/doc/CHANGES-5.1:1.1.2.148 Sat Nov 28 19:00:03 2009 +++ src/doc/CHANGES-5.1 Tue Dec 1 19:51:22 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.148 2009/11/28 19:00:03 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.149 2009/12/01 19:51:22 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14986,3 +14986,37 @@ Fix PR kern/42318 and PR kern/42377 [bouyer, ticket #1171] +sys/arch/amd64/amd64/machdep.c +sys/arch/amd64/include/vmparam.h + + On amd64, add a third free list distinct from the default free + list, holding RAM between 16Mb and 4Gb. This helps preventing + bus_dma(9) memory allocation failures for 32bit DMA on + large-memory machines. + [bouyer, ticket #1158] + +xsrc/external/mit/xf86-video-radeonhd/include/config.h + + Regenerate xf86-video-radeohd's config.h. + [rafal, ticket #1160] + +sys/arch/i386/pnpbios/fdc_pnpbios.c 1.15 + + Fix attaching f...@pnpbios. Closes PR#42374. + [cube, ticket #1161] + +sys/arch/amiga/amiga/machdep.c 1.222 + + Correct the IPL_VM interrupt level mask. + [mhitch, ticket #1166] + +xsrc/external/mit/xf86-video-ati/include/config.h + + Regenerate xf86-video-ati's config.h. + [rafal, ticket #1176] + +usr.sbin/rpc.lockd/lockd_lock.c 1.31 + + Allow comparing v2 and v3 filehandles. + [tron, ticket #1174] +
CVS commit: src/crypto/external/bsd/netpgp/dist/bindings
Module Name:src
Committed By: agc
Date: Tue Dec 1 20:44:50 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/bindings/perl: Makefile netpgp.pl
netpgpperl.i netpgpperl_wrap.c shlib_version
src/crypto/external/bsd/netpgp/dist/bindings/swig: swigit
src/crypto/external/bsd/netpgp/dist/bindings/tcl: Makefile netpgptcl.i
netpgptcl_wrap.c shlib_version
Log Message:
Re-instate perl taint checking by re-defining the possible taint check in
swig. Fix a bug whereby the generated shlib_version file got appended to,
rather than rewritten.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/bindings/perl/Makefile \
src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl.i \
src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl_wrap.c \
src/crypto/external/bsd/netpgp/dist/bindings/perl/shlib_version
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/bindings/swig/swigit
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/bindings/tcl/Makefile \
src/crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl.i \
src/crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl_wrap.c \
src/crypto/external/bsd/netpgp/dist/bindings/tcl/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/bindings/perl/Makefile
diff -u src/crypto/external/bsd/netpgp/dist/bindings/perl/Makefile:1.1 src/crypto/external/bsd/netpgp/dist/bindings/perl/Makefile:1.2
--- src/crypto/external/bsd/netpgp/dist/bindings/perl/Makefile:1.1 Tue Dec 1 06:43:57 2009
+++ src/crypto/external/bsd/netpgp/dist/bindings/perl/Makefile Tue Dec 1 20:44:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/12/01 06:43:57 agc Exp $
+# $NetBSD: Makefile,v 1.2 2009/12/01 20:44:50 agc Exp $
# Automatically generated by swigit wrapper script
PREFIX=/usr/pkg
Index: src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl.i
diff -u src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl.i:1.1 src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl.i:1.2
--- src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl.i:1.1 Tue Dec 1 06:43:57 2009
+++ src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl.i Tue Dec 1 20:44:50 2009
@@ -1,5 +1,7 @@
%module netpgpperl
%{
#include netpgp.h
+#undef SvPOK
+#define SvPOK(x) 1
%}
%include netpgp.h
Index: src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl_wrap.c
diff -u src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl_wrap.c:1.1 src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl_wrap.c:1.2
--- src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl_wrap.c:1.1 Tue Dec 1 06:43:57 2009
+++ src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl_wrap.c Tue Dec 1 20:44:50 2009
@@ -1445,6 +1445,8 @@
#include netpgp.h
+#undef SvPOK
+#define SvPOK(x) 1
#include limits.h
Index: src/crypto/external/bsd/netpgp/dist/bindings/perl/shlib_version
diff -u src/crypto/external/bsd/netpgp/dist/bindings/perl/shlib_version:1.1 src/crypto/external/bsd/netpgp/dist/bindings/perl/shlib_version:1.2
--- src/crypto/external/bsd/netpgp/dist/bindings/perl/shlib_version:1.1 Tue Dec 1 06:43:57 2009
+++ src/crypto/external/bsd/netpgp/dist/bindings/perl/shlib_version Tue Dec 1 20:44:50 2009
@@ -1,22 +1,2 @@
major=0
minor=0
-major=0
-minor=0
-major=0
-minor=0
-major=0
-minor=0
-major=0
-minor=0
-major=0
-minor=0
-major=0
-minor=0
-major=0
-minor=0
-major=0
-minor=0
-major=0
-minor=0
-major=0
-minor=0
Index: src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl
diff -u src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl:1.2 src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl:1.3
--- src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl:1.2 Tue Dec 1 08:02:50 2009
+++ src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl Tue Dec 1 20:44:50 2009
@@ -1,4 +1,4 @@
-#! /usr/pkg/bin/perl -w
+#! /usr/pkg/bin/perl -wT
# netpgp bindings for perl
Index: src/crypto/external/bsd/netpgp/dist/bindings/swig/swigit
diff -u src/crypto/external/bsd/netpgp/dist/bindings/swig/swigit:1.2 src/crypto/external/bsd/netpgp/dist/bindings/swig/swigit:1.3
--- src/crypto/external/bsd/netpgp/dist/bindings/swig/swigit:1.2 Tue Dec 1 06:33:31 2009
+++ src/crypto/external/bsd/netpgp/dist/bindings/swig/swigit Tue Dec 1 20:44:50 2009
@@ -44,6 +44,8 @@
;;
perl)
dir=$(pkg_info -qL perl | awk '/EXTERN.h/ { gsub(/EXTERN.h$, ); print }')
+ cstrings1='#undef SvPOK'
+ cstrings2='#define SvPOK(x) 1'
incpath='CPPFLAGS+=-I'$dir
;;
python)
@@ -64,6 +66,8 @@
%module ${module}${lang}
%{
#include ${module}.h
+${cstrings1}
+${cstrings2}
%}
%include ${module}.h
EOF
@@
CVS commit: src/sys/arch/hp700/dev
Module Name:src Committed By: skrll Date: Tue Dec 1 22:36:32 UTC 2009 Modified Files: src/sys/arch/hp700/dev: dino.c Log Message: Typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hp700/dev/dino.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/dev/dino.c diff -u src/sys/arch/hp700/dev/dino.c:1.16 src/sys/arch/hp700/dev/dino.c:1.17 --- src/sys/arch/hp700/dev/dino.c:1.16 Mon Nov 9 13:33:08 2009 +++ src/sys/arch/hp700/dev/dino.c Tue Dec 1 22:36:31 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: dino.c,v 1.16 2009/11/09 13:33:08 skrll Exp $ */ +/* $NetBSD: dino.c,v 1.17 2009/12/01 22:36:31 skrll Exp $ */ /* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dino.c,v 1.16 2009/11/09 13:33:08 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: dino.c,v 1.17 2009/12/01 22:36:31 skrll Exp $); /* #include cardbus.h */ @@ -511,7 +511,7 @@ int i, error; /* - * Allow allocation only when PCI MEM is already maped. + * Allow allocation only when PCI MEM is already mapped. * Needed to avoid allocation of I/O space used by devices that * have no driver in the current kernel. * Dino can map PCI MEM in the range 0xf080..0xff80 only.
CVS commit: src/external/gpl2/lvm2/dist
Module Name:src
Committed By: haad
Date: Tue Dec 1 23:11:17 UTC 2009
Modified Files:
src/external/gpl2/lvm2/dist/include: dm-ioctl.h
src/external/gpl2/lvm2/dist/libdm/ioctl: libdm-nbsd-iface.c
libdm_netbsd.c
Log Message:
Revert my commit which added knowledge about dm targets to libdevmapper,
this breaks abstraction. Because only lvmtools/lvmlib and device-mapper can
have knowledge about target mapping and libdevmapper only passes requests
from lvmtools to kernel and back. Bump major library and driver version.
Requested by: yamt@
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/lvm2/dist/include/dm-ioctl.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/lvm2/dist/include/dm-ioctl.h
diff -u src/external/gpl2/lvm2/dist/include/dm-ioctl.h:1.2 src/external/gpl2/lvm2/dist/include/dm-ioctl.h:1.3
--- src/external/gpl2/lvm2/dist/include/dm-ioctl.h:1.2 Fri Jun 5 20:11:21 2009
+++ src/external/gpl2/lvm2/dist/include/dm-ioctl.h Tue Dec 1 23:11:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dm-ioctl.h,v 1.2 2009/06/05 20:11:21 haad Exp $ */
+/* $NetBSD: dm-ioctl.h,v 1.3 2009/12/01 23:11:17 haad Exp $ */
/*
* Copyright (C) 2001 - 2003 Sistina Software (UK) Limited.
@@ -259,7 +259,7 @@
#define DM_TARGET_MSG _IOWR(DM_IOCTL, DM_TARGET_MSG_CMD, struct dm_ioctl)
#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
-#define DM_VERSION_MAJOR 4
+#define DM_VERSION_MAJOR 6
#define DM_VERSION_MINOR 15
#define DM_VERSION_PATCHLEVEL 0
#define DM_VERSION_EXTRA -ioctl (2008-04-23)
Index: src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c
diff -u src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c:1.2 src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c:1.3
--- src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c:1.2 Fri Jun 5 19:57:25 2009
+++ src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c Tue Dec 1 23:11:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: libdm-nbsd-iface.c,v 1.2 2009/06/05 19:57:25 haad Exp $*/
+/* $NetBSD: libdm-nbsd-iface.c,v 1.3 2009/12/01 23:11:17 haad Exp $*/
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
@@ -367,8 +367,6 @@
nbsd_get_dm_major(dm_major, DM_BLOCK_MAJOR);
- log_error(format_dev %d--%d %d, dev_major, dev_minor, bufsize);
-
if (bufsize 8)
return 0;
@@ -595,7 +593,6 @@
{
prop_array_t cmd_array;
prop_dictionary_t target_spec;
- prop_dictionary_t target_param;
struct target *t;
@@ -620,10 +617,7 @@
strlcpy(type,t-type,DM_MAX_TYPE_NAME);
prop_dictionary_set_cstring(target_spec,DM_TABLE_TYPE,type);
-
- target_param = nbsd_dm_parse_param(type, t-params);
- prop_dictionary_set(target_spec, DM_TABLE_PARAMS, target_param);
- prop_object_release(target_param);
+ prop_dictionary_set_cstring(target_spec,DM_TABLE_PARAMS,t-params);
prop_array_set(cmd_array,count,target_spec);
Index: src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c
diff -u src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c:1.3 src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c:1.4
--- src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c:1.3 Tue Jun 9 18:29:09 2009
+++ src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c Tue Dec 1 23:11:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: libdm_netbsd.c,v 1.3 2009/06/09 18:29:09 haad Exp $*/
+/* $NetBSD: libdm_netbsd.c,v 1.4 2009/12/01 23:11:17 haad Exp $*/
/*
* Copyright (c) 1996, 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -39,7 +39,6 @@
#include stdio.h
#include stdlib.h
-#include string.h
#include unistd.h
#include netbsd-dm.h
@@ -48,11 +47,6 @@
#include lib.h
-struct nbsd_dm_target_param {
- char *name;
- prop_dictionary_t (*parse)(char *);
-};
-
#define DMI_SIZE 16 * 1024
static int dm_list_versions(prop_dictionary_t, struct dm_ioctl *);
@@ -60,206 +54,6 @@
static int dm_dev_deps(prop_dictionary_t, struct dm_ioctl *);
static int dm_table_status(prop_dictionary_t, struct dm_ioctl *);
-static prop_dictionary_t dm_parse_linear(char *);
-static prop_dictionary_t dm_parse_stripe(char *);
-static prop_dictionary_t dm_parse_mirror(char *);
-static prop_dictionary_t dm_parse_snapshot(char *);
-static prop_dictionary_t dm_parse_snapshot_origin(char *);
-static prop_dictionary_t dm_parse_default(char *);
-
-static struct nbsd_dm_target_param dmt_parse[] = {
- {linear, dm_parse_linear},
- {striped, dm_parse_stripe},
- {mirror, dm_parse_mirror},
- {snapshot, dm_parse_snapshot},
- {snapshot-origin, dm_parse_snapshot_origin},
- {NULL, NULL},
-};
-
-/*
- * Parse params string to target specific proplib dictionary.
CVS commit: src
Module Name:src
Committed By: haad
Date: Tue Dec 1 23:12:10 UTC 2009
Modified Files:
src/external/gpl2/lvm2/lib/libdevmapper: netbsd-dm.h
src/sys/dev/dm: dm.h dm_ioctl.c dm_target_error.c dm_target_linear.c
dm_target_mirror.c dm_target_snapshot.c dm_target_stripe.c
dm_target_zero.c netbsd-dm.h
Log Message:
Revert my commit which have added knowledge about dm targets to libdevmapper,
this breaks abstraction. Because only lvmtools/lvmlib and device-mapper can
have knowledge about target mapping and libdevmapper only passes requests
from lvmtools to kernel and back. Bump major library and driver version.
Requested by: yamt@
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/lvm2/lib/libdevmapper/netbsd-dm.h
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/dm/dm.h src/sys/dev/dm/dm_ioctl.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/dm/dm_target_error.c \
src/sys/dev/dm/dm_target_zero.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/dm/dm_target_linear.c \
src/sys/dev/dm/dm_target_stripe.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/dm/dm_target_mirror.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/dm/dm_target_snapshot.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/dm/netbsd-dm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/lvm2/lib/libdevmapper/netbsd-dm.h
diff -u src/external/gpl2/lvm2/lib/libdevmapper/netbsd-dm.h:1.3 src/external/gpl2/lvm2/lib/libdevmapper/netbsd-dm.h:1.4
--- src/external/gpl2/lvm2/lib/libdevmapper/netbsd-dm.h:1.3 Tue Jun 9 18:24:02 2009
+++ src/external/gpl2/lvm2/lib/libdevmapper/netbsd-dm.h Tue Dec 1 23:12:09 2009
@@ -1,4 +1,4 @@
-/*$NetBSD: netbsd-dm.h,v 1.3 2009/06/09 18:24:02 haad Exp $ */
+/*$NetBSD: netbsd-dm.h,v 1.4 2009/12/01 23:12:09 haad Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -287,8 +287,6 @@
int nbsd_dm_add_uint(const char *, uint64_t, prop_dictionary_t);
int nbsd_dm_add_str(const char *, char *, prop_dictionary_t );
-prop_dictionary_t nbsd_dm_parse_param(const char *, const char *);
-
struct dm_ioctl* nbsd_dm_dict_to_dmi(prop_dictionary_t, const int);
#endif /* __LIB_DEVMAPPER__ */
Index: src/sys/dev/dm/dm.h
diff -u src/sys/dev/dm/dm.h:1.14 src/sys/dev/dm/dm.h:1.15
--- src/sys/dev/dm/dm.h:1.14 Fri Jun 5 21:52:31 2009
+++ src/sys/dev/dm/dm.h Tue Dec 1 23:12:09 2009
@@ -1,4 +1,4 @@
-/*$NetBSD: dm.h,v 1.14 2009/06/05 21:52:31 haad Exp $ */
+/*$NetBSD: dm.h,v 1.15 2009/12/01 23:12:09 haad Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -51,8 +51,8 @@
#define DM_NAME_LEN 128
#define DM_UUID_LEN 129
-#define DM_VERSION_MAJOR 5
-#define DM_VERSION_MINOR 13
+#define DM_VERSION_MAJOR 6
+#define DM_VERSION_MINOR 15
#define DM_VERSION_PATCHLEVEL 0
/*** Internal device-mapper structures ***/
@@ -209,7 +209,7 @@
typedef struct dm_target {
char name[DM_MAX_TYPE_NAME];
/* Initialize target_config area */
- int (*init)(dm_dev_t *, void **, prop_dictionary_t);
+ int (*init)(dm_dev_t *, void **, char *);
/* Destroy target_config area */
int (*destroy)(dm_table_entry_t *);
@@ -281,7 +281,7 @@
#define DM_MAX_PARAMS_SIZE 1024
/* dm_target_zero.c */
-int dm_target_zero_init(dm_dev_t *, void**, prop_dictionary_t);
+int dm_target_zero_init(dm_dev_t *, void**, char *);
char * dm_target_zero_status(void *);
int dm_target_zero_strategy(dm_table_entry_t *, struct buf *);
int dm_target_zero_destroy(dm_table_entry_t *);
@@ -289,7 +289,7 @@
int dm_target_zero_upcall(dm_table_entry_t *, struct buf *);
/* dm_target_error.c */
-int dm_target_error_init(dm_dev_t *, void**, prop_dictionary_t);
+int dm_target_error_init(dm_dev_t *, void**, char *);
char * dm_target_error_status(void *);
int dm_target_error_strategy(dm_table_entry_t *, struct buf *);
int dm_target_error_deps(dm_table_entry_t *, prop_array_t);
@@ -297,7 +297,7 @@
int dm_target_error_upcall(dm_table_entry_t *, struct buf *);
/* dm_target_linear.c */
-int dm_target_linear_init(dm_dev_t *, void**, prop_dictionary_t);
+int dm_target_linear_init(dm_dev_t *, void**, char *);
char * dm_target_linear_status(void *);
int dm_target_linear_strategy(dm_table_entry_t *, struct buf *);
int dm_target_linear_deps(dm_table_entry_t *, prop_array_t);
@@ -308,7 +308,7 @@
uint64_t atoi(const char *);
/* dm_target_mirror.c */
-int dm_target_mirror_init(dm_dev_t *, void**, prop_dictionary_t);
+int dm_target_mirror_init(dm_dev_t *, void**, char *);
char * dm_target_mirror_status(void *);
int dm_target_mirror_strategy(dm_table_entry_t *, struct buf *);
int dm_target_mirror_deps(dm_table_entry_t *, prop_array_t);
@@ -316,7 +316,7 @@
int dm_target_mirror_upcall(dm_table_entry_t *, struct buf *);
/* dm_target_stripe.c */
-int dm_target_stripe_init(dm_dev_t *, void**, prop_dictionary_t);
+int dm_target_stripe_init(dm_dev_t *, void**, char *);
char *
CVS commit: src/external/gpl2/lvm2
Module Name:src
Committed By: haad
Date: Tue Dec 1 23:12:51 UTC 2009
Modified Files:
src/external/gpl2/lvm2/lib/libdevmapper: Makefile
src/external/gpl2/lvm2/sbin/lvm: Makefile
Log Message:
Remove not needed debugging CFLAGS.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/lvm2/lib/libdevmapper/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/lvm2/sbin/lvm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/lvm2/lib/libdevmapper/Makefile
diff -u src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.2 src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.3
--- src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.2 Mon Dec 22 01:48:10 2008
+++ src/external/gpl2/lvm2/lib/libdevmapper/Makefile Tue Dec 1 23:12:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/12/22 01:48:10 haad Exp $
+# $NetBSD: Makefile,v 1.3 2009/12/01 23:12:51 haad Exp $
USE_SHLIBDIR= yes
USE_FORT?= no
@@ -8,8 +8,6 @@
LIB= devmapper
-CFLAGS+= -fno-inline
-
CPPFLAGS+= -I${LIBDM_DISTDIR} -I${LIBDM_DISTDIR}/misc -I${LIBDM_DISTDIR}/mm \
-I${LIBDM_DISTDIR}/datastruct -I${LIBDM_DISTDIR}/ioctl \
-I${LVM2_DISTDIR}/include -I${LIBDM_SRCDIR} -D__NetBSD__
Index: src/external/gpl2/lvm2/sbin/lvm/Makefile
diff -u src/external/gpl2/lvm2/sbin/lvm/Makefile:1.6 src/external/gpl2/lvm2/sbin/lvm/Makefile:1.7
--- src/external/gpl2/lvm2/sbin/lvm/Makefile:1.6 Tue Jan 13 22:38:00 2009
+++ src/external/gpl2/lvm2/sbin/lvm/Makefile Tue Dec 1 23:12:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/01/13 22:38:00 haad Exp $
+# $NetBSD: Makefile,v 1.7 2009/12/01 23:12:51 haad Exp $
USE_FORT?= no
NOLINT= #defined
@@ -22,7 +22,6 @@
vgmknodes.c vgreduce.c vgremove.c vgrename.c vgscan.c \
vgsplit.c lvm.c
-CFLAGS+= -fno-inline
CPPFLAGS+= -I${LVM2_DISTDIR}/lib -I${LVM2_DISTDIR}/include \
-I. -I${LIBDM_INCLUDE} -I${LVM2_DISTDIR}/tools \
CVS commit: src/sys/arch/ews4800mips/ews4800mips
Module Name:src Committed By: skrll Date: Tue Dec 1 23:14:02 UTC 2009 Modified Files: src/sys/arch/ews4800mips/ews4800mips: machdep.c Log Message: Fix build. Hi rmind. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/ews4800mips/ews4800mips/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/ews4800mips/ews4800mips/machdep.c diff -u src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.19 src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.20 --- src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.19 Fri Nov 27 03:23:09 2009 +++ src/sys/arch/ews4800mips/ews4800mips/machdep.c Tue Dec 1 23:14:02 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.19 2009/11/27 03:23:09 rmind Exp $ */ +/* $NetBSD: machdep.c,v 1.20 2009/12/01 23:14:02 skrll Exp $ */ /*- * Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.19 2009/11/27 03:23:09 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.20 2009/12/01 23:14:02 skrll Exp $); #include opt_ddb.h @@ -117,7 +117,7 @@ sbd_init(); __asm volatile(move %0, $29 : =r(v)); - printf(kernel_text=%p edata=%p end=%p sp=%p\n, kernel_text, edata, + printf(kernel_text=%p edata=%p end=%p sp=%lx\n, kernel_text, edata, end, v); option(argc, argv, bi);
CVS commit: src/sys
Module Name:src
Committed By: skrll
Date: Tue Dec 1 23:16:01 UTC 2009
Modified Files:
src/sys/arch/ews4800mips/sbd: if_iee_sbdio.c
src/sys/arch/hp700/gsc: if_iee_gsc.c
src/sys/dev/ic: i82596var.h
Log Message:
Spell busy correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ews4800mips/sbd/if_iee_sbdio.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp700/gsc/if_iee_gsc.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/i82596var.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/ews4800mips/sbd/if_iee_sbdio.c
diff -u src/sys/arch/ews4800mips/sbd/if_iee_sbdio.c:1.9 src/sys/arch/ews4800mips/sbd/if_iee_sbdio.c:1.10
--- src/sys/arch/ews4800mips/sbd/if_iee_sbdio.c:1.9 Sun May 10 04:26:19 2009
+++ src/sys/arch/ews4800mips/sbd/if_iee_sbdio.c Tue Dec 1 23:16:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iee_sbdio.c,v 1.9 2009/05/10 04:26:19 tsutsui Exp $ */
+/* $NetBSD: if_iee_sbdio.c,v 1.10 2009/12/01 23:16:00 skrll Exp $ */
/*
* Copyright (c) 2003 Jochen Kunz.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_iee_sbdio.c,v 1.9 2009/05/10 04:26:19 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_iee_sbdio.c,v 1.10 2009/12/01 23:16:00 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -147,12 +147,12 @@
int
iee_sbdio_reset(struct iee_softc *sc)
{
-#define IEE_ISCP_BUSSY 0x1
+#define IEE_ISCP_BUSY 0x1
int n, retry = 8;
uint32_t cmd, ack;
/* Make sure the busy byte is set and the cache is flushed. */
- SC_ISCP(sc)-iscp_bussy = IEE_ISCP_BUSSY;
+ SC_ISCP(sc)-iscp_busy = IEE_ISCP_BUSY;
IEE_ISCPSYNC(sc, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
/* Setup the PORT Command with pointer to SCP. */
@@ -168,9 +168,9 @@
/* Wait for the chip to initialize and read SCP and ISCP. */
for (n = 0 ; n retry; n++) {
IEE_ISCPSYNC(sc, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
- ack = SC_ISCP(sc)-iscp_bussy;
+ ack = SC_ISCP(sc)-iscp_busy;
IEE_ISCPSYNC(sc, BUS_DMASYNC_PREREAD);
- if (ack != IEE_ISCP_BUSSY) {
+ if (ack != IEE_ISCP_BUSY) {
break;
}
delay(100);
Index: src/sys/arch/hp700/gsc/if_iee_gsc.c
diff -u src/sys/arch/hp700/gsc/if_iee_gsc.c:1.15 src/sys/arch/hp700/gsc/if_iee_gsc.c:1.16
--- src/sys/arch/hp700/gsc/if_iee_gsc.c:1.15 Sun May 24 06:53:35 2009
+++ src/sys/arch/hp700/gsc/if_iee_gsc.c Tue Dec 1 23:16:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iee_gsc.c,v 1.15 2009/05/24 06:53:35 skrll Exp $ */
+/* $NetBSD: if_iee_gsc.c,v 1.16 2009/12/01 23:16:01 skrll Exp $ */
/*
* Copyright (c) 2003 Jochen Kunz.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_iee_gsc.c,v 1.15 2009/05/24 06:53:35 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_iee_gsc.c,v 1.16 2009/12/01 23:16:01 skrll Exp $);
/* autoconfig and device stuff */
#include sys/param.h
@@ -82,7 +82,7 @@
#define IEE_GSC_RESET 0
#define IEE_GSC_PORT 4
#define IEE_GSC_CHANATT 8
-#define IEE_ISCP_BUSSY 0x1
+#define IEE_ISCP_BUSY 0x1
/* autoconfig stuff */
static int iee_gsc_match(device_t, cfdata_t, void *);
@@ -142,8 +142,8 @@
uint32_t cmd;
uint16_t ack;
- /* Make sure the bussy byte is set and the cache is flushed. */
- SC_ISCP(sc)-iscp_bussy = IEE_ISCP_BUSSY;
+ /* Make sure the busy byte is set and the cache is flushed. */
+ SC_ISCP(sc)-iscp_busy = IEE_ISCP_BUSY;
IEE_ISCPSYNC(sc, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
/* Setup the PORT Command with pointer to SCP. */
cmd = IEE_PORT_SCP | IEE_PHYS_SHMEM(sc-sc_scp_off);
@@ -170,9 +170,9 @@
/* Wait for the chip to initialize and read SCP and ISCP. */
for (n = 0 ; n 1000; n++) {
IEE_ISCPSYNC(sc, BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE);
- ack = SC_ISCP(sc)-iscp_bussy;
+ ack = SC_ISCP(sc)-iscp_busy;
IEE_ISCPSYNC(sc, BUS_DMASYNC_PREREAD);
- if (ack != IEE_ISCP_BUSSY)
+ if (ack != IEE_ISCP_BUSY)
break;
DELAY(100);
}
@@ -181,8 +181,8 @@
(sc-sc_iee_cmd)(sc, IEE_SCB_ACK);
return 0;
}
- printf(%s: iee_gsc_reset timeout bussy=0x%x\n,
- device_xname(sc-sc_dev), SC_ISCP(sc)-iscp_bussy);
+ printf(%s: iee_gsc_reset timeout busy=0x%x\n,
+ device_xname(sc-sc_dev), SC_ISCP(sc)-iscp_busy);
return -1;
}
Index: src/sys/dev/ic/i82596var.h
diff -u src/sys/dev/ic/i82596var.h:1.14 src/sys/dev/ic/i82596var.h:1.15
--- src/sys/dev/ic/i82596var.h:1.14 Sun May 10 04:26:19 2009
+++ src/sys/dev/ic/i82596var.h Tue Dec 1 23:16:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: i82596var.h,v 1.14 2009/05/10 04:26:19 tsutsui Exp $ */
+/* $NetBSD: i82596var.h,v 1.15 2009/12/01 23:16:01 skrll Exp $ */
/*
* Copyright (c) 2003 Jochen Kunz.
@@ -51,7 +51,7 @@
/* Intermediate System Configuration Pointer */
struct iee_iscp {
- volatile uint16_t iscp_bussy; /* Even Word, bits 0..15 */
+ volatile uint16_t iscp_busy; /* Even Word, bits 0..15 */
volatile uint16_t iscp_pad; /* Odd Word, bits 16..32 */
volatile uint32_t
CVS commit: [netbsd-5] xsrc/external/mit/pixman/dist
Module Name:xsrc
Committed By: snj
Date: Tue Dec 1 23:18:41 UTC 2009
Added Files:
xsrc/external/mit/pixman/dist/pixman [netbsd-5]:
pixman-x64-mmx-emulation.h
xsrc/external/mit/pixman/dist/test [netbsd-5]: blitters-test.c
window-test.c
Log Message:
Apply patch (requested by mrg in ticket 1177):
Update pixman to 0.16.2.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.1.1.2.2 \
xsrc/external/mit/pixman/dist/pixman/pixman-x64-mmx-emulation.h
cvs rdiff -u -r0 -r1.1.1.1.2.2 \
xsrc/external/mit/pixman/dist/test/blitters-test.c \
xsrc/external/mit/pixman/dist/test/window-test.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: xsrc/external/mit/pixman/dist/pixman/pixman-x64-mmx-emulation.h
diff -u /dev/null xsrc/external/mit/pixman/dist/pixman/pixman-x64-mmx-emulation.h:1.1.1.1.2.2
--- /dev/null Tue Dec 1 23:18:41 2009
+++ xsrc/external/mit/pixman/dist/pixman/pixman-x64-mmx-emulation.h Tue Dec 1 23:18:40 2009
@@ -0,0 +1,263 @@
+#ifndef MMX_X64_H_INCLUDED
+#define MMX_X64_H_INCLUDED
+
+/* Implementation of x64 MMX substitition functions, before
+ * pixman is reimplemented not to use __m64 type on Visual C++
+ *
+ * Copyright (C)2009 by George Yohng
+ * Released in public domain.
+ */
+
+#include intrin.h
+
+#define M64C(a) (*(const __m64 *)(a))
+#define M64U(a) (*(const unsigned long long *)(a))
+
+__inline __m64
+_m_from_int (int a)
+{
+long long i64 = a;
+
+return M64C (i64);
+}
+
+__inline __m64
+_mm_setzero_si64 ()
+{
+long long i64 = 0;
+
+return M64C (i64);
+}
+
+__inline __m64
+_mm_set_pi32 (int i1, int i0)
+{
+unsigned long long i64 = ((unsigned)i0) + (((unsigned long long)(unsigned)i1) 32);
+
+return M64C (i64);
+}
+
+__inline void
+_m_empty ()
+{
+}
+
+__inline __m64
+_mm_set1_pi16 (short w)
+{
+unsigned long long i64 = ((unsigned long long)(unsigned short)(w)) * 0x0001000100010001ULL;
+
+return M64C (i64);
+}
+
+__inline int
+_m_to_int (__m64 m)
+{
+return m.m64_i32[0];
+}
+
+__inline __m64
+_mm_movepi64_pi64 (__m128i a)
+{
+return M64C (a.m128i_i64[0]);
+}
+
+__inline __m64
+_m_pand (__m64 a, __m64 b)
+{
+unsigned long long i64 = M64U (a) M64U (b);
+
+return M64C (i64);
+}
+
+__inline __m64
+_m_por (__m64 a, __m64 b)
+{
+unsigned long long i64 = M64U (a) | M64U (b);
+
+return M64C (i64);
+}
+
+__inline __m64
+_m_pxor (__m64 a, __m64 b)
+{
+unsigned long long i64 = M64U (a) ^ M64U (b);
+
+return M64C (i64);
+}
+
+__inline __m64
+_m_pmulhuw (__m64 a, __m64 b)/* unoptimized */
+{
+unsigned short d[4] =
+{
+ (unsigned short)unsigned)a.m64_u16[0]) * b.m64_u16[0]) 16),
+ (unsigned short)unsigned)a.m64_u16[1]) * b.m64_u16[1]) 16),
+ (unsigned short)unsigned)a.m64_u16[2]) * b.m64_u16[2]) 16),
+ (unsigned short)unsigned)a.m64_u16[3]) * b.m64_u16[3]) 16)
+};
+
+return M64C (d[0]);
+}
+
+__inline __m64
+_m_pmullw2 (__m64 a, __m64 b)/* unoptimized */
+{
+unsigned short d[4] =
+{
+ (unsigned short)unsigned)a.m64_u16[0]) * b.m64_u16[0])),
+ (unsigned short)unsigned)a.m64_u16[1]) * b.m64_u16[1])),
+ (unsigned short)unsigned)a.m64_u16[2]) * b.m64_u16[2])),
+ (unsigned short)unsigned)a.m64_u16[3]) * b.m64_u16[3]))
+};
+
+return M64C (d[0]);
+}
+
+__inline __m64
+_m_pmullw (__m64 a, __m64 b)/* unoptimized */
+{
+unsigned long long x =
+ ((unsigned long long)(unsigned short)unsigned)a.m64_u16[0]) * b.m64_u16[0]))) +
+ (((unsigned long long)(unsigned short)unsigned)a.m64_u16[1]) * b.m64_u16[1]))) 16) +
+ (((unsigned long long)(unsigned short)unsigned)a.m64_u16[2]) * b.m64_u16[2]))) 32) +
+ (((unsigned long long)(unsigned short)unsigned)a.m64_u16[3]) * b.m64_u16[3]))) 48);
+
+return M64C (x);
+}
+
+__inline __m64
+_m_paddusb (__m64 a, __m64 b)/* unoptimized */
+{
+unsigned long long x = (M64U (a) 0x00FF00FF00FF00FFULL) +
+ (M64U (b) 0x00FF00FF00FF00FFULL);
+
+unsigned long long y = ((M64U (a) 8) 0x00FF00FF00FF00FFULL) +
+ ((M64U (b) 8) 0x00FF00FF00FF00FFULL);
+
+x |= ((x 0xFF00FF00FF00FF00ULL) 8) * 0xFF;
+y |= ((y 0xFF00FF00FF00FF00ULL) 8) * 0xFF;
+
+x = (x 0x00FF00FF00FF00FFULL) | ((y 0x00FF00FF00FF00FFULL) 8);
+
+return M64C (x);
+}
+
+__inline __m64
+_m_paddusw (__m64 a, __m64 b)/* unoptimized */
+{
+unsigned long long x = (M64U (a) 0xULL) +
+ (M64U (b) 0xULL);
+
+unsigned long long y = ((M64U (a) 16) 0xULL) +
+ ((M64U (b) 16) 0xULL);
+
+x |= ((x 0x) 16) * 0x;
+y |= ((y 0x) 16) * 0x;
+
+x = (x 0xULL) | ((y 0xULL) 16);
+
+return M64C (x);
+}
+
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Tue Dec 1 23:32:19 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1177. To generate a diff of this commit: cvs rdiff -u -r1.1.2.149 -r1.1.2.150 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.149 src/doc/CHANGES-5.1:1.1.2.150 --- src/doc/CHANGES-5.1:1.1.2.149 Tue Dec 1 19:51:22 2009 +++ src/doc/CHANGES-5.1 Tue Dec 1 23:32:19 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.149 2009/12/01 19:51:22 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.150 2009/12/01 23:32:19 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -15020,3 +15020,55 @@ Allow comparing v2 and v3 filehandles. [tron, ticket #1174] +external/mit/xorg/lib/pixman/Makefile 1.10 +xsrc/external/mit/pixman/config.h.in patch +xsrc/external/mit/pixman/configure patch +xsrc/external/mit/pixman/configure.ac patch +xsrc/external/mit/pixman/pixman/Makefile.am patch +xsrc/external/mit/pixman/pixman/Makefile.in patch +xsrc/external/mit/pixman/pixman/Makefile.win32 patch +xsrc/external/mit/pixman/pixman/pixman-access.c patch +xsrc/external/mit/pixman/pixman/pixman-accessor.h patch +xsrc/external/mit/pixman/pixman/pixman-arm-neon.c patch +xsrc/external/mit/pixman/pixman/pixman-arm-simd.c patch +xsrc/external/mit/pixman/pixman/pixman-bits-image.c patch +xsrc/external/mit/pixman/pixman/pixman-combine.c.template patch +xsrc/external/mit/pixman/pixman/pixman-combine.h.template patch +xsrc/external/mit/pixman/pixman/pixman-combine32.c patch +xsrc/external/mit/pixman/pixman/pixman-combine32.h patch +xsrc/external/mit/pixman/pixman/pixman-combine64.c patch +xsrc/external/mit/pixman/pixman/pixman-combine64.h patch +xsrc/external/mit/pixman/pixman/pixman-conical-gradient.c patch +xsrc/external/mit/pixman/pixman/pixman-cpu.c patch +xsrc/external/mit/pixman/pixman/pixman-edge.c patch +xsrc/external/mit/pixman/pixman/pixman-fast-path.c patch +xsrc/external/mit/pixman/pixman/pixman-general.c patch +xsrc/external/mit/pixman/pixman/pixman-gradient-walker.c patch +xsrc/external/mit/pixman/pixman/pixman-image.c patch +xsrc/external/mit/pixman/pixman/pixman-implementation.c patch +xsrc/external/mit/pixman/pixman/pixman-linear-gradient.c patch +xsrc/external/mit/pixman/pixman/pixman-mmx.c patch +xsrc/external/mit/pixman/pixman/pixman-private.h patch +xsrc/external/mit/pixman/pixman/pixman-radial-gradient.c patch +xsrc/external/mit/pixman/pixman/pixman-region.c patch +xsrc/external/mit/pixman/pixman/pixman-solid-fill.c patch +xsrc/external/mit/pixman/pixman/pixman-sse2.c patch +xsrc/external/mit/pixman/pixman/pixman-trap.c patch +xsrc/external/mit/pixman/pixman/pixman-utils.c patch +xsrc/external/mit/pixman/pixman/pixman-version.h patch +xsrc/external/mit/pixman/pixman/pixman-vmx.c patch +xsrc/external/mit/pixman/pixman/pixman-x86-mmx-emulation.h patch +xsrc/external/mit/pixman/pixman/pixman.c patch +xsrc/external/mit/pixman/pixman/pixman.h patch +xsrc/external/mit/pixman/test/Makefile.am patch +xsrc/external/mit/pixman/test/Makefile.in patch +xsrc/external/mit/pixman/test/blitters-test.c patch +xsrc/external/mit/pixman/test/composite-test.c patch +xsrc/external/mit/pixman/test/fetch-test.c patch +xsrc/external/mit/pixman/test/window-test.c patch +xsrc/external/mit/include/config.h patch + + - Disable using SSE2 for i386. + - Update pixman to 0.16.2. + [mrg, ticket #1177] +
CVS commit: src/external/gpl2/lvm2/dist
Module Name:src Committed By: haad Date: Wed Dec 2 00:59:19 UTC 2009 Modified Files: src/external/gpl2/lvm2/dist: lvm2netbsd Log Message: Fix comment about running ./configure script. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 src/external/gpl2/lvm2/dist/lvm2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/lvm2/dist/lvm2netbsd diff -u src/external/gpl2/lvm2/dist/lvm2netbsd:1.1.1.3 src/external/gpl2/lvm2/dist/lvm2netbsd:1.2 --- src/external/gpl2/lvm2/dist/lvm2netbsd:1.1.1.3 Wed Dec 2 00:25:39 2009 +++ src/external/gpl2/lvm2/dist/lvm2netbsd Wed Dec 2 00:59:19 2009 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: lvm2netbsd,v 1.1.1.3 2009/12/02 00:25:39 haad Exp $ +# $NetBSD: lvm2netbsd,v 1.2 2009/12/02 00:59:19 haad Exp $ # # Copyright (c) 2003 The NetBSD Foundation, Inc. # All rights reserved. @@ -34,7 +34,7 @@ # # ./configure --with-cluster=none --with-snapshots=internal --with-clvmd=none # --with-lvm1=none --with-cluster=none --disable-readline --enable-o_direct -# --enable-devmapper +# --disable-udev_sync --enable-devmapper # # based on texinfo2netbsd #
CVS commit: src/external/gpl2/lvm2/dist
Module Name:src Committed By: haad Date: Wed Dec 2 01:53:25 UTC 2009 Modified Files: src/external/gpl2/lvm2/dist/include: configure.h dm-ioctl.h src/external/gpl2/lvm2/dist/lib/commands: toolcontext.c src/external/gpl2/lvm2/dist/lib/device: dev-io.c dev-swap.c src/external/gpl2/lvm2/dist/lib/filters: filter_netbsd.c src/external/gpl2/lvm2/dist/libdm/ioctl: libdm-nbsd-iface.c Log Message: Fix build, add missing symbols, remove unknown ioctls etc. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/lvm2/dist/include/configure.h cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/lvm2/dist/include/dm-ioctl.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c cvs rdiff -u -r1.5 -r1.6 src/external/gpl2/lvm2/dist/lib/device/dev-io.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl2/lvm2/dist/lib/device/dev-swap.c cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl2/lvm2/dist/lib/filters/filter_netbsd.c cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/lvm2/dist/include/configure.h diff -u src/external/gpl2/lvm2/dist/include/configure.h:1.3 src/external/gpl2/lvm2/dist/include/configure.h:1.4 --- src/external/gpl2/lvm2/dist/include/configure.h:1.3 Wed Feb 18 12:16:13 2009 +++ src/external/gpl2/lvm2/dist/include/configure.h Wed Dec 2 01:53:25 2009 @@ -1,3 +1,5 @@ +/* $NetBSD: configure.h,v 1.4 2009/12/02 01:53:25 haad Exp $ */ + /* lib/misc/configure.h. Generated from configure.h.in by configure. */ /* lib/misc/configure.h.in. Generated from configure.in by autoheader. */ @@ -7,6 +9,9 @@ /* Define to 1 to include built-in support for clustered LVM locking. */ /* #undef CLUSTER_LOCKING_INTERNAL */ +/* Path to cmirrord pidfile. */ +/* #undef CMIRRORD_PIDFILE */ + /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ @@ -15,6 +20,9 @@ /* Define to 1 if using `alloca.c'. */ /* #undef C_ALLOCA */ +/* Define to 0 to reinstate the pre-2.02.54 handling of unit suffixes. */ +/* #undef DEFAULT_SI_UNIT_CONSISTENCY */ + /* Define to 1 to enable LVM2 device-mapper interaction. */ #define DEVMAPPER_SUPPORT 1 @@ -28,7 +36,7 @@ /* #undef DMEVENTD_PIDFILE */ /* Library version */ -#define DM_LIB_VERSION 1.02.30 (2009-01-26) +#define DM_LIB_VERSION 1.02.40 (2009-11-24) /* Define to 1 if you have `alloca', as a function or macro. */ #define HAVE_ALLOCA 1 @@ -46,6 +54,12 @@ /* Define to 1 if canonicalize_file_name is available. */ /* #undef HAVE_CANONICALIZE_FILE_NAME */ +/* Define to 1 if you have the ccs.h header file. */ +/* #undef HAVE_CCS_H */ + +/* Define to 1 if you have the corosync/confdb.h header file. */ +/* #undef HAVE_COROSYNC_CONFDB_H */ + /* Define to 1 if you have the ctype.h header file. */ #define HAVE_CTYPE_H 1 @@ -91,12 +105,21 @@ /* Define to 1 if you have the inttypes.h header file. */ #define HAVE_INTTYPES_H 1 +/* Define to 1 if you have the libcman.h header file. */ +/* #undef HAVE_LIBCMAN_H */ + /* Define to 1 if dynamic libraries are available. */ /* #undef HAVE_LIBDL */ +/* Define to 1 if you have the libdlm.h header file. */ +/* #undef HAVE_LIBDLM_H */ + /* Define to 1 if you have the libgen.h header file. */ #define HAVE_LIBGEN_H 1 +/* Define to 1 if you have the libgulm.h header file. */ +/* #undef HAVE_LIBGULM_H */ + /* Define to 1 if you have the libintl.h header file. */ /* #undef HAVE_LIBINTL_H */ @@ -192,6 +215,9 @@ /* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 +/* Define to 1 if you have the `siginterrupt' function. */ +#define HAVE_SIGINTERRUPT 1 + /* Define to 1 if you have the signal.h header file. */ #define HAVE_SIGNAL_H 1 @@ -269,6 +295,9 @@ /* Define to 1 if you have the sys/ioctl.h header file. */ #define HAVE_SYS_IOCTL_H 1 +/* Define to 1 if you have the sys/ipc.h header file. */ +/* #undef HAVE_SYS_IPC_H */ + /* Define to 1 if you have the sys/mman.h header file. */ #define HAVE_SYS_MMAN_H 1 @@ -288,6 +317,9 @@ /* Define to 1 if you have the sys/select.h header file. */ /* #undef HAVE_SYS_SELECT_H */ +/* Define to 1 if you have the sys/sem.h header file. */ +/* #undef HAVE_SYS_SEM_H */ + /* Define to 1 if you have the sys/socket.h header file. */ /* #undef HAVE_SYS_SOCKET_H */ @@ -321,6 +353,10 @@ /* Define to 1 if you have the time.h header file. */ #define HAVE_TIME_H 1 +/* Define to 1 if libudev's udev_queue_get_udev_is_active function is + available. */ +/* #undef HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE */ + /* Define to 1 if you have the `uname' function. */ #define HAVE_UNAME 1 @@ -418,6 +454,9 @@ /* Define to 1 if your sys/time.h declares `struct tm'. */ /*
CVS commit: src/external/gpl2/lvm2/lib/liblvm
Module Name:src
Committed By: haad
Date: Wed Dec 2 01:54:20 UTC 2009
Modified Files:
src/external/gpl2/lvm2/lib/liblvm: Makefile
Log Message:
Add two more needed files dev-swap.c and unknown.c.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/lvm2/lib/liblvm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/lvm2/lib/liblvm/Makefile
diff -u src/external/gpl2/lvm2/lib/liblvm/Makefile:1.3 src/external/gpl2/lvm2/lib/liblvm/Makefile:1.4
--- src/external/gpl2/lvm2/lib/liblvm/Makefile:1.3 Tue Jan 13 22:33:05 2009
+++ src/external/gpl2/lvm2/lib/liblvm/Makefile Wed Dec 2 01:54:20 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/01/13 22:33:05 ahoka Exp $
+# $NetBSD: Makefile,v 1.4 2009/12/02 01:54:20 haad Exp $
LIBISPRIVATE= yes
@@ -22,7 +22,7 @@
CPPFLAGS.imLcLkup.c=-Wno-error
SRCS+= activate.c lvmcache.c toolcontext.c config.c btree.c \
- str_list.c dev-cache.c dev-io.c dev-md.c device.c \
+ str_list.c dev-cache.c dev-io.c dev-md.c device.c dev-swap.c \
display.c errseg.c filter-composite.c \
filter-persistent.c \
filter-regex.c filter-sysfs.c filter-md.c archive.c \
@@ -32,7 +32,8 @@
merge.c metadata.c mirror.c pv_manip.c pv_map.c segtype.c \
snapshot_manip.c crc.c lvm-exec.c lvm-file.c lvm-string.c \
lvm-wrappers.c timestamp.c util.c memlock.c report.c \
- striped.c uuid.c zero.c disk-rep.c format1.c import-export.c \
+ striped.c unknown.c uuid.c zero.c disk-rep.c format1.c \
+ import-export.c \
import-extents.c layout.c lvm1-label.c vg_number.c \
disk_rep.c format_pool.c import_export.c pool_label.c \
filter_netbsd.c snapshot.c mirrored.c dev_manager.c fs.c dev.c \
@@ -64,6 +65,7 @@
.PATH: ${LVM2_DISTDIR}/lib/report
.PATH: ${LVM2_DISTDIR}/lib/snapshot
.PATH: ${LVM2_DISTDIR}/lib/striped
+.PATH: ${LVM2_DISTDIR}/lib/unknown
.PATH: ${LVM2_DISTDIR}/lib/uuid
.PATH: ${LVM2_DISTDIR}/lib/zero
.PATH: ${LVM2_DISTDIR}/lib/netbsd
CVS commit: src/doc
Module Name:src Committed By: haad Date: Wed Dec 2 02:07:02 UTC 2009 Modified Files: src/doc: 3RDPARTY Log Message: Mention lvm2tools update. To generate a diff of this commit: cvs rdiff -u -r1.734 -r1.735 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.734 src/doc/3RDPARTY:1.735 --- src/doc/3RDPARTY:1.734 Sat Nov 21 03:29:14 2009 +++ src/doc/3RDPARTY Wed Dec 2 02:07:02 2009 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.734 2009/11/21 03:29:14 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.735 2009/12/02 02:07:02 haad Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -545,8 +545,8 @@ leave it alone. (garbled 1/4/2001) Package: libdevmapper -Version: 1.02.29 -Current Vers: 1.02.30 +Version: 1.02.40 +Current Vers: 1.02.40 Maintainer: lvm-de...@redhat.com Archive Site: ftp://sources.redhat.com/pub/lvm2/ Home Page: http://sources.redhat.com/lvm2/ @@ -567,8 +567,8 @@ Notes: Package: lvm2tools -Version: 2.02.43 -Current Vers: 2.02.45 +Version: 2.02.56 +Current Vers: 2.02.56 Maintainer: lvm-de...@redhat.com Archive Site: ftp://sources.redhat.com/pub/lvm2/ Home Page: http://sources.redhat.com/lvm2/
CVS commit: src/doc
Module Name:src Committed By: haad Date: Wed Dec 2 02:07:30 UTC 2009 Modified Files: src/doc: CHANGES Log Message: Mention lvm2tools update. To generate a diff of this commit: cvs rdiff -u -r1.1324 -r1.1325 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.1324 src/doc/CHANGES:1.1325 --- src/doc/CHANGES:1.1324 Mon Nov 30 16:22:33 2009 +++ src/doc/CHANGES Wed Dec 2 02:07:30 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1324 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1325 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -494,3 +494,6 @@ udl(4): Add a driver for DisplayLink DL-1x0/1x5 based USB LCDs and USB-VGA adaptors. Ported from OpenBSD by FUKAUMI Naoki with many modification. [tsutsui 20091130] + lvm: Import new lvm2tools 2.02.56 version and libdevmapper 1.02.40. + [haad 20091202] +
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: mrg Date: Wed Dec 2 07:34:57 UTC 2009 Modified Files: src/sys/arch/sparc64/sparc64: trap.c Log Message: print pid, lid and p_comm in some diag messages that indicate killed processes. To generate a diff of this commit: cvs rdiff -u -r1.159 -r1.160 src/sys/arch/sparc64/sparc64/trap.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/sparc64/sparc64/trap.c diff -u src/sys/arch/sparc64/sparc64/trap.c:1.159 src/sys/arch/sparc64/sparc64/trap.c:1.160 --- src/sys/arch/sparc64/sparc64/trap.c:1.159 Sat Nov 21 04:16:52 2009 +++ src/sys/arch/sparc64/sparc64/trap.c Wed Dec 2 07:34:57 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.159 2009/11/21 04:16:52 rmind Exp $ */ +/* $NetBSD: trap.c,v 1.160 2009/12/02 07:34:57 mrg Exp $ */ /* * Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved. @@ -50,7 +50,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.159 2009/11/21 04:16:52 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.160 2009/12/02 07:34:57 mrg Exp $); #include opt_ddb.h #include opt_multiprocessor.h @@ -620,7 +620,8 @@ case T_INST_EXCEPT: case T_TEXTFAULT: /* This is not an MMU issue */ - printf(trap: textfault at %lx!! sending SIGILL due to trap %d: %s\n, + printf(trap: pid=%d.%d comm=%s textfault at %lx!! sending SIGILL due to trap %d: %s\n, + l-l_proc-p_pid, l-l_lid, l-l_proc-p_comm, pc, type, type N_TRAP_TYPES ? trap_type[type] : T); #if defined(DDB) defined(DEBUG) if (trapdebug TDB_STOPSIG) @@ -634,7 +635,8 @@ break; case T_PRIVINST: - printf(trap: privinst!! sending SIGILL due to trap %d: %s\n, + printf(trap: pid=%d.%d comm=%s privinst!! sending SIGILL due to trap %d: %s\n, + l-l_proc-p_pid, l-l_lid, l-l_proc-p_comm, type, type N_TRAP_TYPES ? trap_type[type] : T); #if defined(DDB) defined(DEBUG) if (trapdebug TDB_STOPSIG)
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: mrg Date: Wed Dec 2 07:55:01 UTC 2009 Modified Files: src/sys/arch/sparc64/sparc64: cpu.c Log Message: count IPI's as interrupts, not misc counters. To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/sys/arch/sparc64/sparc64/cpu.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/sparc64/sparc64/cpu.c diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.87 src/sys/arch/sparc64/sparc64/cpu.c:1.88 --- src/sys/arch/sparc64/sparc64/cpu.c:1.87 Tue Dec 1 09:26:36 2009 +++ src/sys/arch/sparc64/sparc64/cpu.c Wed Dec 2 07:55:01 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.87 2009/12/01 09:26:36 martin Exp $ */ +/* $NetBSD: cpu.c,v 1.88 2009/12/02 07:55:01 mrg Exp $ */ /* * Copyright (c) 1996 @@ -52,7 +52,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.87 2009/12/01 09:26:36 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.88 2009/12/02 07:55:01 mrg Exp $); #include opt_multiprocessor.h @@ -267,10 +267,10 @@ ci-ci_cpcb = lwp_getpcb(ci-ci_data.cpu_idlelwp); } for (i = 0; i IPI_EVCNT_NUM; ++i) - evcnt_attach_dynamic(ci-ci_ipi_evcnt[i], EVCNT_TYPE_MISC, + evcnt_attach_dynamic(ci-ci_ipi_evcnt[i], EVCNT_TYPE_INTR, NULL, device_xname(dev), ipi_evcnt_names[i]); #endif - evcnt_attach_dynamic(ci-ci_tick_evcnt, EVCNT_TYPE_MISC, NULL, + evcnt_attach_dynamic(ci-ci_tick_evcnt, EVCNT_TYPE_INTR, NULL, device_xname(dev), timer); clk = prom_getpropint(node, clock-frequency, 0);
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: mrg
Date: Wed Dec 2 07:55:53 UTC 2009
Modified Files:
src/sys/arch/sparc64/sparc64: db_interface.c
Log Message:
print the fplwp in mach cpu list.
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/sparc64/sparc64/db_interface.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/sparc64/sparc64/db_interface.c
diff -u src/sys/arch/sparc64/sparc64/db_interface.c:1.119 src/sys/arch/sparc64/sparc64/db_interface.c:1.120
--- src/sys/arch/sparc64/sparc64/db_interface.c:1.119 Tue Dec 1 18:51:20 2009
+++ src/sys/arch/sparc64/sparc64/db_interface.c Wed Dec 2 07:55:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.119 2009/12/01 18:51:20 martin Exp $ */
+/* $NetBSD: db_interface.c,v 1.120 2009/12/02 07:55:53 mrg Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.119 2009/12/01 18:51:20 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.120 2009/12/02 07:55:53 mrg Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -1141,9 +1141,10 @@
struct cpu_info *ci;
for (ci = cpus; ci; ci = ci-ci_next) {
- db_printf(cpu%d: self 0x%08lx lwp 0x%08lx pcb 0x%08lx\n,
- ci-ci_index, (u_long)ci-ci_self,
- (u_long)ci-ci_curlwp, (u_long)ci-ci_cpcb);
+ db_printf(cpu%d: self 0x%08lx lwp 0x%08lx pcb 0x%08lx
+ fplwp 0x%08lx\n, ci-ci_index, (u_long)ci-ci_self,
+ (u_long)ci-ci_curlwp, (u_long)ci-ci_cpcb,
+ (u_long)ci-ci_fplwp);
}
}
