CVS commit: src/external/gpl3/gcc/dist/gcc/config/rs6000
Module Name:src Committed By: matt Date: Fri Aug 22 06:51:34 UTC 2014 Modified Files: src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd.h Log Message: Simplify a little (avoid indirection) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.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/netbsd.h diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.5 src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.6 --- src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.5 Sat Mar 1 09:44:50 2014 +++ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h Fri Aug 22 06:51:34 2014 @@ -90,7 +90,7 @@ #define STARTFILE_SPEC NETBSD_STARTFILE_SPEC #undef ENDFILE_SPEC -#define ENDFILE_SPEC %(netbsd_endfile_spec) +#define ENDFILE_SPEC NETBSD_ENDFILE_SPEC #undef LIB_SPEC #define LIB_SPEC NETBSD_LIB_SPEC
CVS commit: src/external/gpl3/gcc/dist/gcc/config/rs6000
Module Name:src Committed By: matt Date: Fri Aug 22 06:52:37 UTC 2014 Modified Files: src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd64.h Log Message: Check the variable for RELOCATABLE_NEEDS_FIXUP To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ 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.6 src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.7 --- src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.6 Tue Mar 4 08:43:12 2014 +++ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h Fri Aug 22 06:52:37 2014 @@ -77,7 +77,7 @@ extern int dot_symbols; -mrelocatable or -mrelocatable-lib is given. */ #undef RELOCATABLE_NEEDS_FIXUP #define RELOCATABLE_NEEDS_FIXUP \ - (target_flags target_flags_explicit MASK_RELOCATABLE) + (rs6000_isa_flags rs6000_isa_flags_explicit OPTION_MASK_RELOCATABLE) #undef RS6000_ABI_NAME #define RS6000_ABI_NAME netbsd
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src Committed By: skrll Date: Fri Aug 22 09:49:13 UTC 2014 Modified Files: src/sys/arch/evbarm/rpi: rpi_machdep.c Log Message: Remove unnecessary #include To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/rpi/rpi_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/rpi/rpi_machdep.c diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.43 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.44 --- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.43 Fri Jul 25 11:39:34 2014 +++ src/sys/arch/evbarm/rpi/rpi_machdep.c Fri Aug 22 09:49:13 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rpi_machdep.c,v 1.43 2014/07/25 11:39:34 jmcneill Exp $ */ +/* $NetBSD: rpi_machdep.c,v 1.44 2014/08/22 09:49:13 skrll Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.43 2014/07/25 11:39:34 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.44 2014/08/22 09:49:13 skrll Exp $); #include opt_evbarm_boardtype.h #include opt_ddb.h @@ -98,8 +98,6 @@ __KERNEL_RCSID(0, $NetBSD: rpi_machdep. #include dev/usb/ukbdvar.h #endif -#include ksyms.h - extern int KERNEL_BASE_phys[]; extern int KERNEL_BASE_virt[];
CVS commit: src/sys/rump/dev/lib/libvirtio_if_vioif
Module Name:src
Committed By: pooka
Date: Fri Aug 22 09:48:54 UTC 2014
Added Files:
src/sys/rump/dev/lib/libvirtio_if_vioif: Makefile
VIRTIO_IF_VIOIF.ioconf shlib_version vioif_at_virtio.c
Log Message:
Add a rump kernel component for the vioif virtio network interface.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile \
src/sys/rump/dev/lib/libvirtio_if_vioif/VIRTIO_IF_VIOIF.ioconf \
src/sys/rump/dev/lib/libvirtio_if_vioif/shlib_version \
src/sys/rump/dev/lib/libvirtio_if_vioif/vioif_at_virtio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile:1.1
--- /dev/null Fri Aug 22 09:48:54 2014
+++ src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile Fri Aug 22 09:48:54 2014
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2014/08/22 09:48:54 pooka Exp $
+#
+
+RUMPTOP=${TOPRUMP}
+
+.PATH: ${RUMPTOP}/../dev/pci
+
+LIB= rumpdev_virtio_if_vioif
+IOCONF= VIRTIO_IF_VIOIF.ioconf
+
+SRCS= vioif_at_virtio.c
+
+SRCS+= if_vioif.c
+
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
+
+.include ${RUMPTOP}/Makefile.rump
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libvirtio_if_vioif/VIRTIO_IF_VIOIF.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_if_vioif/VIRTIO_IF_VIOIF.ioconf:1.1
--- /dev/null Fri Aug 22 09:48:54 2014
+++ src/sys/rump/dev/lib/libvirtio_if_vioif/VIRTIO_IF_VIOIF.ioconf Fri Aug 22 09:48:54 2014
@@ -0,0 +1,12 @@
+# $NetBSD: VIRTIO_IF_VIOIF.ioconf,v 1.1 2014/08/22 09:48:54 pooka Exp $
+#
+
+ioconf virtio_if_vioif
+
+include conf/files
+include dev/pci/files.pci
+include rump/dev/files.rump
+
+pseudo-root virtio*
+
+vioif* at virtio? # Virtio network device
Index: src/sys/rump/dev/lib/libvirtio_if_vioif/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_if_vioif/shlib_version:1.1
--- /dev/null Fri Aug 22 09:48:54 2014
+++ src/sys/rump/dev/lib/libvirtio_if_vioif/shlib_version Fri Aug 22 09:48:54 2014
@@ -0,0 +1,2 @@
+major=0
+minor=0
Index: src/sys/rump/dev/lib/libvirtio_if_vioif/vioif_at_virtio.c
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_if_vioif/vioif_at_virtio.c:1.1
--- /dev/null Fri Aug 22 09:48:54 2014
+++ src/sys/rump/dev/lib/libvirtio_if_vioif/vioif_at_virtio.c Fri Aug 22 09:48:54 2014
@@ -0,0 +1,45 @@
+/* $NetBSD: vioif_at_virtio.c,v 1.1 2014/08/22 09:48:54 pooka Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: vioif_at_virtio.c,v 1.1 2014/08/22 09:48:54 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/bus.h
+
+#include rump_private.h
+
+#include ioconf.c
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+
+ config_init_component(cfdriver_ioconf_virtio_if_vioif,
+ cfattach_ioconf_virtio_if_vioif, cfdata_ioconf_virtio_if_vioif);
+}
CVS commit: src/sys/rump/dev/lib/libvirtio_ld
Module Name:src
Committed By: pooka
Date: Fri Aug 22 09:57:05 UTC 2014
Added Files:
src/sys/rump/dev/lib/libvirtio_ld: Makefile VIRTIO_LD.ioconf
ld_at_virtio.c shlib_version
Log Message:
Add a rump kernel component for ld@virtio.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libvirtio_ld/Makefile \
src/sys/rump/dev/lib/libvirtio_ld/VIRTIO_LD.ioconf \
src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c \
src/sys/rump/dev/lib/libvirtio_ld/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/dev/lib/libvirtio_ld/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_ld/Makefile:1.1
--- /dev/null Fri Aug 22 09:57:05 2014
+++ src/sys/rump/dev/lib/libvirtio_ld/Makefile Fri Aug 22 09:57:05 2014
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.1 2014/08/22 09:57:05 pooka Exp $
+#
+
+RUMPTOP=${TOPRUMP}
+
+.PATH: ${RUMPTOP}/../dev \
+ ${RUMPTOP}/../dev/pci
+
+LIB= rumpdev_virtio_ld
+IOCONF= VIRTIO_LD.ioconf
+
+SRCS= ld_at_virtio.c
+
+SRCS+= ld_virtio.c
+
+# XXX: ld.c does not really belong here, but placing it in libdisk
+# requires revamping config to be more modular in how CFDRIVER() is
+# used. moving ld up in the component tree later to libdisk won't
+# create problems, so just put it here for now. the excessive
+# dependencies of virtio_ld should prevent anyone from want to
+# provide ld via this component ...
+SRCS+= ld.c
+
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpvfs
+
+.include ${RUMPTOP}/Makefile.rump
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libvirtio_ld/VIRTIO_LD.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_ld/VIRTIO_LD.ioconf:1.1
--- /dev/null Fri Aug 22 09:57:05 2014
+++ src/sys/rump/dev/lib/libvirtio_ld/VIRTIO_LD.ioconf Fri Aug 22 09:57:05 2014
@@ -0,0 +1,12 @@
+# $NetBSD: VIRTIO_LD.ioconf,v 1.1 2014/08/22 09:57:05 pooka Exp $
+#
+
+ioconf virtio_ld
+
+include conf/files
+include dev/pci/files.pci
+include rump/dev/files.rump
+
+pseudo-root virtio*
+
+ld* at virtio? # Virtio disk device
Index: src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c:1.1
--- /dev/null Fri Aug 22 09:57:05 2014
+++ src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c Fri Aug 22 09:57:05 2014
@@ -0,0 +1,66 @@
+/* $NetBSD: ld_at_virtio.c,v 1.1 2014/08/22 09:57:05 pooka Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: ld_at_virtio.c,v 1.1 2014/08/22 09:57:05 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/bus.h
+#include sys/stat.h
+
+#include rump_private.h
+#include rump_vfs_private.h
+
+#include ioconf.c
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+
+ config_init_component(cfdriver_ioconf_virtio_ld,
+ cfattach_ioconf_virtio_ld, cfdata_ioconf_virtio_ld);
+}
+
+RUMP_COMPONENT(RUMP_COMPONENT_VFS)
+{
+ extern const struct bdevsw ld_bdevsw;
+ extern const struct cdevsw ld_cdevsw;
+ devmajor_t bmaj = -1, cmaj = -1;
+ int error;
+
+ if ((error = devsw_attach(ld, ld_bdevsw, bmaj,
+ ld_cdevsw, cmaj)) != 0)
+ panic(cannot attach ld: %d, error);
+
+ if ((error = rump_vfs_makedevnodes(S_IFBLK, /dev/ld0, 'a',
+ bmaj, 0, 7)) != 0)
+ panic(cannot create cooked ld dev nodes: %d, error);
+ if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/rld0, 'a',
+ cmaj, 0, 7)) != 0)
+ panic(cannot create raw ld dev nodes: %d, error);
+}
Index: src/sys/rump/dev/lib/libvirtio_ld/shlib_version
diff -u
CVS commit: src/sys/rump/dev
Module Name:src Committed By: pooka Date: Fri Aug 22 09:58:55 UTC 2014 Modified Files: src/sys/rump/dev: Makefile.rumpdevcomp Log Message: Build virtio components as part of RUMPPCIDEVS To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/rump/dev/Makefile.rumpdevcomp 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/dev/Makefile.rumpdevcomp diff -u src/sys/rump/dev/Makefile.rumpdevcomp:1.13 src/sys/rump/dev/Makefile.rumpdevcomp:1.14 --- src/sys/rump/dev/Makefile.rumpdevcomp:1.13 Wed Aug 13 15:01:32 2014 +++ src/sys/rump/dev/Makefile.rumpdevcomp Fri Aug 22 09:58:55 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.rumpdevcomp,v 1.13 2014/08/13 15:01:32 pooka Exp $ +# $NetBSD: Makefile.rumpdevcomp,v 1.14 2014/08/22 09:58:55 pooka Exp $ # RUMPDEVCOMP= audio bpf cgd disk dm drvctl fss md netsmb pad pud \ @@ -8,6 +8,7 @@ RUMPDEVCOMP= audio bpf cgd disk dm drvct RUMPUSBDEVS= ubt ucom ugenhc ulpt umass usb RUMPPCIDEVS= pci pci_if_iwn pci_if_pcn pci_if_wm +RUMPPCIDEVS+= pci_virtio virtio_if_vioif virtio_ld # Not really a PCI device, but RUMPPCIDEVS+= miiphy
CVS commit: [netbsd-7] src/sys
Module Name:src
Committed By: martin
Date: Fri Aug 22 10:15:22 UTC 2014
Modified Files:
src/sys/altq [netbsd-7]: altq_jobs.c
src/sys/dev/ic [netbsd-7]: oosiop.c
src/sys/dev/qbus [netbsd-7]: if_qe.c
src/sys/dev/rasops [netbsd-7]: rasops.c
src/sys/dev/vme [netbsd-7]: if_ie_vme.c
src/sys/net [netbsd-7]: if_gre.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #44):
sys/altq/altq_jobs.c1.7
Fix error branches to avoid leaks, noted by maxv@.
sys/dev/ic/oosiop.c 1.14
Fix leaks in oosiop_alloc_cb error branches, noted by maxv@.
While here, avoid a sketchy pointer cast that probably falls afoul
of strict aliasing rules.
sys/dev/qbus/if_qe.c1.73
Avoid leak in error branch, noted by maxv@, compile-tested for vax.
sys/dev/rasops/rasops.c 1.72
Don't leak f on failure. Noted by maxv@.
sys/dev/vme/if_ie_vme.c 1.31
Sizeof struct ievme, not sizeof size_t.
Noted by maxv@, compile-tested for sparc.
sys/net/if_gre.c1.160
Don't leak in gre_clone_create error branch.
Noted by maxv@, compile-tested for amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.34.1 src/sys/altq/altq_jobs.c
cvs rdiff -u -r1.13 -r1.13.34.1 src/sys/dev/ic/oosiop.c
cvs rdiff -u -r1.72 -r1.72.4.1 src/sys/dev/qbus/if_qe.c
cvs rdiff -u -r1.71 -r1.71.14.1 src/sys/dev/rasops/rasops.c
cvs rdiff -u -r1.30 -r1.30.28.1 src/sys/dev/vme/if_ie_vme.c
cvs rdiff -u -r1.159 -r1.159.2.1 src/sys/net/if_gre.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/altq/altq_jobs.c
diff -u src/sys/altq/altq_jobs.c:1.6 src/sys/altq/altq_jobs.c:1.6.34.1
--- src/sys/altq/altq_jobs.c:1.6 Fri Apr 9 19:32:45 2010
+++ src/sys/altq/altq_jobs.c Fri Aug 22 10:15:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_jobs.c,v 1.6 2010/04/09 19:32:45 plunky Exp $ */
+/* $NetBSD: altq_jobs.c,v 1.6.34.1 2014/08/22 10:15:22 martin Exp $ */
/* $KAME: altq_jobs.c,v 1.11 2005/04/13 03:44:25 suz Exp $ */
/*
* Copyright (c) 2001, the Rector and Board of Visitors of the
@@ -59,7 +59,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: altq_jobs.c,v 1.6 2010/04/09 19:32:45 plunky Exp $);
+__KERNEL_RCSID(0, $NetBSD: altq_jobs.c,v 1.6.34.1 2014/08/22 10:15:22 martin Exp $);
#ifdef _KERNEL_OPT
#include opt_altq.h
@@ -1158,7 +1158,7 @@ adjust_rates_rdc(struct jobs_if *jif)
error = update_error(jif);
if (!error)
- return (NULL);
+ goto fail;
prop_control = (upper_bound*upper_bound*min_share)
/(max_prod*(max_avg_pkt_size 2));
@@ -1252,6 +1252,9 @@ adjust_rates_rdc(struct jobs_if *jif)
}
}
return result;
+
+fail: free(result, M_DEVBUF);
+ return NULL;
}
/*
@@ -1284,19 +1287,19 @@ assign_rate_drops_adc(struct jobs_if *ji
result = malloc((jif-jif_maxpri+1)*sizeof(int64_t), M_DEVBUF, M_WAITOK);
if (result == NULL)
- return NULL;
+ goto fail0;
c = malloc((jif-jif_maxpri+1)*sizeof(u_int64_t), M_DEVBUF, M_WAITOK);
if (c == NULL)
- return NULL;
+ goto fail1;
n = malloc((jif-jif_maxpri+1)*sizeof(u_int64_t), M_DEVBUF, M_WAITOK);
if (n == NULL)
- return NULL;
+ goto fail2;
k = malloc((jif-jif_maxpri+1)*sizeof(u_int64_t), M_DEVBUF, M_WAITOK);
if (k == NULL)
- return NULL;
+ goto fail3;
available = malloc((jif-jif_maxpri+1)*sizeof(int64_t), M_DEVBUF, M_WAITOK);
if (available == NULL)
- return NULL;
+ goto fail4;
for (i = 0; i = jif-jif_maxpri; i++)
result[i] = 0;
@@ -1525,6 +1528,14 @@ assign_rate_drops_adc(struct jobs_if *ji
free(available, M_DEVBUF);
return (result);
+
+fail5: __unused
+ free(available, M_DEVBUF);
+fail4: free(k, M_DEVBUF);
+fail3: free(n, M_DEVBUF);
+fail2: free(c, M_DEVBUF);
+fail1: free(result, M_DEVBUF);
+fail0: return NULL;
}
/*
Index: src/sys/dev/ic/oosiop.c
diff -u src/sys/dev/ic/oosiop.c:1.13 src/sys/dev/ic/oosiop.c:1.13.34.1
--- src/sys/dev/ic/oosiop.c:1.13 Sat Nov 13 13:52:02 2010
+++ src/sys/dev/ic/oosiop.c Fri Aug 22 10:15:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: oosiop.c,v 1.13 2010/11/13 13:52:02 uebayasi Exp $ */
+/* $NetBSD: oosiop.c,v 1.13.34.1 2014/08/22 10:15:22 martin Exp $ */
/*
* Copyright (c) 2001 Shuichiro URATA. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: oosiop.c,v 1.13 2010/11/13 13:52:02 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: oosiop.c,v 1.13.34.1 2014/08/22 10:15:22 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -247,6 +247,7 @@ static int
oosiop_alloc_cb(struct oosiop_softc *sc, int ncb)
{
struct oosiop_cb *cb;
+ void *xfer_kva;
struct oosiop_xfer *xfer;
bus_size_t xfersize;
bus_dma_segment_t seg;
@@ -258,7 +259,8 @@ oosiop_alloc_cb(struct oosiop_softc *sc,
cb
CVS commit: [netbsd-7] src/sys/external/bsd/drm2
Module Name:src
Committed By: martin
Date: Fri Aug 22 10:32:19 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [netbsd-7]: i915_drv.h
src/sys/external/bsd/drm2/i915drm [netbsd-7]: files.i915drmkms
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #45):
sys/external/bsd/drm2/dist/drm/i915/i915_drv.h: revision 1.8
sys/external/bsd/drm2/i915drm/files.i915drmkms: revision 1.6
Restore Intel opregion stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.2.1 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
cvs rdiff -u -r1.5 -r1.5.2.1 \
src/sys/external/bsd/drm2/i915drm/files.i915drmkms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.7 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.7.2.1
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.7 Thu Jul 24 21:18:40 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Fri Aug 22 10:32:18 2014
@@ -2720,8 +2720,8 @@ extern void intel_i2c_reset(struct drm_d
/* intel_opregion.c */
struct intel_encoder;
-#ifdef CONFIG_ACPI
extern int intel_opregion_setup(struct drm_device *dev);
+#ifdef CONFIG_ACPI
extern void intel_opregion_init(struct drm_device *dev);
extern void intel_opregion_fini(struct drm_device *dev);
extern void intel_opregion_asle_intr(struct drm_device *dev);
@@ -2730,7 +2730,6 @@ extern int intel_opregion_notify_encoder
extern int intel_opregion_notify_adapter(struct drm_device *dev,
pci_power_t state);
#else
-static inline int intel_opregion_setup(struct drm_device *dev) { return 0; }
static inline void intel_opregion_init(struct drm_device *dev) { return; }
static inline void intel_opregion_fini(struct drm_device *dev) { return; }
static inline void intel_opregion_asle_intr(struct drm_device *dev) { return; }
Index: src/sys/external/bsd/drm2/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.5 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.5.2.1
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.5 Sat Jul 26 18:13:44 2014
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Fri Aug 22 10:32:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.5 2014/07/26 18:13:44 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.5.2.1 2014/08/22 10:32:19 martin Exp $
define intelfbbus { }
device i915drmkms: drmkms, drmkms_pci, intelfbbus
@@ -60,8 +60,7 @@ file external/bsd/drm2/dist/drm/i915/int
file external/bsd/drm2/dist/drm/i915/intel_i2c.c i915drmkms
file external/bsd/drm2/dist/drm/i915/intel_lvds.c i915drmkms
file external/bsd/drm2/dist/drm/i915/intel_modes.c i915drmkms
-# XXX Restore once I figure out what this does...
-#file external/bsd/drm2/dist/drm/i915/intel_opregion.c i915drmkms
+file external/bsd/drm2/dist/drm/i915/intel_opregion.c i915drmkms
file external/bsd/drm2/dist/drm/i915/intel_overlay.c i915drmkms
file external/bsd/drm2/dist/drm/i915/intel_panel.c i915drmkms
file external/bsd/drm2/dist/drm/i915/intel_pm.c i915drmkms
CVS commit: [netbsd-7] src/sys/external/bsd/drm2
Module Name:src
Committed By: martin
Date: Fri Aug 22 10:36:00 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [netbsd-7]: i915_gem.c
src/sys/external/bsd/drm2/ttm [netbsd-7]: ttm_bo_vm.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #46):
sys/external/bsd/drm2/dist/drm/i915/i915_gem.c: revision 1.15
sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.4
Do not take the {ttm,gem} vmobjlock in the fault handler.
- We don't need this lock.
- uvm does nothing between taking it and calling the fault handler.
- Now that the uvm_aobj shares vmobjlock with the {ttm,gem} uvm
object, we must not hold the lock when we call uvm_obj_wirepages on
the uvm_aobj.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.2.1 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
cvs rdiff -u -r1.2.4.1 -r1.2.4.2 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.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/external/bsd/drm2/dist/drm/i915/i915_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.14 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.14.2.1
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.14 Wed Jul 16 21:48:53 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Fri Aug 22 10:35:59 2014
@@ -1842,6 +1842,9 @@ i915_gem_fault(struct uvm_faultinfo *ufi
intel_runtime_pm_get(dev_priv);
+ /* Thanks, uvm, but we don't need this lock. */
+ mutex_exit(uobj-vmobjlock);
+
ret = i915_mutex_lock_interruptible(dev);
if (ret)
goto out;
@@ -1880,6 +1883,7 @@ unpin:
unlock:
mutex_unlock(dev-struct_mutex);
out:
+ mutex_enter(uobj-vmobjlock);
uvmfault_unlockall(ufi, ufi-entry-aref.ar_amap, uobj);
if (ret == -ERESTART)
uvm_wait(i915flt);
Index: src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.2.4.1 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.2.4.2
--- src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.2.4.1 Mon Aug 18 07:49:10 2014
+++ src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Fri Aug 22 10:35:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_vm.c,v 1.2.4.1 2014/08/18 07:49:10 martin Exp $ */
+/* $NetBSD: ttm_bo_vm.c,v 1.2.4.2 2014/08/22 10:35:59 martin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ttm_bo_vm.c,v 1.2.4.1 2014/08/18 07:49:10 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: ttm_bo_vm.c,v 1.2.4.2 2014/08/22 10:35:59 martin Exp $);
#include sys/types.h
@@ -92,6 +92,9 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *u
unsigned mmapflags;
int ret;
+ /* Thanks, uvm, but we don't need this lock. */
+ mutex_exit(uobj-vmobjlock);
+
/* Copy-on-write mappings make no sense for the graphics aperture. */
if (UVM_ET_ISCOPYONWRITE(ufi-entry)) {
ret = -EIO;
@@ -199,7 +202,8 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *u
out3: pmap_update(ufi-orig_map-pmap);
out2: ttm_mem_io_unlock(man);
out1: ttm_bo_unreserve(bo);
-out0: uvmfault_unlockall(ufi, ufi-entry-aref.ar_amap, uobj);
+out0: mutex_enter(uobj-vmobjlock);
+ uvmfault_unlockall(ufi, ufi-entry-aref.ar_amap, uobj);
/* XXX errno Linux-NetBSD */
return -ret;
}
CVS commit: [netbsd-7] src/sys/external/bsd/common/include/linux
Module Name:src
Committed By: martin
Date: Fri Aug 22 10:38:07 UTC 2014
Modified Files:
src/sys/external/bsd/common/include/linux [netbsd-7]: list.h
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #47):
sys/external/bsd/common/include/linux/list.h: revision 1.5
Add some Linux list routines.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/external/bsd/common/include/linux/list.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/external/bsd/common/include/linux/list.h
diff -u src/sys/external/bsd/common/include/linux/list.h:1.4 src/sys/external/bsd/common/include/linux/list.h:1.4.2.1
--- src/sys/external/bsd/common/include/linux/list.h:1.4 Wed Jul 16 20:59:57 2014
+++ src/sys/external/bsd/common/include/linux/list.h Fri Aug 22 10:38:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: list.h,v 1.4 2014/07/16 20:59:57 riastradh Exp $ */
+/* $NetBSD: list.h,v 1.4.2.1 2014/08/22 10:38:07 martin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -74,6 +74,12 @@ list_first(const struct list_head *head)
}
static inline struct list_head *
+list_last(const struct list_head *head)
+{
+ return head-prev;
+}
+
+static inline struct list_head *
list_next(const struct list_head *node)
{
return node-next;
@@ -192,8 +198,12 @@ list_del_init(struct list_head *node)
#define list_entry(PTR, TYPE, FIELD) container_of(PTR, TYPE, FIELD)
#define list_first_entry(PTR, TYPE, FIELD)\
list_entry(list_first((PTR)), TYPE, FIELD)
+#define list_last_entry(PTR, TYPE, FIELD)\
+ list_entry(list_last((PTR)), TYPE, FIELD)
#define list_next_entry(ENTRY, FIELD) \
list_entry(list_next((ENTRY)-FIELD), typeof(*(ENTRY)), FIELD)
+#define list_prev_entry(ENTRY, FIELD) \
+ list_entry(list_prev((ENTRY)-FIELD), typeof(*(ENTRY)), FIELD)
#define list_for_each(VAR, HEAD) \
for ((VAR) = list_first((HEAD));\
@@ -211,6 +221,12 @@ list_del_init(struct list_head *node)
(VAR) = list_entry(list_next((VAR)-FIELD), typeof(*(VAR)), \
FIELD))
+#define list_for_each_entry_reverse(VAR, HEAD, FIELD) \
+ for ((VAR) = list_entry(list_last((HEAD)), typeof(*(VAR)), FIELD); \
+ (VAR)-FIELD != (HEAD);\
+ (VAR) = list_entry(list_prev((VAR)-FIELD), typeof(*(VAR)), \
+ FIELD))
+
#define list_for_each_entry_safe(VAR, NEXT, HEAD, FIELD) \
for ((VAR) = list_entry(list_first((HEAD)), typeof(*(VAR)), FIELD); \
((VAR)-FIELD != (HEAD)) \
@@ -223,6 +239,11 @@ list_del_init(struct list_head *node)
(VAR)-FIELD != (HEAD);\
(VAR) = list_next_entry((VAR), FIELD))
+#define list_for_each_entry_continue_reverse(VAR, HEAD, FIELD) \
+ for ((VAR) = list_prev_entry((VAR), FIELD); \
+ (VAR)-FIELD != (HEAD);\
+ (VAR) = list_prev_entry((VAR), FIELD))
+
#define list_for_each_entry_safe_from(VAR, NEXT, HEAD, FIELD) \
for (;\
((VAR)-FIELD != (HEAD)) \
CVS commit: [netbsd-7] src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Fri Aug 22 10:41:18 UTC 2014
Modified Files:
src/sys/dev/ic [netbsd-7]: mfi.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #48):
sys/dev/ic/mfi.c: revision 1.54-1.55
Fix mfi(4) panic on boot on some mfi(4) chips.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.53.2.1 src/sys/dev/ic/mfi.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/mfi.c
diff -u src/sys/dev/ic/mfi.c:1.53 src/sys/dev/ic/mfi.c:1.53.2.1
--- src/sys/dev/ic/mfi.c:1.53 Fri Jul 25 08:10:37 2014
+++ src/sys/dev/ic/mfi.c Fri Aug 22 10:41:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.53 2014/07/25 08:10:37 dholland Exp $ */
+/* $NetBSD: mfi.c,v 1.53.2.1 2014/08/22 10:41:18 martin Exp $ */
/* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
/*
@@ -73,7 +73,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mfi.c,v 1.53 2014/07/25 08:10:37 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: mfi.c,v 1.53.2.1 2014/08/22 10:41:18 martin Exp $);
#include bio.h
@@ -380,15 +380,18 @@ mfi_init_ccb(struct mfi_softc *sc)
sc-sc_ccb = malloc(sizeof(struct mfi_ccb) * sc-sc_max_cmds,
M_DEVBUF, M_WAITOK|M_ZERO);
- io_req_base = (uint8_t *)MFIMEM_KVA(sc-sc_tbolt_reqmsgpool);
- io_req_base_phys = MFIMEM_DVA(sc-sc_tbolt_reqmsgpool);
if (sc-sc_ioptype == MFI_IOP_TBOLT) {
/*
* The first 256 bytes (SMID 0) is not used.
* Don't add to the cmd list.
*/
- io_req_base += MEGASAS_THUNDERBOLT_NEW_MSG_SIZE;
- io_req_base_phys += MEGASAS_THUNDERBOLT_NEW_MSG_SIZE;
+ io_req_base = (uint8_t *)MFIMEM_KVA(sc-sc_tbolt_reqmsgpool) +
+ MEGASAS_THUNDERBOLT_NEW_MSG_SIZE;
+ io_req_base_phys = MFIMEM_DVA(sc-sc_tbolt_reqmsgpool) +
+ MEGASAS_THUNDERBOLT_NEW_MSG_SIZE;
+ } else {
+ io_req_base = NULL; /* XXX: gcc */
+ io_req_base_phys = 0; /* XXX: gcc */
}
for (i = 0; i sc-sc_max_cmds; i++) {
CVS commit: [netbsd-7] src/doc
Module Name:src
Committed By: martin
Date: Fri Aug 22 10:42:39 UTC 2014
Modified Files:
src/doc [netbsd-7]: CHANGES-7.0
Log Message:
Tickets 44 - 48
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-7.0
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-7.0
diff -u src/doc/CHANGES-7.0:1.1.2.18 src/doc/CHANGES-7.0:1.1.2.19
--- src/doc/CHANGES-7.0:1.1.2.18 Thu Aug 21 15:21:16 2014
+++ src/doc/CHANGES-7.0 Fri Aug 22 10:42:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.18 2014/08/21 15:21:16 martin Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.19 2014/08/22 10:42:39 martin Exp $
A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
until the 7.0 release:
@@ -298,3 +298,43 @@ sys/miscfs/umapfs/umap_vfsops.c 1.94
Both triggerable from root only.
[maxv, ticket #43]
+sys/altq/altq_jobs.c1.7
+ Fix error branches to avoid leaks, noted by maxv@.
+sys/dev/ic/oosiop.c1.14
+ Fix leaks in oosiop_alloc_cb error branches, noted by maxv@.
+ While here, avoid a sketchy pointer cast that probably falls afoul
+ of strict aliasing rules.
+sys/dev/qbus/if_qe.c1.73
+ Avoid leak in error branch, noted by maxv@, compile-tested for vax.
+sys/dev/rasops/rasops.c1.72
+ Don't leak f on failure. Noted by maxv@.
+sys/dev/vme/if_ie_vme.c1.31
+ Sizeof struct ievme, not sizeof size_t.
+ Noted by maxv@, compile-tested for sparc.
+sys/net/if_gre.c1.160
+ Don't leak in gre_clone_create error branch.
+ Noted by maxv@, compile-tested for amd64.
+ [riastradh, ticket #44]
+
+sys/external/bsd/drm2/dist/drm/i915/i915_drv.h 1.8
+sys/external/bsd/drm2/i915drm/files.i915drmkms 1.6
+ Restore Intel opregion stuff.
+ [riastradh, ticket #45]
+
+sys/external/bsd/drm2/dist/drm/i915/i915_gem.c 1.15
+sys/external/bsd/drm2/ttm/ttm_bo_vm.c 1.4
+ Do not take the {ttm,gem} vmobjlock in the fault handler.
+ - We don't need this lock.
+ - uvm does nothing between taking it and calling the fault handler.
+ - Now that the uvm_aobj shares vmobjlock with the {ttm,gem} uvm
+ object, we must not hold the lock when we call uvm_obj_wirepages on
+ the uvm_aobj.
+ [riastradh, ticket #46]
+
+sys/external/bsd/common/include/linux/list.h 1.5
+ Add some Linux list routines.
+ [riastradh, ticket #47]
+
+sys/dev/ic/mfi.c1.54-1.55
+ Fix mfi(4) panic on boot on some mfi(4) chips.
+ [msaitoh, ticket #48]
CVS commit: src/distrib/sets
Module Name:src
Committed By: apb
Date: Fri Aug 22 10:51:18 UTC 2014
Modified Files:
src/distrib/sets: Makefile
Log Message:
Adapt the sortlists target to deal with commented file names, like
#./dir/file. Such lines now compare equal to their uncommented
counterparts like ./dir/file.
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/Makefile
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/Makefile
diff -u src/distrib/sets/Makefile:1.97 src/distrib/sets/Makefile:1.98
--- src/distrib/sets/Makefile:1.97 Tue Aug 5 15:45:49 2014
+++ src/distrib/sets/Makefile Fri Aug 22 10:51:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2014/08/05 15:45:49 apb Exp $
+# $NetBSD: Makefile,v 1.98 2014/08/22 10:51:18 apb Exp $
# Experimental RCS METALOG versioning
# (Needs host's rcs(1) commands)
@@ -304,15 +304,26 @@ makesyspkgsums: .PHONY check_RELEASEDIR
makedeps: .PHONY
${SETSCMD} ./syspkgdeps all ${.CURDIR}/deps
-# Sort the lists files
+# Sort the lists files.
+#
+# The tricky stuff with awk and sort -k options is to ensure that the
+# heading remains undisturbed, and on non-heading lines anything before
+# the first . is ignored, so that ./dir/file and #./dir/file are
+# sorted together.
+#
sortlists: .PHONY
find ${.CURDIR}/lists \! \( -name CVS -prune \) \! -name .#\* \
-type f -print \
| while read f ; do \
${_MKSHMSG} sorting $${f#${.CURDIR}/} ; \
- { grep '^#' $$f ; \
- grep -v '^#' $$f | sort ; \
- } | cat -s $$f.tmp; \
+ awk 'BEGIN { inheader = 1 } \
+ /^#*\.\// { inheader = 0 } \
+ // { tag = (inheader ? NR : 99); \
+ print tag . $$0 }' \
+ $$f \
+ | sort -t . -k 1n,2 -k 3 \
+ | cut -d . -f 2- \
+ | cat -s $$f.tmp; \
if cmp $$f $$f.tmp /dev/null; then \
: $$f is unchanged ; \
rm $$f.tmp ; \
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: apb Date: Fri Aug 22 10:51:39 UTC 2014 Modified Files: src/distrib/sets/lists/base: ad.aarch64 ad.mips ad.powerpc md.amd64 md.sparc64 mi shl.mi src/distrib/sets/lists/comp: ad.aarch64 ad.arm ad.mips ad.powerpc md.amd64 md.amigappc md.bebox md.cobalt md.evbmips md.evbppc md.ews4800mips md.hpcmips md.i386 md.ibmnws md.macppc md.mvmeppc md.newsmips md.ofppc md.pmax md.prep md.rs6000 md.sandpoint md.sbmips md.sgimips md.sparc md.sparc64 mi src/distrib/sets/lists/debug: ad.aarch64 ad.arm ad.mips ad.powerpc md.sparc64 mi src/distrib/sets/lists/games: mi src/distrib/sets/lists/misc: mi src/distrib/sets/lists/modules: md.amd64 src/distrib/sets/lists/tests: mi src/distrib/sets/lists/xcomp: md.amd64 md.i386 src/distrib/sets/lists/xdebug: md.zaurus Log Message: sort To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base/ad.aarch64 cvs rdiff -u -r1.48 -r1.49 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/base/ad.powerpc cvs rdiff -u -r1.244 -r1.245 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.232 -r1.233 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.1087 -r1.1088 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.712 -r1.713 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/comp/ad.aarch64 cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/comp/ad.arm cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/comp/ad.powerpc cvs rdiff -u -r1.224 -r1.225 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/comp/md.amigappc \ src/distrib/sets/lists/comp/md.ibmnws cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/comp/md.bebox cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/comp/md.cobalt cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/comp/md.evbmips \ src/distrib/sets/lists/comp/md.sandpoint cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/comp/md.evbppc cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/comp/md.ews4800mips \ src/distrib/sets/lists/comp/md.rs6000 cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/comp/md.hpcmips cvs rdiff -u -r1.149 -r1.150 src/distrib/sets/lists/comp/md.i386 cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/comp/md.macppc cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/comp/md.mvmeppc \ src/distrib/sets/lists/comp/md.ofppc \ src/distrib/sets/lists/comp/md.sbmips cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/comp/md.newsmips cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/comp/md.pmax cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/comp/md.prep cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/comp/md.sgimips cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/lists/comp/md.sparc cvs rdiff -u -r1.187 -r1.188 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1908 -r1.1909 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/debug/ad.aarch64 cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/debug/ad.arm cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/debug/ad.powerpc cvs rdiff -u -r1.61 -r1.62 src/distrib/sets/lists/debug/md.sparc64 cvs rdiff -u -r1.82 -r1.83 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/games/mi cvs rdiff -u -r1.194 -r1.195 src/distrib/sets/lists/misc/mi cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.584 -r1.585 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/xcomp/md.amd64 cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/xcomp/md.i386 cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xdebug/md.zaurus Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.aarch64 diff -u src/distrib/sets/lists/base/ad.aarch64:1.3 src/distrib/sets/lists/base/ad.aarch64:1.4 --- src/distrib/sets/lists/base/ad.aarch64:1.3 Mon Aug 11 13:40:34 2014 +++ src/distrib/sets/lists/base/ad.aarch64 Fri Aug 22 10:51:38 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.3 2014/08/11 13:40:34 joerg Exp $ +# $NetBSD: ad.aarch64,v 1.4 2014/08/22 10:51:38 apb Exp $ ./lib/eabi base-compat-shlib compat ./lib/eabi/npf base-npf-shlib compat ./lib/eabi/npf/ext_log.so base-npf-shlib compat,pic @@ -85,10 +85,10 @@ ./usr/lib/eabi/i18n/libmapper_zone.so.5.0 base-i18n-shlib compat,pic ./usr/lib/eabi/libamu.so.4 base-compat-shlib compat,pic ./usr/lib/eabi/libamu.so.4.0 base-compat-shlib compat,pic -./usr/lib/eabi/libarm.so.0 base-compat-shlib compat,pic -./usr/lib/eabi/libarm.so.0.0 base-compat-shlib compat,pic ./usr/lib/eabi/libarchive.so.3 base-compat-shlib
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Fri Aug 22 11:28:04 UTC 2014
Modified Files:
src/sys/kern: uipc_domain.c
Log Message:
Change the meaning of the boolean parameter to domaininit().
was: attach route domain if found from domains link set
now: attach any domain which is found from domains link set
No functional change to monolithic kernel. In a rump kernel, which
attaches networking domains modularly, prevents domains from
accidentally leaking in via the link set in static linked scenarios.
Problem reported by cube, Tom Bousso, and the voices in my head.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/kern/uipc_domain.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/uipc_domain.c
diff -u src/sys/kern/uipc_domain.c:1.93 src/sys/kern/uipc_domain.c:1.94
--- src/sys/kern/uipc_domain.c:1.93 Wed Apr 23 17:05:18 2014
+++ src/sys/kern/uipc_domain.c Fri Aug 22 11:28:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_domain.c,v 1.93 2014/04/23 17:05:18 pooka Exp $ */
+/* $NetBSD: uipc_domain.c,v 1.94 2014/08/22 11:28:03 pooka Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_domain.c,v 1.93 2014/04/23 17:05:18 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_domain.c,v 1.94 2014/08/22 11:28:03 pooka Exp $);
#include sys/param.h
#include sys/socket.h
@@ -82,7 +82,7 @@ static struct domain domain_dummy;
__link_set_add_rodata(domains,domain_dummy);
void
-domaininit(bool addroute)
+domaininit(bool attach)
{
__link_set_decl(domains, struct domain);
struct domain * const * dpp;
@@ -94,16 +94,18 @@ domaininit(bool addroute)
* Add all of the domains. Make sure the PF_ROUTE
* domain is added last.
*/
- __link_set_foreach(dpp, domains) {
- if (*dpp == domain_dummy)
- continue;
- if ((*dpp)-dom_family == PF_ROUTE)
- rt_domain = *dpp;
- else
- domain_attach(*dpp);
+ if (attach) {
+ __link_set_foreach(dpp, domains) {
+ if (*dpp == domain_dummy)
+continue;
+ if ((*dpp)-dom_family == PF_ROUTE)
+rt_domain = *dpp;
+ else
+domain_attach(*dpp);
+ }
+ if (rt_domain)
+ domain_attach(rt_domain);
}
- if (rt_domain addroute)
- domain_attach(rt_domain);
callout_init(pffasttimo_ch, CALLOUT_MPSAFE);
callout_init(pfslowtimo_ch, CALLOUT_MPSAFE);
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src
Committed By: pooka
Date: Fri Aug 22 14:28:58 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libpci: Makefile pci_at_mainbus.c
rumpdev_bus_space.c
Log Message:
Add a compile-time selector for I/O space operations. Needs more work
some day, but allows virtio drivers to work today.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libpci/pci_at_mainbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libpci/rumpdev_bus_space.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/dev/lib/libpci/Makefile
diff -u src/sys/rump/dev/lib/libpci/Makefile:1.3 src/sys/rump/dev/lib/libpci/Makefile:1.4
--- src/sys/rump/dev/lib/libpci/Makefile:1.3 Mon Apr 14 23:53:42 2014
+++ src/sys/rump/dev/lib/libpci/Makefile Fri Aug 22 14:28:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/04/14 23:53:42 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/08/22 14:28:58 pooka Exp $
#
RUMPTOP= ${TOPRUMP}
@@ -23,6 +23,10 @@ SRCS+= pci_at_mainbus.c
CPPFLAGS+= -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpkern
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
+.if ${RUMP_PCI_IOSPACE:Uno} == yes
+CPPFLAGS+=-DRUMP_PCI_IOSPACE
+.endif
+
.if defined(RUMP_PCI_USER)
RUMPCOMP_USER_SRCS= ${RUMP_PCI_USER}
RUMPCOMP_INCS_DIR:= ${.PARSEDIR}
Index: src/sys/rump/dev/lib/libpci/pci_at_mainbus.c
diff -u src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.4 src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.5
--- src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.4 Thu Jul 31 15:55:08 2014
+++ src/sys/rump/dev/lib/libpci/pci_at_mainbus.c Fri Aug 22 14:28:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_at_mainbus.c,v 1.4 2014/07/31 15:55:08 pooka Exp $ */
+/* $NetBSD: pci_at_mainbus.c,v 1.5 2014/08/22 14:28:58 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_at_mainbus.c,v 1.4 2014/07/31 15:55:08 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_at_mainbus.c,v 1.5 2014/08/22 14:28:58 pooka Exp $);
#include sys/param.h
#include sys/conf.h
@@ -80,7 +80,7 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV_AFTERM
#endif
pba.pba_flags = PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;;
-#if 0
+#ifdef RUMP_PCI_IOSPACE
pba.pba_flags |= PCI_FLAGS_IO_OKAY;
#endif
Index: src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c
diff -u src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.2 src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.3
--- src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.2 Sun Apr 13 15:43:26 2014
+++ src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c Fri Aug 22 14:28:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdev_bus_space.c,v 1.2 2014/04/13 15:43:26 pooka Exp $ */
+/* $NetBSD: rumpdev_bus_space.c,v 1.3 2014/08/22 14:28:58 pooka Exp $ */
/*-
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -34,6 +34,10 @@
#include pci_user.h
+#if defined(RUMP_PCI_IOSPACE) (defined(__i386__) || defined(__x86_64__))
+#define IOSPACE_SUPPORTED
+#endif
+
int
bus_space_map(bus_space_tag_t bst, bus_addr_t address, bus_size_t size,
int flags, bus_space_handle_t *handlep)
@@ -48,8 +52,12 @@ bus_space_map(bus_space_tag_t bst, bus_a
* make a hypercall to request it.
*/
if (bst == 0) {
+#ifdef IOSPACE_SUPPORTED
*handlep = address;
rv = 0;
+#else
+ rv = ENOTSUP;
+#endif
} else {
*handlep = (bus_space_handle_t)rumpcomp_pci_map(address, size);
rv = *handlep ? 0 : EINVAL;
@@ -65,7 +73,12 @@ bus_space_read_1(bus_space_tag_t bst, bu
uint8_t rv;
if (bst == 0) {
- panic(8bit IO space not supported);
+#ifdef IOSPACE_SUPPORTED
+ unsigned short addr = bsh + offset;
+ __asm__ __volatile__(inb %1, %0 : =a(rv) : d(addr));
+#else
+ panic(IO space not supported);
+#endif
} else {
rv = *(volatile uint8_t *)(bsh + offset);
}
@@ -80,7 +93,12 @@ bus_space_read_2(bus_space_tag_t bst, bu
uint16_t rv;
if (bst == 0) {
- panic(16bit IO space not supported);
+#ifdef IOSPACE_SUPPORTED
+ unsigned short addr = bsh + offset;
+ __asm__ __volatile__(in %1, %0 : =a(rv) : d(addr));
+#else
+ panic(IO space not supported);
+#endif
} else {
rv = *(volatile uint16_t *)(bsh + offset);
}
@@ -95,11 +113,11 @@ bus_space_read_4(bus_space_tag_t bst, bu
uint32_t rv;
if (bst == 0) {
-#if 1
- panic(IO space not supported in this build);
-#else
+#ifdef IOSPACE_SUPPORTED
unsigned short addr = bsh + offset;
__asm__ __volatile__(inl %1, %0 : =a(rv) : d(addr));
+#else
+ panic(IO space not supported);
#endif
} else {
rv = *(volatile uint32_t *)(bsh + offset);
@@ -114,8 +132,11 @@ bus_space_write_1(bus_space_tag_t bst, b
{
if (bst == 0) {
-#if 1
- panic(IO space not supported in this build);
+#ifdef IOSPACE_SUPPORTED
+ unsigned short addr = bsh + offset;
+ __asm__
CVS commit: src/sys/dev/pci
Module Name:src Committed By: riastradh Date: Fri Aug 22 15:26:28 UTC 2014 Modified Files: src/sys/dev/pci: agp_i810.c Log Message: Revert to mapping the whole GTTMMADR region all at once for now. This was split up so we could map the GTT prefetchable without interfering with the MMIO registers, but it interferes with old drm which tries to map the whole region and which is still hooked up for the moment. Once we unhook old drm for good we can put this back. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/dev/pci/agp_i810.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/agp_i810.c diff -u src/sys/dev/pci/agp_i810.c:1.112 src/sys/dev/pci/agp_i810.c:1.113 --- src/sys/dev/pci/agp_i810.c:1.112 Fri Jul 25 23:05:54 2014 +++ src/sys/dev/pci/agp_i810.c Fri Aug 22 15:26:28 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: agp_i810.c,v 1.112 2014/07/25 23:05:54 riastradh Exp $ */ +/* $NetBSD: agp_i810.c,v 1.113 2014/08/22 15:26:28 riastradh Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.112 2014/07/25 23:05:54 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.113 2014/08/22 15:26:28 riastradh Exp $); #include sys/param.h #include sys/systm.h @@ -405,7 +405,9 @@ agp_i810_attach(device_t parent, device_ apbase = AGP_I965_GMADR; mmadr_bar = AGP_I965_MMADR; mmadr_type |= PCI_MAPREG_MEM_TYPE_64BIT; - isc-size = 512*1024; + if (pci_mapreg_info(isc-vga_pa.pa_pc, isc-vga_pa.pa_tag, + AGP_I965_MMADR, mmadr_type, NULL, isc-size, NULL)) + isc-size = 512*1024; /* XXX */ gtt_bar = 0; gtt_off = AGP_I965_GTT; break; @@ -413,14 +415,18 @@ agp_i810_attach(device_t parent, device_ apbase = AGP_I965_GMADR; mmadr_bar = AGP_I965_MMADR; mmadr_type |= PCI_MAPREG_MEM_TYPE_64BIT; - isc-size = 512*1024; + if (pci_mapreg_info(isc-vga_pa.pa_pc, isc-vga_pa.pa_tag, + AGP_I965_MMADR, mmadr_type, NULL, isc-size, NULL)) + isc-size = 512*1024; /* XXX */ gtt_bar = 0; gtt_off = AGP_G4X_GTT; break; default: apbase = AGP_I810_GMADR; mmadr_bar = AGP_I810_MMADR; - isc-size = 512*1024; + if (pci_mapreg_info(isc-vga_pa.pa_pc, isc-vga_pa.pa_tag, + AGP_I965_MMADR, mmadr_type, NULL, isc-size, NULL)) + isc-size = 512*1024; /* XXX */ gtt_bar = 0; gtt_off = AGP_I810_GTT; break;
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch
Module Name:src
Committed By: matt
Date: Fri Aug 22 15:27:51 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch: Makefile
Added Files:
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/powerpc:
Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/powerpc64:
Makefile
Log Message:
add powerpc64 support
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/powerpc/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/powerpc64/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile:1.1 Sat Mar 1 10:00:47 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile Fri Aug 22 15:27:50 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/03/01 10:00:47 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2014/08/22 15:27:50 matt Exp $
# install multilib c++config.h files
@@ -17,6 +17,11 @@ SUBDIR= mips64 mips32 mipso32
CXXCONFIGARGS= mips64 _ABI64 mipso32 _ABIO32 mips32
.endif
+.if ${MACHINE_ARCH} == powerpc64
+SUBDIR= powerpc powerpc64
+CXXCONFIGARGS= powerpc64 _LP64 powerpc
+.endif
+
# XXX arm variants are missing, but hopefully won't need them
# until aarch64 anyway.
Added files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/powerpc/Makefile
diff -u /dev/null src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/powerpc/Makefile:1.1
--- /dev/null Fri Aug 22 15:27:51 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/powerpc/Makefile Fri Aug 22 15:27:51 2014
@@ -0,0 +1,4 @@
+# $NetBSD: Makefile,v 1.1 2014/08/22 15:27:51 matt Exp $
+
+GCC_MACHINE_ARCH=powerpc
+.include ../Makefile.arch_bits
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/powerpc64/Makefile
diff -u /dev/null src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/powerpc64/Makefile:1.1
--- /dev/null Fri Aug 22 15:27:51 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/powerpc64/Makefile Fri Aug 22 15:27:51 2014
@@ -0,0 +1,4 @@
+# $NetBSD: Makefile,v 1.1 2014/08/22 15:27:51 matt Exp $
+
+GCC_MACHINE_ARCH=powerpc64
+.include ../Makefile.arch_bits
CVS commit: src
Module Name:src
Committed By: apb
Date: Fri Aug 22 16:45:32 UTC 2014
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/usr.bin/make: Makefile t_make.sh
Removed Files:
src/tests/usr.bin/make: d_comment.mk d_comment.out d_cond1.mk
d_cond1.out d_dotwait.mk d_dotwait.out d_export.mk d_export.out
d_export_all.mk d_export_all.out d_moderrs.mk d_moderrs.out
d_modmatch.mk d_modmatch.out d_modmisc.mk d_modmisc.out
d_modorder.mk d_modorder.out d_modts.mk d_modts.out d_modword.mk
d_modword.out d_posix.mk d_posix.out d_qequals.mk d_qequals.out
d_ternary.mk d_ternary.out d_unmatchedvarparen.mk
d_unmatchedvarparen.out d_varcmd.mk d_varcmd.out
Log Message:
Test make(1) by running the maintained tests, not unmaintained
copies of them.
* Remove all old tests from src/tests/usr.bin/make/d_*. These tests
were unmaintained old copies of the actual tests which are maintained
under src/usr.bin/make/unit-tests. One exception is the test in
d_unmatchedvarparen.mk, which was new, but has nw been added to
src/usr.bin/make/unit-tests/varmisc.mk.
* In src/tests/usr.bin/make/Makefile, copy all
the tests from src/usr.bin/make/unit-tests to
${DESTDIR}/usr/tests/usr.bin/make/unit-tests.
* In src/tests/usr.bin/make/t_make.sh, run the tests installed above,
instead of the old tests.
* In etc/mtree/NetBSD.dist.tests, create the
usr/tests/usr.bin/make/unit-tests diectory.
* Update the set lists for all the above.
To generate a diff of this commit:
cvs rdiff -u -r1.585 -r1.586 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.108 -r1.109 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/make/Makefile \
src/tests/usr.bin/make/t_make.sh
cvs rdiff -u -r1.1 -r0 src/tests/usr.bin/make/d_comment.mk \
src/tests/usr.bin/make/d_comment.out src/tests/usr.bin/make/d_cond1.mk \
src/tests/usr.bin/make/d_cond1.out src/tests/usr.bin/make/d_dotwait.mk \
src/tests/usr.bin/make/d_export.mk src/tests/usr.bin/make/d_export.out \
src/tests/usr.bin/make/d_export_all.mk \
src/tests/usr.bin/make/d_export_all.out \
src/tests/usr.bin/make/d_moderrs.mk src/tests/usr.bin/make/d_moderrs.out \
src/tests/usr.bin/make/d_modmatch.mk \
src/tests/usr.bin/make/d_modmatch.out src/tests/usr.bin/make/d_modmisc.mk \
src/tests/usr.bin/make/d_modmisc.out src/tests/usr.bin/make/d_modorder.mk \
src/tests/usr.bin/make/d_modorder.out src/tests/usr.bin/make/d_modts.mk \
src/tests/usr.bin/make/d_modts.out src/tests/usr.bin/make/d_modword.mk \
src/tests/usr.bin/make/d_modword.out src/tests/usr.bin/make/d_posix.mk \
src/tests/usr.bin/make/d_posix.out src/tests/usr.bin/make/d_qequals.mk \
src/tests/usr.bin/make/d_qequals.out src/tests/usr.bin/make/d_ternary.mk \
src/tests/usr.bin/make/d_ternary.out \
src/tests/usr.bin/make/d_unmatchedvarparen.mk \
src/tests/usr.bin/make/d_unmatchedvarparen.out \
src/tests/usr.bin/make/d_varcmd.mk src/tests/usr.bin/make/d_varcmd.out
cvs rdiff -u -r1.2 -r0 src/tests/usr.bin/make/d_dotwait.out
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.585 src/distrib/sets/lists/tests/mi:1.586
--- src/distrib/sets/lists/tests/mi:1.585 Fri Aug 22 10:51:38 2014
+++ src/distrib/sets/lists/tests/mi Fri Aug 22 16:45:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.585 2014/08/22 10:51:38 apb Exp $
+# $NetBSD: mi,v 1.586 2014/08/22 16:45:32 apb Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -3463,38 +3463,100 @@
./usr/tests/usr.bin/make tests-usr.bin-tests
./usr/tests/usr.bin/make/Atffile tests-usr.bin-tests atf
./usr/tests/usr.bin/make/Kyuafile tests-usr.bin-tests atf,kyua
-./usr/tests/usr.bin/make/d_comment.mk tests-usr.bin-tests atf
-./usr/tests/usr.bin/make/d_comment.out tests-usr.bin-tests atf
-./usr/tests/usr.bin/make/d_cond1.mk tests-usr.bin-tests atf
-./usr/tests/usr.bin/make/d_cond1.out tests-usr.bin-tests atf
-./usr/tests/usr.bin/make/d_dotwait.mk tests-usr.bin-tests atf
-./usr/tests/usr.bin/make/d_dotwait.out tests-usr.bin-tests atf
-./usr/tests/usr.bin/make/d_export.mk tests-usr.bin-tests atf
-./usr/tests/usr.bin/make/d_export.out tests-usr.bin-tests atf
-./usr/tests/usr.bin/make/d_export_all.mk tests-usr.bin-tests atf
-./usr/tests/usr.bin/make/d_export_all.out tests-usr.bin-tests atf
-./usr/tests/usr.bin/make/d_moderrs.mk tests-usr.bin-tests atf
-./usr/tests/usr.bin/make/d_moderrs.out tests-usr.bin-tests atf
-./usr/tests/usr.bin/make/d_modmatch.mk tests-usr.bin-tests atf
-./usr/tests/usr.bin/make/d_modmatch.out tests-usr.bin-tests atf
-./usr/tests/usr.bin/make/d_modmisc.mk tests-usr.bin-tests atf
-./usr/tests/usr.bin/make/d_modmisc.out tests-usr.bin-tests atf
CVS commit: src/sys/ufs/ext2fs
Module Name:src Committed By: hannken Date: Fri Aug 22 16:49:30 UTC 2014 Modified Files: src/sys/ufs/ext2fs: ext2fs_vfsops.c Log Message: Use mount from argument mp, vp-v_mount is not valid here. PR kern/49142 (panic in ext2fs_loadvnode mounting an ext2fs filesystem) Needs pullup to -7 To generate a diff of this commit: cvs rdiff -u -r1.183 -r1.184 src/sys/ufs/ext2fs/ext2fs_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/ufs/ext2fs/ext2fs_vfsops.c diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.183 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.184 --- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.183 Wed Jul 9 08:43:54 2014 +++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Fri Aug 22 16:49:30 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ext2fs_vfsops.c,v 1.183 2014/07/09 08:43:54 maxv Exp $ */ +/* $NetBSD: ext2fs_vfsops.c,v 1.184 2014/08/22 16:49:30 hannken Exp $ */ /* * Copyright (c) 1989, 1991, 1993, 1994 @@ -60,7 +60,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.183 2014/07/09 08:43:54 maxv Exp $); +__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.184 2014/08/22 16:49:30 hannken Exp $); #if defined(_KERNEL_OPT) #include opt_compat_netbsd.h @@ -1024,7 +1024,7 @@ ext2fs_loadvnode(struct mount *mp, struc if (++ext2gennumber (u_long)time_second) ext2gennumber = time_second; ip-i_e2fs_gen = ext2gennumber; - if ((vp-v_mount-mnt_flag MNT_RDONLY) == 0) + if ((mp-mnt_flag MNT_RDONLY) == 0) ip-i_flag |= IN_MODIFIED; } uvm_vnp_setsize(vp, ext2fs_size(ip));
CVS commit: src/common/lib/libc/gen
Module Name:src
Committed By: riastradh
Date: Fri Aug 22 17:17:02 UTC 2014
Modified Files:
src/common/lib/libc/gen: rb.c
Log Message:
Fix failure case in rb_tree_find_node_leq/geq.
Return NULL, not `NULL - offset'.
XXX pullup to netbsd-5, netbsd-6, netbsd-7
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/common/lib/libc/gen/rb.c
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/gen/rb.c
diff -u src/common/lib/libc/gen/rb.c:1.11 src/common/lib/libc/gen/rb.c:1.12
--- src/common/lib/libc/gen/rb.c:1.11 Mon Jun 20 09:11:16 2011
+++ src/common/lib/libc/gen/rb.c Fri Aug 22 17:17:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rb.c,v 1.11 2011/06/20 09:11:16 mrg Exp $ */
+/* $NetBSD: rb.c,v 1.12 2014/08/22 17:17:02 riastradh Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,10 +39,10 @@
#else
#define KASSERT(s) do { } while (/*CONSTCOND*/ 0)
#endif
-__RCSID($NetBSD: rb.c,v 1.11 2011/06/20 09:11:16 mrg Exp $);
+__RCSID($NetBSD: rb.c,v 1.12 2014/08/22 17:17:02 riastradh Exp $);
#else
#include lib/libkern/libkern.h
-__KERNEL_RCSID(0, $NetBSD: rb.c,v 1.11 2011/06/20 09:11:16 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: rb.c,v 1.12 2014/08/22 17:17:02 riastradh Exp $);
#endif
#ifdef _LIBC
@@ -145,7 +145,7 @@ rb_tree_find_node_geq(struct rb_tree *rb
parent = parent-rb_nodes[diff 0];
}
- return RB_NODETOITEM(rbto, last);
+ return (last == NULL ? NULL : RB_NODETOITEM(rbto, last));
}
void *
@@ -166,7 +166,7 @@ rb_tree_find_node_leq(struct rb_tree *rb
parent = parent-rb_nodes[diff 0];
}
- return RB_NODETOITEM(rbto, last);
+ return (last == NULL ? NULL : RB_NODETOITEM(rbto, last));
}
void *
CVS commit: src/common/lib/libc/gen
Module Name:src
Committed By: matt
Date: Fri Aug 22 17:19:48 UTC 2014
Modified Files:
src/common/lib/libc/gen: rb.c
Log Message:
Remove enclosing parens on return.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/common/lib/libc/gen/rb.c
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/gen/rb.c
diff -u src/common/lib/libc/gen/rb.c:1.12 src/common/lib/libc/gen/rb.c:1.13
--- src/common/lib/libc/gen/rb.c:1.12 Fri Aug 22 17:17:02 2014
+++ src/common/lib/libc/gen/rb.c Fri Aug 22 17:19:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rb.c,v 1.12 2014/08/22 17:17:02 riastradh Exp $ */
+/* $NetBSD: rb.c,v 1.13 2014/08/22 17:19:48 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,10 +39,10 @@
#else
#define KASSERT(s) do { } while (/*CONSTCOND*/ 0)
#endif
-__RCSID($NetBSD: rb.c,v 1.12 2014/08/22 17:17:02 riastradh Exp $);
+__RCSID($NetBSD: rb.c,v 1.13 2014/08/22 17:19:48 matt Exp $);
#else
#include lib/libkern/libkern.h
-__KERNEL_RCSID(0, $NetBSD: rb.c,v 1.12 2014/08/22 17:17:02 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: rb.c,v 1.13 2014/08/22 17:19:48 matt Exp $);
#endif
#ifdef _LIBC
@@ -145,7 +145,7 @@ rb_tree_find_node_geq(struct rb_tree *rb
parent = parent-rb_nodes[diff 0];
}
- return (last == NULL ? NULL : RB_NODETOITEM(rbto, last));
+ return last == NULL ? NULL : RB_NODETOITEM(rbto, last);
}
void *
@@ -166,7 +166,7 @@ rb_tree_find_node_leq(struct rb_tree *rb
parent = parent-rb_nodes[diff 0];
}
- return (last == NULL ? NULL : RB_NODETOITEM(rbto, last));
+ return last == NULL ? NULL : RB_NODETOITEM(rbto, last);
}
void *
CVS commit: [netbsd-7] src/sys/ufs/ext2fs
Module Name:src Committed By: martin Date: Fri Aug 22 19:20:15 UTC 2014 Modified Files: src/sys/ufs/ext2fs [netbsd-7]: ext2fs_vfsops.c Log Message: Pull up following revision(s) (requested by hannken in ticket #49): sys/ufs/ext2fs/ext2fs_vfsops.c: revision 1.184 Use mount from argument mp, vp-v_mount is not valid here. PR kern/49142 (panic in ext2fs_loadvnode mounting an ext2fs filesystem) To generate a diff of this commit: cvs rdiff -u -r1.183 -r1.183.2.1 src/sys/ufs/ext2fs/ext2fs_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/ufs/ext2fs/ext2fs_vfsops.c diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.183 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.183.2.1 --- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.183 Wed Jul 9 08:43:54 2014 +++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Fri Aug 22 19:20:15 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ext2fs_vfsops.c,v 1.183 2014/07/09 08:43:54 maxv Exp $ */ +/* $NetBSD: ext2fs_vfsops.c,v 1.183.2.1 2014/08/22 19:20:15 martin Exp $ */ /* * Copyright (c) 1989, 1991, 1993, 1994 @@ -60,7 +60,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.183 2014/07/09 08:43:54 maxv Exp $); +__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.183.2.1 2014/08/22 19:20:15 martin Exp $); #if defined(_KERNEL_OPT) #include opt_compat_netbsd.h @@ -1024,7 +1024,7 @@ ext2fs_loadvnode(struct mount *mp, struc if (++ext2gennumber (u_long)time_second) ext2gennumber = time_second; ip-i_e2fs_gen = ext2gennumber; - if ((vp-v_mount-mnt_flag MNT_RDONLY) == 0) + if ((mp-mnt_flag MNT_RDONLY) == 0) ip-i_flag |= IN_MODIFIED; } uvm_vnp_setsize(vp, ext2fs_size(ip));
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Fri Aug 22 19:21:53 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket 49 To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.19 src/doc/CHANGES-7.0:1.1.2.20 --- src/doc/CHANGES-7.0:1.1.2.19 Fri Aug 22 10:42:39 2014 +++ src/doc/CHANGES-7.0 Fri Aug 22 19:21:53 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.19 2014/08/22 10:42:39 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.20 2014/08/22 19:21:53 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -338,3 +338,10 @@ sys/external/bsd/common/include/linux/li sys/dev/ic/mfi.c1.54-1.55 Fix mfi(4) panic on boot on some mfi(4) chips. [msaitoh, ticket #48] + +sys/ufs/ext2fs/ext2fs_vfsops.c 1.184 + Use mount from argument mp, vp-v_mount is not valid here. + PR kern/49142 (panic in ext2fs_loadvnode mounting an ext2fs + filesystem) + [hannken, ticket #49] +
CVS commit: src/sys/arch/arm/omap
Module Name:src Committed By: jakllsch Date: Fri Aug 22 19:44:04 UTC 2014 Modified Files: src/sys/arch/arm/omap: files.omap2 Log Message: tifb can support 32 and 24 BPP framebuffer modes; pull in corresponding raspos support. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/omap/files.omap2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/omap/files.omap2 diff -u src/sys/arch/arm/omap/files.omap2:1.28 src/sys/arch/arm/omap/files.omap2:1.29 --- src/sys/arch/arm/omap/files.omap2:1.28 Wed Jul 16 18:31:17 2014 +++ src/sys/arch/arm/omap/files.omap2 Fri Aug 22 19:44:04 2014 @@ -1,4 +1,4 @@ -# $NetBSD: files.omap2,v 1.28 2014/07/16 18:31:17 bouyer Exp $ +# $NetBSD: files.omap2,v 1.29 2014/08/22 19:44:04 jakllsch Exp $ # # Configuration info for Texas Instruments OMAP2/OMAP3 CPU support # Based on xscale/files.pxa2x0 @@ -158,7 +158,7 @@ attach omapfb at obio file arch/arm/omap/omapfb.c omapfb # TI AM335x framebuffer -device tifb: rasops16, rasops8, wsemuldisplaydev, vcons, edid +device tifb: rasops32, rasops24, rasops16, rasops8, wsemuldisplaydev, vcons, edid attach tifb at obio file arch/arm/omap/tifb.c tifb
CVS commit: src/sys/arch/arm/omap
Module Name:src
Committed By: jakllsch
Date: Fri Aug 22 19:59:18 UTC 2014
Modified Files:
src/sys/arch/arm/omap: tifb.c
Log Message:
Support WSDISPLAYIO_GET_FBINFO ioctl in tifb(4).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/omap/tifb.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/arm/omap/tifb.c
diff -u src/sys/arch/arm/omap/tifb.c:1.1 src/sys/arch/arm/omap/tifb.c:1.2
--- src/sys/arch/arm/omap/tifb.c:1.1 Wed Jul 16 18:30:43 2014
+++ src/sys/arch/arm/omap/tifb.c Fri Aug 22 19:59:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tifb.c,v 1.1 2014/07/16 18:30:43 bouyer Exp $ */
+/* $NetBSD: tifb.c,v 1.2 2014/08/22 19:59:18 jakllsch Exp $ */
/*
* Copyright (c) 2010 Michael Lorenz
@@ -57,7 +57,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tifb.c,v 1.1 2014/07/16 18:30:43 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: tifb.c,v 1.2 2014/08/22 19:59:18 jakllsch Exp $);
#include opt_omap.h
@@ -779,6 +779,17 @@ tifb_ioctl(void *v, void *vs, u_long cmd
}
return 0;
+ case WSDISPLAYIO_GET_FBINFO:
+ {
+struct wsdisplayio_fbinfo *fbi = data;
+int ret;
+
+ret = wsdisplayio_get_fbinfo(ms-scr_ri, fbi);
+fbi-fbi_flags |= WSFB_VRAM_IS_RAM;
+fbi-fbi_fboffset = sc-sc_palettesize;
+return ret;
+ }
+
case WSDISPLAYIO_GVIDEO:
{
int *on = data;
CVS commit: src/sys/arch/arm/omap
Module Name:src
Committed By: jakllsch
Date: Fri Aug 22 20:01:16 UTC 2014
Modified Files:
src/sys/arch/arm/omap: tifb.c
Log Message:
Fix what is almost certianly an off-by-one error when configuring pads on
AM335x for BPP greater than 16.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/omap/tifb.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/arm/omap/tifb.c
diff -u src/sys/arch/arm/omap/tifb.c:1.2 src/sys/arch/arm/omap/tifb.c:1.3
--- src/sys/arch/arm/omap/tifb.c:1.2 Fri Aug 22 19:59:18 2014
+++ src/sys/arch/arm/omap/tifb.c Fri Aug 22 20:01:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tifb.c,v 1.2 2014/08/22 19:59:18 jakllsch Exp $ */
+/* $NetBSD: tifb.c,v 1.3 2014/08/22 20:01:16 jakllsch Exp $ */
/*
* Copyright (c) 2010 Michael Lorenz
@@ -57,7 +57,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tifb.c,v 1.2 2014/08/22 19:59:18 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: tifb.c,v 1.3 2014/08/22 20:01:16 jakllsch Exp $);
#include opt_omap.h
@@ -443,7 +443,7 @@ tifb_attach(device_t parent, device_t se
#ifdef TI_AM335X
/* configure output pins */
- for (i = 0; i ((sc-sc_panel-bpp == 16) ? 16 : 23); i++) {
+ for (i = 0; i ((sc-sc_panel-bpp == 16) ? 16 : 24); i++) {
if (sitara_cm_padconf_get(tifb_padconf_data[i].padname,
mode, state) == 0) {
aprint_debug(: %s mode %s state %d ,
CVS commit: src/sbin/ping6
Module Name:src
Committed By: matt
Date: Fri Aug 22 20:54:29 UTC 2014
Modified Files:
src/sbin/ping6: ping6.c
Log Message:
Rework to be avoid a conditional assignment which results in:
sbin/ping6/ping6.c:1879:8: error: 'cbit.skip' may be used uninitialized in this
function [-Werror=maybe-uninitialized]
cur += ntohs(cbit.skip) * 32;
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sbin/ping6/ping6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ping6/ping6.c
diff -u src/sbin/ping6/ping6.c:1.82 src/sbin/ping6/ping6.c:1.83
--- src/sbin/ping6/ping6.c:1.82 Sat Oct 19 01:09:16 2013
+++ src/sbin/ping6/ping6.c Fri Aug 22 20:54:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ping6.c,v 1.82 2013/10/19 01:09:16 christos Exp $ */
+/* $NetBSD: ping6.c,v 1.83 2014/08/22 20:54:29 matt Exp $ */
/* $KAME: ping6.c,v 1.164 2002/11/16 14:05:37 itojun Exp $ */
/*
@@ -77,7 +77,7 @@ static char sccsid[] = @(#)ping.c 8.1 (
#else
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: ping6.c,v 1.82 2013/10/19 01:09:16 christos Exp $);
+__RCSID($NetBSD: ping6.c,v 1.83 2014/08/22 20:54:29 matt Exp $);
#endif
#endif
@@ -125,6 +125,7 @@ __RCSID($NetBSD: ping6.c,v 1.82 2013/10
#include fcntl.h
#include math.h
#include signal.h
+#include stdbool.h
#include stdio.h
#include stdlib.h
#include string.h
@@ -1844,6 +1845,7 @@ pr_suptypes(struct icmp6_nodeinfo *ni /*
}
while (cp end) {
+ size_t skip = 0;
clen = (size_t)(end - cp);
if ((ni-ni_flags NI_SUPTYPE_FLAG_COMPRESS) == 0) {
if (clen == 0 || clen MAXQTYPES / 8 ||
@@ -1860,8 +1862,8 @@ pr_suptypes(struct icmp6_nodeinfo *ni /*
return;
cp += sizeof(cbit);
clen = ntohs(cbit.words) * sizeof(v);
- if (cur + clen * 8 + (u_long)ntohs(cbit.skip) * 32
- MAXQTYPES)
+ skip = (size_t)ntohs(cbit.skip) * 32;
+ if (cur + clen * 8 + skip MAXQTYPES)
return;
}
@@ -1874,9 +1876,7 @@ pr_suptypes(struct icmp6_nodeinfo *ni /*
b = pr_bitrange(0, (int)(cur + off * 8), b);
cp += clen;
- cur += clen * 8;
- if ((ni-ni_flags NI_SUPTYPE_FLAG_COMPRESS) != 0)
- cur += ntohs(cbit.skip) * 32;
+ cur += clen * 8 + skip;
}
}
CVS commit: src/external/bsd/nvi/dist/ex
Module Name:src
Committed By: aymeric
Date: Fri Aug 22 21:28:20 UTC 2014
Modified Files:
src/external/bsd/nvi/dist/ex: ex_cscope.c ex_tag.c tag.h
Log Message:
In tagq_free(), fix the test checking whether a TAGQ should be removed from
its tailq. This required introducing a new flag in the TAGQ structure to
avoid reverting to poking under the hood of the queue.h API.
The concrete bug it solves is that using tags would make vi crash reliably
on exit.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nvi/dist/ex/ex_cscope.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/nvi/dist/ex/ex_tag.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/dist/ex/tag.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/bsd/nvi/dist/ex/ex_cscope.c
diff -u src/external/bsd/nvi/dist/ex/ex_cscope.c:1.5 src/external/bsd/nvi/dist/ex/ex_cscope.c:1.6
--- src/external/bsd/nvi/dist/ex/ex_cscope.c:1.5 Sun Jan 26 21:43:45 2014
+++ src/external/bsd/nvi/dist/ex/ex_cscope.c Fri Aug 22 21:28:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_cscope.c,v 1.5 2014/01/26 21:43:45 christos Exp $ */
+/* $NetBSD: ex_cscope.c,v 1.6 2014/08/22 21:28:20 aymeric Exp $ */
/*-
* Copyright (c) 1994, 1996
* Rob Mayoff. All rights reserved.
@@ -16,7 +16,7 @@
static const char sccsid[] = Id: ex_cscope.c,v 10.21 2003/11/05 17:11:54 skimo Exp (Berkeley) Date: 2003/11/05 17:11:54 ;
#endif /* not lint */
#else
-__RCSID($NetBSD: ex_cscope.c,v 1.5 2014/01/26 21:43:45 christos Exp $);
+__RCSID($NetBSD: ex_cscope.c,v 1.6 2014/08/22 21:28:20 aymeric Exp $);
#endif
#include sys/param.h
@@ -549,6 +549,7 @@ cscope_find(SCR *sp, EXCMD *cmdp, const
/* Link the current TAGQ structure into place. */
TAILQ_INSERT_HEAD(exp-tq, tqp, q);
+ F_SET(tqp, TAG_IS_LINKED);
(void)cscope_search(sp, tqp, tqp-current);
Index: src/external/bsd/nvi/dist/ex/ex_tag.c
diff -u src/external/bsd/nvi/dist/ex/ex_tag.c:1.11 src/external/bsd/nvi/dist/ex/ex_tag.c:1.12
--- src/external/bsd/nvi/dist/ex/ex_tag.c:1.11 Sun Jan 26 21:43:45 2014
+++ src/external/bsd/nvi/dist/ex/ex_tag.c Fri Aug 22 21:28:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_tag.c,v 1.11 2014/01/26 21:43:45 christos Exp $ */
+/* $NetBSD: ex_tag.c,v 1.12 2014/08/22 21:28:20 aymeric Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -19,7 +19,7 @@
static const char sccsid[] = Id: ex_tag.c,v 10.50 2004/03/16 14:09:11 skimo Exp (Berkeley) Date: 2004/03/16 14:09:11 ;
#endif /* not lint */
#else
-__RCSID($NetBSD: ex_tag.c,v 1.11 2014/01/26 21:43:45 christos Exp $);
+__RCSID($NetBSD: ex_tag.c,v 1.12 2014/08/22 21:28:20 aymeric Exp $);
#endif
#include sys/param.h
@@ -606,6 +606,7 @@ ex_tag_copy(SCR *orig, SCR *sp)
TAILQ_INSERT_TAIL(tqp-tagq, tp, q);
}
TAILQ_INSERT_TAIL(nexp-tq, tqp, q);
+ F_SET(tqp, TAG_IS_LINKED);
}
/* Copy list of tag files. */
@@ -740,7 +741,7 @@ tagq_free(SCR *sp, TAGQ *tqp)
* If allocated and then the user failed to switch files, the TAGQ
* structure was never attached to any list.
*/
- if (TAILQ_NEXT(tqp, q) != NULL)
+ if (F_ISSET(tqp, TAG_IS_LINKED))
TAILQ_REMOVE(exp-tq, tqp, q);
free(tqp);
return (0);
@@ -810,6 +811,7 @@ tagq_push(SCR *sp, TAGQ *tqp, int new_sc
*/
if (TAILQ_EMPTY(exp-tq)) {
TAILQ_INSERT_HEAD(exp-tq, rtqp, q);
+ F_SET(rtqp, TAG_IS_LINKED);
} else {
free(rtqp);
rtqp = TAILQ_FIRST(exp-tq);
@@ -817,6 +819,7 @@ tagq_push(SCR *sp, TAGQ *tqp, int new_sc
/* Link the new TAGQ structure into place. */
TAILQ_INSERT_HEAD(exp-tq, tqp, q);
+ F_SET(tqp, TAG_IS_LINKED);
(void)ctag_search(sp,
tqp-current-search, tqp-current-slen, tqp-tag);
Index: src/external/bsd/nvi/dist/ex/tag.h
diff -u src/external/bsd/nvi/dist/ex/tag.h:1.3 src/external/bsd/nvi/dist/ex/tag.h:1.4
--- src/external/bsd/nvi/dist/ex/tag.h:1.3 Mon Nov 25 22:43:46 2013
+++ src/external/bsd/nvi/dist/ex/tag.h Fri Aug 22 21:28:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tag.h,v 1.3 2013/11/25 22:43:46 christos Exp $ */
+/* $NetBSD: tag.h,v 1.4 2014/08/22 21:28:20 aymeric Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -104,6 +104,7 @@ struct _tagq { /* Tag queue. */
size_t tlen; /* Tag string length. */
#define TAG_CSCOPE 0x01 /* Cscope tag. */
+#define TAG_IS_LINKED 0x02 /* Tag was inserted into linked list */
u_int8_t flags;
char buf[1]; /* Variable length buffer. */
CVS commit: src/sbin/mknod
Module Name:src
Committed By: mlelstv
Date: Fri Aug 22 22:28:50 UTC 2014
Modified Files:
src/sbin/mknod: mknod.c
Log Message:
Accept driver names only in the two args form together with a minor number.
That's what the documentation says and also avoids the case where the driver
name converted to a major number is interpreted as a packed dev_t number.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sbin/mknod/mknod.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/mknod/mknod.c
diff -u src/sbin/mknod/mknod.c:1.41 src/sbin/mknod/mknod.c:1.42
--- src/sbin/mknod/mknod.c:1.41 Fri Jun 14 16:28:20 2013
+++ src/sbin/mknod/mknod.c Fri Aug 22 22:28:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mknod.c,v 1.41 2013/06/14 16:28:20 tsutsui Exp $ */
+/* $NetBSD: mknod.c,v 1.42 2014/08/22 22:28:50 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#ifndef lint
__COPYRIGHT(@(#) Copyright (c) 1998\
The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: mknod.c,v 1.41 2013/06/14 16:28:20 tsutsui Exp $);
+__RCSID($NetBSD: mknod.c,v 1.42 2014/08/22 22:28:50 mlelstv Exp $);
#endif /* not lint */
#include sys/types.h
@@ -223,7 +223,7 @@ main(int argc, char **argv)
if (*p == 0 errno == 0)
continue;
#ifdef KERN_DRIVERS
- if (n == 0) {
+ if (argc == 2 n == 0) {
major = major_from_name(argv[0], mode);
if (major != -1) {
numbers[0] = major;
CVS commit: src/external/gpl3/gcc/dist/gcc/config/rs6000
Module Name:src
Committed By: matt
Date: Sat Aug 23 02:17:47 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd.h netbsd64.h
rs6000.c t-netbsd64
Log Message:
Fix powerpc64 support for NetBSD.
Add __PPC_ISEL__ to indicate cpu support the isel instruction
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h \
src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd64
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/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.6 src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.7
--- src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.6 Fri Aug 22 06:51:34 2014
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h Sat Aug 23 02:17:47 2014
@@ -31,6 +31,8 @@
builtin_define (_SECURE_PLT); \
if (TARGET_SOFT_FLOAT) \
builtin_define (_SOFT_FLOAT); \
+ if (TARGET_ISEL)\
+builtin_define (__PPC_ISEL__); \
} \
while (0)
Index: src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c
diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.6 src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.7
--- src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.6 Tue May 27 09:18:54 2014
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c Sat Aug 23 02:17:47 2014
@@ -3492,7 +3492,8 @@ rs6000_option_override_internal (bool gl
rs6000_long_double_type_size = RS6000_DEFAULT_LONG_DOUBLE_SIZE;
}
-#if !defined (POWERPC_LINUX) !defined (POWERPC_FREEBSD)
+#if !defined (POWERPC_LINUX) !defined (POWERPC_FREEBSD) \
+ !defined (POWERPC_NETBSD)
if (!global_options_set.x_rs6000_ieeequad)
rs6000_ieeequad = 1;
#endif
@@ -22500,7 +22501,8 @@ rs6000_savres_routine_name (rs6000_stack
}
else if (DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_ELFv2)
{
-#if !defined (POWERPC_LINUX) !defined (POWERPC_FREEBSD)
+#if !defined (POWERPC_LINUX) !defined (POWERPC_FREEBSD) \
+ !defined(POWERPC_NETBSD)
/* No out-of-line save/restore routines for GPRs on AIX. */
gcc_assert (!TARGET_AIX || (sel SAVRES_REG) != SAVRES_GPR);
#endif
@@ -22512,7 +22514,8 @@ rs6000_savres_routine_name (rs6000_stack
: ((sel SAVRES_LR) ? _restgpr0_ : _restgpr1_));
else if ((sel SAVRES_REG) == SAVRES_FPR)
{
-#if defined (POWERPC_LINUX) || defined (POWERPC_FREEBSD)
+#if defined (POWERPC_LINUX) || defined (POWERPC_FREEBSD) \
+|| defined (POWERPC_NETBSD)
if ((sel SAVRES_LR))
prefix = ((sel SAVRES_SAVE) ? _savefpr_ : _restfpr_);
else
@@ -29135,7 +29138,8 @@ rs6000_elf_file_end (void)
aix_struct_return ? 2 : 1);
}
#endif
-#if defined (POWERPC_LINUX) || defined (POWERPC_FREEBSD)
+#if defined (POWERPC_LINUX) || defined (POWERPC_FREEBSD) \
+|| defined (POWERPC_NETBSD)
if (TARGET_32BIT || DEFAULT_ABI == ABI_ELFv2)
file_end_indicate_exec_stack ();
#endif
Index: src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h
diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.7 src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.8
--- src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h:1.7 Fri Aug 22 06:52:37 2014
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h Sat Aug 23 02:17:47 2014
@@ -301,6 +301,8 @@ extern int dot_symbols;
do \
{ \
NETBSD_OS_CPP_BUILTINS_ELF(); \
+ if (TARGET_ISEL) \
+ builtin_define (__PPC_ISEL__); \
if (TARGET_64BIT) \
{ \
builtin_define (__PPC__); \
@@ -386,9 +388,7 @@ extern int dot_symbols;
#define PTRDIFF_TYPE (TARGET_64BIT ? long int : int)
#undef WCHAR_TYPE
-#define WCHAR_TYPE (TARGET_64BIT ? int : long int)
-#undef WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE 32
+#define WCHAR_TYPE int
/* Override rs6000.h definition. */
#undef ASM_APP_ON
Index: src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd64
diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd64:1.1 src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd64:1.2
--- src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd64:1.1 Wed Jun 29 04:59:10 2011
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd64 Sat Aug 23 02:17:47 2014
@@ -6,13 +6,9 @@ LIB2FUNCS_EXTRA = $(srcdir)/config/rs600
TARGET_LIBGCC2_CFLAGS += -mno-minimal-toc
-MULTILIB_OPTIONS= m64/m32 msoft-float
-MULTILIB_DIRNAMES = 64 32 soft-float
-MULTILIB_EXTRA_OPTS = fPIC mstrict-align
-MULTILIB_EXCEPTIONS = m64/msoft-float
-MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
-# XXX this is wrong
-MULTILIB_OSDIRNAMES = ../lib
CVS commit: src/compat/powerpc64/powerpc
Module Name:src
Committed By: matt
Date: Sat Aug 23 02:20:55 UTC 2014
Modified Files:
src/compat/powerpc64/powerpc: bsd.powerpc.mk
Log Message:
Add
LDFLAGS+= -Wl,-m,elf32ppc_nbsd
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/compat/powerpc64/powerpc/bsd.powerpc.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/powerpc64/powerpc/bsd.powerpc.mk
diff -u src/compat/powerpc64/powerpc/bsd.powerpc.mk:1.2 src/compat/powerpc64/powerpc/bsd.powerpc.mk:1.3
--- src/compat/powerpc64/powerpc/bsd.powerpc.mk:1.2 Fri Mar 7 05:48:30 2014
+++ src/compat/powerpc64/powerpc/bsd.powerpc.mk Sat Aug 23 02:20:55 2014
@@ -1,6 +1,10 @@
-# $NetBSD: bsd.powerpc.mk,v 1.2 2014/03/07 05:48:30 matt Exp $
+# $NetBSD: bsd.powerpc.mk,v 1.3 2014/08/23 02:20:55 matt Exp $
LD+= -m elf32ppc_nbsd
+.if empty(LDFLAGS:M*elf32ppc_nbsd*)
+LDFLAGS+= -Wl,-m,elf32ppc_nbsd
+.endif
+.ifndef MLIBDIR
MLIBDIR= powerpc
LIBC_MACHINE_ARCH= ${MLIBDIR}
COMMON_MACHINE_ARCH= ${MLIBDIR}
@@ -13,3 +17,4 @@ LDELFSO_MACHINE_ARCH= ${MLIBDIR}
GOMP_MACHINE_ARCH= ${MLIBDIR}
.include ${.PARSEDIR}/../../m32.mk
+.endif
CVS commit: src/sys/arch/powerpc/include
Module Name:src Committed By: matt Date: Sat Aug 23 02:21:44 UTC 2014 Modified Files: src/sys/arch/powerpc/include: asm.h Log Message: Fix cmpptr/cmpreq/etc to use right mnemonics To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/arch/powerpc/include/asm.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/powerpc/include/asm.h diff -u src/sys/arch/powerpc/include/asm.h:1.46 src/sys/arch/powerpc/include/asm.h:1.47 --- src/sys/arch/powerpc/include/asm.h:1.46 Thu Mar 6 19:05:24 2014 +++ src/sys/arch/powerpc/include/asm.h Sat Aug 23 02:21:44 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.46 2014/03/06 19:05:24 matt Exp $ */ +/* $NetBSD: asm.h,v 1.47 2014/08/23 02:21:44 matt Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -356,12 +356,12 @@ y: .quad .##y,.TOC.@tocbase,0; \ # define cmpptri cmpwi # define cmplongi cmpwi # define cmpregi cmpwi -# define cmpptrl cmpwl -# define cmplongl cmpwl -# define cmpregl cmpwl -# define cmpptrli cmpwli -# define cmplongli cmpwli -# define cmpregli cmpwli +# define cmpptrl cmplw +# define cmplongl cmplw +# define cmpregl cmplw +# define cmpptrli cmplwi +# define cmplongli cmplwi +# define cmpregli cmplwi #else /* __LP64__ */ @@ -401,12 +401,12 @@ y: .quad .##y,.TOC.@tocbase,0; \ # define cmpptri cmpdi # define cmplongi cmpdi # define cmpregi cmpdi -# define cmpptrl cmpdl -# define cmplongl cmpdl -# define cmpregl cmpdl -# define cmpptrli cmpdli -# define cmplongli cmpdli -# define cmpregli cmpdli +# define cmpptrl cmpld +# define cmplongl cmpld +# define cmpregl cmpld +# define cmpptrli cmpldi +# define cmplongli cmpldi +# define cmpregli cmpldi #endif /* __LP64__ */
CVS commit: src/lib/libc/arch
Module Name:src Committed By: matt Date: Sat Aug 23 02:24:22 UTC 2014 Modified Files: src/lib/libc/arch/powerpc: SYS.h src/lib/libc/arch/powerpc/sys: __clone.S __syscall.S brk.S getcontext.S pipe.S sbrk.S src/lib/libc/arch/powerpc64: Makefile.inc SYS.h src/lib/libc/arch/powerpc64/gen: __setjmp14.S __sigsetjmp14.S src/lib/libc/arch/powerpc64/sys: __clone.S __sigtramp2.S __syscall.S __vfork14.S brk.S cerror.S fork.S getcontext.S pipe.S ptrace.S sbrk.S syscall.S Added Files: src/lib/libc/arch/powerpc64: genassym.cf Log Message: Minimize differences between powerpc and powerpc64 Fix powerpc64 assembly to use right instructions for 64bit CPUs. Use hidden for __curbrk and __minbrk to avoid GOT/TOC relocations. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/libc/arch/powerpc/SYS.h cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/powerpc/sys/__clone.S \ src/lib/libc/arch/powerpc/sys/getcontext.S cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/powerpc/sys/__syscall.S cvs rdiff -u -r1.13 -r1.14 src/lib/libc/arch/powerpc/sys/brk.S cvs rdiff -u -r1.8 -r1.9 src/lib/libc/arch/powerpc/sys/pipe.S cvs rdiff -u -r1.12 -r1.13 src/lib/libc/arch/powerpc/sys/sbrk.S cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/powerpc64/Makefile.inc \ src/lib/libc/arch/powerpc64/SYS.h cvs rdiff -u -r0 -r1.1 src/lib/libc/arch/powerpc64/genassym.cf cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/powerpc64/gen/__setjmp14.S \ src/lib/libc/arch/powerpc64/gen/__sigsetjmp14.S cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/powerpc64/sys/__clone.S \ src/lib/libc/arch/powerpc64/sys/__syscall.S \ src/lib/libc/arch/powerpc64/sys/__vfork14.S \ src/lib/libc/arch/powerpc64/sys/fork.S \ src/lib/libc/arch/powerpc64/sys/pipe.S \ src/lib/libc/arch/powerpc64/sys/syscall.S cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/powerpc64/sys/__sigtramp2.S cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/powerpc64/sys/brk.S \ src/lib/libc/arch/powerpc64/sys/getcontext.S \ src/lib/libc/arch/powerpc64/sys/sbrk.S cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/powerpc64/sys/cerror.S cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/powerpc64/sys/ptrace.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/powerpc/SYS.h diff -u src/lib/libc/arch/powerpc/SYS.h:1.12 src/lib/libc/arch/powerpc/SYS.h:1.13 --- src/lib/libc/arch/powerpc/SYS.h:1.12 Sat Jan 15 07:31:12 2011 +++ src/lib/libc/arch/powerpc/SYS.h Sat Aug 23 02:24:22 2014 @@ -1,24 +1,21 @@ -/* $NetBSD: SYS.h,v 1.12 2011/01/15 07:31:12 matt Exp $ */ +/* $NetBSD: SYS.h,v 1.13 2014/08/23 02:24:22 matt Exp $ */ #include machine/asm.h #include sys/syscall.h -#ifdef __STDC__ +#define BRANCH_TO_CERROR() b _C_LABEL(__cerror) + #define _DOSYSCALL(x) li %r0,(SYS_ ## x) ;\ sc -#else -#define _DOSYSCALL(x) li %r0,(SYS_/**/x) ;\ -sc -#endif /* __STDC__ */ #define _SYSCALL_NOERROR(x,y) .text;\ -.align 2 ;\ +.p2align 2 ;\ ENTRY(x);\ _DOSYSCALL(y) #define _SYSCALL(x,y) .text;\ -.align 2 ;\ - 2: b _C_LABEL(__cerror) ;\ +.p2align 2 ;\ + 2: BRANCH_TO_CERROR() ;\ _SYSCALL_NOERROR(x,y) ;\ bso 2b @@ -32,7 +29,7 @@ #define PSEUDO(x,y) _SYSCALL_NOERROR(x,y) ;\ bnslr;\ -b _C_LABEL(__cerror) ;\ +BRANCH_TO_CERROR() ;\ END(x) #define RSYSCALL_NOERROR(x) PSEUDO_NOERROR(x,x) Index: src/lib/libc/arch/powerpc/sys/__clone.S diff -u src/lib/libc/arch/powerpc/sys/__clone.S:1.5 src/lib/libc/arch/powerpc/sys/__clone.S:1.6 --- src/lib/libc/arch/powerpc/sys/__clone.S:1.5 Thu Sep 12 15:36:15 2013 +++ src/lib/libc/arch/powerpc/sys/__clone.S Sat Aug 23 02:24:22 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: __clone.S,v 1.5 2013/09/12 15:36:15 joerg Exp $ */ +/* $NetBSD: __clone.S,v 1.6 2014/08/23 02:24:22 matt Exp $ */ /*- * Copyright (c) 2001 Tsubai Masanari. All rights reserved. @@ -30,7 +30,7 @@ #include SYS.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: __clone.S,v 1.5 2013/09/12 15:36:15 joerg Exp $) +__RCSID($NetBSD: __clone.S,v 1.6 2014/08/23 02:24:22 matt Exp $) #endif /* LIBC_SCCS !lint */ #ifdef WEAK_ALIAS @@ -44,9 +44,9 @@ ENTRY(__clone) /* * Sanity checks: func and stack may not be NULL. */ - cmpwi %r3,0 + cmpptri %r3,0 beq 1f - cmpwi %r4,0 + cmpptri %r4,0 beq 1f mr %r7,%r3 /* Save fn in r7. */ @@ -54,7 +54,7 @@ ENTRY(__clone) _DOSYSCALL(__clone) /* (flags, stack) */ bso 2f /* error... */ - cmpwi %r3,0 + cmpptri %r3,0 bnelr /* We're the parent, just return. */ mtlr %r7 /* fn */ @@ -69,5 +69,5 @@ ENTRY(__clone) 1: li %r3,EINVAL 2: - b _C_LABEL(__cerror) + BRANCH_TO_CERROR() END(__clone) Index: src/lib/libc/arch/powerpc/sys/getcontext.S diff -u src/lib/libc/arch/powerpc/sys/getcontext.S:1.5 src/lib/libc/arch/powerpc/sys/getcontext.S:1.6 ---
CVS commit: src/lib/libkvm
Module Name:src
Committed By: matt
Date: Sat Aug 23 02:25:23 UTC 2014
Modified Files:
src/lib/libkvm: kvm_powerpc64.c
Log Message:
#if 0 some code not in use yet
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libkvm/kvm_powerpc64.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/libkvm/kvm_powerpc64.c
diff -u src/lib/libkvm/kvm_powerpc64.c:1.5 src/lib/libkvm/kvm_powerpc64.c:1.6
--- src/lib/libkvm/kvm_powerpc64.c:1.5 Mon Jan 27 21:00:01 2014
+++ src/lib/libkvm/kvm_powerpc64.c Sat Aug 23 02:25:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_powerpc64.c,v 1.5 2014/01/27 21:00:01 matt Exp $ */
+/* $NetBSD: kvm_powerpc64.c,v 1.6 2014/08/23 02:25:23 matt Exp $ */
/*
* Copyright (c) 2005 Wasabi Systems, Inc.
@@ -90,7 +90,7 @@
#include powerpc/oea/bat.h
#include powerpc/oea/pte.h
-__RCSID($NetBSD: kvm_powerpc64.c,v 1.5 2014/01/27 21:00:01 matt Exp $);
+__RCSID($NetBSD: kvm_powerpc64.c,v 1.6 2014/08/23 02:25:23 matt Exp $);
void
_kvm_freevtop(kvm_t *kd)
@@ -117,17 +117,16 @@ _kvm_initvtop(kvm_t *kd)
int
_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
{
- cpu_kcore_hdr_t *cpu_kh;
- uint32_t pvr;
if (ISALIVE(kd)) {
_kvm_err(kd, 0, vatop called in live kernel!);
return 0;
}
- cpu_kh = kd-cpu_data;
-
- pvr = (cpu_kh-pvr 16);
+#if 0
+ cpu_kcore_hdr_t *cpu_kh = kd-cpu_data;
+ uint32_t pvr = (cpu_kh-pvr 16);
+#endif
/* No hit -- no translation */
CVS commit: src/share/mk
Module Name:src
Committed By: matt
Date: Sat Aug 23 02:26:36 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Change powerpc64 to use GCC 4.8
To generate a diff of this commit:
cvs rdiff -u -r1.832 -r1.833 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.832 src/share/mk/bsd.own.mk:1.833
--- src/share/mk/bsd.own.mk:1.832 Wed Aug 13 20:51:26 2014
+++ src/share/mk/bsd.own.mk Sat Aug 23 02:26:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.832 2014/08/13 20:51:26 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.833 2014/08/23 02:26:36 matt Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -64,8 +64,7 @@ MKGCC?= no
# Platforms still using GCC 4.5
.if \
${MACHINE_CPU} == m68k || \
- ${MACHINE_ARCH} == powerpc || \
- ${MACHINE_ARCH} == powerpc64
+ ${MACHINE_ARCH} == powerpc
HAVE_GCC?=45
.elif ${MACHINE} == playstation2 || ${MACHINE_CPU} == aarch64
CVS commit: [netbsd-7] src/usr.sbin/sysinst
Module Name:src
Committed By: riz
Date: Sat Aug 23 03:44:02 UTC 2014
Modified Files:
src/usr.sbin/sysinst [netbsd-7]: disks.c main.c mbr.c net.c partman.c
util.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #39):
usr.sbin/sysinst/main.c: revision 1.4
usr.sbin/sysinst/disks.c: revision 1.5
usr.sbin/sysinst/main.c: revision 1.5
usr.sbin/sysinst/mbr.c: revision 1.3
usr.sbin/sysinst/net.c: revision 1.3
usr.sbin/sysinst/net.c: revision 1.4
usr.sbin/sysinst/partman.c: revision 1.5
usr.sbin/sysinst/partman.c: revision 1.6
usr.sbin/sysinst/util.c: revision 1.4
Remove duplicate fclose(), pointed out by coverity scan.
Remove (accidently) duplicated code - pointed out by coverity scan.
Make sure the interface name is 0 terminated, pointed out by coverity scan.
Check return value from getenv() before using the value. Pointed out by
coverity scan.
Make an invariant more clear to avoid fals positives from coverity scan
if chdir() fails, try chdir /
Check return values from stat before comparing contents of the result
structures. Pointed out by coverity scan.
Cosmetic changes trying to appease coverity scan.
Make sure to not dereference a NULL pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.4.1 src/usr.sbin/sysinst/disks.c \
src/usr.sbin/sysinst/partman.c
cvs rdiff -u -r1.3 -r1.3.4.1 src/usr.sbin/sysinst/main.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/mbr.c \
src/usr.sbin/sysinst/net.c
cvs rdiff -u -r1.3 -r1.3.2.1 src/usr.sbin/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.4 src/usr.sbin/sysinst/disks.c:1.4.4.1
--- src/usr.sbin/sysinst/disks.c:1.4 Fri Aug 8 20:24:27 2014
+++ src/usr.sbin/sysinst/disks.c Sat Aug 23 03:44:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.4 2014/08/08 20:24:27 riz Exp $ */
+/* $NetBSD: disks.c,v 1.4.4.1 2014/08/23 03:44:02 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1383,7 +1383,7 @@ get_dkwedges(struct dkwedge_info **dkw,
}
}
- if (dkwl.dkwl_nwedges 0)
+ if (dkwl.dkwl_nwedges 0 *dkw != NULL)
qsort(*dkw, dkwl.dkwl_nwedges, sizeof(**dkw), get_dkwedges_sort);
close(fd);
Index: src/usr.sbin/sysinst/partman.c
diff -u src/usr.sbin/sysinst/partman.c:1.4 src/usr.sbin/sysinst/partman.c:1.4.4.1
--- src/usr.sbin/sysinst/partman.c:1.4 Fri Aug 8 20:59:35 2014
+++ src/usr.sbin/sysinst/partman.c Sat Aug 23 03:44:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: partman.c,v 1.4 2014/08/08 20:59:35 riz Exp $ */
+/* $NetBSD: partman.c,v 1.4.4.1 2014/08/23 03:44:02 riz Exp $ */
/*
* Copyright 2012 Eugene Lozovoy
@@ -1736,7 +1736,7 @@ pm_wedges_fill(pm_devs_t *pm_cur)
if (wedges[i].pm == pm_cur ! wedges[i].allocated)
wedges[i].pm = NULL;
- for (i = 0; i MAXPARTITIONS i MAX_WEDGES; i++)
+ for (i = 0; i min(MAXPARTITIONS,MAX_WEDGES); i++)
if (pm_cur-bsdlabel[i].pi_fstype != FS_UNUSED) {
current = pm_wedge_getfree();
if (current 0) {
@@ -2414,17 +2414,18 @@ pm_submenu(menudesc *m, void *arg)
switch (((part_entry_t *)arg)[m-cursel].type) {
case PM_DISK_T:
- if (pm_cur-gpt) {
+ if (pm_cur != NULL pm_cur-gpt) {
process_menu(MENU_pmgptentry, part_num);
pm_wedges_fill(pm_cur);
- } else
+ } else {
process_menu(MENU_pmdiskentry, part_num);
+ }
break;
case PM_WEDGE_T:
case PM_PART_T:
part_num = ((part_entry_t *)arg)[m-cursel].dev_num;
process_menu(MENU_pmpartentry, part_num);
- if (pm_cur-gpt)
+ if (pm_cur != NULL pm_cur-gpt)
pm_wedges_fill(pm_cur);
break;
case PM_SPEC_T:
@@ -2597,7 +2598,7 @@ pm_upddevlist(menudesc *m, void *arg)
if (pm_i-found 0)
pm_i-found = 0;
/* Detect all present devices */
- find_disks(partman);
+ (void)find_disks(partman);
pm_lvm_find();
pm_clean();
Index: src/usr.sbin/sysinst/main.c
diff -u src/usr.sbin/sysinst/main.c:1.3 src/usr.sbin/sysinst/main.c:1.3.4.1
--- src/usr.sbin/sysinst/main.c:1.3 Wed Aug 6 09:11:46 2014
+++ src/usr.sbin/sysinst/main.c Sat Aug 23 03:44:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.3 2014/08/06 09:11:46 martin Exp $ */
+/* $NetBSD: main.c,v 1.3.4.1 2014/08/23 03:44:02 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -390,7 +390,10 @@ toplevel(void)
* XXX must be idempotent, since we get run each time the main
* menu is displayed.
*/
- chdir(getenv(HOME));
+ char *home = getenv(HOME);
+ if (home != NULL)
+ if (chdir(home) != 0)
+ (void)chdir(/);
unwind_mounts();
/* Display banner message in (english, francais, deutsch..) */
Index: src/usr.sbin/sysinst/mbr.c
diff -u src/usr.sbin/sysinst/mbr.c:1.2 src/usr.sbin/sysinst/mbr.c:1.2.4.1
--- src/usr.sbin/sysinst/mbr.c:1.2 Sun Aug 3 16:09:38 2014
+++ src/usr.sbin/sysinst/mbr.c
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: riz Date: Sat Aug 23 03:47:10 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets 39, 50. To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.20 src/doc/CHANGES-7.0:1.1.2.21 --- src/doc/CHANGES-7.0:1.1.2.20 Fri Aug 22 19:21:53 2014 +++ src/doc/CHANGES-7.0 Sat Aug 23 03:47:10 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.20 2014/08/22 19:21:53 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.21 2014/08/23 03:47:10 riz Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -345,3 +345,22 @@ sys/ufs/ext2fs/ext2fs_vfsops.c 1.184 filesystem) [hannken, ticket #49] +usr.sbin/sysinst/disks.c 1.5 +usr.sbin/sysinst/main.c1.4-1.5 +usr.sbin/sysinst/mbr.c1.3 +usr.sbin/sysinst/net.c1.3-1.4 +usr.sbin/sysinst/partman.c 1.5-1.6 +usr.sbin/sysinst/util.c1.4 + + Remove some duplicate code, null termination, check + return values, avoid NULL dereference in sysinst. + [martin, ticket #39] + +sys/dev/isa/ess.c1.81-1.82 +sys/dev/isa/essreg.h1.17 +sys/dev/isa/essvar.h1.27 + + Add support for Spatializer, 3D audio effects embedded in ES1869 + and ES1879 to ess(4). + [nakayama, ticket #50] +
CVS commit: [netbsd-7] src/sys/dev/isa
Module Name:src
Committed By: riz
Date: Sat Aug 23 03:46:55 UTC 2014
Modified Files:
src/sys/dev/isa [netbsd-7]: ess.c essreg.h essvar.h
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #50):
sys/dev/isa/ess.c: revision 1.81
sys/dev/isa/ess.c: revision 1.82
sys/dev/isa/essvar.h: revision 1.27
sys/dev/isa/essreg.h: revision 1.17
Remove redundant colon.
Add support for Spatializer, 3D audio effects embedded in ES1869
and ES1879 to ess(4).
Tested on my old laptop, mobio NX.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.80.24.1 src/sys/dev/isa/ess.c
cvs rdiff -u -r1.16 -r1.16.138.1 src/sys/dev/isa/essreg.h
cvs rdiff -u -r1.26 -r1.26.24.1 src/sys/dev/isa/essvar.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/isa/ess.c
diff -u src/sys/dev/isa/ess.c:1.80 src/sys/dev/isa/ess.c:1.80.24.1
--- src/sys/dev/isa/ess.c:1.80 Thu Nov 24 03:35:57 2011
+++ src/sys/dev/isa/ess.c Sat Aug 23 03:46:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ess.c,v 1.80 2011/11/24 03:35:57 mrg Exp $ */
+/* $NetBSD: ess.c,v 1.80.24.1 2014/08/23 03:46:55 riz Exp $ */
/*
* Copyright 1997
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ess.c,v 1.80 2011/11/24 03:35:57 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: ess.c,v 1.80.24.1 2014/08/23 03:46:55 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -170,7 +170,7 @@ int ess_reset(struct ess_softc *);
void ess_set_gain(struct ess_softc *, int, int);
int ess_set_in_port(struct ess_softc *, int);
int ess_set_in_ports(struct ess_softc *, int);
-u_int ess_srtotc(u_int);
+u_int ess_srtotc(struct ess_softc *, u_int);
u_int ess_srtofc(u_int);
u_char ess_get_dsp_status(struct ess_softc *);
u_char ess_dsp_read_ready(struct ess_softc *);
@@ -920,7 +920,7 @@ essattach(struct ess_softc *sc, int enab
return;
}
- aprint_normal(: ESS Technology ES%s [version 0x%04x]\n,
+ aprint_normal(ESS Technology ES%s [version 0x%04x]\n,
essmodel[sc-sc_model], sc-sc_version);
callout_init(sc-sc_poll1_ch, CALLOUT_MPSAFE);
@@ -994,7 +994,17 @@ essattach(struct ess_softc *sc, int enab
if (ESS_USE_AUDIO1(sc-sc_model)) {
ess_write_mix_reg(sc, ESS_MREG_ADC_SOURCE, ESS_SOURCE_MIC);
sc-in_port = ESS_SOURCE_MIC;
- sc-ndevs = ESS_1788_NDEVS;
+ if (ESS_IS_ES18X9(sc-sc_model)) {
+ sc-ndevs = ESS_18X9_NDEVS;
+ sc-sc_spatializer = 0;
+ ess_set_mreg_bits(sc, ESS_MREG_MODE,
+ ESS_MODE_ASYNC_MODE | ESS_MODE_NEWREG);
+ ess_set_mreg_bits(sc, ESS_MREG_SPATIAL_CTRL,
+ ESS_SPATIAL_CTRL_RESET);
+ ess_clear_mreg_bits(sc, ESS_MREG_SPATIAL_CTRL,
+ ESS_SPATIAL_CTRL_ENABLE | ESS_SPATIAL_CTRL_MONO);
+ } else
+ sc-ndevs = ESS_1788_NDEVS;
} else {
/*
* Set hardware record source to use output of the record
@@ -1015,6 +1025,14 @@ essattach(struct ess_softc *sc, int enab
* are set to 50% volume.
*/
for (i = 0; i sc-ndevs; i++) {
+ if (ESS_IS_ES18X9(sc-sc_model)) {
+ switch (i) {
+ case ESS_SPATIALIZER:
+ case ESS_SPATIALIZER_ENABLE:
+v = 0;
+goto skip;
+ }
+ }
switch (i) {
case ESS_MIC_PLAY_VOL:
case ESS_LINE_PLAY_VOL:
@@ -1031,6 +1049,7 @@ essattach(struct ess_softc *sc, int enab
v = ESS_4BIT_GAIN(AUDIO_MAX_GAIN / 2);
break;
}
+skip:
sc-gain[i][ESS_LEFT] = sc-gain[i][ESS_RIGHT] = v;
ess_set_gain(sc, i, 1);
}
@@ -1262,11 +1281,12 @@ ess_set_params(
else
rate = play-sample_rate;
- ess_write_x_reg(sc, ESS_XCMD_SAMPLE_RATE, ess_srtotc(rate));
+ ess_write_x_reg(sc, ESS_XCMD_SAMPLE_RATE, ess_srtotc(sc, rate));
ess_write_x_reg(sc, ESS_XCMD_FILTER_CLOCK, ess_srtofc(rate));
if (!ESS_USE_AUDIO1(sc-sc_model)) {
- ess_write_mix_reg(sc, ESS_MREG_SAMPLE_RATE, ess_srtotc(rate));
+ ess_write_mix_reg(sc, ESS_MREG_SAMPLE_RATE,
+ ess_srtotc(sc, rate));
ess_write_mix_reg(sc, ESS_MREG_FILTER_CLOCK, ess_srtofc(rate));
}
@@ -1781,6 +1801,35 @@ ess_set_port(void *addr, mixer_ctrl_t *c
return 0;
}
+ if (ESS_IS_ES18X9(sc-sc_model)) {
+
+ switch (cp-dev) {
+ case ESS_SPATIALIZER:
+ if (cp-type != AUDIO_MIXER_VALUE ||
+ cp-un.value.num_channels != 1)
+return EINVAL;
+
+ sc-gain[cp-dev][ESS_LEFT] =
+sc-gain[cp-dev][ESS_RIGHT] = ESS_6BIT_GAIN(
+cp-un.value.level[AUDIO_MIXER_LEVEL_MONO]);
+ ess_set_gain(sc, cp-dev, 1);
+ return 0;
+
+ case ESS_SPATIALIZER_ENABLE:
+ if (cp-type != AUDIO_MIXER_ENUM)
+return EINVAL;
+
+ sc-sc_spatializer = (cp-un.ord != 0);
+ if (sc-sc_spatializer)
+ess_set_mreg_bits(sc, ESS_MREG_SPATIAL_CTRL,
+ESS_SPATIAL_CTRL_ENABLE);
+ else
+ess_clear_mreg_bits(sc, ESS_MREG_SPATIAL_CTRL,
+ESS_SPATIAL_CTRL_ENABLE);
+ return 0;
+ }
+ }
+
if (ESS_USE_AUDIO1(sc-sc_model))
return EINVAL;
@@ -1886,6 +1935,23 @@ ess_get_port(void *addr, mixer_ctrl_t *c
return 0;
}
+ if (ESS_IS_ES18X9(sc-sc_model)) {
+
+
