CVS commit: src/doc
Module Name:src Committed By: matt Date: Sat Mar 12 08:03:06 UTC 2011 Modified Files: src/doc: HACKS Log Message: Add note of gcc build HACKS for powerpc. To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/HACKS diff -u src/doc/HACKS:1.114 src/doc/HACKS:1.115 --- src/doc/HACKS:1.114 Fri Apr 23 02:12:58 2010 +++ src/doc/HACKS Sat Mar 12 08:03:06 2011 @@ -1,4 +1,4 @@ -# $NetBSD: HACKS,v 1.114 2010/04/23 02:12:58 christos Exp $ +# $NetBSD: HACKS,v 1.115 2011/03/12 08:03:06 matt Exp $ # # This file is intended to document workarounds for currently unsolved # (mostly) compiler bugs. @@ -635,3 +635,12 @@ workaround for PR port-macppc/37812 kcah + hack define TARGET_SECURE_PLT and HAVE_AS_TLS because when + building the native compiler via build.sh those don't defined + properly. + cdate Sat Mar 12 08:00:00 UTC 2011 + who matt + file src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h + descr + see above + kcah
CVS commit: src/doc
Module Name:src Committed By: matt Date: Sat Mar 12 08:04:17 UTC 2011 Modified Files: src/doc: CHANGES Log Message: Note PPC TLS support. To generate a diff of this commit: cvs rdiff -u -r1.1519 -r1.1520 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.1519 src/doc/CHANGES:1.1520 --- src/doc/CHANGES:1.1519 Thu Mar 10 13:17:35 2011 +++ src/doc/CHANGES Sat Mar 12 08:04:17 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1519 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1520 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -885,3 +885,4 @@ limits from QUOTA to QUOTA2. [bouyer 20110306] tmux(1): First import of tmux (version 1.4). [jmmv 20110310] + powerpc: add TLS (thread local storage) support. [matt 20110311]
CVS commit: othersrc/external/bsd/rs
Module Name:othersrc Committed By: agc Date: Sat Mar 12 08:08:30 UTC 2011 Update of /cvsroot/othersrc/external/bsd/rs In directory ivanova.netbsd.org:/tmp/cvs-serv8550 Log Message: Initial import into othersrc of library and rs(1) progream, implementing Reed Solomon erasure coding. Status: Vendor Tag: CROOKS Release Tags: rs-base N othersrc/external/bsd/rs/Makefile N othersrc/external/bsd/rs/dist/rs.1 N othersrc/external/bsd/rs/dist/Makefile N othersrc/external/bsd/rs/dist/README N othersrc/external/bsd/rs/dist/TODO N othersrc/external/bsd/rs/dist/main.c N othersrc/external/bsd/rs/dist/rs.c N othersrc/external/bsd/rs/dist/rs.h N othersrc/external/bsd/rs/dist/librs.3 N othersrc/external/bsd/rs/librs/Makefile N othersrc/external/bsd/rs/librs/shlib_version N othersrc/external/bsd/rs/rs/Makefile No conflicts created by this import
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: matt Date: Sat Mar 12 08:08:38 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Shell scripts don't have .debug versions. To generate a diff of this commit: cvs rdiff -u -r1.268 -r1.269 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.268 src/distrib/sets/lists/tests/mi:1.269 --- src/distrib/sets/lists/tests/mi:1.268 Fri Mar 11 10:36:29 2011 +++ src/distrib/sets/lists/tests/mi Sat Mar 12 08:08:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.268 2011/03/11 10:36:29 pooka Exp $ +# $NetBSD: mi,v 1.269 2011/03/12 08:08:38 matt Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -227,10 +227,6 @@ ./usr/libdata/debug/usr/tests/fs/ffs tests-fs-debug ./usr/libdata/debug/usr/tests/fs/ffs/h_quota2_server.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs/h_quota2_tests.debug tests-fs-debug debug,atf -./usr/libdata/debug/usr/tests/fs/ffs/rump_edquota.debug tests-fs-debug debug,atf -./usr/libdata/debug/usr/tests/fs/ffs/rump_quota.debug tests-fs-debug debug,atf -./usr/libdata/debug/usr/tests/fs/ffs/rump_quotactl.debug tests-fs-debug debug,atf -./usr/libdata/debug/usr/tests/fs/ffs/rump_repquota.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs/t_fifos.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs/t_mount.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs/t_quota2_1.debug tests-fs-debug debug,atf
CVS commit: othersrc/external/bsd/threshold
Module Name:othersrc Committed By: agc Date: Sat Mar 12 08:13:11 UTC 2011 Update of /cvsroot/othersrc/external/bsd/threshold In directory ivanova.netbsd.org:/tmp/cvs-serv3990 Log Message: Initial import into othersrc of a library and program to do threshold-based data sharing - data can be recovered when the constituent threshold shares of the original data are presented. This library implements Rabin's IDA, and there are also some proof of concept RAID4 and RAID5 functions in there too. Status: Vendor Tag: CROOKS Release Tags: threshold-base N othersrc/external/bsd/threshold/Makefile.inc N othersrc/external/bsd/threshold/Makefile N othersrc/external/bsd/threshold/mkdist N othersrc/external/bsd/threshold/dist/Makefile.am N othersrc/external/bsd/threshold/dist/TODO N othersrc/external/bsd/threshold/dist/aclocal.m4 N othersrc/external/bsd/threshold/dist/configure N othersrc/external/bsd/threshold/dist/configure.ac N othersrc/external/bsd/threshold/dist/libtool N othersrc/external/bsd/threshold/dist/tst N othersrc/external/bsd/threshold/dist/buildaux/config.guess N othersrc/external/bsd/threshold/dist/buildaux/config.sub N othersrc/external/bsd/threshold/dist/buildaux/depcomp N othersrc/external/bsd/threshold/dist/buildaux/install-sh N othersrc/external/bsd/threshold/dist/buildaux/ltmain.sh N othersrc/external/bsd/threshold/dist/buildaux/missing N othersrc/external/bsd/threshold/dist/include/Makefile.am N othersrc/external/bsd/threshold/dist/include/threshold.h N othersrc/external/bsd/threshold/dist/src/Makefile.am N othersrc/external/bsd/threshold/dist/src/Makefile.in N othersrc/external/bsd/threshold/dist/src/libthreshold/libthreshold.3 N othersrc/external/bsd/threshold/dist/src/libthreshold/Makefile.am N othersrc/external/bsd/threshold/dist/src/libthreshold/Makefile.in N othersrc/external/bsd/threshold/dist/src/libthreshold/config.h.in N othersrc/external/bsd/threshold/dist/src/libthreshold/ida.c N othersrc/external/bsd/threshold/dist/src/libthreshold/internal.h N othersrc/external/bsd/threshold/dist/src/libthreshold/threshold.c N othersrc/external/bsd/threshold/dist/src/libthreshold/raid.c N othersrc/external/bsd/threshold/dist/src/threshold/Makefile.am N othersrc/external/bsd/threshold/dist/src/threshold/Makefile.in N othersrc/external/bsd/threshold/dist/src/threshold/main.c N othersrc/external/bsd/threshold/dist/src/threshold/threshold.1 N othersrc/external/bsd/threshold/dist/autom4te.cache/requests N othersrc/external/bsd/threshold/dist/autom4te.cache/output.0 N othersrc/external/bsd/threshold/dist/autom4te.cache/traces.0 N othersrc/external/bsd/threshold/libthreshold/shlib_version N othersrc/external/bsd/threshold/libthreshold/Makefile N othersrc/external/bsd/threshold/libthreshold/config.h N othersrc/external/bsd/threshold/threshold/Makefile No conflicts created by this import
CVS commit: othersrc/external/bsd/gensetlist
Module Name:othersrc Committed By: agc Date: Sat Mar 12 08:20:42 UTC 2011 Update of /cvsroot/othersrc/external/bsd/gensetlist In directory ivanova.netbsd.org:/tmp/cvs-serv25174 Log Message: Import into othersrc the setlist maintenance code, as explained in http://mail-index.netbsd.org/tech-userlevel/2010/10/31/msg004135.html The code generates setlist entries automatically from the definitions in BSD Makefiles. Status: Vendor Tag: CROOKS Release Tags: gensetlist-base N othersrc/external/bsd/gensetlist/gensetlist.c N othersrc/external/bsd/gensetlist/Makefile N othersrc/external/bsd/gensetlist/bsd.setlist.mk N othersrc/external/bsd/gensetlist/gensetlist.8 N othersrc/external/bsd/gensetlist/lib/shlib_version N othersrc/external/bsd/gensetlist/lib/Makefile N othersrc/external/bsd/gensetlist/netpgp/Makefile No conflicts created by this import
CVS commit: src/share/misc
Module Name:src Committed By: tron Date: Sat Mar 12 11:32:11 UTC 2011 Modified Files: src/share/misc: acronyms Log Message: Add AGM (annual general meeting). To generate a diff of this commit: cvs rdiff -u -r1.204 -r1.205 src/share/misc/acronyms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms diff -u src/share/misc/acronyms:1.204 src/share/misc/acronyms:1.205 --- src/share/misc/acronyms:1.204 Sun Feb 20 17:29:28 2011 +++ src/share/misc/acronyms Sat Mar 12 11:32:11 2011 @@ -1,4 +1,4 @@ -$NetBSD: acronyms,v 1.204 2011/02/20 17:29:28 jruoho Exp $ +$NetBSD: acronyms,v 1.205 2011/03/12 11:32:11 tron Exp $ 10Q thank you 10X thanks 1337 elite (leet) @@ -21,6 +21,7 @@ AFK away from keyboard AFU all fucked up AFW away from window +AGM annual general meeting AINEC and it's not even close AISE as I see it AIU as I understand
CVS commit: src/sys/arch/sparc64
Module Name:src Committed By: nakayama Date: Sat Mar 12 11:42:57 UTC 2011 Modified Files: src/sys/arch/sparc64/dev: mkclock.c src/sys/arch/sparc64/sparc64: clock.c Log Message: Remove unnecessary headers. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc64/dev/mkclock.c cvs rdiff -u -r1.101 -r1.102 src/sys/arch/sparc64/sparc64/clock.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/dev/mkclock.c diff -u src/sys/arch/sparc64/dev/mkclock.c:1.6 src/sys/arch/sparc64/dev/mkclock.c:1.7 --- src/sys/arch/sparc64/dev/mkclock.c:1.6 Sat Oct 24 14:52:19 2009 +++ src/sys/arch/sparc64/dev/mkclock.c Sat Mar 12 11:42:57 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mkclock.c,v 1.6 2009/10/24 14:52:19 nakayama Exp $ */ +/* $NetBSD: mkclock.c,v 1.7 2011/03/12 11:42:57 nakayama Exp $ */ /* * Copyright (c) 1992, 1993 @@ -55,7 +55,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mkclock.c,v 1.6 2009/10/24 14:52:19 nakayama Exp $); +__KERNEL_RCSID(0, $NetBSD: mkclock.c,v 1.7 2011/03/12 11:42:57 nakayama Exp $); /* * Clock driver for 'mkclock' - Mostek MK48Txx TOD clock. @@ -80,8 +80,6 @@ #include dev/ic/mk48txxreg.h #include dev/ic/mk48txxvar.h -#include sparc64/dev/iommureg.h -#include sparc64/dev/sbusreg.h #include dev/sbus/sbusvar.h #include dev/ebus/ebusreg.h #include dev/ebus/ebusvar.h Index: src/sys/arch/sparc64/sparc64/clock.c diff -u src/sys/arch/sparc64/sparc64/clock.c:1.101 src/sys/arch/sparc64/sparc64/clock.c:1.102 --- src/sys/arch/sparc64/sparc64/clock.c:1.101 Thu Mar 11 03:54:56 2010 +++ src/sys/arch/sparc64/sparc64/clock.c Sat Mar 12 11:42:57 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.101 2010/03/11 03:54:56 mrg Exp $ */ +/* $NetBSD: clock.c,v 1.102 2011/03/12 11:42:57 nakayama Exp $ */ /* * Copyright (c) 1992, 1993 @@ -55,7 +55,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.101 2010/03/11 03:54:56 mrg Exp $); +__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.102 2011/03/12 11:42:57 nakayama Exp $); #include opt_multiprocessor.h @@ -90,10 +90,6 @@ #include sparc64/sparc64/intreg.h #include sparc64/sparc64/timerreg.h #include sparc64/dev/iommureg.h -#include sparc64/dev/sbusreg.h -#include dev/sbus/sbusvar.h -#include dev/ebus/ebusreg.h -#include dev/ebus/ebusvar.h /*
CVS commit: src/sys/arch/sparc64
Module Name:src
Committed By: nakayama
Date: Sat Mar 12 11:43:38 UTC 2011
Modified Files:
src/sys/arch/sparc64/dev: auxio.c fdc.c zs.c
src/sys/arch/sparc64/include: autoconf.h
Log Message:
Remove implicit include dev/sbus/sbusvar.h from autoconf.h, and
add it explicitly in files depending on it.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sparc64/dev/auxio.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sparc64/dev/fdc.c
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/sparc64/dev/zs.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sparc64/include/autoconf.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/sparc64/dev/auxio.c
diff -u src/sys/arch/sparc64/dev/auxio.c:1.20 src/sys/arch/sparc64/dev/auxio.c:1.21
--- src/sys/arch/sparc64/dev/auxio.c:1.20 Fri Jun 13 13:10:49 2008
+++ src/sys/arch/sparc64/dev/auxio.c Sat Mar 12 11:43:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: auxio.c,v 1.20 2008/06/13 13:10:49 cegger Exp $ */
+/* $NetBSD: auxio.c,v 1.21 2011/03/12 11:43:38 nakayama Exp $ */
/*
* Copyright (c) 2000, 2001 Matthew R. Green
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: auxio.c,v 1.20 2008/06/13 13:10:49 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: auxio.c,v 1.21 2011/03/12 11:43:38 nakayama Exp $);
#include opt_auxio.h
@@ -49,7 +49,7 @@
#include dev/ebus/ebusreg.h
#include dev/ebus/ebusvar.h
-#include sparc64/dev/sbusvar.h
+#include dev/sbus/sbusvar.h
#include sparc64/dev/auxioreg.h
#include sparc64/dev/auxiovar.h
Index: src/sys/arch/sparc64/dev/fdc.c
diff -u src/sys/arch/sparc64/dev/fdc.c:1.33 src/sys/arch/sparc64/dev/fdc.c:1.34
--- src/sys/arch/sparc64/dev/fdc.c:1.33 Wed Feb 24 22:37:55 2010
+++ src/sys/arch/sparc64/dev/fdc.c Sat Mar 12 11:43:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc.c,v 1.33 2010/02/24 22:37:55 dyoung Exp $ */
+/* $NetBSD: fdc.c,v 1.34 2011/03/12 11:43:38 nakayama Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fdc.c,v 1.33 2010/02/24 22:37:55 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: fdc.c,v 1.34 2011/03/12 11:43:38 nakayama Exp $);
#include opt_ddb.h
#include opt_md.h
@@ -141,7 +141,7 @@
#elif SUN4U
#include dev/ebus/ebusreg.h
#include dev/ebus/ebusvar.h
-/* #include sparc/sparc/auxreg.h */
+#include dev/sbus/sbusvar.h
#include sparc64/dev/auxioreg.h
#include sparc64/dev/auxiovar.h
#include sparc64/dev/fdcreg.h
Index: src/sys/arch/sparc64/dev/zs.c
diff -u src/sys/arch/sparc64/dev/zs.c:1.69 src/sys/arch/sparc64/dev/zs.c:1.70
--- src/sys/arch/sparc64/dev/zs.c:1.69 Mon Oct 26 19:55:11 2009
+++ src/sys/arch/sparc64/dev/zs.c Sat Mar 12 11:43:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.69 2009/10/26 19:55:11 martin Exp $ */
+/* $NetBSD: zs.c,v 1.70 2011/03/12 11:43:38 nakayama Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zs.c,v 1.69 2009/10/26 19:55:11 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: zs.c,v 1.70 2011/03/12 11:43:38 nakayama Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -68,6 +68,7 @@
#include dev/sun/kbd_ms_ttyvar.h
#include ddb/db_output.h
+#include dev/sbus/sbusvar.h
#include sparc64/dev/cons.h
#include ioconf.h
Index: src/sys/arch/sparc64/include/autoconf.h
diff -u src/sys/arch/sparc64/include/autoconf.h:1.28 src/sys/arch/sparc64/include/autoconf.h:1.29
--- src/sys/arch/sparc64/include/autoconf.h:1.28 Mon Apr 28 20:23:36 2008
+++ src/sys/arch/sparc64/include/autoconf.h Sat Mar 12 11:43:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.28 2008/04/28 20:23:36 martin Exp $ */
+/* $NetBSD: autoconf.h,v 1.29 2011/03/12 11:43:38 nakayama Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -75,7 +75,6 @@
#include machine/bus.h
#include machine/promlib.h
-#include dev/sbus/sbusvar.h
/* This is used to map device classes to IPLs */
struct intrmap {
CVS commit: src/external/mit/xorg/share/man/man7
Module Name:src
Committed By: plunky
Date: Sat Mar 12 12:15:46 UTC 2011
Modified Files:
src/external/mit/xorg/share/man/man7: Makefile
Log Message:
in order that generated MAN files are cleaned up, bsd.x11.mk needs
to be included after the MAN= assignment. Then we need to explicitly
include bsd.own.mk before .PATH to get the value of X11SRCDIRMIT
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/share/man/man7/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/mit/xorg/share/man/man7/Makefile
diff -u src/external/mit/xorg/share/man/man7/Makefile:1.1 src/external/mit/xorg/share/man/man7/Makefile:1.2
--- src/external/mit/xorg/share/man/man7/Makefile:1.1 Thu Nov 18 18:47:36 2010
+++ src/external/mit/xorg/share/man/man7/Makefile Sat Mar 12 12:15:46 2011
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2010/11/18 18:47:36 tron Exp $
+# $NetBSD: Makefile,v 1.2 2011/03/12 12:15:46 plunky Exp $
-.include bsd.x11.mk
+.include bsd.own.mk
.PATH: ${X11SRCDIRMIT}/xorg-docs/man/general
MAN= Consortium.7 Standards.7 X.7 XOrgFoundation.7 XProjectTeam.7 \
Xsecurity.7
+.include bsd.x11.mk
.include bsd.man.mk
CVS commit: src/usr.bin/quota
Module Name:src Committed By: bouyer Date: Sat Mar 12 12:28:47 UTC 2011 Modified Files: src/usr.bin/quota: getvfsquota.c Log Message: Don't include quotautil.h here, it's not used. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.bin/quota/getvfsquota.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/quota/getvfsquota.c diff -u src/usr.bin/quota/getvfsquota.c:1.4 src/usr.bin/quota/getvfsquota.c:1.5 --- src/usr.bin/quota/getvfsquota.c:1.4 Sun Mar 6 22:36:07 2011 +++ src/usr.bin/quota/getvfsquota.c Sat Mar 12 12:28:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: getvfsquota.c,v 1.4 2011/03/06 22:36:07 christos Exp $ */ +/* $NetBSD: getvfsquota.c,v 1.5 2011/03/12 12:28:47 bouyer Exp $ */ /*- * Copyright (c) 2011 Manuel Bouyer @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: getvfsquota.c,v 1.4 2011/03/06 22:36:07 christos Exp $); +__RCSID($NetBSD: getvfsquota.c,v 1.5 2011/03/12 12:28:47 bouyer Exp $); #include stdio.h #include stdlib.h @@ -43,7 +43,6 @@ #include sys/quota.h #include getvfsquota.h -#include quotautil.h /* retrieve quotas from vfs, for the given user id */ int
CVS commit: src/libexec/rpc.rquotad
Module Name:src Committed By: bouyer Date: Sat Mar 12 12:30:40 UTC 2011 Modified Files: src/libexec/rpc.rquotad: rquotad.c Log Message: Define qfextension here To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/libexec/rpc.rquotad/rquotad.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/rpc.rquotad/rquotad.c diff -u src/libexec/rpc.rquotad/rquotad.c:1.25 src/libexec/rpc.rquotad/rquotad.c:1.26 --- src/libexec/rpc.rquotad/rquotad.c:1.25 Sun Mar 6 17:08:16 2011 +++ src/libexec/rpc.rquotad/rquotad.c Sat Mar 12 12:30:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rquotad.c,v 1.25 2011/03/06 17:08:16 bouyer Exp $ */ +/* $NetBSD: rquotad.c,v 1.26 2011/03/12 12:30:39 bouyer Exp $ */ /* * by Manuel Bouyer (bou...@ensta.fr). Public domain. @@ -6,7 +6,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: rquotad.c,v 1.25 2011/03/06 17:08:16 bouyer Exp $); +__RCSID($NetBSD: rquotad.c,v 1.26 2011/03/12 12:30:39 bouyer Exp $); #endif #include sys/param.h @@ -37,6 +37,8 @@ #include getvfsquota.h +const char *qfextension[MAXQUOTAS] = INITQFNAMES; + void rquota_service(struct svc_req *request, SVCXPRT *transp); void ext_rquota_service(struct svc_req *request, SVCXPRT *transp); void sendquota(struct svc_req *request, int vers, SVCXPRT *transp);
CVS commit: othersrc/external/bsd/rs/dist
Module Name:othersrc Committed By: wiz Date: Sat Mar 12 13:20:00 UTC 2011 Modified Files: othersrc/external/bsd/rs/dist: rs.1 Log Message: Sort sections, remove superfluous Pp, upper-case names. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/rs/dist/rs.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/external/bsd/rs/dist/rs.1 diff -u othersrc/external/bsd/rs/dist/rs.1:1.1.1.1 othersrc/external/bsd/rs/dist/rs.1:1.2 --- othersrc/external/bsd/rs/dist/rs.1:1.1.1.1 Sat Mar 12 08:08:29 2011 +++ othersrc/external/bsd/rs/dist/rs.1 Sat Mar 12 13:20:00 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: rs.1,v 1.1.1.1 2011/03/12 08:08:29 agc Exp $ +.\ $NetBSD: rs.1,v 1.2 2011/03/12 13:20:00 wiz Exp $ .\ .\ Copyright (c) 2011 Alistair Crooks a...@netbsd.org .\ All rights reserved. @@ -28,7 +28,7 @@ .Os .Sh NAME .Nm rs -.Nd reed-solomon erasure coding +.Nd Reed-Solomon erasure coding .Sh SYNOPSIS .Nm .Fl dv @@ -91,8 +91,12 @@ .Dv stdout and exits. .El -.Pp -.Sh EXAMPLE +.Sh RETURN VALUES +The +.Nm +utility will return 0 for success, +and 1 for failure. +.Sh EXAMPLES .Bd -literal % cp Makefile a % rs -o a.rs a @@ -106,11 +110,6 @@ % cmp a a.2 % .Ed -.Sh RETURN VALUES -The -.Nm -utility will return 0 for success, -and 1 for failure. .Sh SEE ALSO .Xr librs 3 .Sh HISTORY
CVS commit: src/share/mk
Module Name:src
Committed By: plunky
Date: Sat Mar 12 13:22:03 UTC 2011
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
CLEANFILES is not processed by bsd.files.mk so don't assume that
anything assigned there will be cleaned up; handle clean up of the
PKGCONFIG files explicitly. (eg lib/dri/dri.pc was not cleaned)
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/share/mk/bsd.x11.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.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.93 src/share/mk/bsd.x11.mk:1.94
--- src/share/mk/bsd.x11.mk:1.93 Wed Dec 8 01:57:22 2010
+++ src/share/mk/bsd.x11.mk Sat Mar 12 13:22:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.93 2010/12/08 01:57:22 joerg Exp $
+# $NetBSD: bsd.x11.mk,v 1.94 2011/03/12 13:22:03 plunky Exp $
.include bsd.init.mk
@@ -339,7 +339,9 @@
${.IMPSRC} ${.TARGET}.tmp \
mv -f ${.TARGET}.tmp ${.TARGET}
-CLEANFILES+= ${_PKGCONFIG_FILES} ${_PKGCONFIG_FILES:C/$/.tmp/}
+cleandir: cleanpkgconfig
+cleanpkgconfig: .PHONY
+ rm -f ${_PKGCONFIG_FILES} ${_PKGCONFIG_FILES:C/$/.tmp/}
.endif
#
CVS commit: othersrc/external/bsd/threshold/dist/src
Module Name:othersrc Committed By: wiz Date: Sat Mar 12 13:22:24 UTC 2011 Modified Files: othersrc/external/bsd/threshold/dist/src/libthreshold: libthreshold.3 othersrc/external/bsd/threshold/dist/src/threshold: threshold.1 Log Message: Whitespace nits. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ othersrc/external/bsd/threshold/dist/src/libthreshold/libthreshold.3 cvs rdiff -u -r1.1.1.1 -r1.2 \ othersrc/external/bsd/threshold/dist/src/threshold/threshold.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/external/bsd/threshold/dist/src/libthreshold/libthreshold.3 diff -u othersrc/external/bsd/threshold/dist/src/libthreshold/libthreshold.3:1.1.1.1 othersrc/external/bsd/threshold/dist/src/libthreshold/libthreshold.3:1.2 --- othersrc/external/bsd/threshold/dist/src/libthreshold/libthreshold.3:1.1.1.1 Sat Mar 12 08:13:08 2011 +++ othersrc/external/bsd/threshold/dist/src/libthreshold/libthreshold.3 Sat Mar 12 13:22:24 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: libthreshold.3,v 1.1.1.1 2011/03/12 08:13:08 agc Exp $ +.\ $NetBSD: libthreshold.3,v 1.2 2011/03/12 13:22:24 wiz Exp $ .\ .\ Copyright (c) 2010 Alistair Crooks a...@netbsd.org .\ All rights reserved. @@ -28,7 +28,7 @@ .Os .Sh NAME .Nm libthreshold -.Nd secret sharing library +.Nd secret sharing library .Sh LIBRARY .Lb libthreshold .Sh SYNOPSIS @@ -100,7 +100,7 @@ The information may still be used to recover parts of the original secret - there is no expectation of secrecy withion the shares, and -.It RAID5 +.It RAID5 Use a standard XOR-parity based scheme, with the parity in rotation, to provide the resilience to be able to recover the data with a threshold of shares being one less than the total number of shares. Index: othersrc/external/bsd/threshold/dist/src/threshold/threshold.1 diff -u othersrc/external/bsd/threshold/dist/src/threshold/threshold.1:1.1.1.1 othersrc/external/bsd/threshold/dist/src/threshold/threshold.1:1.2 --- othersrc/external/bsd/threshold/dist/src/threshold/threshold.1:1.1.1.1 Sat Mar 12 08:13:09 2011 +++ othersrc/external/bsd/threshold/dist/src/threshold/threshold.1 Sat Mar 12 13:22:24 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: threshold.1,v 1.1.1.1 2011/03/12 08:13:09 agc Exp $ +.\ $NetBSD: threshold.1,v 1.2 2011/03/12 13:22:24 wiz Exp $ .\ .\ Copyright (c) 2010 Alistair Crooks a...@netbsd.org .\ All rights reserved. @@ -55,13 +55,13 @@ .Xr libthreshold 3 library. .Pp -The secret is first split up into +The secret is first split up into a number of shares. .Bl -tag -width Ar .It Fl a Specify the algorithm to be used in the threshold scheme. The default algorithm is -.Dq +.Dq . .It Fl i Operate in an interactive manner by prompting the user for a secret to be typed in response to a prompt, and read by @@ -71,7 +71,7 @@ routine. Please note the maximum limit on the length of the secret that can be given using -.Xr getpass 3. +.Xr getpass 3 . .It Fl j is used to reconstruct (or join) the original secret from the threshold number of shares which were provided on the command line. @@ -92,7 +92,8 @@ .Dv k and .Dv n -are integers representing the threshold and total number of shares, respectively. +are integers representing the threshold and total number of shares, +respectively. .It Fl t Specify the threshold number of shares, from which the original secret can be reconstructed. @@ -102,7 +103,8 @@ .Dv k and .Dv n -are integers representing the threshold and total number of shares, respectively. +are integers representing the threshold and total number of shares, +respectively. .It Fl o used to provide the output file name .El
CVS commit: othersrc/external/bsd/gensetlist
Module Name:othersrc Committed By: wiz Date: Sat Mar 12 13:23:17 UTC 2011 Modified Files: othersrc/external/bsd/gensetlist: gensetlist.8 Log Message: Sort options. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/gensetlist/gensetlist.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/external/bsd/gensetlist/gensetlist.8 diff -u othersrc/external/bsd/gensetlist/gensetlist.8:1.1.1.1 othersrc/external/bsd/gensetlist/gensetlist.8:1.2 --- othersrc/external/bsd/gensetlist/gensetlist.8:1.1.1.1 Sat Mar 12 08:20:42 2011 +++ othersrc/external/bsd/gensetlist/gensetlist.8 Sat Mar 12 13:23:17 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: gensetlist.8,v 1.1.1.1 2011/03/12 08:20:42 agc Exp $ +.\ $NetBSD: gensetlist.8,v 1.2 2011/03/12 13:23:17 wiz Exp $ .\ .\ Copyright (c) 2010 Alistair Crooks a...@netbsd.org .\ All rights reserved. @@ -31,9 +31,9 @@ .Nd create set list entries during build process .Sh SYNOPSIS .Nm -.Fl D definition .Fl V .Fl c category +.Fl D definition .Fl v NAME=VALUE .Sh DESCRIPTION The @@ -51,6 +51,9 @@ The following options are used with .Nm .Bl -tag -width aardvark +.It Fl c +The category is used, as part of the process of adding the files +to the now almost defunct syspkgs set name. .It Fl D The definition is used as a guard, and added to the set files which, in turn, will add the file to the set list if the definition @@ -59,9 +62,6 @@ Prints the version information for .Nm to standard error. -.It Fl c -The category is used, as part of the process of adding the files -to the now almost defunct syspkgs set name. .It Fl v This option is used as part of a (key, value) pair to add the definitions from the build infrastructure.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sat Mar 12 13:24:15 UTC 2011 Modified Files: src/share/man/man4: dbcool.4 Log Message: Bump date for SMSC EMC6D103S. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/man/man4/dbcool.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/dbcool.4 diff -u src/share/man/man4/dbcool.4:1.9 src/share/man/man4/dbcool.4:1.10 --- src/share/man/man4/dbcool.4:1.9 Fri Mar 11 18:38:51 2011 +++ src/share/man/man4/dbcool.4 Sat Mar 12 13:24:15 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: dbcool.4,v 1.9 2011/03/11 18:38:51 pgoyette Exp $ +.\ $NetBSD: dbcool.4,v 1.10 2011/03/12 13:24:15 wiz Exp $ .\ .\ Copyright (c) 2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd February 26, 2010 +.Dd March 12, 2011 .Dt DBCOOL 4 .Os .Sh NAME
CVS commit: src/share/man/man9/man9.x86
Module Name:src Committed By: wiz Date: Sat Mar 12 13:25:42 UTC 2011 Modified Files: src/share/man/man9/man9.x86: tsc.9 Log Message: Fix typos. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/man9.x86/tsc.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/man9.x86/tsc.9 diff -u src/share/man/man9/man9.x86/tsc.9:1.1 src/share/man/man9/man9.x86/tsc.9:1.2 --- src/share/man/man9/man9.x86/tsc.9:1.1 Fri Mar 11 19:50:33 2011 +++ src/share/man/man9/man9.x86/tsc.9 Sat Mar 12 13:25:41 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: tsc.9,v 1.1 2011/03/11 19:50:33 jruoho Exp $ +.\ $NetBSD: tsc.9,v 1.2 2011/03/12 13:25:41 wiz Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -44,7 +44,7 @@ .Ft void .Fn tsc_sync_drift int64_t drift .Sh DESCRIPTION -The time stamp sounter +The time stamp counter .Pq Tn TSC is a hardware counter found in all contemporary x86 processors. The counter is implemented as a 64-bit model-specific register @@ -65,7 +65,7 @@ such factors as system sleep states, .Tn CPU .Dq hotplugging , -.Dq hiberanation , +.Dq hibernation , and .Tn CPU frequency scaling.
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: pgoyette
Date: Sat Mar 12 13:33:18 UTC 2011
Modified Files:
src/sys/dev/i2c: dbcool.c
Log Message:
Fix another instance of the same typo in the same comment! dosn't --
doesn't
Thanks again, Jukka!
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/i2c/dbcool.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.28 src/sys/dev/i2c/dbcool.c:1.29
--- src/sys/dev/i2c/dbcool.c:1.28 Fri Mar 11 19:12:46 2011
+++ src/sys/dev/i2c/dbcool.c Sat Mar 12 13:33:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool.c,v 1.28 2011/03/11 19:12:46 pgoyette Exp $ */
+/* $NetBSD: dbcool.c,v 1.29 2011/03/12 13:33:18 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dbcool.c,v 1.28 2011/03/11 19:12:46 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: dbcool.c,v 1.29 2011/03/12 13:33:18 pgoyette Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1840,7 +1840,7 @@
* send_byte/receive_byte which doesn't work.
*
* So if we only get 0's back then try again with dc-dc_chip
- * set to the EMC6D103S_DEVICEID and which dosn't have
+ * set to the EMC6D103S_DEVICEID and which doesn't have
* DBCFLAG_NO_READBYTE set so read_byte will be used
*/
if ((c_id == 0) (d_id == 0) (r_id == 0)) {
CVS commit: src/tests/fs/ffs
Module Name:src
Committed By: bouyer
Date: Sat Mar 12 13:43:58 UTC 2011
Modified Files:
src/tests/fs/ffs: quotas_common.sh
Log Message:
Add support for multiple rump servers in shutdown and cleanup
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/fs/ffs/quotas_common.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/ffs/quotas_common.sh
diff -u src/tests/fs/ffs/quotas_common.sh:1.2 src/tests/fs/ffs/quotas_common.sh:1.3
--- src/tests/fs/ffs/quotas_common.sh:1.2 Sun Mar 6 17:08:40 2011
+++ src/tests/fs/ffs/quotas_common.sh Sat Mar 12 13:43:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: quotas_common.sh,v 1.2 2011/03/06 17:08:40 bouyer Exp $
+# $NetBSD: quotas_common.sh,v 1.3 2011/03/12 13:43:58 bouyer Exp $
create_with_quotas()
{
@@ -25,7 +25,9 @@
rump_shutdown()
{
- atf_check -s exit:0 rump.halt
+ for s in ${RUMP_SOCKETS_LIST}; do
+ atf_check -s exit:0 env RUMP_SERVER=unix://${s} rump.halt;
+ done
# check that the quota inode creation didn't corrupt the filesystem
atf_check -s exit:0 -o match:already clean \
-o match:Phase 6 - Check Quotas \
@@ -46,10 +48,15 @@
atf_set timeout 60
}
eval ${name}_body() { \
+ RUMP_SOCKETS_LIST=\${RUMP_SOCKET}; \
+ export RUMP_SERVER=unix://\${RUMP_SOCKET}; \
${check_function} ${@} ; \
}
eval ${name}_cleanup() { \
- atf_check -s exit:1 -o ignore -e ignore rump.halt; \
+ for s in \${RUMP_SOCKETS_LIST}; do \
+ export RUMP_SERVER=unix://\${s}; \
+ atf_check -s exit:1 -o ignore -e ignore rump.halt; \
+ done; \
}
tests=${tests} ${name}
}
@@ -68,10 +75,15 @@
atf_set timeout 60
}
eval ${name}_body() { \
+ RUMP_SOCKETS_LIST=\${RUMP_SOCKET}; \
+ export RUMP_SERVER=unix://\${RUMP_SOCKET}; \
${check_function} ${@} ; \
}
eval ${name}_cleanup() { \
- atf_check -s exit:1 -o ignore -e ignore rump.halt; \
+ for s in \${RUMP_SOCKETS_LIST}; do \
+ export RUMP_SERVER=unix://\${s}; \
+ atf_check -s exit:1 -o ignore -e ignore rump.halt; \
+ done; \
}
tests=${tests} ${name}
}
@@ -80,9 +92,7 @@
{
IMG=fsimage
DIR=target
- RUMP_SOCKET=test
- RUMP_SERVER=unix://${RUMP_SOCKET}
- export RUMP_SERVER
+ RUMP_SOCKET=test;
for i in ${tests}; do
atf_add_test_case $i
done
CVS commit: src
Module Name:src
Committed By: bouyer
Date: Sat Mar 12 14:03:39 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/fs/nfs: Makefile
Added Files:
src/tests/fs/nfs: t_rquotad.sh
Log Message:
Add a test for rpc.rquotad(8)
To generate a diff of this commit:
cvs rdiff -u -r1.269 -r1.270 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/nfs/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/nfs/t_rquotad.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.269 src/distrib/sets/lists/tests/mi:1.270
--- src/distrib/sets/lists/tests/mi:1.269 Sat Mar 12 08:08:38 2011
+++ src/distrib/sets/lists/tests/mi Sat Mar 12 14:03:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.269 2011/03/12 08:08:38 matt Exp $
+# $NetBSD: mi,v 1.270 2011/03/12 14:03:38 bouyer Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -1228,6 +1228,7 @@
./usr/tests/fs/nfstests-fs-tests
./usr/tests/fs/nfs/Atffile tests-fs-tests atf
./usr/tests/fs/nfs/t_mountdtests-fs-tests atf
+./usr/tests/fs/nfs/t_rquotadtests-fs-tests atf
./usr/tests/fs/nfs/nfsservicetests-fs-tests
./usr/tests/fs/nfs/nfsservice/exports tests-fs-tests atf
./usr/tests/fs/nfs/nfsservice/rumpnfsd tests-fs-tests atf
Index: src/tests/fs/nfs/Makefile
diff -u src/tests/fs/nfs/Makefile:1.4 src/tests/fs/nfs/Makefile:1.5
--- src/tests/fs/nfs/Makefile:1.4 Thu Sep 23 09:39:14 2010
+++ src/tests/fs/nfs/Makefile Sat Mar 12 14:03:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/09/23 09:39:14 he Exp $
+# $NetBSD: Makefile,v 1.5 2011/03/12 14:03:38 bouyer Exp $
#
.include bsd.own.mk
@@ -9,6 +9,11 @@
TESTS_C= t_mountd
+.for name in t_rquotad
+TESTS_SH+= ${name}
+TESTS_SH_SRC_${name}= ../ffs/quotas_common.sh ${name}.sh
+.endfor
+
VFSTESTDIR != cd ${.CURDIR}/../common ${PRINTOBJDIR}
LDADD+=-L${VFSTESTDIR} -lvfstest
Added files:
Index: src/tests/fs/nfs/t_rquotad.sh
diff -u /dev/null src/tests/fs/nfs/t_rquotad.sh:1.1
--- /dev/null Sat Mar 12 14:03:39 2011
+++ src/tests/fs/nfs/t_rquotad.sh Sat Mar 12 14:03:38 2011
@@ -0,0 +1,142 @@
+# $NetBSD: t_rquotad.sh,v 1.1 2011/03/12 14:03:38 bouyer Exp $
+#
+# Copyright (c) 2011 Manuel Bouyer
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+for e in le be; do
+ for v in 1; do
+for q in user group both; do
+ test_case_root get_nfs_${e}_${v}_${q} get_nfs_quota \
+ get NFS quota with ${q} enabled ${e} ${v} ${q}
+done
+ done
+done
+
+get_nfs_quota()
+{
+ create_with_quotas $*
+ local q=$3
+ local expect
+
+ case ${q} in
+ user)
+ expect=u
+ ;;
+ group)
+ expect=g
+ ;;
+ both)
+ expect=u g
+ ;;
+ *)
+ atf_fail wrong quota type
+ ;;
+ esac
+
+#start a a nfs server
+
+ atf_check -s exit:0 rump_server -lrumpvfs -lrumpdev -lrumpnet \
+ -lrumpnet_net -lrumpnet_netinet -lrumpnet_local \
+ -lrumpnet_shmif -lrumpdev_disk -lrumpfs_ffs -lrumpfs_nfs\
+ -lrumpfs_nfsserver \
+ -d key=/dk,hostpath=${IMG},size=host ${RUMP_SERVER}
+
+ atf_check -s exit:0 rump.ifconfig shmif0 create
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr shmbus
+ atf_check -s exit:0 rump.ifconfig shmif0 inet 10.1.1.1
+
+ export RUMPHIJACK_RETRYCONNECT=die
+ export LD_PRELOAD=/usr/lib/librumphijack.so
+
+ atf_check -s exit:0 mkdir /rump/etc
+ atf_check -s exit:0 mkdir /rump/export
+ atf_check -s exit:0 mkdir -p /rump/var/run
+ atf_check -s exit:0 mkdir -p /rump/var/db
+ atf_check -s exit:0 touch
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src
Committed By: tron
Date: Sat Mar 12 14:19:25 UTC 2011
Modified Files:
src/external/bsd/tmux/usr.bin/tmux: Makefile
Log Message:
Disable SSP warnings for a few files to make this build with USE_SSP=yes.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/tmux/usr.bin/tmux/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/bsd/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.2 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.3
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.2 Sat Mar 12 03:02:59 2011
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Sat Mar 12 14:19:25 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/03/12 03:02:59 christos Exp $
+# $NetBSD: Makefile,v 1.3 2011/03/12 14:19:25 tron Exp $
.include bsd.own.mk
WARNS?= 4
@@ -155,6 +155,12 @@
CPPFLAGS+= -DBUILD=\$(VERSION)\
CPPFLAGS+= -I${SRCDIR} -I${.CURDIR}
+COPTS.cmd-paste-buffer.c+= -Wno-stack-protector
+COPTS.cmd-server-info.c+= -Wno-stack-protector
+COPTS.imsg-buffer.c+= -Wno-stack-protector
+COPTS.imsg.c+= -Wno-stack-protector
+COPTS.screen.c+= -Wno-stack-protector
+
LDADD+= -levent -lterminfo -lutil
DPADD+= ${LIBEVENT} ${LIBTERMINFO} ${LIBUTIL}
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src
Committed By: phx
Date: Sat Mar 12 16:41:23 UTC 2011
Modified Files:
src/sys/arch/sandpoint/stand/altboot: brdsetup.c globals.h main.c nif.c
stg.c
Log Message:
Introduced an optional shutdown function for all network interfaces.
This is needed to stop a NIF and make it return to a known state. A running
NIF may cause all sorts of bad effects, like for example making it impossible
to reboot a board without a hardware-reset function.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sandpoint/stand/altboot/brdsetup.c \
src/sys/arch/sandpoint/stand/altboot/globals.h \
src/sys/arch/sandpoint/stand/altboot/main.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sandpoint/stand/altboot/nif.c \
src/sys/arch/sandpoint/stand/altboot/stg.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/sandpoint/stand/altboot/brdsetup.c
diff -u src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.9 src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.10
--- src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.9 Fri Mar 11 17:46:30 2011
+++ src/sys/arch/sandpoint/stand/altboot/brdsetup.c Sat Mar 12 16:41:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: brdsetup.c,v 1.9 2011/03/11 17:46:30 phx Exp $ */
+/* $NetBSD: brdsetup.c,v 1.10 2011/03/12 16:41:23 phx Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,6 +31,7 @@
#include sys/param.h
+#include powerpc/psl.h
#include powerpc/oea/spr.h
#include lib/libsa/stand.h
@@ -128,6 +129,8 @@
static void brdfixup(void);
static void setup(void);
+static inline uint32_t mfmsr(void);
+static inline void mtmsr(uint32_t);
static inline uint32_t cputype(void);
static inline u_quad_t mftb(void);
static void init_uart(unsigned, unsigned, uint8_t);
@@ -252,7 +255,7 @@
busclock = (extclk *
pci_to_memclk[(val 19) 0x1f] + 10) / 10;
/* PLLRATIO from HID1 */
- __asm (mfspr %0,1009 : =r(val));
+ asm volatile (mfspr %0,1009 : =r(val));
cpuclock = ((uint64_t)busclock *
mem_to_cpuclk[val 27] + 10) / 10;
} else
@@ -696,11 +699,23 @@
void
_rtt(void)
{
+ uint32_t msr;
+
+ netif_shutdown_all();
if (brdprop-reset != NULL)
(*brdprop-reset)();
- else
+ else {
+ msr = mfmsr();
+ msr = ~PSL_EE;
+ mtmsr(msr);
+ asm volatile (sync; isync);
+ asm volatile(mtspr %0,%1 : : K(81), r(0));
+ msr = ~(PSL_ME | PSL_DR | PSL_IR);
+ mtmsr(msr);
+ asm volatile (sync; isync);
run(0, 0, 0, 0, (void *)0xFFF00100); /* reset entry */
+ }
/*NOTREACHED*/
}
@@ -785,11 +800,26 @@
}
static inline uint32_t
+mfmsr(void)
+{
+ uint32_t msr;
+
+ asm volatile (mfmsr %0 : =r(msr));
+ return msr;
+}
+
+static inline void
+mtmsr(uint32_t msr)
+{
+ asm volatile (mtmsr %0 : : r(msr));
+}
+
+static inline uint32_t
cputype(void)
{
uint32_t pvr;
- __asm volatile (mfpvr %0 : =r(pvr));
+ asm volatile (mfpvr %0 : =r(pvr));
return pvr 16;
}
@@ -801,7 +831,7 @@
asm (1: mftbu %0; mftb %0+1; mftbu %1; cmpw %0,%1; bne 1b
: =r(tb), =r(scratch));
- return (tb);
+ return tb;
}
static void
Index: src/sys/arch/sandpoint/stand/altboot/globals.h
diff -u src/sys/arch/sandpoint/stand/altboot/globals.h:1.9 src/sys/arch/sandpoint/stand/altboot/globals.h:1.10
--- src/sys/arch/sandpoint/stand/altboot/globals.h:1.9 Thu Mar 10 21:11:49 2011
+++ src/sys/arch/sandpoint/stand/altboot/globals.h Sat Mar 12 16:41:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: globals.h,v 1.9 2011/03/10 21:11:49 phx Exp $ */
+/* $NetBSD: globals.h,v 1.10 2011/03/12 16:41:23 phx Exp $ */
#ifdef DEBUG
#define DPRINTF(x) printf x
@@ -133,6 +133,7 @@
int net_strategy(void *, int, daddr_t, size_t, void *, size_t *);
int netif_init(void *);
+void netif_shutdown_all(void);
int netif_open(void *);
int netif_close(int);
@@ -140,7 +141,8 @@
int xxx ## _match(unsigned, void *); \
void * xxx ## _init(unsigned, void *); \
int xxx ## _send(void *, char *, unsigned); \
-int xxx ## _recv(void *, char *, unsigned, unsigned)
+int xxx ## _recv(void *, char *, unsigned, unsigned); \
+void xxx ## _shutdown(void *)
NIF_DECL(fxp);
NIF_DECL(tlp);
Index: src/sys/arch/sandpoint/stand/altboot/main.c
diff -u src/sys/arch/sandpoint/stand/altboot/main.c:1.9 src/sys/arch/sandpoint/stand/altboot/main.c:1.10
--- src/sys/arch/sandpoint/stand/altboot/main.c:1.9 Sun Mar 6 18:22:13 2011
+++ src/sys/arch/sandpoint/stand/altboot/main.c Sat Mar 12 16:41:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.9 2011/03/06 18:22:13 phx Exp $ */
+/* $NetBSD: main.c,v 1.10 2011/03/12 16:41:23 phx Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -250,6 +250,8 @@
btinfo_modulelist_size);
}
+ netif_shutdown_all();
+
__syncicache((void *)marks[MARK_ENTRY],
(u_int)marks[MARK_SYM] - (u_int)marks[MARK_ENTRY]);
Index: src/sys/arch/sandpoint/stand/altboot/nif.c
diff -u
CVS commit: src/sys/arch/sandpoint/sandpoint
Module Name:src Committed By: phx Date: Sat Mar 12 16:46:32 UTC 2011 Modified Files: src/sys/arch/sandpoint/sandpoint: locore.S Log Message: When rebooting flush the instruction pipeline first, then do an absolute jump to 0xfff00100. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sandpoint/sandpoint/locore.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/sandpoint/sandpoint/locore.S diff -u src/sys/arch/sandpoint/sandpoint/locore.S:1.20 src/sys/arch/sandpoint/sandpoint/locore.S:1.21 --- src/sys/arch/sandpoint/sandpoint/locore.S:1.20 Mon Jan 17 08:23:57 2011 +++ src/sys/arch/sandpoint/sandpoint/locore.S Sat Mar 12 16:46:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.20 2011/01/17 08:23:57 matt Exp $ */ +/* $NetBSD: locore.S,v 1.21 2011/03/12 16:46:31 phx Exp $ */ /* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */ /* @@ -150,7 +150,8 @@ mfmsr 3 ori 3,3,PSL_IP@l mtmsr 3 - b 0xFFF00100 + isync + ba 0xFFF00100 /* * Include common switch / setfault code
CVS commit: src/sys/arch/sandpoint/sandpoint
Module Name:src
Committed By: phx
Date: Sat Mar 12 16:49:17 UTC 2011
Modified Files:
src/sys/arch/sandpoint/sandpoint: machdep.c satmgr.c
Log Message:
The DSM-G600's satellite microcontroller provides no possibility to reboot
or powerdown the board, so we can only support reboot by falling back to
a default reboot procedure.
The default procedure will turn off interrupts and the MMU, then jump
through the firmware's reset vector (0xfff00100).
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/sandpoint/sandpoint/machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sandpoint/sandpoint/satmgr.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/sandpoint/sandpoint/machdep.c
diff -u src/sys/arch/sandpoint/sandpoint/machdep.c:1.54 src/sys/arch/sandpoint/sandpoint/machdep.c:1.55
--- src/sys/arch/sandpoint/sandpoint/machdep.c:1.54 Wed Jan 12 07:38:44 2011
+++ src/sys/arch/sandpoint/sandpoint/machdep.c Sat Mar 12 16:49:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.54 2011/01/12 07:38:44 nisimura Exp $ */
+/* $NetBSD: machdep.c,v 1.55 2011/03/12 16:49:16 phx Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.54 2011/01/12 07:38:44 nisimura Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.55 2011/03/12 16:49:16 phx Exp $);
#include opt_compat_netbsd.h
#include opt_ddb.h
@@ -353,7 +353,9 @@
void
cpu_reboot(int howto, char *what)
{
+ extern void jump_to_ppc_reset_entry(void); /* from locore.S */
static int syncing;
+ register_t msr;
boothowto = howto;
if ((howto RB_NOSYNC) == 0 syncing == 0) {
@@ -383,11 +385,21 @@
howto = RB_AUTOBOOT;
}
- if (md_reboot != NULL) {
+ if (md_reboot != NULL)
(*md_reboot)(howto);
- /* should not come here */
- }
- while (1) ; /* may practice PPC processor reset sequence here */
+
+ /*
+ * No reboot method defined. So we disable the MMU and jump
+ * through the firmware's reset vector.
+ */
+ msr = mfmsr();
+ msr = ~PSL_EE;
+ mtmsr(msr);
+ __asm volatile(mtspr %0,%1 : : K(81), r(0));
+ msr = ~(PSL_ME | PSL_DR | PSL_IR);
+ mtmsr(msr);
+ jump_to_ppc_reset_entry();
+ for (;;);
}
#ifdef MODULAR
Index: src/sys/arch/sandpoint/sandpoint/satmgr.c
diff -u src/sys/arch/sandpoint/sandpoint/satmgr.c:1.5 src/sys/arch/sandpoint/sandpoint/satmgr.c:1.6
--- src/sys/arch/sandpoint/sandpoint/satmgr.c:1.5 Wed Mar 9 20:33:57 2011
+++ src/sys/arch/sandpoint/sandpoint/satmgr.c Sat Mar 12 16:49:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: satmgr.c,v 1.5 2011/03/09 20:33:57 phx Exp $ */
+/* $NetBSD: satmgr.c,v 1.6 2011/03/12 16:49:16 phx Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -115,11 +115,9 @@
static void kreboot(struct satmgr_softc *);
static void sreboot(struct satmgr_softc *);
static void qreboot(struct satmgr_softc *);
-static void dreboot(struct satmgr_softc *);
static void kpwroff(struct satmgr_softc *);
static void spwroff(struct satmgr_softc *);
static void qpwroff(struct satmgr_softc *);
-static void dpwroff(struct satmgr_softc *);
static void kbutton(struct satmgr_softc *, int);
static void sbutton(struct satmgr_softc *, int);
static void qbutton(struct satmgr_softc *, int);
@@ -138,7 +136,7 @@
{ kurobox, kreboot, kpwroff, kbutton },
{ synology, sreboot, spwroff, sbutton },
{ qnap, qreboot, qpwroff, qbutton },
-{ dlink,dreboot, dpwroff, dbutton }
+{ dlink,NULL, NULL, dbutton }
};
/* single byte stride register layout */
@@ -266,11 +264,16 @@
satmgr_reboot(int howto)
{
struct satmgr_softc *sc = device_lookup_private(satmgr_cd, 0);
-
- if ((howto RB_POWERDOWN) == RB_AUTOBOOT)
- (*sc-sc_ops-reboot)(sc); /* REBOOT */
- else
- (*sc-sc_ops-pwroff)(sc); /* HALT or POWERDOWN */
+
+ if ((howto RB_POWERDOWN) == RB_AUTOBOOT) {
+ if (sc-sc_ops-reboot != NULL)
+ (*sc-sc_ops-reboot)(sc); /* REBOOT */
+ else
+ return;/* default reboot */
+ } else
+ if (sc-sc_ops-pwroff != NULL)
+ (*sc-sc_ops-pwroff)(sc); /* HALT or POWERDOWN */
+
tsleep(satmgr_reboot, PWAIT, reboot, 0);
/*NOTREACHED*/
}
@@ -699,20 +702,6 @@
}
static void
-dreboot(struct satmgr_softc *sc)
-{
-
- /* XXX cause a machine check exception? */
-}
-
-static void
-dpwroff(struct satmgr_softc *sc)
-{
-
- /* not possible */
-}
-
-static void
dbutton(struct satmgr_softc *sc, int ch)
{
CVS commit: src/sys/dev/pci
Module Name:src Committed By: phx Date: Sat Mar 12 16:52:05 UTC 2011 Modified Files: src/sys/dev/pci: if_stge.c Log Message: When shutting down the network interface it is not enough to stop it. Some boards also need to reset the chip, otherwise bad things can happen. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/dev/pci/if_stge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_stge.c diff -u src/sys/dev/pci/if_stge.c:1.52 src/sys/dev/pci/if_stge.c:1.53 --- src/sys/dev/pci/if_stge.c:1.52 Tue Mar 8 19:06:58 2011 +++ src/sys/dev/pci/if_stge.c Sat Mar 12 16:52:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_stge.c,v 1.52 2011/03/08 19:06:58 phx Exp $ */ +/* $NetBSD: if_stge.c,v 1.53 2011/03/12 16:52:05 phx Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_stge.c,v 1.52 2011/03/08 19:06:58 phx Exp $); +__KERNEL_RCSID(0, $NetBSD: if_stge.c,v 1.53 2011/03/12 16:52:05 phx Exp $); #include sys/param.h @@ -754,7 +754,7 @@ struct ifnet *ifp = sc-sc_ethercom.ec_if; stge_stop(ifp, 1); - + stge_reset(sc); return true; }
CVS commit: src/usr.bin/shmif_dumpbus
Module Name:src
Committed By: pooka
Date: Sat Mar 12 18:27:42 UTC 2011
Modified Files:
src/usr.bin/shmif_dumpbus: shmif_dumpbus.c
Log Message:
Apropos, pcap doesn't export the on-disk pcap packet header but
only the in-memory one. Since the in-memory one uses struct timeval
and the on-disk one uses 32bit time_t, things didn't work so well
on -current. Generate a suitable local packetheader to fix things.
(don't think it's worth writing via libpcap for something as simple
as this)
noticed both by bouyer and the shmif_dumpbus test
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/shmif_dumpbus/shmif_dumpbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/shmif_dumpbus/shmif_dumpbus.c
diff -u src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.3 src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.4
--- src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.3 Thu Mar 10 10:11:25 2011
+++ src/usr.bin/shmif_dumpbus/shmif_dumpbus.c Sat Mar 12 18:27:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: shmif_dumpbus.c,v 1.3 2011/03/10 10:11:25 pooka Exp $ */
+/* $NetBSD: shmif_dumpbus.c,v 1.4 2011/03/12 18:27:42 pooka Exp $ */
/*-
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -55,6 +55,19 @@
exit(1);
}
+/*
+ * Apparently pcap uses a non-exported structure as the on-disk
+ * packet header. Since that format isn't very likely to change
+ * soon, just define a local version
+ */
+struct ondisk_pcaphdr {
+ uint32_t ts_sec;
+ uint32_t ts_usec;
+ uint32_t caplen;
+ uint32_t len;
+
+};
+
#define BUFSIZE 64*1024
int
main(int argc, char *argv[])
@@ -153,7 +166,7 @@
i = 0;
while (curbus = buslast || bonus) {
- struct pcap_pkthdr packhdr;
+ struct ondisk_pcaphdr packhdr;
struct shmif_pkthdr sp;
uint32_t oldoff;
bool wrap;
@@ -187,8 +200,8 @@
memset(packhdr, 0, sizeof(packhdr));
packhdr.caplen = packhdr.len = sp.sp_len;
- packhdr.ts.tv_sec = sp.sp_sec;
- packhdr.ts.tv_usec = sp.sp_usec;
+ packhdr.ts_sec = sp.sp_sec;
+ packhdr.ts_usec = sp.sp_usec;
assert(sp.sp_len = BUFSIZE);
if (write(pfd, packhdr, sizeof(packhdr)) != sizeof(packhdr))
CVS commit: src
Module Name:src Committed By: christos Date: Sat Mar 12 19:52:48 UTC 2011 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/include: vis.h src/lib/libc: shlib_version src/lib/libc/compat/gen: Makefile.inc compat_unvis.c src/lib/libc/compat/include: vis.h src/lib/libc/gen: Makefile.inc unvis.3 unvis.c vis.3 vis.c src/lib/libc/include: namespace.h src/tests/lib/libc/gen: t_vis.c Added Files: src/lib/libc/compat/gen: compat___unvis13.c Log Message: Fix various vis/unvis issues: - no need for all the weak symbols - define a new _VIS_END flag for UNVIS_END so that there are no collisions between and vis and unvis flags. - add bound versions of the vis and unvis functions that take the length of the destination buffer. Unlike the OpenBSD ones they return -1 or NULL if the buffer is not large enough, instead of silently truncating. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.116 -r1.117 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.109 -r1.110 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.577 -r1.578 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/comp/ad.mips64eb \ src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.102 -r1.103 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.88 -r1.89 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1597 -r1.1598 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.162 -r1.163 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.18 -r1.19 src/include/vis.h cvs rdiff -u -r1.221 -r1.222 src/lib/libc/shlib_version cvs rdiff -u -r1.13 -r1.14 src/lib/libc/compat/gen/Makefile.inc cvs rdiff -u -r0 -r1.1 src/lib/libc/compat/gen/compat___unvis13.c cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/gen/compat_unvis.c cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/include/vis.h cvs rdiff -u -r1.173 -r1.174 src/lib/libc/gen/Makefile.inc cvs rdiff -u -r1.20 -r1.21 src/lib/libc/gen/unvis.3 cvs rdiff -u -r1.33 -r1.34 src/lib/libc/gen/unvis.c cvs rdiff -u -r1.23 -r1.24 src/lib/libc/gen/vis.3 cvs rdiff -u -r1.43 -r1.44 src/lib/libc/gen/vis.c cvs rdiff -u -r1.146 -r1.147 src/lib/libc/include/namespace.h cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/gen/t_vis.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.43 src/distrib/sets/lists/base/ad.mips64eb:1.44 --- src/distrib/sets/lists/base/ad.mips64eb:1.43 Tue Feb 15 22:42:17 2011 +++ src/distrib/sets/lists/base/ad.mips64eb Sat Mar 12 14:52:45 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.43 2011/02/16 03:42:17 christos Exp $ +# $NetBSD: ad.mips64eb,v 1.44 2011/03/12 19:52:45 christos Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -66,7 +66,7 @@ ./usr/lib/64/libbz2.so.1 base-compat-shlib compat,pic ./usr/lib/64/libbz2.so.1.1 base-compat-shlib compat,pic ./usr/lib/64/libc.so.12base-compat-shlib compat,pic -./usr/lib/64/libc.so.12.176 base-compat-shlib compat,pic +./usr/lib/64/libc.so.12.177 base-compat-shlib compat,pic ./usr/lib/64/libcom_err.so.6 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libcom_err.so.6.0 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libcrypt.so.1 base-compat-shlib compat,pic @@ -333,7 +333,7 @@ ./usr/lib/o32/libbz2.so.1 base-compat-shlib compat,pic ./usr/lib/o32/libbz2.so.1.1 base-compat-shlib compat,pic ./usr/lib/o32/libc.so.12 base-compat-shlib compat,pic -./usr/lib/o32/libc.so.12.176 base-compat-shlib compat,pic +./usr/lib/o32/libc.so.12.177 base-compat-shlib compat,pic ./usr/lib/o32/libcom_err.so.6 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libcom_err.so.6.0 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libcrypt.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.41 src/distrib/sets/lists/base/ad.mips64el:1.42 --- src/distrib/sets/lists/base/ad.mips64el:1.41 Tue Feb 15 22:42:17 2011 +++ src/distrib/sets/lists/base/ad.mips64el Sat Mar 12 14:52:45 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.41 2011/02/16 03:42:17 christos Exp $ +# $NetBSD: ad.mips64el,v 1.42 2011/03/12 19:52:45 christos Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -66,7 +66,7 @@ ./usr/lib/64/libbz2.so.1 base-compat-shlib compat,pic
CVS commit: src/lib/libc/dlfcn
Module Name:src
Committed By: joerg
Date: Sat Mar 12 21:55:10 UTC 2011
Modified Files:
src/lib/libc/dlfcn: dlfcn_elf.c
Log Message:
Avoid a dependency issue between pthread TLS by using simple atomic
initialisation, possibly running the initialisation loop more than once.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/dlfcn/dlfcn_elf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/dlfcn/dlfcn_elf.c
diff -u src/lib/libc/dlfcn/dlfcn_elf.c:1.8 src/lib/libc/dlfcn/dlfcn_elf.c:1.9
--- src/lib/libc/dlfcn/dlfcn_elf.c:1.8 Mon Mar 7 05:09:11 2011
+++ src/lib/libc/dlfcn/dlfcn_elf.c Sat Mar 12 21:55:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dlfcn_elf.c,v 1.8 2011/03/07 05:09:11 joerg Exp $ */
+/* $NetBSD: dlfcn_elf.c,v 1.9 2011/03/12 21:55:09 joerg Exp $ */
/*
* Copyright (c) 2000 Takuya SHIOZAKI
@@ -27,14 +27,15 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: dlfcn_elf.c,v 1.8 2011/03/07 05:09:11 joerg Exp $);
+__RCSID($NetBSD: dlfcn_elf.c,v 1.9 2011/03/12 21:55:09 joerg Exp $);
#endif /* LIBC_SCCS and not lint */
-#include reentrant.h
#include namespace.h
+#include sys/atomic.h
#include elf.h
#include errno.h
#include string.h
+#include stdbool.h
#undef dlopen
#undef dlclose
@@ -132,7 +133,6 @@
return -1;
}
-static once_t dl_iterate_phdr_once = ONCE_INITIALIZER;
static const char *dlpi_name;
static Elf_Addr dlpi_addr;
static const Elf_Phdr *dlpi_phdr;
@@ -175,12 +175,22 @@
dl_iterate_phdr(int (*callback)(struct dl_phdr_info *, size_t, void *),
void *data)
{
+ static bool setup_done;
struct dl_phdr_info phdr_info;
if (__auxinfo == NULL)
return EOPNOTSUPP;
- thr_once(dl_iterate_phdr_once, dl_iterate_phdr_setup);
+ if (!setup_done) {
+ /*
+ * This can race on the first call to dl_iterate_phdr.
+ * dl_iterate_phdr_setup only touches field of pointer size
+ * and smaller and such stores are atomic.
+ */
+ dl_iterate_phdr_setup();
+ membar_producer();
+ setup_done = true;
+ }
memset(phdr_info, 0, sizeof(phdr_info));
phdr_info.dlpi_addr = dlpi_addr;
CVS commit: src/sys/arch/arm/marvell
Module Name:src
Committed By: nonaka
Date: Sat Mar 12 22:34:52 UTC 2011
Modified Files:
src/sys/arch/arm/marvell: files.marvell
Log Message:
mvsoc needs pic_splfuncs.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/marvell/files.marvell
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/arm/marvell/files.marvell
diff -u src/sys/arch/arm/marvell/files.marvell:1.3 src/sys/arch/arm/marvell/files.marvell:1.4
--- src/sys/arch/arm/marvell/files.marvell:1.3 Sat Mar 5 14:50:56 2011
+++ src/sys/arch/arm/marvell/files.marvell Sat Mar 12 22:34:52 2011
@@ -1,11 +1,11 @@
-# $NetBSD: files.marvell,v 1.3 2011/03/05 14:50:56 matt Exp $
+# $NetBSD: files.marvell,v 1.4 2011/03/12 22:34:52 nonaka Exp $
#
# Configuration info for Marvell System on Chip support
#
include arch/arm/pic/files.pic
-device mvsoc { [unit = -1], [offset = -1], [irq = -1] } : bus_space_generic, pic
+device mvsoc { [unit = -1], [offset = -1], [irq = -1] } : bus_space_generic, pic, pic_splfuncs
attach mvsoc at mainbus
file arch/arm/marvell/mvsoc.c mvsoc
file arch/arm/marvell/mvsoc_space.c
@@ -68,7 +68,7 @@
attach gtidmac at mvsoc with gtidmac_mbus
# General Purpose I/O Port Interface
-device mvsocgpp: gpiobus, pic
+device mvsocgpp: gpiobus, pic, pic_splfuncs
attach mvsocgpp at mvsoc
file arch/arm/marvell/mvsocgpp.c mvsocgpp needs-flag
CVS commit: src
Module Name:src
Committed By: joerg
Date: Sat Mar 12 22:54:37 UTC 2011
Modified Files:
src/libexec/ld.elf_so: rtld.h symbol.c
src/libexec/ld.elf_so/arch/i386: mdreloc.c
src/libexec/ld.elf_so/arch/sh3: mdreloc.c
src/libexec/ld.elf_so/arch/x86_64: mdreloc.c
src/sys/arch/amd64/include: types.h
src/sys/arch/i386/include: types.h
src/sys/arch/sh3/include: types.h
Log Message:
Add TLS support for AMD64, i386 and SH3.
This material is based upon work partially supported by
The NetBSD Foundation under a contract with Joerg Sonnenberger.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/libexec/ld.elf_so/rtld.h
cvs rdiff -u -r1.55 -r1.56 src/libexec/ld.elf_so/symbol.c
cvs rdiff -u -r1.32 -r1.33 src/libexec/ld.elf_so/arch/i386/mdreloc.c
cvs rdiff -u -r1.28 -r1.29 src/libexec/ld.elf_so/arch/sh3/mdreloc.c
cvs rdiff -u -r1.38 -r1.39 src/libexec/ld.elf_so/arch/x86_64/mdreloc.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/amd64/include/types.h
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/i386/include/types.h
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sh3/include/types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.102 src/libexec/ld.elf_so/rtld.h:1.103
--- src/libexec/ld.elf_so/rtld.h:1.102 Thu Mar 10 14:27:31 2011
+++ src/libexec/ld.elf_so/rtld.h Sat Mar 12 22:54:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.h,v 1.102 2011/03/10 14:27:31 joerg Exp $ */
+/* $NetBSD: rtld.h,v 1.103 2011/03/12 22:54:36 joerg Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -375,6 +375,10 @@
extern size_t _rtld_tls_max_index;
__dso_public extern void *__tls_get_addr(void *);
+#ifdef __i386__
+__dso_public extern void *___tls_get_addr(void *)
+__attribute__((__regparm__(1)));
+#endif
#endif
/* map_object.c */
Index: src/libexec/ld.elf_so/symbol.c
diff -u src/libexec/ld.elf_so/symbol.c:1.55 src/libexec/ld.elf_so/symbol.c:1.56
--- src/libexec/ld.elf_so/symbol.c:1.55 Wed Mar 9 23:10:07 2011
+++ src/libexec/ld.elf_so/symbol.c Sat Mar 12 22:54:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: symbol.c,v 1.55 2011/03/09 23:10:07 joerg Exp $ */
+/* $NetBSD: symbol.c,v 1.56 2011/03/12 22:54:36 joerg Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: symbol.c,v 1.55 2011/03/09 23:10:07 joerg Exp $);
+__RCSID($NetBSD: symbol.c,v 1.56 2011/03/12 22:54:36 joerg Exp $);
#endif /* not lint */
#include err.h
@@ -97,6 +97,9 @@
(fptr_t)_rtld_tls_allocate,
(fptr_t)_rtld_tls_free,
(fptr_t)__tls_get_addr,
+#ifdef __i386__
+ (fptr_t)___tls_get_addr,
+#endif
#endif
NULL
};
Index: src/libexec/ld.elf_so/arch/i386/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/i386/mdreloc.c:1.32 src/libexec/ld.elf_so/arch/i386/mdreloc.c:1.33
--- src/libexec/ld.elf_so/arch/i386/mdreloc.c:1.32 Fri Aug 6 16:33:18 2010
+++ src/libexec/ld.elf_so/arch/i386/mdreloc.c Sat Mar 12 22:54:36 2011
@@ -1,11 +1,12 @@
-/* $NetBSD: mdreloc.c,v 1.32 2010/08/06 16:33:18 joerg Exp $ */
+/* $NetBSD: mdreloc.c,v 1.33 2011/03/12 22:54:36 joerg Exp $ */
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: mdreloc.c,v 1.32 2010/08/06 16:33:18 joerg Exp $);
+__RCSID($NetBSD: mdreloc.c,v 1.33 2011/03/12 22:54:36 joerg Exp $);
#endif /* not lint */
#include sys/types.h
+#include sys/ucontext.h
#include debug.h
#include rtld.h
@@ -119,6 +120,47 @@
rdbg((COPY (avoid in main)));
break;
+ case R_TYPE(TLS_TPOFF):
+ def = _rtld_find_symdef(symnum, obj, defobj, false);
+ if (def == NULL)
+return -1;
+
+ if (!defobj-tls_done
+ _rtld_tls_offset_allocate(obj))
+return -1;
+
+ *where = (Elf_Addr)(def-st_value - defobj-tlsoffset);
+
+ rdbg((TLS_TPOFF %s in %s -- %p,
+ obj-strtab + obj-symtab[symnum].st_name,
+ obj-path, (void *)*where));
+ break;
+
+ case R_TYPE(TLS_DTPMOD32):
+ def = _rtld_find_symdef(symnum, obj, defobj, false);
+ if (def == NULL)
+return -1;
+
+ *where = (Elf_Addr)(defobj-tlsindex);
+
+ rdbg((TLS_DTPMOD32 %s in %s -- %p,
+ obj-strtab + obj-symtab[symnum].st_name,
+ obj-path, (void *)*where));
+ break;
+
+ case R_TYPE(TLS_DTPOFF32):
+ def = _rtld_find_symdef(symnum, obj, defobj, false);
+ if (def == NULL)
+return -1;
+
+ *where = (Elf_Addr)(def-st_value);
+
+ rdbg((TLS_DTPOFF32 %s in %s -- %p,
+ obj-strtab + obj-symtab[symnum].st_name,
+ obj-path, (void *)*where));
+
+ break;
+
default:
rdbg((sym = %lu, type = %lu, offset = %p,
contents = %p, symbol = %s,
@@ -214,3 +256,25 @@
}
return err;
}
+
+/*
+ * i386 specific GNU variant of __tls_get_addr using register based
+ * argument passing.
+ */
+#define DTV_MAX_INDEX(dtv) ((size_t)((dtv)[-1]))
+
+__dso_public __attribute__((__regparm__(1))) void *
+___tls_get_addr(void *arg_)
+{
+
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: erh
Date: Sat Mar 12 23:04:17 UTC 2011
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Fix the usage of the -s option to mention using it multiple times, rather
than the deprecated colon separated syntax.
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/usr.sbin/postinstall/postinstall
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/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.114 src/usr.sbin/postinstall/postinstall:1.115
--- src/usr.sbin/postinstall/postinstall:1.114 Sun Feb 13 20:25:35 2011
+++ src/usr.sbin/postinstall/postinstall Sat Mar 12 23:04:16 2011
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.114 2011/02/13 20:25:35 tron Exp $
+# $NetBSD: postinstall,v 1.115 2011/03/12 23:04:16 erh Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1513,8 +1513,8 @@
of the following:
* A directory that contains a NetBSD source tree;
* A distribution set file such as etc.tgz or
- xetc.tgz, or a colon-separated list of such
- files;
+ xetc.tgz. Pass multiple -s options to specify
+ multiple such files;
* A temporary directory in which one or both of
etc.tgz and xetc.tgz have been extracted.
[${SRC_DIR:-/}]
CVS commit: src/external/mit/xorg/lib/libOSMesa
Module Name:src
Committed By: mrg
Date: Sun Mar 13 04:48:53 UTC 2011
Modified Files:
src/external/mit/xorg/lib/libOSMesa: libmesa.mk
Log Message:
clean up the glsl generated files.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libOSMesa/libmesa.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libOSMesa/libmesa.mk
diff -u src/external/mit/xorg/lib/libOSMesa/libmesa.mk:1.6 src/external/mit/xorg/lib/libOSMesa/libmesa.mk:1.7
--- src/external/mit/xorg/lib/libOSMesa/libmesa.mk:1.6 Mon Jul 19 05:34:27 2010
+++ src/external/mit/xorg/lib/libOSMesa/libmesa.mk Sun Mar 13 04:48:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: libmesa.mk,v 1.6 2010/07/19 05:34:27 mrg Exp $
+# $NetBSD: libmesa.mk,v 1.7 2011/03/13 04:48:53 mrg Exp $
#
# Consumer of this Makefile should set MESA_SRC_MODULES.
@@ -344,13 +344,14 @@
CPPFLAGS+= -I.
#
-${SRCS.slang}: library/slang_120_core_gc.h \
- library/slang_builtin_120_common_gc.h \
- library/slang_builtin_120_fragment_gc.h \
- library/slang_common_builtin_gc.h \
- library/slang_core_gc.h \
- library/slang_fragment_builtin_gc.h \
- library/slang_vertex_builtin_gc.h
+HEADERS.slang= library/slang_120_core_gc.h \
+ library/slang_builtin_120_common_gc.h \
+ library/slang_builtin_120_fragment_gc.h \
+ library/slang_common_builtin_gc.h \
+ library/slang_core_gc.h \
+ library/slang_fragment_builtin_gc.h \
+ library/slang_vertex_builtin_gc.h
+${SRCS.slang}: ${HEADERS.slang}
library/slang_120_core_gc.h: slang_120_core.gc
-@mkdir -p library
@@ -381,3 +382,9 @@
$(GLSL) vertex $ library/slang_vertex_builtin_gc.h
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/shader/slang/library
+
+CLEANFILES+= ${HEADERS.slang}
+cleandir: cleanmesa
+cleanmesa: .PHONY
+ -@if [ -d library ]; then rmdir library; fi
+
CVS commit: src/share/man/man9/man9.x86
Module Name:src Committed By: jruoho Date: Sun Mar 13 04:57:21 UTC 2011 Modified Files: src/share/man/man9/man9.x86: tsc.9 Log Message: Xref hpet(4) and hz(9). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man9/man9.x86/tsc.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/man9.x86/tsc.9 diff -u src/share/man/man9/man9.x86/tsc.9:1.2 src/share/man/man9/man9.x86/tsc.9:1.3 --- src/share/man/man9/man9.x86/tsc.9:1.2 Sat Mar 12 13:25:41 2011 +++ src/share/man/man9/man9.x86/tsc.9 Sun Mar 13 04:57:21 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: tsc.9,v 1.2 2011/03/12 13:25:41 wiz Exp $ +.\ $NetBSD: tsc.9,v 1.3 2011/03/13 04:57:21 jruoho Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd March 5, 2011 +.Dd March 13, 2011 .Dt TSC 9 x86 .Os .Sh NAME @@ -146,5 +146,6 @@ .\ .Sh SEE ALSO .Xr gettimeofday 2 , -.Xr timeval 3 , +.Xr hpet 4 , +.Xr hz 9 , .Xr timecounter 9
CVS commit: src/share/man/man4/man4.x86
Module Name:src Committed By: jruoho Date: Sun Mar 13 04:58:55 UTC 2011 Modified Files: src/share/man/man4/man4.x86: hpet.4 Log Message: Xref tsc(9). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/man4.x86/hpet.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.x86/hpet.4 diff -u src/share/man/man4/man4.x86/hpet.4:1.1 src/share/man/man4/man4.x86/hpet.4:1.2 --- src/share/man/man4/man4.x86/hpet.4:1.1 Fri Aug 6 16:42:31 2010 +++ src/share/man/man4/man4.x86/hpet.4 Sun Mar 13 04:58:55 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: hpet.4,v 1.1 2010/08/06 16:42:31 jruoho Exp $ +.\ $NetBSD: hpet.4,v 1.2 2011/03/13 04:58:55 jruoho Exp $ .\ .\ Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd August 6, 2010 +.Dd March 13, 2011 .Dt HPET 4 x86 .Os .Sh NAME @@ -66,7 +66,8 @@ .Sh SEE ALSO .Xr acpi 4 , .Xr attimer 4 , -.Xr timecounter 9 +.Xr timecounter 9 , +.Xr tsc 9 .Rs .%A Intel Corporation .%T IA-PC HPET (High Precision Event Timers) Specification
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Sun Mar 13 05:03:21 UTC 2011 Modified Files: src/share/man/man9: time_second.9 Log Message: Tidy up the SEE ALSO section. Namely, do not duplicate a big list of xrefs that are already used in the body of the text. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man9/time_second.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/time_second.9 diff -u src/share/man/man9/time_second.9:1.4 src/share/man/man9/time_second.9:1.5 --- src/share/man/man9/time_second.9:1.4 Thu Mar 12 12:40:20 2009 +++ src/share/man/man9/time_second.9 Sun Mar 13 05:03:21 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: time_second.9,v 1.4 2009/03/12 12:40:20 joerg Exp $ +.\ $NetBSD: time_second.9,v 1.5 2011/03/13 05:03:21 jruoho Exp $ .\ .\ Copyright (c) 1994 Christopher G. Demetriou .\ All rights reserved. @@ -32,7 +32,7 @@ .\ .\ Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp .\ -.Dd November 28, 2008 +.Dd March 13, 2008 .Dt TIME_SECOND 9 .Os .Sh NAME @@ -73,6 +73,7 @@ It is set at system boot, and is updated when the system time is adjusted with .Xr settimeofday 2 . +The variable may be read and written without special precautions. .Pp All of these variables contain times expressed in seconds and microseconds since midnight (0 hour), @@ -99,26 +100,9 @@ .Xr getnanouptime 9 functions can be used to get the time elapsed since boot more accurately and in an atomic manner. -.Pp -.Va boottime -may be read and written without special precautions. .Sh SEE ALSO .Xr clock_settime 2 , .Xr ntp_adjtime 2 , -.Xr settimeofday 2 , -.Xr bintime 9 , -.Xr binuptime 9 , -.Xr getbintime 9 , -.Xr getbinuptime 9 , -.Xr getmicrotime 9 , -.Xr getmicrouptime 9 , -.Xr getnanotime 9 , -.Xr getnanouptime 9 , +.Xr timeval 3 , .Xr hardclock 9 , -.Xr hz 9 , -.Xr inittodr 9 , -.Xr microtime 9 , -.Xr microuptime 9 , -.Xr nanotime 9 , -.Xr nanouptime 9 , -.Xr timecounter 9 +.Xr hz 9
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: kiyohara
Date: Sun Mar 13 05:26:14 UTC 2011
Modified Files:
src/sys/dev/ic: sl811hs.c
Log Message:
Fix reset status. Clear some flags for active pipes after completing hard reset.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/ic/sl811hs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.26 src/sys/dev/ic/sl811hs.c:1.27
--- src/sys/dev/ic/sl811hs.c:1.26 Sat May 8 01:33:00 2010
+++ src/sys/dev/ic/sl811hs.c Sun Mar 13 05:26:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.26 2010/05/08 01:33:00 isaki Exp $ */
+/* $NetBSD: sl811hs.c,v 1.27 2011/03/13 05:26:14 kiyohara Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -84,7 +84,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sl811hs.c,v 1.26 2010/05/08 01:33:00 isaki Exp $);
+__KERNEL_RCSID(0, $NetBSD: sl811hs.c,v 1.27 2011/03/13 05:26:14 kiyohara Exp $);
#include opt_slhci.h
@@ -2801,7 +2801,7 @@
/* Cancel all pipes. Note that not all of these may be on the
* callback queue yet; some could be in slhci_start, for example. */
FOREACH_AP(q, t, spipe) {
- spipe-pflags = PF_GONE;
+ spipe-pflags |= PF_GONE;
spipe-pipe.repeat = 0;
spipe-pipe.aborting = 1;
if (spipe-xfer != NULL)
@@ -2828,6 +2828,8 @@
slhci_reset(struct slhci_softc *sc)
{
struct slhci_transfers *t;
+ struct slhci_pipe *spipe;
+ struct gcq *q;
uint8_t r, pol, ctrl;
t = sc-sc_transfers;
@@ -2914,6 +2916,10 @@
t-flags = ~(F_UDISABLED|F_RESET);
t-flags |= F_CRESET|F_ROOTINTR;
+ FOREACH_AP(q, t, spipe) {
+ spipe-pflags = ~PF_GONE;
+ spipe-pipe.aborting = 0;
+ }
DLOG(D_MSG, RESET done flags %#x, t-flags, 0,0,0);
}
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: mrg
Date: Sun Mar 13 07:40:45 UTC 2011
Modified Files:
src/lib/libc/gen: unvis.c
Log Message:
cast ~0 to (size_t) when passing to a size_t taking function.
fixes lint build errors.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/gen/unvis.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/unvis.c
diff -u src/lib/libc/gen/unvis.c:1.34 src/lib/libc/gen/unvis.c:1.35
--- src/lib/libc/gen/unvis.c:1.34 Sat Mar 12 19:52:48 2011
+++ src/lib/libc/gen/unvis.c Sun Mar 13 07:40:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: unvis.c,v 1.34 2011/03/12 19:52:48 christos Exp $ */
+/* $NetBSD: unvis.c,v 1.35 2011/03/13 07:40:44 mrg Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)unvis.c 8.1 (Berkeley) 6/4/93;
#else
-__RCSID($NetBSD: unvis.c,v 1.34 2011/03/12 19:52:48 christos Exp $);
+__RCSID($NetBSD: unvis.c,v 1.35 2011/03/13 07:40:44 mrg Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -528,13 +528,13 @@
int
strunvisx(char *dst, const char *src, int flag)
{
- return strnunvisx(dst, ~0, src, flag);
+ return strnunvisx(dst, (size_t)~0, src, flag);
}
int
strunvis(char *dst, const char *src)
{
- return strnunvisx(dst, ~0, src, 0);
+ return strnunvisx(dst, (size_t)~0, src, 0);
}
int
