CVS commit: src/doc
Module Name:src Committed By: skrll Date: Mon May 18 06:20:02 UTC 2009 Modified Files: src/doc: CHANGES Log Message: Note com at dino works on hp700. To generate a diff of this commit: cvs rdiff -u -r1.1230 -r1.1231 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1230 src/doc/CHANGES:1.1231 --- src/doc/CHANGES:1.1230 Thu May 14 16:28:05 2009 +++ src/doc/CHANGES Mon May 18 06:20:02 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1230 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1231 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -275,4 +275,5 @@ into libbluetooth, retiring the separate libsdp. [plunky 20090512] dhcpcd(8): Import dhcpcd-5.0.4 [roy 20090514] + hp700: com at dino now works [skrll 20090518]
CVS commit: src/usr.sbin/ofctl
Module Name:src
Committed By: mrg
Date: Mon May 18 05:51:53 UTC 2009
Modified Files:
src/usr.sbin/ofctl: ofctl.c
Log Message:
if there is no "name" properly, don't assert(), pretend it is empty.
now "ofctl" works on the shark. fixes PR#36733.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/ofctl/ofctl.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/ofctl/ofctl.c
diff -u src/usr.sbin/ofctl/ofctl.c:1.10 src/usr.sbin/ofctl/ofctl.c:1.11
--- src/usr.sbin/ofctl/ofctl.c:1.10 Sun Apr 26 04:54:27 2009
+++ src/usr.sbin/ofctl/ofctl.c Mon May 18 05:51:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ofctl.c,v 1.10 2009/04/26 04:54:27 lukem Exp $ */
+/* $NetBSD: ofctl.c,v 1.11 2009/05/18 05:51:53 mrg Exp $ */
/*-
* Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 2006, 2007\
The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: ofctl.c,v 1.10 2009/04/26 04:54:27 lukem Exp $");
+__RCSID("$NetBSD: ofctl.c,v 1.11 2009/05/18 05:51:53 mrg Exp $");
#endif /* not lint */
#include
@@ -564,7 +564,8 @@
int len;
len = OF_getprop(node, "name", name, sizeof(name));
- assert(len > 0);
+ if (len <= 0)
+ name[0] = '\0';
off += snprintf(buf + off, buflen - off, "/%s", name);
reglen = OF_getprop(node, "reg", reg_buf, sizeof(reg_buf));
CVS commit: src/sys/arch/hp700/hp700
Module Name:src
Committed By: skrll
Date: Mon May 18 05:20:46 UTC 2009
Modified Files:
src/sys/arch/hp700/hp700: machdep.c
Log Message:
Remove stray printf.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/hp700/hp700/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/hp700/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.65 src/sys/arch/hp700/hp700/machdep.c:1.66
--- src/sys/arch/hp700/hp700/machdep.c:1.65 Mon May 18 05:19:15 2009
+++ src/sys/arch/hp700/hp700/machdep.c Mon May 18 05:20:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.65 2009/05/18 05:19:15 skrll Exp $ */
+/* $NetBSD: machdep.c,v 1.66 2009/05/18 05:20:46 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.65 2009/05/18 05:19:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.66 2009/05/18 05:20:46 skrll Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@@ -1022,7 +1022,6 @@
hpti_g(vaddr_t hpt, vsize_t hptsize)
{
-printf("%s: called %p %08x\n", __func__, (void *)hpt, (uint32_t)hptsize);
return pdc_call((iodcio_t)pdc, 0, PDC_TLB, PDC_TLB_CONFIG,
&pdc_hwtlb, hpt, hptsize, PDC_TLB_CURRPDE);
}
CVS commit: src/sys/arch/hp700/hp700
Module Name:src
Committed By: skrll
Date: Mon May 18 05:19:15 UTC 2009
Modified Files:
src/sys/arch/hp700/hp700: machdep.c
Log Message:
Whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/hp700/hp700/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/hp700/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.64 src/sys/arch/hp700/hp700/machdep.c:1.65
--- src/sys/arch/hp700/hp700/machdep.c:1.64 Sat May 16 16:06:06 2009
+++ src/sys/arch/hp700/hp700/machdep.c Mon May 18 05:19:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.64 2009/05/16 16:06:06 mjf Exp $ */
+/* $NetBSD: machdep.c,v 1.65 2009/05/18 05:19:15 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.64 2009/05/16 16:06:06 mjf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.65 2009/05/18 05:19:15 skrll Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@@ -265,7 +265,6 @@
struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
-
void delay_init(void);
static inline void fall(int, int, int, int, int);
void dumpsys(void);
@@ -358,7 +357,7 @@
#endif
#ifdef HP8200_CPU
{ "PA8200", "Vulcan", "PCXU+",
- hpcxup,HPPA_CPU_PCXUP, HPPA_FTRS_W32B, "2.0",
+ hpcxup, HPPA_CPU_PCXUP, HPPA_FTRS_W32B, "2.0",
desidhash_u, itlb_u, dtlb_u, itlbna_u, dtlbna_u, tlbd_u,
ibtlb_u, NULL, pbtlb_u },
#endif
CVS commit: src/sys/arch/evbppc/conf
Module Name:src
Committed By: mrg
Date: Mon May 18 05:17:28 UTC 2009
Modified Files:
src/sys/arch/evbppc/conf: Makefile.obs405.inc
Log Message:
apply the change from PR 40289 - use ppc405 on openblocks ppc405 kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/conf/Makefile.obs405.inc
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/evbppc/conf/Makefile.obs405.inc
diff -u src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.3 src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.4
--- src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.3 Thu Nov 24 12:54:29 2005
+++ src/sys/arch/evbppc/conf/Makefile.obs405.inc Mon May 18 05:17:28 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.obs405.inc,v 1.3 2005/11/24 12:54:29 dbj Exp $
+# $NetBSD: Makefile.obs405.inc,v 1.4 2009/05/18 05:17:28 mrg Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
-CFLAGS+=-mcpu=403
-AFLAGS+=-mcpu=403
+CFLAGS+=-mcpu=405
+AFLAGS+=-mcpu=405
TEXTADDR?= 25000
SYSTEM_FIRST_OBJ= locore.o
CVS commit: src/sys/arch/hp700/dev
Module Name:src
Committed By: skrll
Date: Mon May 18 05:13:26 UTC 2009
Modified Files:
src/sys/arch/hp700/dev: com_dino.c
Log Message:
u_intXX_t -> uintXX_t
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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.7 src/sys/arch/hp700/dev/com_dino.c:1.8
--- src/sys/arch/hp700/dev/com_dino.c:1.7 Mon May 18 04:58:23 2009
+++ src/sys/arch/hp700/dev/com_dino.c Mon May 18 05:13:26 2009
@@ -53,15 +53,15 @@
};
struct com_dino_regs {
- u_int8_t reset;
- u_int8_t pad0[3];
- u_int8_t test;
+ uint8_t reset;
+ uint8_t pad0[3];
+ uint8_t test;
#define COM_DINO_PAR_LOOP 0x01
#define COM_DINO_CLK_SEL 0x02
- u_int8_t pad1[3];
- u_int32_t iodc;
- u_int8_t pad2[0x54];
- u_int8_t dither;
+ uint8_t pad1[3];
+ uint32_t iodc;
+ uint8_t pad2[0x54];
+ uint8_t dither;
};
int com_dino_match(device_t, cfdata_t, void *);
CVS commit: src/sys/arch/hp700/dev
Module Name:src Committed By: skrll Date: Mon May 18 04:58:23 UTC 2009 Modified Files: src/sys/arch/hp700/dev: com_dino.c Log Message: Use the right interrupt number for com @ dino. Tested as working by Jonathan Kollasch. Thanks. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 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.6 src/sys/arch/hp700/dev/com_dino.c:1.7 --- src/sys/arch/hp700/dev/com_dino.c:1.6 Wed May 13 18:44:23 2009 +++ src/sys/arch/hp700/dev/com_dino.c Mon May 18 04:58:23 2009 @@ -138,7 +138,7 @@ com_attach_subr(sc); - ca->ca_irq = 11; + ca->ca_irq = 10; sc_comdino->sc_ih = dino_intr_establish(sc_dino, ca->ca_irq, IPL_TTY, comintr, sc);
CVS commit: src/crypto/external/bsd/netpgp/dist
Module Name:src Committed By: agc Date: Mon May 18 03:55:42 UTC 2009 Modified Files: src/crypto/external/bsd/netpgp/dist: configure configure.ac tst src/crypto/external/bsd/netpgp/dist/src/lib: config.h crypto.c crypto.h keyring.h packet-parse.c packet-parse.h packet-print.c validate.c validate.h version.h Log Message: + some more name changes + we've had the ability to sign files with a detached signature for a while now. We can now verify the files using the detached signature file. + in honour of this, update version numbers - 1.0.0/20090517 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/netpgp/dist/configure \ src/crypto/external/bsd/netpgp/dist/configure.ac cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/dist/tst cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/netpgp/dist/src/lib/config.h \ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.h \ src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.h \ src/crypto/external/bsd/netpgp/dist/src/lib/version.h cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/netpgp/dist/src/lib/crypto.c \ src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/netpgp/dist/src/lib/crypto.h cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/netpgp/dist/src/lib/validate.c cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/netpgp/dist/src/lib/validate.h 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/configure diff -u src/crypto/external/bsd/netpgp/dist/configure:1.6 src/crypto/external/bsd/netpgp/dist/configure:1.7 --- src/crypto/external/bsd/netpgp/dist/configure:1.6 Sat May 16 06:30:38 2009 +++ src/crypto/external/bsd/netpgp/dist/configure Mon May 18 03:55:42 2009 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for netpgp 20090515. +# Generated by GNU Autoconf 2.63 for netpgp 20090517. # # Report bugs to c0596823>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='netpgp' PACKAGE_TARNAME='netpgp' -PACKAGE_VERSION='20090515' -PACKAGE_STRING='netpgp 20090515' +PACKAGE_VERSION='20090517' +PACKAGE_STRING='netpgp 20090517' PACKAGE_BUGREPORT='Alistair Crooks c0596823' ac_unique_file="src/bin/netpgp.c" @@ -1268,7 +1268,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures netpgp 20090515 to adapt to many kinds of systems. +\`configure' configures netpgp 20090517 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1338,7 +1338,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of netpgp 20090515:";; + short | recursive ) echo "Configuration of netpgp 20090517:";; esac cat <<\_ACEOF @@ -1418,7 +1418,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -netpgp configure 20090515 +netpgp configure 20090517 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1432,7 +1432,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by netpgp $as_me 20090515, which was +It was created by netpgp $as_me 20090517, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -6161,7 +6161,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by netpgp $as_me 20090515, which was +This file was extended by netpgp $as_me 20090517, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6220,7 +6220,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -netpgp config.status 20090515 +netpgp config.status 20090517 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/&/g'`\\" Index: src/crypto/external/bsd/netpgp/dist/configure.ac diff -u src/crypto/external/bsd/netpgp/dist/configure.ac:1.6 src/crypto/external/bsd/netpgp/dist/configure.ac:1.7 --- src/crypto/external/bsd/netpgp/dist/configure.ac:1.6 Sat May 16 06:30:38 2009 +++ src/crypto/external/bsd/netpgp/dist/c
CVS commit: src/sys/arch/sparc/sparc
Module Name:src
Committed By: mrg
Date: Mon May 18 02:28:35 UTC 2009
Modified Files:
src/sys/arch/sparc/sparc: pmap.c
Log Message:
fix a LOCKDEBUG problem from the previous: need to call pmap_kremove()
on a pre-existing mapping, before installing a new one.
To generate a diff of this commit:
cvs rdiff -u -r1.327 -r1.328 src/sys/arch/sparc/sparc/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/sparc/pmap.c
diff -u src/sys/arch/sparc/sparc/pmap.c:1.327 src/sys/arch/sparc/sparc/pmap.c:1.328
--- src/sys/arch/sparc/sparc/pmap.c:1.327 Mon May 18 01:36:11 2009
+++ src/sys/arch/sparc/sparc/pmap.c Mon May 18 02:28:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.327 2009/05/18 01:36:11 mrg Exp $ */
+/* $NetBSD: pmap.c,v 1.328 2009/05/18 02:28:35 mrg Exp $ */
/*
* Copyright (c) 1996
@@ -56,7 +56,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.327 2009/05/18 01:36:11 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.328 2009/05/18 02:28:35 mrg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -3807,6 +3807,7 @@
va += NBPG, off += NBPG) {
paddr_t pa = PMAP_BOOTSTRAP_VA2PA(CPUINFO_VA + off);
prom_printf("going to pmap_kenter_pa(va=%p, pa=%p)\n", va, pa);
+ pmap_kremove(va, NBPG);
pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE);
}
CVS commit: src/share/man/man8
Module Name:src Committed By: snj Date: Mon May 18 02:25:34 UTC 2009 Modified Files: src/share/man/man8: afterboot.8 Log Message: Make some updates (most notably syncing the Postfix section with reality) inspired by PR misc/39168. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/share/man/man8/afterboot.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man8/afterboot.8 diff -u src/share/man/man8/afterboot.8:1.39 src/share/man/man8/afterboot.8:1.40 --- src/share/man/man8/afterboot.8:1.39 Thu May 7 06:29:07 2009 +++ src/share/man/man8/afterboot.8 Mon May 18 02:25:34 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: afterboot.8,v 1.39 2009/05/07 06:29:07 dholland Exp $ +.\" $NetBSD: afterboot.8,v 1.40 2009/05/18 02:25:34 snj Exp $ .\" $OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $ .\" .\" Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu @@ -59,7 +59,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 20, 2008 +.Dd May 18, 2009 .Dt AFTERBOOT 8 .Os .Sh NAME @@ -193,7 +193,9 @@ or edit the .Pa /etc/myname file to have it stick around for the next reboot. -Note that hostname is supposed include a domainname, and that this should +Note that +.Dq Va hostname +is supposed include a domainname, and that this should not be confused with YP (NIS) .Xr domainname 1 . If you are using @@ -686,23 +688,24 @@ Check .Pa /etc/mail/aliases and update appropriately if you want e-mail to be routed -to non-local address or to different users. +to non-local addresses or to different users. .Pp Run .Xr newaliases 1 after changes. .Ss Postfix .Nx -comes also with Postfix in the base system. -You may wish to set it up in favor of sendmail. -Take a look to +uses Postfix as its MTA. +Postfix is started by default, but its initial configuration does not +cause it to listen on the network for incoming connections. +To configure Postfix, see .Pa /etc/postfix/main.cf -and enable the daemon in -.Pa /etc/rc.conf -using "postfix=yes". -It is very important to configure +and +.Pa /etc/postfix/master.cf . +If you wish to use a different MTA (e.g., sendmail), install your MTA of +choice and edit .Pa /etc/mailer.conf -to point to Postfix binaries. +to point to the proper binaries. .Ss DHCP server If this is a DHCP @@ -964,7 +967,8 @@ Should any problems appear when running the test suite, please let the .Nx developers know by sending a message to the appropriate mailing list or -by sending a problem report. For more details see: +by sending a problem report. +For more details see: .Bl -bullet -offset indent .It .Pa http://www.netbsd.org/mailinglists/ @@ -994,8 +998,6 @@ .Xr exports 5 , .Xr fstab 5 , .Xr group 5 , -.Xr krb.conf 5 , -.Xr krb.realms 5 , .Xr mailer.conf 5 , .Xr passwd 5 , .Xr rc.conf 5 ,
CVS commit: src/share/man/man4
Module Name:src Committed By: snj Date: Mon May 18 02:41:23 UTC 2009 Modified Files: src/share/man/man4: iwn.4 Log Message: Remove stale link to the IWN webpage, which is nowhere to be found. Noted by Takuro KUBOTA in PR misc/40129. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/iwn.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/iwn.4 diff -u src/share/man/man4/iwn.4:1.6 src/share/man/man4/iwn.4:1.7 --- src/share/man/man4/iwn.4:1.6 Mon Mar 9 19:24:28 2009 +++ src/share/man/man4/iwn.4 Mon May 18 02:41:23 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: iwn.4,v 1.6 2009/03/09 19:24:28 joerg Exp $ +.\" $NetBSD: iwn.4,v 1.7 2009/05/18 02:41:23 snj Exp $ .\" .\" Copyright (c) 2007,2008 .\" Damien Bergamini . All rights reserved. @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd November 7, 2008 +.Dd May 18, 2009 .Dt IWN 4 .Os .Sh NAME @@ -196,10 +196,6 @@ .Xr pci 4 , .\" .Xr hostname.if 5 , .Xr ifconfig 8 -.Rs -.%T The IWN Web Page -.%O http://damien.bergamini.free.fr/iwn/ -.Re .Sh AUTHORS The .Nm
CVS commit: src/sys/arch/sparc/sparc
Module Name:src
Committed By: mrg
Date: Mon May 18 01:36:11 UTC 2009
Modified Files:
src/sys/arch/sparc/sparc: cpu.c cpuvar.h db_interface.c locore.s pmap.c
Log Message:
- retire union cpu_info_pg
- allocate space for each cpu_info{} in pmap_bootstrap
- remap cpu0's space into the PA currently in CPUINFO_VA
- cpus[] becomes an array of pointers to cpu_info{}, easy to traverse
- only call kernel lock for IPL_VM interrupts (? as implemented on
x86 and sparc64)
- revert a minor part of locore.s:1.241
- in cpu_hatch(), set %sp to near the middle of the interrupt stack.
we only need a %sp until we get to run an MI thread (own idlelwp or
real code)
we still waste one page of space, but this gets SMP much closer to
actually working again.
To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.214 src/sys/arch/sparc/sparc/cpu.c
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/sparc/sparc/cpuvar.h
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/sparc/sparc/db_interface.c
cvs rdiff -u -r1.244 -r1.245 src/sys/arch/sparc/sparc/locore.s
cvs rdiff -u -r1.326 -r1.327 src/sys/arch/sparc/sparc/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/sparc/cpu.c
diff -u src/sys/arch/sparc/sparc/cpu.c:1.213 src/sys/arch/sparc/sparc/cpu.c:1.214
--- src/sys/arch/sparc/sparc/cpu.c:1.213 Tue Mar 10 23:58:20 2009
+++ src/sys/arch/sparc/sparc/cpu.c Mon May 18 01:36:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.213 2009/03/10 23:58:20 martin Exp $ */
+/* $NetBSD: cpu.c,v 1.214 2009/05/18 01:36:11 mrg Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.213 2009/03/10 23:58:20 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.214 2009/05/18 01:36:11 mrg Exp $");
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
@@ -103,7 +103,7 @@
int sparc_ncpus; /* # of CPUs detected by PROM */
#ifdef MULTIPROCESSOR
-union cpu_info_pg *cpus;
+struct cpu_info *cpus[4]; /* we only support 4 CPUs. */
u_int cpu_ready_mask; /* the set of CPUs marked as READY */
#endif
@@ -156,10 +156,10 @@
getcpuinfo(cpi, node);
/*
- * Arrange pcb and interrupt stack.
+ * Arrange interrupt stack. This cpu will also abuse the bottom
+ * half of the interrupt stack before it gets to run its idle LWP.
*/
- intstack = uvm_km_alloc(kernel_map, INT_STACK_SIZE,
- 0, UVM_KMF_WIRED);
+ intstack = uvm_km_alloc(kernel_map, INT_STACK_SIZE, 0, UVM_KMF_WIRED);
if (intstack == 0)
panic("%s: no uspace/intstack", __func__);
cpi->eintstack = (void*)(intstack + INT_STACK_SIZE);
@@ -339,7 +339,7 @@
getcpuinfo(&cpuinfo, node);
#if defined(MULTIPROCESSOR)
- cpi = sc->sc_cpuinfo = cpuinfo.ci_self;
+ cpi = sc->sc_cpuinfo = cpus[idx];
#else
/* The `local' VA is global for uniprocessor. */
cpi = sc->sc_cpuinfo = (struct cpu_info *)CPUINFO_VA;
@@ -362,7 +362,7 @@
/*
* Initialise this cpu's cpu_info.
*/
- cpi = sc->sc_cpuinfo = &cpus[idx].ci;
+ cpi = sc->sc_cpuinfo = cpus[idx];
init_cpuinfo(cpi, node);
/*
Index: src/sys/arch/sparc/sparc/cpuvar.h
diff -u src/sys/arch/sparc/sparc/cpuvar.h:1.76 src/sys/arch/sparc/sparc/cpuvar.h:1.77
--- src/sys/arch/sparc/sparc/cpuvar.h:1.76 Tue Mar 10 23:58:20 2009
+++ src/sys/arch/sparc/sparc/cpuvar.h Mon May 18 01:36:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuvar.h,v 1.76 2009/03/10 23:58:20 martin Exp $ */
+/* $NetBSD: cpuvar.h,v 1.77 2009/05/18 01:36:11 mrg Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -416,7 +416,7 @@
#define CPU_INFO_ITERATOR int
#ifdef MULTIPROCESSOR
-#define CPU_INFO_FOREACH(cii, cp) cii = 0; cp = &cpus[cii].ci, cii < sparc_ncpus; cii++
+#define CPU_INFO_FOREACH(cii, cp) cii = 0; cp = cpus[cii], cii < sparc_ncpus; cii++
#else
#define CPU_INFO_FOREACH(cii, cp) (void)cii, cp = curcpu(); cp != NULL; cp = NULL
#endif
@@ -473,11 +473,7 @@
#define CPU_MID2CPUNO(mid) ((mid) != 0 ? (mid) - 8 : 0)
#ifdef MULTIPROCESSOR
-union cpu_info_pg {
- struct cpu_info ci; /* cpu info (aliased (per cpu) to CPUINFO_VA */
- char pad[32 * 1024]; /* XXX: force 32K alignment for now */
-};/* SMP capable cpu types */
-extern union cpu_info_pg *cpus;
+extern struct cpu_info *cpus[];
extern u_int cpu_ready_mask; /* the set of CPUs marked as READY */
#endif
Index: src/sys/arch/sparc/sparc/db_interface.c
diff -u src/sys/arch/sparc/sparc/db_interface.c:1.83 src/sys/arch/sparc/sparc/db_interface.c:1.84
--- src/sys/arch/sparc/sparc/db_interface.c:1.83 Tue Mar 10 23:58:20 2009
+++ src/sys/arch/sparc/sparc/db_interface.c Mon May 18 01:36:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.83 2009/03/10 23:58:20 martin Exp $ */
+/* $NetBSD: db_interface.c,v 1.84 2009/05/18 01:36:11 mrg Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.83 2009/03/10 23:58:20 martin Exp $");
+__KERNE
CVS commit: src/share/man/man7
Module Name:src Committed By: snj Date: Mon May 18 00:41:53 UTC 2009 Modified Files: src/share/man/man7: sysctl.7 Log Message: Document PROC_PID_LIMIT_SBSIZE. From Greg A. Woods in PR lib/36463. Wording is taken from getrlimit(2). To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/share/man/man7/sysctl.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/sysctl.7 diff -u src/share/man/man7/sysctl.7:1.21 src/share/man/man7/sysctl.7:1.22 --- src/share/man/man7/sysctl.7:1.21 Thu Apr 9 03:40:24 2009 +++ src/share/man/man7/sysctl.7 Mon May 18 00:41:53 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysctl.7,v 1.21 2009/04/09 03:40:24 joerg Exp $ +.\" $NetBSD: sysctl.7,v 1.22 2009/05/18 00:41:53 snj Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 .\" -.Dd March 1, 2009 +.Dd May 18, 2009 .Dt SYSCTL 7 .Os .Sh NAME @@ -1715,7 +1715,14 @@ The maximum number of simultaneous processes for this user id. .It Li proc.pid.rlimit.descriptors ( PROC_PID_LIMIT_NOFILE ) The maximum number of open files for this process. -.\" XXX proc.pid.rlimit.sbsize +.It Li proc.pid.rlimit.sbsize ( PROC_PID_LIMIT_SBSIZE ) +The maximum size (in bytes) of the socket buffers +set by the +.Xr setsockopt 2 +.Dv SO_RCVBUF +and +.Dv SO_SNDBUF +options. .El .Pp The fifth level name is one of
CVS commit: src/sys/arch/sparc/sparc
Module Name:src
Committed By: mrg
Date: Mon May 18 00:25:15 UTC 2009
Modified Files:
src/sys/arch/sparc/sparc: intr.c
Log Message:
also print the cpu_number() when we get a strayintr().
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/sparc/sparc/intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/sparc/intr.c
diff -u src/sys/arch/sparc/sparc/intr.c:1.102 src/sys/arch/sparc/sparc/intr.c:1.103
--- src/sys/arch/sparc/sparc/intr.c:1.102 Tue Mar 10 23:58:20 2009
+++ src/sys/arch/sparc/sparc/intr.c Mon May 18 00:25:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.102 2009/03/10 23:58:20 martin Exp $ */
+/* $NetBSD: intr.c,v 1.103 2009/05/18 00:25:15 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.102 2009/03/10 23:58:20 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.103 2009/05/18 00:25:15 mrg Exp $");
#include "opt_multiprocessor.h"
#include "opt_sparc_arch.h"
@@ -99,8 +99,8 @@
int timesince;
snprintb(bits, sizeof(bits), PSR_BITS, fp->psr);
- printf("stray interrupt ipl 0x%x pc=0x%x npc=0x%x psr=%s\n",
- fp->ipl, fp->pc, fp->npc, bits);
+ printf("stray interrupt cpu%d ipl 0x%x pc=0x%x npc=0x%x psr=%s\n",
+ cpu_number(), fp->ipl, fp->pc, fp->npc, bits);
timesince = time_uptime - straytime;
if (timesince <= 10) {
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: he
Date: Mon May 18 00:14:27 UTC 2009
Modified Files:
src/sys/dev/pci: tgavar.h
Log Message:
Complete the device_t / softc split by changing the sc_dev member
from "struct device" to "device_t". Commit overlooked when tga.c was
changed?
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/tgavar.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/pci/tgavar.h
diff -u src/sys/dev/pci/tgavar.h:1.17 src/sys/dev/pci/tgavar.h:1.18
--- src/sys/dev/pci/tgavar.h:1.17 Wed Jan 7 01:31:01 2009
+++ src/sys/dev/pci/tgavar.h Mon May 18 00:14:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tgavar.h,v 1.17 2009/01/07 01:31:01 ahoka Exp $ */
+/* $NetBSD: tgavar.h,v 1.18 2009/05/18 00:14:27 he Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -94,7 +94,7 @@
};
struct tga_softc {
- struct device sc_dev;
+ device_t sc_dev;
struct tga_devconfig *sc_dc; /* device configuration */
void *sc_intr; /* interrupt handler info */
CVS commit: src/share/man
Module Name:src Committed By: snj Date: Mon May 18 00:07:47 UTC 2009 Modified Files: src/share/man/man4: usb.4 src/share/man/man9: wsdisplay.9 wsfont.9 Log Message: Fix some typos and bad wording. From Raphael Langerhorst in PR misc/35213, plus two small nits from me. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/share/man/man4/usb.4 cvs rdiff -u -r1.21 -r1.22 src/share/man/man9/wsdisplay.9 cvs rdiff -u -r1.13 -r1.14 src/share/man/man9/wsfont.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/usb.4 diff -u src/share/man/man4/usb.4:1.90 src/share/man/man4/usb.4:1.91 --- src/share/man/man4/usb.4:1.90 Mon May 4 20:42:34 2009 +++ src/share/man/man4/usb.4 Mon May 18 00:07:47 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: usb.4,v 1.90 2009/05/04 20:42:34 wiz Exp $ +.\" $NetBSD: usb.4,v 1.91 2009/05/18 00:07:47 snj Exp $ .\" .\" Copyright (c) 1999-2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -307,7 +307,7 @@ bus proceeds in several steps: .Bl -enum .It -Any device specific driver can to attach to the device. +Any device specific driver can attach to the device. .It If none is found, any device class specific driver can attach. .It @@ -434,7 +434,7 @@ .Va requests field is indexed by the transfer kind, i.e. .Va UE_* , -and indicates how many transfers of each kind that has been completed +and indicates how many transfers of each kind have been completed by the controller. .It Dv USB_REQUEST Fa "struct usb_ctl_request" This command can be used to execute arbitrary requests on the control pipe. Index: src/share/man/man9/wsdisplay.9 diff -u src/share/man/man9/wsdisplay.9:1.21 src/share/man/man9/wsdisplay.9:1.22 --- src/share/man/man9/wsdisplay.9:1.21 Wed Apr 30 13:10:59 2008 +++ src/share/man/man9/wsdisplay.9 Mon May 18 00:07:47 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: wsdisplay.9,v 1.21 2008/04/30 13:10:59 martin Exp $ +.\" $NetBSD: wsdisplay.9,v 1.22 2009/05/18 00:07:47 snj Exp $ .\" .\" Copyright (c) 2001, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -136,7 +136,7 @@ .Fa show_screen member defines a function for mapping a screen onto the physical display. -This function is used for between switching screens. +This function is used for switching between screens. The .Fa load_font member defines a function for loading a new font into the display. @@ -163,21 +163,18 @@ A structure used to attach the .Xr wsdisplay 4 child device for the simple bit-mapped interface. -If the full terminal-emulation interface is to be used, then -.Em struct wsemuldisplaydev_attach_args -should be used instead. It has the following members: .Bd -literal const struct wsdisplay_accessops *accessops; void *accesscookie; .Ed +If the full terminal-emulation interface is to be used, then +.Em struct wsemuldisplaydev_attach_args +should be used instead. .It Fa struct wsemuldisplaydev_attach_args A structure used to attach the .Xr wsdisplay 4 child device for the full terminal emulation interface. -If the simple bit-mapped interface is to be used, then -.Em struct wsdisplaydev_attach_args -should be used instead. It has the following members: .Bd -literal int console; @@ -185,6 +182,9 @@ const struct wsdisplay_accessops *accessops; void *accesscookie; .Ed +If the simple bit-mapped interface is to be used, then +.Em struct wsdisplaydev_attach_args +should be used instead. .It Fa struct wsdisplay_emulops A structure used to specify the display emulation functions. All displays intending to provide terminal emulation must provide Index: src/share/man/man9/wsfont.9 diff -u src/share/man/man9/wsfont.9:1.13 src/share/man/man9/wsfont.9:1.14 --- src/share/man/man9/wsfont.9:1.13 Wed Apr 30 13:10:59 2008 +++ src/share/man/man9/wsfont.9 Mon May 18 00:07:47 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: wsfont.9,v 1.13 2008/04/30 13:10:59 martin Exp $ +.\" $NetBSD: wsfont.9,v 1.14 2009/05/18 00:07:47 snj Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -146,8 +146,8 @@ .Fn wsfont_find is called with any of the parameters as 0, it indicates that we don't care about that aspect of the font. -If the font is found a (nonnegative-valued) cookie is returned which -can used with the other functions. +If the font is found, a (nonnegative-valued) cookie is returned which +can be used with the other functions. .Pp The .Fa bitorder @@ -202,7 +202,7 @@ .Fn wsfont_unlock will free resources used by temporary copies. .Pp -The address of the wsdisplay_font pointer for the specified font is return in +The address of the wsdisplay_font pointer for the specified font is returned in the .Fa ptr argument. @@ -218,7 +218,7 @@ .Fa c to glyph for font .Fa font . -Returns the glyph or success or -1 on error. +Returns the glyph on success or \-1 on error. .El .Sh CODE REFERENCES This section
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: joerg Date: Sun May 17 21:31:59 UTC 2009 Modified Files: src/external/bsd/pkg_install/dist/lib: pkg_summary.5 Log Message: Merge for pkg_install-20090513. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/pkg_summary.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/pkg_install/dist/lib/pkg_summary.5 diff -u src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.2 src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.3 --- src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.2 Tue Feb 3 05:16:08 2009 +++ src/external/bsd/pkg_install/dist/lib/pkg_summary.5 Sun May 17 21:31:59 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_summary.5,v 1.2 2009/02/03 05:16:08 wiz Exp $ +.\" $NetBSD: pkg_summary.5,v 1.3 2009/05/17 21:31:59 joerg Exp $ .\" .\" Copyright (c) 2006 The NetBSD Foundation .\" @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 29, 2007 +.Dd April 11, 2009 .Dt PKG_SUMMARY 5 .Os .Sh NAME @@ -94,6 +94,12 @@ (required) The path of the package directory within pkgsrc. .It Ev PKGTOOLS_VERSION (required) The version of the package tools used to create the package. +.It Ev PREV_PKGPATH +(optional) The previous path of the package directory within pkgsrc when +a package was moved. +(See +.Ev SUPERSEDES +below for a renamed package.) .It Ev PROVIDES (optional) A list of shared libraries provided by the package, including major version number, one per line. @@ -104,6 +110,10 @@ If missing, this package does not require shared libraries. .It Ev SIZE_PKG (required) The size of the package when installed, in bytes. +.It Ev SUPERSEDES +(optional) A list of dewey patterns of previous packages this +package replaces, one per line. +This is used for package renaming. .El .Pp The
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Sun May 17 21:21:10 UTC 2009 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9098 Log Message: Import pkg_install-20090513: - Make compression type selection in pkg_create optionally explicit. - PREV_PKGPATH / SUPERSEDES Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20090513 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/README U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/decompress.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c C src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jPKGSRC:yesterday -jPKGSRC src/external/bsd/pkg_install/dist
CVS commit: src/sys/arch
Module Name:src
Committed By: bouyer
Date: Sun May 17 18:24:24 UTC 2009
Modified Files:
src/sys/arch/i386/i386: gdt.c
src/sys/arch/i386/include: segments.h
src/sys/arch/x86/x86: sys_machdep.c
Log Message:
on Xen the GDT has to be updated though HYPERVISOR_update_descriptor().
Export i386/i386/gdt.c:update_descriptor() and use it in x86_set_sdbase(),
as a direct write to the GDT will cause a kernel trap.
Fix PR port-xen/41401.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/i386/i386/gdt.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/i386/include/segments.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/x86/x86/sys_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/i386/gdt.c
diff -u src/sys/arch/i386/i386/gdt.c:1.47 src/sys/arch/i386/i386/gdt.c:1.48
--- src/sys/arch/i386/i386/gdt.c:1.47 Sat Mar 21 14:41:29 2009
+++ src/sys/arch/i386/i386/gdt.c Sun May 17 18:24:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gdt.c,v 1.47 2009/03/21 14:41:29 ad Exp $ */
+/* $NetBSD: gdt.c,v 1.48 2009/05/17 18:24:23 bouyer Exp $ */
/*-
* Copyright (c) 1996, 1997, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.47 2009/03/21 14:41:29 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.48 2009/05/17 18:24:23 bouyer Exp $");
#include "opt_multiprocessor.h"
#include "opt_xen.h"
@@ -66,7 +66,7 @@
int gdt_get_slot1(int);
void gdt_put_slot1(int, int);
-static void
+void
update_descriptor(union descriptor *table, union descriptor *entry)
{
#ifndef XEN
Index: src/sys/arch/i386/include/segments.h
diff -u src/sys/arch/i386/include/segments.h:1.52 src/sys/arch/i386/include/segments.h:1.53
--- src/sys/arch/i386/include/segments.h:1.52 Sat Mar 21 22:17:13 2009
+++ src/sys/arch/i386/include/segments.h Sun May 17 18:24:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: segments.h,v 1.52 2009/03/21 22:17:13 ad Exp $ */
+/* $NetBSD: segments.h,v 1.53 2009/05/17 18:24:23 bouyer Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -197,6 +197,7 @@
void setgdt(int, const void *, size_t, int, int, int, int);
void unsetgate(struct gate_descriptor *);
void cpu_init_idt(void);
+void update_descriptor(union descriptor *, union descriptor *);
#if !defined(XEN)
void idt_init(void);
Index: src/sys/arch/x86/x86/sys_machdep.c
diff -u src/sys/arch/x86/x86/sys_machdep.c:1.18 src/sys/arch/x86/x86/sys_machdep.c:1.19
--- src/sys/arch/x86/x86/sys_machdep.c:1.18 Sun Mar 29 09:24:52 2009
+++ src/sys/arch/x86/x86/sys_machdep.c Sun May 17 18:24:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_machdep.c,v 1.18 2009/03/29 09:24:52 ad Exp $ */
+/* $NetBSD: sys_machdep.c,v 1.19 2009/05/17 18:24:24 bouyer Exp $ */
/*-
* Copyright (c) 1998, 2007, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.18 2009/03/29 09:24:52 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.19 2009/05/17 18:24:24 bouyer Exp $");
#include "opt_mtrr.h"
#include "opt_perfctrs.h"
@@ -591,7 +591,7 @@
x86_set_sdbase(void *arg, char which, lwp_t *l, bool direct)
{
#ifdef i386
- struct segment_descriptor sd;
+ union descriptor usd;
struct pcb *pcb;
vaddr_t base;
int error;
@@ -604,28 +604,30 @@
return error;
}
- sd.sd_lobase = base & 0xff;
- sd.sd_hibase = (base >> 24) & 0xff;
- sd.sd_lolimit = 0x;
- sd.sd_hilimit = 0xf;
- sd.sd_type = SDT_MEMRWA;
- sd.sd_dpl = SEL_UPL;
- sd.sd_p = 1;
- sd.sd_xx = 0;
- sd.sd_def32 = 1;
- sd.sd_gran = 1;
+ usd.sd.sd_lobase = base & 0xff;
+ usd.sd.sd_hibase = (base >> 24) & 0xff;
+ usd.sd.sd_lolimit = 0x;
+ usd.sd.sd_hilimit = 0xf;
+ usd.sd.sd_type = SDT_MEMRWA;
+ usd.sd.sd_dpl = SEL_UPL;
+ usd.sd.sd_p = 1;
+ usd.sd.sd_xx = 0;
+ usd.sd.sd_def32 = 1;
+ usd.sd.sd_gran = 1;
kpreempt_disable();
pcb = &l->l_addr->u_pcb;
if (which == 'f') {
- memcpy(&pcb->pcb_fsd, &sd, sizeof(sd));
+ memcpy(&pcb->pcb_fsd, &usd.sd,
+ sizeof(struct segment_descriptor));
if (l == curlwp) {
- memcpy(&curcpu()->ci_gdt[GUFS_SEL], &sd, sizeof(sd));
+ update_descriptor(&curcpu()->ci_gdt[GUFS_SEL], &usd);
}
} else /* which == 'g' */ {
- memcpy(&pcb->pcb_gsd, &sd, sizeof(sd));
+ memcpy(&pcb->pcb_gsd, &usd.sd,
+ sizeof(struct segment_descriptor));
if (l == curlwp) {
- memcpy(&curcpu()->ci_gdt[GUGS_SEL], &sd, sizeof(sd));
+ update_descriptor(&curcpu()->ci_gdt[GUGS_SEL], &usd);
}
}
kpreempt_enable();
CVS commit: src/sys/arch/hp700/hp700
Module Name:src
Committed By: mjf
Date: Sun May 17 18:21:29 UTC 2009
Modified Files:
src/sys/arch/hp700/hp700: pim.h
Log Message:
u_intNN_t -> uintNN_t
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hp700/hp700/pim.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/hp700/hp700/pim.h
diff -u src/sys/arch/hp700/hp700/pim.h:1.3 src/sys/arch/hp700/hp700/pim.h:1.4
--- src/sys/arch/hp700/hp700/pim.h:1.3 Sat May 16 16:06:06 2009
+++ src/sys/arch/hp700/hp700/pim.h Sun May 17 18:21:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pim.h,v 1.3 2009/05/16 16:06:06 mjf Exp $ */
+/* $NetBSD: pim.h,v 1.4 2009/05/17 18:21:29 mjf Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -45,93 +45,93 @@
struct hp700_pim_regs {
/* The general registers. */
- u_int pim_regs_r0;
- u_int pim_regs_r1;
- u_int pim_regs_r2;
- u_int pim_regs_r3;
- u_int pim_regs_r4;
- u_int pim_regs_r5;
- u_int pim_regs_r6;
- u_int pim_regs_r7;
- u_int pim_regs_r8;
- u_int pim_regs_r9;
- u_int pim_regs_r10;
- u_int pim_regs_r11;
- u_int pim_regs_r12;
- u_int pim_regs_r13;
- u_int pim_regs_r14;
- u_int pim_regs_r15;
- u_int pim_regs_r16;
- u_int pim_regs_r17;
- u_int pim_regs_r18;
- u_int pim_regs_r19;
- u_int pim_regs_r20;
- u_int pim_regs_r21;
- u_int pim_regs_r22;
- u_int pim_regs_r23;
- u_int pim_regs_r24;
- u_int pim_regs_r25;
- u_int pim_regs_r26;
- u_int pim_regs_r27;
- u_int pim_regs_r28;
- u_int pim_regs_r29;
- u_int pim_regs_r30;
- u_int pim_regs_r31;
+ uint32_t pim_regs_r0;
+ uint32_t pim_regs_r1;
+ uint32_t pim_regs_r2;
+ uint32_t pim_regs_r3;
+ uint32_t pim_regs_r4;
+ uint32_t pim_regs_r5;
+ uint32_t pim_regs_r6;
+ uint32_t pim_regs_r7;
+ uint32_t pim_regs_r8;
+ uint32_t pim_regs_r9;
+ uint32_t pim_regs_r10;
+ uint32_t pim_regs_r11;
+ uint32_t pim_regs_r12;
+ uint32_t pim_regs_r13;
+ uint32_t pim_regs_r14;
+ uint32_t pim_regs_r15;
+ uint32_t pim_regs_r16;
+ uint32_t pim_regs_r17;
+ uint32_t pim_regs_r18;
+ uint32_t pim_regs_r19;
+ uint32_t pim_regs_r20;
+ uint32_t pim_regs_r21;
+ uint32_t pim_regs_r22;
+ uint32_t pim_regs_r23;
+ uint32_t pim_regs_r24;
+ uint32_t pim_regs_r25;
+ uint32_t pim_regs_r26;
+ uint32_t pim_regs_r27;
+ uint32_t pim_regs_r28;
+ uint32_t pim_regs_r29;
+ uint32_t pim_regs_r30;
+ uint32_t pim_regs_r31;
/* The control registers. */
- u_int pim_regs_cr0;
- u_int pim_regs_cr1;
- u_int pim_regs_cr2;
- u_int pim_regs_cr3;
- u_int pim_regs_cr4;
- u_int pim_regs_cr5;
- u_int pim_regs_cr6;
- u_int pim_regs_cr7;
- u_int pim_regs_cr8;
- u_int pim_regs_cr9;
- u_int pim_regs_cr10;
- u_int pim_regs_cr11;
- u_int pim_regs_cr12;
- u_int pim_regs_cr13;
- u_int pim_regs_cr14;
- u_int pim_regs_cr15;
- u_int pim_regs_cr16;
- u_int pim_regs_cr17;
- u_int pim_regs_cr18;
- u_int pim_regs_cr19;
- u_int pim_regs_cr20;
- u_int pim_regs_cr21;
- u_int pim_regs_cr22;
- u_int pim_regs_cr23;
- u_int pim_regs_cr24;
- u_int pim_regs_cr25;
- u_int pim_regs_cr26;
- u_int pim_regs_cr27;
- u_int pim_regs_cr28;
- u_int pim_regs_cr29;
- u_int pim_regs_cr30;
- u_int pim_regs_cr31;
+ uint32_t pim_regs_cr0;
+ uint32_t pim_regs_cr1;
+ uint32_t pim_regs_cr2;
+ uint32_t pim_regs_cr3;
+ uint32_t pim_regs_cr4;
+ uint32_t pim_regs_cr5;
+ uint32_t pim_regs_cr6;
+ uint32_t pim_regs_cr7;
+ uint32_t pim_regs_cr8;
+ uint32_t pim_regs_cr9;
+ uint32_t pim_regs_cr10;
+ uint32_t pim_regs_cr11;
+ uint32_t pim_regs_cr12;
+ uint32_t pim_regs_cr13;
+ uint32_t pim_regs_cr14;
+ uint32_t pim_regs_cr15;
+ uint32_t pim_regs_cr16;
+ uint32_t pim_regs_cr17;
+ uint32_t pim_regs_cr18;
+ uint32_t pim_regs_cr19;
+ uint32_t pim_regs_cr20;
+ uint32_t pim_regs_cr21;
+ uint32_t pim_regs_cr22;
+ uint32_t pim_regs_cr23;
+ uint32_t pim_regs_cr24;
+ uint32_t pim_regs_cr25;
+ uint32_t pim_regs_cr26;
+ uint32_t pim_regs_cr27;
+ uint32_t pim_regs_cr28;
+ uint32_t pim_regs_cr29;
+ uint32_t pim_regs_cr30;
+ uint32_t pim_regs_cr31;
/* The space registers. */
- u_int pim_regs_sr0;
- u_int pim_regs_sr1;
- u_int pim_regs_sr2;
- u_int pim_regs_sr3;
- u_int pim_regs_sr4;
- u_int pim_regs_sr5;
- u_int pim_regs_sr6;
- u_int pim_regs_sr7;
+ uint32_t pim_regs_sr0;
+ uint32_t pim_regs_sr1;
+ uint32_t pim_regs_sr2;
+ uint32_t pim_regs_sr3;
+ uint32_t pim_regs_sr4;
+ uint32_t pim_regs_sr5;
+ uint32_t pim_regs_sr6;
+ uint32_t pim_regs_sr7;
/* The back entries of the instruction address queues. */
- u_int pim_regs_iisq_tail;
- u_int pim_regs_iioq_tail;
+ uint32_t pim_regs_iisq_tail;
+ uint32_t pim_regs_iioq_tail;
};
/* The PIM data for HPMC and LPMC contains this check information. */
struct hp700_pim_checks {
/* The Check Type. */
- u_int pim_check_type;
+ uint32_t pim_check_type;
#define PIM_CHECK_CACHE (1 << 31)
#define PIM_CHECK_TLB (1 << 30)
#define PIM_CHECK_BUS (1 << 29)
@@ -142,7 +142,7 @@
* The CPU State. In addition to the common PIM_CPU_
* bits defined below, some fields are HPMC-specific.
*/
- u_int pim_che
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: dyoung Date: Sun May 17 18:11:34 UTC 2009 Modified Files: src/sys/dev/scsipi: sd.c Log Message: Reverse the sense of the DETACH_FORCE check so that we return EBUSY in the correct circumstances. To generate a diff of this commit: cvs rdiff -u -r1.282 -r1.283 src/sys/dev/scsipi/sd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/scsipi/sd.c diff -u src/sys/dev/scsipi/sd.c:1.282 src/sys/dev/scsipi/sd.c:1.283 --- src/sys/dev/scsipi/sd.c:1.282 Sat May 16 20:10:52 2009 +++ src/sys/dev/scsipi/sd.c Sun May 17 18:11:34 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: sd.c,v 1.282 2009/05/16 20:10:52 dyoung Exp $ */ +/* $NetBSD: sd.c,v 1.283 2009/05/17 18:11:34 dyoung Exp $ */ /*- * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc. @@ -47,7 +47,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.282 2009/05/16 20:10:52 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.283 2009/05/17 18:11:34 dyoung Exp $"); #include "opt_scsi.h" #include "rnd.h" @@ -356,7 +356,7 @@ mutex_enter(&sd->sc_dk.dk_openlock); if (sd->sc_dk.dk_openmask == 0) ; /* nothing to do */ - else if ((flags & DETACH_FORCE) != 0) + else if ((flags & DETACH_FORCE) == 0) rc = EBUSY; else sdlastclose(sd);
CVS commit: src/lib/libpthread
Module Name:src
Committed By: ad
Date: Sun May 17 14:49:00 UTC 2009
Modified Files:
src/lib/libpthread: pthread.c pthread_int.h
Log Message:
- Convert from makecontext() -> _lwp_makecontext().
- Rely on _lwp_makecontext() to set up the thread identity register.
This is not currently done (a bug), nor does libpthread use the
threadreg yet. I'm doing this so it the code can be used by the
person working on TLS to verify that their threadreg code is working.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/lib/libpthread/pthread.c
cvs rdiff -u -r1.71 -r1.72 src/lib/libpthread/pthread_int.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread.c
diff -u src/lib/libpthread/pthread.c:1.109 src/lib/libpthread/pthread.c:1.110
--- src/lib/libpthread/pthread.c:1.109 Wed Apr 1 10:13:24 2009
+++ src/lib/libpthread/pthread.c Sun May 17 14:49:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread.c,v 1.109 2009/04/01 10:13:24 drochner Exp $ */
+/* $NetBSD: pthread.c,v 1.110 2009/05/17 14:49:00 ad Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: pthread.c,v 1.109 2009/04/01 10:13:24 drochner Exp $");
+__RCSID("$NetBSD: pthread.c,v 1.110 2009/05/17 14:49:00 ad Exp $");
#define __EXPOSE_STACK 1
@@ -62,7 +62,7 @@
RB_PROTOTYPE_STATIC(__pthread__alltree, __pthread_st, pt_alltree, pthread__cmp)
#endif
-static void pthread__create_tramp(pthread_t, void *(*)(void *), void *);
+static void pthread__create_tramp(void *);
static void pthread__initthread(pthread_t);
static void pthread__scrubthread(pthread_t, char *, int);
static int pthread__stackid_setup(void *, size_t, pthread_t *);
@@ -406,8 +406,11 @@
* Create the new LWP.
*/
pthread__scrubthread(newthread, name, nattr.pta_flags);
- makecontext(&newthread->pt_uc, pthread__create_tramp, 3,
- newthread, startfunc, arg);
+ newthread->pt_func = startfunc;
+ newthread->pt_arg = arg;
+ _lwp_makecontext(&newthread->pt_uc, pthread__create_tramp,
+ newthread, newthread, newthread->pt_stack.ss_sp,
+ newthread->pt_stack.ss_size);
flag = LWP_DETACHED;
if ((newthread->pt_flags & PT_FLAG_SUSPENDED) != 0 ||
@@ -440,22 +443,21 @@
static void
-pthread__create_tramp(pthread_t self, void *(*start)(void *), void *arg)
+pthread__create_tramp(void *cookie)
{
+ pthread_t self;
void *retval;
- /*
- * Set up identity register.
- * XXX Race: could receive a signal before this.
- */
- (void)_lwp_setprivate(self);
+ self = cookie;
/*
* Throw away some stack in a feeble attempt to reduce cache
* thrash. May help for SMT processors. XXX We should not
* be allocating stacks on fixed 2MB boundaries. Needs a
- * thread register or decent thread local storage. Note
- * that pt_lid may not be set by this point, but we don't
+ * thread register or decent thread local storage.
+ *
+ * Note that we may race with the kernel in _lwp_create(),
+ * and so pt_lid can be unset at this point, but we don't
* care.
*/
(void)alloca(((unsigned)self->pt_lid & 7) << 8);
@@ -471,7 +473,7 @@
err(1, "_lwp_ctl");
}
- retval = (*start)(arg);
+ retval = (*self->pt_func)(self->pt_arg);
pthread_exit(retval);
Index: src/lib/libpthread/pthread_int.h
diff -u src/lib/libpthread/pthread_int.h:1.71 src/lib/libpthread/pthread_int.h:1.72
--- src/lib/libpthread/pthread_int.h:1.71 Sat May 16 22:21:18 2009
+++ src/lib/libpthread/pthread_int.h Sun May 17 14:49:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_int.h,v 1.71 2009/05/16 22:21:18 ad Exp $ */
+/* $NetBSD: pthread_int.h,v 1.72 2009/05/17 14:49:00 ad Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -106,6 +106,8 @@
struct pthread_lock_ops pt_lockops;/* Cached to avoid PIC overhead */
pthread_mutex_t *pt_droplock; /* Drop this lock if cancelled */
pthread_cond_t pt_joiners; /* Threads waiting to join. */
+ void *(*pt_func)(void *);/* Function to call at start. */
+ void *pt_arg; /* Argumen to pass at start. */
/* Threads to defer waking, usually until pthread_mutex_unlock(). */
lwpid_t pt_waiters[PTHREAD__UNPARK_MAX];
CVS commit: src/share/man/man9
Module Name:src Committed By: elad Date: Sun May 17 14:46:33 UTC 2009 Modified Files: src/share/man/man9: file.9 Log Message: Undocument FILE_LOCK(), FILE_UNLOCK() -- heh. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/share/man/man9/file.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/file.9 diff -u src/share/man/man9/file.9:1.12 src/share/man/man9/file.9:1.13 --- src/share/man/man9/file.9:1.12 Sun May 10 14:33:54 2009 +++ src/share/man/man9/file.9 Sun May 17 14:46:33 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: file.9,v 1.12 2009/05/10 14:33:54 elad Exp $ +.\" $NetBSD: file.9,v 1.13 2009/05/17 14:46:33 elad Exp $ .\" .\" Copyright (c) 2002, 2005, 2006 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 10, 2009 +.Dd May 17, 2009 .Dt FILE 9 .Os .Sh NAME @@ -37,9 +37,7 @@ .Nm FILE_IS_USABLE , .Nm FILE_USE , .Nm FILE_UNUSE , -.Nm FILE_SET_MATURE , -.Nm FILE_LOCK , -.Nm FILE_UNLOCK +.Nm FILE_SET_MATURE .Nd operations on file entries .Sh SYNOPSIS .In sys/file.h @@ -55,10 +53,6 @@ .Fn FILE_UNUSE "struct file *fp" "struct lwp *l" .Ft void .Fn FILE_SET_MATURE "struct file *fp" -.Ft void -.Fn FILE_LOCK "struct file *fp" -.Ft void -.Fn FILE_UNLOCK "struct file *fp" .Sh DESCRIPTION The file descriptor table of a process references a file entry for each file used by the kernel. @@ -247,12 +241,6 @@ Mark the file entry as being fully constructed (mature) by clearing the FIF_LARVAL flag in .Em f_iflags . -.It Fn FILE_LOCK "fp" -Locks the file entry -.Ar fp . -.It Fn FILE_UNLOCK "fp" -Unlocks the file entry -.Ar fp . .El .Sh CODE REFERENCES This section describes places within the
CVS commit: src/sys/dev/sdmmc
Module Name:src
Committed By: cegger
Date: Sun May 17 14:36:46 UTC 2009
Modified Files:
src/sys/dev/sdmmc: sdhc.c
Log Message:
fix crash with LOCKDEBUG+DIAGNOSTIC kernels:
sdhc_bus_clock() calls mutex_enter().
then in DIAGNOSTIC section, sdhc_bus_clock() calls sdhc_card_detect().
sdhc_card_detect() calls mutex_enter() on the same mutex again.
when LOCKDEBUG is enabled, you get
Mutex error: lockdebug_wantlock: locking against myself
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/sdmmc/sdhc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.1 src/sys/dev/sdmmc/sdhc.c:1.2
--- src/sys/dev/sdmmc/sdhc.c:1.1 Tue Apr 21 03:00:30 2009
+++ src/sys/dev/sdmmc/sdhc.c Sun May 17 14:36:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.1 2009/04/21 03:00:30 nonaka Exp $ */
+/* $NetBSD: sdhc.c,v 1.2 2009/05/17 14:36:46 cegger Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.1 2009/04/21 03:00:30 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.2 2009/05/17 14:36:46 cegger Exp $");
#include
#include
@@ -558,17 +558,23 @@
int div;
int timo;
int error = 0;
+#ifdef DIAGNOSTIC
+ int ispresent;
+#endif
+#ifdef DIAGNOSTIC
mutex_enter(&hp->host_mtx);
+ ispresent = ISSET(HREAD4(hp, SDHC_PRESENT_STATE), SDHC_CMD_INHIBIT_MASK);
+ mutex_exit(&hp->host_mtx);
-#ifdef DIAGNOSTIC
/* Must not stop the clock if commands are in progress. */
- if (ISSET(HREAD4(hp, SDHC_PRESENT_STATE), SDHC_CMD_INHIBIT_MASK) &&
- sdhc_card_detect(hp))
+ if (ispresent && sdhc_card_detect(hp))
printf("%s: sdhc_sdclk_frequency_select: command in progress\n",
device_xname(hp->sc->sc_dev));
#endif
+ mutex_enter(&hp->host_mtx);
+
/*
* Stop SD clock before changing the frequency.
*/
CVS commit: src/sbin/umount
Module Name:src Committed By: mjf Date: Sun May 17 14:09:15 UTC 2009 Modified Files: src/sbin/umount: umount.8 Log Message: Add an exmaple of unmounting all file systems apart from NFS and MFS e.g, umount -a -t nonfs,mfs This makes it clear that the "no prefix" only needs to be on the first file-system argument to -t. The mount(8) man page has a clear example of this but for some reason umount(8) was missing one. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sbin/umount/umount.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/umount/umount.8 diff -u src/sbin/umount/umount.8:1.14 src/sbin/umount/umount.8:1.15 --- src/sbin/umount/umount.8:1.14 Fri Dec 30 10:29:56 2005 +++ src/sbin/umount/umount.8 Sun May 17 14:09:15 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: umount.8,v 1.14 2005/12/30 10:29:56 mjl Exp $ +.\" $NetBSD: umount.8,v 1.15 2009/05/17 14:09:15 mjf Exp $ .\" .\" Copyright (c) 1980, 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)umount.8 8.2 (Berkeley) 5/8/95 .\" -.Dd April 21, 2004 +.Dd May 17, 2009 .Dt UMOUNT 8 .Os .Sh NAME @@ -124,6 +124,17 @@ unmounts all filesystems of the type .Tn NFS and +.Tn MFS , +whereas the +.Nm +command: +.Bd -literal -offset indent +umount -a -t nonfs,mfs +.Ed +.Pp +unmounts all file systems except those of type +.Tn NFS +and .Tn MFS . .It Fl v Verbose, additional information is printed out as each filesystem
CVS commit: src/crypto/external/bsd/netpgp/bin
Module Name:src
Committed By: he
Date: Sun May 17 11:38:43 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/bin: Makefile
Log Message:
Add LDADD+= and DPADD+= settings so that this builds on sun2 as well,
where we can't rely on shared libraries expressing the needs of the
program.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/crypto/external/bsd/netpgp/bin/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/bin/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/Makefile:1.1.1.1 src/crypto/external/bsd/netpgp/bin/Makefile:1.2
--- src/crypto/external/bsd/netpgp/bin/Makefile:1.1.1.1 Thu Apr 23 06:31:55 2009
+++ src/crypto/external/bsd/netpgp/bin/Makefile Sun May 17 11:38:42 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/04/23 06:31:55 agc Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/17 11:38:42 he Exp $
.include
@@ -11,6 +11,9 @@
LDADD+= -L${LIBNETPGPDIR} -lnetpgp
DPADD+= ${LIBNETPGPDIR}/libnetpgp.a
+LDADD+= -lcrypto -lz -lbz2
+DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
+
MAN= netpgp.1
# although the code is/was WARNS=4 clean, when linking, there is a warning
CVS commit: src/sys/net
Module Name:src
Committed By: cegger
Date: Sun May 17 11:34:21 UTC 2009
Modified Files:
src/sys/net: if_bridge.c
Log Message:
fix crash in bridge_ioctl():
BRDGGFLT and BRDGSFILT bridge controls are only available with BRIDGE_IPF and
PFIL_HOOKS defined.
In amd64 GENERIC and XEN kernel configs PFIL_HOOKS is defined but BRIDGE_IPF is
not.
When a BRDGGFLT or BRDGSFILT command comes in, then ifd->ifd_cmd is not in range
of bridge_control_table_size. Then bc is not set and is dereferenced
later => BOOM.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/net/if_bridge.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/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.69 src/sys/net/if_bridge.c:1.70
--- src/sys/net/if_bridge.c:1.69 Tue May 12 23:03:24 2009
+++ src/sys/net/if_bridge.c Sun May 17 11:34:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.69 2009/05/12 23:03:24 elad Exp $ */
+/* $NetBSD: if_bridge.c,v 1.70 2009/05/17 11:34:21 cegger Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.69 2009/05/12 23:03:24 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.70 2009/05/17 11:34:21 cegger Exp $");
#include "opt_bridge_ipf.h"
#include "opt_inet.h"
@@ -454,7 +454,7 @@
case SIOCSDRVSPEC:
if (ifd->ifd_cmd >= bridge_control_table_size) {
error = EINVAL;
- break;
+ return error;
}
bc = &bridge_control_table[ifd->ifd_cmd];
@@ -476,6 +476,7 @@
switch (cmd) {
case SIOCGDRVSPEC:
case SIOCSDRVSPEC:
+ KASSERT(bc != NULL);
if (cmd == SIOCGDRVSPEC &&
(bc->bc_flags & BC_F_COPYOUT) == 0) {
error = EINVAL;
CVS commit: src/sys/kern
Module Name:src
Committed By: ad
Date: Sun May 17 10:08:38 UTC 2009
Modified Files:
src/sys/kern: sys_generic.c
Log Message:
Updates to f_flag need to be made with atomics.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/kern/sys_generic.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/sys_generic.c
diff -u src/sys/kern/sys_generic.c:1.121 src/sys/kern/sys_generic.c:1.122
--- src/sys/kern/sys_generic.c:1.121 Sun May 17 05:54:42 2009
+++ src/sys/kern/sys_generic.c Sun May 17 10:08:38 2009
@@ -1,7 +1,7 @@
-/* $NetBSD: sys_generic.c,v 1.121 2009/05/17 05:54:42 yamt Exp $ */
+/* $NetBSD: sys_generic.c,v 1.122 2009/05/17 10:08:38 ad Exp $ */
/*-
- * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
+ * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.121 2009/05/17 05:54:42 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.122 2009/05/17 10:08:38 ad Exp $");
#include
#include
@@ -89,6 +89,7 @@
#include
#include
#include
+#include
#include
@@ -593,22 +594,20 @@
switch (com) {
case FIONBIO:
- mutex_enter(&fp->f_lock);
+ /* XXX Code block is not atomic */
if (*(int *)data != 0)
- fp->f_flag |= FNONBLOCK;
+ atomic_or_uint(&fp->f_flag, FNONBLOCK);
else
- fp->f_flag &= ~FNONBLOCK;
- mutex_exit(&fp->f_lock);
+ atomic_and_uint(&fp->f_flag, ~FNONBLOCK);
error = (*fp->f_ops->fo_ioctl)(fp, FIONBIO, data);
break;
case FIOASYNC:
- mutex_enter(&fp->f_lock);
+ /* XXX Code block is not atomic */
if (*(int *)data != 0)
- fp->f_flag |= FASYNC;
+ atomic_or_uint(&fp->f_flag, FASYNC);
else
- fp->f_flag &= ~FASYNC;
- mutex_exit(&fp->f_lock);
+ atomic_and_uint(&fp->f_flag, ~FASYNC);
error = (*fp->f_ops->fo_ioctl)(fp, FIOASYNC, data);
break;
