Re: CVS commit: src/sys
On Sun, Nov 27, 2011 at 12:38:12AM +, Izumi Tsutsui wrote: Log Message: Revert stopcap fix for rump by christos, which causes build failure on most non-x86 ports and seems unnecessary. (caused by wrong rump_namei.h?) Probably not; rump_namei.h only actually contains the namei flags, reprocessed to be prefixed with RUMP_, so it doesn't actually change often except for rcsids; nor is it (I think) visible or used except from/in rump internals. -- David A. Holland dholl...@netbsd.org
Re: CVS commit: src/sys
Revert stopcap fix for rump by christos, which causes build failure on most non-x86 ports and seems unnecessary. (caused by wrong rump_namei.h?) Probably not; rump_namei.h only actually contains the namei flags, reprocessed to be prefixed with RUMP_, so it doesn't actually change often except for rcsids; nor is it (I think) visible or used except from/in rump internals. Anyway, no obvious rump problem in the latest build. http://releng.NetBSD.org/builds/HEAD/20270050Z/ --- Izumi Tsutsui
Re: CVS commit: src/sys
On Mon, Nov 28, 2011 at 03:29:12AM +0900, Izumi Tsutsui wrote: Anyway, no obvious rump problem in the latest build. http://releng.NetBSD.org/builds/HEAD/20270050Z/ The fix was about runtime problems, wasn't it? Martin
CVS commit: src
Module Name:src Committed By: isaki Date: Sun Nov 27 09:00:33 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4/man4.x68k: Makefile src/sys/arch/x68k/conf: GENERIC files.x68k Added Files: src/share/man/man4/man4.x68k: powsw.4 src/sys/arch/x68k/dev: powsw.c Log Message: Add powsw(4) for x68k power switch. It substitutes for a part about power switch handler of pow(4) deleted before. Benefits than pow(4): - separate a front switch (= powsw0) and an EXPWON line (= powsw1) completely. Only powsw0 is enabled in GENERIC by default. - prevent chattering in some hardware individuals. thank you for a report and a test: Yasushi Oshima and Y.Sugahara. To generate a diff of this commit: cvs rdiff -u -r1.1358 -r1.1359 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/man4.x68k/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.x68k/powsw.4 cvs rdiff -u -r1.157 -r1.158 src/sys/arch/x68k/conf/GENERIC cvs rdiff -u -r1.76 -r1.77 src/sys/arch/x68k/conf/files.x68k cvs rdiff -u -r0 -r1.1 src/sys/arch/x68k/dev/powsw.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1358 src/distrib/sets/lists/man/mi:1.1359 --- src/distrib/sets/lists/man/mi:1.1358 Sat Nov 26 15:39:49 2011 +++ src/distrib/sets/lists/man/mi Sun Nov 27 09:00:32 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1358 2011/11/26 15:39:49 tsutsui Exp $ +# $NetBSD: mi,v 1.1359 2011/11/27 09:00:32 isaki Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1826,6 +1826,7 @@ ./usr/share/man/cat4/x68k/mfp.0 man-sys-catman .cat ./usr/share/man/cat4/x68k/neptune.0 man-sys-catman .cat ./usr/share/man/cat4/x68k/pow.0 man-obsolete obsolete +./usr/share/man/cat4/x68k/powsw.0 man-sys-catman .cat ./usr/share/man/cat4/x68k/vs.0 man-sys-catman .cat ./usr/share/man/cat4/x86/amdpcib.0 man-sys-catman .cat ./usr/share/man/cat4/x86/apic.0 man-sys-catman .cat @@ -4592,6 +4593,7 @@ ./usr/share/man/html4/x68k/mfp.html man-sys-htmlman html ./usr/share/man/html4/x68k/neptune.html man-sys-htmlman html ./usr/share/man/html4/x68k/pow.html man-obsolete obsolete +./usr/share/man/html4/x68k/powsw.html man-sys-htmlman html ./usr/share/man/html4/x68k/vs.html man-sys-htmlman html ./usr/share/man/html4/x86/amdpcib.html man-sys-htmlman html ./usr/share/man/html4/x86/apic.html man-sys-htmlman html @@ -7293,6 +7295,7 @@ ./usr/share/man/man4/x68k/mfp.4 man-sys-man .man ./usr/share/man/man4/x68k/neptune.4 man-sys-man .man ./usr/share/man/man4/x68k/pow.4 man-obsolete obsolete +./usr/share/man/man4/x68k/powsw.4 man-sys-man .man ./usr/share/man/man4/x68k/vs.4 man-sys-man .man ./usr/share/man/man4/x86/amdpcib.4 man-sys-man .man ./usr/share/man/man4/x86/apic.4 man-sys-man .man Index: src/share/man/man4/man4.x68k/Makefile diff -u src/share/man/man4/man4.x68k/Makefile:1.8 src/share/man/man4/man4.x68k/Makefile:1.9 --- src/share/man/man4/man4.x68k/Makefile:1.8 Sat Nov 19 12:27:43 2011 +++ src/share/man/man4/man4.x68k/Makefile Sun Nov 27 09:00:33 2011 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2011/11/19 12:27:43 isaki Exp $ +# $NetBSD: Makefile,v 1.9 2011/11/27 09:00:33 isaki Exp $ -MAN= bmd.4 intio.4 intro.4 mfp.4 neptune.4 vs.4 +MAN= bmd.4 intio.4 intro.4 mfp.4 neptune.4 powsw.4 vs.4 MANSUBDIR=/x68k .include bsd.man.mk Index: src/sys/arch/x68k/conf/GENERIC diff -u src/sys/arch/x68k/conf/GENERIC:1.157 src/sys/arch/x68k/conf/GENERIC:1.158 --- src/sys/arch/x68k/conf/GENERIC:1.157 Tue Nov 22 21:25:41 2011 +++ src/sys/arch/x68k/conf/GENERIC Sun Nov 27 09:00:32 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.157 2011/11/22 21:25:41 tls Exp $ +# $NetBSD: GENERIC,v 1.158 2011/11/27 09:00:32 isaki Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/x68k/conf/std.x68k options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.157 $ +#ident GENERIC-$Revision: 1.158 $ maxusers 8 @@ -288,6 +288,9 @@ par0 at intio0 addr 0xe8c000 # Builtin sram0 at intio0 addr 0xed # battery-backuped static RAM pseudo-device bell # OPM bell +powsw0 at mfp0# Front switch +#powsw1 at mfp0# External power switch + xcom0 at mainbus0 # NS16550 fast serial xcom1 at mainbus0 Index: src/sys/arch/x68k/conf/files.x68k diff -u src/sys/arch/x68k/conf/files.x68k:1.76 src/sys/arch/x68k/conf/files.x68k:1.77 --- src/sys/arch/x68k/conf/files.x68k:1.76 Sat Nov 19 12:27:43 2011 +++ src/sys/arch/x68k/conf/files.x68k Sun Nov 27 09:00:32 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.x68k,v 1.76 2011/11/19 12:27:43 isaki Exp $ +# $NetBSD: files.x68k,v 1.77 2011/11/27 09:00:32 isaki Exp $ # # new style config file for x68k architecture # @@ -96,6 +96,10 @@ device kbd: event attach kbd at mfp
CVS commit: src/doc
Module Name:src Committed By: isaki Date: Sun Nov 27 09:04:37 UTC 2011 Modified Files: src/doc: CHANGES Log Message: Note powsw(4) for x68k. To generate a diff of this commit: cvs rdiff -u -r1.1633 -r1.1634 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.1633 src/doc/CHANGES:1.1634 --- src/doc/CHANGES:1.1633 Thu Nov 24 18:54:19 2011 +++ src/doc/CHANGES Sun Nov 27 09:04:37 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1633 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1634 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1178,3 +1178,4 @@ Changes from NetBSD 5.0 to NetBSD 6.0: audio: Audio drivers are now MP-safe. [jmcneill 2023] xbdback(4): driver is now MP-SAFE. [jym 2023] resolvconf(8): import openresolv-3.4.5 [roy 2024] + x68k: Add powsw(4), a revised power switch driver [isaki 2027]
CVS commit: src/sys/arch/i386/stand/misc
Module Name:src Committed By: martin Date: Sun Nov 27 09:24:35 UTC 2011 Modified Files: src/sys/arch/i386/stand/misc: rawr32.exe.uue Log Message: New Rawrite32 release is out. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/stand/misc/rawr32.exe.uue 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: src/sys/sys
Module Name:src Committed By: martin Date: Sun Nov 27 10:31:13 UTC 2011 Modified Files: src/sys/sys: systm.h Log Message: If not kernel, include stdbool.h To generate a diff of this commit: cvs rdiff -u -r1.254 -r1.255 src/sys/sys/systm.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/systm.h diff -u src/sys/sys/systm.h:1.254 src/sys/sys/systm.h:1.255 --- src/sys/sys/systm.h:1.254 Sun Nov 27 03:52:38 2011 +++ src/sys/sys/systm.h Sun Nov 27 10:31:12 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: systm.h,v 1.254 2011/11/27 03:52:38 jakllsch Exp $ */ +/* $NetBSD: systm.h,v 1.255 2011/11/27 10:31:12 martin Exp $ */ /*- * Copyright (c) 1982, 1988, 1991, 1993 @@ -43,6 +43,9 @@ #include opt_ddb.h #include opt_multiprocessor.h #endif +#ifndef _KERNEL +#include stdbool.h +#endif #include machine/endian.h
CVS commit: src/sys/dist/ipf/netinet
Module Name:src Committed By: mbalmer Date: Sun Nov 27 10:53:08 UTC 2011 Modified Files: src/sys/dist/ipf/netinet: ip_nat.c Log Message: Typo. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/dist/ipf/netinet/ip_nat.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/dist/ipf/netinet/ip_nat.c diff -u src/sys/dist/ipf/netinet/ip_nat.c:1.43 src/sys/dist/ipf/netinet/ip_nat.c:1.44 --- src/sys/dist/ipf/netinet/ip_nat.c:1.43 Sat Feb 12 21:23:31 2011 +++ src/sys/dist/ipf/netinet/ip_nat.c Sun Nov 27 10:53:07 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_nat.c,v 1.43 2011/02/12 21:23:31 christos Exp $ */ +/* $NetBSD: ip_nat.c,v 1.44 2011/11/27 10:53:07 mbalmer Exp $ */ /* * Copyright (C) 1995-2003 by Darren Reed. @@ -120,7 +120,7 @@ extern struct ifnet vpnif; #if !defined(lint) #if defined(__NetBSD__) #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ip_nat.c,v 1.43 2011/02/12 21:23:31 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: ip_nat.c,v 1.44 2011/11/27 10:53:07 mbalmer Exp $); #else static const char sccsid[] = @(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed; static const char rcsid[] = @(#)Id: ip_nat.c,v 2.195.2.130 2010/03/16 02:24:52 darrenr Exp; @@ -4660,7 +4660,7 @@ int icmptype; * does not keep track of the icmptype, and a single NAT structure * is used for all icmp types with the same src, dest and id, we * simply define the replies as queries as well. The funny thing is, - * altough it seems silly to call a reply a query, this is exactly + * although it seems silly to call a reply a query, this is exactly * as it is defined in the IPv4 specification */
CVS commit: src/sys/sys
Module Name:src Committed By: martin Date: Sun Nov 27 11:07:22 UTC 2011 Modified Files: src/sys/sys: systm.h Log Message: No stdbool.h if _STANDALONE To generate a diff of this commit: cvs rdiff -u -r1.255 -r1.256 src/sys/sys/systm.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/systm.h diff -u src/sys/sys/systm.h:1.255 src/sys/sys/systm.h:1.256 --- src/sys/sys/systm.h:1.255 Sun Nov 27 10:31:12 2011 +++ src/sys/sys/systm.h Sun Nov 27 11:07:21 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: systm.h,v 1.255 2011/11/27 10:31:12 martin Exp $ */ +/* $NetBSD: systm.h,v 1.256 2011/11/27 11:07:21 martin Exp $ */ /*- * Copyright (c) 1982, 1988, 1991, 1993 @@ -43,7 +43,7 @@ #include opt_ddb.h #include opt_multiprocessor.h #endif -#ifndef _KERNEL +#if !defined(_KERNEL) !defined(_STANDALONE) #include stdbool.h #endif
CVS commit: src/usr.bin/quota
Module Name:src
Committed By: dholland
Date: Sun Nov 27 13:23:50 UTC 2011
Modified Files:
src/usr.bin/quota: quota.c
Log Message:
The proper type for a variable that can be either a uid or gid is id_t,
not uint32_t.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/quota/quota.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/quota/quota.c
diff -u src/usr.bin/quota/quota.c:1.38 src/usr.bin/quota/quota.c:1.39
--- src/usr.bin/quota/quota.c:1.38 Fri Nov 25 16:55:05 2011
+++ src/usr.bin/quota/quota.c Sun Nov 27 13:23:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: quota.c,v 1.38 2011/11/25 16:55:05 dholland Exp $ */
+/* $NetBSD: quota.c,v 1.39 2011/11/27 13:23:50 dholland Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = @(#)quota.c 8.4 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: quota.c,v 1.38 2011/11/25 16:55:05 dholland Exp $);
+__RCSID($NetBSD: quota.c,v 1.39 2011/11/27 13:23:50 dholland Exp $);
#endif
#endif /* not lint */
@@ -85,11 +85,11 @@ struct quotause {
#define FOUND 0x01
#define QUOTA2 0x02
-static struct quotause *getprivs(uint32_t, int);
-static void heading(int, uint32_t, const char *, const char *);
+static struct quotause *getprivs(id_t, int);
+static void heading(int, id_t, const char *, const char *);
static void showgid(gid_t);
static void showgrpname(const char *);
-static void showquotas(int, uint32_t, const char *);
+static void showquotas(int, id_t, const char *);
static void showuid(uid_t);
static void showusrname(const char *);
static void usage(void) __attribute__((__noreturn__));
@@ -314,7 +314,7 @@ showgrpname(const char *name)
}
static void
-showquotas(int type, uint32_t id, const char *name)
+showquotas(int type, id_t id, const char *name)
{
struct quotause *qup;
struct quotause *quplist;
@@ -435,7 +435,7 @@ showquotas(int type, uint32_t id, const
}
static void
-heading(int type, uint32_t id, const char *name, const char *tag)
+heading(int type, id_t id, const char *name, const char *tag)
{
if (dflag)
printf(Default %s disk quotas: %s\n,
@@ -464,7 +464,7 @@ heading(int type, uint32_t id, const cha
* Collect the requested quota information.
*/
static struct quotause *
-getprivs(uint32_t id, int quotatype)
+getprivs(id_t id, int quotatype)
{
struct quotause *qup, *quptail;
struct quotause *quphead;
CVS commit: src/usr.bin/quota
Module Name:src Committed By: dholland Date: Sun Nov 27 13:24:32 UTC 2011 Modified Files: src/usr.bin/quota: quota.c Log Message: Use __dead, not attribute noreturn. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/usr.bin/quota/quota.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/quota/quota.c diff -u src/usr.bin/quota/quota.c:1.39 src/usr.bin/quota/quota.c:1.40 --- src/usr.bin/quota/quota.c:1.39 Sun Nov 27 13:23:50 2011 +++ src/usr.bin/quota/quota.c Sun Nov 27 13:24:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: quota.c,v 1.39 2011/11/27 13:23:50 dholland Exp $ */ +/* $NetBSD: quota.c,v 1.40 2011/11/27 13:24:32 dholland Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19 #if 0 static char sccsid[] = @(#)quota.c 8.4 (Berkeley) 4/28/95; #else -__RCSID($NetBSD: quota.c,v 1.39 2011/11/27 13:23:50 dholland Exp $); +__RCSID($NetBSD: quota.c,v 1.40 2011/11/27 13:24:32 dholland Exp $); #endif #endif /* not lint */ @@ -92,7 +92,7 @@ static void showgrpname(const char *); static void showquotas(int, id_t, const char *); static void showuid(uid_t); static void showusrname(const char *); -static void usage(void) __attribute__((__noreturn__)); +static void usage(void) __dead; static int qflag = 0; static int vflag = 0;
CVS commit: src/sys/dev
Module Name:src
Committed By: rmind
Date: Sun Nov 27 14:36:21 UTC 2011
Modified Files:
src/sys/dev/ic: sl811hs.c
src/sys/dev/pcmcia: slhci_pcmcia.c
src/sys/dev/usb: usbdi.h
Log Message:
G/C unnecessary IPL_HARDUSB
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/sl811hs.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pcmcia/slhci_pcmcia.c
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/usb/usbdi.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/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.30 src/sys/dev/ic/sl811hs.c:1.31
--- src/sys/dev/ic/sl811hs.c:1.30 Mon Oct 17 13:06:08 2011
+++ src/sys/dev/ic/sl811hs.c Sun Nov 27 14:36:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.30 2011/10/17 13:06:08 isaki Exp $ */
+/* $NetBSD: sl811hs.c,v 1.31 2011/11/27 14:36:20 rmind Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -84,7 +84,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sl811hs.c,v 1.30 2011/10/17 13:06:08 isaki Exp $);
+__KERNEL_RCSID(0, $NetBSD: sl811hs.c,v 1.31 2011/11/27 14:36:20 rmind Exp $);
#include opt_slhci.h
@@ -881,9 +881,9 @@ slhci_transfer(struct usbd_xfer *xfer)
* so start it first.
*/
- /* Start next is always done at splsoftusb, so we do this here so
+ /* Start next is always done at splusb, so we do this here so
* start functions are always called at softusb. XXX */
- s = splsoftusb();
+ s = splusb();
error = xfer-pipe-methods-start(SIMPLEQ_FIRST(xfer-pipe-queue));
splx(s);
@@ -1269,7 +1269,7 @@ slhci_abort(struct usbd_xfer *xfer)
callback:
xfer-status = USBD_CANCELLED;
- /* Abort happens at splsoftusb. */
+ /* Abort happens at splusb. */
usb_transfer_complete(xfer);
}
@@ -1382,7 +1382,7 @@ slhci_lock_call(struct slhci_softc *sc,
usbd_status ret;
int x, s;
- x = splsoftusb();
+ x = splusb();
s = splhardusb();
simple_lock(sc-sc_lock);
ret = (*lcf)(sc, spipe, xfer);
@@ -1431,7 +1431,7 @@ slhci_callback_entry(void *arg)
sc = (struct slhci_softc *)arg;
- x = splsoftusb();
+ x = splusb();
s = splhardusb();
simple_lock(sc-sc_lock);
t = sc-sc_transfers;
@@ -2328,8 +2328,8 @@ slhci_dotransfer(struct slhci_softc *sc)
}
}
-/* slhci_callback is called after the lock is taken from splsoftusb.
- * s is pointer to old spl (splsoftusb). */
+/* slhci_callback is called after the lock is taken from splusb.
+ * s is pointer to old spl (splusb). */
static void
slhci_callback(struct slhci_softc *sc, int *s)
{
@@ -2495,7 +2495,7 @@ slhci_do_callback_schedule(struct slhci_
}
#if 0
-/* must be called with lock taken from splsoftusb */
+/* must be called with lock taken from splusb */
/* XXX static */ void
slhci_pollxfer(struct slhci_softc *sc, struct usbd_xfer *xfer, int *s)
{
Index: src/sys/dev/pcmcia/slhci_pcmcia.c
diff -u src/sys/dev/pcmcia/slhci_pcmcia.c:1.8 src/sys/dev/pcmcia/slhci_pcmcia.c:1.9
--- src/sys/dev/pcmcia/slhci_pcmcia.c:1.8 Tue Mar 8 04:58:21 2011
+++ src/sys/dev/pcmcia/slhci_pcmcia.c Sun Nov 27 14:36:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: slhci_pcmcia.c,v 1.8 2011/03/08 04:58:21 kiyohara Exp $ */
+/* $NetBSD: slhci_pcmcia.c,v 1.9 2011/11/27 14:36:20 rmind Exp $ */
/*
* Not (c) 2007 Matthew Orgass
* This file is public domain, meaning anyone can make any use of part or all
@@ -11,7 +11,7 @@
/* Glue for RATOC USB HOST CF+ Card (SL811HS chip) */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: slhci_pcmcia.c,v 1.8 2011/03/08 04:58:21 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: slhci_pcmcia.c,v 1.9 2011/11/27 14:36:20 rmind Exp $);
#include sys/param.h
#include sys/device.h
@@ -140,7 +140,7 @@ slhci_pcmcia_enable(struct slhci_pcmcia_
*/
slhci_preinit(sc, NULL, pioh-iot, pioh-ioh, 100, 2);
- psc-sc_ih = pcmcia_intr_establish(pf, IPL_HARDUSB,
+ psc-sc_ih = pcmcia_intr_establish(pf, IPL_USB,
slhci_intr, sc);
if (psc-sc_ih == NULL) {
Index: src/sys/dev/usb/usbdi.h
diff -u src/sys/dev/usb/usbdi.h:1.79 src/sys/dev/usb/usbdi.h:1.80
--- src/sys/dev/usb/usbdi.h:1.79 Fri Sep 4 17:53:12 2009
+++ src/sys/dev/usb/usbdi.h Sun Nov 27 14:36:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.h,v 1.79 2009/09/04 17:53:12 dyoung Exp $ */
+/* $NetBSD: usbdi.h,v 1.80 2011/11/27 14:36:21 rmind Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */
/*
@@ -273,13 +273,9 @@ struct usbif_attach_arg {
/* No match */
#define UMATCH_NONE 0
-/* XXX Perhaps USB should have its own levels? */
#define splusb splsoftnet
#define splhardusb splbio
#define IPL_USB IPL_BIO
-#define splsoftusb splusb
#define IPL_SOFTUSB IPL_SOFTNET
-#define IPL_HARDUSB IPL_USB
-
#endif /* _USBDI_H_ */
CVS commit: src/sys/net
Module Name:src Committed By: jakllsch Date: Sun Nov 27 14:55:57 UTC 2011 Modified Files: src/sys/net: if.c Log Message: We need a cv_destroy() here too. Fixes LOCKDEBUG panic on interface detachment. To generate a diff of this commit: cvs rdiff -u -r1.257 -r1.258 src/sys/net/if.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.c diff -u src/sys/net/if.c:1.257 src/sys/net/if.c:1.258 --- src/sys/net/if.c:1.257 Wed Nov 16 06:09:37 2011 +++ src/sys/net/if.c Sun Nov 27 14:55:57 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if.c,v 1.257 2011/11/16 06:09:37 dyoung Exp $ */ +/* $NetBSD: if.c,v 1.258 2011/11/27 14:55:57 jakllsch Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc. @@ -90,7 +90,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if.c,v 1.257 2011/11/16 06:09:37 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: if.c,v 1.258 2011/11/27 14:55:57 jakllsch Exp $); #include opt_inet.h @@ -1954,6 +1954,7 @@ ifioctl_detach(struct ifnet *ifp) ifp-if_ioctl_lock = NULL; percpu_free(il-il_nenter, sizeof(uint64_t)); il-il_nenter = NULL; + cv_destroy(il-il_emptied); mutex_destroy(il-il_lock); kmem_free(il, sizeof(*il)); }
CVS commit: xsrc/external/mit/xf86-input-mouse/dist/src
Module Name:xsrc
Committed By: tsutsui
Date: Sun Nov 27 15:12:16 UTC 2011
Modified Files:
xsrc/external/mit/xf86-input-mouse/dist/src: mouse.c pnp.c
Log Message:
Fix -Wshadow. (should be committed before
src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile rev 1.5. Sorry)
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xf86-input-mouse/dist/src/pnp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
diff -u xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.13 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.14
--- xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.13 Sun Jul 24 00:42:42 2011
+++ xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c Sun Nov 27 15:12:16 2011
@@ -273,7 +273,7 @@ MouseCommonOptions(InputInfoPtr pInfo)
MessageType buttons_from = X_CONFIG;
char *s;
int origButtons;
-int i;
+int btn;
pMse = pInfo-private;
@@ -583,8 +583,8 @@ MouseCommonOptions(InputInfoPtr pInfo)
free(s);
}
/* get maximum of mapped buttons */
-for (i = pMse-buttons-1; i = 0; i--) {
- int f = ffs (pMse-buttonMap[i]);
+for (btn = pMse-buttons-1; btn = 0; btn--) {
+ int f = ffs (pMse-buttonMap[btn]);
if (f pMse-buttons)
pMse-buttons = f;
}
@@ -3487,21 +3487,21 @@ autoProbeMouse(InputInfoPtr pInfo, Bool
}
case AUTOPROBE_SWITCH_PROTOCOL:
{
- MouseProtocolID proto;
+ MouseProtocolID protoid;
void *defaults;
AP_DBG((State SWITCH_PROTOCOL\n));
- proto = mPriv-protoList[mPriv-protocolID++];
- if (proto == PROT_UNKNOWN)
+ protoid = mPriv-protoList[mPriv-protocolID++];
+ if (protoid == PROT_UNKNOWN)
mPriv-autoState = AUTOPROBE_SWITCHSERIAL;
- else if (!(defaults = GetProtocol(proto)-defaults)
+ else if (!(defaults = GetProtocol(protoid)-defaults)
|| (mPriv-serialDefaultsNum == -1
(defaults == msDefaults))
|| (mPriv-serialDefaultsNum != -1
serialDefaultsList[mPriv-serialDefaultsNum]
== defaults)) {
AP_DBG((Changing Protocol to %s\n,
- ProtocolIDToName(proto)));
- SetMouseProto(pMse,proto);
+ ProtocolIDToName(protoid)));
+ SetMouseProto(pMse,protoid);
FlushButtons(pMse);
RESET_VALIDATION;
mPriv-autoState = AUTOPROBE_VALIDATE2;
Index: xsrc/external/mit/xf86-input-mouse/dist/src/pnp.c
diff -u xsrc/external/mit/xf86-input-mouse/dist/src/pnp.c:1.1.1.4 xsrc/external/mit/xf86-input-mouse/dist/src/pnp.c:1.2
--- xsrc/external/mit/xf86-input-mouse/dist/src/pnp.c:1.1.1.4 Sun Jul 24 00:38:36 2011
+++ xsrc/external/mit/xf86-input-mouse/dist/src/pnp.c Sun Nov 27 15:12:16 2011
@@ -708,8 +708,8 @@ probePs2ProtocolPnP(InputInfoPtr pInfo)
u = ps2GetDeviceID(pInfo);
if (u == 0x03) {
/* found IntelliMouse now try IntelliExplorer */
- unsigned char seq[] = { 243, 200, 243, 200, 243, 80 };
- if (ps2SendPacket(pInfo,seq,sizeof(seq))) {
+ unsigned char seqi[] = { 243, 200, 243, 200, 243, 80 };
+ if (ps2SendPacket(pInfo,seqi,sizeof(seqi))) {
u = ps2GetDeviceID(pInfo);
if (u == 0x04)
ret = PROT_EXPPS2;
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jakllsch Date: Sun Nov 27 15:28:26 UTC 2011 Modified Files: src/sys/dev/ic: com.c Log Message: whitespace consistency adjustment To generate a diff of this commit: cvs rdiff -u -r1.301 -r1.302 src/sys/dev/ic/com.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/com.c diff -u src/sys/dev/ic/com.c:1.301 src/sys/dev/ic/com.c:1.302 --- src/sys/dev/ic/com.c:1.301 Sat May 28 19:30:19 2011 +++ src/sys/dev/ic/com.c Sun Nov 27 15:28:26 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com.c,v 1.301 2011/05/28 19:30:19 matt Exp $ */ +/* $NetBSD: com.c,v 1.302 2011/11/27 15:28:26 jakllsch Exp $ */ /*- * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: com.c,v 1.301 2011/05/28 19:30:19 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: com.c,v 1.302 2011/11/27 15:28:26 jakllsch Exp $); #include opt_com.h #include opt_ddb.h @@ -183,7 +183,7 @@ void comcnputc(dev_t, int); void comcnpollc(dev_t, int); #define integrate static inline -void comsoft(void *); +void comsoft(void *); integrate void com_rxsoft(struct com_softc *, struct tty *); integrate void com_txsoft(struct com_softc *, struct tty *); integrate void com_stsoft(struct com_softc *, struct tty *); @@ -424,12 +424,12 @@ com_attach_subr(struct com_softc *sc) SET(sc-sc_hwflags, COM_HW_FIFO); goto fifodelay; - case COM_TYPE_OMAP: - sc-sc_fifolen = 64; - fifo_msg = OMAP UART, working fifo; - SET(sc-sc_hwflags, COM_HW_FIFO); - goto fifodelay; - } + case COM_TYPE_OMAP: + sc-sc_fifolen = 64; + fifo_msg = OMAP UART, working fifo; + SET(sc-sc_hwflags, COM_HW_FIFO); + goto fifodelay; + } sc-sc_fifolen = 1; /* look for a NS 16550AF UART with FIFOs */
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: jakllsch
Date: Sun Nov 27 18:17:08 UTC 2011
Modified Files:
src/sys/dev/ic: com.c
Log Message:
more whitespace and comment spelling fixes
To generate a diff of this commit:
cvs rdiff -u -r1.302 -r1.303 src/sys/dev/ic/com.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/com.c
diff -u src/sys/dev/ic/com.c:1.302 src/sys/dev/ic/com.c:1.303
--- src/sys/dev/ic/com.c:1.302 Sun Nov 27 15:28:26 2011
+++ src/sys/dev/ic/com.c Sun Nov 27 18:17:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.302 2011/11/27 15:28:26 jakllsch Exp $ */
+/* $NetBSD: com.c,v 1.303 2011/11/27 18:17:08 jakllsch Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: com.c,v 1.302 2011/11/27 15:28:26 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: com.c,v 1.303 2011/11/27 18:17:08 jakllsch Exp $);
#include opt_com.h
#include opt_ddb.h
@@ -641,7 +641,7 @@ com_detach(device_t self, int flags)
if (ISSET(sc-sc_hwflags, COM_HW_KGDB))
return EBUSY;
-if (ISSET(sc-sc_hwflags, COM_HW_CONSOLE)
+ if (ISSET(sc-sc_hwflags, COM_HW_CONSOLE)
(flags DETACH_SHUTDOWN) != 0)
return EBUSY;
@@ -650,7 +650,7 @@ com_detach(device_t self, int flags)
sc-enabled = 0;
}
-if (ISSET(sc-sc_hwflags, COM_HW_CONSOLE)) {
+ if (ISSET(sc-sc_hwflags, COM_HW_CONSOLE)) {
comconsattached = 0;
cn_tab = NULL;
}
@@ -2012,7 +2012,7 @@ again: do {
/*
* Since some device (e.g., ST16C1550) doesn't clear IIR_TXRDY
* by IIR read, so we can't do this way: `process all interrupts,
- * then do TX if possble'.
+ * then do TX if possible'.
*/
(iir IIR_IMASK) != IIR_TXRDY);
CVS commit: src/sys/arch/usermode/conf
Module Name:src Committed By: reinoud Date: Sun Nov 27 20:06:26 UTC 2011 Modified Files: src/sys/arch/usermode/conf: std.usermode Log Message: Compile in syscall name table so urkel debugging code can print out the names of the system calls so its more clear where it strands.` To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/usermode/conf/std.usermode 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/usermode/conf/std.usermode diff -u src/sys/arch/usermode/conf/std.usermode:1.6 src/sys/arch/usermode/conf/std.usermode:1.7 --- src/sys/arch/usermode/conf/std.usermode:1.6 Sat Sep 3 12:28:45 2011 +++ src/sys/arch/usermode/conf/std.usermode Sun Nov 27 20:06:26 2011 @@ -1,4 +1,4 @@ -# $NetBSD: std.usermode,v 1.6 2011/09/03 12:28:45 jmcneill Exp $ +# $NetBSD: std.usermode,v 1.7 2011/11/27 20:06:26 reinoud Exp $ machine usermode include conf/std @@ -13,6 +13,7 @@ options URKELVISOR # Defaults options NKMEMPAGES=2048 #options NKMEMPAGES_MAX_DEFAULT=2048 +options syscall_debug defflag opt_xen.h DO_NOT_DEFINE defflag opt_kernbase.h DO_NOT_DEFINE2
CVS commit: src/sys/arch/usermode/dev
Module Name:src
Committed By: reinoud
Date: Sun Nov 27 20:08:23 UTC 2011
Modified Files:
src/sys/arch/usermode/dev: ld_thunkbus.c
Log Message:
Implement the choice between using AIO or not.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/usermode/dev/ld_thunkbus.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/usermode/dev/ld_thunkbus.c
diff -u src/sys/arch/usermode/dev/ld_thunkbus.c:1.16 src/sys/arch/usermode/dev/ld_thunkbus.c:1.17
--- src/sys/arch/usermode/dev/ld_thunkbus.c:1.16 Fri Sep 16 16:30:51 2011
+++ src/sys/arch/usermode/dev/ld_thunkbus.c Sun Nov 27 20:08:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_thunkbus.c,v 1.16 2011/09/16 16:30:51 reinoud Exp $ */
+/* $NetBSD: ld_thunkbus.c,v 1.17 2011/11/27 20:08:23 reinoud Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ld_thunkbus.c,v 1.16 2011/09/16 16:30:51 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: ld_thunkbus.c,v 1.17 2011/11/27 20:08:23 reinoud Exp $);
#include sys/param.h
#include sys/proc.h
@@ -50,8 +50,12 @@ static int ld_thunkbus_ldstart(struct ld
static int ld_thunkbus_lddump(struct ld_softc *, void *, int, int);
static int ld_thunkbus_ldflush(struct ld_softc *, int);
+//#define LD_USE_AIO
+
+#ifdef LD_USE_AIO
static void ld_thunkbus_sig(int, siginfo_t *, void *);
-static void ld_thunkbus_complete(void *);
+#endif
+static void ld_thunkbus_complete(void *arg);
struct ld_thunkbus_softc;
@@ -92,7 +96,6 @@ ld_thunkbus_attach(device_t parent, devi
struct ld_softc *ld = sc-sc_ld;
struct thunkbus_attach_args *taa = opaque;
const char *path = taa-u.diskimage.path;
- struct sigaction sa;
ssize_t size, blksize;
ld-sc_dv = self;
@@ -122,18 +125,23 @@ ld_thunkbus_attach(device_t parent, devi
sc-sc_ih = softint_establish(SOFTINT_BIO,
ld_thunkbus_complete, sc);
+#ifdef LD_USE_AIO
+ struct sigaction sa;
+
sa.sa_flags = SA_RESTART | SA_SIGINFO;
sa.sa_sigaction = ld_thunkbus_sig;
thunk_sigemptyset(sa.sa_mask);
// thunk_sigaddset(sa.sa_mask, SIGALRM);
if (thunk_sigaction(SIGIO, sa, NULL) == -1)
panic(couldn't register SIGIO handler: %d, thunk_geterrno());
+#endif
sc-busy = false;
ldattach(ld);
}
+#ifdef LD_USE_AIO
static void
ld_thunkbus_sig(int sig, siginfo_t *info, void *ctx)
{
@@ -155,32 +163,7 @@ ld_thunkbus_sig(int sig, siginfo_t *info
curcpu()-ci_idepth--;
}
-
-static void
-ld_thunkbus_complete(void *arg)
-{
- struct ld_thunkbus_softc *sc = arg;
- struct ld_thunkbus_transfer *tt = sc-sc_tt;
- struct buf *bp = tt-tt_bp;
-
- if (!sc-busy)
- panic(%s: but not busy?\n, __func__);
-
- if (thunk_aio_error(tt-tt_aio) == 0
- thunk_aio_return(tt-tt_aio) != -1) {
- bp-b_resid = 0;
- } else {
- bp-b_error = thunk_geterrno();
- bp-b_resid = bp-b_bcount;
- }
-
- dprintf_debug(\tfin\n);
- if (bp-b_error)
- dprintf_debug(error!\n);
-
- sc-busy = false;
- lddone(sc-sc_ld, bp);
-}
+#endif
static int
ld_thunkbus_ldstart(struct ld_softc *ld, struct buf *bp)
@@ -200,7 +183,7 @@ ld_thunkbus_ldstart(struct ld_softc *ld,
tt-tt_aio.aio_sigevent.sigev_notify = SIGEV_SIGNAL;
tt-tt_aio.aio_sigevent.sigev_signo = SIGIO;
tt-tt_aio.aio_sigevent.sigev_value.sival_ptr = tt;
-
+#ifdef LD_USE_AIO
#if 0
device_printf(sc-sc_ld.sc_dv, %s addr %p, off=%lld, count=%lld\n,
(bp-b_flags B_READ) ? rd : wr,
@@ -216,10 +199,60 @@ ld_thunkbus_ldstart(struct ld_softc *ld,
error = thunk_aio_read(tt-tt_aio);
else
error = thunk_aio_write(tt-tt_aio);
-
+#else
+ /* let the softint do the work */
+ spl_intr(IPL_BIO, softint_schedule, sc-sc_ih);
+ sc-busy = true;
+ error = 0;
+#endif
return error == -1 ? thunk_geterrno() : 0;
}
+static void
+ld_thunkbus_complete(void *arg)
+{
+ struct ld_thunkbus_softc *sc = arg;
+ struct ld_thunkbus_transfer *tt = sc-sc_tt;
+ struct buf *bp = tt-tt_bp;
+
+ if (!sc-busy)
+ panic(%s: but not busy?\n, __func__);
+
+#ifdef LD_USE_AIO
+ if (thunk_aio_error(tt-tt_aio) == 0
+ thunk_aio_return(tt-tt_aio) != -1) {
+ bp-b_resid = 0;
+ } else {
+ bp-b_error = thunk_geterrno();
+ bp-b_resid = bp-b_bcount;
+ }
+#else
+ size_t ret;
+ off_t offset = tt-tt_aio.aio_offset;
+
+ /* read/write the request */
+ if (bp-b_flags B_READ)
+ ret = thunk_pread(sc-sc_fd, bp-b_data, bp-b_bcount, offset);
+ else
+ ret = thunk_pwrite(sc-sc_fd, bp-b_data, bp-b_bcount, offset);
+
+ /* setup return params */
+ if ((ret = 0) (ret == bp-b_bcount)) {
+ bp-b_resid = 0;
+ } else {
+ bp-b_error = thunk_geterrno();
+ bp-b_resid = bp-b_bcount;
+ }
+#endif
+
+ dprintf_debug(\tfin\n);
+ if (bp-b_error)
+ dprintf_debug(error!\n);
+
+ sc-busy = false;
+ lddone(sc-sc_ld, bp);
+}
+
static int
ld_thunkbus_lddump(struct ld_softc *ld, void *data, int blkno, int blkcnt)
{
CVS commit: src/sys/arch/usermode/dev
Module Name:src Committed By: reinoud Date: Sun Nov 27 20:57:28 UTC 2011 Modified Files: src/sys/arch/usermode/dev: ld_thunkbus.c Log Message: Fix in-code declaration of the sigaction structure. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/usermode/dev/ld_thunkbus.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/usermode/dev/ld_thunkbus.c diff -u src/sys/arch/usermode/dev/ld_thunkbus.c:1.17 src/sys/arch/usermode/dev/ld_thunkbus.c:1.18 --- src/sys/arch/usermode/dev/ld_thunkbus.c:1.17 Sun Nov 27 20:08:23 2011 +++ src/sys/arch/usermode/dev/ld_thunkbus.c Sun Nov 27 20:57:28 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ld_thunkbus.c,v 1.17 2011/11/27 20:08:23 reinoud Exp $ */ +/* $NetBSD: ld_thunkbus.c,v 1.18 2011/11/27 20:57:28 reinoud Exp $ */ /*- * Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ld_thunkbus.c,v 1.17 2011/11/27 20:08:23 reinoud Exp $); +__KERNEL_RCSID(0, $NetBSD: ld_thunkbus.c,v 1.18 2011/11/27 20:57:28 reinoud Exp $); #include sys/param.h #include sys/proc.h @@ -95,6 +95,9 @@ ld_thunkbus_attach(device_t parent, devi struct ld_thunkbus_softc *sc = device_private(self); struct ld_softc *ld = sc-sc_ld; struct thunkbus_attach_args *taa = opaque; +#ifdef LD_USE_AIO + struct sigaction sa; +#endif const char *path = taa-u.diskimage.path; ssize_t size, blksize; @@ -126,8 +129,6 @@ ld_thunkbus_attach(device_t parent, devi ld_thunkbus_complete, sc); #ifdef LD_USE_AIO - struct sigaction sa; - sa.sa_flags = SA_RESTART | SA_SIGINFO; sa.sa_sigaction = ld_thunkbus_sig; thunk_sigemptyset(sa.sa_mask);
CVS commit: src/sys/arch/usermode/dev
Module Name:src Committed By: reinoud Date: Sun Nov 27 21:22:28 UTC 2011 Modified Files: src/sys/arch/usermode/dev: ld_thunkbus.c Log Message: Use AIO by default To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/usermode/dev/ld_thunkbus.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/usermode/dev/ld_thunkbus.c diff -u src/sys/arch/usermode/dev/ld_thunkbus.c:1.18 src/sys/arch/usermode/dev/ld_thunkbus.c:1.19 --- src/sys/arch/usermode/dev/ld_thunkbus.c:1.18 Sun Nov 27 20:57:28 2011 +++ src/sys/arch/usermode/dev/ld_thunkbus.c Sun Nov 27 21:22:28 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ld_thunkbus.c,v 1.18 2011/11/27 20:57:28 reinoud Exp $ */ +/* $NetBSD: ld_thunkbus.c,v 1.19 2011/11/27 21:22:28 reinoud Exp $ */ /*- * Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ld_thunkbus.c,v 1.18 2011/11/27 20:57:28 reinoud Exp $); +__KERNEL_RCSID(0, $NetBSD: ld_thunkbus.c,v 1.19 2011/11/27 21:22:28 reinoud Exp $); #include sys/param.h #include sys/proc.h @@ -50,7 +50,7 @@ static int ld_thunkbus_ldstart(struct ld static int ld_thunkbus_lddump(struct ld_softc *, void *, int, int); static int ld_thunkbus_ldflush(struct ld_softc *, int); -//#define LD_USE_AIO +#define LD_USE_AIO #ifdef LD_USE_AIO static void ld_thunkbus_sig(int, siginfo_t *, void *);
CVS commit: src/sys/arch/usermode
Module Name:src
Committed By: reinoud
Date: Sun Nov 27 21:23:47 UTC 2011
Modified Files:
src/sys/arch/usermode/include: thunk.h
src/sys/arch/usermode/usermode: thunk.c
Log Message:
Add thunk_sigprocmask()
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/usermode/include/thunk.h
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/usermode/usermode/thunk.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/usermode/include/thunk.h
diff -u src/sys/arch/usermode/include/thunk.h:1.34 src/sys/arch/usermode/include/thunk.h:1.35
--- src/sys/arch/usermode/include/thunk.h:1.34 Thu Sep 15 12:23:51 2011
+++ src/sys/arch/usermode/include/thunk.h Sun Nov 27 21:23:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: thunk.h,v 1.34 2011/09/15 12:23:51 reinoud Exp $ */
+/* $NetBSD: thunk.h,v 1.35 2011/11/27 21:23:46 reinoud Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -112,6 +112,7 @@ int thunk_sigblock(int);
int thunk_sigunblock(int);
int thunk_sigemptyset(sigset_t *sa_mask);
void thunk_sigaddset(sigset_t *sa_mask, int sig);
+int thunk_sigprocmask(int how, const sigset_t * set, sigset_t *oset);
int thunk_atexit(void (*function)(void));
int thunk_aio_read(struct aiocb *);
Index: src/sys/arch/usermode/usermode/thunk.c
diff -u src/sys/arch/usermode/usermode/thunk.c:1.39 src/sys/arch/usermode/usermode/thunk.c:1.40
--- src/sys/arch/usermode/usermode/thunk.c:1.39 Thu Sep 15 20:25:23 2011
+++ src/sys/arch/usermode/usermode/thunk.c Sun Nov 27 21:23:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: thunk.c,v 1.39 2011/09/15 20:25:23 reinoud Exp $ */
+/* $NetBSD: thunk.c,v 1.40 2011/11/27 21:23:47 reinoud Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifdef __NetBSD__
-__RCSID($NetBSD: thunk.c,v 1.39 2011/09/15 20:25:23 reinoud Exp $);
+__RCSID($NetBSD: thunk.c,v 1.40 2011/11/27 21:23:47 reinoud Exp $);
#endif
#include sys/types.h
@@ -449,6 +449,12 @@ thunk_sigaddset(sigset_t *sa_mask, int s
}
int
+thunk_sigprocmask(int how, const sigset_t * set, sigset_t *oset)
+{
+ return sigprocmask(how, set, oset);
+}
+
+int
thunk_atexit(void (*function)(void))
{
return atexit(function);
CVS commit: src/sys/arch/usermode/conf
Module Name:src Committed By: reinoud Date: Sun Nov 27 21:31:48 UTC 2011 Modified Files: src/sys/arch/usermode/conf: GENERIC Log Message: Add some config settings as default and make a note that DDB is far from working yet :-/ To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/usermode/conf/GENERIC 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/usermode/conf/GENERIC diff -u src/sys/arch/usermode/conf/GENERIC:1.19 src/sys/arch/usermode/conf/GENERIC:1.20 --- src/sys/arch/usermode/conf/GENERIC:1.19 Fri Sep 16 16:29:47 2011 +++ src/sys/arch/usermode/conf/GENERIC Sun Nov 27 21:31:48 2011 @@ -1,9 +1,9 @@ -# $NetBSD: GENERIC,v 1.19 2011/09/16 16:29:47 reinoud Exp $ +# $NetBSD: GENERIC,v 1.20 2011/11/27 21:31:48 reinoud Exp $ include arch/usermode/conf/std.usermode options INCLUDE_CONFIG_FILE -#ident GENERIC-$Revision: 1.19 $ +#ident GENERIC-$Revision: 1.20 $ maxusers 32 makeoptions DEBUG=-O1 -g3 @@ -20,10 +20,11 @@ options SYSVSEM options SYSVSHM options DEBUG +#options DDB # missing support options DIAGNOSTIC options LOCKDEBUG -#options DEBUG_EXEC -#options CPU_DEBUG +options DEBUG_EXEC +options CPU_DEBUG #options UVMHIST #options UVMHIST_PRINT
CVS commit: src/sys/arch/usermode/usermode
Module Name:src Committed By: reinoud Date: Sun Nov 27 21:33:19 UTC 2011 Modified Files: src/sys/arch/usermode/usermode: pmap.c Log Message: Create two panics that signal inconsistent states. To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/sys/arch/usermode/usermode/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/usermode/usermode/pmap.c diff -u src/sys/arch/usermode/usermode/pmap.c:1.73 src/sys/arch/usermode/usermode/pmap.c:1.74 --- src/sys/arch/usermode/usermode/pmap.c:1.73 Mon Sep 19 12:52:32 2011 +++ src/sys/arch/usermode/usermode/pmap.c Sun Nov 27 21:33:19 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.73 2011/09/19 12:52:32 reinoud Exp $ */ +/* $NetBSD: pmap.c,v 1.74 2011/11/27 21:33:19 reinoud Exp $ */ /*- * Copyright (c) 2011 Reinoud Zandijk rein...@netbsd.org @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.73 2011/09/19 12:52:32 reinoud Exp $); +__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.74 2011/11/27 21:33:19 reinoud Exp $); #include opt_memsize.h #include opt_kmempages.h @@ -550,6 +550,7 @@ pmap_fault(pmap_t pmap, vaddr_t va, vm_p pmap_update_page(ppn); return true; } + panic(pmap: page not readable but marked referenced?); return false; } @@ -579,6 +580,7 @@ pmap_fault(pmap_t pmap, vaddr_t va, vm_p return true; } } + panic(pmap: page not writable but marked modified?); return false; }
CVS commit: src/sys/arch/usermode
Module Name:src
Committed By: reinoud
Date: Sun Nov 27 21:38:17 UTC 2011
Modified Files:
src/sys/arch/usermode/dev: cpu.c
src/sys/arch/usermode/include: machdep.h param.h pcb.h
src/sys/arch/usermode/usermode: machdep.c syscall.c trap.c urkelvisor.c
Log Message:
Big patch that changes the signal stack usage of urkel significantly.
Formerly, all signals came on the signal stack and the two important ones were
then forwared to either the system call or the pagefault handler. This worked
fine but the signal stack remains that, a stack. When we go multi-process this
stack gets corrupted and out-of-order with all kind of nastyness since a
userland process switch can occure when a system call is called or when a
process gets a page fault.
The new scheme only uses the signal stack as a jumpboard. It swaps states and
then returns from the signal, clearing the stack but instead of returning to
the code it now jumpt to the handler and that handler then returns to the code
when its finished.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/usermode/dev/cpu.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/usermode/include/machdep.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/usermode/include/param.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/usermode/include/pcb.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/usermode/usermode/machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/usermode/usermode/syscall.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/usermode/usermode/trap.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/usermode/usermode/urkelvisor.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/usermode/dev/cpu.c
diff -u src/sys/arch/usermode/dev/cpu.c:1.46 src/sys/arch/usermode/dev/cpu.c:1.47
--- src/sys/arch/usermode/dev/cpu.c:1.46 Wed Sep 14 18:30:13 2011
+++ src/sys/arch/usermode/dev/cpu.c Sun Nov 27 21:38:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.46 2011/09/14 18:30:13 reinoud Exp $ */
+/* $NetBSD: cpu.c,v 1.47 2011/11/27 21:38:17 reinoud Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -30,7 +30,7 @@
#include opt_hz.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.46 2011/09/14 18:30:13 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.47 2011/11/27 21:38:17 reinoud Exp $);
#include sys/param.h
#include sys/conf.h
@@ -163,7 +163,7 @@ cpu_switchto(lwp_t *oldlwp, lwp_t *newlw
struct cpu_info *ci = curcpu();
#ifdef CPU_DEBUG
- printf(cpu_switchto [%s,pid=%d,lid=%d] - [%s,pid=%d,lid=%d]\n,
+ dprintf_debug(cpu_switchto [%s,pid=%d,lid=%d] - [%s,pid=%d,lid=%d]\n,
oldlwp ? oldlwp-l_name : none,
oldlwp ? oldlwp-l_proc-p_pid : -1,
oldlwp ? oldlwp-l_lid : -1,
@@ -171,14 +171,14 @@ cpu_switchto(lwp_t *oldlwp, lwp_t *newlw
newlwp ? newlwp-l_proc-p_pid : -1,
newlwp ? newlwp-l_lid : -1);
if (oldpcb) {
- printf(oldpcb uc_link=%p, uc_stack.ss_sp=%p,
+ dprintf_debug(oldpcb uc_link=%p, uc_stack.ss_sp=%p,
uc_stack.ss_size=%d\n,
oldpcb-pcb_ucp.uc_link,
oldpcb-pcb_ucp.uc_stack.ss_sp,
(int)oldpcb-pcb_ucp.uc_stack.ss_size);
}
if (newpcb) {
- printf(newpcb uc_link=%p, uc_stack.ss_sp=%p,
+ dprintf_debug(newpcb uc_link=%p, uc_stack.ss_sp=%p,
uc_stack.ss_size=%d\n,
newpcb-pcb_ucp.uc_link,
newpcb-pcb_ucp.uc_stack.ss_sp,
@@ -202,7 +202,7 @@ cpu_switchto(lwp_t *oldlwp, lwp_t *newlw
}
#ifdef CPU_DEBUG
- printf(cpu_switchto: returning %p (was %p)\n, ci-ci_stash, oldlwp);
+ dprintf_debug(cpu_switchto: returning %p (was %p)\n, ci-ci_stash, oldlwp);
#endif
return ci-ci_stash;
}
@@ -211,7 +211,7 @@ void
cpu_dumpconf(void)
{
#ifdef CPU_DEBUG
- printf(cpu_dumpconf\n);
+ dprintf_debug(cpu_dumpconf\n);
#endif
}
@@ -223,16 +223,18 @@ cpu_signotify(struct lwp *l)
void
cpu_getmcontext(struct lwp *l, mcontext_t *mcp, unsigned int *flags)
{
+ panic(cpu_getmcontext);
#ifdef CPU_DEBUG
- printf(cpu_getmcontext\n);
+ dprintf_debug(cpu_getmcontext\n);
#endif
}
int
cpu_setmcontext(struct lwp *l, const mcontext_t *mcp, unsigned int flags)
{
+ panic(cpu_setmcontext);
#ifdef CPU_DEBUG
- printf(cpu_setmcontext\n);
+ dprintf_debug(cpu_setmcontext\n);
#endif
return 0;
}
@@ -254,7 +256,7 @@ void
cpu_lwp_free(struct lwp *l, int proc)
{
#ifdef CPU_DEBUG
- printf(cpu_lwp_free\n);
+ dprintf_debug(cpu_lwp_free (dummy)\n);
#endif
}
@@ -264,7 +266,7 @@ cpu_lwp_free2(struct lwp *l)
struct pcb *pcb = lwp_getpcb(l);
#ifdef CPU_DEBUG
- printf(cpu_lwp_free2\n);
+ dprintf_debug(cpu_lwp_free2\n);
#endif
if (pcb == NULL)
@@ -287,7 +289,7 @@ static void
cpu_lwp_trampoline(ucontext_t *ucp, void (*func)(void *), void *arg)
{
#ifdef CPU_DEBUG
- printf(cpu_lwp_trampoline called with func %p, arg %p\n, (void *) func, arg);
+ dprintf_debug(cpu_lwp_trampoline called with func %p, arg %p\n, (void *) func, arg);
#endif
/* init lwp */
CVS commit: src/sys
Module Name:src
Committed By: jmcneill
Date: Mon Nov 28 00:30:17 UTC 2011
Modified Files:
src/sys/dev/ic: ath.c
src/sys/external/isc/atheros_hal/dist/ar5416: ar5416_interrupts.c
Log Message:
SVN r220966 from FreeBSD:
Fix a corner-case of interrupt handling which resulted in potentially
spurious (and fatal) interrupt errors.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/dev/ic/ath.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_interrupts.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/ath.c
diff -u src/sys/dev/ic/ath.c:1.112 src/sys/dev/ic/ath.c:1.113
--- src/sys/dev/ic/ath.c:1.112 Fri Oct 7 16:58:11 2011
+++ src/sys/dev/ic/ath.c Mon Nov 28 00:30:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ath.c,v 1.112 2011/10/07 16:58:11 dyoung Exp $ */
+/* $NetBSD: ath.c,v 1.113 2011/11/28 00:30:17 jmcneill Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID($FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $);
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, $NetBSD: ath.c,v 1.112 2011/10/07 16:58:11 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: ath.c,v 1.113 2011/11/28 00:30:17 jmcneill Exp $);
#endif
/*
@@ -740,7 +740,7 @@ ath_intr(void *arg)
struct ath_softc *sc = arg;
struct ifnet *ifp = sc-sc_if;
struct ath_hal *ah = sc-sc_ah;
- HAL_INT status;
+ HAL_INT status = 0;
if (!device_activation(sc-sc_dev, DEVACT_LEVEL_DRIVER)) {
/*
Index: src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_interrupts.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_interrupts.c:1.2 src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_interrupts.c:1.3
--- src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_interrupts.c:1.2 Mon Mar 7 11:25:44 2011
+++ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_interrupts.c Mon Nov 28 00:30:17 2011
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ar5416_interrupts.c,v 1.2 2011/03/07 11:25:44 cegger Exp $
+ * $Id: ar5416_interrupts.c,v 1.3 2011/11/28 00:30:17 jmcneill Exp $
*/
#include opt_ah.h
@@ -55,6 +55,8 @@ ar5416IsInterruptPending(struct ath_hal
* values. The value returned is mapped to abstract the hw-specific bit
* locations in the Interrupt Status Register.
*
+ * (*masked) is cleared on initial call.
+ *
* Returns: A hardware-abstracted bitmap of all non-masked-out
* interrupts pending, as well as an unmasked value
*/
@@ -73,10 +75,9 @@ ar5416GetPendingInterrupts(struct ath_ha
isr = 0;
sync_cause = OS_REG_READ(ah, AR_INTR_SYNC_CAUSE);
sync_cause = AR_INTR_SYNC_DEFAULT;
- if (isr == 0 sync_cause == 0) {
- *masked = 0;
+ *masked = 0;
+ if (isr == 0 sync_cause == 0)
return AH_FALSE;
- }
if (isr != 0) {
struct ath_hal_5212 *ahp = AH5212(ah);
CVS commit: src/sys/kern
Module Name:src
Committed By: jnemeth
Date: Mon Nov 28 03:13:32 UTC 2011
Modified Files:
src/sys/kern: kern_module.c
Log Message:
Move unloaded module debug message higher as it appears that name
sometimes points to memory that gets freed causing the system to crash.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/kern/kern_module.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_module.c
diff -u src/sys/kern/kern_module.c:1.84 src/sys/kern/kern_module.c:1.85
--- src/sys/kern/kern_module.c:1.84 Sun Nov 6 12:40:04 2011
+++ src/sys/kern/kern_module.c Mon Nov 28 03:13:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.84 2011/11/06 12:40:04 tron Exp $ */
+/* $NetBSD: kern_module.c,v 1.85 2011/11/28 03:13:31 jnemeth Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.84 2011/11/06 12:40:04 tron Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.85 2011/11/28 03:13:31 jnemeth Exp $);
#define _MODULE_INTERNAL
@@ -1121,6 +1121,7 @@ module_do_unload(const char *name, bool
u_int i;
KASSERT(kernconfig_is_held());
+ KASSERT(name != NULL);
mod = module_lookup(name);
if (mod == NULL) {
@@ -1156,6 +1157,7 @@ module_do_unload(const char *name, bool
for (i = 0; i mod-mod_nrequired; i++) {
mod-mod_required[i]-mod_refcnt--;
}
+ module_print(unloaded module `%s', name);
if (mod-mod_kobj != NULL) {
kobj_unload(mod-mod_kobj);
}
@@ -1170,7 +1172,6 @@ module_do_unload(const char *name, bool
}
module_gen++;
- module_print(unloaded module `%s', name);
return 0;
}
CVS commit: src/lib/libperfuse
Module Name:src
Committed By: manu
Date: Mon Nov 28 05:33:33 UTC 2011
Modified Files:
src/lib/libperfuse: ops.c
Log Message:
- Add missing ENOENT or ESTALL when accessing deleted node
- Fix a warning, fix style (80 chars for a line)
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/lib/libperfuse/ops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.46 src/lib/libperfuse/ops.c:1.47
--- src/lib/libperfuse/ops.c:1.46 Thu Nov 17 02:28:21 2011
+++ src/lib/libperfuse/ops.c Mon Nov 28 05:33:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.46 2011/11/17 02:28:21 manu Exp $ */
+/* $NetBSD: ops.c,v 1.47 2011/11/28 05:33:33 manu Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -44,6 +44,9 @@
extern int perfuse_diagflags;
+#if 0
+static void print_node(const char *, puffs_cookie_t);
+#endif
static void set_expire(puffs_cookie_t, struct fuse_entry_out *,
struct fuse_attr_out *);
static int attr_expired(puffs_cookie_t);
@@ -102,6 +105,27 @@ const int vttoif_tab[9] = {
#define IFTOVT(mode) (iftovt_tab[((mode) S_IFMT) 12])
#define VTTOIF(indx) (vttoif_tab[(int)(indx)])
+#if 0
+static void
+print_node(func, opc)
+ const char *func;
+ puffs_cookie_t opc;
+{
+ struct puffs_node *pn;
+ struct perfuse_node_data *pnd;
+ struct vattr *vap;
+
+ pn = (struct puffs_node *)opc;
+ pnd = PERFUSE_NODE_DATA(opc);
+ vap = pn-pn_va;
+
+ printf(%s: \%s\, opc = %p, nodeid = 0x%PRIx64 ino = %PRIu64\n,
+ func, pnd-pnd_name, opc, pnd-pnd_nodeid, vap-va_fileid);
+
+ return;
+}
+#endif /* PERFUSE_DEBUG */
+
int
perfuse_node_close_common(pu, opc, mode)
struct puffs_usermount *pu;
@@ -432,6 +456,12 @@ node_lookup_common(pu, opc, path, pcr, p
size_t len;
int error;
+ /*
+ * Prevent further lookups if the parent was removed
+ */
+ if (PERFUSE_NODE_DATA(opc)-pnd_flags PND_REMOVED)
+ return ESTALE;
+
if (pnp == NULL)
DERRX(EX_SOFTWARE, pnp must be != NULL);
@@ -453,8 +483,9 @@ node_lookup_common(pu, opc, path, pcr, p
#ifdef PERFUSE_DEBUG
if (perfuse_diagflags PDF_FILENAME)
DPRINTF(%s: opc = %p, file = \%s\ found
-cookie = %p, nodeid = 0x%PRIx64 for \%s\\n,
-__func__, (void *)opc, perfuse_node_path(opc),
+cookie = %p, nodeid = 0x%PRIx64
+for \%s\\n, __func__,
+(void *)opc, perfuse_node_path(opc),
(void *)oldpnd-pnd_pn, oldpnd-pnd_nodeid,
path);
#endif
@@ -1180,6 +1211,15 @@ perfuse_node_lookup(pu, opc, pni, pcn)
return error;
/*
+ * Kernel would kill us if the filesystem returned the parent
+ * itself. If we want to live, hide that!
+ */
+ if ((opc == (puffs_cookie_t)pn) (strcmp(pcn-pcn_name, .) != 0)) {
+ DWARNX(lookup returned parent);
+ return ESTALE;
+ }
+
+ /*
* Removed node
*/
if (PERFUSE_NODE_DATA(pn)-pnd_flags PND_REMOVED)
@@ -2337,7 +2377,9 @@ perfuse_node_rmdir(pu, opc, targ, pcn)
int error;
pnd = PERFUSE_NODE_DATA(opc);
- if (pnd-pnd_flags PND_REMOVED)
+
+ if ((pnd-pnd_flags PND_REMOVED) ||
+ (PERFUSE_NODE_DATA(targ)-pnd_flags PND_REMOVED))
return ENOENT;
/*
@@ -2884,7 +2926,7 @@ perfuse_node_advlock(pu, opc, id, op, fl
fli-lk.pid = fl-l_pid;
fli-lk_flags = (flags F_FLOCK) ? FUSE_LK_FLOCK : 0;
- owner = (uint64_t)(vaddr_t)id;
+ owner = (uint32_t)(vaddr_t)id;
#ifdef PERFUSE_DEBUG
if (perfuse_diagflags PDF_FH)
CVS commit: src/etc/etc.evbarm
Module Name:src
Committed By: sekiya
Date: Mon Nov 28 06:15:48 UTC 2011
Modified Files:
src/etc/etc.evbarm: Makefile.inc
Log Message:
Enable SHEEVAPLUG for build.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/etc/etc.evbarm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.23 src/etc/etc.evbarm/Makefile.inc:1.24
--- src/etc/etc.evbarm/Makefile.inc:1.23 Thu Oct 30 15:41:33 2008
+++ src/etc/etc.evbarm/Makefile.inc Mon Nov 28 06:15:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.23 2008/10/30 15:41:33 cliff Exp $
+# $NetBSD: Makefile.inc,v 1.24 2011/11/28 06:15:48 sekiya Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -9,7 +9,7 @@
.if ${MACHINE_ARCH} == arm
# Little endian platforms
EVBARM_BOARDS= ADI_BRH CP3100 GEMINI GUMSTIX INTEGRATOR \
- IQ80310 IQ80321 SMDK2410 SMDK2800 \
+ IQ80310 IQ80321 SHEEVAPLUG SMDK2410 SMDK2800 \
TEAMASA_NPWR TISDP2420 TS7200 TWINTAIL
.else
# Big endian platforms
CVS commit: src/distrib/notes/common
Module Name:src Committed By: sekiya Date: Mon Nov 28 06:16:40 UTC 2011 Modified Files: src/distrib/notes/common: contents Log Message: Note kern-SHEEVAPLUG. To generate a diff of this commit: cvs rdiff -u -r1.168 -r1.169 src/distrib/notes/common/contents Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/contents diff -u src/distrib/notes/common/contents:1.168 src/distrib/notes/common/contents:1.169 --- src/distrib/notes/common/contents:1.168 Fri May 27 15:43:00 2011 +++ src/distrib/notes/common/contents Mon Nov 28 06:16:40 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: contents,v 1.168 2011/05/27 15:43:00 tsutsui Exp $ +.\ $NetBSD: contents,v 1.169 2011/11/28 06:16:40 sekiya Exp $ .\ .\ Copyright (c) 1999-2005 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -575,6 +575,8 @@ install the kernel that matches your har (see below) .It Sy kern-IQ80321 (see below) +.It Sy kern-SHEEVAPLUG +(see below) .It Sy kern-TEAMASA_NPWR .Pp These sets contain a
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: agc Date: Mon Nov 28 06:36:14 UTC 2011 Modified Files: src/crypto/external/bsd/openssh/dist: ssh-keygen.1 Log Message: get rid of an old merge conflict which managed to creep through To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/ssh-keygen.1 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/openssh/dist/ssh-keygen.1 diff -u src/crypto/external/bsd/openssh/dist/ssh-keygen.1:1.6 src/crypto/external/bsd/openssh/dist/ssh-keygen.1:1.7 --- src/crypto/external/bsd/openssh/dist/ssh-keygen.1:1.6 Wed Sep 7 17:49:19 2011 +++ src/crypto/external/bsd/openssh/dist/ssh-keygen.1 Mon Nov 28 06:36:14 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: ssh-keygen.1,v 1.6 2011/09/07 17:49:19 christos Exp $ +.\ $NetBSD: ssh-keygen.1,v 1.7 2011/11/28 06:36:14 agc Exp $ .\ $OpenBSD: ssh-keygen.1,v 1.106 2011/04/13 04:09:37 djm Exp $ .\ .\ -*- nroff -*- @@ -410,12 +410,9 @@ new passphrase. .It Fl q Silence .Nm ssh-keygen . - ssh-keygen.1 Used by .Pa /etc/rc.d/sshd when creating a new key. -=== - 1.1.1.4 .It Fl R Ar hostname Removes all keys belonging to .Ar hostname
CVS commit: src
Module Name:src Committed By: isaki Date: Sun Nov 27 09:00:33 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4/man4.x68k: Makefile src/sys/arch/x68k/conf: GENERIC files.x68k Added Files: src/share/man/man4/man4.x68k: powsw.4 src/sys/arch/x68k/dev: powsw.c Log Message: Add powsw(4) for x68k power switch. It substitutes for a part about power switch handler of pow(4) deleted before. Benefits than pow(4): - separate a front switch (= powsw0) and an EXPWON line (= powsw1) completely. Only powsw0 is enabled in GENERIC by default. - prevent chattering in some hardware individuals. thank you for a report and a test: Yasushi Oshima and Y.Sugahara. To generate a diff of this commit: cvs rdiff -u -r1.1358 -r1.1359 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/man4.x68k/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.x68k/powsw.4 cvs rdiff -u -r1.157 -r1.158 src/sys/arch/x68k/conf/GENERIC cvs rdiff -u -r1.76 -r1.77 src/sys/arch/x68k/conf/files.x68k cvs rdiff -u -r0 -r1.1 src/sys/arch/x68k/dev/powsw.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: isaki Date: Sun Nov 27 09:04:37 UTC 2011 Modified Files: src/doc: CHANGES Log Message: Note powsw(4) for x68k. To generate a diff of this commit: cvs rdiff -u -r1.1633 -r1.1634 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/examples/asm
Module Name:src Committed By: skrll Date: Sun Nov 27 09:07:12 UTC 2011 Modified Files: src/share/examples/asm: README Log Message: Typo To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/examples/asm/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/stand/misc
Module Name:src Committed By: martin Date: Sun Nov 27 09:24:35 UTC 2011 Modified Files: src/sys/arch/i386/stand/misc: rawr32.exe.uue Log Message: New Rawrite32 release is out. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/stand/misc/rawr32.exe.uue Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: martin Date: Sun Nov 27 10:31:13 UTC 2011 Modified Files: src/sys/sys: systm.h Log Message: If not kernel, include stdbool.h To generate a diff of this commit: cvs rdiff -u -r1.254 -r1.255 src/sys/sys/systm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dist/ipf/netinet
Module Name:src Committed By: mbalmer Date: Sun Nov 27 10:53:08 UTC 2011 Modified Files: src/sys/dist/ipf/netinet: ip_nat.c Log Message: Typo. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/dist/ipf/netinet/ip_nat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: martin Date: Sun Nov 27 11:07:22 UTC 2011 Modified Files: src/sys/sys: systm.h Log Message: No stdbool.h if _STANDALONE To generate a diff of this commit: cvs rdiff -u -r1.255 -r1.256 src/sys/sys/systm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/quota
Module Name:src Committed By: dholland Date: Sun Nov 27 13:24:32 UTC 2011 Modified Files: src/usr.bin/quota: quota.c Log Message: Use __dead, not attribute noreturn. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/usr.bin/quota/quota.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src Committed By: rmind Date: Sun Nov 27 14:36:21 UTC 2011 Modified Files: src/sys/dev/ic: sl811hs.c src/sys/dev/pcmcia: slhci_pcmcia.c src/sys/dev/usb: usbdi.h Log Message: G/C unnecessary IPL_HARDUSB To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/sl811hs.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pcmcia/slhci_pcmcia.c cvs rdiff -u -r1.79 -r1.80 src/sys/dev/usb/usbdi.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src Committed By: jakllsch Date: Sun Nov 27 14:55:57 UTC 2011 Modified Files: src/sys/net: if.c Log Message: We need a cv_destroy() here too. Fixes LOCKDEBUG panic on interface detachment. To generate a diff of this commit: cvs rdiff -u -r1.257 -r1.258 src/sys/net/if.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: mbalmer Date: Sun Nov 27 15:08:04 UTC 2011 Modified Files: src/sys/dev/ic: ac97.c Log Message: Add the Avance Logic ALC203 code, found on e.g. alix3d3 boards. To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/sys/dev/ic/ac97.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-input-mouse/dist/src
Module Name:xsrc Committed By: tsutsui Date: Sun Nov 27 15:12:16 UTC 2011 Modified Files: xsrc/external/mit/xf86-input-mouse/dist/src: mouse.c pnp.c Log Message: Fix -Wshadow. (should be committed before src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile rev 1.5. Sorry) To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c cvs rdiff -u -r1.1.1.4 -r1.2 \ xsrc/external/mit/xf86-input-mouse/dist/src/pnp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jakllsch Date: Sun Nov 27 15:28:26 UTC 2011 Modified Files: src/sys/dev/ic: com.c Log Message: whitespace consistency adjustment To generate a diff of this commit: cvs rdiff -u -r1.301 -r1.302 src/sys/dev/ic/com.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jakllsch Date: Sun Nov 27 18:17:08 UTC 2011 Modified Files: src/sys/dev/ic: com.c Log Message: more whitespace and comment spelling fixes To generate a diff of this commit: cvs rdiff -u -r1.302 -r1.303 src/sys/dev/ic/com.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/usermode/conf
Module Name:src Committed By: reinoud Date: Sun Nov 27 20:06:26 UTC 2011 Modified Files: src/sys/arch/usermode/conf: std.usermode Log Message: Compile in syscall name table so urkel debugging code can print out the names of the system calls so its more clear where it strands.` To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/usermode/conf/std.usermode Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/usermode/dev
Module Name:src Committed By: reinoud Date: Sun Nov 27 20:08:23 UTC 2011 Modified Files: src/sys/arch/usermode/dev: ld_thunkbus.c Log Message: Implement the choice between using AIO or not. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/usermode/dev/ld_thunkbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/usermode/dev
Module Name:src Committed By: reinoud Date: Sun Nov 27 20:57:28 UTC 2011 Modified Files: src/sys/arch/usermode/dev: ld_thunkbus.c Log Message: Fix in-code declaration of the sigaction structure. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/usermode/dev/ld_thunkbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/usermode/dev
Module Name:src Committed By: reinoud Date: Sun Nov 27 21:22:28 UTC 2011 Modified Files: src/sys/arch/usermode/dev: ld_thunkbus.c Log Message: Use AIO by default To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/usermode/dev/ld_thunkbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/usermode
Module Name:src Committed By: reinoud Date: Sun Nov 27 21:23:47 UTC 2011 Modified Files: src/sys/arch/usermode/include: thunk.h src/sys/arch/usermode/usermode: thunk.c Log Message: Add thunk_sigprocmask() To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/usermode/include/thunk.h cvs rdiff -u -r1.39 -r1.40 src/sys/arch/usermode/usermode/thunk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/usermode/conf
Module Name:src Committed By: reinoud Date: Sun Nov 27 21:31:48 UTC 2011 Modified Files: src/sys/arch/usermode/conf: GENERIC Log Message: Add some config settings as default and make a note that DDB is far from working yet :-/ To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/usermode/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/usermode/usermode
Module Name:src Committed By: reinoud Date: Sun Nov 27 21:33:19 UTC 2011 Modified Files: src/sys/arch/usermode/usermode: pmap.c Log Message: Create two panics that signal inconsistent states. To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/sys/arch/usermode/usermode/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/usermode
Module Name:src Committed By: reinoud Date: Sun Nov 27 21:38:17 UTC 2011 Modified Files: src/sys/arch/usermode/dev: cpu.c src/sys/arch/usermode/include: machdep.h param.h pcb.h src/sys/arch/usermode/usermode: machdep.c syscall.c trap.c urkelvisor.c Log Message: Big patch that changes the signal stack usage of urkel significantly. Formerly, all signals came on the signal stack and the two important ones were then forwared to either the system call or the pagefault handler. This worked fine but the signal stack remains that, a stack. When we go multi-process this stack gets corrupted and out-of-order with all kind of nastyness since a userland process switch can occure when a system call is called or when a process gets a page fault. The new scheme only uses the signal stack as a jumpboard. It swaps states and then returns from the signal, clearing the stack but instead of returning to the code it now jumpt to the handler and that handler then returns to the code when its finished. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/arch/usermode/dev/cpu.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/usermode/include/machdep.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/usermode/include/param.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/usermode/include/pcb.h cvs rdiff -u -r1.32 -r1.33 src/sys/arch/usermode/usermode/machdep.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/usermode/usermode/syscall.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/usermode/usermode/trap.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/usermode/usermode/urkelvisor.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: jmcneill Date: Mon Nov 28 00:30:17 UTC 2011 Modified Files: src/sys/dev/ic: ath.c src/sys/external/isc/atheros_hal/dist/ar5416: ar5416_interrupts.c Log Message: SVN r220966 from FreeBSD: Fix a corner-case of interrupt handling which resulted in potentially spurious (and fatal) interrupt errors. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/dev/ic/ath.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_interrupts.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: jnemeth Date: Mon Nov 28 03:13:32 UTC 2011 Modified Files: src/sys/kern: kern_module.c Log Message: Move unloaded module debug message higher as it appears that name sometimes points to memory that gets freed causing the system to crash. To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/sys/kern/kern_module.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libperfuse
Module Name:src Committed By: manu Date: Mon Nov 28 05:33:33 UTC 2011 Modified Files: src/lib/libperfuse: ops.c Log Message: - Add missing ENOENT or ESTALL when accessing deleted node - Fix a warning, fix style (80 chars for a line) To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/lib/libperfuse/ops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/etc.evbarm
Module Name:src Committed By: sekiya Date: Mon Nov 28 06:15:48 UTC 2011 Modified Files: src/etc/etc.evbarm: Makefile.inc Log Message: Enable SHEEVAPLUG for build. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/etc/etc.evbarm/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: sekiya Date: Mon Nov 28 06:16:40 UTC 2011 Modified Files: src/distrib/notes/common: contents Log Message: Note kern-SHEEVAPLUG. To generate a diff of this commit: cvs rdiff -u -r1.168 -r1.169 src/distrib/notes/common/contents Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: agc Date: Mon Nov 28 06:36:14 UTC 2011 Modified Files: src/crypto/external/bsd/openssh/dist: ssh-keygen.1 Log Message: get rid of an old merge conflict which managed to creep through To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/ssh-keygen.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: tls Date: Mon Nov 28 07:56:54 UTC 2011 Modified Files: src/share/man/man5: boot.cfg.5 src/sys/arch/i386/stand/boot: boot2.c src/sys/arch/i386/stand/lib: bootmod.h exec.c libi386.h src/sys/arch/x86/include: bootinfo.h src/sys/arch/x86/x86: x86_machdep.c src/sys/dev: rnd.c Log Message: Add support for passing saved entropy (random seed file) to the kernel from the bootloader. This can fix the problem of poor quality keys for other kernel modules which call arc4random() early in kernel startup (NFS startup, in particular, causes this). We continue to rely on the etc/rc.d/random_seed script to save entropy to the seed file at shutdown and erase the seed file at startup. Boot loader support implemented only for i386 and amd64 ports for now but it should be easy for other ports to do the same or similar. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/share/man/man5/boot.cfg.5 cvs rdiff -u -r1.55 -r1.56 src/sys/arch/i386/stand/boot/boot2.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/stand/lib/bootmod.h cvs rdiff -u -r1.48 -r1.49 src/sys/arch/i386/stand/lib/exec.c cvs rdiff -u -r1.37 -r1.38 src/sys/arch/i386/stand/lib/libi386.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/x86/include/bootinfo.h cvs rdiff -u -r1.56 -r1.57 src/sys/arch/x86/x86/x86_machdep.c cvs rdiff -u -r1.86 -r1.87 src/sys/dev/rnd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
