CVS commit: src
Module Name:src Committed By: uebayasi Date: Thu Nov 6 06:42:25 UTC 2014 Modified Files: src: BUILDING Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/BUILDING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.112 src/BUILDING:1.113 --- src/BUILDING:1.112 Thu Nov 6 03:50:13 2014 +++ src/BUILDING Thu Nov 6 06:42:25 2014 @@ -632,8 +632,8 @@ BUILDING set (see above). iso-image Create a NetBSD installation CD-ROM image in the - RELEASEDIR/images directory. The CD-ROM file system will - have a layout as described in release(7). + RELEASEDIR/iso directory. The CD-ROM file system will have + a layout as described in release(7). For most machine types, the CD-ROM will be bootable, and will automatically run the sysinst(8) menu-based @@ -649,8 +649,8 @@ BUILDING the RELEASEDIR/RELEASEMACHINEDIR/installation/cdrom directory by ``make release''. These smaller images usually contain the same tools as the larger images in - RELEASEDIR/images, but do not contain additional content - such as the distribution sets. + RELEASEDIR/iso, but do not contain additional content such + as the distribution sets. Note that the mac68k port still uses an older method of creating CD-ROM images. This requires the mkisofs(1) @@ -659,8 +659,8 @@ BUILDING iso-image-source Create a NetBSD installation CD-ROM image in the - RELEASEDIR/images directory. The CD-ROM file system will - have a layout as described in release(7). It will have top + RELEASEDIR/iso directory. The CD-ROM file system will have + a layout as described in release(7). It will have top level directories for the machine type and source. For most machine types, the CD-ROM will be bootable, and @@ -678,8 +678,8 @@ BUILDING the RELEASEDIR/RELEASEMACHINEDIR/installation/cdrom directory by ``make release''. These smaller images usually contain the same tools as the larger images in - RELEASEDIR/images, but do not contain additional content - such as the distribution sets. + RELEASEDIR/iso, but do not contain additional content such + as the distribution sets. Note that the mac68k port still uses an older method of creating CD-ROM images. This requires the mkisofs(1) @@ -820,8 +820,8 @@ BUILDING symbol table and can be used for debugging (for example with a cross-gdb built by MKCROSSGDB). - kernels This command will build all kernels defined in port specific - release build procedure. + kernels This command will build all kernels defined in port + specific release build procedure. This command internally calls the kernel=kconf operation for each found kernel configuration file.
CVS commit: src/doc
Module Name:src Committed By: uebayasi Date: Thu Nov 6 06:41:23 UTC 2014 Modified Files: src/doc: BUILDING.mdoc Log Message: Document the "kernels" operation. To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.105 src/doc/BUILDING.mdoc:1.106 --- src/doc/BUILDING.mdoc:1.105 Wed Nov 5 08:15:04 2014 +++ src/doc/BUILDING.mdoc Thu Nov 6 06:41:23 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: BUILDING.mdoc,v 1.105 2014/11/05 08:15:04 snj Exp $ +.\" $NetBSD: BUILDING.mdoc,v 1.106 2014/11/06 06:41:23 uebayasi Exp $ .\" .\" Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -1506,6 +1506,13 @@ file alongside of the kernel which contains a full symbol table and can be used for debugging (for example with a cross-gdb built by .Sy MKCROSSGDB ) . +.It Sy kernels +This command will build all kernels defined in port specific release build +procedure. +.Pp +This command internally calls the +.Sy kernel Ns = Ns Ar kconf +operation for each found kernel configuration file. .It Sy modules This command will build kernel modules and install them into .Sy DESTDIR .
CVS commit: src
Module Name:src Committed By: uebayasi Date: Thu Nov 6 03:50:13 UTC 2014 Modified Files: src: BUILDING Log Message: Expand TABs. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/BUILDING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.111 src/BUILDING:1.112 --- src/BUILDING:1.111 Thu Nov 6 03:34:11 2014 +++ src/BUILDING Thu Nov 6 03:50:13 2014 @@ -823,8 +823,8 @@ BUILDING kernels This command will build all kernels defined in port specific release build procedure. - This command internally calls the kernel=kconf operation - for each found kernel configuration file. + This command internally calls the kernel=kconf operation + for each found kernel configuration file. modules This command will build kernel modules and install them into DESTDIR.
CVS commit: src
Module Name:src Committed By: uebayasi Date: Thu Nov 6 03:34:11 UTC 2014 Modified Files: src: BUILDING Log Message: Document the new "kernels" operation, prompted by joerg@. To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 src/BUILDING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.110 src/BUILDING:1.111 --- src/BUILDING:1.110 Wed Nov 5 08:16:33 2014 +++ src/BUILDING Thu Nov 6 03:34:11 2014 @@ -820,6 +820,12 @@ BUILDING symbol table and can be used for debugging (for example with a cross-gdb built by MKCROSSGDB). + kernels This command will build all kernels defined in port specific + release build procedure. + + This command internally calls the kernel=kconf operation + for each found kernel configuration file. + modules This command will build kernel modules and install them into DESTDIR.
CVS commit: src
Module Name:src
Committed By: uebayasi
Date: Thu Nov 6 02:02:49 UTC 2014
Modified Files:
src: build.sh
Log Message:
build.sh: New operation "kernels" to build all kernels
To generate a diff of this commit:
cvs rdiff -u -r1.299 -r1.300 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.299 src/build.sh:1.300
--- src/build.sh:1.299 Wed Nov 5 08:19:17 2014
+++ src/build.sh Thu Nov 6 02:02:48 2014
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.299 2014/11/05 08:19:17 snj Exp $
+# $NetBSD: build.sh,v 1.300 2014/11/06 02:02:48 uebayasi Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -543,6 +543,7 @@ initdefaults()
do_release=false
do_kernel=false
do_releasekernel=false
+ do_kernels=false
do_modules=false
do_installmodules=false
do_install=false
@@ -1027,6 +1028,7 @@ Usage: ${progname} [-EhnorUuxy] [-a arch
kernel.gdb=conf Build kernel (including netbsd.gdb) with config
file \`conf'
releasekernel=conf Install kernel built by kernel=conf to RELEASEDIR.
+kernels Build all kernels
installmodules=idir Run "make installmodules" to \`idir' to install all
kernel modules.
modules Build kernel modules.
@@ -1343,6 +1345,10 @@ parseoptions()
bomb "Must supply a kernel name with \`${op}=...'"
;;
+ kernels)
+ op=kernels
+ ;;
+
disk-image=*)
arg=${op#*=}
op=disk_image
@@ -1870,7 +1876,7 @@ createmakewrapper()
eval cat <
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: pooka
Date: Thu Nov 6 01:42:01 UTC 2014
Modified Files:
src/sys/dev/pci: viornd.c
Log Message:
put the "asked for" print also behind VIORNG_DEBUG
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/viornd.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/viornd.c
diff -u src/sys/dev/pci/viornd.c:1.4 src/sys/dev/pci/viornd.c:1.5
--- src/sys/dev/pci/viornd.c:1.4 Thu Nov 6 01:29:25 2014
+++ src/sys/dev/pci/viornd.c Thu Nov 6 01:42:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: viornd.c,v 1.4 2014/11/06 01:29:25 pooka Exp $ */
+/* $NetBSD: viornd.c,v 1.5 2014/11/06 01:42:01 pooka Exp $ */
/* $OpenBSD: viornd.c,v 1.1 2014/01/21 21:14:58 sf Exp $ */
/*
@@ -91,8 +91,10 @@ viornd_get(size_t bytes, void *priv)
struct virtqueue *vq = &sc->sc_vq;
int slot;
+#if VIORND_DEBUG
aprint_normal("%s: asked for %d bytes of entropy\n", __func__,
VIORND_BUFSIZE);
+#endif
mutex_enter(&sc->sc_mutex);
if (sc->sc_active) {
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Thu Nov 6 01:36:57 UTC 2014
Modified Files:
src/usr.bin/make: meta.c
Log Message:
Ensure -- filemon is at start of line
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/make/meta.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.35 src/usr.bin/make/meta.c:1.36
--- src/usr.bin/make/meta.c:1.35 Mon Oct 20 23:22:57 2014
+++ src/usr.bin/make/meta.c Thu Nov 6 01:36:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.35 2014/10/20 23:22:57 sjg Exp $ */
+/* $NetBSD: meta.c,v 1.36 2014/11/06 01:36:57 sjg Exp $ */
/*
* Implement 'meta' mode.
@@ -167,7 +167,7 @@ filemon_read(FILE *mfp, int fd)
/* rewind */
(void)lseek(fd, (off_t)0, SEEK_SET);
-fprintf(mfp, "-- filemon acquired metadata --\n");
+fprintf(mfp, "\n-- filemon acquired metadata --\n");
while ((n = read(fd, buf, sizeof(buf))) > 0) {
fwrite(buf, 1, n, mfp);
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: pooka
Date: Thu Nov 6 01:29:25 UTC 2014
Modified Files:
src/sys/dev/pci: viornd.c
Log Message:
Abort only actually initialized slots.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/viornd.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/viornd.c
diff -u src/sys/dev/pci/viornd.c:1.3 src/sys/dev/pci/viornd.c:1.4
--- src/sys/dev/pci/viornd.c:1.3 Thu Nov 6 00:42:18 2014
+++ src/sys/dev/pci/viornd.c Thu Nov 6 01:29:25 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: viornd.c,v 1.3 2014/11/06 00:42:18 pooka Exp $ */
+/* $NetBSD: viornd.c,v 1.4 2014/11/06 01:29:25 pooka Exp $ */
/* $OpenBSD: viornd.c,v 1.1 2014/01/21 21:14:58 sf Exp $ */
/*
@@ -102,10 +102,10 @@ viornd_get(size_t bytes, void *priv)
bus_dmamap_sync(vsc->sc_dmat, sc->sc_dmamap, 0, VIORND_BUFSIZE,
BUS_DMASYNC_PREREAD);
if (virtio_enqueue_prep(vsc, vq, &slot)) {
- virtio_enqueue_abort(vsc, vq, slot);
goto out;
}
if (virtio_enqueue_reserve(vsc, vq, slot, 1)) {
+ virtio_enqueue_abort(vsc, vq, slot);
goto out;
}
virtio_enqueue(vsc, vq, slot, sc->sc_dmamap, 0);
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: christos
Date: Thu Nov 6 01:26:02 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_acpi.c intel_opregion.c
Log Message:
Fix compilation (debug)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/i915/intel_acpi.c
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.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/intel_acpi.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_acpi.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_acpi.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_acpi.c:1.3 Wed Nov 5 18:46:09 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_acpi.c Wed Nov 5 20:26:02 2014
@@ -12,6 +12,10 @@
#ifdef CONFIG_ACPI
#ifdef __NetBSD__
+#include
+#define _COMPONENT ACPI_BUTTON_COMPONENT
+ACPI_MODULE_NAME("acpi_intel_brightness")
+
static ACPI_OBJECT *
acpi_evaluate_dsm(ACPI_HANDLE handle, const uint8_t *uuid, int rev, int func,
ACPI_OBJECT *argv4)
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.6 src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.6 Wed Nov 5 18:46:09 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c Wed Nov 5 20:26:02 2014
@@ -257,12 +257,12 @@ struct opregion_asle {
static int swsci(struct drm_device *dev, u32 function, u32 parm, u32 *parm_out)
{
struct drm_i915_private *dev_priv = dev->dev_private;
- struct opregion_swsci __iomem *swsci = dev_priv->opregion.swsci;
+ struct opregion_swsci __iomem *region_swsci = dev_priv->opregion.swsci;
u32 main_function, sub_function, scic;
u16 pci_swsci;
u32 dslp;
- if (!swsci)
+ if (!region_swsci)
return -ENODEV;
main_function = (function & SWSCI_SCIC_MAIN_FUNCTION_MASK) >>
@@ -282,7 +282,7 @@ static int swsci(struct drm_device *dev,
}
/* Driver sleep timeout in ms. */
- dslp = ioread32(&swsci->dslp);
+ dslp = ioread32(®ion_swsci->dslp);
if (!dslp) {
/* The spec says 2ms should be the default, but it's too small
* for some machines. */
@@ -295,7 +295,7 @@ static int swsci(struct drm_device *dev,
}
/* The spec tells us to do this, but we are the only user... */
- scic = ioread32(&swsci->scic);
+ scic = ioread32(®ion_swsci->scic);
if (scic & SWSCI_SCIC_INDICATOR) {
DRM_DEBUG_DRIVER("SWSCI request already in progress\n");
return -EBUSY;
@@ -303,8 +303,8 @@ static int swsci(struct drm_device *dev,
scic = function | SWSCI_SCIC_INDICATOR;
- iowrite32(parm, &swsci->parm);
- iowrite32(scic, &swsci->scic);
+ iowrite32(parm, ®ion_swsci->parm);
+ iowrite32(scic, ®ion_swsci->scic);
/* Ensure SCI event is selected and event trigger is cleared. */
pci_read_config_word(dev->pdev, PCI_SWSCI, &pci_swsci);
@@ -319,7 +319,7 @@ static int swsci(struct drm_device *dev,
pci_write_config_word(dev->pdev, PCI_SWSCI, pci_swsci);
/* Poll for the result. */
-#define C (((scic = ioread32(&swsci->scic)) & SWSCI_SCIC_INDICATOR) == 0)
+#define C (((scic = ioread32(®ion_swsci->scic)) & SWSCI_SCIC_INDICATOR) == 0)
if (wait_for(C, dslp)) {
DRM_DEBUG_DRIVER("SWSCI request timed out\n");
return -ETIMEDOUT;
@@ -335,7 +335,7 @@ static int swsci(struct drm_device *dev,
}
if (parm_out)
- *parm_out = ioread32(&swsci->parm);
+ *parm_out = ioread32(®ion_swsci->parm);
return 0;
CVS commit: src/sys/rump/dev
Module Name:src
Committed By: pooka
Date: Thu Nov 6 00:45:59 UTC 2014
Modified Files:
src/sys/rump/dev: Makefile.rumpdevcomp
Added Files:
src/sys/rump/dev/lib/libvirtio_viornd: Makefile VIRTIO_VIORND.ioconf
shlib_version viornd_at_virtio.c
Log Message:
Add rump kernel component for viornd
tested: qemu -device virtio-rng-pci
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/dev/Makefile.rumpdevcomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libvirtio_viornd/Makefile \
src/sys/rump/dev/lib/libvirtio_viornd/VIRTIO_VIORND.ioconf \
src/sys/rump/dev/lib/libvirtio_viornd/shlib_version \
src/sys/rump/dev/lib/libvirtio_viornd/viornd_at_virtio.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/Makefile.rumpdevcomp
diff -u src/sys/rump/dev/Makefile.rumpdevcomp:1.14 src/sys/rump/dev/Makefile.rumpdevcomp:1.15
--- src/sys/rump/dev/Makefile.rumpdevcomp:1.14 Fri Aug 22 09:58:55 2014
+++ src/sys/rump/dev/Makefile.rumpdevcomp Thu Nov 6 00:45:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpdevcomp,v 1.14 2014/08/22 09:58:55 pooka Exp $
+# $NetBSD: Makefile.rumpdevcomp,v 1.15 2014/11/06 00:45:58 pooka Exp $
#
RUMPDEVCOMP= audio bpf cgd disk dm drvctl fss md netsmb pad pud \
@@ -8,7 +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
+RUMPPCIDEVS+= pci_virtio virtio_if_vioif virtio_ld virtio_viornd
# Not really a PCI device, but
RUMPPCIDEVS+= miiphy
Added files:
Index: src/sys/rump/dev/lib/libvirtio_viornd/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_viornd/Makefile:1.1
--- /dev/null Thu Nov 6 00:45:59 2014
+++ src/sys/rump/dev/lib/libvirtio_viornd/Makefile Thu Nov 6 00:45:58 2014
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2014/11/06 00:45:58 pooka Exp $
+#
+
+RUMPTOP=${TOPRUMP}
+
+.PATH: ${RUMPTOP}/../dev/pci
+
+LIB= rumpdev_virtio_viornd
+IOCONF= VIRTIO_VIORND.ioconf
+
+SRCS= viornd_at_virtio.c
+
+SRCS+= viornd.c
+
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
+
+.include "${RUMPTOP}/Makefile.rump"
+.include
+.include
Index: src/sys/rump/dev/lib/libvirtio_viornd/VIRTIO_VIORND.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_viornd/VIRTIO_VIORND.ioconf:1.1
--- /dev/null Thu Nov 6 00:45:59 2014
+++ src/sys/rump/dev/lib/libvirtio_viornd/VIRTIO_VIORND.ioconf Thu Nov 6 00:45:58 2014
@@ -0,0 +1,12 @@
+# $NetBSD: VIRTIO_VIORND.ioconf,v 1.1 2014/11/06 00:45:58 pooka Exp $
+#
+
+ioconf virtio_viornd
+
+include "conf/files"
+include "dev/pci/files.pci"
+include "rump/dev/files.rump"
+
+pseudo-root virtio*
+
+viornd* at virtio? # Virtio entropy device
Index: src/sys/rump/dev/lib/libvirtio_viornd/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_viornd/shlib_version:1.1
--- /dev/null Thu Nov 6 00:45:59 2014
+++ src/sys/rump/dev/lib/libvirtio_viornd/shlib_version Thu Nov 6 00:45:58 2014
@@ -0,0 +1,2 @@
+major=0
+minor=0
Index: src/sys/rump/dev/lib/libvirtio_viornd/viornd_at_virtio.c
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_viornd/viornd_at_virtio.c:1.1
--- /dev/null Thu Nov 6 00:45:59 2014
+++ src/sys/rump/dev/lib/libvirtio_viornd/viornd_at_virtio.c Thu Nov 6 00:45:58 2014
@@ -0,0 +1,49 @@
+/* $NetBSD: viornd_at_virtio.c,v 1.1 2014/11/06 00:45:58 pooka Exp $ */
+
+/*
+ * Copyright (c) 2014 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
+__KERNEL_RCSID(0, "$NetBSD: viornd_at_virtio.c,v 1.1 2014/11/06 00:45:58 pooka Exp $");
+
+#include
+#include
+#include
+#inclu
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: pooka
Date: Thu Nov 6 00:42:18 UTC 2014
Modified Files:
src/sys/dev/pci: viornd.c
Log Message:
disable debug print by default
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/viornd.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/viornd.c
diff -u src/sys/dev/pci/viornd.c:1.2 src/sys/dev/pci/viornd.c:1.3
--- src/sys/dev/pci/viornd.c:1.2 Thu Nov 6 00:41:33 2014
+++ src/sys/dev/pci/viornd.c Thu Nov 6 00:42:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: viornd.c,v 1.2 2014/11/06 00:41:33 pooka Exp $ */
+/* $NetBSD: viornd.c,v 1.3 2014/11/06 00:42:18 pooka Exp $ */
/* $OpenBSD: viornd.c,v 1.1 2014/01/21 21:14:58 sf Exp $ */
/*
@@ -61,7 +61,7 @@
#define VIORND_BUFSIZE 32
-#define VIORND_DEBUG 1
+#define VIORND_DEBUG 0
struct viornd_softc {
device_t sc_dev;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: pooka
Date: Thu Nov 6 00:41:33 UTC 2014
Modified Files:
src/sys/dev/pci: viornd.c
Log Message:
Print attachment \n's so that we don't get junky lines
(this driver now matches ld)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/viornd.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/viornd.c
diff -u src/sys/dev/pci/viornd.c:1.1 src/sys/dev/pci/viornd.c:1.2
--- src/sys/dev/pci/viornd.c:1.1 Sun Oct 26 18:43:18 2014
+++ src/sys/dev/pci/viornd.c Thu Nov 6 00:41:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: viornd.c,v 1.1 2014/10/26 18:43:18 tls Exp $ */
+/* $NetBSD: viornd.c,v 1.2 2014/11/06 00:41:33 pooka Exp $ */
/* $OpenBSD: viornd.c,v 1.1 2014/01/21 21:14:58 sf Exp $ */
/*
@@ -144,6 +144,9 @@ viornd_attach( device_t parent, device_t
sc->sc_virtio = vsc;
sc->sc_dev = self;
+ aprint_normal("\n");
+ aprint_naive("\n");
+
(void)virtio_negotiate_features(vsc, 0);
mutex_init(&sc->sc_mutex, MUTEX_DEFAULT, IPL_VM);
CVS commit: src/sys/external/bsd/drm2
Module Name:src
Committed By: nonaka
Date: Wed Nov 5 23:46:09 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_dma.c i915_drv.h
intel_acpi.c intel_opregion.c
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
src/sys/external/bsd/drm2/include/linux: acpi.h pci.h
Log Message:
i915drmkms(4): Enable CONFIG_ACPI if NACPICA > 0.
Now brightness can be adjusted via hotkey on Mouse Computer LB-J300X (Clevo
W330SU2).
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_acpi.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/linux/acpi.h
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/include/linux/pci.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/drm2/dist/drm/i915/i915_dma.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.11 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.11 Sun Sep 7 23:03:11 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Wed Nov 5 23:46:09 2014
@@ -1375,7 +1375,11 @@ static int i915_load_modeset_init(struct
goto out;
#endif
+#ifdef __NetBSD__
+ intel_register_dsm_handler(dev);
+#else
intel_register_dsm_handler();
+#endif
#ifndef __NetBSD__ /* XXX vga */
ret = vga_switcheroo_register_client(dev->pdev, &i915_switcheroo_ops, false);
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.9 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.10
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.9 Sun Sep 7 23:03:11 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Wed Nov 5 23:46:09 2014
@@ -30,6 +30,13 @@
#ifndef _I915_DRV_H_
#define _I915_DRV_H_
+#if defined(__NetBSD__) && (defined(i386) || defined(amd64))
+#include "acpica.h"
+#if (NACPICA > 0)
+#define CONFIG_ACPI
+#endif
+#endif
+
#include
#include "i915_reg.h"
@@ -2720,8 +2727,8 @@ extern void intel_i2c_reset(struct drm_d
/* intel_opregion.c */
struct intel_encoder;
-extern int intel_opregion_setup(struct drm_device *dev);
#ifdef CONFIG_ACPI
+extern int intel_opregion_setup(struct drm_device *dev);
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,6 +2737,7 @@ 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; }
@@ -2747,10 +2755,22 @@ intel_opregion_notify_adapter(struct drm
/* intel_acpi.c */
#ifdef CONFIG_ACPI
+#ifdef __NetBSD__
+extern void intel_register_dsm_handler(struct drm_device *);
+#else
extern void intel_register_dsm_handler(void);
+#endif
extern void intel_unregister_dsm_handler(void);
#else
+#ifdef __NetBSD__
+static inline void
+intel_register_dsm_handler(struct drm_device *dev)
+{
+ return;
+}
+#else
static inline void intel_register_dsm_handler(void) { return; }
+#endif
static inline void intel_unregister_dsm_handler(void) { return; }
#endif /* CONFIG_ACPI */
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_acpi.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_acpi.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_acpi.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_acpi.c:1.2 Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_acpi.c Wed Nov 5 23:46:09 2014
@@ -9,11 +9,104 @@
#include
#include "i915_drv.h"
+#ifdef CONFIG_ACPI
+
+#ifdef __NetBSD__
+static ACPI_OBJECT *
+acpi_evaluate_dsm(ACPI_HANDLE handle, const uint8_t *uuid, int rev, int func,
+ACPI_OBJECT *argv4)
+{
+ ACPI_OBJECT_LIST arg;
+ ACPI_OBJECT params[4];
+ ACPI_BUFFER buf;
+ ACPI_STATUS rv;
+
+ if (handle == NULL)
+ handle = ACPI_ROOT_OBJECT;
+
+ arg.Count = 4;
+ arg.Pointer = params;
+ params[0].Type = ACPI_TYPE_BUFFER;
+ params[0].Buffer.Length = 16;
+ params[0].Buffer.Pointer = (char *)__UNCONST(uuid);
+ params[1].Type = ACPI_TYPE_INTEGER;
+ params[1].Integer.Value = rev;
+ params[2].Type = ACPI_TYPE_INTEGER;
+ params[2].Integer.Value = func;
+ if (argv4 != NULL) {
+ params[3] = *argv4;
+ } else
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Wed Nov 5 22:27:55 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: BPI Log Message: Add awincnt at awinio (64 bit timer counter) To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/BPI 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/conf/BPI diff -u src/sys/arch/evbarm/conf/BPI:1.8 src/sys/arch/evbarm/conf/BPI:1.9 --- src/sys/arch/evbarm/conf/BPI:1.8 Wed Nov 5 08:11:35 2014 +++ src/sys/arch/evbarm/conf/BPI Wed Nov 5 22:27:55 2014 @@ -1,5 +1,5 @@ # -# $NetBSD: BPI,v 1.8 2014/11/05 08:11:35 skrll Exp $ +# $NetBSD: BPI,v 1.9 2014/11/05 22:27:55 skrll Exp $ # # BPI -- Banana Pi - an Allwinner A20 Eval Board Kernel # @@ -245,6 +245,9 @@ awinwdt* at awinio? # RTC awinrtc* at awinio? +# 64-bit counter +awincnt0 at awinio0 + # onboard audio codec awinac0 at awinio0 audio0 at awinac0
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Wed Nov 5 20:34:39 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: CUBIETRUCK Log Message: Remove MULTIPROCESSOR, it is now in CUBIEBOARD To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/CUBIETRUCK 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/conf/CUBIETRUCK diff -u src/sys/arch/evbarm/conf/CUBIETRUCK:1.5 src/sys/arch/evbarm/conf/CUBIETRUCK:1.6 --- src/sys/arch/evbarm/conf/CUBIETRUCK:1.5 Wed Nov 5 08:16:56 2014 +++ src/sys/arch/evbarm/conf/CUBIETRUCK Wed Nov 5 20:34:38 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CUBIETRUCK,v 1.5 2014/11/05 08:16:56 martin Exp $ +# $NetBSD: CUBIETRUCK,v 1.6 2014/11/05 20:34:38 martin Exp $ # # CUBIETRUCK - Cubieboard3 (mostly cubieboard2 with 2GB) # @@ -28,6 +28,4 @@ makeoptions CPUFLAGS="-mcpu=cortex-a7 -m # options PMAP_NEED_ALLOC_POOLPAGE -options MULTIPROCESSOR -cpu* at mainbus? #options VERBOSE_INIT_ARM # verbose bootstraping messages
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Wed Nov 5 20:32:53 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: CUBIEBOARD Log Message: Add awincnt at awinio (64 bit timer counter) To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/conf/CUBIEBOARD 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/conf/CUBIEBOARD diff -u src/sys/arch/evbarm/conf/CUBIEBOARD:1.30 src/sys/arch/evbarm/conf/CUBIEBOARD:1.31 --- src/sys/arch/evbarm/conf/CUBIEBOARD:1.30 Wed Nov 5 18:32:29 2014 +++ src/sys/arch/evbarm/conf/CUBIEBOARD Wed Nov 5 20:32:53 2014 @@ -1,5 +1,5 @@ # -# $NetBSD: CUBIEBOARD,v 1.30 2014/11/05 18:32:29 jmcneill Exp $ +# $NetBSD: CUBIEBOARD,v 1.31 2014/11/05 20:32:53 martin Exp $ # # CUBIEBOARD -- Allwinner A10/A20 Eval Board Kernel # @@ -245,6 +245,9 @@ awinwdt* at awinio? # RTC awinrtc* at awinio? +# 64-bit counter +awincnt0 at awinio0 + # onboard audio codec awinac0 at awinio0 audio0 at awinac0
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src/sna
Module Name:xsrc
Committed By: snj
Date: Wed Nov 5 19:54:00 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_display.c
Log Message:
convert to drmMap. say hello to a visible cursor!
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.1.1.2 Wed Nov 5 17:56:24 2014
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c Wed Nov 5 19:54:00 2014
@@ -438,14 +438,22 @@ static void *gem_mmap(int fd, int handle
{
struct drm_i915_gem_mmap_gtt mmap_arg;
void *ptr;
+#ifdef __NetBSD__
+ int err;
+#endif
VG_CLEAR(mmap_arg);
mmap_arg.handle = handle;
if (drmIoctl(fd, DRM_IOCTL_I915_GEM_MMAP_GTT, &mmap_arg))
return NULL;
+#ifdef __NetBSD__
+ err = -drmMap(fd, mmap_arg.offset, size, &ptr);
+ if (err)
+#else
ptr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, mmap_arg.offset);
if (ptr == MAP_FAILED)
+#endif
return NULL;
return ptr;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Wed Nov 5 19:39:17 UTC 2014
Modified Files:
src/sys/dev/pci: radeonfb.c radeonfbvar.h
Log Message:
- unmap registers in WSDISPLAYIO_MODE_MAPPED only if a drm attached
- don't try to touch backlight registers when they're not mapped
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/pci/radeonfb.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pci/radeonfbvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.87 src/sys/dev/pci/radeonfb.c:1.88
--- src/sys/dev/pci/radeonfb.c:1.87 Tue Oct 21 09:07:07 2014
+++ src/sys/dev/pci/radeonfb.c Wed Nov 5 19:39:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.87 2014/10/21 09:07:07 macallan Exp $ */
+/* $NetBSD: radeonfb.c,v 1.88 2014/11/05 19:39:17 macallan Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.87 2014/10/21 09:07:07 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.88 2014/11/05 19:39:17 macallan Exp $");
#include
#include
@@ -1001,7 +1001,14 @@ radeonfb_attach(device_t parent, device_
pmf_event_register(dev, PMFE_DISPLAY_BRIGHTNESS_DOWN,
radeonfb_brightness_down, TRUE);
- config_found_ia(dev, "drm", aux, radeonfb_drm_print);
+ /*
+ * if we attach a DRM we need to unmap registers in
+ * WSDISPLAYIO_MODE_MAPPED, since this keeps us from doing things like
+ * screen blanking we only do it if needed
+ */
+ sc->sc_needs_unmap =
+ (config_found_ia(dev, "drm", aux, radeonfb_drm_print) != 0);
+ DPRINTF(("needs_unmap: %d\n", sc->sc_needs_unmap));
PRINTREG(RADEON_CRTC_EXT_CNTL);
PRINTREG(RADEON_CRTC_GEN_CNTL);
@@ -1048,6 +1055,9 @@ radeonfb_map(struct radeonfb_softc *sc)
static void
radeonfb_unmap(struct radeonfb_softc *sc)
{
+ if (!sc->sc_needs_unmap)
+ return;
+
if (sc->sc_mapped) {
bus_space_unmap(sc->sc_regt, sc->sc_regh, sc->sc_regsz);
bus_space_unmap(sc->sc_memt, sc->sc_memh, sc->sc_memsz);
@@ -1119,6 +1129,8 @@ radeonfb_ioctl(void *v, void *vs,
case WSDISPLAYIO_SVIDEO:
radeonfb_blank(dp,
(*(unsigned int *)d == WSDISPLAYIO_VIDEO_OFF));
+ radeonfb_switch_backlight(dp,
+ (*(unsigned int *)d == WSDISPLAYIO_VIDEO_ON));
return 0;
case WSDISPLAYIO_GETCMAP:
@@ -4093,10 +4105,13 @@ radeonfb_switch_backlight(struct radeonf
static int
radeonfb_set_backlight(struct radeonfb_display *dp, int level)
{
- struct radeonfb_softc *sc;
+ struct radeonfb_softc *sc = dp->rd_softc;;
int rlevel, s;
uint32_t lvds;
+ if(!sc->sc_mapped)
+ return 0;
+
s = spltty();
dp->rd_bl_level = level;
@@ -4108,11 +4123,9 @@ radeonfb_set_backlight(struct radeonfb_d
else if (level >= RADEONFB_BACKLIGHT_MAX)
level = RADEONFB_BACKLIGHT_MAX;
- sc = dp->rd_softc;
-
/* On some chips, we should negate the backlight level. */
if (dp->rd_softc->sc_flags & RFB_INV_BLIGHT) {
- rlevel = RADEONFB_BACKLIGHT_MAX - level;
+ rlevel = RADEONFB_BACKLIGHT_MAX - level;
} else
rlevel = level;
Index: src/sys/dev/pci/radeonfbvar.h
diff -u src/sys/dev/pci/radeonfbvar.h:1.19 src/sys/dev/pci/radeonfbvar.h:1.20
--- src/sys/dev/pci/radeonfbvar.h:1.19 Wed Jan 22 07:57:33 2014
+++ src/sys/dev/pci/radeonfbvar.h Wed Nov 5 19:39:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfbvar.h,v 1.19 2014/01/22 07:57:33 macallan Exp $ */
+/* $NetBSD: radeonfbvar.h,v 1.20 2014/11/05 19:39:17 macallan Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -231,6 +231,7 @@ struct radeonfb_softc {
bus_size_t sc_iosz;
bus_addr_t sc_ioaddr;
+ int sc_needs_unmap;
int sc_mapped;
/* size of a single display */
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Wed Nov 5 18:32:29 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: CUBIEBOARD Log Message: add MULTIPROCESSOR, awincnt To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/CUBIEBOARD 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/conf/CUBIEBOARD diff -u src/sys/arch/evbarm/conf/CUBIEBOARD:1.29 src/sys/arch/evbarm/conf/CUBIEBOARD:1.30 --- src/sys/arch/evbarm/conf/CUBIEBOARD:1.29 Fri Oct 24 10:48:05 2014 +++ src/sys/arch/evbarm/conf/CUBIEBOARD Wed Nov 5 18:32:29 2014 @@ -1,5 +1,5 @@ # -# $NetBSD: CUBIEBOARD,v 1.29 2014/10/24 10:48:05 jmcneill Exp $ +# $NetBSD: CUBIEBOARD,v 1.30 2014/11/05 18:32:29 jmcneill Exp $ # # CUBIEBOARD -- Allwinner A10/A20 Eval Board Kernel # @@ -172,7 +172,8 @@ config netbsd root on ? type ? # The main bus device mainbus0 at root -# The boot cpu +# CPU(s) +options MULTIPROCESSOR cpu* at mainbus? # Specify the memory size in megabytes (optional). @@ -214,6 +215,9 @@ awinicu0 at awinio0 # DMA Controller awindma0 at awinio0 +# 64-bit counter +awincnt0 at awinio0 + # GPIO Controller awingpio0 at awinio0
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Wed Nov 5 18:24:48 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: tickets 177-178 & 181-183 To generate a diff of this commit: cvs rdiff -u -r1.1.2.75 -r1.1.2.76 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.75 src/doc/CHANGES-7.0:1.1.2.76 --- src/doc/CHANGES-7.0:1.1.2.75 Tue Nov 4 07:16:05 2014 +++ src/doc/CHANGES-7.0 Wed Nov 5 18:24:47 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.75 2014/11/04 07:16:05 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.76 2014/11/05 18:24:47 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -1980,3 +1980,44 @@ share/man/man4/viornd.41.2 Use proper markup in AUTHORS, and sort SEE ALSO. [tls, ticket #176] +sys/external/bsd/drm2/dist/drm/i915/intel_panel.c 1.6 + + i915: set backlight duty cycle after backlight enable for gen4, + to fix an issue with a blank screen upon booting. + [jmcneill, ticket #177] + +sys/external/bsd/drm2/dist/drm/i915/i915_gem.c 1.18 + + When moving an object to inactive, make sure that we first flush + it from the GTT domain in case it belonged there. Fixes random + panic when running X (PR 49195). + [sborrill, ticket #178] + +lib/libperfuse/fuse.h1.6 +lib/libperfuse/ops.c1.78 +lib/libperfuse/perfuse.c 1.35 +lib/libperfuse/perfuse_priv.h 1.36 +lib/libpuffs/dispatcher.c 1.48 +lib/libpuffs/opdump.c1.37 +lib/libpuffs/puffs.c1.118 +lib/libpuffs/puffs.h1.126 +lib/libpuffs/puffs_ops.3 1.40-1.41 +sys/fs/puffs/puffs_msgif.h 1.82-1.83 +sys/fs/puffs/puffs_vnops.c 1.196 + + Add PUFFS support for fallocate and fdiscard operations, and + add FUSE fallocate support. + [manu, ticket #181] + +sys/fs/puffs/puffs_vnops.c 1.195 + + A long time ago, VOP_STRATEGY could not fail without taking + down the kernel. This is not the case anymore, so we can stop + dropping errors in puffs_vnop_strategy() + [manu, ticket #182] + +lib/libperfuse/ops.c1.79 + + Avoid deadlocks on write errors. + [manu, ticket #183] +
CVS commit: [netbsd-7] src/lib/libperfuse
Module Name:src
Committed By: snj
Date: Wed Nov 5 18:18:27 UTC 2014
Modified Files:
src/lib/libperfuse [netbsd-7]: ops.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #183):
lib/libperfuse/ops.c: revision 1.79
Avoid deadlocks on write errors
On write errors, we failed to dequeue some operations, leading to
rare but unpleasant deadlocks
To generate a diff of this commit:
cvs rdiff -u -r1.66.2.10 -r1.66.2.11 src/lib/libperfuse/ops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.66.2.10 src/lib/libperfuse/ops.c:1.66.2.11
--- src/lib/libperfuse/ops.c:1.66.2.10 Wed Nov 5 18:11:30 2014
+++ src/lib/libperfuse/ops.c Wed Nov 5 18:18:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.66.2.10 2014/11/05 18:11:30 snj Exp $ */
+/* $NetBSD: ops.c,v 1.66.2.11 2014/11/05 18:18:27 snj Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -3299,6 +3299,7 @@ perfuse_node_write2(struct puffs_usermou
if (*resid != 0)
error = EFBIG;
+out:
#ifdef PERFUSE_DEBUG
if (perfuse_diagflags & PDF_RESIZE) {
if (offset > (off_t)vap->va_size)
@@ -3315,16 +3316,6 @@ perfuse_node_write2(struct puffs_usermou
if (offset > (off_t)vap->va_size)
vap->va_size = offset;
- if (inresize) {
-#ifdef PERFUSE_DEBUG
- if (!(pnd->pnd_flags & PND_INRESIZE))
- DERRX(EX_SOFTWARE, "file write grow without resize");
-#endif
- pnd->pnd_flags &= ~PND_INRESIZE;
- (void)dequeue_requests(opc, PCQ_RESIZE, DEQUEUE_ALL);
- }
-
-
/*
* Statistics
*/
@@ -3344,7 +3335,15 @@ perfuse_node_write2(struct puffs_usermou
__func__, (void*)opc, perfuse_node_path(ps, opc));
#endif
-out:
+ if (inresize) {
+#ifdef PERFUSE_DEBUG
+ if (!(pnd->pnd_flags & PND_INRESIZE))
+ DERRX(EX_SOFTWARE, "file write grow without resize");
+#endif
+ pnd->pnd_flags &= ~PND_INRESIZE;
+ (void)dequeue_requests(opc, PCQ_RESIZE, DEQUEUE_ALL);
+ }
+
/*
* VOP_PUTPAGE causes FAF write where kernel does not
* check operation result. At least warn if it failed.
CVS commit: [netbsd-7] src/sys/fs/puffs
Module Name:src Committed By: snj Date: Wed Nov 5 18:16:17 UTC 2014 Modified Files: src/sys/fs/puffs [netbsd-7]: puffs_vnops.c Log Message: Pull up following revision(s) (requested by manu in ticket #182): sys/fs/puffs/puffs_vnops.c: revision 1.195 According to pooka@'s comment, a long time ago, VOP_STRATEGY could not fail without taking down the kernel. It seems this is not the case anymore, hence we can stop dropping errors in puffs_vnop_strategy() Approved by pooka@ To generate a diff of this commit: cvs rdiff -u -r1.182.2.8 -r1.182.2.9 src/sys/fs/puffs/puffs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/puffs/puffs_vnops.c diff -u src/sys/fs/puffs/puffs_vnops.c:1.182.2.8 src/sys/fs/puffs/puffs_vnops.c:1.182.2.9 --- src/sys/fs/puffs/puffs_vnops.c:1.182.2.8 Wed Nov 5 18:11:31 2014 +++ src/sys/fs/puffs/puffs_vnops.c Wed Nov 5 18:16:17 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: puffs_vnops.c,v 1.182.2.8 2014/11/05 18:11:31 snj Exp $ */ +/* $NetBSD: puffs_vnops.c,v 1.182.2.9 2014/11/05 18:16:17 snj Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.182.2.8 2014/11/05 18:11:31 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.182.2.9 2014/11/05 18:16:17 snj Exp $"); #include #include @@ -2841,13 +2841,6 @@ puffs_vnop_strategy(void *v) if (dobiodone == 0) goto out; - /* - * : wrong, but kernel can't survive strategy - * failure currently. Here, have one more X: X. - */ - if (error != ENOMEM) - error = 0; - error = checkerr(pmp, error, __func__); if (error) goto out;
CVS commit: [netbsd-7] src
Module Name:src
Committed By: snj
Date: Wed Nov 5 18:11:31 UTC 2014
Modified Files:
src/lib/libperfuse [netbsd-7]: fuse.h ops.c perfuse.c perfuse_priv.h
src/lib/libpuffs [netbsd-7]: dispatcher.c opdump.c puffs.c puffs.h
puffs_ops.3
src/sys/fs/puffs [netbsd-7]: puffs_msgif.h puffs_vnops.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #181):
lib/libperfuse/fuse.h: revision 1.6
lib/libperfuse/ops.c: revision 1.78
lib/libperfuse/perfuse.c: revision 1.35
lib/libperfuse/perfuse_priv.h: revision 1.36
lib/libpuffs/dispatcher.c: revision 1.48
lib/libpuffs/opdump.c: revision 1.37
lib/libpuffs/puffs.c: revision 1.118
lib/libpuffs/puffs.h: revision 1.126
lib/libpuffs/puffs_ops.3: revisions 1.40-1.41
sys/fs/puffs/puffs_msgif.h: revision 1.82-1.83
sys/fs/puffs/puffs_msgif.h: revision 1.82
sys/fs/puffs/puffs_vnops.c: revision 1.196
Add PUFFS support for fallocate and fdiscard operations
--
libpuffs support for fallocate and fdiscard operations
--
Add PUFFS_HAVE_FALLOCATE in puffs_msgif.h so that filesystem can decide
at build time wether fallocate is usable
--
FUSE fallocate support
There seems to be no fdiscard FUSE operation at the moment, hence that
one is left unused.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.18.1 src/lib/libperfuse/fuse.h
cvs rdiff -u -r1.66.2.9 -r1.66.2.10 src/lib/libperfuse/ops.c
cvs rdiff -u -r1.31.10.2 -r1.31.10.3 src/lib/libperfuse/perfuse.c
cvs rdiff -u -r1.32.2.2 -r1.32.2.3 src/lib/libperfuse/perfuse_priv.h
cvs rdiff -u -r1.46.4.1 -r1.46.4.2 src/lib/libpuffs/dispatcher.c
cvs rdiff -u -r1.36 -r1.36.10.1 src/lib/libpuffs/opdump.c
cvs rdiff -u -r1.117 -r1.117.18.1 src/lib/libpuffs/puffs.c
cvs rdiff -u -r1.124.10.1 -r1.124.10.2 src/lib/libpuffs/puffs.h
cvs rdiff -u -r1.36.10.1 -r1.36.10.2 src/lib/libpuffs/puffs_ops.3
cvs rdiff -u -r1.80.14.1 -r1.80.14.2 src/sys/fs/puffs/puffs_msgif.h
cvs rdiff -u -r1.182.2.7 -r1.182.2.8 src/sys/fs/puffs/puffs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/fuse.h
diff -u src/lib/libperfuse/fuse.h:1.5 src/lib/libperfuse/fuse.h:1.5.18.1
--- src/lib/libperfuse/fuse.h:1.5 Wed Dec 28 17:33:53 2011
+++ src/lib/libperfuse/fuse.h Wed Nov 5 18:11:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fuse.h,v 1.5 2011/12/28 17:33:53 manu Exp $ */
+/* $NetBSD: fuse.h,v 1.5.18.1 2014/11/05 18:11:30 snj Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -169,6 +169,9 @@ enum fuse_opcode {
FUSE_DESTROY = 38,
FUSE_IOCTL = 39,
FUSE_POLL = 40,
+ FUSE_NOTIFY_REPLY = 41,
+ FUSE_BATCH_FORGET = 42,
+ FUSE_FALLOCATE = 43,
FUSE_OPCODE_MAX,
FUSE_CUSE_INIT = 4096
@@ -441,6 +444,14 @@ struct fuse_notify_poll_wakeup_out {
uint64_t kh;
};
+struct fuse_fallocate_in {
+ uint64_t fh;
+ uint64_t offset;
+ uint64_t length;
+ uint32_t mode;
+ uint32_t padding;
+};
+
#if 0 /* Duplicated in perfuse.h to avoid making fuse.h public */
/* Send from kernel to proces */
struct fuse_in_header {
Index: src/lib/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.66.2.9 src/lib/libperfuse/ops.c:1.66.2.10
--- src/lib/libperfuse/ops.c:1.66.2.9 Thu Oct 30 12:38:15 2014
+++ src/lib/libperfuse/ops.c Wed Nov 5 18:11:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.66.2.9 2014/10/30 12:38:15 martin Exp $ */
+/* $NetBSD: ops.c,v 1.66.2.10 2014/11/05 18:11:30 snj Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -3635,8 +3635,47 @@ perfuse_node_deleteextattr(struct puffs_
error = xchg_msg(pu, opc, pm, NO_PAYLOAD_REPLY_LEN, wait_reply);
if (error != 0)
goto out;
+
+ ps->ps_destroy_msg(pm);
+
+out:
+ node_rele(opc);
+ return error;
+}
+
+int
+perfuse_node_fallocate(struct puffs_usermount *pu, puffs_cookie_t opc,
+ off_t off, off_t len)
+{
+ struct perfuse_state *ps;
+ perfuse_msg_t *pm;
+ struct fuse_fallocate_in *fai;
+ int error;
+ ps = puffs_getspecific(pu);
+ if (ps->ps_flags & PS_NO_FALLOCATE)
+ return EOPNOTSUPP;
+
+ node_ref(opc);
+
+ pm = ps->ps_new_msg(pu, opc, FUSE_FALLOCATE, sizeof(*fai), NULL);
+
+ fai = GET_INPAYLOAD(ps, pm, fuse_fallocate_in);
+ fai->fh = perfuse_get_fh(opc, FWRITE);
+ fai->offset = off;
+ fai->length = len;
+ fai->mode = 0;
+
+ error = xchg_msg(pu, opc, pm, NO_PAYLOAD_REPLY_LEN, wait_reply);
+ if (error == EOPNOTSUPP || error == ENOSYS) {
+ ps->ps_flags |= PS_NO_FALLOCATE;
+ error = EOPNOTSUPP;
+ }
+ if (error != 0)
+ goto out;
+
ps->ps_destroy_msg(pm);
+
out:
node_rele(opc);
return error;
Index: src/lib/libperfuse/perfuse.c
diff -u src/lib/libperfuse/perfuse.c:1.31.10.2 src/lib/libperfuse/perfuse.c:1.31.10.3
--- src/lib/libperfuse/perfuse.c:1.31.10.2 Thu Sep 11 12:17:10 2014
+++ src/lib/libperfuse/perfuse.c Wed Nov 5 18:11:30 2014
@@ -1,4 +1,4
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src
Committed By: christos
Date: Wed Nov 5 18:01:16 UTC 2014
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
Log Message:
adjust to newer sources
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/drivers/xf86-video-intel/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/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.16 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.17
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.16 Thu Sep 11 13:26:30 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Wed Nov 5 13:01:16 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/09/11 17:26:30 riastradh Exp $
+# $NetBSD: Makefile,v 1.17 2014/11/05 18:01:16 christos Exp $
.include
@@ -9,59 +9,71 @@ DRIVER_NAME= intel_drv
SRCS+= intel_device.c
SRCS+= intel_options.c
SRCS+= intel_module.c
+SRCS+= backlight.c
+SRCS+= fd.c
# legacy/i810
.PATH: ${X11SRCDIR.${DRIVER}}/src/legacy/i810
SRCS+= i810_accel.c
SRCS+= i810_cursor.c
+SRCS+= i810_dga.c
+SRCS+= i810_dri.c
SRCS+= i810_driver.c
+SRCS+= i810_hwmc.c
SRCS+= i810_memory.c
SRCS+= i810_video.c
SRCS+= i810_wmark.c
-
SRCS+= i810_xaa.c
-SRCS+= i810_dga.c
-SRCS+= i810_dri.c
-SRCS+= i810_hwmc.c
# sna
.PATH: ${X11SRCDIR.${DRIVER}}/src/sna
SRCS+= blt.c
SRCS+= kgem.c
+SRCS+= gen2_render.c
+SRCS+= gen3_render.c
+SRCS+= gen4_common.c
+SRCS+= gen4_render.c
+SRCS+= gen4_source.c
+SRCS+= gen4_vertex.c
+SRCS+= gen5_render.c
+SRCS+= gen6_common.c
+SRCS+= gen6_render.c
+SRCS+= gen7_render.c
+SRCS+= gen8_eu.c
+SRCS+= gen8_render.c
+SRCS+= gen8_vertex.c
+
SRCS+= sna_accel.c
+SRCS+= sna_acpi.c
SRCS+= sna_blt.c
SRCS+= sna_composite.c
SRCS+= sna_cpu.c
SRCS+= sna_damage.c
SRCS+= sna_display.c
SRCS+= sna_display_fake.c
+SRCS+= sna_dri2.c
+#SRCS+= sna_dri3.c
SRCS+= sna_driver.c
SRCS+= sna_glyphs.c
SRCS+= sna_gradient.c
SRCS+= sna_io.c
+#SRCS+= sna_present.c
SRCS+= sna_render.c
SRCS+= sna_stream.c
-SRCS+= sna_trapezoids.c
+SRCS+= sna_threads.c
SRCS+= sna_tiling.c
SRCS+= sna_transform.c
-SRCS+= sna_threads.c
+SRCS+= sna_trapezoids.c
+SRCS+= sna_trapezoids_boxes.c
+SRCS+= sna_trapezoids_imprecise.c
+SRCS+= sna_trapezoids_mono.c
+SRCS+= sna_trapezoids_precise.c
SRCS+= sna_vertex.c
SRCS+= sna_video.c
+SRCS+= sna_video_hwmc.c
SRCS+= sna_video_overlay.c
SRCS+= sna_video_sprite.c
SRCS+= sna_video_textured.c
-SRCS+= gen2_render.c
-SRCS+= gen3_render.c
-SRCS+= gen4_render.c
-SRCS+= gen4_source.c
-SRCS+= gen4_vertex.c
-SRCS+= gen5_render.c
-SRCS+= gen6_render.c
-SRCS+= gen7_render.c
-
-SRCS+= sna_dri.c
-
-SRCS+= sna_video_hwmc.c
# sna/brw
.PATH: ${X11SRCDIR.${DRIVER}}/src/sna/brw
@@ -95,31 +107,30 @@ SRCS+= fbutil.c
# uxa
.PATH: ${X11SRCDIR.${DRIVER}}/src/uxa
-SRCS+= intel_batchbuffer.c
-SRCS+= intel_display.c
-SRCS+= intel_driver.c
-SRCS+= intel_memory.c
-SRCS+= intel_uxa.c
-SRCS+= intel_video.c
SRCS+= i830_3d.c
SRCS+= i830_render.c
SRCS+= i915_3d.c
SRCS+= i915_render.c
SRCS+= i915_video.c
SRCS+= i965_3d.c
-SRCS+= i965_video.c
SRCS+= i965_render.c
-SRCS+= uxa.c
+SRCS+= i965_video.c
+SRCS+= intel_batchbuffer.c
+SRCS+= intel_display.c
+SRCS+= intel_dri.c
+SRCS+= intel_driver.c
+#SRCS+= intel_glamor.c
+SRCS+= intel_hwmc.c
+SRCS+= intel_memory.c
+#SRCS+= intel_present.c
+#SRCS+= intel_sync.c
+SRCS+= intel_uxa.c
+SRCS+= intel_video.c
SRCS+= uxa-accel.c
SRCS+= uxa-glyphs.c
SRCS+= uxa-render.c
SRCS+= uxa-unaccel.c
-
-#SRCS+= intel_glamor.c
-
-SRCS+= intel_dri.c
-
-SRCS+= intel_hwmc.c
+SRCS+= uxa.c
MAN= intel.4
@@ -131,18 +142,44 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/xvmc
# Use the Intel-style __sync_* atomic primitives.
-CPPFLAGS+= -DHAVE_ATOMIC_PRIMITIVES
-CPPFLAGS+= -DENABLE_XVMC
-CPPFLAGS+= -DUSE_UXA
-CPPFLAGS+= -DUSE_SNA
CPPFLAGS+= -DDEFAULT_ACCEL_METHOD=UXA
+CPPFLAGS+= -DENABLE_XVMC=1
CPPFLAGS+= -DHAS_PIXMAN_GLYPHS=1
CPPFLAGS+= -DHAS_PIXMAN_TRIANGLES=1
-
-CPPFLAGS+= -DHAVE_DRI1
-CPPFLAGS+= -DHAVE_DRI2_H
-CPPFLAGS+= -DHAVE_XAA_H
+CPPFLAGS+= -DHAVE_ATOMIC_PRIMITIVES=1
+CPPFLAGS+= -DHAVE_CPUID_H=1
+CPPFLAGS+= -DHAVE_DGAPROC_H=1
+CPPFLAGS+= -DHAVE_DLFCN_H=1
+CPPFLAGS+= -DHAVE_DRI1=1
+CPPFLAGS+= -DHAVE_DRI2=1
+CPPFLAGS+= -DHAVE_DRI2_H=1
+CPPFLAGS+= -DHAVE_DRISTRUCT_H=1
+CPPFLAGS+= -DHAVE_DRI_H=1
+CPPFLAGS+= -DHAVE_GETLINE
+CPPFLAGS+= -DHAVE_GETLINE=1
+CPPFLAGS+= -DHAVE_INTTYPES_H=1
+CPPFLAGS+= -DHAVE_MEMORY_H=1
+CPPFLAGS+= -DHAVE_SAREA_H=1
+CPPFLAGS+= -DHAVE_STDINT_H=1
+CPPFLAGS+= -DHAVE_STDLIB_H=1
+CPPFLAGS+= -DHAVE_STRINGS_H=1
+CPPFLAGS+= -DHAVE_STRING_H=1
+CPPFLAGS+= -DHAVE_STRLCAT=1
+CPPFLAGS+= -DHAVE_STRLCPY=1
+CPPFLAGS+= -DHAVE_ST
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc Committed By: christos Date: Wed Nov 5 17:58:59 UTC 2014 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src: backlight.c xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810: i810_dri.c xsrc/external/mit/xf86-video-intel/dist/src/sna: kgem.c xsrc/external/mit/xf86-video-intel/dist/src/uxa: intel.h Removed Files: xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_dri.c Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/backlight.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810_dri.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c cvs rdiff -u -r1.3 -r0 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-intel/dist/src/backlight.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/backlight.c:1.1.1.1 xsrc/external/mit/xf86-video-intel/dist/src/backlight.c:1.2 --- xsrc/external/mit/xf86-video-intel/dist/src/backlight.c:1.1.1.1 Wed Nov 5 12:56:20 2014 +++ xsrc/external/mit/xf86-video-intel/dist/src/backlight.c Wed Nov 5 12:58:59 2014 @@ -83,7 +83,7 @@ void backlight_init(struct backlight *b) b->max = -1; } -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__NetBSD__) #include #include Index: xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810_dri.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810_dri.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810_dri.c:1.3 --- xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810_dri.c:1.2 Wed Apr 2 22:50:29 2014 +++ xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810_dri.c Wed Nov 5 12:58:59 2014 @@ -7,6 +7,7 @@ #include #include +#include "xorg-server.h" #include "xf86.h" #include "xf86_OSproc.h" Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.3 --- xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.2 Wed Apr 2 23:59:19 2014 +++ xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c Wed Nov 5 12:58:59 2014 @@ -35,7 +35,9 @@ #include #include #include +#include #include +#include #include #include @@ -59,8 +61,10 @@ static struct kgem_bo * search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags); #define DBG_NO_HW 0 +#define DBG_NO_EXEC 0 #define DBG_NO_TILING 0 #define DBG_NO_CACHE 0 +#define DBG_NO_SNOOP_CACHE 0 #define DBG_NO_CACHE_LEVEL 0 #define DBG_NO_CPU 0 #define DBG_NO_CREATE2 0 @@ -79,6 +83,7 @@ search_snoop_cache(struct kgem *kgem, un #define DBG_NO_HANDLE_LUT 0 #define DBG_NO_WT 0 #define DBG_DUMP 0 +#define DBG_NO_MALLOC_CACHE 0 #define FORCE_MMAP_SYNC 0 /* ((1 << DOMAIN_CPU) | (1 << DOMAIN_GTT)) */ @@ -86,7 +91,8 @@ search_snoop_cache(struct kgem *kgem, un #define DEBUG_SYNC 0 #endif -#define SHOW_BATCH 0 +#define SHOW_BATCH_BEFORE 0 +#define SHOW_BATCH_AFTER 0 #if 0 #define ASSERT_IDLE(kgem__, handle__) assert(!__kgem_busy(kgem__, handle__)) @@ -100,8 +106,12 @@ search_snoop_cache(struct kgem *kgem, un * is being simultaneously being read by the GPU, or within the sampler * prefetch. In general, the chipsets seem to have a requirement that sampler * offsets be aligned to a cacheline (64 bytes). + * + * Actually, it turns out the BLT color pattern (BR15) has the most severe + * alignment restrictions, 64 bytes for 8-bpp, 128 bytes for 16-bpp and 256 + * bytes for 32-bpp. */ -#define UPLOAD_ALIGNMENT 128 +#define UPLOAD_ALIGNMENT 256 #define PAGE_ALIGN(x) ALIGN(x, PAGE_SIZE) #define NUM_PAGES(x) (((x) + PAGE_SIZE-1) / PAGE_SIZE) @@ -110,12 +120,8 @@ search_snoop_cache(struct kgem *kgem, un #define MAX_CPU_VMA_CACHE INT16_MAX #define MAP_PRESERVE_TIME 10 -#define MAKE_CPU_MAP(ptr) ((void*)((uintptr_t)(ptr) | 1)) -#define MAKE_USER_MAP(ptr) ((void*)((uintptr_t)(ptr) | 3)) -#define IS_USER_MAP(ptr) ((uintptr_t)(ptr) & 2) -#define __MAP_TYPE(ptr) ((uintptr_t)(ptr) & 3) - -#define MAKE_REQUEST(rq, ring) ((struct kgem_request *)((uintptr_t)(rq) | (ring))) +#define MAKE_USER_MAP(ptr) ((void*)((uintptr_t)(ptr) | 1)) +#define IS_USER_MAP(ptr) ((uintptr_t)(ptr) & 1) #define LOCAL_I915_PARAM_HAS_BLT 11 #define LOCAL_I915_PARAM_HAS_RELAXED_FENCING 12 @@ -131,7 +137,7 @@ search_snoop_cache(struct kgem *kgem, un #define LOCAL_I915_EXEC_NO_RELOC (1<<11) #define LOCAL_I915_EXEC_HANDLE_LUT (1<<12) -#define LOCAL_I915_GEM_CREATE2 0x32 +#define LOCAL_I915_GEM_CREATE2 0x34 #define LOCAL_IOCTL_I915_GEM_CREATE2 DRM_IO
CVS commit: [netbsd-7] src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: snj
Date: Wed Nov 5 17:57:13 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [netbsd-7]: i915_gem.c
Log Message:
Pull up following revision(s) (requested by sborrill in ticket #178):
sys/external/bsd/drm2/dist/drm/i915/i915_gem.c: revision 1.18
When moving an object to inactive, make sure that we first flush it from
the GTT domain in case it belonged there. Also, fix some compilation issues
when turning on WATCH_GTT and WATCH_LISTS, although this is a lost cause;
most of the code has rotted beyond repair.
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.1 -r1.14.2.2 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.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.2.1 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.14.2.2
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.14.2.1 Fri Aug 22 10:35:59 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Wed Nov 5 17:57:13 2014
@@ -58,6 +58,7 @@
#include
#include
#include
+#include
#include
#include
@@ -2826,10 +2827,18 @@ void i915_vma_move_to_active(struct i915
static void
i915_gem_object_move_to_inactive(struct drm_i915_gem_object *obj)
{
- struct drm_i915_private *dev_priv = obj->base.dev->dev_private;
+ struct drm_device *dev = obj->base.dev;
+ struct drm_i915_private *dev_priv = dev->dev_private;
struct i915_address_space *vm;
struct i915_vma *vma;
+ if ((obj->base.write_domain & I915_GEM_DOMAIN_GTT) != 0) {
+#if 0
+ printk(KERN_ERR "%s: %p 0x%x flushing gtt\n", __func__, obj,
+ obj->base.write_domain);
+#endif
+ i915_gem_object_flush_gtt_write_domain(obj);
+ }
BUG_ON(obj->base.write_domain & ~I915_GEM_GPU_DOMAINS);
BUG_ON(!obj->active);
@@ -3934,7 +3943,7 @@ static void i915_gem_verify_gtt(struct d
struct drm_i915_gem_object *obj;
int err = 0;
- list_for_each_entry(obj, &dev_priv->mm.gtt_list, global_list) {
+ list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) {
if (obj->gtt_space == NULL) {
printk(KERN_ERR "object found on GTT list with no space reserved\n");
err++;
CVS import: xsrc/external/mit/xf86-video-intel/dist
Module Name:xsrc Committed By: christos Date: Wed Nov 5 17:56:30 UTC 2014 Update of /cvsroot/xsrc/external/mit/xf86-video-intel/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10098 Log Message: Import the latest from x.org; no improvement over the current screen corruption. Status: Vendor Tag: xorg Release Tags: xf86-video-intel-2-99-916 U xsrc/external/mit/xf86-video-intel/dist/COPYING U xsrc/external/mit/xf86-video-intel/dist/Makefile.am U xsrc/external/mit/xf86-video-intel/dist/ChangeLog U xsrc/external/mit/xf86-video-intel/dist/depcomp U xsrc/external/mit/xf86-video-intel/dist/configure U xsrc/external/mit/xf86-video-intel/dist/compile U xsrc/external/mit/xf86-video-intel/dist/AUTHORS U xsrc/external/mit/xf86-video-intel/dist/INSTALL U xsrc/external/mit/xf86-video-intel/dist/missing U xsrc/external/mit/xf86-video-intel/dist/README U xsrc/external/mit/xf86-video-intel/dist/install-sh U xsrc/external/mit/xf86-video-intel/dist/config.h.in U xsrc/external/mit/xf86-video-intel/dist/NEWS U xsrc/external/mit/xf86-video-intel/dist/configure.ac U xsrc/external/mit/xf86-video-intel/dist/ltmain.sh U xsrc/external/mit/xf86-video-intel/dist/config.guess U xsrc/external/mit/xf86-video-intel/dist/aclocal.m4 U xsrc/external/mit/xf86-video-intel/dist/config.sub U xsrc/external/mit/xf86-video-intel/dist/Makefile.in N xsrc/external/mit/xf86-video-intel/dist/tools/backlight_helper.c N xsrc/external/mit/xf86-video-intel/dist/tools/Makefile.am N xsrc/external/mit/xf86-video-intel/dist/tools/virtual.c N xsrc/external/mit/xf86-video-intel/dist/tools/Makefile.in N xsrc/external/mit/xf86-video-intel/dist/tools/org.x.xf86-video-intel.backlight-helper.policy.in N xsrc/external/mit/xf86-video-intel/dist/tools/intel-virtual-output.man U xsrc/external/mit/xf86-video-intel/dist/man/Makefile.am U xsrc/external/mit/xf86-video-intel/dist/man/intel.man U xsrc/external/mit/xf86-video-intel/dist/man/Makefile.in U xsrc/external/mit/xf86-video-intel/dist/src/intel_driver.h U xsrc/external/mit/xf86-video-intel/dist/src/intel_options.h U xsrc/external/mit/xf86-video-intel/dist/src/Makefile.am U xsrc/external/mit/xf86-video-intel/dist/src/intel_options.c U xsrc/external/mit/xf86-video-intel/dist/src/intel_module.c N xsrc/external/mit/xf86-video-intel/dist/src/backlight.h N xsrc/external/mit/xf86-video-intel/dist/src/fd.c U xsrc/external/mit/xf86-video-intel/dist/src/intel_device.c N xsrc/external/mit/xf86-video-intel/dist/src/fd.h N xsrc/external/mit/xf86-video-intel/dist/src/backlight.c U xsrc/external/mit/xf86-video-intel/dist/src/i915_pciids.h U xsrc/external/mit/xf86-video-intel/dist/src/compat-api.h U xsrc/external/mit/xf86-video-intel/dist/src/Makefile.in U xsrc/external/mit/xf86-video-intel/dist/src/intel_list.h N xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_yuv_rgb.g8b U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_sf_mask.g4b U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_projective.g4b.gen5 U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_projective.g6a U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_affine.g4a N xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_argb.g8a U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_ca.g5b U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_a.g7a U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_projective.g7b U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_affine.g5a U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_projective.g5b U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_argb.g4a U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_planar.g5b U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_a.g5a U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_argb.g6a U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_write.g6a U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_a.g5b U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_yuv_rgb.g4b.gen5 U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_xy.g5b N xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_affine.g8b U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_a.g5a U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_argb.g4b.gen5 U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_mask_sample_argb.g7a U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_affine.g6b U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_yuv_rgb.g6a U xsrc/external/mit/xf86-video-intel/dist/src/render_program/exa_wm_src_sample_argb.
CVS commit: [netbsd-7] src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src Committed By: snj Date: Wed Nov 5 17:52:10 UTC 2014 Modified Files: src/sys/external/bsd/drm2/dist/drm/i915 [netbsd-7]: intel_panel.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #177): sys/external/bsd/drm2/dist/drm/i915/intel_panel.c: revision 1.6 Merge https://github.com/torvalds/linux/commit/2e7eeeb59a92d09144fdb7d2dc1af77a10a7945b#diff-528092536eaeb3c5f7ff6dfeed53786d > drm/i915: set backlight duty cycle after backlight enable for gen4 > For reasons I can't claim to fully understand gen4 seems to require > backlight duty cycle setting after the backlight has been enabled, or > else black screen follows. I don't have documentation for the correct > sequence on gen4 either. Confirmed on Dell Latitude D630 and MacBook4,1. > Without this patch, the screen on my T61 (i965) would be blank at boot > unless I booted with the AC adapter unplugged. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.2.1 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.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/intel_panel.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.4 src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.4.2.1 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.4 Wed Jul 16 20:56:25 2014 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c Wed Nov 5 17:52:10 2014 @@ -730,9 +730,6 @@ static void i965_enable_backlight(struct ctl = freq << 16; I915_WRITE(BLC_PWM_CTL, ctl); - /* XXX: combine this into above write? */ - intel_panel_actually_set_backlight(connector, panel->backlight.level); - ctl2 = BLM_PIPE(pipe); if (panel->backlight.combination_mode) ctl2 |= BLM_COMBINATION_MODE; @@ -741,6 +738,8 @@ static void i965_enable_backlight(struct I915_WRITE(BLC_PWM_CTL2, ctl2); POSTING_READ(BLC_PWM_CTL2); I915_WRITE(BLC_PWM_CTL2, ctl2 | BLM_PWM_ENABLE); + + intel_panel_actually_set_backlight(connector, panel->backlight.level); } static void vlv_enable_backlight(struct intel_connector *connector)
CVS commit: xsrc/external/mit/xorg-server/dist/randr
Module Name:xsrc
Committed By: christos
Date: Wed Nov 5 17:51:14 UTC 2014
Modified Files:
xsrc/external/mit/xorg-server/dist/randr: randr.c randrstr.h
Log Message:
Add RRSetChanged from more recent versions of xorg-server.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xorg-server/dist/randr/randr.c \
xsrc/external/mit/xorg-server/dist/randr/randrstr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/randr/randr.c
diff -u xsrc/external/mit/xorg-server/dist/randr/randr.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/randr/randr.c:1.2
--- xsrc/external/mit/xorg-server/dist/randr/randr.c:1.1.1.4 Tue Nov 23 00:22:12 2010
+++ xsrc/external/mit/xorg-server/dist/randr/randr.c Wed Nov 5 12:51:14 2014
@@ -442,6 +442,14 @@ RRTellChanged (ScreenPtr pScreen)
}
}
+void
+RRSetChanged(ScreenPtr pScreen)
+{
+ rrScrPriv(pScreen);
+
+ pScrPriv->changed = TRUE;
+}
+
/*
* Return the first output which is connected to an active CRTC
* Used in emulating 1.0 behaviour
Index: xsrc/external/mit/xorg-server/dist/randr/randrstr.h
diff -u xsrc/external/mit/xorg-server/dist/randr/randrstr.h:1.1.1.4 xsrc/external/mit/xorg-server/dist/randr/randrstr.h:1.2
--- xsrc/external/mit/xorg-server/dist/randr/randrstr.h:1.1.1.4 Tue Aug 2 02:57:05 2011
+++ xsrc/external/mit/xorg-server/dist/randr/randrstr.h Wed Nov 5 12:51:14 2014
@@ -448,6 +448,9 @@ RRDeliverScreenEvent (ClientPtr client,
extern _X_EXPORT void
RRTellChanged (ScreenPtr pScreen);
+extern _X_EXPORT void
+RRSetChanged (ScreenPtr pScreen);
+
/*
* Poll the driver for changed information
*/
CVS commit: src/sys/arch/evbarm/awin
Module Name:src
Committed By: matt
Date: Wed Nov 5 17:46:51 UTC 2014
Modified Files:
src/sys/arch/evbarm/awin: awin_start.S
Log Message:
Only look at the ID register if we are configured for multiple SoCs.
Make sure that the ID register is dealt with correctly for BE as well.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/awin/awin_start.S
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/awin/awin_start.S
diff -u src/sys/arch/evbarm/awin/awin_start.S:1.5 src/sys/arch/evbarm/awin/awin_start.S:1.6
--- src/sys/arch/evbarm/awin/awin_start.S:1.5 Thu Oct 30 01:15:30 2014
+++ src/sys/arch/evbarm/awin/awin_start.S Wed Nov 5 17:46:51 2014
@@ -41,7 +41,7 @@
#include
#include
-RCSID("$NetBSD: awin_start.S,v 1.5 2014/10/30 01:15:30 jmcneill Exp $")
+RCSID("$NetBSD: awin_start.S,v 1.6 2014/11/05 17:46:51 matt Exp $")
#if defined(VERBOSE_INIT_ARM)
#define XPUTC(n) mov r0, n; bl xputc
@@ -151,26 +151,43 @@ _C_LABEL(awin_start):
// Make sure the cache is flushed out to RAM for the other CPUs
bl _C_LABEL(armv7_dcache_wbinv_all)
+#if defined(ALLWINNER_A20) + defined(ALLWINNER_A31) + defined(ALLWINNER_A80) > 1
// Read SoC ID
movw r5, #:lower16:(AWIN_CORE_PBASE+AWIN_SRAM_OFFSET)
movt r5, #:upper16:(AWIN_CORE_PBASE+AWIN_SRAM_OFFSET)
ldr r1, [r5, #AWIN_SRAM_VER_REG]
- orr r1, r1, AWIN_SRAM_VER_R_EN
+#ifdef __ARMEB__
+ orr r1, r1, #(AWIN_SRAM_VER_R_EN << 8) # it's bit 15
+#else
+ orr r1, r1, #AWIN_SRAM_VER_R_EN
+#endif
str r1, [r5, #AWIN_SRAM_VER_REG]
dsb
ldr r1, [r5, #AWIN_SRAM_VER_REG]
+#ifdef __ARMEB__
+ rev r1, r1
+#endif
lsr r1, r1, #16
+#endif /* ALLWINNER_A20 + ALLWINNER_A31 + ALLWINNER_A80 > 1 */
// MP init based on SoC ID
#if defined(ALLWINNER_A20)
+# if defined(ALLWINNER_A31) || defined(ALLWINNER_A80)
movw r0, #AWIN_SRAM_VER_KEY_A20
cmp r1, r0
bleq a20_mpinit
+# else
+ bl a20_mpinit
+# endif
#endif
#if defined(ALLWINNER_A31)
+# if defined(ALLWINNER_A20) || defined(ALLWINNER_A80)
movw r0, #AWIN_SRAM_VER_KEY_A31
cmp r1, r0
bleq a31_mpinit
+# else
+ bl a31_mpinit
+# endif
#endif
XPUTC2(#62)
CVS commit: src/sys/dev/wsfont
Module Name:src
Committed By: macallan
Date: Wed Nov 5 17:03:40 UTC 2014
Modified Files:
src/sys/dev/wsfont: Droid_Sans_Mono_19x36.h
Log Message:
forgot the license header
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/wsfont/Droid_Sans_Mono_19x36.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/wsfont/Droid_Sans_Mono_19x36.h
diff -u src/sys/dev/wsfont/Droid_Sans_Mono_19x36.h:1.1 src/sys/dev/wsfont/Droid_Sans_Mono_19x36.h:1.2
--- src/sys/dev/wsfont/Droid_Sans_Mono_19x36.h:1.1 Wed Nov 5 17:01:38 2014
+++ src/sys/dev/wsfont/Droid_Sans_Mono_19x36.h Wed Nov 5 17:03:40 2014
@@ -1,3 +1,19 @@
+/*
+ Copyright 2010 Ascender Corporation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
static u_char Droid_Sans_Mono_19x36_data[];
static struct wsdisplay_font Droid_Sans_Mono_19x36 = {
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: macallan Date: Wed Nov 5 17:01:38 UTC 2014 Modified Files: src/sys/dev/wsfont: files.wsfont wsfont.c Added Files: src/sys/dev/wsfont: Droid_Sans_Mono_19x36.h Log Message: add FONT_DROID_SANS_MONO19x36, so we have something readable on 200+dpi displays To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/dev/wsfont/Droid_Sans_Mono_19x36.h cvs rdiff -u -r1.19 -r1.20 src/sys/dev/wsfont/files.wsfont cvs rdiff -u -r1.55 -r1.56 src/sys/dev/wsfont/wsfont.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: jmcneill
Date: Wed Nov 5 15:05:20 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_io.c awin_reg.h files.awin
Added Files:
src/sys/arch/arm/allwinner: awin_cnt.c
Log Message:
add 64-bit counter driver; it is certainly slower than gtmr (mutexes involved,
etc) but at least it is monotonic with > 1 cpu
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/allwinner/awin_cnt.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/allwinner/awin_io.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/arm/allwinner/awin_reg.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/allwinner/files.awin
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/allwinner/awin_io.c
diff -u src/sys/arch/arm/allwinner/awin_io.c:1.25 src/sys/arch/arm/allwinner/awin_io.c:1.26
--- src/sys/arch/arm/allwinner/awin_io.c:1.25 Wed Nov 5 07:56:48 2014
+++ src/sys/arch/arm/allwinner/awin_io.c Wed Nov 5 15:05:20 2014
@@ -31,7 +31,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: awin_io.c,v 1.25 2014/11/05 07:56:48 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_io.c,v 1.26 2014/11/05 15:05:20 jmcneill Exp $");
#include
#include
@@ -97,6 +97,8 @@ static const struct awin_locators awin_l
{ "awindma", OFFANDSIZE(DMA), NOPORT, AWIN_IRQ_DMA, A10|A20|REQ },
{ "awindma", OFFANDSIZE(DMA), NOPORT, AWIN_A31_IRQ_DMA, A31 },
{ "awintmr", OFFANDSIZE(TMR), NOPORT, AWIN_IRQ_TMR0, A10 },
+ { "awincnt", OFFANDSIZE(CPUCFG), NOPORT, NOINTR, A20 },
+ { "awincnt", OFFANDSIZE(A31_CPUCFG), NOPORT, NOINTR, A31 },
{ "com", OFFANDSIZE(UART0), 0, AWIN_IRQ_UART0, A10|A20 },
{ "com", OFFANDSIZE(UART1), 1, AWIN_IRQ_UART1, A10|A20 },
{ "com", OFFANDSIZE(UART2), 2, AWIN_IRQ_UART2, A10|A20 },
Index: src/sys/arch/arm/allwinner/awin_reg.h
diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.41 src/sys/arch/arm/allwinner/awin_reg.h:1.42
--- src/sys/arch/arm/allwinner/awin_reg.h:1.41 Sun Nov 2 23:54:46 2014
+++ src/sys/arch/arm/allwinner/awin_reg.h Wed Nov 5 15:05:20 2014
@@ -849,6 +849,9 @@ struct awin_mmc_idma_descriptor {
#define AWIN_CPUCFG_CPU1_PWROFF_REG 0x01B4
#define AWIN_CPUCFG_DBGCTRL0_REG 0x01E0
#define AWIN_CPUCFG_DBGCTRL1_REG 0x01E4
+#define AWIN_CPUCFG_CNT64_CTRL_REG 0x0280
+#define AWIN_CPUCFG_CNT64_LOW_REG 0x0284
+#define AWIN_CPUCFG_CNT64_HIGH_REG 0x0288
#define AWIN_CPUCFG_CPU_RST_CTRL_CORE_RESET __BIT(1)
#define AWIN_CPUCFG_CPU_RST_CTRL_RESET __BIT(0)
@@ -865,6 +868,10 @@ struct awin_mmc_idma_descriptor {
#define AWIN_CPUCFG_DBGCTL0_CPU1_DBGPWRDUP __BIT(1)
#define AWIN_CPUCFG_DBGCTL0_CPU0_DBGPWRDUP __BIT(1)
+#define AWIN_CPUCFG_CNT64_CLK_SRC_SEL __BIT(2)
+#define AWIN_CPUCFG_CNT64_RL_EN __BIT(1)
+#define AWIN_CPUCFG_CNT64_CLR_EN __BIT(0)
+
#define AWIN_PLL1_CFG_REG 0x
#define AWIN_PLL1_TUN_REG 0x0004
#define AWIN_PLL2_CFG_REG 0x0008
Index: src/sys/arch/arm/allwinner/files.awin
diff -u src/sys/arch/arm/allwinner/files.awin:1.18 src/sys/arch/arm/allwinner/files.awin:1.19
--- src/sys/arch/arm/allwinner/files.awin:1.18 Sun Nov 2 23:55:48 2014
+++ src/sys/arch/arm/allwinner/files.awin Wed Nov 5 15:05:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.awin,v 1.18 2014/11/02 23:55:48 jmcneill Exp $
+# $NetBSD: files.awin,v 1.19 2014/11/05 15:05:20 jmcneill Exp $
#
# Configuration info for Allwinner ARM Peripherals
#
@@ -53,6 +53,11 @@ device awintmr
attach awintmr at awinio with awin_tmr
file arch/arm/allwinner/awin_tmr.c awin_tmr
+# A20/A31 64-bit counter
+device awincnt
+attach awincnt at awinio with awin_cnt
+file arch/arm/allwinner/awin_cnt.c awin_cnt
+
# A10/A20 UART
options COM_16750 # for IIR_BUSY
attach com at awinio with awin_com
Added files:
Index: src/sys/arch/arm/allwinner/awin_cnt.c
diff -u /dev/null src/sys/arch/arm/allwinner/awin_cnt.c:1.1
--- /dev/null Wed Nov 5 15:05:20 2014
+++ src/sys/arch/arm/allwinner/awin_cnt.c Wed Nov 5 15:05:20 2014
@@ -0,0 +1,136 @@
+/* $NetBSD: awin_cnt.c,v 1.1 2014/11/05 15:05:20 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2014 Jared D. McNeill
+ * 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 BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPEC
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Wed Nov 5 15:05:40 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: HUMMINGBIRD_A31 Log Message: enable awincnt To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31 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/conf/HUMMINGBIRD_A31 diff -u src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.14 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.15 --- src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.14 Wed Nov 5 00:16:19 2014 +++ src/sys/arch/evbarm/conf/HUMMINGBIRD_A31 Wed Nov 5 15:05:40 2014 @@ -1,4 +1,4 @@ -# $NetBSD: HUMMINGBIRD_A31,v 1.14 2014/11/05 00:16:19 jmcneill Exp $ +# $NetBSD: HUMMINGBIRD_A31,v 1.15 2014/11/05 15:05:40 jmcneill Exp $ # # HUMMINGBIRD_A31 - Merrii Hummingbird A31 # @@ -198,6 +198,9 @@ awinicu0 at awinio0 # DMA Controller awindma0 at awinio0 +# 64-bit counter +awincnt0 at awinio0 + # GPIO Controller awingpio0 at awinio0
CVS commit: src/sys/external/bsd/drm2/ttm
Module Name:src
Committed By: riastradh
Date: Wed Nov 5 15:03:19 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/ttm: ttm_bo_vm.c
Log Message:
Oops -- fix call to ttm_bo_uvm_fault_idle in last commit.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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/ttm/ttm_bo_vm.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.6 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.7
--- src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.6 Wed Nov 5 14:47:16 2014
+++ src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Wed Nov 5 15:03:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_vm.c,v 1.6 2014/11/05 14:47:16 riastradh Exp $ */
+/* $NetBSD: ttm_bo_vm.c,v 1.7 2014/11/05 15:03:19 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.6 2014/11/05 14:47:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.7 2014/11/05 15:03:19 riastradh Exp $");
#include
@@ -132,7 +132,7 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *u
}
}
- ret = ttm_bo_uvm_fault_idle(bo, ufi, uobj);
+ ret = ttm_bo_uvm_fault_idle(bo, ufi);
if (ret) {
/* Unlocks if it restarts. */
KASSERT(ret == -ERESTART);
CVS commit: [netbsd-5-2] src/doc
Module Name:src
Committed By: sborrill
Date: Wed Nov 5 14:50:58 UTC 2014
Modified Files:
src/doc [netbsd-5-2]: CHANGES-5.2.3
Log Message:
Ticket #1930
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.22 -r1.1.2.23 src/doc/CHANGES-5.2.3
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-5.2.3
diff -u src/doc/CHANGES-5.2.3:1.1.2.22 src/doc/CHANGES-5.2.3:1.1.2.23
--- src/doc/CHANGES-5.2.3:1.1.2.22 Mon Nov 3 13:06:58 2014
+++ src/doc/CHANGES-5.2.3 Wed Nov 5 14:50:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.2.3,v 1.1.2.22 2014/11/03 13:06:58 msaitoh Exp $
+# $NetBSD: CHANGES-5.2.3,v 1.1.2.23 2014/11/05 14:50:58 sborrill Exp $
A complete list of changes from the NetBSD 5.2.2 release to the NetBSD 5.2.3
release:
@@ -345,3 +345,16 @@ usr.bin/ftp/version.h1.85
Change the version that ftp announces to 20141026. It can be a
useful method to determine if CVE-2014-8517 is fixed.
[lukem, ticket #1929]
+
+distrib/common/Makefile.bootcd 1.20 via patch
+distrib/notes/arc/prep1.3 via patch
+distrib/notes/cats/prep1.12 via patch
+distrib/notes/common/main 1.512 via patch
+distrib/notes/macppc/prep.OPENFIRMWARE 1.16 via patch
+share/man/man7/release.7 1.33-1.36 via patch
+
+ Install fully-populated .iso images in ${RELEASEDIR}/images
+ instead of ${RELEASEDIR}/iso. Update documentation to reflect
+ this.
+ [snj, ticket #1930]
+
CVS commit: [netbsd-5-2] src
Module Name:src
Committed By: sborrill
Date: Wed Nov 5 14:50:10 UTC 2014
Modified Files:
src/distrib/common [netbsd-5-2]: Makefile.bootcd
src/distrib/notes/arc [netbsd-5-2]: prep
src/distrib/notes/cats [netbsd-5-2]: prep
src/distrib/notes/common [netbsd-5-2]: main
src/distrib/notes/macppc [netbsd-5-2]: prep.OPENFIRMWARE
src/share/man/man7 [netbsd-5-2]: release.7
Log Message:
Apply patch (requested by snj in ticket 1930):
Install fully-populated .iso images in ${RELEASEDIR}/images instead
of ${RELEASEDIR}/iso
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.1 -r1.14.2.1.10.1 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.1.6.1 -r1.1.6.1.10.1 src/distrib/notes/arc/prep
cvs rdiff -u -r1.10.2.1 -r1.10.2.1.10.1 src/distrib/notes/cats/prep
cvs rdiff -u -r1.425.2.16.2.5 -r1.425.2.16.2.6 src/distrib/notes/common/main
cvs rdiff -u -r1.11.2.2 -r1.11.2.2.6.1 \
src/distrib/notes/macppc/prep.OPENFIRMWARE
cvs rdiff -u -r1.25.4.1 -r1.25.4.1.6.1 src/share/man/man7/release.7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.14.2.1 src/distrib/common/Makefile.bootcd:1.14.2.1.10.1
--- src/distrib/common/Makefile.bootcd:1.14.2.1 Sat Dec 6 21:30:03 2008
+++ src/distrib/common/Makefile.bootcd Wed Nov 5 14:50:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.14.2.1 2008/12/06 21:30:03 snj Exp $
+# $NetBSD: Makefile.bootcd,v 1.14.2.1.10.1 2014/11/05 14:50:10 sborrill Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -42,7 +42,7 @@ CDSOURCE?= false
.if ${CDRELEASE} == false
CDROMS_RELEASEDIR?= ${MACHINE}/installation/cdrom
.else
-CDROMS_RELEASEDIR?= iso
+CDROMS_RELEASEDIR?= images
.endif
.if defined(CDRELEASE_NOISOS)
CDRELEASE_EXCLUDE= -s ',./installation/cdrom.*,,gp'
Index: src/distrib/notes/arc/prep
diff -u src/distrib/notes/arc/prep:1.1.6.1 src/distrib/notes/arc/prep:1.1.6.1.10.1
--- src/distrib/notes/arc/prep:1.1.6.1 Sat Apr 25 23:16:33 2009
+++ src/distrib/notes/arc/prep Wed Nov 5 14:50:10 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep,v 1.1.6.1 2009/04/25 23:16:33 snj Exp $
+.\" $NetBSD: prep,v 1.1.6.1.10.1 2014/11/05 14:50:10 sborrill Exp $
.
First and foremost, before beginning the installation process,
.Em make sure you have a reliable backup
@@ -40,7 +40,7 @@ install kernel onto a CD-R.
Go to one of the
.Nx
mirror sites and download CD-R image from the
-.Pa pub/NetBSD/iso
+.Pa pub/NetBSD/images
directory.
.Lk http://www.NetBSD.org/mirrors/#iso
.Pp
Index: src/distrib/notes/cats/prep
diff -u src/distrib/notes/cats/prep:1.10.2.1 src/distrib/notes/cats/prep:1.10.2.1.10.1
--- src/distrib/notes/cats/prep:1.10.2.1 Sat Apr 25 23:16:33 2009
+++ src/distrib/notes/cats/prep Wed Nov 5 14:50:10 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep,v 1.10.2.1 2009/04/25 23:16:33 snj Exp $
+.\" $NetBSD: prep,v 1.10.2.1.10.1 2014/11/05 14:50:10 sborrill Exp $
.
A \*M machine usually needs little or no preparation before installing
.Nx ,
@@ -36,7 +36,7 @@ install kernel onto a CD-R.
Go to one of the
.Nx
mirror sites and download CD-R image from the
-.Pa pub/NetBSD/iso
+.Pa pub/NetBSD/images
directory.
.Lk http://www.NetBSD.org/mirrors/#iso
.Pp
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.425.2.16.2.5 src/distrib/notes/common/main:1.425.2.16.2.6
--- src/distrib/notes/common/main:1.425.2.16.2.5 Sat Jan 18 11:23:44 2014
+++ src/distrib/notes/common/main Wed Nov 5 14:50:10 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.425.2.16.2.5 2014/01/18 11:23:44 bouyer Exp $
+.\" $NetBSD: main,v 1.425.2.16.2.6 2014/11/05 14:50:10 sborrill Exp $
.\"
.\" Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -118,7 +118,7 @@ Option 1: bootable CD-ROM images contain
.Pp
These can be found
on an FTP site near you, usually located in the
-.Pa /pub/NetBSD/iso/
+.Pa /pub/NetBSD/images/
directory.
Check the NetBSD website for details.
.Pp
Index: src/distrib/notes/macppc/prep.OPENFIRMWARE
diff -u src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.2 src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.2.6.1
--- src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.2 Fri Nov 5 07:29:48 2010
+++ src/distrib/notes/macppc/prep.OPENFIRMWARE Wed Nov 5 14:50:10 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep.OPENFIRMWARE,v 1.11.2.2 2010/11/05 07:29:48 snj Exp $
+.\" $NetBSD: prep.OPENFIRMWARE,v 1.11.2.2.6.1 2014/11/05 14:50:10 sborrill Exp $
.if \*[OF_VERSION_3] \{\
.
.Ss2 Updating your BootROM
@@ -1177,7 +1177,7 @@ Go to one of the
mirror sites and download the CD-R image
.Pa macppccd-\*V.iso
from the
-.Pa pub/NetBSD/iso
+.Pa pub/NetBSD/images
directory.
.Lk http://www.NetBSD.org/mirrors/#iso
.Pp
Index: src/share/man/man7/release.7
diff -u src/share/man/man7/release.7:1.25.4.1 src/share/man/man7/release.7:1.25.4.1.6.1
--- src/share/man/
CVS commit: src/sys/external/bsd/drm2/ttm
Module Name:src
Committed By: riastradh
Date: Wed Nov 5 14:47:16 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/ttm: ttm_bo_vm.c
Log Message:
Simplify uvmfault_unlockall use in ttm_bo_uvm_fault.
Pass NULL for uobj instead of locking uobj->vmobjlock before calling
uvmfault_unlockall.
Should fix lockdebug unlocking-unlocked-mutex crash in
ttm_bo_uvm_fault_idle.
XXX pullup to netbsd-7
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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/ttm/ttm_bo_vm.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.5 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.6
--- src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.5 Wed Sep 10 18:24:16 2014
+++ src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Wed Nov 5 14:47:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_vm.c,v 1.5 2014/09/10 18:24:16 riastradh Exp $ */
+/* $NetBSD: ttm_bo_vm.c,v 1.6 2014/11/05 14:47:16 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.5 2014/09/10 18:24:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.6 2014/11/05 14:47:16 riastradh Exp $");
#include
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,
#include
static int ttm_bo_uvm_fault_idle(struct ttm_buffer_object *,
- struct uvm_faultinfo *, struct uvm_object *);
+ struct uvm_faultinfo *);
static int ttm_bo_uvm_lookup(struct ttm_bo_device *, unsigned long,
unsigned long, struct ttm_buffer_object **);
@@ -111,8 +111,7 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *u
* relocking uobj's vmobjlock first), wait for it, and
* start over.
*/
- mutex_enter(uobj->vmobjlock);
- uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj);
+ uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, NULL);
(void)ttm_bo_wait_unreserved(bo);
return -ERESTART;
}
@@ -204,15 +203,13 @@ 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: mutex_enter(uobj->vmobjlock);
- uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj);
+out0: uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, NULL);
/* XXX errno Linux->NetBSD */
return -ret;
}
static int
-ttm_bo_uvm_fault_idle(struct ttm_buffer_object *bo, struct uvm_faultinfo *ufi,
-struct uvm_object *uobj)
+ttm_bo_uvm_fault_idle(struct ttm_buffer_object *bo, struct uvm_faultinfo *ufi)
{
struct ttm_bo_device *const bdev = bo->bdev;
int ret = 0;
@@ -224,7 +221,7 @@ ttm_bo_uvm_fault_idle(struct ttm_buffer_
if (ttm_bo_wait(bo, false, false, true) == 0)
goto out;
- uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj);
+ uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, NULL);
(void)ttm_bo_wait(bo, false, true, false);
ret = -ERESTART;
CVS commit: src
Module Name:src Committed By: prlw1 Date: Wed Nov 5 14:30:00 UTC 2014 Modified Files: src/distrib/sets/lists/xcomp: mi src/external/mit/xorg/server/xorg-server/include: Makefile Log Message: Install fbpict.h (e.g., new xf86-video-intel assumes it exists if RENDER is defined) To generate a diff of this commit: cvs rdiff -u -r1.152 -r1.153 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.11 -r1.12 \ src/external/mit/xorg/server/xorg-server/include/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/lists/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.152 src/distrib/sets/lists/xcomp/mi:1.153 --- src/distrib/sets/lists/xcomp/mi:1.152 Thu May 15 16:32:28 2014 +++ src/distrib/sets/lists/xcomp/mi Wed Nov 5 14:30:00 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.152 2014/05/15 16:32:28 apb Exp $ +# $NetBSD: mi,v 1.153 2014/11/05 14:30:00 prlw1 Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -5911,6 +5911,7 @@ ./usr/X11R7/include/xorg/fbdevhw.h -unknown- xorg ./usr/X11R7/include/xorg/fboverlay.h -unknown- xorg ./usr/X11R7/include/xorg/fbpseudocolor.h -unknown- obsolete +./usr/X11R7/include/xorg/fbpict.h -unknown- xorg ./usr/X11R7/include/xorg/fbrop.h -unknown- xorg ./usr/X11R7/include/xorg/fi1236.h -unknown- xorg ./usr/X11R7/include/xorg/fourcc.h -unknown- xorg Index: src/external/mit/xorg/server/xorg-server/include/Makefile diff -u src/external/mit/xorg/server/xorg-server/include/Makefile:1.11 src/external/mit/xorg/server/xorg-server/include/Makefile:1.12 --- src/external/mit/xorg/server/xorg-server/include/Makefile:1.11 Wed Apr 2 01:22:11 2014 +++ src/external/mit/xorg/server/xorg-server/include/Makefile Wed Nov 5 14:30:00 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/04/02 01:22:11 riastradh Exp $ +# $NetBSD: Makefile,v 1.12 2014/11/05 14:30:00 prlw1 Exp $ .include @@ -30,7 +30,7 @@ INCS= BT.h IBM.h TI.h XIstubs.h Xprintf. dixgrabs.h dixstruct.h dri.h dristruct.h edid.h exa.h exevents.h \ eventconvert.h events.h eventstr.h list.h \ extension.h extinit.h extnsionst.h fb.h fbdevhw.h fboverlay.h \ - fbrop.h fi1236.h fourcc.h gc.h gcstruct.h geext.h globals.h \ + fbpict.h fbrop.h fi1236.h fourcc.h gc.h gcstruct.h geext.h globals.h \ glyphstr.h i2c_def.h input.h inputstr.h inpututils.h \ mi.h mibstore.h micmap.h micoord.h mifillarc.h mifpoly.h \ migc.h miline.h mipict.h mipointer.h mipointrst.h misc.h miscstruct.h \
CVS commit: [netbsd-5-1] src/doc
Module Name:src
Committed By: sborrill
Date: Wed Nov 5 14:18:28 UTC 2014
Modified Files:
src/doc [netbsd-5-1]: CHANGES-5.1.5
Log Message:
Ticket #1930
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-5.1.5
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-5.1.5
diff -u src/doc/CHANGES-5.1.5:1.1.2.21 src/doc/CHANGES-5.1.5:1.1.2.22
--- src/doc/CHANGES-5.1.5:1.1.2.21 Mon Nov 3 13:07:58 2014
+++ src/doc/CHANGES-5.1.5 Wed Nov 5 14:18:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1.5,v 1.1.2.21 2014/11/03 13:07:58 msaitoh Exp $
+# $NetBSD: CHANGES-5.1.5,v 1.1.2.22 2014/11/05 14:18:28 sborrill Exp $
A complete list of changes from the NetBSD 5.1.4 release to the NetBSD 5.1.5
release:
@@ -345,3 +345,16 @@ usr.bin/ftp/version.h1.85
Change the version that ftp announces to 20141026. It can be a
useful method to determine if CVE-2014-8517 is fixed.
[lukem, ticket #1929]
+
+distrib/common/Makefile.bootcd 1.20 via patch
+distrib/notes/arc/prep1.3 via patch
+distrib/notes/cats/prep1.12 via patch
+distrib/notes/common/main 1.512 via patch
+distrib/notes/macppc/prep.OPENFIRMWARE 1.16 via patch
+share/man/man7/release.7 1.33-1.36 via patch
+
+ Install fully-populated .iso images in ${RELEASEDIR}/images
+ instead of ${RELEASEDIR}/iso. Update documentation to reflect
+ this.
+ [snj, ticket #1930]
+
CVS commit: [netbsd-5-1] src
Module Name:src
Committed By: sborrill
Date: Wed Nov 5 14:17:33 UTC 2014
Modified Files:
src/distrib/common [netbsd-5-1]: Makefile.bootcd
src/distrib/notes/arc [netbsd-5-1]: prep
src/distrib/notes/cats [netbsd-5-1]: prep
src/distrib/notes/common [netbsd-5-1]: main
src/distrib/notes/macppc [netbsd-5-1]: prep.OPENFIRMWARE
src/share/man/man7 [netbsd-5-1]: release.7
Log Message:
Apply patch (requested by snj in ticket 1930):
Install fully-populated .iso images in ${RELEASEDIR}/images instead
of ${RELEASEDIR}/iso
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.1 -r1.14.2.1.6.1 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.1.6.1 -r1.1.6.1.6.1 src/distrib/notes/arc/prep
cvs rdiff -u -r1.10.2.1 -r1.10.2.1.6.1 src/distrib/notes/cats/prep
cvs rdiff -u -r1.425.2.14.2.7 -r1.425.2.14.2.8 src/distrib/notes/common/main
cvs rdiff -u -r1.11.2.2 -r1.11.2.2.2.1 \
src/distrib/notes/macppc/prep.OPENFIRMWARE
cvs rdiff -u -r1.25.4.1 -r1.25.4.1.2.1 src/share/man/man7/release.7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.14.2.1 src/distrib/common/Makefile.bootcd:1.14.2.1.6.1
--- src/distrib/common/Makefile.bootcd:1.14.2.1 Sat Dec 6 21:30:03 2008
+++ src/distrib/common/Makefile.bootcd Wed Nov 5 14:17:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.14.2.1 2008/12/06 21:30:03 snj Exp $
+# $NetBSD: Makefile.bootcd,v 1.14.2.1.6.1 2014/11/05 14:17:32 sborrill Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -42,7 +42,7 @@ CDSOURCE?= false
.if ${CDRELEASE} == false
CDROMS_RELEASEDIR?= ${MACHINE}/installation/cdrom
.else
-CDROMS_RELEASEDIR?= iso
+CDROMS_RELEASEDIR?= images
.endif
.if defined(CDRELEASE_NOISOS)
CDRELEASE_EXCLUDE= -s ',./installation/cdrom.*,,gp'
Index: src/distrib/notes/arc/prep
diff -u src/distrib/notes/arc/prep:1.1.6.1 src/distrib/notes/arc/prep:1.1.6.1.6.1
--- src/distrib/notes/arc/prep:1.1.6.1 Sat Apr 25 23:16:33 2009
+++ src/distrib/notes/arc/prep Wed Nov 5 14:17:33 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep,v 1.1.6.1 2009/04/25 23:16:33 snj Exp $
+.\" $NetBSD: prep,v 1.1.6.1.6.1 2014/11/05 14:17:33 sborrill Exp $
.
First and foremost, before beginning the installation process,
.Em make sure you have a reliable backup
@@ -40,7 +40,7 @@ install kernel onto a CD-R.
Go to one of the
.Nx
mirror sites and download CD-R image from the
-.Pa pub/NetBSD/iso
+.Pa pub/NetBSD/images
directory.
.Lk http://www.NetBSD.org/mirrors/#iso
.Pp
Index: src/distrib/notes/cats/prep
diff -u src/distrib/notes/cats/prep:1.10.2.1 src/distrib/notes/cats/prep:1.10.2.1.6.1
--- src/distrib/notes/cats/prep:1.10.2.1 Sat Apr 25 23:16:33 2009
+++ src/distrib/notes/cats/prep Wed Nov 5 14:17:33 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep,v 1.10.2.1 2009/04/25 23:16:33 snj Exp $
+.\" $NetBSD: prep,v 1.10.2.1.6.1 2014/11/05 14:17:33 sborrill Exp $
.
A \*M machine usually needs little or no preparation before installing
.Nx ,
@@ -36,7 +36,7 @@ install kernel onto a CD-R.
Go to one of the
.Nx
mirror sites and download CD-R image from the
-.Pa pub/NetBSD/iso
+.Pa pub/NetBSD/images
directory.
.Lk http://www.NetBSD.org/mirrors/#iso
.Pp
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.425.2.14.2.7 src/distrib/notes/common/main:1.425.2.14.2.8
--- src/distrib/notes/common/main:1.425.2.14.2.7 Sat Jan 18 11:23:49 2014
+++ src/distrib/notes/common/main Wed Nov 5 14:17:33 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.425.2.14.2.7 2014/01/18 11:23:49 bouyer Exp $
+.\" $NetBSD: main,v 1.425.2.14.2.8 2014/11/05 14:17:33 sborrill Exp $
.\"
.\" Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -118,7 +118,7 @@ Option 1: bootable CD-ROM images contain
.Pp
These can be found
on an FTP site near you, usually located in the
-.Pa /pub/NetBSD/iso/
+.Pa /pub/NetBSD/images/
directory.
Check the NetBSD website for details.
.Pp
Index: src/distrib/notes/macppc/prep.OPENFIRMWARE
diff -u src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.2 src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.2.2.1
--- src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.2 Fri Nov 5 07:29:48 2010
+++ src/distrib/notes/macppc/prep.OPENFIRMWARE Wed Nov 5 14:17:33 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep.OPENFIRMWARE,v 1.11.2.2 2010/11/05 07:29:48 snj Exp $
+.\" $NetBSD: prep.OPENFIRMWARE,v 1.11.2.2.2.1 2014/11/05 14:17:33 sborrill Exp $
.if \*[OF_VERSION_3] \{\
.
.Ss2 Updating your BootROM
@@ -1177,7 +1177,7 @@ Go to one of the
mirror sites and download the CD-R image
.Pa macppccd-\*V.iso
from the
-.Pa pub/NetBSD/iso
+.Pa pub/NetBSD/images
directory.
.Lk http://www.NetBSD.org/mirrors/#iso
.Pp
Index: src/share/man/man7/release.7
diff -u src/share/man/man7/release.7:1.25.4.1 src/share/man/man7/release.7:1.25.4.1.2.1
--- src/share/man/man7/rele
CVS commit: src/distrib/evbarm/instkernel/instkernel
Module Name:src
Committed By: joerg
Date: Wed Nov 5 13:53:22 UTC 2014
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
Log Message:
Prepare CUBIETRUCK_INSTALL too.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/distrib/evbarm/instkernel/instkernel/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/evbarm/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.24 src/distrib/evbarm/instkernel/instkernel/Makefile:1.25
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.24 Sat Mar 1 01:53:36 2014
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Wed Nov 5 13:53:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2014/03/01 01:53:36 matt Exp $
+# $NetBSD: Makefile,v 1.25 2014/11/05 13:53:22 joerg Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -46,7 +46,8 @@ MDSETTARGETS+= RPI_INSTALL ${SSHRAMDIS
# Little endian (any ABI) ARMv7 platforms.
MDSETTARGETS+= BCM5301X_INSTALL ${RAMDISK} - \
BEAGLEBONE_INSTALL ${RAMDISK} - \
- CUBIEBOARD_INSTALL ${RAMDISK} -
+ CUBIEBOARD_INSTALL ${RAMDISK} - \
+ CUBIETRUCK_INSTALL ${RAMDISK} -
.endif
MDSET_RELEASEDIR= installation/instkernel
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: nakayama
Date: Wed Nov 5 13:50:50 UTC 2014
Modified Files:
src/sys/arch/sparc64/sparc64: cache.h
Log Message:
Simplify a condition.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sparc64/sparc64/cache.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/sparc64/sparc64/cache.h
diff -u src/sys/arch/sparc64/sparc64/cache.h:1.25 src/sys/arch/sparc64/sparc64/cache.h:1.26
--- src/sys/arch/sparc64/sparc64/cache.h:1.25 Wed Nov 5 13:30:11 2014
+++ src/sys/arch/sparc64/sparc64/cache.h Wed Nov 5 13:50:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cache.h,v 1.25 2014/11/05 13:30:11 nakayama Exp $ */
+/* $NetBSD: cache.h,v 1.26 2014/11/05 13:50:50 nakayama Exp $ */
/*
* Copyright (c) 2011 Matthew R. Green
@@ -130,14 +130,12 @@ sp_tlb_flush_pte_sun4v(vaddr_t va, int c
static __inline__ void
sp_tlb_flush_pte(vaddr_t va, int ctx)
{
- if (CPU_ISSUN4U || CPU_ISSUN4US) {
- if (CPU_IS_USIII_UP() || CPU_IS_SPARC64_V_UP())
- sp_tlb_flush_pte_usiii(va, ctx);
- else
- sp_tlb_flush_pte_us(va, ctx);
- }
- else if (CPU_ISSUN4V)
+ if (CPU_ISSUN4V)
sp_tlb_flush_pte_sun4v(va, ctx);
+ else if (CPU_IS_USIII_UP() || CPU_IS_SPARC64_V_UP())
+ sp_tlb_flush_pte_usiii(va, ctx);
+ else
+ sp_tlb_flush_pte_us(va, ctx);
}
static __inline__ void
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: nakayama
Date: Wed Nov 5 13:30:11 UTC 2014
Modified Files:
src/sys/arch/sparc64/sparc64: cache.h cpu.c ipifuncs.c
Log Message:
Remove more #ifdef SUN4V to make compilable w/o options SUN4V.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sparc64/sparc64/cache.h
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/sparc64/sparc64/cpu.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/sparc64/sparc64/ipifuncs.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/sparc64/sparc64/cache.h
diff -u src/sys/arch/sparc64/sparc64/cache.h:1.24 src/sys/arch/sparc64/sparc64/cache.h:1.25
--- src/sys/arch/sparc64/sparc64/cache.h:1.24 Tue Nov 4 18:11:42 2014
+++ src/sys/arch/sparc64/sparc64/cache.h Wed Nov 5 13:30:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cache.h,v 1.24 2014/11/04 18:11:42 palle Exp $ */
+/* $NetBSD: cache.h,v 1.25 2014/11/05 13:30:11 nakayama Exp $ */
/*
* Copyright (c) 2011 Matthew R. Green
@@ -82,9 +82,7 @@
*/
#include
-#ifdef SUN4V
#include
-#endif
/* Various cache size/line sizes */
extern int ecache_min_line_size;
@@ -120,7 +118,6 @@ void sp_tlb_flush_pte_usiii(vaddr_t, int
void sp_tlb_flush_all_us(void);
void sp_tlb_flush_all_usiii(void);
-#ifdef SUN4V
static __inline__ void
sp_tlb_flush_pte_sun4v(vaddr_t va, int ctx)
{
@@ -129,7 +126,6 @@ sp_tlb_flush_pte_sun4v(vaddr_t va, int c
if ( hv_rc != H_EOK )
panic("hv_mmu_demap_page(%p,%d) failed - rc = %" PRIx64 "\n", (void*)va, ctx, hv_rc);
}
-#endif
static __inline__ void
sp_tlb_flush_pte(vaddr_t va, int ctx)
Index: src/sys/arch/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.119 src/sys/arch/sparc64/sparc64/cpu.c:1.120
--- src/sys/arch/sparc64/sparc64/cpu.c:1.119 Tue Nov 4 18:11:42 2014
+++ src/sys/arch/sparc64/sparc64/cpu.c Wed Nov 5 13:30:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.119 2014/11/04 18:11:42 palle Exp $ */
+/* $NetBSD: cpu.c,v 1.120 2014/11/05 13:30:11 nakayama Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.119 2014/11/04 18:11:42 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.120 2014/11/05 13:30:11 nakayama Exp $");
#include "opt_multiprocessor.h"
@@ -74,14 +74,10 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.11
#include
#include
-#ifdef SUN4V
#include
-#endif
-#ifdef SUN4V
#define SUN4V_MONDO_QUEUE_SIZE 32
#define SUN4V_QUEUE_ENTRY_SIZE 64
-#endif
int ecache_min_line_size;
Index: src/sys/arch/sparc64/sparc64/ipifuncs.c
diff -u src/sys/arch/sparc64/sparc64/ipifuncs.c:1.52 src/sys/arch/sparc64/sparc64/ipifuncs.c:1.53
--- src/sys/arch/sparc64/sparc64/ipifuncs.c:1.52 Tue Nov 4 18:11:42 2014
+++ src/sys/arch/sparc64/sparc64/ipifuncs.c Wed Nov 5 13:30:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ipifuncs.c,v 1.52 2014/11/04 18:11:42 palle Exp $ */
+/* $NetBSD: ipifuncs.c,v 1.53 2014/11/05 13:30:11 nakayama Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.52 2014/11/04 18:11:42 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.53 2014/11/05 13:30:11 nakayama Exp $");
#include "opt_ddb.h"
@@ -53,9 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v
#endif
#endif
-#ifdef SUN4V
#define SPARC64_IPI_RETRIES 1
-#endif
/* CPU sets containing halted, paused and resumed cpus */
static volatile sparc64_cpuset_t cpus_halted;
@@ -69,9 +67,7 @@ static void sparc64_ipi_error(const char
/* Send IPI functions for supported platforms */
static void sparc64_send_ipi_sun4u(int, ipifunc_t, uint64_t, uint64_t);
-#ifdef SUN4V
static void sparc64_send_ipi_sun4v(int, ipifunc_t, uint64_t, uint64_t);
-#endif
/*
* These are the "function" entry points in locore.s/mp_subr.s to handle IPI's.
@@ -80,14 +76,10 @@ void sparc64_ipi_halt(void *, void *);
void sparc64_ipi_pause(void *, void *);
void sparc64_ipi_flush_pte_us(void *, void *);
void sparc64_ipi_flush_pte_usiii(void *, void *);
-#ifdef SUN4V
void sparc64_ipi_flush_pte_sun4v(void *, void *);
-#endif
void sparc64_ipi_dcache_flush_page_us(void *, void *);
void sparc64_ipi_dcache_flush_page_usiii(void *, void *);
-#ifdef SUN4V
void sparc64_ipi_dcache_flush_page_sun4v(void *, void *);
-#endif
void sparc64_ipi_blast_dcache(void *, void *);
void sparc64_ipi_ccall(void *, void *);
@@ -289,7 +281,6 @@ sparc64_send_ipi_sun4u(int upaid, ipifun
" (tried %d times)", cpu_number(), upaid, i);
}
-#ifdef SUN4V
/*
* Send an interprocessor interrupt - sun4v.
*/
@@ -314,7 +305,6 @@ sparc64_send_ipi_sun4v(int cpuid, ipifun
panic("Unable to send mondo %lx to cpu %d: %d",
(long unsigned int)func, cpuid, err);
}
-#endif
/*
* Wait for IPI operation to complete.
CVS commit: [netbsd-5] src/doc
Module Name:src
Committed By: sborrill
Date: Wed Nov 5 13:11:32 UTC 2014
Modified Files:
src/doc [netbsd-5]: CHANGES-5.3
Log Message:
Ticket #1930
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.75 -r1.1.2.76 src/doc/CHANGES-5.3
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-5.3
diff -u src/doc/CHANGES-5.3:1.1.2.75 src/doc/CHANGES-5.3:1.1.2.76
--- src/doc/CHANGES-5.3:1.1.2.75 Mon Nov 3 18:50:31 2014
+++ src/doc/CHANGES-5.3 Wed Nov 5 13:11:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.3,v 1.1.2.75 2014/11/03 18:50:31 msaitoh Exp $
+# $NetBSD: CHANGES-5.3,v 1.1.2.76 2014/11/05 13:11:32 sborrill Exp $
A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3
release:
@@ -1117,3 +1117,16 @@ usr.sbin/ypbind/ypbind.c 1.63-1.98
disk, spams syslogd when the server goes down, or gets confused about
its binding state. Fixes PR#15355, PR#32519 and also PR#43900.
[dholland, ticket #1925]
+
+distrib/common/Makefile.bootcd 1.20 via patch
+distrib/notes/arc/prep1.3 via patch
+distrib/notes/cats/prep1.12 via patch
+distrib/notes/common/main 1.512 via patch
+distrib/notes/macppc/prep.OPENFIRMWARE 1.16 via patch
+share/man/man7/release.7 1.33-1.36 via patch
+
+ Install fully-populated .iso images in ${RELEASEDIR}/images
+ instead of ${RELEASEDIR}/iso. Update documentation to reflect
+ this.
+ [snj, ticket #1930]
+
CVS commit: [netbsd-5] src
Module Name:src
Committed By: sborrill
Date: Wed Nov 5 13:11:12 UTC 2014
Modified Files:
src/distrib/common [netbsd-5]: Makefile.bootcd
src/distrib/notes/arc [netbsd-5]: prep
src/distrib/notes/cats [netbsd-5]: prep
src/distrib/notes/common [netbsd-5]: main
src/distrib/notes/macppc [netbsd-5]: prep.OPENFIRMWARE
src/share/man/man7 [netbsd-5]: release.7
Log Message:
Apply patch (requested by snj in ticket 1930):
Install fully-populated .iso images in ${RELEASEDIR}/images instead
of ${RELEASEDIR}/iso
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.1 -r1.14.2.2 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.1.6.1 -r1.1.6.2 src/distrib/notes/arc/prep
cvs rdiff -u -r1.10.2.1 -r1.10.2.2 src/distrib/notes/cats/prep
cvs rdiff -u -r1.425.2.16 -r1.425.2.17 src/distrib/notes/common/main
cvs rdiff -u -r1.11.2.2 -r1.11.2.3 src/distrib/notes/macppc/prep.OPENFIRMWARE
cvs rdiff -u -r1.25.4.1 -r1.25.4.2 src/share/man/man7/release.7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.14.2.1 src/distrib/common/Makefile.bootcd:1.14.2.2
--- src/distrib/common/Makefile.bootcd:1.14.2.1 Sat Dec 6 21:30:03 2008
+++ src/distrib/common/Makefile.bootcd Wed Nov 5 13:11:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.14.2.1 2008/12/06 21:30:03 snj Exp $
+# $NetBSD: Makefile.bootcd,v 1.14.2.2 2014/11/05 13:11:12 sborrill Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -42,7 +42,7 @@ CDSOURCE?= false
.if ${CDRELEASE} == false
CDROMS_RELEASEDIR?= ${MACHINE}/installation/cdrom
.else
-CDROMS_RELEASEDIR?= iso
+CDROMS_RELEASEDIR?= images
.endif
.if defined(CDRELEASE_NOISOS)
CDRELEASE_EXCLUDE= -s ',./installation/cdrom.*,,gp'
Index: src/distrib/notes/arc/prep
diff -u src/distrib/notes/arc/prep:1.1.6.1 src/distrib/notes/arc/prep:1.1.6.2
--- src/distrib/notes/arc/prep:1.1.6.1 Sat Apr 25 23:16:33 2009
+++ src/distrib/notes/arc/prep Wed Nov 5 13:11:12 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep,v 1.1.6.1 2009/04/25 23:16:33 snj Exp $
+.\" $NetBSD: prep,v 1.1.6.2 2014/11/05 13:11:12 sborrill Exp $
.
First and foremost, before beginning the installation process,
.Em make sure you have a reliable backup
@@ -40,7 +40,7 @@ install kernel onto a CD-R.
Go to one of the
.Nx
mirror sites and download CD-R image from the
-.Pa pub/NetBSD/iso
+.Pa pub/NetBSD/images
directory.
.Lk http://www.NetBSD.org/mirrors/#iso
.Pp
Index: src/distrib/notes/cats/prep
diff -u src/distrib/notes/cats/prep:1.10.2.1 src/distrib/notes/cats/prep:1.10.2.2
--- src/distrib/notes/cats/prep:1.10.2.1 Sat Apr 25 23:16:33 2009
+++ src/distrib/notes/cats/prep Wed Nov 5 13:11:12 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep,v 1.10.2.1 2009/04/25 23:16:33 snj Exp $
+.\" $NetBSD: prep,v 1.10.2.2 2014/11/05 13:11:12 sborrill Exp $
.
A \*M machine usually needs little or no preparation before installing
.Nx ,
@@ -36,7 +36,7 @@ install kernel onto a CD-R.
Go to one of the
.Nx
mirror sites and download CD-R image from the
-.Pa pub/NetBSD/iso
+.Pa pub/NetBSD/images
directory.
.Lk http://www.NetBSD.org/mirrors/#iso
.Pp
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.425.2.16 src/distrib/notes/common/main:1.425.2.17
--- src/distrib/notes/common/main:1.425.2.16 Tue Nov 27 18:12:23 2012
+++ src/distrib/notes/common/main Wed Nov 5 13:11:12 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.425.2.16 2012/11/27 18:12:23 riz Exp $
+.\" $NetBSD: main,v 1.425.2.17 2014/11/05 13:11:12 sborrill Exp $
.\"
.\" Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -118,7 +118,7 @@ Option 1: bootable CD-ROM images contain
.Pp
These can be found
on an FTP site near you, usually located in the
-.Pa /pub/NetBSD/iso/
+.Pa /pub/NetBSD/images/
directory.
Check the NetBSD website for details.
.Pp
Index: src/distrib/notes/macppc/prep.OPENFIRMWARE
diff -u src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.2 src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.3
--- src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.2 Fri Nov 5 07:29:48 2010
+++ src/distrib/notes/macppc/prep.OPENFIRMWARE Wed Nov 5 13:11:12 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep.OPENFIRMWARE,v 1.11.2.2 2010/11/05 07:29:48 snj Exp $
+.\" $NetBSD: prep.OPENFIRMWARE,v 1.11.2.3 2014/11/05 13:11:12 sborrill Exp $
.if \*[OF_VERSION_3] \{\
.
.Ss2 Updating your BootROM
@@ -1177,7 +1177,7 @@ Go to one of the
mirror sites and download the CD-R image
.Pa macppccd-\*V.iso
from the
-.Pa pub/NetBSD/iso
+.Pa pub/NetBSD/images
directory.
.Lk http://www.NetBSD.org/mirrors/#iso
.Pp
Index: src/share/man/man7/release.7
diff -u src/share/man/man7/release.7:1.25.4.1 src/share/man/man7/release.7:1.25.4.2
--- src/share/man/man7/release.7:1.25.4.1 Sun Oct 4 11:48:39 2009
+++ src/share/man/man7/release.7 Wed Nov 5 13:11:12 2014
@@ -1,4
CVS commit: src/lib/librumpuser
Module Name:src Committed By: justin Date: Wed Nov 5 12:28:47 UTC 2014 Modified Files: src/lib/librumpuser: rumpuser_port.h Log Message: Add some prototypes for Android rump kernel builds See buildrump.sh #70, some Android versins are missing prototypes for these libc functions To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/lib/librumpuser/rumpuser_port.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librumpuser/rumpuser_port.h diff -u src/lib/librumpuser/rumpuser_port.h:1.39 src/lib/librumpuser/rumpuser_port.h:1.40 --- src/lib/librumpuser/rumpuser_port.h:1.39 Wed Nov 5 01:37:27 2014 +++ src/lib/librumpuser/rumpuser_port.h Wed Nov 5 12:28:46 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser_port.h,v 1.39 2014/11/05 01:37:27 pooka Exp $ */ +/* $NetBSD: rumpuser_port.h,v 1.40 2014/11/05 12:28:46 justin Exp $ */ #ifndef _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_ #define _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_ @@ -92,12 +92,20 @@ getsubopt(char **optionp, char * const * } #endif +#if !defined(HAVE_CLOCKID_T) +typedef int clockid_t; +#endif + #ifdef __ANDROID__ #include typedef uint16_t in_port_t; #include #define atomic_inc_uint(x) __sync_fetch_and_add(x, 1) #define atomic_dec_uint(x) __sync_fetch_and_sub(x, 1) +#include +int clock_nanosleep (clockid_t, int, const struct timespec *, struct timespec *); +#include +void arc4random_buf(void*, size_t); #endif /* sunny magic */ @@ -108,10 +116,6 @@ typedef uint16_t in_port_t; # endif #endif -#if !defined(HAVE_CLOCKID_T) -typedef int clockid_t; -#endif - #if !defined(HAVE_CLOCK_GETTIME) #include #define CLOCK_REALTIME 0
CVS commit: [netbsd-5] src/usr.sbin/ypbind
Module Name:src
Committed By: msaitoh
Date: Wed Nov 5 09:59:25 UTC 2014
Modified Files:
src/usr.sbin/ypbind [netbsd-5]: ypbind.c
Log Message:
Fix compile error (s/__printf/__printf__/).
To generate a diff of this commit:
cvs rdiff -u -r1.57.18.2 -r1.57.18.3 src/usr.sbin/ypbind/ypbind.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/ypbind/ypbind.c
diff -u src/usr.sbin/ypbind/ypbind.c:1.57.18.2 src/usr.sbin/ypbind/ypbind.c:1.57.18.3
--- src/usr.sbin/ypbind/ypbind.c:1.57.18.2 Mon Nov 3 18:48:42 2014
+++ src/usr.sbin/ypbind/ypbind.c Wed Nov 5 09:59:25 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ypbind.c,v 1.57.18.2 2014/11/03 18:48:42 msaitoh Exp $ */
+/* $NetBSD: ypbind.c,v 1.57.18.3 2014/11/05 09:59:25 msaitoh Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt
@@ -28,7 +28,7 @@
#include
#ifndef LINT
-__RCSID("$NetBSD: ypbind.c,v 1.57.18.2 2014/11/03 18:48:42 msaitoh Exp $");
+__RCSID("$NetBSD: ypbind.c,v 1.57.18.3 2014/11/05 09:59:25 msaitoh Exp $");
#endif
#include
@@ -202,7 +202,7 @@ static int debug;
#define DPRINTF(...)
#endif
-static void yp_log(int, const char *, ...) __attribute__((__format__(__printf, 2, 3)));
+static void yp_log(int, const char *, ...) __attribute__((__format__(__printf__, 2, 3)));
/*
* Log some stuff, to syslog or stderr depending on the debug setting.
CVS commit: src/sbin/dkctl
Module Name:src Committed By: wiz Date: Wed Nov 5 09:26:26 UTC 2014 Modified Files: src/sbin/dkctl: dkctl.8 Log Message: New sentence, new line. Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sbin/dkctl/dkctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/dkctl/dkctl.8 diff -u src/sbin/dkctl/dkctl.8:1.24 src/sbin/dkctl/dkctl.8:1.25 --- src/sbin/dkctl/dkctl.8:1.24 Tue Nov 4 08:00:44 2014 +++ src/sbin/dkctl/dkctl.8 Wed Nov 5 09:26:26 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: dkctl.8,v 1.24 2014/11/04 08:00:44 mlelstv Exp $ +.\" $NetBSD: dkctl.8,v 1.25 2014/11/05 09:26:26 wiz Exp $ .\" .\" Copyright 2002 Wasabi Systems, Inc. .\" All rights reserved. @@ -33,7 +33,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd January 5, 2011 +.Dd November 4, 2014 .Dt DKCTL 8 .Os .Sh NAME @@ -167,9 +167,10 @@ in this case is the wedge name. List all of the wedges configured on the specified disk. .It Ic makewedges Delete all wedges configured on the specified disk, and autodiscover -the wedges again. Wedges that are in use are not deleted and conflicting -or overlapping wedges are not created. You need to list wedges -to find out what has changed. +the wedges again. +Wedges that are in use are not deleted and conflicting +or overlapping wedges are not created. +You need to list wedges to find out what has changed. .It Ic strategy Op Ar name Get and set the disk I/O scheduler (buffer queue strategy) on the drive.
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Wed Nov 5 09:13:16 UTC 2014 Modified Files: src/sys/arch/arm/arm32: pmap.c Log Message: Fix typo in comment To generate a diff of this commit: cvs rdiff -u -r1.308 -r1.309 src/sys/arch/arm/arm32/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm32/pmap.c diff -u src/sys/arch/arm/arm32/pmap.c:1.308 src/sys/arch/arm/arm32/pmap.c:1.309 --- src/sys/arch/arm/arm32/pmap.c:1.308 Tue Nov 4 23:58:21 2014 +++ src/sys/arch/arm/arm32/pmap.c Wed Nov 5 09:13:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.308 2014/11/04 23:58:21 matt Exp $ */ +/* $NetBSD: pmap.c,v 1.309 2014/11/05 09:13:16 skrll Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -215,7 +215,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.308 2014/11/04 23:58:21 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.309 2014/11/05 09:13:16 skrll Exp $"); //#define PMAP_DEBUG #ifdef PMAP_DEBUG @@ -2540,7 +2540,7 @@ pmap_clearbit(struct vm_page_md *md, pad * * This is a local function used to work out the best strategy to clean * a single page referenced by its entry in the PV table. It's used by - * pmap_copy_page, pmap_zero page and maybe some others later on. + * pmap_copy_page, pmap_zero_page and maybe some others later on. * * Its policy is effectively: * o If there are no mappings, we don't bother doing anything with the cache.
CVS commit: src
Module Name:src
Committed By: snj
Date: Wed Nov 5 08:19:17 UTC 2014
Modified Files:
src: Makefile build.sh
Log Message:
iso -> images
To generate a diff of this commit:
cvs rdiff -u -r1.310 -r1.311 src/Makefile
cvs rdiff -u -r1.298 -r1.299 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.310 src/Makefile:1.311
--- src/Makefile:1.310 Mon Aug 18 07:52:40 2014
+++ src/Makefile Wed Nov 5 08:19:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.310 2014/08/18 07:52:40 plunky Exp $
+# $NetBSD: Makefile,v 1.311 2014/11/05 08:19:17 snj Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -64,11 +64,11 @@
# Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
# from ${DESTDIR}
# iso-image:
-# Create CD-ROM image in RELEASEDIR/iso.
+# Create CD-ROM image in RELEASEDIR/images.
# RELEASEDIR must already have been populated by `make release'
# or equivalent.
# iso-image-source:
-# Create CD-ROM image with source in RELEASEDIR/iso.
+# Create CD-ROM image with source in RELEASEDIR/images.
# RELEASEDIR must already have been populated by
# `make release sourcesets' or equivalent.
# live-image:
Index: src/build.sh
diff -u src/build.sh:1.298 src/build.sh:1.299
--- src/build.sh:1.298 Tue Sep 30 14:57:51 2014
+++ src/build.sh Wed Nov 5 08:19:17 2014
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.298 2014/09/30 14:57:51 apb Exp $
+# $NetBSD: build.sh,v 1.299 2014/11/05 08:19:17 snj Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1037,8 +1037,8 @@ Usage: ${progname} [-EhnorUuxy] [-a arch
sourcesets Create source sets in RELEASEDIR/source/sets.
syspkgs Create syspkgs in
RELEASEDIR/RELEASEMACHINEDIR/binary/syspkgs.
-iso-image Create CD-ROM image in RELEASEDIR/iso.
-iso-image-sourceCreate CD-ROM image with source in RELEASEDIR/iso.
+iso-image Create CD-ROM image in RELEASEDIR/images.
+iso-image-sourceCreate CD-ROM image with source in RELEASEDIR/images.
live-image Create bootable live image in
RELEASEDIR/RELEASEMACHINEDIR/installation/liveimage.
install-image Create bootable installation image in
@@ -1870,7 +1870,7 @@ createmakewrapper()
eval cat <
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Wed Nov 5 08:16:56 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: CUBIETRUCK Log Message: Enable MULTIPROCESSOR To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/CUBIETRUCK 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/conf/CUBIETRUCK diff -u src/sys/arch/evbarm/conf/CUBIETRUCK:1.4 src/sys/arch/evbarm/conf/CUBIETRUCK:1.5 --- src/sys/arch/evbarm/conf/CUBIETRUCK:1.4 Fri Oct 24 10:59:45 2014 +++ src/sys/arch/evbarm/conf/CUBIETRUCK Wed Nov 5 08:16:56 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CUBIETRUCK,v 1.4 2014/10/24 10:59:45 jmcneill Exp $ +# $NetBSD: CUBIETRUCK,v 1.5 2014/11/05 08:16:56 martin Exp $ # # CUBIETRUCK - Cubieboard3 (mostly cubieboard2 with 2GB) # @@ -28,9 +28,6 @@ makeoptions CPUFLAGS="-mcpu=cortex-a7 -m # options PMAP_NEED_ALLOC_POOLPAGE -# -# not fully working yet -# -# options MULTIPROCESSOR -# cpu* at mainbus? -# options VERBOSE_INIT_ARM # verbose bootstraping messages +options MULTIPROCESSOR +cpu* at mainbus? +#options VERBOSE_INIT_ARM # verbose bootstraping messages
CVS commit: src
Module Name:src Committed By: snj Date: Wed Nov 5 08:16:33 UTC 2014 Modified Files: src: BUILDING Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 src/BUILDING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.109 src/BUILDING:1.110 --- src/BUILDING:1.109 Thu Aug 7 21:46:43 2014 +++ src/BUILDING Wed Nov 5 08:16:33 2014 @@ -632,8 +632,8 @@ BUILDING set (see above). iso-image Create a NetBSD installation CD-ROM image in the - RELEASEDIR/iso directory. The CD-ROM file system will have - a layout as described in release(7). + RELEASEDIR/images directory. The CD-ROM file system will + have a layout as described in release(7). For most machine types, the CD-ROM will be bootable, and will automatically run the sysinst(8) menu-based @@ -649,8 +649,8 @@ BUILDING the RELEASEDIR/RELEASEMACHINEDIR/installation/cdrom directory by ``make release''. These smaller images usually contain the same tools as the larger images in - RELEASEDIR/iso, but do not contain additional content such - as the distribution sets. + RELEASEDIR/images, but do not contain additional content + such as the distribution sets. Note that the mac68k port still uses an older method of creating CD-ROM images. This requires the mkisofs(1) @@ -659,8 +659,8 @@ BUILDING iso-image-source Create a NetBSD installation CD-ROM image in the - RELEASEDIR/iso directory. The CD-ROM file system will have - a layout as described in release(7). It will have top + RELEASEDIR/images directory. The CD-ROM file system will + have a layout as described in release(7). It will have top level directories for the machine type and source. For most machine types, the CD-ROM will be bootable, and @@ -678,8 +678,8 @@ BUILDING the RELEASEDIR/RELEASEMACHINEDIR/installation/cdrom directory by ``make release''. These smaller images usually contain the same tools as the larger images in - RELEASEDIR/iso, but do not contain additional content such - as the distribution sets. + RELEASEDIR/images, but do not contain additional content + such as the distribution sets. Note that the mac68k port still uses an older method of creating CD-ROM images. This requires the mkisofs(1)
CVS commit: src/doc
Module Name:src Committed By: snj Date: Wed Nov 5 08:15:05 UTC 2014 Modified Files: src/doc: BUILDING.mdoc Log Message: sync with reality: iso -> images To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.104 src/doc/BUILDING.mdoc:1.105 --- src/doc/BUILDING.mdoc:1.104 Thu Aug 7 21:45:27 2014 +++ src/doc/BUILDING.mdoc Wed Nov 5 08:15:04 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: BUILDING.mdoc,v 1.104 2014/08/07 21:45:27 apb Exp $ +.\" $NetBSD: BUILDING.mdoc,v 1.105 2014/11/05 08:15:04 snj Exp $ .\" .\" Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -1146,7 +1146,7 @@ be set (see above). Create a .Nx installation CD-ROM image in the -.Sy RELEASEDIR Ns Pa /iso +.Sy RELEASEDIR Ns Pa /images directory. The CD-ROM file system will have a layout as described in .Xr release 7 . @@ -1173,7 +1173,7 @@ Note that other, smaller, CD-ROM images directory by .Dq "make release" . These smaller images usually contain the same tools as the larger images in -.Sy RELEASEDIR Ns Pa /iso , +.Sy RELEASEDIR Ns Pa /images , but do not contain additional content such as the distribution sets. .Pp Note that the mac68k port still uses an older method of creating @@ -1189,7 +1189,7 @@ but which can be installed from Create a .Nx installation CD-ROM image in the -.Sy RELEASEDIR Ns Pa /iso +.Sy RELEASEDIR Ns Pa /images directory. The CD-ROM file system will have a layout as described in .Xr release 7 . @@ -1217,7 +1217,7 @@ Note that other, smaller, CD-ROM images directory by .Dq make release . These smaller images usually contain the same tools as the larger images in -.Sy RELEASEDIR Ns Pa /iso , +.Sy RELEASEDIR Ns Pa /images , but do not contain additional content such as the distribution sets. .Pp Note that the mac68k port still uses an older method of creating
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Wed Nov 5 08:11:35 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: BPI Log Message: Enable MULTIPROCESSOR To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/BPI 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/conf/BPI diff -u src/sys/arch/evbarm/conf/BPI:1.7 src/sys/arch/evbarm/conf/BPI:1.8 --- src/sys/arch/evbarm/conf/BPI:1.7 Fri Oct 24 10:59:24 2014 +++ src/sys/arch/evbarm/conf/BPI Wed Nov 5 08:11:35 2014 @@ -1,5 +1,5 @@ # -# $NetBSD: BPI,v 1.7 2014/10/24 10:59:24 jmcneill Exp $ +# $NetBSD: BPI,v 1.8 2014/11/05 08:11:35 skrll Exp $ # # BPI -- Banana Pi - an Allwinner A20 Eval Board Kernel # @@ -26,7 +26,7 @@ options CPU_CORTEXA7 options ALLWINNER_A20 options PMAPCOUNTERS options AWIN_CONSOLE_EARLY -#options MULTIPROCESSOR +options MULTIPROCESSOR # Architecture options
