CVS commit: src/sys/arch/sh3
Module Name:src Committed By: nonaka Date: Thu Apr 30 05:20:31 UTC 2009 Modified Files: src/sys/arch/sh3/dev: adc.c src/sys/arch/sh3/sh3: cache_sh3.c interrupt.c Log Message: Support SH7706 To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sh3/dev/adc.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sh3/sh3/cache_sh3.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sh3/sh3/interrupt.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/sh3/dev/adc.c diff -u src/sys/arch/sh3/dev/adc.c:1.11 src/sys/arch/sh3/dev/adc.c:1.12 --- src/sys/arch/sh3/dev/adc.c:1.11 Sun Apr 5 00:22:27 2009 +++ src/sys/arch/sh3/dev/adc.c Thu Apr 30 05:20:30 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: adc.c,v 1.11 2009/04/05 00:22:27 uwe Exp $ */ +/* $NetBSD: adc.c,v 1.12 2009/04/30 05:20:30 nonaka Exp $ */ /* * Copyright (c) 2003 Valeriy E. Ushakov @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: adc.c,v 1.11 2009/04/05 00:22:27 uwe Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adc.c,v 1.12 2009/04/30 05:20:30 nonaka Exp $"); #include #include @@ -58,7 +58,8 @@ /* REMINDER: also in 7727 and 7729 */ if ((cpu_product != CPU_PRODUCT_7709) - && (cpu_product != CPU_PRODUCT_7709A)) + && (cpu_product != CPU_PRODUCT_7709A) + && (cpu_product != CPU_PRODUCT_7706)) return (0); if (strcmp(cf->cf_name, "adc") != 0) Index: src/sys/arch/sh3/sh3/cache_sh3.c diff -u src/sys/arch/sh3/sh3/cache_sh3.c:1.14 src/sys/arch/sh3/sh3/cache_sh3.c:1.15 --- src/sys/arch/sh3/sh3/cache_sh3.c:1.14 Mon Apr 28 20:23:35 2008 +++ src/sys/arch/sh3/sh3/cache_sh3.c Thu Apr 30 05:20:30 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cache_sh3.c,v 1.14 2008/04/28 20:23:35 martin Exp $ */ +/* $NetBSD: cache_sh3.c,v 1.15 2009/04/30 05:20:30 nonaka Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cache_sh3.c,v 1.14 2008/04/28 20:23:35 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cache_sh3.c,v 1.15 2009/04/30 05:20:30 nonaka Exp $"); #include "opt_cache.h" @@ -77,6 +77,8 @@ cache_size = 8 * 1024; break; case CPU_PRODUCT_7709A: + /* FALLTHROUGH */ + case CPU_PRODUCT_7706: cache_size = 16 * 1024; break; } Index: src/sys/arch/sh3/sh3/interrupt.c diff -u src/sys/arch/sh3/sh3/interrupt.c:1.27 src/sys/arch/sh3/sh3/interrupt.c:1.28 --- src/sys/arch/sh3/sh3/interrupt.c:1.27 Mon Apr 28 20:23:35 2008 +++ src/sys/arch/sh3/sh3/interrupt.c Thu Apr 30 05:20:30 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: interrupt.c,v 1.27 2008/04/28 20:23:35 martin Exp $ */ +/* $NetBSD: interrupt.c,v 1.28 2009/04/30 05:20:30 nonaka Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.27 2008/04/28 20:23:35 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.28 2009/04/30 05:20:30 nonaka Exp $"); #include #include @@ -76,6 +76,7 @@ #ifdef SH3 case CPU_PRODUCT_7709: case CPU_PRODUCT_7709A: + case CPU_PRODUCT_7706: _reg_write_2(SH7709_IPRC, 0); _reg_write_2(SH7709_IPRD, 0); _reg_write_2(SH7709_IPRE, 0); @@ -215,7 +216,7 @@ * int intc_intr_priority(int evtcode, int level) * Setup interrupt priority register. * SH7708, SH7708S, SH7708R, SH7750, SH7750S ... evtcode is INTEVT - * SH7709, SH7709A ... evtcode is INTEVT2 + * SH7709, SH7709A, SH7706 ... evtcode is INTEVT2 */ static void intc_intr_priority(int evtcode, int level) @@ -391,7 +392,9 @@ { printf("INTEVT=0x%x", _reg_read_4(SH_(INTEVT))); - if (cpu_product == CPU_PRODUCT_7709 || cpu_product == CPU_PRODUCT_7709A) + if (cpu_product == CPU_PRODUCT_7709 || + cpu_product == CPU_PRODUCT_7709A || + cpu_product == CPU_PRODUCT_7706) printf(" INTEVT2=0x%x", _reg_read_4(SH7709_INTEVT2)); printf("\n");
CVS commit: src/sys/arch/sh3/include
Module Name:src Committed By: nonaka Date: Thu Apr 30 05:19:38 UTC 2009 Modified Files: src/sys/arch/sh3/include: scireg.h Log Message: Added some register definition. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sh3/include/scireg.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/sh3/include/scireg.h diff -u src/sys/arch/sh3/include/scireg.h:1.8 src/sys/arch/sh3/include/scireg.h:1.9 --- src/sys/arch/sh3/include/scireg.h:1.8 Tue Jul 1 11:49:37 2003 +++ src/sys/arch/sh3/include/scireg.h Thu Apr 30 05:19:38 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: scireg.h,v 1.8 2003/07/01 11:49:37 uwe Exp $ */ +/* $NetBSD: scireg.h,v 1.9 2009/04/30 05:19:38 nonaka Exp $ */ /*- * Copyright (C) 1999 SAITOH Masanobu. All rights reserved. @@ -43,6 +43,7 @@ #define SHREG_SCTDR (*(volatile unsigned char *) 0xFE86) #define SHREG_SCSSR (*(volatile unsigned char *) 0xFE88) #define SHREG_SCRDR (*(volatile unsigned char *) 0xFE8A) +#define SHREG_SCSCMR (*(volatile unsigned char *) 0xFE8C) #define SHREG_SCSPDR (*(volatile unsigned char *) 0xf4000136) #else @@ -59,6 +60,15 @@ #endif +#define SCSMR_CA 0x80 +#define SCSMR_CHR 0x40 +#define SCSMR_PE 0x20 +#define SCSMR_OE 0x10 +#define SCSMR_STOP 0x08 +#define SCSMR_MP 0x04 +#define SCSMR_CKS1 0x02 +#define SCSMR_CKS0 0x01 + #define SCSCR_TIE 0x80 /* Transmit Interrupt Enable */ #define SCSCR_RIE 0x40 /* Receive Interrupt Enable */ #define SCSCR_TE 0x20 /* Transmit Enable */ @@ -73,6 +83,9 @@ #define SCSSR_ORER 0x20 #define SCSSR_FER 0x10 #define SCSSR_PER 0x08 +#define SCSSR_TEND 0x04 +#define SCSSR_MPB 0x02 +#define SCSSR_MPBT 0x01 #define SCSPTR_SPB1IO 0x08 #define SCSPTR_SPB1DT 0x04
CVS commit: src/sys/kern
Module Name:src Committed By: nonaka Date: Thu Apr 30 05:15:36 UTC 2009 Modified Files: src/sys/kern: kern_drvctl.c Log Message: include sys/lwp.h for curlwp. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/kern/kern_drvctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_drvctl.c diff -u src/sys/kern/kern_drvctl.c:1.26 src/sys/kern/kern_drvctl.c:1.27 --- src/sys/kern/kern_drvctl.c:1.26 Sat Apr 11 23:05:26 2009 +++ src/sys/kern/kern_drvctl.c Thu Apr 30 05:15:36 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_drvctl.c,v 1.26 2009/04/11 23:05:26 christos Exp $ */ +/* $NetBSD: kern_drvctl.c,v 1.27 2009/04/30 05:15:36 nonaka Exp $ */ /* * Copyright (c) 2004 @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.26 2009/04/11 23:05:26 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.27 2009/04/30 05:15:36 nonaka Exp $"); #include #include @@ -46,6 +46,7 @@ #include #include #include +#include struct drvctl_event { TAILQ_ENTRY(drvctl_event) dce_link;
CVS commit: src/crypto/external/bsd/netpgp/lib
Module Name:src Committed By: agc Date: Thu Apr 30 04:59:14 UTC 2009 Modified Files: src/crypto/external/bsd/netpgp/lib: Makefile Log Message: Build the netpgp library with WARNS=3 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/lib/Makefile 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/lib/Makefile diff -u src/crypto/external/bsd/netpgp/lib/Makefile:1.2 src/crypto/external/bsd/netpgp/lib/Makefile:1.3 --- src/crypto/external/bsd/netpgp/lib/Makefile:1.2 Sat Apr 25 01:29:15 2009 +++ src/crypto/external/bsd/netpgp/lib/Makefile Thu Apr 30 04:59:14 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2009/04/25 01:29:15 agc Exp $ +# $NetBSD: Makefile,v 1.3 2009/04/30 04:59:14 agc Exp $ .include @@ -11,8 +11,7 @@ SRCS+= symmetric.c validate.c writer.c CPPFLAGS+= -I${EXTDIST}/include MAN= libnetpgp.3 -WARNS=0 -#WARNS=4 +WARNS=3 EXTDIST=${NETBSDSRCDIR}/crypto/external/bsd/netpgp/dist
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: agc Date: Thu Apr 30 04:57:57 UTC 2009 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: compress.c create.c keyring.c netpgp.c openssl_crypto.c packet-print.c reader.c signature.c Log Message: WARNS=3 fixes To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/netpgp/dist/src/lib/compress.c \ src/crypto/external/bsd/netpgp/dist/src/lib/create.c \ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c \ src/crypto/external/bsd/netpgp/dist/src/lib/openssl_crypto.c \ src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c \ src/crypto/external/bsd/netpgp/dist/src/lib/signature.c cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c \ src/crypto/external/bsd/netpgp/dist/src/lib/reader.c 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/src/lib/compress.c diff -u src/crypto/external/bsd/netpgp/dist/src/lib/compress.c:1.2 src/crypto/external/bsd/netpgp/dist/src/lib/compress.c:1.3 --- src/crypto/external/bsd/netpgp/dist/src/lib/compress.c:1.2 Sat Apr 25 01:29:14 2009 +++ src/crypto/external/bsd/netpgp/dist/src/lib/compress.c Thu Apr 30 04:57:57 2009 @@ -85,8 +85,8 @@ { z_decompress_t *z = __ops_reader_get_arg(rinfo); size_t len; + size_t cc; char *cdest = dest; - int cc; assert(z->type == OPS_C_ZIP || z->type == OPS_C_ZLIB); @@ -168,8 +168,8 @@ { bz_decompress_t *bz = __ops_reader_get_arg(rinfo); size_t len; + size_t cc; char *cdest = dest; - int cc; assert(bz->type == OPS_C_BZIP2); Index: src/crypto/external/bsd/netpgp/dist/src/lib/create.c diff -u src/crypto/external/bsd/netpgp/dist/src/lib/create.c:1.2 src/crypto/external/bsd/netpgp/dist/src/lib/create.c:1.3 --- src/crypto/external/bsd/netpgp/dist/src/lib/create.c:1.2 Sat Apr 25 01:29:15 2009 +++ src/crypto/external/bsd/netpgp/dist/src/lib/create.c Thu Apr 30 04:57:57 2009 @@ -39,13 +39,19 @@ #include "memory.h" #include "netpgpdefs.h" +#include +#include +#include + #include #ifdef HAVE_ASSERT_H #include #endif +#ifdef HAVE_FCNTL_H #include +#endif #ifdef HAVE_UNISTD_H #include @@ -99,9 +105,9 @@ __ops_write_struct_user_id(__ops_user_id_t * id, __ops_create_info_t * info) { - return __ops_write_ptag(OPS_PTAG_CT_USER_ID, info) - && __ops_write_length(strlen((char *) id->user_id), info) - && __ops_write(id->user_id, strlen((char *) id->user_id), info); + return __ops_write_ptag(OPS_PTAG_CT_USER_ID, info) && + __ops_write_length(strlen((char *) id->user_id), info) && + __ops_write(id->user_id, strlen((char *) id->user_id), info); } /** @@ -359,6 +365,7 @@ if (__ops_get_debug_level(__FILE__)) { unsigned inti2 = 0; + fprintf(stderr, "\nWRITING:\niv="); for (i2 = 0; i2 < __ops_block_size(key->algorithm); i2++) { fprintf(stderr, "%02x ", key->iv[i2]); @@ -385,12 +392,12 @@ case OPS_PKA_RSA_ENCRYPT_ONLY: case OPS_PKA_RSA_SIGN_ONLY: - if (!__ops_write_mpi(key->key.rsa.d, info) - || !__ops_write_mpi(key->key.rsa.p, info) - || !__ops_write_mpi(key->key.rsa.q, info) - || !__ops_write_mpi(key->key.rsa.u, info)) { + if (!__ops_write_mpi(key->key.rsa.d, info) || + !__ops_write_mpi(key->key.rsa.p, info) || + !__ops_write_mpi(key->key.rsa.q, info) || + !__ops_write_mpi(key->key.rsa.u, info)) { if (__ops_get_debug_level(__FILE__)) { -fprintf(stderr, "4 x mpi not written - problem\n"); +(void) fprintf(stderr, "4 x mpi not written - problem\n"); } return false; } @@ -522,10 +529,12 @@ */ bool -__ops_write_transferable_secret_key(const __ops_keydata_t * keydata, const unsigned char *passphrase, const size_t pplen, bool armoured, __ops_create_info_t * info) +__ops_write_transferable_secret_key(const __ops_keydata_t *keydata, + const unsigned char *passphrase, const size_t pplen, + bool armoured, __ops_create_info_t * info) { - bool rtn; - unsigned inti = 0, j = 0; + unsigned i = 0, j = 0; + bool rtn; if (armoured) { __ops_writer_push_armoured(info, OPS_PGP_PRIVATE_KEY_BLOCK); @@ -757,10 +766,10 @@ /* secret key and public key MPIs */ length += secret_key_length(key); - return __ops_write_ptag(OPS_PTAG_CT_SECRET_KEY, info) - /* && __ops_write_length(1+4+1+1+secret_key_length(key)+2,info) */ - && __ops_write_length((unsigned)length, info) - && write_secret_key_body(key, passphrase, pplen, info); + return __ops_write_ptag(OPS_PTAG_CT_SECRET_KEY, info) && + /* __ops_write_length(1+4+1+1+secret_key_length(key)+2,info) && */ + __ops_write_length((unsigned)length, info) && + write_secret_key_body(key, passphrase, pplen, info); } /** @@ -894,7 +903,6 @@ (void) memcpy(EM + i, M, mLen); - if (__ops_get_debug_level(__FILE__)) { unsigned inti2 = 0; fprintf(stderr, "Encod
CVS commit: src/sys/arch/xen/conf
Module Name:src Committed By: pgoyette Date: Thu Apr 30 04:38:02 UTC 2009 Modified Files: src/sys/arch/xen/conf: files.xen Log Message: Include cpu_topology.c for xen kernels, too. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/sys/arch/xen/conf/files.xen 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/xen/conf/files.xen diff -u src/sys/arch/xen/conf/files.xen:1.98 src/sys/arch/xen/conf/files.xen:1.99 --- src/sys/arch/xen/conf/files.xen:1.98 Sat Apr 18 11:26:58 2009 +++ src/sys/arch/xen/conf/files.xen Thu Apr 30 04:38:01 2009 @@ -1,4 +1,4 @@ -# $NetBSD: files.xen,v 1.98 2009/04/18 11:26:58 cegger Exp $ +# $NetBSD: files.xen,v 1.99 2009/04/30 04:38:01 pgoyette Exp $ # NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp # NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp @@ -130,6 +130,7 @@ file arch/x86/x86/tsc.c file arch/x86/x86/vm_machdep.c file arch/x86/x86/x86_machdep.c +file arch/x86/x86/cpu_topology.c include "arch/xen/conf/files.compat"
CVS commit: othersrc/usr.bin/pod2mdoc
Module Name:othersrc Committed By: joerg Date: Thu Apr 30 01:56:03 UTC 2009 Modified Files: othersrc/usr.bin/pod2mdoc: pod2mdoc.py Log Message: Appease the license gods by adding a proper note. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/pod2mdoc/pod2mdoc.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/pod2mdoc/pod2mdoc.py diff -u othersrc/usr.bin/pod2mdoc/pod2mdoc.py:1.1 othersrc/usr.bin/pod2mdoc/pod2mdoc.py:1.2 --- othersrc/usr.bin/pod2mdoc/pod2mdoc.py:1.1 Thu Apr 30 00:28:58 2009 +++ othersrc/usr.bin/pod2mdoc/pod2mdoc.py Thu Apr 30 01:56:03 2009 @@ -1,4 +1,33 @@ #!/usr/pkg/bin/python2.5 +# $NetBSD: pod2mdoc.py,v 1.2 2009/04/30 01:56:03 joerg Exp $ +# +# Copyright (c) 2009 Joerg Sonnenberger . +# 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 COPYRIGHT HOLDERS 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 +# COPYRIGHT HOLDERS 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. + import datetime import re @@ -339,7 +368,7 @@ self._children.append(c) def output(self): output = [] - output.append(".\\\" $NetBSD: pod2mdoc.py,v 1.1 2009/04/30 00:28:58 joerg Exp $") + output.append(".\\\" $NetBSD: pod2mdoc.py,v 1.2 2009/04/30 01:56:03 joerg Exp $") output.append(".Dd %s" % mdoc_date) output.append(".Dt %s %s" % (mdoc_command.upper(), mdoc_section)) output.append(".Os")
CVS commit: [netbsd-5-0] src
Module Name:src Committed By: snj Date: Thu Apr 30 01:03:08 UTC 2009 Modified Files: src/gnu/usr.bin/groff/tmac [netbsd-5-0]: mdoc.local src/sys/sys [netbsd-5-0]: param.h Added Files: src/doc [netbsd-5-0]: CHANGES-5.0.1 Log Message: Welcome to 5.0.0_PATCH. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-5.0.1 cvs rdiff -u -r1.43.4.8 -r1.43.4.8.2.1 src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.330.4.9 -r1.330.4.9.2.1 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.8 src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.8.2.1 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.8 Sun Apr 26 01:39:54 2009 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Thu Apr 30 01:03:07 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.43.4.8 2009/04/26 01:39:54 snj Exp $ +.\" $NetBSD: mdoc.local,v 1.43.4.8.2.1 2009/04/30 01:03:07 snj Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\" Default .Os value -.ds doc-operating-system NetBSD\~5.0 +.ds doc-operating-system NetBSD\~5.0.0_PATCH .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~5.0 +.ds doc-default-operating-system NetBSD\~5.0.0_PATCH .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.330.4.9 src/sys/sys/param.h:1.330.4.9.2.1 --- src/sys/sys/param.h:1.330.4.9 Sun Apr 26 01:39:55 2009 +++ src/sys/sys/param.h Thu Apr 30 01:03:08 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.330.4.9 2009/04/26 01:39:55 snj Exp $ */ +/* $NetBSD: param.h,v 1.330.4.9.2.1 2009/04/30 01:03:08 snj Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 50003 /* NetBSD 5.0 */ +#define __NetBSD_Version__ 50003 /* NetBSD 5.0.0_PATCH */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__) Added files: Index: src/doc/CHANGES-5.0.1 diff -u /dev/null src/doc/CHANGES-5.0.1:1.1.2.1 --- /dev/null Thu Apr 30 01:03:08 2009 +++ src/doc/CHANGES-5.0.1 Thu Apr 30 01:03:07 2009 @@ -0,0 +1,11 @@ +# $NetBSD: CHANGES-5.0.1,v 1.1.2.1 2009/04/30 01:03:07 snj Exp $ + +A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.0.1 +release: + +gnu/usr.bin/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 5.0.0_PATCH. + [snj] +
CVS commit: [netbsd-5] src
Module Name:src Committed By: snj Date: Thu Apr 30 00:54:47 UTC 2009 Modified Files: src/gnu/usr.bin/groff/tmac [netbsd-5]: mdoc.local src/sys/sys [netbsd-5]: param.h Added Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Welcome to 5.0_STABLE. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-5.1 cvs rdiff -u -r1.43.4.8 -r1.43.4.9 src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.330.4.9 -r1.330.4.10 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.8 src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.9 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.8 Sun Apr 26 01:39:54 2009 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Thu Apr 30 00:54:47 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.43.4.8 2009/04/26 01:39:54 snj Exp $ +.\" $NetBSD: mdoc.local,v 1.43.4.9 2009/04/30 00:54:47 snj Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\" Default .Os value -.ds doc-operating-system NetBSD\~5.0 +.ds doc-operating-system NetBSD\~5.0_STABLE .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~5.0 +.ds doc-default-operating-system NetBSD\~5.0_STABLE .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.330.4.9 src/sys/sys/param.h:1.330.4.10 --- src/sys/sys/param.h:1.330.4.9 Sun Apr 26 01:39:55 2009 +++ src/sys/sys/param.h Thu Apr 30 00:54:47 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.330.4.9 2009/04/26 01:39:55 snj Exp $ */ +/* $NetBSD: param.h,v 1.330.4.10 2009/04/30 00:54:47 snj Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 50003 /* NetBSD 5.0 */ +#define __NetBSD_Version__ 50003 /* NetBSD 5.0_STABLE */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__) Added files: Index: src/doc/CHANGES-5.1 diff -u /dev/null src/doc/CHANGES-5.1:1.1.2.1 --- /dev/null Thu Apr 30 00:54:47 2009 +++ src/doc/CHANGES-5.1 Thu Apr 30 00:54:46 2009 @@ -0,0 +1,11 @@ +# $NetBSD: CHANGES-5.1,v 1.1.2.1 2009/04/30 00:54:46 snj Exp $ + +A complete list of changes from the NetBSD 5.0 release to the NetBSD 4.1 +release: + +gnu/usr.bin/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 5.0_STABLE. + [snj] +
CVS commit: src/gnu/dist/gcc4/gcc/doc
Module Name:src Committed By: joerg Date: Thu Apr 30 00:53:48 UTC 2009 Modified Files: src/gnu/dist/gcc4/gcc/doc: gcov.texi Log Message: Sort sourcefile after all other options. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/gnu/dist/gcc4/gcc/doc/gcov.texi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/gcc4/gcc/doc/gcov.texi diff -u src/gnu/dist/gcc4/gcc/doc/gcov.texi:1.1.1.2 src/gnu/dist/gcc4/gcc/doc/gcov.texi:1.2 --- src/gnu/dist/gcc4/gcc/doc/gcov.texi:1.1.1.2 Sat Oct 21 22:43:47 2006 +++ src/gnu/dist/gcc4/gcc/doc/gcov.texi Thu Apr 30 00:53:48 2009 @@ -128,8 +128,9 @@ [...@option{-l}|@option{--long-file-names}] [...@option{-p}|@option{--preserve-paths}] [...@option{-f}|@option{--function-summaries}] - [...@option{-o}|@option{--object-directory} @var{directory|file}] @var{sourcefile} + [...@option{-o}|@option{--object-directory} @var{directory|file}] [...@option{-u}|@option{--unconditional-branches}] + @var{sourcefile} @c man end @c man begin SEEALSO gpl(7), gfdl(7), fsf-funding(7), gcc(1) and the Info entry for @file{gcc}.
CVS commit: src/gnu/usr.bin/gcc4/gcc
Module Name:src Committed By: joerg Date: Thu Apr 30 00:30:56 UTC 2009 Modified Files: src/gnu/usr.bin/gcc4/gcc: gcc.1 Added Files: src/gnu/usr.bin/gcc4/gcc: gcc-contrib.1 Log Message: Convert GCC man page to mdoc(7) using othersrc/usr.bin/pod2mdoc. Do some manual post-processing and use that as new gcc(1). The original version is included to add as base for three-way merges. OK wiz, no objection from tech-userlevel. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/gnu/usr.bin/gcc4/gcc/gcc-contrib.1 cvs rdiff -u -r1.2 -r1.3 src/gnu/usr.bin/gcc4/gcc/gcc.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: othersrc/usr.bin/pod2mdoc
Module Name:othersrc Committed By: joerg Date: Thu Apr 30 00:28:59 UTC 2009 Added Files: othersrc/usr.bin/pod2mdoc: pod2mdoc.py Log Message: Add a Python script to convert POD markup to mdoc markup. It tries to do something sane e.g. by detecting arguments etc, but post-processing is still required. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 othersrc/usr.bin/pod2mdoc/pod2mdoc.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: othersrc/usr.bin/pod2mdoc/pod2mdoc.py diff -u /dev/null othersrc/usr.bin/pod2mdoc/pod2mdoc.py:1.1 --- /dev/null Thu Apr 30 00:28:59 2009 +++ othersrc/usr.bin/pod2mdoc/pod2mdoc.py Thu Apr 30 00:28:58 2009 @@ -0,0 +1,606 @@ +#!/usr/pkg/bin/python2.5 +import datetime +import re + +nroff_post_punctuation = (".", ",", ":", ";", ")", "]", "?", "!") +nroff_pre_punctuation = ("(", "[") + +class Node(object): +def __str__(self): + return "\n".join(self.output()) + +def convert_bracket(line): +if line[0] == ".": + args = line.split() + output = [] + if len(args) > 1: + if args[1] == "[": + output.append(".Oo") + output.append(args[0][1:]) + else: + output.append(args[0]) + if args[1] == "]": + output.append("Oc") + else: + output.append(args[1]) + for a in args[2:]: + if a == "[": + output.append("Oo") + elif a == "]": + output.append("Oc") + else: + output.append(a) + else: + output.append(args[0]) + if output[0] == ".Oo" and output[-1] == "Oc" and "Oo" not in output[1:-1] and "Oc" not in output[1:-1]: + output[0] = ".Op" + output.pop() + return " ".join(output) +else: + return line + +def apply_expand(lines, f): +output = [] +for l in lines: + output += f(l) +return output + +def expand_generic(line, regex, macro, sub): +output = [] +while True: + m = re.search(regex, line) + if m is None: + break + pre = line[:m.start()].rstrip() + matched = line[m.start():m.end()].strip() + post = line[m.end():].lstrip() + args = [ macro ] + while pre and pre[-1] in nroff_pre_punctuation: + args.append(pre[-1]) + pre = pre[:-1].rstrip() + if pre: + output.append(pre) + args += sub(m) + while post and post[0] in nroff_post_punctuation: + args.append(post[0]) + post = post[1:].lstrip() + output.append(" ".join(args)) + line = post +if line: + output.append(line) +return output + +def expand_static_tag(line, marker, macro, replacement): +return expand_generic(line, re.escape(marker), macro, lambda m: [replacement]) + +def expand_url(line): +return expand_generic(line, r"\\\*\[Lt\]B<(http|ftp)://.*?>\\\*\[Gt\]", + ".Lk", lambda m: [ m.group(0)[8:-7].strip() ]) + +def expand_crossref(line): +return expand_generic(line, r"L<(([-a-zA-Z0-9_\.]+)\(([0-9]+)\))\|\1>", + ".Xr", lambda m: [ m.group(2).strip(), m.group(3)]) + +def expand_code(line): +return expand_generic(line, "C<([^<]*)>", + ".Va", lambda m: [ m.group(1).strip() ]) + +def expand_code2(line): +return expand_generic(line, "C<([^<]*)I([^<]*)>", + ".Va", lambda m: [ ".Sy %sfile%s" % (m.group(1).strip(), m.group(2).strip()) ]) + +def expand_options_fixed(line): +def split_options(m): + output = [] + if m.group(1) == "Os": + output.append("\&Os") + else: + output.append(m.group(1)) + output.append("Ns") + output.append("Oo") + output.append("Ns") + output.append("Ar") + output.append(m.group(2)) + if m.group(3): + args = m.group(3).split("|")[1:] + for a in args: + output.append("Ns") + output.append("|") + output.append("Ns") + output.append("Ar") + output.append(a[2:-1]) + output.append("Ns") + output.append("Oc") + return output + +return expand_generic(line, r"B<-([-a-zA-Z0-9=#\+,]+)>\[B<([^<>]*)>(\|B<[^<>]*>)*\]", ".Fl", split_options) + +def expand_options_optional(line): +def split_options(m): + args = m.group(1)[2:-1].split() + output = [] + first = True + for a in args: + if not first: + output.append("Fl") + else: + first = False + if a[1:] == "Os": + output.append("\&Os") + else: + output.append(a[1:]) + output[-1] = output[-1] + "-" + output.append("Ns") + output.append("Ar") + output.append(m.group(3)) + + return output + +return expand_generic(line, r"(B<-[-a-zA-Z0-9=#\+,]+( -[-a-zA-Z0-9=#\+,]+)*>)\[B<->I<([^<>]*)>\]", ".Fl", split_options) + +def expand_options_optional2(line): +def split_options(m): + args = m.group(1)[2:-3].split() + output = [] + first = True + for a in args: + if not first: + output.append("Fl") + else: + first = False + if a[1:] == "Os": + output.append("\&Os") + else: + output.append(a[1:]) + output.append("Ns") + output.append("Oo") + output.append("=") + output.append("Ns") + output.append("Ar") + output.append(m.group(3)) + output.append("Oc") + + return output + +regex = r"(B<-[-a-zA-Z0-9=#\+,]+( -[-a-zA-Z0-9=#\+,]+)*\[=>)I<([^<>]*)>B<\]" +macro = ".Fl" + +
CVS commit: src/sys/arch/x86
Module Name:src Committed By: rmind Date: Thu Apr 30 00:07:23 UTC 2009 Modified Files: src/sys/arch/x86/conf: files.x86 src/sys/arch/x86/include: cpu.h src/sys/arch/x86/x86: identcpu.c Added Files: src/sys/arch/x86/x86: cpu_topology.c Log Message: Move x86 CPU topology detection code into the separate file (as it was originally). OK by . To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/x86/conf/files.x86 cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x86/include/cpu.h cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/x86/cpu_topology.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x86/x86/identcpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/conf/files.x86 diff -u src/sys/arch/x86/conf/files.x86:1.51 src/sys/arch/x86/conf/files.x86:1.52 --- src/sys/arch/x86/conf/files.x86:1.51 Fri Apr 17 21:07:58 2009 +++ src/sys/arch/x86/conf/files.x86 Thu Apr 30 00:07:23 2009 @@ -1,4 +1,4 @@ -# $NetBSD: files.x86,v 1.51 2009/04/17 21:07:58 dyoung Exp $ +# $NetBSD: files.x86,v 1.52 2009/04/30 00:07:23 rmind Exp $ # options for MP configuration through the MP spec defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI @@ -49,6 +49,7 @@ file arch/x86/x86/bus_space.c file arch/x86/x86/consinit.c file arch/x86/x86/core_machdep.c coredump +file arch/x86/x86/cpu_topology.c file arch/x86/x86/errata.c file arch/x86/x86/genfb_machdep.c file arch/x86/x86/identcpu.c Index: src/sys/arch/x86/include/cpu.h diff -u src/sys/arch/x86/include/cpu.h:1.16 src/sys/arch/x86/include/cpu.h:1.17 --- src/sys/arch/x86/include/cpu.h:1.16 Sun Apr 19 14:11:37 2009 +++ src/sys/arch/x86/include/cpu.h Thu Apr 30 00:07:23 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.16 2009/04/19 14:11:37 ad Exp $ */ +/* $NetBSD: cpu.h,v 1.17 2009/04/30 00:07:23 rmind Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -353,6 +353,9 @@ void cpu_probe(struct cpu_info *); void cpu_identify(struct cpu_info *); +/* cpu_topology.c */ +void x86_cpu_toplogy(struct cpu_info *); + /* vm_machdep.c */ void cpu_proc_fork(struct proc *, struct proc *); Index: src/sys/arch/x86/x86/identcpu.c diff -u src/sys/arch/x86/x86/identcpu.c:1.15 src/sys/arch/x86/x86/identcpu.c:1.16 --- src/sys/arch/x86/x86/identcpu.c:1.15 Wed Apr 1 03:56:54 2009 +++ src/sys/arch/x86/x86/identcpu.c Thu Apr 30 00:07:23 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: identcpu.c,v 1.15 2009/04/01 03:56:54 tls Exp $ */ +/* $NetBSD: identcpu.c,v 1.16 2009/04/30 00:07:23 rmind Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -29,34 +29,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/*- - * Copyright (c)2008 YAMAMOTO Takashi, - * 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 AUTHOR 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 AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - #include -__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.15 2009/04/01 03:56:54 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.16 2009/04/30 00:07:23 rmind Exp $"); #include "opt_enhanced_speedstep.h" #include "opt_intel_odcm.h" @@ -70,7 +44,6 @@ #include #include #include -#include #include @@ -131,55 +104,6 @@ return (NULL); } -static void -cpu_probe_p6(struct cpu_info *ci) -{ - u_int lp_max = 1; /* logical processors per package */ - u_int smt_max; /* smt per core */ - u_int core_max = 1; /* core per package */ - int smt_bits, core_bits; - uint32_t descs[4]; - - if (cpu_vendor != CPUVENDOR_INTEL || - CPUID2FAMILY(ci->ci_signature) < 6) - return; - - /* Determine the extended feature flags. */ - x86_cpuid(0x8000, descs); - if (descs[0] >= 0x8001) { - x86_cpuid(0x8001, descs);
CVS commit: src/gnu/dist/gcc4/gcc/doc
Module Name:src Committed By: joerg Date: Wed Apr 29 23:53:29 UTC 2009 Modified Files: src/gnu/dist/gcc4/gcc/doc: invoke.texi Log Message: Include option as item for -Wp description to match the rest of the table. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/gnu/dist/gcc4/gcc/doc/invoke.texi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/gcc4/gcc/doc/invoke.texi diff -u src/gnu/dist/gcc4/gcc/doc/invoke.texi:1.7 src/gnu/dist/gcc4/gcc/doc/invoke.texi:1.8 --- src/gnu/dist/gcc4/gcc/doc/invoke.texi:1.7 Wed Apr 29 23:46:39 2009 +++ src/gnu/dist/gcc4/gcc/doc/invoke.texi Wed Apr 29 23:53:28 2009 @@ -6205,6 +6205,7 @@ compilation. @table @gcctabopt +...@item -Wp,@var{option} @opindex Wp You can use @option{-Wp,@var{option}} to bypass the compiler driver and pass @var{option} directly through to the preprocessor. If
CVS commit: src/sys/arch/i386/pci
Module Name:src Committed By: dyoung Date: Wed Apr 29 23:50:53 UTC 2009 Modified Files: src/sys/arch/i386/pci: elan520.c Log Message: Add elansc_shutdown() for turning off the watchdog. Don't try to unregister the watchdog in elansc_detach() if we are shutting the system down, because unregistering is designed to fail if the watchdog is armed. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/arch/i386/pci/elan520.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/pci/elan520.c diff -u src/sys/arch/i386/pci/elan520.c:1.41 src/sys/arch/i386/pci/elan520.c:1.42 --- src/sys/arch/i386/pci/elan520.c:1.41 Wed Apr 29 23:18:09 2009 +++ src/sys/arch/i386/pci/elan520.c Wed Apr 29 23:50:53 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: elan520.c,v 1.41 2009/04/29 23:18:09 dyoung Exp $ */ +/* $NetBSD: elan520.c,v 1.42 2009/04/29 23:50:53 dyoung Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.41 2009/04/29 23:18:09 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.42 2009/04/29 23:50:53 dyoung Exp $"); #include #include @@ -131,6 +131,7 @@ static int elansc_rescan(device_t, const char *, const int *); static void elansc_protect(struct elansc_softc *, int, paddr_t, uint32_t); +static bool elansc_shutdown(device_t, int); static const uint32_t sfkb = 64 * 1024, fkb = 4 * 1024; @@ -877,6 +878,20 @@ return true; } +static bool +elansc_shutdown(device_t self, int how) +{ + struct elansc_softc *sc = device_private(self); + + /* Set up the watchdog registers with some defaults. */ + elansc_wdogctl_write(sc, WDTMRCTL_WRST_ENB | WDTMRCTL_EXP_SEL30); + + /* ...and clear it. */ + elansc_wdogctl_reset(sc); + + return true; +} + static int elansc_detach(device_t self, int flags) { @@ -888,7 +903,8 @@ pmf_device_deregister(self); - if ((rc = sysmon_wdog_unregister(&sc->sc_smw)) != 0) { + if ((flags & DETACH_SHUTDOWN) == 0 && + (rc = sysmon_wdog_unregister(&sc->sc_smw)) != 0) { if (rc == ERESTART) rc = EINTR; return rc; @@ -896,11 +912,7 @@ mutex_enter(&sc->sc_mtx); - /* Set up the watchdog registers with some defaults. */ - elansc_wdogctl_write(sc, WDTMRCTL_WRST_ENB | WDTMRCTL_EXP_SEL30); - - /* ...and clear it. */ - elansc_wdogctl_reset(sc); + (void)elansc_shutdown(self, 0); bus_space_write_1(sc->sc_memt, sc->sc_memh, MMCR_PICICR, sc->sc_picicr); bus_space_write_1(sc->sc_memt, sc->sc_memh, MMCR_MPICMODE, @@ -1344,7 +1356,8 @@ elansc_wdogctl_reset(sc); mutex_exit(&sc->sc_mtx); - if (!pmf_device_register(self, elansc_suspend, elansc_resume)) + if (!pmf_device_register1(self, elansc_suspend, elansc_resume, + elansc_shutdown)) aprint_error_dev(self, "could not establish power hooks\n"); #if NGPIO > 0
CVS commit: src/gnu/dist/gcc4/gcc/doc
Module Name:src Committed By: joerg Date: Wed Apr 29 23:46:39 UTC 2009 Modified Files: src/gnu/dist/gcc4/gcc/doc: invoke.texi Log Message: Fix markup for -fdiagnostics-show-options. Don't split @code{} over lines. Ensure that sentences are consistently followed by two spaces. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/gnu/dist/gcc4/gcc/doc/invoke.texi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/gcc4/gcc/doc/invoke.texi diff -u src/gnu/dist/gcc4/gcc/doc/invoke.texi:1.6 src/gnu/dist/gcc4/gcc/doc/invoke.texi:1.7 --- src/gnu/dist/gcc4/gcc/doc/invoke.texi:1.6 Sun Feb 3 02:48:47 2008 +++ src/gnu/dist/gcc4/gcc/doc/invoke.texi Wed Apr 29 23:46:39 2009 @@ -213,8 +213,8 @@ @item Language Independent Options @xref{Language Independent Options,,Options to Control Diagnostic Messages Formatting}. @gccoptlist{-fmessage-leng...@var{n} @gol --fdiagnostics-show-locati...@r{[}once@r{|}every-l...@r{]}} @gol --fdiagnostics-show-options +-fdiagnostics-show-locati...@r{[}once@r{|}every-l...@r{]} @gol +-fdiagnostics-show-options} @item Warning Options @xref{Warning Options,,Options to Request or Suppress Warnings}. @@ -2568,11 +2568,11 @@ stored.''. If a program breaks these rules, the results on any particular implementation are entirely unpredictable. -Examples of code with undefined behavior are @code{a = a++;}, @code{a[n] -= b[n++]} and @code{a[i++] = i;}. Some more complicated cases are not -diagnosed by this option, and it may give an occasional false positive -result, but in general it has been found fairly effective at detecting -this sort of problem in programs. +Examples of code with undefined behavior are @code{a = a++;}, +...@code{a[n] = b[n++]} and @code{a[i++] = i;}. Some more complicated cases +are not diagnosed by this option, and it may give an occasional false +positive result, but in general it has been found fairly effective at +detecting this sort of problem in programs. The present implementation of this option only works for C programs. A future implementation may also work for C++ programs. @@ -4490,7 +4490,7 @@ arithmetic on them. This produces better code by making all memory references potential common subexpressions. When they are not common subexpressions, instruction combination should eliminate the separate -register-load. This option is now a nop and will be removed in 4.2. +register-load. This option is now a nop and will be removed in 4.2. @item -fforce-addr @opindex fforce-addr @@ -5049,7 +5049,7 @@ Perform a variety of simple scalar cleanups (constant/copy propagation, redundancy elimination, range propagation and expression simplification) based on a dominator tree traversal. This also -performs jump threading (to reduce jumps to jumps). This flag is +performs jump threading (to reduce jumps to jumps). This flag is enabled by default at @option{-O} and higher. @item -ftree-ch @@ -6055,7 +6055,7 @@ Maximum number of basic blocks on path that cse considers. The default is 10. @item max-cse-insns -The maximum instructions CSE process before flushing. The default is 1000. +The maximum instructions CSE process before flushing. The default is 1000. @item global-var-threshold @@ -6372,8 +6372,8 @@ @item -rdynamic @opindex rdynamic Pass the flag @option{-export-dynamic} to the ELF linker, on targets -that support it. This instructs the linker to add all symbols, not -only used ones, to the dynamic symbol table. This option is needed +that support it. This instructs the linker to add all symbols, not +only used ones, to the dynamic symbol table. This option is needed for some uses of @code{dlopen} or to allow obtaining backtraces from within a program. @@ -7868,12 +7868,12 @@ @item -mmac @opindex mmac -Enable the use of multiply-accumulate instructions. Disabled by default. +Enable the use of multiply-accumulate instructions. Disabled by default. @item -mpush-args @opindex mpush-args Push instructions will be used to pass outgoing arguments when functions -are called. Enabled by default. +are called. Enabled by default. @end table @node Darwin Options @@ -11655,9 +11655,9 @@ @itemx -mlong-double-128 @opindex mlong-double-64 @opindex mlong-double-128 -These switches control the size of @code{long double} type. A size +These switches control the size of @code{long double} type. A size of 64bit makes the @code{long double} type equivalent to the @code{double} -type. This is the default. +type. This is the default. @item -mbackchain @itemx -mno-backchain
CVS commit: src/sys/arch/i386/pci
Module Name:src Committed By: dyoung Date: Wed Apr 29 23:18:09 UTC 2009 Modified Files: src/sys/arch/i386/pci: elan520.c Log Message: Delete dead code. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/i386/pci/elan520.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/pci/elan520.c diff -u src/sys/arch/i386/pci/elan520.c:1.40 src/sys/arch/i386/pci/elan520.c:1.41 --- src/sys/arch/i386/pci/elan520.c:1.40 Wed Apr 8 23:53:10 2009 +++ src/sys/arch/i386/pci/elan520.c Wed Apr 29 23:18:09 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: elan520.c,v 1.40 2009/04/08 23:53:10 dyoung Exp $ */ +/* $NetBSD: elan520.c,v 1.41 2009/04/29 23:18:09 dyoung Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.40 2009/04/08 23:53:10 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.41 2009/04/29 23:18:09 dyoung Exp $"); #include #include @@ -749,15 +749,7 @@ protsize = end_pa - start_pa; -#if 0 - /* set PG_SZ, attribute, target, size, address. */ - par = MMCR_PAR_TARGET_SDRAM | MMCR_PAR_ATTR_NOWRITE | MMCR_PAR_PG_SZ; - par |= __SHIFTIN(protsize / sfkb - 1, MMCR_PAR_64KB_SZ); - par |= __SHIFTIN(start_pa / sfkb, MMCR_PAR_64KB_ST_ADR); - bus_space_write_4(memt, memh, MMCR_PAR(pidx), par); -#else elansc_protect(sc, pidx, start_pa, protsize); -#endif sc->sc_textpar[tidx++] = pidx; @@ -840,15 +832,7 @@ aprint_debug_dev(self, "protect page 0\n"); -#if 0 - /* set PG_SZ, attribute, target, size, address. */ - par = MMCR_PAR_TARGET_SDRAM | MMCR_PAR_ATTR_NOWRITE; - par |= __SHIFTIN(PG0_PROT_SIZE / PAGE_SIZE - 1, MMCR_PAR_4KB_SZ); - par |= __SHIFTIN(pg0_paddr / PAGE_SIZE, MMCR_PAR_4KB_ST_ADR); - bus_space_write_4(memt, memh, MMCR_PAR(pidx), par); -#else elansc_protect(sc, pidx, pg0_paddr, PG0_PROT_SIZE); -#endif return pidx; } @@ -1413,19 +1397,7 @@ "unable to register watchdog with sysmon\n"); } elansc_attached = true; -#if 0 - pba.pba_iot = sc->sc_iot; - pba.pba_memt = sc->sc_memt; - pba.pba_dmat = sc->sc_dmat; - pba.pba_dmat64 = sc->sc_dmat64; - pba.pba_pc = sc->sc_pc; - pba.pba_flags = sc->sc_pciflags; - pba.pba_bus = 0; - pba.pba_bridgetag = NULL; - sc->sc_pci = config_found_ia(self, "pcibus", pba, pcibusprint); -#else elansc_rescan(sc->sc_dev, "pcibus", NULL); -#endif } static int
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: wiz Date: Wed Apr 29 22:34:31 UTC 2009 Modified Files: src/usr.bin/calendar/calendars: calendar.netbsd Log Message: void tabs, for consistency. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.bin/calendar/calendars/calendar.netbsd 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/calendar/calendars/calendar.netbsd diff -u src/usr.bin/calendar/calendars/calendar.netbsd:1.17 src/usr.bin/calendar/calendars/calendar.netbsd:1.18 --- src/usr.bin/calendar/calendars/calendar.netbsd:1.17 Wed Apr 29 22:25:03 2009 +++ src/usr.bin/calendar/calendars/calendar.netbsd Wed Apr 29 22:34:31 2009 @@ -26,7 +26,7 @@ 04/12 NetBSD 2.0.2 released, 2005 04/20 NetBSD 0.8 released, 1993 04/21 NetBSD 1.6.1 released, 2003 -04/29 NetBSD 5.0 released, 2009 +04/29 NetBSD 5.0 released, 2009 05/05 NetBSD/x68k port started, 1996 05/09 NetBSD/acorn26 port started, 2000 05/12 NetBSD 1.4 released, 1999 @@ -89,7 +89,7 @@ 12/09 NetBSD/evbppc port started, 2002 12/09 NetBSD 2.0 released, 2004 12/17 NetBSD/zaurus port started, 2006 -12/19 NetBSD 4.0 released, 2007 +12/19 NetBSD 4.0 released, 2007 12/23 NetBSD 1.3.3 released, 1998 12/23 NetBSD 3.0 released, 2005 12/29 NetBSD/ews4800mips port started, 2005
CVS commit: src/sys/fs/ntfs
Module Name:src Committed By: elad Date: Wed Apr 29 22:33:33 UTC 2009 Modified Files: src/sys/fs/ntfs: ntfs_vnops.c Log Message: Replace open-coded vaccess() in ntfs_access() with a call to vaccess(). Similarly to msdosfs, always add the exec bit to keep the current behavior. Mailing list reference: http://mail-index.netbsd.org/tech-kern/2009/04/21/msg004881.html To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/fs/ntfs/ntfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/ntfs/ntfs_vnops.c diff -u src/sys/fs/ntfs/ntfs_vnops.c:1.42 src/sys/fs/ntfs/ntfs_vnops.c:1.43 --- src/sys/fs/ntfs/ntfs_vnops.c:1.42 Wed Dec 17 20:51:35 2008 +++ src/sys/fs/ntfs/ntfs_vnops.c Wed Apr 29 22:33:33 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ntfs_vnops.c,v 1.42 2008/12/17 20:51:35 cegger Exp $ */ +/* $NetBSD: ntfs_vnops.c,v 1.43 2009/04/29 22:33:33 elad Exp $ */ /* * Copyright (c) 1992, 1993 @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.42 2008/12/17 20:51:35 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.43 2009/04/29 22:33:33 elad Exp $"); #include #include @@ -405,11 +405,7 @@ } */ *ap = v; struct vnode *vp = ap->a_vp; struct ntnode *ip = VTONT(vp); - kauth_cred_t cred = ap->a_cred; - mode_t mask, mode = ap->a_mode; - gid_t grp; - int i; - uint16_t ngroups; + mode_t file_mode, mode = ap->a_mode; dprintf(("ntfs_access: %llu\n", (unsigned long long)ip->i_number)); @@ -429,46 +425,10 @@ } } - /* Otherwise, user id 0 always gets access. */ - if (kauth_authorize_generic(cred, KAUTH_GENERIC_ISSUSER, NULL) == 0) - return (0); - - mask = 0; - - /* Otherwise, check the owner. */ - if (kauth_cred_geteuid(cred) == ip->i_mp->ntm_uid) { - if (mode & VEXEC) - mask |= S_IXUSR; - if (mode & VREAD) - mask |= S_IRUSR; - if (mode & VWRITE) - mask |= S_IWUSR; - return ((ip->i_mp->ntm_mode & mask) == mask ? 0 : EACCES); - } - - /* Otherwise, check the groups. */ - ngroups = kauth_cred_ngroups(cred); - for (i = 0; i < ngroups; i++) { - grp = kauth_cred_group(cred, i); - if (ip->i_mp->ntm_gid == grp) { - if (mode & VEXEC) -mask |= S_IXGRP; - if (mode & VREAD) -mask |= S_IRGRP; - if (mode & VWRITE) -mask |= S_IWGRP; - return ((ip->i_mp->ntm_mode&mask) == mask ? 0 : EACCES); - } - } + file_mode = ip->i_mp->ntm_mode | (S_IXUSR|S_IXGRP|S_IXOTH); - /* Otherwise, check everyone else. */ - if (mode & VEXEC) - mask |= S_IXOTH; - if (mode & VREAD) - mask |= S_IROTH; - if (mode & VWRITE) - mask |= S_IWOTH; - return ((ip->i_mp->ntm_mode & mask) == mask ? 0 : EACCES); + return (vaccess(vp->v_type, file_mode, ip->i_mp->ntm_uid, + ip->i_mp->ntm_gid, mode, ap->a_cred)); } /*
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: snj Date: Wed Apr 29 22:25:03 UTC 2009 Modified Files: src/usr.bin/calendar/calendars: calendar.netbsd Log Message: NetBSD 5.0. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.bin/calendar/calendars/calendar.netbsd 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/calendar/calendars/calendar.netbsd diff -u src/usr.bin/calendar/calendars/calendar.netbsd:1.16 src/usr.bin/calendar/calendars/calendar.netbsd:1.17 --- src/usr.bin/calendar/calendars/calendar.netbsd:1.16 Tue Sep 9 18:47:19 2008 +++ src/usr.bin/calendar/calendars/calendar.netbsd Wed Apr 29 22:25:03 2009 @@ -26,6 +26,7 @@ 04/12 NetBSD 2.0.2 released, 2005 04/20 NetBSD 0.8 released, 1993 04/21 NetBSD 1.6.1 released, 2003 +04/29 NetBSD 5.0 released, 2009 05/05 NetBSD/x68k port started, 1996 05/09 NetBSD/acorn26 port started, 2000 05/12 NetBSD 1.4 released, 1999
CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: jym Date: Wed Apr 29 22:21:49 UTC 2009 Modified Files: src/sys/arch/xen/xen: if_xennet_xenbus.c Log Message: Do not forget to detach rnd(4) device when removing a xennet device. Ok by bouyer@ in private mail. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/xen/xen/if_xennet_xenbus.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/xen/xen/if_xennet_xenbus.c diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.34 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.35 --- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.34 Tue Mar 3 19:04:41 2009 +++ src/sys/arch/xen/xen/if_xennet_xenbus.c Wed Apr 29 22:21:49 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: if_xennet_xenbus.c,v 1.34 2009/03/03 19:04:41 bouyer Exp $ */ +/* $NetBSD: if_xennet_xenbus.c,v 1.35 2009/04/29 22:21:49 jym Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -95,7 +95,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.34 2009/03/03 19:04:41 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.35 2009/04/29 22:21:49 jym Exp $"); #include "opt_xen.h" #include "opt_nfs_boot.h" @@ -416,6 +416,12 @@ ether_ifdetach(ifp); if_detach(ifp); + +#if NRND > 0 + /* Unhook the entropy source. */ + rnd_detach_source(&sc->sc_rnd_source); +#endif + while (xengnt_status(sc->sc_tx_ring_gntref)) { tsleep(xennet_xenbus_detach, PRIBIO, "xnet_txref", hz/2); }
CVS commit: src/distrib/atari/floppies/install
Module Name:src Committed By: tsutsui Date: Wed Apr 29 18:24:05 UTC 2009 Modified Files: src/distrib/atari/floppies/install: list Log Message: Fix indent. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/distrib/atari/floppies/install/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/atari/floppies/install/list diff -u src/distrib/atari/floppies/install/list:1.10 src/distrib/atari/floppies/install/list:1.11 --- src/distrib/atari/floppies/install/list:1.10 Sun Jan 25 22:08:37 2009 +++ src/distrib/atari/floppies/install/list Wed Apr 29 18:24:05 2009 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.10 2009/01/25 22:08:37 abs Exp $ +# $NetBSD: list,v 1.11 2009/04/29 18:24:05 tsutsui Exp $ PROG bin/cat PROG bin/chmod @@ -54,9 +54,9 @@ SPECIAL umount srcdir distrib/utils/x_umount # various files that we need in /etc for the install -COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig +COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols -COPY ${NETBSDSRCDIR}/distrib/common/services etc/services +COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # we need the boot block code in /usr/mdec MTREE ./usr/mdec/std type=dir uname=root gname=wheel mode=0755
CVS commit: src/distrib
Module Name:src Committed By: tsutsui Date: Wed Apr 29 18:23:46 UTC 2009 Modified Files: src/distrib/amiga/floppies/inst-common: list src/distrib/bebox/floppies/ramdisk: list src/distrib/evbsh3/rom/ramdiskcommon: list src/distrib/vax/inst-common: list Log Message: Sort some entries. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/distrib/amiga/floppies/inst-common/list cvs rdiff -u -r1.11 -r1.12 src/distrib/bebox/floppies/ramdisk/list cvs rdiff -u -r1.6 -r1.7 src/distrib/evbsh3/rom/ramdiskcommon/list cvs rdiff -u -r1.9 -r1.10 src/distrib/vax/inst-common/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/amiga/floppies/inst-common/list diff -u src/distrib/amiga/floppies/inst-common/list:1.14 src/distrib/amiga/floppies/inst-common/list:1.15 --- src/distrib/amiga/floppies/inst-common/list:1.14 Sun Jan 25 22:08:37 2009 +++ src/distrib/amiga/floppies/inst-common/list Wed Apr 29 18:23:46 2009 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.14 2009/01/25 22:08:37 abs Exp $ +# $NetBSD: list,v 1.15 2009/04/29 18:23:46 tsutsui Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -67,9 +67,9 @@ # various files that we need in /etc for the install COPY ${DESTDIR}/etc/groupetc COPY ${DESTDIR}/etc/master.passwd etc +COPY ${DESTDIR}/etc/netconfig etc COPY ${DESTDIR}/etc/passwdetc COPY ${NETBSDSRCDIR}/distrib/common/protocols etc -COPY ${DESTDIR}/etc/netconfig etc COPY ${DESTDIR}/etc/pwd.dbetc COPY ${NETBSDSRCDIR}/distrib/common/services etc COPY ${DESTDIR}/etc/spwd.dbetc Index: src/distrib/bebox/floppies/ramdisk/list diff -u src/distrib/bebox/floppies/ramdisk/list:1.11 src/distrib/bebox/floppies/ramdisk/list:1.12 --- src/distrib/bebox/floppies/ramdisk/list:1.11 Sun Jan 25 22:08:37 2009 +++ src/distrib/bebox/floppies/ramdisk/list Wed Apr 29 18:23:46 2009 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.11 2009/01/25 22:08:37 abs Exp $ +# $NetBSD: list,v 1.12 2009/04/29 18:23:46 tsutsui Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/ramdiskbin ramdiskbin @@ -60,8 +60,8 @@ # various files that we need in /etc for the install COPY ${CURDIR}/../../../../etc/group etc/group COPY ${CURDIR}/../../../../etc/master.passwd etc/master.passwd -COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${CURDIR}/../../../../etc/netconfig etc/netconfig +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services SPECIAL pwd_mkdb -p -d ./ etc/master.passwd Index: src/distrib/evbsh3/rom/ramdiskcommon/list diff -u src/distrib/evbsh3/rom/ramdiskcommon/list:1.6 src/distrib/evbsh3/rom/ramdiskcommon/list:1.7 --- src/distrib/evbsh3/rom/ramdiskcommon/list:1.6 Sun Jan 25 22:08:37 2009 +++ src/distrib/evbsh3/rom/ramdiskcommon/list Wed Apr 29 18:23:46 2009 @@ -1,16 +1,16 @@ -# $NetBSD: list,v 1.6 2009/01/25 22:08:37 abs Exp $ +# $NetBSD: list,v 1.7 2009/04/29 18:23:46 tsutsui Exp $ # various files that we need in /etc for the install COPY ${CURDIR}/../../../../etc/master.passwd etc/master.passwd #COPY ${CURDIR}/../../../../etc/etc.evbsh3/rc etc/rc COPY ${CURDIR}/../../../../etc/group etc/group -COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols -COPY ${NETBSDSRCDIR}/distrib/common/services etc/services COPY ${CURDIR}/../../../../etc/gettytab etc/gettytab #COPY ${CURDIR}/localtimeetc/localtime COPY ${CURDIR}/../../../../etc/hosts etc/hosts -COPY ${CURDIR}/../../../../etc/etc.evbsh3/ttys etc/ttys +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/services etc/services COPY ${CURDIR}/../ramdiskcommon/shells etc/shells +COPY ${CURDIR}/../../../../etc/etc.evbsh3/ttys etc/ttys #COPY ${CURDIR}/dot.profileetc/.profile #COPY ${CURDIR}/termcap.miniusr/share/misc/termcap #COPY ${CURDIR}/kvm.dbvar/db/kvm.db Index: src/distrib/vax/inst-common/list diff -u src/distrib/vax/inst-common/list:1.9 src/distrib/vax/inst-common/list:1.10 --- src/distrib/vax/inst-common/list:1.9 Sun Jan 25 22:08:39 2009 +++ src/distrib/vax/inst-common/list Wed Apr 29 18:23:46 2009 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.9 2009/01/25 22:08:39 abs Exp $ +# $NetBSD: list,v 1.10 2009/04/29 18:23:46 tsutsui Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -55,9 +55,9 @@ # various files that we need in /etc for the install COPY ${DESTDIR}/etc/groupetc COPY ${DESTDIR}/etc/master.passwd etc +COPY ${DESTDIR}/etc/netconfig etc COPY ${DESTDIR}/etc/passwdetc COPY ${NETBSDSRCDIR}/distrib/common/protocols etc -COPY ${DESTDIR}/etc/netconfig etc COPY ${DESTDIR}/etc/pwd.dbetc COPY ${NETBSDSRCDIR}/distrib/common/services etc COPY ${DESTDIR}/etc/spwd.dbetc
CVS commit: src/distrib
Module Name:src Committed By: tsutsui Date: Wed Apr 29 18:22:47 UTC 2009 Modified Files: src/distrib/alpha/instkernel/ramdisk: list src/distrib/mac68k/instkernel/ramdisk: list src/distrib/sgimips/ramdisk: list src/distrib/x68k/floppies/ramdisk: list Log Message: Fix indent and sort some entries. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/distrib/alpha/instkernel/ramdisk/list cvs rdiff -u -r1.21 -r1.22 src/distrib/mac68k/instkernel/ramdisk/list cvs rdiff -u -r1.10 -r1.11 src/distrib/sgimips/ramdisk/list cvs rdiff -u -r1.21 -r1.22 src/distrib/x68k/floppies/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/alpha/instkernel/ramdisk/list diff -u src/distrib/alpha/instkernel/ramdisk/list:1.29 src/distrib/alpha/instkernel/ramdisk/list:1.30 --- src/distrib/alpha/instkernel/ramdisk/list:1.29 Sat Apr 4 23:24:07 2009 +++ src/distrib/alpha/instkernel/ramdisk/list Wed Apr 29 18:22:47 2009 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.29 2009/04/04 23:24:07 tsutsui Exp $ +# $NetBSD: list,v 1.30 2009/04/29 18:22:47 tsutsui Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin @@ -69,8 +69,8 @@ # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd -COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services CMD ${TOOL_PWD_MKDB} -L -d . etc/master.passwd Index: src/distrib/mac68k/instkernel/ramdisk/list diff -u src/distrib/mac68k/instkernel/ramdisk/list:1.21 src/distrib/mac68k/instkernel/ramdisk/list:1.22 --- src/distrib/mac68k/instkernel/ramdisk/list:1.21 Tue Apr 7 11:49:17 2009 +++ src/distrib/mac68k/instkernel/ramdisk/list Wed Apr 29 18:22:47 2009 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.21 2009/04/07 11:49:17 joerg Exp $ +# $NetBSD: list,v 1.22 2009/04/29 18:22:47 tsutsui Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin gnu/usr.bin/binutils @@ -70,8 +70,8 @@ # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd -COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools Index: src/distrib/sgimips/ramdisk/list diff -u src/distrib/sgimips/ramdisk/list:1.10 src/distrib/sgimips/ramdisk/list:1.11 --- src/distrib/sgimips/ramdisk/list:1.10 Tue Apr 7 11:49:18 2009 +++ src/distrib/sgimips/ramdisk/list Wed Apr 29 18:22:47 2009 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.10 2009/04/07 11:49:18 joerg Exp $ +# $NetBSD: list,v 1.11 2009/04/29 18:22:47 tsutsui Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/sgimips/stand @@ -66,8 +66,8 @@ # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd -COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools Index: src/distrib/x68k/floppies/ramdisk/list diff -u src/distrib/x68k/floppies/ramdisk/list:1.21 src/distrib/x68k/floppies/ramdisk/list:1.22 --- src/distrib/x68k/floppies/ramdisk/list:1.21 Sun Jan 25 22:08:39 2009 +++ src/distrib/x68k/floppies/ramdisk/list Wed Apr 29 18:22:47 2009 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.21 2009/01/25 22:08:39 abs Exp $ +# $NetBSD: list,v 1.22 2009/04/29 18:22:47 tsutsui Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/x68k/stand @@ -69,8 +69,8 @@ # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/group etc/group -COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${CURDIR}/services etc/services # we need the boot blocks in /usr/mdec
CVS commit: src/distrib
Module Name:src Committed By: tsutsui Date: Wed Apr 29 18:20:03 UTC 2009 Modified Files: src/distrib/acorn26/instkernel: list src/distrib/acorn32/ramdisk: list src/distrib/amd64/ramdisks/common: list.ramdisk src/distrib/arc/ramdisk: list src/distrib/cats/ramdisk: list src/distrib/cobalt/ramdisk: list src/distrib/evbarm/instkernel/ramdisk: list src/distrib/evbmips/instkernel/ramdisk: list src/distrib/evbppc/ramdisk: list src/distrib/ews4800mips/floppies/ramdisk: list src/distrib/hp300/ramdisk: list src/distrib/hp700/ramdisk: list src/distrib/i386/ramdisks/common: list.ramdisk src/distrib/ibmnws/netboot/ramdisk: list src/distrib/macppc/floppies/ramdisk: list src/distrib/miniroot: list src/distrib/mipsco/ramdisk: list src/distrib/mvme68k/ramdisk: list src/distrib/newsmips/floppies/ramdisk: list src/distrib/ofppc/ramdisks/common: list.ramdisk src/distrib/sandpoint/ramdisk: list src/distrib/shark/instkernel/ramdisk: list src/distrib/sparc64/instfs: list src/distrib/vax/ramdisk: list src/distrib/zaurus/ramdisk: list Log Message: Fix indent on common/protocols changes. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/distrib/acorn26/instkernel/list cvs rdiff -u -r1.15 -r1.16 src/distrib/acorn32/ramdisk/list cvs rdiff -u -r1.7 -r1.8 src/distrib/amd64/ramdisks/common/list.ramdisk cvs rdiff -u -r1.14 -r1.15 src/distrib/arc/ramdisk/list cvs rdiff -u -r1.12 -r1.13 src/distrib/cats/ramdisk/list cvs rdiff -u -r1.4 -r1.5 src/distrib/cobalt/ramdisk/list cvs rdiff -u -r1.9 -r1.10 src/distrib/evbarm/instkernel/ramdisk/list cvs rdiff -u -r1.4 -r1.5 src/distrib/evbmips/instkernel/ramdisk/list cvs rdiff -u -r1.7 -r1.8 src/distrib/evbppc/ramdisk/list cvs rdiff -u -r1.4 -r1.5 src/distrib/ews4800mips/floppies/ramdisk/list cvs rdiff -u -r1.18 -r1.19 src/distrib/hp300/ramdisk/list cvs rdiff -u -r1.8 -r1.9 src/distrib/hp700/ramdisk/list cvs rdiff -u -r1.10 -r1.11 src/distrib/i386/ramdisks/common/list.ramdisk cvs rdiff -u -r1.6 -r1.7 src/distrib/ibmnws/netboot/ramdisk/list cvs rdiff -u -r1.30 -r1.31 src/distrib/macppc/floppies/ramdisk/list cvs rdiff -u -r1.26 -r1.27 src/distrib/miniroot/list cvs rdiff -u -r1.8 -r1.9 src/distrib/mipsco/ramdisk/list cvs rdiff -u -r1.16 -r1.17 src/distrib/mvme68k/ramdisk/list cvs rdiff -u -r1.20 -r1.21 src/distrib/newsmips/floppies/ramdisk/list cvs rdiff -u -r1.3 -r1.4 src/distrib/ofppc/ramdisks/common/list.ramdisk cvs rdiff -u -r1.3 -r1.4 src/distrib/sandpoint/ramdisk/list cvs rdiff -u -r1.12 -r1.13 src/distrib/shark/instkernel/ramdisk/list cvs rdiff -u -r1.10 -r1.11 src/distrib/sparc64/instfs/list cvs rdiff -u -r1.18 -r1.19 src/distrib/vax/ramdisk/list cvs rdiff -u -r1.5 -r1.6 src/distrib/zaurus/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/acorn26/instkernel/list diff -u src/distrib/acorn26/instkernel/list:1.8 src/distrib/acorn26/instkernel/list:1.9 --- src/distrib/acorn26/instkernel/list:1.8 Sun Jan 25 22:08:37 2009 +++ src/distrib/acorn26/instkernel/list Wed Apr 29 18:20:00 2009 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.8 2009/01/25 22:08:37 abs Exp $ +# $NetBSD: list,v 1.9 2009/04/29 18:20:00 tsutsui Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -65,7 +65,7 @@ COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools Index: src/distrib/acorn32/ramdisk/list diff -u src/distrib/acorn32/ramdisk/list:1.15 src/distrib/acorn32/ramdisk/list:1.16 --- src/distrib/acorn32/ramdisk/list:1.15 Sun Jan 25 22:08:37 2009 +++ src/distrib/acorn32/ramdisk/list Wed Apr 29 18:20:02 2009 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.15 2009/01/25 22:08:37 abs Exp $ +# $NetBSD: list,v 1.16 2009/04/29 18:20:02 tsutsui Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -65,7 +65,7 @@ COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig -COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols +COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols COPY ${NETBSDSRCDIR}/distrib/common/services etc/services # and the common installation tools Index: src/distrib/amd64/ramdisks/common/list.ramdisk diff -u src/distrib/amd64/ramdisks/common/list.ramdisk:1.7 src/distrib/amd64/ramdisks/common/list.ramdisk:1.8 --- src/distrib/amd64/ramdisks/common/list.ramdisk:1.7 Wed Apr 29 18:07:01 2009 +++ src/distrib/amd64/ramdisks/common/list.
CVS commit: src/distrib/amd64/ramdisks/common
Module Name:src Committed By: tsutsui Date: Wed Apr 29 18:07:01 UTC 2009 Modified Files: src/distrib/amd64/ramdisks/common: list.ramdisk Log Message: Remove unnecessary gnu/usr.bin from SRCDIRS. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/distrib/amd64/ramdisks/common/list.ramdisk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/amd64/ramdisks/common/list.ramdisk diff -u src/distrib/amd64/ramdisks/common/list.ramdisk:1.6 src/distrib/amd64/ramdisks/common/list.ramdisk:1.7 --- src/distrib/amd64/ramdisks/common/list.ramdisk:1.6 Sun Jan 25 22:08:37 2009 +++ src/distrib/amd64/ramdisks/common/list.ramdisk Wed Apr 29 18:07:01 2009 @@ -1,6 +1,6 @@ -# $NetBSD: list.ramdisk,v 1.6 2009/01/25 22:08:37 abs Exp $ +# $NetBSD: list.ramdisk,v 1.7 2009/04/29 18:07:01 tsutsui Exp $ -SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin libexec +SRCDIRS bin sbin usr.bin usr.sbin libexec # init invokes the shell as -sh ARGVLN sh -sh
CVS commit: src/distrib/i386/ramdisks/common
Module Name:src Committed By: tsutsui Date: Wed Apr 29 18:01:50 UTC 2009 Modified Files: src/distrib/i386/ramdisks/common: list.ramdisk Log Message: Remove unneeded gnu/usr.bin from SRCDIRS. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/i386/ramdisks/common/list.ramdisk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/i386/ramdisks/common/list.ramdisk diff -u src/distrib/i386/ramdisks/common/list.ramdisk:1.9 src/distrib/i386/ramdisks/common/list.ramdisk:1.10 --- src/distrib/i386/ramdisks/common/list.ramdisk:1.9 Sun Jan 25 22:08:38 2009 +++ src/distrib/i386/ramdisks/common/list.ramdisk Wed Apr 29 18:01:50 2009 @@ -1,7 +1,7 @@ -# $NetBSD: list.ramdisk,v 1.9 2009/01/25 22:08:38 abs Exp $ +# $NetBSD: list.ramdisk,v 1.10 2009/04/29 18:01:50 tsutsui Exp $ SRCDIRS usr.bin/less -SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin +SRCDIRS bin sbin usr.bin usr.sbin # Programs for a minimal ramdisk image
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed Apr 29 18:00:50 UTC 2009 Modified Files: src/sys/rump/include/rump: rump.h Log Message: Add proof-of-concept code for enabling system calls to rump virtual kernels running in other processes on the same machine or on an entirely different host. I wrote this a while ago and am now committing it mainly to avoid losing it. It works, but could do with a little tuning here and there. What this will hopefully eventually buy us is the ability to use standard userland tools to configure rump kernels, e.g. ifconfig(8) and route(8) could be used to configure the networking stack provided by a rump kernel. Also some distributed OS implications may apply. fun fact: a system call which just does copyin/copyout takes >1000x longer when made over the LAN as compared to when made on the same machine. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/rump/include/rump/rump.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/rump/include/rump/rump.h diff -u src/sys/rump/include/rump/rump.h:1.12 src/sys/rump/include/rump/rump.h:1.13 --- src/sys/rump/include/rump/rump.h:1.12 Fri Mar 27 13:47:53 2009 +++ src/sys/rump/include/rump/rump.h Wed Apr 29 18:00:49 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.h,v 1.12 2009/03/27 13:47:53 pooka Exp $ */ +/* $NetBSD: rump.h,v 1.13 2009/04/29 18:00:49 pooka Exp $ */ /* * Copyright (c) 2007 Antti Kantee. All Rights Reserved. @@ -127,6 +127,7 @@ int rump_vfs_vptofh(struct vnode *, struct fid *, size_t *); void rump_vfs_syncwait(struct mount *); +struct lwp *rump_newproc_switch(void); struct lwp *rump_setup_curlwp(pid_t, lwpid_t, int); struct lwp *rump_get_curlwp(void); void rump_clear_curlwp(void); @@ -141,6 +142,8 @@ typedef int (*rump_sysproxy_t)(int, void *, uint8_t *, size_t, register_t *); int rump_sysproxy_set(rump_sysproxy_t, void *); +int rump_sysproxy_socket_setup_client(int); +int rump_sysproxy_socket_setup_server(int); /* * Begin rump syscall conditionals. Yes, something a little better
CVS commit: src/sys/rump/librump
Module Name:src Committed By: pooka Date: Wed Apr 29 17:51:47 UTC 2009 Modified Files: src/sys/rump/librump/rumpkern: Makefile.rumpkern emul.c rump.c rump_private.h Added Files: src/sys/rump/librump/rumpkern: sysproxy_socket.c src/sys/rump/librump/test/sysproxy/client: Makefile sysproxy_client.c src/sys/rump/librump/test/sysproxy/serv: Makefile sysproxy_serv.c Log Message: Add proof-of-concept code for enabling system calls to rump virtual kernels running in other processes on the same machine or on an entirely different host. I wrote this a while ago and am now committing it mainly to avoid losing it. It works, but could do with a little tuning here and there. What this will hopefully eventually buy us is the ability to use standard userland tools to configure rump kernels, e.g. ifconfig(8) and route(8) could be used to configure the networking stack provided by a rump kernel. Also some distributed OS implications may apply. fun fact: a system call which just does copyin/copyout takes >1000x longer when made over the LAN as compared to when made on the same machine. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/rump/librump/rumpkern/Makefile.rumpkern cvs rdiff -u -r1.87 -r1.88 src/sys/rump/librump/rumpkern/emul.c cvs rdiff -u -r1.103 -r1.104 src/sys/rump/librump/rumpkern/rump.c cvs rdiff -u -r1.27 -r1.28 src/sys/rump/librump/rumpkern/rump_private.h cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpkern/sysproxy_socket.c cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/test/sysproxy/client/Makefile \ src/sys/rump/librump/test/sysproxy/client/sysproxy_client.c cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/test/sysproxy/serv/Makefile \ src/sys/rump/librump/test/sysproxy/serv/sysproxy_serv.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.43 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.44 --- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.43 Thu Apr 16 14:07:17 2009 +++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Wed Apr 29 17:51:47 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.rumpkern,v 1.43 2009/04/16 14:07:17 pooka Exp $ +# $NetBSD: Makefile.rumpkern,v 1.44 2009/04/29 17:51:47 pooka Exp $ # .include "${RUMPTOP}/Makefile.rump" @@ -14,7 +14,8 @@ # # Source modules, first the ones specifically implemented for librump. # -SRCS= rump.c emul.c intr.c locks.c ltsleep.c percpu.c pool.c sleepq.c vm.c +SRCS= rump.c emul.c intr.c locks.c ltsleep.c percpu.c pool.c \ + sleepq.c sysproxy_socket.c vm.c # stubs # Index: src/sys/rump/librump/rumpkern/emul.c diff -u src/sys/rump/librump/rumpkern/emul.c:1.87 src/sys/rump/librump/rumpkern/emul.c:1.88 --- src/sys/rump/librump/rumpkern/emul.c:1.87 Sun Apr 26 20:41:24 2009 +++ src/sys/rump/librump/rumpkern/emul.c Wed Apr 29 17:51:47 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: emul.c,v 1.87 2009/04/26 20:41:24 pooka Exp $ */ +/* $NetBSD: emul.c,v 1.88 2009/04/29 17:51:47 pooka Exp $ */ /* * Copyright (c) 2007 Antti Kantee. All Rights Reserved. @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.87 2009/04/26 20:41:24 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.88 2009/04/29 17:51:47 pooka Exp $"); #include #include @@ -125,7 +125,10 @@ copyin(const void *uaddr, void *kaddr, size_t len) { - memcpy(kaddr, uaddr, len); + if (curproc->p_vmspace == &rump_vmspace) + memcpy(kaddr, uaddr, len); + else + rump_sysproxy_copyin(uaddr, kaddr, len); return 0; } @@ -133,7 +136,10 @@ copyout(const void *kaddr, void *uaddr, size_t len) { - memcpy(uaddr, kaddr, len); + if (curproc->p_vmspace == &rump_vmspace) + memcpy(uaddr, kaddr, len); + else + rump_sysproxy_copyout(kaddr, uaddr, len); return 0; } @@ -148,7 +154,10 @@ copyinstr(const void *uaddr, void *kaddr, size_t len, size_t *done) { - strlcpy(kaddr, uaddr, len); + if (curproc->p_vmspace == &rump_vmspace) + strlcpy(kaddr, uaddr, len); + else + rump_sysproxy_copyin(uaddr, kaddr, len); if (done) *done = strlen(kaddr)+1; /* includes termination */ return 0; @@ -158,7 +167,10 @@ copyoutstr(const void *kaddr, void *uaddr, size_t len, size_t *done) { - strlcpy(uaddr, kaddr, len); + if (curproc->p_vmspace == &rump_vmspace) + strlcpy(uaddr, kaddr, len); + else + rump_sysproxy_copyout(kaddr, uaddr, len); if (done) *done = strlen(uaddr)+1; /* includes termination */ return 0; Index: src/sys/rump/librump/rumpkern/rump.c diff -u src/sys/rump/librump/rumpkern/rump.c:1.103 src/sys/rump/librump/rumpkern/rump.c:1.104 --- src/sys/rump/librump/rumpkern/rump.c:1.103 Wed Apr 29 15:49:28 2009 +++ src/sys/rump/librump/rumpkern/rump.c Wed Apr 29 17:51:47 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.c,v 1.103 2009/04/29 15:49:28 pooka Exp $ */ +/* $NetBSD: rump.c,v 1.104 2009/04/29 17
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: pooka Date: Wed Apr 29 16:05:41 UTC 2009 Modified Files: src/sys/rump/librump/rumpvfs: rumpfs.c Log Message: Add enough support to be able to create directories and perform lookups through them. This has two implications: 1) mountpoints can be created directly onto the rump rootfs. this is benefitial in test programs where we want the same program to be easily switched between testing against rump and testing against the host kernel. 2) fakeblk must be used (it used to work implicitly) to register block devices that should be used from the host fs namespace. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/rump/librump/rumpvfs/rumpfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/librump/rumpvfs/rumpfs.c diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.13 src/sys/rump/librump/rumpvfs/rumpfs.c:1.14 --- src/sys/rump/librump/rumpvfs/rumpfs.c:1.13 Sat Apr 18 15:41:36 2009 +++ src/sys/rump/librump/rumpvfs/rumpfs.c Wed Apr 29 16:05:41 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpfs.c,v 1.13 2009/04/18 15:41:36 pooka Exp $ */ +/* $NetBSD: rumpfs.c,v 1.14 2009/04/29 16:05:41 pooka Exp $ */ /* * Copyright (c) 2007 Antti Kantee. All Rights Reserved. @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.13 2009/04/18 15:41:36 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.14 2009/04/29 16:05:41 pooka Exp $"); #include #include @@ -55,6 +55,8 @@ static int rump_vop_lookup(void *); static int rump_vop_getattr(void *); +static int rump_vop_mkdir(void *); +static int rump_vop_inactive(void *); static int rump_vop_reclaim(void *); static int rump_vop_success(void *); @@ -79,10 +81,12 @@ { &vop_default_desc, vn_default_error }, { &vop_lookup_desc, rump_vop_lookup }, { &vop_getattr_desc, rump_vop_getattr }, + { &vop_mkdir_desc, rump_vop_mkdir }, { &vop_putpages_desc, genfs_null_putpages }, { &vop_fsync_desc, rump_vop_success }, { &vop_lock_desc, genfs_lock }, { &vop_unlock_desc, genfs_unlock }, + { &vop_inactive_desc, rump_vop_inactive }, { &vop_reclaim_desc, rump_vop_reclaim }, { NULL, NULL } }; @@ -95,19 +99,41 @@ static struct mount rump_mnt; static int lastino = 1; +static kmutex_t reclock; -static struct vattr * -makevattr(enum vtype vt) +struct rumpfs_dent { + char *rd_name; + struct rumpfs_node *rd_node; + + LIST_ENTRY(rumpfs_dent) rd_entries; +}; + +struct rumpfs_node { + struct vattr rn_va; + struct vnode *rn_vp; + + /* only for VDIR */ + LIST_HEAD(, rumpfs_dent) rn_dir; +}; + +static struct rumpfs_node * +makeprivate(enum vtype vt) { + struct rumpfs_node *rn; struct vattr *va; struct timespec ts; + rn = kmem_alloc(sizeof(*va), KM_SLEEP); + LIST_INIT(&rn->rn_dir); nanotime(&ts); - va = kmem_alloc(sizeof(*va), KM_SLEEP); + va = &rn->rn_va; va->va_type = vt; va->va_mode = 0755; - va->va_nlink = 2; + if (vt == VDIR) + va->va_nlink = 2; + else + va->va_nlink = 1; va->va_uid = 0; va->va_gid = 0; va->va_fsid = @@ -125,13 +151,14 @@ va->va_filerev = 0; va->va_vaflags = 0; - return va; + return rn; } static int rump_makevnode(const char *path, size_t size, enum vtype vt, struct vnode **vpp) { struct vnode *vp; + struct rumpfs_node *rn; int (**vpops)(void *); int rv; @@ -157,15 +184,22 @@ panic("rump_makevnode: lazy bum"); spec_node_init(vp, makedev(RUMPBLK, rv)); } - if (vt != VBLK) - vp->v_data = makevattr(vp->v_type); + if (vt != VBLK) { + rn = makeprivate(vp->v_type); + rn->rn_vp = vp; + vp->v_data = rn; + } + + vn_lock(vp, LK_RETRY | LK_EXCLUSIVE); *vpp = vp; return 0; } /* - * Simple lookup for faking lookup of device entry for rump file systems + * Simple lookup for faking lookup of device entry for rump file systems + * and for locating/creating directories. Yes, this will panic if you + * call it with the wrong arguments. */ static int rump_vop_lookup(void *v) @@ -176,44 +210,85 @@ struct componentname *a_cnp; }; */ *ap = v; struct componentname *cnp = ap->a_cnp; + struct vnode *dvp = ap->a_dvp; + struct vnode **vpp = ap->a_vpp; + struct vnode *vp; + struct rumpfs_node *rn = dvp->v_data; + struct rumpfs_dent *rd; uint64_t fsize; enum vtype vt; int rv, error, ft; /* we handle only some "non-special" cases */ - KASSERT(cnp->cn_nameiop == LOOKUP); - KASSERT(cnp->cn_flags & FOLLOW); + KASSERT(((cnp->cn_flags & ISLASTCN) == 0) + || (cnp->cn_nameiop == LOOKUP || cnp->cn_nameiop == CREATE)); KASSERT((cnp->cn_flags & ISDOTDOT) == 0); KASSERT(cnp->cn_namelen != 0 && cnp->cn_pnbuf[0] != '.'); - rv = rumpuser_getfileinfo(cnp->cn_pnbuf, &fsize, &ft, &error); - if (rv) - return error; - switch (ft) { - case RUMPUSER_FT_DIR: - vt = VDIR; - break; - case RUMPUSER_FT_REG: - vt = VREG; - break; - case RUMPUSER_FT_BLK: - vt = VBLK; - break; - case RUMPUSER_FT_CHR:
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: pooka Date: Wed Apr 29 15:49:28 UTC 2009 Modified Files: src/sys/rump/librump/rumpkern: rump.c Log Message: include proc0 in allproc To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/sys/rump/librump/rumpkern/rump.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/rump.c diff -u src/sys/rump/librump/rumpkern/rump.c:1.102 src/sys/rump/librump/rumpkern/rump.c:1.103 --- src/sys/rump/librump/rumpkern/rump.c:1.102 Fri Apr 24 13:27:03 2009 +++ src/sys/rump/librump/rumpkern/rump.c Wed Apr 29 15:49:28 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.c,v 1.102 2009/04/24 13:27:03 pooka Exp $ */ +/* $NetBSD: rump.c,v 1.103 2009/04/29 15:49:28 pooka Exp $ */ /* * Copyright (c) 2007 Antti Kantee. All Rights Reserved. @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.102 2009/04/24 13:27:03 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.103 2009/04/29 15:49:28 pooka Exp $"); #include #include @@ -197,6 +197,7 @@ l->l_proc = p; l->l_lid = 1; LIST_INIT(&allproc); + LIST_INSERT_HEAD(&allproc, &proc0, p_list); proc_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE); rump_limits.pl_rlimit[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: pooka Date: Wed Apr 29 15:49:01 UTC 2009 Modified Files: src/sys/rump/librump/rumpvfs: rump_vfs.c Log Message: Use cwdinit() for proc0's cwdi. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 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.16 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.17 --- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.16 Sun Apr 26 21:36:24 2009 +++ src/sys/rump/librump/rumpvfs/rump_vfs.c Wed Apr 29 15:49:01 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_vfs.c,v 1.16 2009/04/26 21:36:24 pooka Exp $ */ +/* $NetBSD: rump_vfs.c,v 1.17 2009/04/29 15:49:01 pooka Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -107,10 +107,12 @@ rump_proc_vfs_init = pvfs_init; rump_proc_vfs_release = pvfs_rele; + /* bootstrap cwdi */ rw_init(&rump_cwdi.cwdi_lock); rump_cwdi.cwdi_cdir = rootvnode; vref(rump_cwdi.cwdi_cdir); proc0.p_cwdi = &rump_cwdi; + proc0.p_cwdi = cwdinit(); if (rump_threads) { int rv;
CVS commit: src/tests/fs/ffs
Module Name:src Committed By: pooka Date: Wed Apr 29 15:46:01 UTC 2009 Modified Files: src/tests/fs/ffs: t_renamerace.c Log Message: * register fakeblk * fix error message To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/fs/ffs/t_renamerace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/fs/ffs/t_renamerace.c diff -u src/tests/fs/ffs/t_renamerace.c:1.4 src/tests/fs/ffs/t_renamerace.c:1.5 --- src/tests/fs/ffs/t_renamerace.c:1.4 Sun Apr 26 15:15:38 2009 +++ src/tests/fs/ffs/t_renamerace.c Wed Apr 29 15:46:01 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: t_renamerace.c,v 1.4 2009/04/26 15:15:38 pooka Exp $ */ +/* $NetBSD: t_renamerace.c,v 1.5 2009/04/29 15:46:01 pooka Exp $ */ /* * Modified for rump and atf from a program supplied @@ -86,8 +86,9 @@ args.fspec = image; rump_init(); + rump_fakeblk_register(image); if (rump_sys_mount(MOUNT_FFS, "/", MNT_LOG, &args, sizeof(args)) == -1) - atf_tc_fail_errno("ukfs_mount failed"); + atf_tc_fail_errno("rump_sys_mount failed"); pthread_create(&pt1, NULL, w1, NULL); pthread_create(&pt2, NULL, w2, NULL);
CVS commit: src/sys
Module Name:src Committed By: dyoung Date: Wed Apr 29 15:44:56 UTC 2009 Modified Files: src/sys/kern: vfs_subr.c src/sys/sys: mount.h Log Message: Extract vfs_unmountall1() from vfs_unmountall() for reuse. To generate a diff of this commit: cvs rdiff -u -r1.376 -r1.377 src/sys/kern/vfs_subr.c cvs rdiff -u -r1.188 -r1.189 src/sys/sys/mount.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/kern/vfs_subr.c diff -u src/sys/kern/vfs_subr.c:1.376 src/sys/kern/vfs_subr.c:1.377 --- src/sys/kern/vfs_subr.c:1.376 Wed Apr 29 01:03:43 2009 +++ src/sys/kern/vfs_subr.c Wed Apr 29 15:44:55 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_subr.c,v 1.376 2009/04/29 01:03:43 dyoung Exp $ */ +/* $NetBSD: vfs_subr.c,v 1.377 2009/04/29 15:44:55 dyoung Exp $ */ /*- * Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc. @@ -81,7 +81,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.376 2009/04/29 01:03:43 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.377 2009/04/29 15:44:55 dyoung Exp $"); #include "opt_ddb.h" #include "opt_compat_netbsd.h" @@ -2246,11 +2246,17 @@ bool vfs_unmountall(struct lwp *l) { + printf("unmounting file systems..."); + return vfs_unmountall1(l, true, true); +} + +bool +vfs_unmountall1(struct lwp *l, bool force, bool verbose) +{ struct mount *mp, *nmp; bool any_error, progress; int error; - printf("unmounting file systems..."); for (any_error = false, mp = CIRCLEQ_LAST(&mountlist); !CIRCLEQ_EMPTY(&mountlist); mp = nmp) { @@ -2260,16 +2266,19 @@ mp->mnt_stat.f_mntonname, mp->mnt_stat.f_mntfromname); #endif atomic_inc_uint(&mp->mnt_refcnt); - if ((error = dounmount(mp, MNT_FORCE, l)) == 0) + if ((error = dounmount(mp, force ? MNT_FORCE : 0, l)) == 0) progress = true; else { - printf("unmount of %s failed with error %d\n", - mp->mnt_stat.f_mntonname, error); + if (verbose) { +printf("unmount of %s failed with error %d\n", +mp->mnt_stat.f_mntonname, error); + } any_error = true; } } - printf(" done\n"); - if (any_error) + if (verbose) + printf(" done\n"); + if (any_error && verbose) printf("WARNING: some file systems would not unmount\n"); return progress; } @@ -2283,9 +2292,7 @@ struct lwp *l; /* XXX we're certainly not running in lwp0's context! */ - l = curlwp; - if (l == NULL) - l = &lwp0; + l = (curlwp == NULL) ? &lwp0 : curlwp; printf("syncing disks... "); Index: src/sys/sys/mount.h diff -u src/sys/sys/mount.h:1.188 src/sys/sys/mount.h:1.189 --- src/sys/sys/mount.h:1.188 Wed Apr 29 10:46:46 2009 +++ src/sys/sys/mount.h Wed Apr 29 15:44:55 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: mount.h,v 1.188 2009/04/29 10:46:46 martin Exp $ */ +/* $NetBSD: mount.h,v 1.189 2009/04/29 15:44:55 dyoung Exp $ */ /* * Copyright (c) 1989, 1991, 1993 @@ -390,6 +390,7 @@ int vfs_mountroot(void); void vfs_shutdown(void); /* unmount and sync file systems */ bool vfs_unmountall(struct lwp *); /* unmount file systems */ +bool vfs_unmountall1(struct lwp *, bool, bool); int vfs_busy(struct mount *, struct mount **); int vfs_rootmountalloc(const char *, const char *, struct mount **); void vfs_unbusy(struct mount *, bool, struct mount **);
CVS commit: [nick-hppapmap] src/sys/arch/hp700/dev
Module Name:src Committed By: skrll Date: Wed Apr 29 15:42:27 UTC 2009 Modified Files: src/sys/arch/hp700/dev [nick-hppapmap]: dino.c Log Message: Sync with HEAD. To generate a diff of this commit: cvs rdiff -u -r1.6.2.3 -r1.6.2.4 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.6.2.3 src/sys/arch/hp700/dev/dino.c:1.6.2.4 --- src/sys/arch/hp700/dev/dino.c:1.6.2.3 Sat Apr 25 15:09:14 2009 +++ src/sys/arch/hp700/dev/dino.c Wed Apr 29 15:42:27 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: dino.c,v 1.6.2.3 2009/04/25 15:09:14 skrll Exp $ */ +/* $NetBSD: dino.c,v 1.6.2.4 2009/04/29 15:42:27 skrll Exp $ */ /* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.6.2.3 2009/04/25 15:09:14 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.6.2.4 2009/04/29 15:42:27 skrll Exp $"); /* #include "cardbus.h" */ @@ -388,7 +388,7 @@ void dino_intr_disestablish(void *v, void *cookie) { - panic("There is no hp700_intr_disestablish()!"); + /* XXX Implement me */ }
CVS commit: src/sys/dev/ic
Module Name:src Committed By: tsutsui Date: Wed Apr 29 15:10:58 UTC 2009 Modified Files: src/sys/dev/ic: rtl8169.c rtl81x9reg.h rtl81x9var.h Log Message: Pull some changes for newer chips from FreeBSD: - pull MACSTAT and CMDSTOP quirks for 8168/8111 chips - always set CPLUSCMD_PCI_MRW on reset - set VLANSTRIP and RXCSUM_ENB bits on CPLUS register per if_capenable Tested on 8111C and 8111D by several users, and no bad side effect on my old 8169S. To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/dev/ic/rtl8169.c cvs rdiff -u -r1.37 -r1.38 src/sys/dev/ic/rtl81x9reg.h cvs rdiff -u -r1.46 -r1.47 src/sys/dev/ic/rtl81x9var.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/dev/ic/rtl8169.c diff -u src/sys/dev/ic/rtl8169.c:1.116 src/sys/dev/ic/rtl8169.c:1.117 --- src/sys/dev/ic/rtl8169.c:1.116 Mon Apr 13 12:38:06 2009 +++ src/sys/dev/ic/rtl8169.c Wed Apr 29 15:10:57 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rtl8169.c,v 1.116 2009/04/13 12:38:06 tsutsui Exp $ */ +/* $NetBSD: rtl8169.c,v 1.117 2009/04/29 15:10:57 tsutsui Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.116 2009/04/13 12:38:06 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.117 2009/04/29 15:10:57 tsutsui Exp $"); /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */ /* @@ -593,19 +593,23 @@ break; case RTK_HWREV_8168_SPIN1: sc->sc_rev = 21; + sc->sc_quirk |= RTKQ_MACSTAT; break; case RTK_HWREV_8168_SPIN2: sc->sc_rev = 22; + sc->sc_quirk |= RTKQ_MACSTAT; break; case RTK_HWREV_8168_SPIN3: sc->sc_rev = 23; + sc->sc_quirk |= RTKQ_MACSTAT; break; case RTK_HWREV_8168C: case RTK_HWREV_8168C_SPIN2: case RTK_HWREV_8168CP: case RTK_HWREV_8168D: sc->sc_rev = 24; - sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD; + sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD | + RTKQ_MACSTAT | RTKQ_CMDSTOP; /* * From FreeBSD driver: * @@ -625,8 +629,8 @@ case RTK_HWREV_8102EL: case RTK_HWREV_8102EL_SPIN2: sc->sc_rev = 25; - sc->sc_quirk |= - RTKQ_DESCV2 | RTKQ_NOEECMD | RTKQ_NOJUMBO; + sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD | + RTKQ_MACSTAT | RTKQ_CMDSTOP | RTKQ_NOJUMBO; break; case RTK_HWREV_8100E: case RTK_HWREV_8100E_SPIN2: @@ -1719,6 +1723,7 @@ const uint8_t *enaddr; uint32_t rxcfg = 0; uint32_t reg; + uint16_t cfg; int error; if ((error = re_enable(sc)) != 0) @@ -1736,32 +1741,27 @@ * RX checksum offload. We must configure the C+ register * before all others. */ - reg = 0; - - /* - * XXX: Realtek docs say bits 0 and 1 are reserved, for 8169S/8110S. - * FreeBSD drivers set these bits anyway (for 8139C+?). - * So far, it works. - */ + cfg = RE_CPLUSCMD_PCI_MRW; /* * XXX: For old 8169 set bit 14. * For 8169S/8110S and above, do not set bit 14. */ if ((sc->sc_quirk & RTKQ_8169NONS) != 0) - reg |= (0x1 << 14) | RTK_CPLUSCMD_PCI_MRW; + cfg |= (0x1 << 14); - if (1) {/* not for 8169S ? */ - reg |= - RTK_CPLUSCMD_VLANSTRIP | - (ifp->if_capenable & - (IFCAP_CSUM_IPv4_Rx | IFCAP_CSUM_TCPv4_Rx | - IFCAP_CSUM_UDPv4_Rx) ? - RTK_CPLUSCMD_RXCSUM_ENB : 0); - } + if ((ifp->if_capenable & ETHERCAP_VLAN_HWTAGGING) != 0) + cfg |= RE_CPLUSCMD_VLANSTRIP; + if ((ifp->if_capenable & (IFCAP_CSUM_IPv4_Rx | + IFCAP_CSUM_TCPv4_Rx | IFCAP_CSUM_UDPv4_Rx)) != 0) + cfg |= RE_CPLUSCMD_RXCSUM_ENB; + if ((sc->sc_quirk & RTKQ_MACSTAT) != 0) { + cfg |= RE_CPLUSCMD_MACSTAT_DIS; + cfg |= RE_CPLUSCMD_TXENB; + } else + cfg |= RE_CPLUSCMD_RXENB | RE_CPLUSCMD_TXENB; - CSR_WRITE_2(sc, RTK_CPLUS_CMD, - reg | RTK_CPLUSCMD_RXENB | RTK_CPLUSCMD_TXENB); + CSR_WRITE_2(sc, RTK_CPLUS_CMD, cfg); /* XXX: from Realtek-supplied Linux driver. Wholly undocumented. */ if ((sc->sc_quirk & RTKQ_8139CPLUS) == 0) @@ -1981,8 +1981,14 @@ mii_down(&sc->mii); - CSR_WRITE_1(sc, RTK_COMMAND, 0x00); + if ((sc->sc_quirk & RTKQ_CMDSTOP) != 0) + CSR_WRITE_1(sc, RTK_COMMAND, RTK_CMD_STOPREQ | RTK_CMD_TX_ENB | + RTK_CMD_RX_ENB); + else + CSR_WRITE_1(sc, RTK_COMMAND, 0x00); + DELAY(1000); CSR_WRITE_2(sc, RTK_IMR, 0x); + CSR_WRITE_2(sc, RTK_ISR, 0x); if (sc->re_head != NULL) { m_freem(sc->re_head); Index: src/sys/dev/ic/rtl81x9reg.h diff -u src/sys/dev/ic/rtl81x9reg.h:1.37 src/sys/dev/ic/rtl81x9reg.h:1.38 --- src/sys/dev/ic/rtl81x9reg.h:1.37 Mon Apr 13 12:33:05 2009 +++ src/sys/dev/ic/rtl81x9reg.h Wed Apr 29 15:10:57 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rtl81x9reg.h,v 1.37 2009/04/13 12:33:05 tsutsui Exp $ */ +/* $NetBSD: rtl81x9reg.h,v 1.38 2009/04/29 15:10:57 tsutsui Exp $ */ /* * Copyright (c) 1997, 1998 @@ -309,6 +309,7 @@ #define RTK_CMD_TX_ENB 0x0004 #define RTK_CMD_RX_ENB 0x0008 #define RTK_CMD_RESET 0x0010 +#define RTK_CMD
CVS commit: [nick-hppapmap] src/sys/arch/hp700/hp700
Module Name:src Committed By: skrll Date: Wed Apr 29 15:03:10 UTC 2009 Modified Files: src/sys/arch/hp700/hp700 [nick-hppapmap]: genassym.cf Log Message: G/C some more old stuff. To generate a diff of this commit: cvs rdiff -u -r1.16.2.2 -r1.16.2.3 src/sys/arch/hp700/hp700/genassym.cf 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.16.2.2 src/sys/arch/hp700/hp700/genassym.cf:1.16.2.3 --- src/sys/arch/hp700/hp700/genassym.cf:1.16.2.2 Tue Apr 28 12:53:53 2009 +++ src/sys/arch/hp700/hp700/genassym.cf Wed Apr 29 15:03:10 2009 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.16.2.2 2009/04/28 12:53:53 skrll Exp $ +# $NetBSD: genassym.cf,v 1.16.2.3 2009/04/29 15:03:10 skrll Exp $ # $OpenBSD: genassym.cf,v 1.18 2001/09/20 18:31:14 mickey Exp $ @@ -84,12 +84,6 @@ member INT_REG_BITS_MAP int_reg_bits_map export INT_REG_BIT_REG -# pte things -#export TLB_REF_POS -#export TLB_NO_RW_ALIAS_POS -#export TLB_DIRTY_POS -#export TLB_UNMANAGED_POS - # struct cpu_info fields #define CI_CPL offsetof(struct cpu_info, ci_cpl) #define CI_INTR_DEPTH offsetof(struct cpu_info, ci_intr_depth)
CVS commit: src/sys/rump/librump/rumpuser
Module Name:src Committed By: pooka Date: Wed Apr 29 14:58:50 UTC 2009 Modified Files: src/sys/rump/librump/rumpuser: rumpuser_pth_dummy.c Log Message: catch locking-against-oneself already when taking the lock To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpuser/rumpuser_pth_dummy.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/rumpuser/rumpuser_pth_dummy.c diff -u src/sys/rump/librump/rumpuser/rumpuser_pth_dummy.c:1.5 src/sys/rump/librump/rumpuser/rumpuser_pth_dummy.c:1.6 --- src/sys/rump/librump/rumpuser/rumpuser_pth_dummy.c:1.5 Wed Mar 18 10:22:45 2009 +++ src/sys/rump/librump/rumpuser/rumpuser_pth_dummy.c Wed Apr 29 14:58:50 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser_pth_dummy.c,v 1.5 2009/03/18 10:22:45 cegger Exp $ */ +/* $NetBSD: rumpuser_pth_dummy.c,v 1.6 2009/04/29 14:58:50 pooka Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -27,7 +27,7 @@ #include #if !defined(lint) -__RCSID("$NetBSD: rumpuser_pth_dummy.c,v 1.5 2009/03/18 10:22:45 cegger Exp $"); +__RCSID("$NetBSD: rumpuser_pth_dummy.c,v 1.6 2009/04/29 14:58:50 pooka Exp $"); #endif /* !lint */ #include @@ -161,6 +161,7 @@ if (write) { rw->v++; + assert(rw->v == 1); } else { assert(rw->v <= 0); rw->v--;
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: njoly Date: Wed Apr 29 14:55:36 UTC 2009 Modified Files: src/sys/arch/x86/pci: ichlpcib.c Log Message: Attach 82801IEM LPC Interface Bridge too. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x86/pci/ichlpcib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/pci/ichlpcib.c diff -u src/sys/arch/x86/pci/ichlpcib.c:1.16 src/sys/arch/x86/pci/ichlpcib.c:1.17 --- src/sys/arch/x86/pci/ichlpcib.c:1.16 Sat Apr 4 23:13:18 2009 +++ src/sys/arch/x86/pci/ichlpcib.c Wed Apr 29 14:55:36 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ichlpcib.c,v 1.16 2009/04/04 23:13:18 joerg Exp $ */ +/* $NetBSD: ichlpcib.c,v 1.17 2009/04/29 14:55:36 njoly Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.16 2009/04/04 23:13:18 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.17 2009/04/29 14:55:36 njoly Exp $"); #include #include @@ -149,6 +149,7 @@ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801IH_LPC, 1, 0 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801IO_LPC, 1, 0 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801IR_LPC, 1, 0 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801IEM_LPC, 1, 0 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801IB_LPC, 1, 0 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_63XXESB_LPC, 1, 0 },
CVS commit: [nick-hppapmap] src/sys/arch/hp700/dev
Module Name:src Committed By: skrll Date: Wed Apr 29 14:20:37 UTC 2009 Modified Files: src/sys/arch/hp700/dev [nick-hppapmap]: pdc.c Log Message: Whitespace (remove diff to HEAD) To generate a diff of this commit: cvs rdiff -u -r1.25.4.2 -r1.25.4.3 src/sys/arch/hp700/dev/pdc.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/pdc.c diff -u src/sys/arch/hp700/dev/pdc.c:1.25.4.2 src/sys/arch/hp700/dev/pdc.c:1.25.4.3 --- src/sys/arch/hp700/dev/pdc.c:1.25.4.2 Tue Apr 28 12:54:40 2009 +++ src/sys/arch/hp700/dev/pdc.c Wed Apr 29 14:20:37 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pdc.c,v 1.25.4.2 2009/04/28 12:54:40 skrll Exp $ */ +/* $NetBSD: pdc.c,v 1.25.4.3 2009/04/29 14:20:37 skrll Exp $ */ /* $OpenBSD: pdc.c,v 1.14 2001/04/29 21:05:43 mickey Exp $ */ @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pdc.c,v 1.25.4.2 2009/04/28 12:54:40 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pdc.c,v 1.25.4.3 2009/04/29 14:20:37 skrll Exp $"); #include #include @@ -427,7 +427,6 @@ *pdc_consbuf = c; err = pdc_call(pdc_cniodc, 0, pz_cons->pz_hpa, IODC_IO_CONSOUT, pz_cons->pz_spa, pz_cons->pz_layers, pdcret, 0, pdc_consbuf, 1, 0); - hp700_pagezero_unmap(pagezero_cookie); splx(s);
CVS commit: [nick-hppapmap] src/sys/arch/hp700/dev
Module Name:src Committed By: skrll Date: Wed Apr 29 14:17:45 UTC 2009 Modified Files: src/sys/arch/hp700/dev [nick-hppapmap]: com_dino.c Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.3.12.1 -r1.3.12.2 src/sys/arch/hp700/dev/com_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/com_dino.c diff -u src/sys/arch/hp700/dev/com_dino.c:1.3.12.1 src/sys/arch/hp700/dev/com_dino.c:1.3.12.2 --- src/sys/arch/hp700/dev/com_dino.c:1.3.12.1 Sun Dec 28 16:46:32 2008 +++ src/sys/arch/hp700/dev/com_dino.c Wed Apr 29 14:17:44 2009 @@ -42,7 +42,6 @@ #include #include - void *dino_intr_establish(void *sc, int irq, int pri, int (*handler)(void *v), void *arg);
CVS commit: src/sys/fs/tmpfs
Module Name:src Committed By: pooka Date: Wed Apr 29 11:01:50 UTC 2009 Modified Files: src/sys/fs/tmpfs: tmpfs_vnops.c Log Message: replace outdated comment. no functional change To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/fs/tmpfs/tmpfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/tmpfs/tmpfs_vnops.c diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.58 src/sys/fs/tmpfs/tmpfs_vnops.c:1.59 --- src/sys/fs/tmpfs/tmpfs_vnops.c:1.58 Wed Apr 15 11:41:25 2009 +++ src/sys/fs/tmpfs/tmpfs_vnops.c Wed Apr 29 11:01:50 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: tmpfs_vnops.c,v 1.58 2009/04/15 11:41:25 yamt Exp $ */ +/* $NetBSD: tmpfs_vnops.c,v 1.59 2009/04/29 11:01:50 pooka Exp $ */ /* * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.58 2009/04/15 11:41:25 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.59 2009/04/29 11:01:50 pooka Exp $"); #include #include @@ -204,9 +204,7 @@ goto out; } - /* If we are deleting or renaming the entry, keep - * track of its tmpfs_dirent so that it can be - * easily deleted later. */ + /* Check permissions */ if ((cnp->cn_flags & ISLASTCN) && (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME)) {
CVS commit: [ipsec-tools-0_7-branch] src/crypto/dist/ipsec-tools/src/racoon
Module Name:src Committed By: tteras Date: Wed Apr 29 10:50:25 UTC 2009 Modified Files: src/crypto/dist/ipsec-tools/src/racoon [ipsec-tools-0_7-branch]: crypto_openssl.c Log Message: >From Ross Meng: Fix a memory leak in X509 certificate validation. To generate a diff of this commit: cvs rdiff -u -r1.11.6.5 -r1.11.6.6 \ src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c diff -u src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c:1.11.6.5 src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c:1.11.6.6 --- src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c:1.11.6.5 Mon Apr 20 13:33:30 2009 +++ src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c Wed Apr 29 10:50:25 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: crypto_openssl.c,v 1.11.6.5 2009/04/20 13:33:30 tteras Exp $ */ +/* $NetBSD: crypto_openssl.c,v 1.11.6.6 2009/04/29 10:50:25 tteras Exp $ */ /* Id: crypto_openssl.c,v 1.47 2006/05/06 20:42:09 manubsd Exp */ @@ -486,7 +486,7 @@ X509_STORE_CTX_set_flags (csc, X509_V_FLAG_CRL_CHECK_ALL); #endif error = X509_verify_cert(csc); - X509_STORE_CTX_cleanup(csc); + X509_STORE_CTX_free(csc); /* * if x509_verify_cert() is successful then the value of error is
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src Committed By: tteras Date: Wed Apr 29 10:50:02 UTC 2009 Modified Files: src/crypto/dist/ipsec-tools/src/racoon: crypto_openssl.c Log Message: >From Ross Meng: Fix a memory leak in X509 certificate validation. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 \ src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c diff -u src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c:1.18 src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c:1.19 --- src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c:1.18 Mon Apr 20 13:22:41 2009 +++ src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c Wed Apr 29 10:50:01 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: crypto_openssl.c,v 1.18 2009/04/20 13:22:41 tteras Exp $ */ +/* $NetBSD: crypto_openssl.c,v 1.19 2009/04/29 10:50:01 tteras Exp $ */ /* Id: crypto_openssl.c,v 1.47 2006/05/06 20:42:09 manubsd Exp */ @@ -510,7 +510,7 @@ X509_STORE_CTX_set_flags (csc, X509_V_FLAG_CRL_CHECK_ALL); #endif error = X509_verify_cert(csc); - X509_STORE_CTX_cleanup(csc); + X509_STORE_CTX_free(csc); /* * if x509_verify_cert() is successful then the value of error is
CVS commit: src/sys/sys
Module Name:src Committed By: martin Date: Wed Apr 29 10:46:47 UTC 2009 Modified Files: src/sys/sys: mount.h Log Message: Add missing prototype for vfs_mountalloc(). To generate a diff of this commit: cvs rdiff -u -r1.187 -r1.188 src/sys/sys/mount.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/sys/mount.h diff -u src/sys/sys/mount.h:1.187 src/sys/sys/mount.h:1.188 --- src/sys/sys/mount.h:1.187 Fri Apr 17 20:22:52 2009 +++ src/sys/sys/mount.h Wed Apr 29 10:46:46 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: mount.h,v 1.187 2009/04/17 20:22:52 dyoung Exp $ */ +/* $NetBSD: mount.h,v 1.188 2009/04/29 10:46:46 martin Exp $ */ /* * Copyright (c) 1989, 1991, 1993 @@ -400,7 +400,7 @@ void vfs_delref(struct vfsops *); void vfs_destroy(struct mount *); void vfs_scrubvnlist(struct mount *); - +struct mount *vfs_mountalloc(struct vfsops *, struct vnode *); int vfs_stdextattrctl(struct mount *, int, struct vnode *, int, const char *);
CVS commit: src/usr.sbin/eeprom
Module Name:src Committed By: nakayama Date: Wed Apr 29 09:13:58 UTC 2009 Modified Files: src/usr.sbin/eeprom: defs.h main.c Log Message: More WARNS=4 fixes, for sparc and sun3. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/eeprom/defs.h cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/eeprom/main.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/eeprom/defs.h diff -u src/usr.sbin/eeprom/defs.h:1.12 src/usr.sbin/eeprom/defs.h:1.13 --- src/usr.sbin/eeprom/defs.h:1.12 Sun Apr 26 01:51:07 2009 +++ src/usr.sbin/eeprom/defs.h Wed Apr 29 09:13:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: defs.h,v 1.12 2009/04/26 01:51:07 lukem Exp $ */ +/* $NetBSD: defs.h,v 1.13 2009/04/29 09:13:58 nakayama Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ * the function that handles that value. */ struct keytabent { - char *kt_keyword; /* keyword for this entry */ + const char *kt_keyword; /* keyword for this entry */ u_int kt_offset; /* offset into prom of value */ void (*kt_handler) (struct keytabent *, char *); /* handler function for this entry */ @@ -71,7 +71,7 @@ * vice-versa. */ struct strvaltabent { - char *sv_str; /* the string ... */ + const char *sv_str; /* the string ... */ u_char sv_val; /* ... and the value */ }; Index: src/usr.sbin/eeprom/main.c diff -u src/usr.sbin/eeprom/main.c:1.20 src/usr.sbin/eeprom/main.c:1.21 --- src/usr.sbin/eeprom/main.c:1.20 Sun Apr 26 01:51:07 2009 +++ src/usr.sbin/eeprom/main.c Wed Apr 29 09:13:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.20 2009/04/26 01:51:07 lukem Exp $ */ +/* $NetBSD: main.c,v 1.21 2009/04/29 09:13:58 nakayama Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #ifndef lint __COPYRIGHT("@(#) Copyright (c) 1996\ The NetBSD Foundation, Inc. All rights reserved."); -__RCSID("$NetBSD: main.c,v 1.20 2009/04/26 01:51:07 lukem Exp $"); +__RCSID("$NetBSD: main.c,v 1.21 2009/04/29 09:13:58 nakayama Exp $"); #endif #include @@ -93,7 +93,7 @@ #if defined(USE_OPENPROM) || defined(USE_OPENFIRM) || defined(USE_PREPNVRAM) const char *optstring = "-cf:iv"; #else - char *optstring = "-cf:i"; + const char *optstring = "-cf:i"; #endif /* USE_OPENPROM */ while ((ch = getopt(argc, argv, optstring)) != -1)
CVS commit: src/sys/arch/hp700/dev
Module Name:src Committed By: skrll Date: Wed Apr 29 07:14:58 UTC 2009 Modified Files: src/sys/arch/hp700/dev: dino.c Log Message: Don't panic in dino_intr_disesablish. Just note that it needs to be implemented for now. Stop gap fix for PR/41295. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 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.6 src/sys/arch/hp700/dev/dino.c:1.7 --- src/sys/arch/hp700/dev/dino.c:1.6 Thu Aug 28 08:25:46 2008 +++ src/sys/arch/hp700/dev/dino.c Wed Apr 29 07:14:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: dino.c,v 1.6 2008/08/28 08:25:46 skrll Exp $ */ +/* $NetBSD: dino.c,v 1.7 2009/04/29 07:14:58 skrll Exp $ */ /* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.6 2008/08/28 08:25:46 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.7 2009/04/29 07:14:58 skrll Exp $"); /* #include "cardbus.h" */ @@ -387,7 +387,7 @@ void dino_intr_disestablish(void *v, void *cookie) { - panic("There is no hp700_intr_disestablish()!"); + /* XXX Implement me */ }