CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Tue Jun 23 12:22:35 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: xhci.c
Log Message:
Comment updates from t-hash.
To generate a diff of this commit:
cvs rdiff -u -r1.28.2.28 -r1.28.2.29 src/sys/dev/usb/xhci.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/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.28.2.28 src/sys/dev/usb/xhci.c:1.28.2.29
--- src/sys/dev/usb/xhci.c:1.28.2.28 Sun Jun 7 08:04:52 2015
+++ src/sys/dev/usb/xhci.c Tue Jun 23 12:22:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.28.2.28 2015/06/07 08:04:52 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.28.2.29 2015/06/23 12:22:35 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.28.2.28 2015/06/07 08:04:52 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.28.2.29 2015/06/23 12:22:35 skrll Exp $);
#include opt_usb.h
@@ -1403,7 +1403,8 @@ xhci_stop_endpoint(struct usbd_pipe *pip
* Set TR Dequeue Pointer.
* xCHI 1.1 4.6.10 6.4.3.9
* Purge all of the transfer requests on ring.
- * EPSTATE of endpoint must be ERROR or STOPPED, or CONTEXT_STATE error.
+ * EPSTATE of endpoint must be ERROR or STOPPED, otherwise CONTEXT_STATE
+ * error will be generated.
*/
static usbd_status
xhci_set_dequeue(struct usbd_pipe *pipe)
@@ -1743,7 +1744,10 @@ xhci_handle_event(struct xhci_softc * co
} else {
xx = (void *)(uintptr_t)(trb_0 ~0x3);
}
- /* XXX this may not happen */
+ /*
+ * stop_endpoint may cause ERR_STOPPED_LENGTH_INVALID,
+ * in which case this condition may happen.
+ */
if (xx == NULL) {
DPRINTFN(1, xfer done: xx is NULL, 0, 0, 0, 0);
break;
@@ -2139,6 +2143,7 @@ xhci_new_device(device_t parent, struct
KASSERT(bus-ub_devices[dev-ud_addr] == NULL);
bus-ub_devices[dev-ud_addr] = dev;
+ /* read 64 bytes of device descriptor */
err = usbd_get_initial_ddesc(dev, dd);
if (err)
goto bad;
@@ -2340,6 +2345,10 @@ xhci_ring_put(struct xhci_softc * const
* (called from interrupt from xHCI), or timed-out.
* Command validation is performed in xhci_handle_event by checking if
* trb_0 in CMD_COMPLETE TRB and sc-sc_command_addr are identical.
+ * locked = 0: called without lock held
+ * locked = 1: allows called with lock held
+ * 'locked' is needed as some methods are called with sc_lock_held.
+ * (see usbdivar.h)
*/
static usbd_status
xhci_do_command1(struct xhci_softc * const sc, struct xhci_trb * const trb,
@@ -2357,7 +2366,7 @@ xhci_do_command1(struct xhci_softc * con
if (!locked)
mutex_enter(sc-sc_lock);
- /* XXX KASSERT may fire when cv_timedwait unlocks sc_lock */
+ /* XXX KASSERT may fail when cv_timedwait unlocks sc_lock */
KASSERT(sc-sc_command_addr == 0);
sc-sc_command_addr = xhci_ring_trbp(cr, cr-xr_ep);
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Tue Jun 23 12:22:35 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: xhci.c Log Message: Comment updates from t-hash. To generate a diff of this commit: cvs rdiff -u -r1.28.2.28 -r1.28.2.29 src/sys/dev/usb/xhci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: matt Date: Tue Jun 23 14:38:49 UTC 2015 Modified Files: src/distrib/sets/lists/modules: md.i386 Log Message: Remove compatmodules lines since they are now autogenerated To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/modules/md.i386 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/modules/md.i386 diff -u src/distrib/sets/lists/modules/md.i386:1.67 src/distrib/sets/lists/modules/md.i386:1.68 --- src/distrib/sets/lists/modules/md.i386:1.67 Sun May 17 05:22:43 2015 +++ src/distrib/sets/lists/modules/md.i386 Tue Jun 23 14:38:49 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.67 2015/05/17 05:22:43 pgoyette Exp $ +# $NetBSD: md.i386,v 1.68 2015/06/23 14:38:49 matt Exp $ # # NOTE that there are three sets of files here: # @MODULEDIR@, i386-xen, and i386pae-xen @@ -187,862 +187,3 @@ ./@MODULEDIR@/xc5k/xc5k.kmod base-kernel-modules kmod ./@MODULEDIR@/zl10353base-kernel-modules kmod ./@MODULEDIR@/zl10353/zl10353.kmod base-kernel-modules kmod -./stand/i386-xen base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@ base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/accf_dataready base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/accf_dataready/accf_dataready.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/accf_httpready base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/accf_httpready/accf_httpready.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpiacadbase-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpiacad/acpiacad.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpibatbase-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpibat/acpibat.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpibutbase-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpibut/acpibut.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpicpubase-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpicpu/acpicpu.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpidalbbase-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpidalb/acpidalb.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpifanbase-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpifan/acpifan.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpilidbase-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpilid/acpilid.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpipmtrbase-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpipmtr/acpipmtr.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpitzbase-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpitz/acpitz.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpiverbose base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpiverbose/acpiverbose.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpivgabase-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpivga/acpivga.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpiwdrtbase-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpiwdrt/acpiwdrt.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpiwmibase-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/acpiwmi/acpiwmi.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/adosfsbase-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/adosfs/adosfs.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/aibsbase-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/aibs/aibs.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/aiobase-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/aio/aio.kmod base-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/amdtempbase-kernel-modules kmod,compatmodules -./stand/i386-xen/@OSRELEASE@/modules/amdtemp/amdtemp.kmod base-kernel-modules kmod,compatmodules
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: matt Date: Tue Jun 23 14:38:49 UTC 2015 Modified Files: src/distrib/sets/lists/modules: md.i386 Log Message: Remove compatmodules lines since they are now autogenerated To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/modules/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib
Module Name:src
Committed By: matt
Date: Tue Jun 23 16:33:21 UTC 2015
Modified Files:
src/lib: Makefile
Log Message:
Add DTRACE and CTF libraries
To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.224 src/lib/Makefile:1.225
--- src/lib/Makefile:1.224 Mon Jun 22 06:03:20 2015
+++ src/lib/Makefile Tue Jun 23 16:33:21 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.224 2015/06/22 06:03:20 matt Exp $
+# $NetBSD: Makefile,v 1.225 2015/06/23 16:33:21 matt Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include bsd.own.mk
@@ -64,6 +64,14 @@ SUBDIR+= ../external/bsd/sljit/lib
SUBDIR+= libbpfjit
.endif
+.if ${MKDTRACE} != no
+SUBDIR+=../external/cddl/osnet/lib/libdtrace
+.endif
+
+.if ${MKDTRACE} != no || ${MKCTF} != no
+SUBDIR+=../external/cddl/osnet/lib/libctf
+.endif
+
.if (${MKZFS} != no)
SUBDIR+=../external/cddl/osnet/lib/libavl
SUBDIR+=../external/cddl/osnet/lib/libnvpair
CVS commit: src/lib
Module Name:src Committed By: matt Date: Tue Jun 23 16:33:21 UTC 2015 Modified Files: src/lib: Makefile Log Message: Add DTRACE and CTF libraries To generate a diff of this commit: cvs rdiff -u -r1.224 -r1.225 src/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/sysmon
Module Name:src Committed By: pgoyette Date: Tue Jun 23 19:22:56 UTC 2015 Modified Files: src/sys/dev/sysmon: sysmon_envsys_events.c Log Message: Separate the two conditions for the KASSERT, so we can tell which one occurred. To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/dev/sysmon/sysmon_envsys_events.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/sysmon
yeah - done! thanks! On Tue, 23 Jun 2015, Christoph Badura wrote: On Tue, Jun 23, 2015 at 10:41:42AM +, Paul Goyette wrote: Committed By: pgoyette Date: Tue Jun 23 10:41:42 UTC 2015 Modified Files: src/sys/dev/sysmon: sysmon_envsys_events.c Log Message: Fix the KASSERT - we want to make sure that _both_ pointers are non-NULL, not just that one or the other is non-NULL! Wouldn't it be better written as: KASSERT(sme != NULL); KASSERT(edata != NULL); Same effect, but when one of the triggers you know immediately which pointer was NULL. --chris - | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com| | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd.org | -
CVS commit: src/common/lib/libc/arch/mips/atomic
Module Name:src Committed By: matt Date: Tue Jun 23 20:56:17 UTC 2015 Modified Files: src/common/lib/libc/arch/mips/atomic: membar_ops.S Log Message: Always use sync if mips3 or later or not using O32 ABI. (A little redundant since not using O32 means you are using mips3 or later.) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/mips/atomic/membar_ops.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/mips/atomic
Module Name:src Committed By: matt Date: Tue Jun 23 20:56:17 UTC 2015 Modified Files: src/common/lib/libc/arch/mips/atomic: membar_ops.S Log Message: Always use sync if mips3 or later or not using O32 ABI. (A little redundant since not using O32 means you are using mips3 or later.) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/mips/atomic/membar_ops.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/mips/atomic/membar_ops.S diff -u src/common/lib/libc/arch/mips/atomic/membar_ops.S:1.7 src/common/lib/libc/arch/mips/atomic/membar_ops.S:1.8 --- src/common/lib/libc/arch/mips/atomic/membar_ops.S:1.7 Mon Jun 22 06:06:02 2015 +++ src/common/lib/libc/arch/mips/atomic/membar_ops.S Tue Jun 23 20:56:17 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: membar_ops.S,v 1.7 2015/06/22 06:06:02 matt Exp $ */ +/* $NetBSD: membar_ops.S,v 1.8 2015/06/23 20:56:17 matt Exp $ */ /*- * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc. @@ -31,21 +31,11 @@ #include atomic_op_asm.h -#if defined(_KERNEL) !defined(_RUMPKERNEL) - -#ifdef _KERNEL_OPT -#include opt_cputype.h -#include opt_lockdebug.h -#include opt_multiprocessor.h -#endif - -#include assym.h - -#if (MIPS_HAS_LLSC != 0 defined(MULTIPROCESSOR)) || !defined(__mips_o32) -#define SYNC sync -#endif -#elif !defined(__mips_o32) -#define SYNC sync +// If we are on building for MIPS III or later, put in SYNCs +#if __mips = 3 || !defined(__mips_o32) +# define SYNC sync +#else +# define SYNC nop #endif .text @@ -53,11 +43,7 @@ LEAF(_membar_sync) j ra -#ifdef SYNC SYNC -#else - nop -#endif END(_membar_sync) #ifdef __OCTEON__
CVS commit: src/sys/arch/cobalt/stand/boot
Module Name:src
Committed By: matt
Date: Tue Jun 23 20:54:43 UTC 2015
Modified Files:
src/sys/arch/cobalt/stand/boot: Makefile
Log Message:
Always build for mips3. Use -Os instead -O2 for smallest code size.
text goes from 74608 to 63020
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/cobalt/stand/boot/Makefile
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/cobalt/stand/boot/Makefile
diff -u src/sys/arch/cobalt/stand/boot/Makefile:1.29 src/sys/arch/cobalt/stand/boot/Makefile:1.30
--- src/sys/arch/cobalt/stand/boot/Makefile:1.29 Tue Aug 5 15:40:59 2014
+++ src/sys/arch/cobalt/stand/boot/Makefile Tue Jun 23 20:54:43 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2014/08/05 15:40:59 apb Exp $
+# $NetBSD: Makefile,v 1.30 2015/06/23 20:54:43 matt Exp $
NOMAN= # defined
@@ -53,10 +53,12 @@ CPPFLAGS+= -DSUPPORT_DHCP -DSUPPORT_BOOT
#CPPFLAGS+= -DRPC_DEBUG -DRARP_DEBUG -DNET_DEBUG -DDEBUG -DPARANOID
# compiler flags for smallest code size
-CFLAGS= -O2 -mmemcpy -ffreestanding -mno-abicalls -msoft-float -G 128
+CFLAGS= -Os -mmemcpy -ffreestanding -mno-abicalls -msoft-float -G 128
+AFLAGS+= -mips3
+CFLAGS+= -mips3
.if ${MACHINE_ARCH} == mips64el
-AFLAGS+= -mips3 -mabi=32
-CFLAGS+= -mips3 -mabi=32
+AFLAGS+= -mabi=32
+CFLAGS+= -mabi=32
LINKFORMAT= -m elf32ltsmip
.endif
CVS commit: src/sys/arch/cobalt/stand/boot
Module Name:src Committed By: matt Date: Tue Jun 23 20:54:43 UTC 2015 Modified Files: src/sys/arch/cobalt/stand/boot: Makefile Log Message: Always build for mips3. Use -Os instead -O2 for smallest code size. text goes from 74608 to 63020 To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/cobalt/stand/boot/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ews4800mips
Module Name:src Committed By: matt Date: Tue Jun 23 21:00:23 UTC 2015 Modified Files: src/sys/arch/ews4800mips/ews4800mips: bus_dma.c bus_space.c cpu.c sbd.c tr2.c tr2a.c src/sys/arch/ews4800mips/include: bus.h src/sys/arch/ews4800mips/sbd: fb_sbdio.c if_iee_sbdio.c sbdio.c zs_sbdio.c Log Message: Fixup includes to the new world order. Put platform wdflush into mips_locore_jumpvec To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ews4800mips/ews4800mips/bus_dma.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ews4800mips/ews4800mips/bus_space.c \ src/sys/arch/ews4800mips/ews4800mips/tr2.c \ src/sys/arch/ews4800mips/ews4800mips/tr2a.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ews4800mips/ews4800mips/cpu.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ews4800mips/ews4800mips/sbd.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ews4800mips/include/bus.h cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ews4800mips/sbd/fb_sbdio.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ews4800mips/sbd/if_iee_sbdio.c \ src/sys/arch/ews4800mips/sbd/zs_sbdio.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ews4800mips/sbd/sbdio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/ews4800mips/ews4800mips/bus_dma.c diff -u src/sys/arch/ews4800mips/ews4800mips/bus_dma.c:1.14 src/sys/arch/ews4800mips/ews4800mips/bus_dma.c:1.15 --- src/sys/arch/ews4800mips/ews4800mips/bus_dma.c:1.14 Thu Jun 11 08:22:08 2015 +++ src/sys/arch/ews4800mips/ews4800mips/bus_dma.c Tue Jun 23 21:00:23 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.14 2015/06/11 08:22:08 matt Exp $ */ +/* $NetBSD: bus_dma.c,v 1.15 2015/06/23 21:00:23 matt Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,18 +31,20 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.14 2015/06/11 08:22:08 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.15 2015/06/23 21:00:23 matt Exp $); +#define _EWS4800MIPS_BUS_DMA_PRIVATE /* #define BUS_DMA_DEBUG */ + #include sys/param.h #include sys/malloc.h +#include sys/bus.h #include sys/mbuf.h #include sys/proc.h +#include mips/locore.h #include mips/cache.h -#define _EWS4800MIPS_BUS_DMA_PRIVATE -#include machine/bus.h #include machine/sbdvar.h #include dev/bus_dma/bus_dmamem_common.h Index: src/sys/arch/ews4800mips/ews4800mips/bus_space.c diff -u src/sys/arch/ews4800mips/ews4800mips/bus_space.c:1.5 src/sys/arch/ews4800mips/ews4800mips/bus_space.c:1.6 --- src/sys/arch/ews4800mips/ews4800mips/bus_space.c:1.5 Fri Jan 27 18:52:55 2012 +++ src/sys/arch/ews4800mips/ews4800mips/bus_space.c Tue Jun 23 21:00:23 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_space.c,v 1.5 2012/01/27 18:52:55 para Exp $ */ +/* $NetBSD: bus_space.c,v 1.6 2015/06/23 21:00:23 matt Exp $ */ /*- * Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc. @@ -27,15 +27,18 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.5 2012/01/27 18:52:55 para Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.6 2015/06/23 21:00:23 matt Exp $); + +#define _EWS4800MIPS_BUS_SPACE_PRIVATE #include sys/param.h -#include sys/systm.h -#include sys/malloc.h +#include sys/bus.h #include sys/extent.h +#include sys/malloc.h +#include sys/systm.h + +#include mips/locore.h -#define _EWS4800MIPS_BUS_SPACE_PRIVATE -#include machine/bus.h #include machine/sbdvar.h #ifdef BUS_SPACE_DEBUG Index: src/sys/arch/ews4800mips/ews4800mips/tr2.c diff -u src/sys/arch/ews4800mips/ews4800mips/tr2.c:1.5 src/sys/arch/ews4800mips/ews4800mips/tr2.c:1.6 --- src/sys/arch/ews4800mips/ews4800mips/tr2.c:1.5 Sun Feb 20 07:55:20 2011 +++ src/sys/arch/ews4800mips/ews4800mips/tr2.c Tue Jun 23 21:00:23 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tr2.c,v 1.5 2011/02/20 07:55:20 matt Exp $ */ +/* $NetBSD: tr2.c,v 1.6 2015/06/23 21:00:23 matt Exp $ */ /*- * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tr2.c,v 1.5 2011/02/20 07:55:20 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: tr2.c,v 1.6 2015/06/23 21:00:23 matt Exp $); #define __INTR_PRIVATE #include fb_sbdio.h @@ -46,6 +46,7 @@ __KERNEL_RCSID(0, $NetBSD: tr2.c,v 1.5 #include uvm/uvm_extern.h +#include mips/locore.h /* Set L2-cache size */ #include mips/cache.h /* Set L2-cache size */ #include machine/autoconf.h @@ -110,6 +111,8 @@ tr2_init(void) /* Register system-board specific ops. */ _SBD_OPS_REGISTER_ALL(tr2); + + mips_locore_jumpvec.ljv_wbflush = platform.wbflush; } int Index: src/sys/arch/ews4800mips/ews4800mips/tr2a.c diff -u src/sys/arch/ews4800mips/ews4800mips/tr2a.c:1.5 src/sys/arch/ews4800mips/ews4800mips/tr2a.c:1.6 --- src/sys/arch/ews4800mips/ews4800mips/tr2a.c:1.5 Sun Feb 20 07:55:20 2011 +++ src/sys/arch/ews4800mips/ews4800mips/tr2a.c Tue Jun 23 21:00:23 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tr2a.c,v 1.5 2011/02/20 07:55:20
CVS commit: src/sys/arch/ews4800mips
Module Name:src Committed By: matt Date: Tue Jun 23 21:00:23 UTC 2015 Modified Files: src/sys/arch/ews4800mips/ews4800mips: bus_dma.c bus_space.c cpu.c sbd.c tr2.c tr2a.c src/sys/arch/ews4800mips/include: bus.h src/sys/arch/ews4800mips/sbd: fb_sbdio.c if_iee_sbdio.c sbdio.c zs_sbdio.c Log Message: Fixup includes to the new world order. Put platform wdflush into mips_locore_jumpvec To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ews4800mips/ews4800mips/bus_dma.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ews4800mips/ews4800mips/bus_space.c \ src/sys/arch/ews4800mips/ews4800mips/tr2.c \ src/sys/arch/ews4800mips/ews4800mips/tr2a.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ews4800mips/ews4800mips/cpu.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ews4800mips/ews4800mips/sbd.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ews4800mips/include/bus.h cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ews4800mips/sbd/fb_sbdio.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ews4800mips/sbd/if_iee_sbdio.c \ src/sys/arch/ews4800mips/sbd/zs_sbdio.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ews4800mips/sbd/sbdio.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/cobalt/stand/boot
Module Name:src Committed By: matt Date: Tue Jun 23 20:27:28 UTC 2015 Modified Files: src/sys/arch/cobalt/stand/boot: boot.h Log Message: #include mips/cpuregs.h To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/cobalt/stand/boot/boot.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/cobalt/stand/boot
Module Name:src Committed By: matt Date: Tue Jun 23 20:27:28 UTC 2015 Modified Files: src/sys/arch/cobalt/stand/boot: boot.h Log Message: #include mips/cpuregs.h To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/cobalt/stand/boot/boot.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/cobalt/stand/boot/boot.h diff -u src/sys/arch/cobalt/stand/boot/boot.h:1.12 src/sys/arch/cobalt/stand/boot/boot.h:1.13 --- src/sys/arch/cobalt/stand/boot/boot.h:1.12 Thu May 29 14:25:01 2008 +++ src/sys/arch/cobalt/stand/boot/boot.h Tue Jun 23 20:27:28 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: boot.h,v 1.12 2008/05/29 14:25:01 tsutsui Exp $ */ +/* $NetBSD: boot.h,v 1.13 2015/06/23 20:27:28 matt Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -26,6 +26,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include mips/cpuregs.h + #if defined(_DEBUG) #define DPRINTF(x) printf x; #else
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Tue Jun 23 12:03:29 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: ugen.c
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.126.2.9 -r1.126.2.10 src/sys/dev/usb/ugen.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/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.126.2.9 src/sys/dev/usb/ugen.c:1.126.2.10
--- src/sys/dev/usb/ugen.c:1.126.2.9 Sat May 9 09:35:20 2015
+++ src/sys/dev/usb/ugen.c Tue Jun 23 12:03:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.126.2.9 2015/05/09 09:35:20 skrll Exp $ */
+/* $NetBSD: ugen.c,v 1.126.2.10 2015/06/23 12:03:29 skrll Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ugen.c,v 1.126.2.9 2015/05/09 09:35:20 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ugen.c,v 1.126.2.10 2015/06/23 12:03:29 skrll Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -461,7 +461,7 @@ ugenopen(dev_t dev, int flag, int mode,
sce-ibuf = NULL;
return EIO;
}
- for(i = 0; i UGEN_NISOREQS; ++i) {
+ for (i = 0; i UGEN_NISOREQS; ++i) {
sce-isoreqs[i].sce = sce;
xfer = usbd_alloc_xfer(sc-sc_udev);
if (xfer == NULL)
@@ -469,12 +469,12 @@ ugenopen(dev_t dev, int flag, int mode,
sce-isoreqs[i].xfer = xfer;
tbuf = usbd_alloc_buffer
(xfer, isize * UGEN_NISORFRMS);
-if (tbuf == 0) {
+if (tbuf == NULL) {
i++;
goto bad;
}
sce-isoreqs[i].dmabuf = tbuf;
-for(j = 0; j UGEN_NISORFRMS; ++j)
+for (j = 0; j UGEN_NISORFRMS; ++j)
sce-isoreqs[i].sizes[j] = isize;
usbd_setup_isoc_xfer
(xfer, sce-pipeh, sce-isoreqs[i],
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Tue Jun 23 12:03:29 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: ugen.c Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.126.2.9 -r1.126.2.10 src/sys/dev/usb/ugen.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Tue Jun 23 12:07:20 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: aubtfwl.c
Log Message:
Unwrap line
To generate a diff of this commit:
cvs rdiff -u -r1.5.10.5 -r1.5.10.6 src/sys/dev/usb/aubtfwl.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/usb/aubtfwl.c
diff -u src/sys/dev/usb/aubtfwl.c:1.5.10.5 src/sys/dev/usb/aubtfwl.c:1.5.10.6
--- src/sys/dev/usb/aubtfwl.c:1.5.10.5 Sat Mar 21 11:33:37 2015
+++ src/sys/dev/usb/aubtfwl.c Tue Jun 23 12:07:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: aubtfwl.c,v 1.5.10.5 2015/03/21 11:33:37 skrll Exp $ */
+/* $NetBSD: aubtfwl.c,v 1.5.10.6 2015/06/23 12:07:20 skrll Exp $ */
/*
* Copyright (c) 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: aubtfwl.c,v 1.5.10.5 2015/03/21 11:33:37 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: aubtfwl.c,v 1.5.10.6 2015/06/23 12:07:20 skrll Exp $);
#include sys/param.h
#include dev/usb/usb.h
@@ -190,8 +190,7 @@ aubtfwl_firmware_load(device_t self, con
if (error != 0) {
break;
}
- error = usbd_bulk_transfer(xfer, pipe,
- 0, USBD_DEFAULT_TIMEOUT,
+ error = usbd_bulk_transfer(xfer, pipe, 0, USBD_DEFAULT_TIMEOUT,
buf, n);
if (error != USBD_NORMAL_COMPLETION) {
aprint_error_dev(self, xfer failed, %s\n,
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Tue Jun 23 12:07:20 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: aubtfwl.c Log Message: Unwrap line To generate a diff of this commit: cvs rdiff -u -r1.5.10.5 -r1.5.10.6 src/sys/dev/usb/aubtfwl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Tue Jun 23 12:08:21 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: usbdevices.config Log Message: Hook in udsir To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.24.6.1 src/sys/dev/usb/usbdevices.config 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/usb/usbdevices.config diff -u src/sys/dev/usb/usbdevices.config:1.24 src/sys/dev/usb/usbdevices.config:1.24.6.1 --- src/sys/dev/usb/usbdevices.config:1.24 Sun Mar 16 09:34:45 2014 +++ src/sys/dev/usb/usbdevices.config Tue Jun 23 12:08:21 2015 @@ -1,4 +1,4 @@ -# $NetBSD: usbdevices.config,v 1.24 2014/03/16 09:34:45 martin Exp $ +# $NetBSD: usbdevices.config,v 1.24.6.1 2015/06/23 12:08:21 skrll Exp $ # # This file contains all USB related configuration. # It is suitable for inclusion in a kernel config(5) file. @@ -106,6 +106,10 @@ irframe* at stuirda? ustir* at uhub? port ? irframe* at ustir? +# KingSun/DonShine USB/IrDA Bridge +udsir* at uhub? port ? +irframe* at udsir? + # Windows Media Center IR transceiver irmce* at uhub? port ? cir* at irmce?
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Tue Jun 23 12:08:21 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: usbdevices.config Log Message: Hook in udsir To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.24.6.1 src/sys/dev/usb/usbdevices.config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: msaitoh Date: Tue Jun 23 10:00:13 UTC 2015 Modified Files: src/sys/arch/x86/x86: intr.c Log Message: Fix a bug that an interrupt mask is unmasked in intr_disestablish_xcall(). It's not intended. - If there is no any handler, 1) do delroute because it has no any source and 2) dont' hwunmask to prevent spurious interrupt. - If there is any handler, 1) don't delroute because it has source and 2) do hwunmask to be able to get interrupt again. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/arch/x86/x86/intr.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/x86/x86
Module Name:src Committed By: msaitoh Date: Tue Jun 23 10:00:13 UTC 2015 Modified Files: src/sys/arch/x86/x86: intr.c Log Message: Fix a bug that an interrupt mask is unmasked in intr_disestablish_xcall(). It's not intended. - If there is no any handler, 1) do delroute because it has no any source and 2) dont' hwunmask to prevent spurious interrupt. - If there is any handler, 1) don't delroute because it has source and 2) do hwunmask to be able to get interrupt again. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/arch/x86/x86/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/x86/x86/intr.c diff -u src/sys/arch/x86/x86/intr.c:1.85 src/sys/arch/x86/x86/intr.c:1.86 --- src/sys/arch/x86/x86/intr.c:1.85 Fri May 15 08:36:41 2015 +++ src/sys/arch/x86/x86/intr.c Tue Jun 23 10:00:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.c,v 1.85 2015/05/15 08:36:41 knakahara Exp $ */ +/* $NetBSD: intr.c,v 1.86 2015/06/23 10:00:13 msaitoh Exp $ */ /*- * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -133,7 +133,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.85 2015/05/15 08:36:41 knakahara Exp $); +__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.86 2015/06/23 10:00:13 msaitoh Exp $); #include opt_intrdebug.h #include opt_multiprocessor.h @@ -1096,8 +1096,18 @@ intr_disestablish_xcall(void *arg1, void *p = q-ih_next; intr_calculatemasks(ci); - (*pic-pic_delroute)(pic, ci, ih-ih_pin, idtvec, source-is_type); - (*pic-pic_hwunmask)(pic, ih-ih_pin); + /* + * If there is no any handler, 1) do delroute because it has no + * any source and 2) dont' hwunmask to prevent spurious interrupt. + * + * If there is any handler, 1) don't delroute because it has source + * and 2) do hwunmask to be able to get interrupt again. + * + */ + if (source-is_handlers == NULL) + (*pic-pic_delroute)(pic, ci, ih-ih_pin, idtvec, source-is_type); + else + (*pic-pic_hwunmask)(pic, ih-ih_pin); /* Re-enable interrupts. */ x86_write_psl(psl);
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: dholland Date: Tue Jun 23 06:28:29 UTC 2015 Modified Files: src/sys/compat/netbsd32: netbsd32_nfssvc.c Log Message: add missing opt_nfsserver.h To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_nfssvc.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/compat/netbsd32/netbsd32_nfssvc.c diff -u src/sys/compat/netbsd32/netbsd32_nfssvc.c:1.1 src/sys/compat/netbsd32/netbsd32_nfssvc.c:1.2 --- src/sys/compat/netbsd32/netbsd32_nfssvc.c:1.1 Mon Jun 22 10:35:00 2015 +++ src/sys/compat/netbsd32/netbsd32_nfssvc.c Tue Jun 23 06:28:29 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_nfssvc.c,v 1.1 2015/06/22 10:35:00 mrg Exp $ */ +/* $NetBSD: netbsd32_nfssvc.c,v 1.2 2015/06/23 06:28:29 dholland Exp $ */ /* * Copyright (c) 2015 Matthew R. Green @@ -29,10 +29,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netbsd32_nfssvc.c,v 1.1 2015/06/22 10:35:00 mrg Exp $); +__KERNEL_RCSID(0, $NetBSD: netbsd32_nfssvc.c,v 1.2 2015/06/23 06:28:29 dholland Exp $); #if defined(_KERNEL_OPT) #include opt_nfs.h +#include opt_nfsserver.h #include opt_compat_netbsd.h #endif
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: dholland Date: Tue Jun 23 06:28:29 UTC 2015 Modified Files: src/sys/compat/netbsd32: netbsd32_nfssvc.c Log Message: add missing opt_nfsserver.h To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_nfssvc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
re: CVS commit: src/sys/compat/netbsd32
David A. Holland writes: Module Name: src Committed By: dholland Date: Tue Jun 23 04:44:08 UTC 2015 Modified Files: src/sys/compat/netbsd32: syscalls.master Log Message: Don't reference netbsd32_nfssvc unless NFSSERVER is defined. Fixes PR 49994. thanks.
Re: CVS commit: src/sys/dev/sysmon
On Tue, Jun 23, 2015 at 10:41:42AM +, Paul Goyette wrote: Committed By: pgoyette Date: Tue Jun 23 10:41:42 UTC 2015 Modified Files: src/sys/dev/sysmon: sysmon_envsys_events.c Log Message: Fix the KASSERT - we want to make sure that _both_ pointers are non-NULL, not just that one or the other is non-NULL! Wouldn't it be better written as: KASSERT(sme != NULL); KASSERT(edata != NULL); Same effect, but when one of the triggers you know immediately which pointer was NULL. --chris
CVS commit: src/sys/fs/ptyfs
Module Name:src Committed By: hannken Date: Tue Jun 23 10:41:07 UTC 2015 Modified Files: src/sys/fs/ptyfs: ptyfs_vnops.c Log Message: No need to call spec_inactive() from ptyfs_incative(). To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/fs/ptyfs/ptyfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/ptyfs/ptyfs_vnops.c diff -u src/sys/fs/ptyfs/ptyfs_vnops.c:1.50 src/sys/fs/ptyfs/ptyfs_vnops.c:1.51 --- src/sys/fs/ptyfs/ptyfs_vnops.c:1.50 Thu Aug 21 06:40:35 2014 +++ src/sys/fs/ptyfs/ptyfs_vnops.c Tue Jun 23 10:41:06 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ptyfs_vnops.c,v 1.50 2014/08/21 06:40:35 maxv Exp $ */ +/* $NetBSD: ptyfs_vnops.c,v 1.51 2015/06/23 10:41:06 hannken Exp $ */ /* * Copyright (c) 1993, 1995 @@ -76,7 +76,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ptyfs_vnops.c,v 1.50 2014/08/21 06:40:35 maxv Exp $); +__KERNEL_RCSID(0, $NetBSD: ptyfs_vnops.c,v 1.51 2015/06/23 10:41:06 hannken Exp $); #include sys/param.h #include sys/systm.h @@ -242,7 +242,8 @@ ptyfs_inactive(void *v) if (ptyfs-ptyfs_type == PTYFSptc) ptyfs_clr_active(vp-v_mount, ptyfs-ptyfs_pty); - return spec_inactive(v); + VOP_UNLOCK(vp); + return 0; } /*
CVS commit: src/sys/kern
Module Name:src Committed By: hannken Date: Tue Jun 23 10:40:36 UTC 2015 Modified Files: src/sys/kern: vfs_vnode.c Log Message: Remove the test for mounted-on block devices in vclean() and always close the vnode here. A forced unmount of a file system holding a mounted-on block device will make this mounted-on file system unusable. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/kern/vfs_vnode.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: hannken
Date: Tue Jun 23 10:40:36 UTC 2015
Modified Files:
src/sys/kern: vfs_vnode.c
Log Message:
Remove the test for mounted-on block devices in vclean() and
always close the vnode here.
A forced unmount of a file system holding a mounted-on
block device will make this mounted-on file system unusable.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/kern/vfs_vnode.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/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.42 src/sys/kern/vfs_vnode.c:1.43
--- src/sys/kern/vfs_vnode.c:1.42 Mon Apr 20 19:36:55 2015
+++ src/sys/kern/vfs_vnode.c Tue Jun 23 10:40:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.42 2015/04/20 19:36:55 riastradh Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.43 2015/06/23 10:40:36 hannken Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_vnode.c,v 1.42 2015/04/20 19:36:55 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_vnode.c,v 1.43 2015/06/23 10:40:36 hannken Exp $);
#define _VFS_VNODE_PRIVATE
@@ -956,7 +956,7 @@ static void
vclean(vnode_t *vp)
{
lwp_t *l = curlwp;
- bool recycle, active, doclose;
+ bool recycle, active;
int error;
KASSERT(mutex_owned(vp-v_interlock));
@@ -969,8 +969,6 @@ vclean(vnode_t *vp)
}
active = (vp-v_usecount 1);
- doclose = ! (active vp-v_type == VBLK
- spec_node_getmountedfs(vp) != NULL);
mutex_exit(vp-v_interlock);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
@@ -995,18 +993,16 @@ vclean(vnode_t *vp)
* deactivated before being reclaimed. Note that the
* VOP_INACTIVE will unlock the vnode.
*/
- if (doclose) {
- error = vinvalbuf(vp, V_SAVE, NOCRED, l, 0, 0);
- if (error != 0) {
- if (wapbl_vphaswapbl(vp))
-WAPBL_DISCARD(wapbl_vptomp(vp));
- error = vinvalbuf(vp, 0, NOCRED, l, 0, 0);
- }
- KASSERT(error == 0);
- KASSERT((vp-v_iflag VI_ONWORKLST) == 0);
- if (active (vp-v_type == VBLK || vp-v_type == VCHR)) {
- spec_node_revoke(vp);
- }
+ error = vinvalbuf(vp, V_SAVE, NOCRED, l, 0, 0);
+ if (error != 0) {
+ if (wapbl_vphaswapbl(vp))
+ WAPBL_DISCARD(wapbl_vptomp(vp));
+ error = vinvalbuf(vp, 0, NOCRED, l, 0, 0);
+ }
+ KASSERT(error == 0);
+ KASSERT((vp-v_iflag VI_ONWORKLST) == 0);
+ if (active (vp-v_type == VBLK || vp-v_type == VCHR)) {
+ spec_node_revoke(vp);
}
if (active) {
VOP_INACTIVE(vp, recycle);
@@ -1041,14 +1037,9 @@ vclean(vnode_t *vp)
/* Done with purge, notify sleepers of the grim news. */
mutex_enter(vp-v_interlock);
- if (doclose) {
- vp-v_op = dead_vnodeop_p;
- vp-v_vflag |= VV_LOCKSWORK;
- vp-v_iflag |= VI_CLEAN;
- } else {
- vp-v_op = spec_vnodeop_p;
- vp-v_vflag = ~VV_LOCKSWORK;
- }
+ vp-v_op = dead_vnodeop_p;
+ vp-v_vflag |= VV_LOCKSWORK;
+ vp-v_iflag |= VI_CLEAN;
vp-v_tag = VT_NON;
KNOTE(vp-v_klist, NOTE_REVOKE);
vp-v_iflag = ~VI_XLOCK;
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: hannken Date: Tue Jun 23 10:41:32 UTC 2015 Modified Files: src/sys/rump/librump/rumpvfs: rumpfs.c Log Message: VOP_INACTIVE() is a rump operation, not a specfs operation. To generate a diff of this commit: cvs rdiff -u -r1.134 -r1.135 src/sys/rump/librump/rumpvfs/rumpfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: hannken
Date: Tue Jun 23 10:42:35 UTC 2015
Modified Files:
src/sys/kern: vfs_subr.c
src/sys/miscfs/deadfs: dead_vfsops.c
src/sys/miscfs/specfs: spec_vnops.c specdev.h
Log Message:
Add a vfs_newvnode() method to deadfs and use it to create
anonymous device vnodes with bdevvp() and cdevvp().
Implement spec_inactive() and spec_reclaim() to handle these nodes.
To generate a diff of this commit:
cvs rdiff -u -r1.446 -r1.447 src/sys/kern/vfs_subr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/miscfs/deadfs/dead_vfsops.c
cvs rdiff -u -r1.147 -r1.148 src/sys/miscfs/specfs/spec_vnops.c
cvs rdiff -u -r1.43 -r1.44 src/sys/miscfs/specfs/specdev.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_subr.c
diff -u src/sys/kern/vfs_subr.c:1.446 src/sys/kern/vfs_subr.c:1.447
--- src/sys/kern/vfs_subr.c:1.446 Wed May 6 15:57:08 2015
+++ src/sys/kern/vfs_subr.c Tue Jun 23 10:42:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_subr.c,v 1.446 2015/05/06 15:57:08 hannken Exp $ */
+/* $NetBSD: vfs_subr.c,v 1.447 2015/06/23 10:42:34 hannken Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_subr.c,v 1.446 2015/05/06 15:57:08 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_subr.c,v 1.447 2015/06/23 10:42:34 hannken Exp $);
#include opt_ddb.h
#include opt_compat_netbsd.h
@@ -117,11 +117,12 @@ const int vttoif_tab[9] = {
int doforce = 1; /* 1 = permit forcible unmounting */
int prtactive = 0; /* 1 = print out reclaim of active vnodes */
+extern struct mount *dead_rootmount;
+
/*
* Local declarations.
*/
-static int getdevvp(dev_t, vnode_t **, enum vtype);
static void vn_initialize_syncerd(void);
/*
@@ -342,8 +343,13 @@ loop:
int
bdevvp(dev_t dev, vnode_t **vpp)
{
+ struct vattr va;
+
+ vattr_null(va);
+ va.va_type = VBLK;
+ va.va_rdev = dev;
- return (getdevvp(dev, vpp, VBLK));
+ return vcache_new(dead_rootmount, NULL, va, NOCRED, vpp);
}
/*
@@ -353,8 +359,13 @@ bdevvp(dev_t dev, vnode_t **vpp)
int
cdevvp(dev_t dev, vnode_t **vpp)
{
+ struct vattr va;
- return (getdevvp(dev, vpp, VCHR));
+ vattr_null(va);
+ va.va_type = VCHR;
+ va.va_rdev = dev;
+
+ return vcache_new(dead_rootmount, NULL, va, NOCRED, vpp);
}
/*
@@ -479,36 +490,6 @@ reassignbuf(struct buf *bp, struct vnode
}
/*
- * Create a vnode for a device.
- * Used by bdevvp (block device) for root file system etc.,
- * and by cdevvp (character device) for console and kernfs.
- */
-static int
-getdevvp(dev_t dev, vnode_t **vpp, enum vtype type)
-{
- vnode_t *vp;
- vnode_t *nvp;
- int error;
-
- if (dev == NODEV) {
- *vpp = NULL;
- return (0);
- }
- error = getnewvnode(VT_NON, NULL, spec_vnodeop_p, NULL, nvp);
- if (error) {
- *vpp = NULL;
- return (error);
- }
- vp = nvp;
- vp-v_type = type;
- vp-v_vflag |= VV_MPSAFE;
- uvm_vnp_setsize(vp, 0);
- spec_node_init(vp, dev);
- *vpp = vp;
- return (0);
-}
-
-/*
* Lookup a vnode by device number and return it referenced.
*/
int
Index: src/sys/miscfs/deadfs/dead_vfsops.c
diff -u src/sys/miscfs/deadfs/dead_vfsops.c:1.3 src/sys/miscfs/deadfs/dead_vfsops.c:1.4
--- src/sys/miscfs/deadfs/dead_vfsops.c:1.3 Tue Jun 23 10:41:59 2015
+++ src/sys/miscfs/deadfs/dead_vfsops.c Tue Jun 23 10:42:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dead_vfsops.c,v 1.3 2015/06/23 10:41:59 hannken Exp $ */
+/* $NetBSD: dead_vfsops.c,v 1.4 2015/06/23 10:42:34 hannken Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dead_vfsops.c,v 1.3 2015/06/23 10:41:59 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: dead_vfsops.c,v 1.4 2015/06/23 10:42:34 hannken Exp $);
#include sys/param.h
#include sys/systm.h
@@ -63,6 +63,8 @@ struct vfsops dead_vfsops = {
.vfs_statvfs = (void *)dead_panic,
.vfs_sync = (void *)dead_panic,
.vfs_vget = (void *)dead_panic,
+ .vfs_loadvnode = (void *)dead_panic,
+ .vfs_newvnode = dead_newvnode,
.vfs_fhtovp = (void *)dead_panic,
.vfs_vptofh = (void *)dead_panic,
.vfs_init = (void *)dead_panic,
@@ -84,3 +86,30 @@ dead_panic(void)
panic(dead fs operation used);
}
+
+/*
+ * Create a new anonymous device vnode.
+ */
+int
+dead_newvnode(struct mount *mp, struct vnode *dvp, struct vnode *vp,
+struct vattr *vap, kauth_cred_t cred,
+size_t *key_len, const void **new_key)
+{
+
+ KASSERT(mp == dead_rootmount);
+ KASSERT(dvp == NULL);
+ KASSERT(vap-va_type == VCHR || vap-va_type == VBLK);
+ KASSERT(vap-va_rdev != VNOVAL);
+
+ vp-v_tag = VT_NON;
+ vp-v_type = vap-va_type;
+ vp-v_op = spec_vnodeop_p;
+ vp-v_vflag |= VV_MPSAFE;
+ uvm_vnp_setsize(vp, 0);
+ spec_node_init(vp, vap-va_rdev);
+
+ *key_len = sizeof(struct vnode *);
+ *new_key = vp;
+
+ return 0;
+}
Index: src/sys/miscfs/specfs/spec_vnops.c
diff -u
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: hannken Date: Tue Jun 23 10:41:32 UTC 2015 Modified Files: src/sys/rump/librump/rumpvfs: rumpfs.c Log Message: VOP_INACTIVE() is a rump operation, not a specfs operation. To generate a diff of this commit: cvs rdiff -u -r1.134 -r1.135 src/sys/rump/librump/rumpvfs/rumpfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/librump/rumpvfs/rumpfs.c diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.134 src/sys/rump/librump/rumpvfs/rumpfs.c:1.135 --- src/sys/rump/librump/rumpvfs/rumpfs.c:1.134 Wed Jan 7 04:05:26 2015 +++ src/sys/rump/librump/rumpvfs/rumpfs.c Tue Jun 23 10:41:32 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpfs.c,v 1.134 2015/01/07 04:05:26 riastradh Exp $ */ +/* $NetBSD: rumpfs.c,v 1.135 2015/06/23 10:41:32 hannken Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.134 2015/01/07 04:05:26 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.135 2015/06/23 10:41:32 hannken Exp $); #include sys/param.h #include sys/atomic.h @@ -1647,6 +1647,7 @@ rump_vop_spec(void *v) case VOP_LOCK_DESCOFFSET: case VOP_UNLOCK_DESCOFFSET: case VOP_ISLOCKED_DESCOFFSET: + case VOP_INACTIVE_DESCOFFSET: case VOP_RECLAIM_DESCOFFSET: opvec = rump_vnodeop_p; break;
CVS commit: src/sys/dev/sysmon
Module Name:src Committed By: pgoyette Date: Tue Jun 23 10:41:42 UTC 2015 Modified Files: src/sys/dev/sysmon: sysmon_envsys_events.c Log Message: Fix the KASSERT - we want to make sure that _both_ pointers are non-NULL, n ot just that one or the other is non-NULL! To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/dev/sysmon/sysmon_envsys_events.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/sysmon/sysmon_envsys_events.c diff -u src/sys/dev/sysmon/sysmon_envsys_events.c:1.115 src/sys/dev/sysmon/sysmon_envsys_events.c:1.116 --- src/sys/dev/sysmon/sysmon_envsys_events.c:1.115 Sat Apr 18 14:44:44 2015 +++ src/sys/dev/sysmon/sysmon_envsys_events.c Tue Jun 23 10:41:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sysmon_envsys_events.c,v 1.115 2015/04/18 14:44:44 mlelstv Exp $ */ +/* $NetBSD: sysmon_envsys_events.c,v 1.116 2015/06/23 10:41:41 pgoyette Exp $ */ /*- * Copyright (c) 2007, 2008 Juan Romero Pardines. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_events.c,v 1.115 2015/04/18 14:44:44 mlelstv Exp $); +__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_events.c,v 1.116 2015/06/23 10:41:41 pgoyette Exp $); #include sys/param.h #include sys/types.h @@ -768,7 +768,7 @@ sme_events_worker(struct work *wk, void envsys_data_t *edata = see-see_edata; KASSERT(wk == see-see_wk); - KASSERT(sme != NULL || edata != NULL); + KASSERT(sme != NULL edata != NULL); mutex_enter(sme-sme_mtx); see-see_flags |= SEE_EVENT_WORKING;
CVS commit: src/sys/dev/sysmon
Module Name:src Committed By: pgoyette Date: Tue Jun 23 10:41:42 UTC 2015 Modified Files: src/sys/dev/sysmon: sysmon_envsys_events.c Log Message: Fix the KASSERT - we want to make sure that _both_ pointers are non-NULL, n ot just that one or the other is non-NULL! To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/dev/sysmon/sysmon_envsys_events.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/ptyfs
Module Name:src Committed By: hannken Date: Tue Jun 23 10:41:07 UTC 2015 Modified Files: src/sys/fs/ptyfs: ptyfs_vnops.c Log Message: No need to call spec_inactive() from ptyfs_incative(). To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/fs/ptyfs/ptyfs_vnops.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: hannken Date: Tue Jun 23 10:42:35 UTC 2015 Modified Files: src/sys/kern: vfs_subr.c src/sys/miscfs/deadfs: dead_vfsops.c src/sys/miscfs/specfs: spec_vnops.c specdev.h Log Message: Add a vfs_newvnode() method to deadfs and use it to create anonymous device vnodes with bdevvp() and cdevvp(). Implement spec_inactive() and spec_reclaim() to handle these nodes. To generate a diff of this commit: cvs rdiff -u -r1.446 -r1.447 src/sys/kern/vfs_subr.c cvs rdiff -u -r1.3 -r1.4 src/sys/miscfs/deadfs/dead_vfsops.c cvs rdiff -u -r1.147 -r1.148 src/sys/miscfs/specfs/spec_vnops.c cvs rdiff -u -r1.43 -r1.44 src/sys/miscfs/specfs/specdev.h 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: hannken Date: Tue Jun 23 10:41:59 UTC 2015 Modified Files: src/sys/kern: vfs_vnode.c src/sys/miscfs/deadfs: dead_vfsops.c Log Message: Use VFS_PROTOS() for deadfs. Rename dead_mount to dead_rootmount. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/kern/vfs_vnode.c cvs rdiff -u -r1.2 -r1.3 src/sys/miscfs/deadfs/dead_vfsops.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: hannken
Date: Tue Jun 23 10:41:59 UTC 2015
Modified Files:
src/sys/kern: vfs_vnode.c
src/sys/miscfs/deadfs: dead_vfsops.c
Log Message:
Use VFS_PROTOS() for deadfs. Rename dead_mount to dead_rootmount.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/kern/vfs_vnode.c
cvs rdiff -u -r1.2 -r1.3 src/sys/miscfs/deadfs/dead_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.43 src/sys/kern/vfs_vnode.c:1.44
--- src/sys/kern/vfs_vnode.c:1.43 Tue Jun 23 10:40:36 2015
+++ src/sys/kern/vfs_vnode.c Tue Jun 23 10:41:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.43 2015/06/23 10:40:36 hannken Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.44 2015/06/23 10:41:59 hannken Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_vnode.c,v 1.43 2015/06/23 10:40:36 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_vnode.c,v 1.44 2015/06/23 10:41:59 hannken Exp $);
#define _VFS_VNODE_PRIVATE
@@ -162,7 +162,6 @@ struct vcache_node {
u_int numvnodes __cacheline_aligned;
static pool_cache_t vnode_cache __read_mostly;
-static struct mount *dead_mount;
/*
* There are two free lists: one is for vnodes which have no buffer/page
@@ -201,6 +200,7 @@ static void vnpanic(vnode_t *, const ch
static void vwait(vnode_t *, int);
/* Routines having to do with the management of the vnode table. */
+extern struct mount *dead_rootmount;
extern int (**dead_vnodeop_p)(void *);
extern struct vfsops dead_vfsops;
@@ -213,9 +213,9 @@ vfs_vnode_sysinit(void)
NULL, IPL_NONE, NULL, NULL, NULL);
KASSERT(vnode_cache != NULL);
- dead_mount = vfs_mountalloc(dead_vfsops, NULL);
- KASSERT(dead_mount != NULL);
- dead_mount-mnt_iflag = IMNT_MPSAFE;
+ dead_rootmount = vfs_mountalloc(dead_vfsops, NULL);
+ KASSERT(dead_rootmount != NULL);
+ dead_rootmount-mnt_iflag = IMNT_MPSAFE;
mutex_init(vnode_free_list_lock, MUTEX_DEFAULT, IPL_NONE);
TAILQ_INIT(vnode_free_list);
@@ -1032,8 +1032,8 @@ vclean(vnode_t *vp)
/* Move to dead mount. */
vp-v_vflag = ~VV_ROOT;
- atomic_inc_uint(dead_mount-mnt_refcnt);
- vfs_insmntque(vp, dead_mount);
+ atomic_inc_uint(dead_rootmount-mnt_refcnt);
+ vfs_insmntque(vp, dead_rootmount);
/* Done with purge, notify sleepers of the grim news. */
mutex_enter(vp-v_interlock);
Index: src/sys/miscfs/deadfs/dead_vfsops.c
diff -u src/sys/miscfs/deadfs/dead_vfsops.c:1.2 src/sys/miscfs/deadfs/dead_vfsops.c:1.3
--- src/sys/miscfs/deadfs/dead_vfsops.c:1.2 Sun Mar 23 15:21:16 2014
+++ src/sys/miscfs/deadfs/dead_vfsops.c Tue Jun 23 10:41:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dead_vfsops.c,v 1.2 2014/03/23 15:21:16 hannken Exp $ */
+/* $NetBSD: dead_vfsops.c,v 1.3 2015/06/23 10:41:59 hannken Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,13 +30,19 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dead_vfsops.c,v 1.2 2014/03/23 15:21:16 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: dead_vfsops.c,v 1.3 2015/06/23 10:41:59 hannken Exp $);
#include sys/param.h
#include sys/systm.h
#include sys/vnode.h
#include sys/mount.h
+#include miscfs/specfs/specdev.h
+
+VFS_PROTOS(dead);
+
+static void dead_panic(void);
+
extern const struct vnodeopv_desc dead_vnodeop_opv_desc;
static const struct vnodeopv_desc * const dead_vnodeopv_descs[] = {
@@ -44,12 +50,7 @@ static const struct vnodeopv_desc * cons
NULL
};
-static void
-dead_panic(void)
-{
-
- panic(dead fs operation used);
-}
+struct mount *dead_rootmount;
struct vfsops dead_vfsops = {
.vfs_name = dead,
@@ -76,3 +77,10 @@ struct vfsops dead_vfsops = {
.vfs_fsync = (void *)eopnotsupp,
.vfs_opv_descs = dead_vnodeopv_descs
};
+
+static void
+dead_panic(void)
+{
+
+ panic(dead fs operation used);
+}
Re: CVS commit: src/sys/compat/netbsd32
On Tue, Jun 23, 2015 at 06:23:36PM +1000, matthew green wrote: Log Message: Don't reference netbsd32_nfssvc unless NFSSERVER is defined. Fixes PR 49994. thanks. *bow* -- David A. Holland dholl...@netbsd.org
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: matt Date: Wed Jun 24 01:39:24 UTC 2015 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Remove spurious rump from directories To generate a diff of this commit: cvs rdiff -u -r1.629 -r1.630 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: matt Date: Wed Jun 24 01:39:24 UTC 2015 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Remove spurious rump from directories To generate a diff of this commit: cvs rdiff -u -r1.629 -r1.630 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.629 src/distrib/sets/lists/tests/mi:1.630 --- src/distrib/sets/lists/tests/mi:1.629 Mon Jun 22 19:10:14 2015 +++ src/distrib/sets/lists/tests/mi Wed Jun 24 01:39:24 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.629 2015/06/22 19:10:14 christos Exp $ +# $NetBSD: mi,v 1.630 2015/06/24 01:39:24 matt Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -30,23 +30,23 @@ ./usr/libdata/debug/usr/tests/dev/scsipitests-fs-debug compattestfile,atf ./usr/libdata/debug/usr/tests/dev/sysmontests-fs-debug compattestfile,atf ./usr/libdata/debug/usr/tests/fs tests-fs-debug compattestfile,atf -./usr/libdata/debug/usr/tests/fs/ffs tests-fs-debug compattestfile,atf,rump +./usr/libdata/debug/usr/tests/fs/ffs tests-fs-debug compattestfile,atf ./usr/libdata/debug/usr/tests/fs/fifofs tests-fs-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/fs/hfs tests-fs-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/fs/kernfs tests-fs-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/fs/lfs tests-fs-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/fs/msdosfstests-fs-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/fs/nfs tests-fs-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/fs/nfs/nfsservicetests-fs-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/fs/nullfs tests-fs-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/fs/psshfs tests-fs-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/fs/ptyfs tests-fs-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/fs/puffs tests-fs-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/fs/puffs/h_dtfstests-fs-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/fs/tmpfs tests-fs-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/fs/umapfs tests-fs-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/fs/union tests-fs-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/fs/vfs tests-fs-debug compattestfile,atf,rump +./usr/libdata/debug/usr/tests/fs/hfs tests-fs-debug compattestfile,atf +./usr/libdata/debug/usr/tests/fs/kernfs tests-fs-debug compattestfile,atf +./usr/libdata/debug/usr/tests/fs/lfs tests-fs-debug compattestfile,atf +./usr/libdata/debug/usr/tests/fs/msdosfstests-fs-debug compattestfile,atf +./usr/libdata/debug/usr/tests/fs/nfs tests-fs-debug compattestfile,atf +./usr/libdata/debug/usr/tests/fs/nfs/nfsservicetests-fs-debug compattestfile,atf +./usr/libdata/debug/usr/tests/fs/nullfs tests-fs-debug compattestfile,atf +./usr/libdata/debug/usr/tests/fs/psshfs tests-fs-debug compattestfile,atf +./usr/libdata/debug/usr/tests/fs/ptyfs tests-fs-debug compattestfile,atf +./usr/libdata/debug/usr/tests/fs/puffs tests-fs-debug compattestfile,atf +./usr/libdata/debug/usr/tests/fs/puffs/h_dtfstests-fs-debug compattestfile,atf +./usr/libdata/debug/usr/tests/fs/tmpfs tests-fs-debug compattestfile,atf +./usr/libdata/debug/usr/tests/fs/umapfs tests-fs-debug compattestfile,atf +./usr/libdata/debug/usr/tests/fs/union tests-fs-debug compattestfile,atf +./usr/libdata/debug/usr/tests/fs/vfs tests-fs-debug compattestfile,atf ./usr/libdata/debug/usr/tests/include tests-include-tests compattestfile,atf ./usr/libdata/debug/usr/tests/include/machinetests-include-tests compattestfile,atf ./usr/libdata/debug/usr/tests/include/systests-include-tests compattestfile,atf @@ -152,12 +152,12 @@ ./usr/libdata/debug/usr/tests/net/mcast tests-net-debug compattestfile,atf ./usr/libdata/debug/usr/tests/net/net tests-net-debug compattestfile,atf ./usr/libdata/debug/usr/tests/net/sys tests-net-debug compattestfile,atf -./usr/libdata/debug/usr/tests/rump tests-syscall-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/rump/modautoloadtests-syscall-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/rump/rumpkerntests-syscall-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/rump/rumpkern/h_client tests-syscall-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/rump/rumpkern/h_server tests-syscall-debug compattestfile,atf,rump -./usr/libdata/debug/usr/tests/rump/rumpvfstests-syscall-debug compattestfile,atf,rump +./usr/libdata/debug/usr/tests/rump tests-syscall-debug
CVS commit: src/external/gpl3/gcc/dist/gcc/config/rs6000
Module Name:src
Committed By: matt
Date: Wed Jun 24 01:29:33 UTC 2015
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd64.h
Log Message:
Change CC1_SPEC andd CC1PLUS_SPEC to supply -fPIC by default if none of
m32 mrelocatable fpie fPIE fpic fPIC fno-pie fno-pic are supplied.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h
diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.12 src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.13
--- src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.12 Thu Apr 2 16:49:09 2015
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h Wed Jun 24 01:29:33 2015
@@ -87,6 +87,17 @@ extern int dot_symbols;
#define ELFv2_ABI_CHECK (rs6000_elf_abi == 2)
+#undef CC1_OS_NETBSD_SPEC
+#define CC1_OS_NETBSD_SPEC \
+ NETBSD_CC1_AND_CC1PLUS_SPEC \
+ %{!m32: %{!mrelocatable: %{!fno-pie: %{!fno-pic: \
+ %{!fpie: %{!fpic: \
+ %{!fPIE: %{!fPIC:-fPIC
+/* %{!m32: %{!mcmodel*: -mcmodel=medium}} */
+
+#undef CC1PLUS_SPEC
+#define CC1PLUS_SPEC CC1_OS_NETBSD_SPEC
+
#undef SUBSUBTARGET_OVERRIDE_OPTIONS
#define SUBSUBTARGET_OVERRIDE_OPTIONS\
do\
CVS commit: src/external/gpl3/gcc/dist/gcc/config/rs6000
Module Name:src Committed By: matt Date: Wed Jun 24 01:29:33 UTC 2015 Modified Files: src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd64.h Log Message: Change CC1_SPEC andd CC1PLUS_SPEC to supply -fPIC by default if none of m32 mrelocatable fpie fPIE fpic fPIC fno-pie fno-pic are supplied. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 \ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
