CVS commit: src/sys/dev
Module Name:src
Committed By: christos
Date: Wed Mar 11 16:00:55 UTC 2015
Modified Files:
src/sys/dev: lockstat.c
Log Message:
add coverity annotations (variable is volatile so it might have side effects)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/lockstat.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/lockstat.c
diff -u src/sys/dev/lockstat.c:1.21 src/sys/dev/lockstat.c:1.22
--- src/sys/dev/lockstat.c:1.21 Sun Mar 8 21:41:41 2015
+++ src/sys/dev/lockstat.c Wed Mar 11 12:00:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lockstat.c,v 1.21 2015/03/09 01:41:41 christos Exp $ */
+/* $NetBSD: lockstat.c,v 1.22 2015/03/11 16:00:54 christos Exp $ */
/*-
* Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lockstat.c,v 1.21 2015/03/09 01:41:41 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: lockstat.c,v 1.22 2015/03/11 16:00:54 christos Exp $);
#include sys/types.h
#include sys/param.h
@@ -166,6 +166,7 @@ lockstat_init_tables(lsenable_t *le)
lscpu_t *lc;
lsbuf_t *lb;
+ /* coverity[assert_side_effect] */
KASSERT(!lockstat_dev_enabled);
for (CPU_INFO_FOREACH(cii, ci)) {
@@ -211,6 +212,7 @@ void
lockstat_start(lsenable_t *le)
{
+ /* coverity[assert_side_effect] */
KASSERT(!lockstat_dev_enabled);
lockstat_init_tables(le);
@@ -249,6 +251,7 @@ lockstat_stop(lsdisable_t *ld)
int error;
lwp_t *l;
+ /* coverity[assert_side_effect] */
KASSERT(lockstat_dev_enabled);
/*
@@ -315,6 +318,7 @@ lockstat_alloc(lsenable_t *le)
lsbuf_t *lb;
size_t sz;
+ /* coverity[assert_side_effect] */
KASSERT(!lockstat_dev_enabled);
lockstat_free();
@@ -324,6 +328,7 @@ lockstat_alloc(lsenable_t *le)
if (lb == NULL)
return (ENOMEM);
+ /* coverity[assert_side_effect] */
KASSERT(!lockstat_dev_enabled);
KASSERT(lockstat_baseb == NULL);
lockstat_sizeb = sz;
@@ -339,6 +344,7 @@ void
lockstat_free(void)
{
+ /* coverity[assert_side_effect] */
KASSERT(!lockstat_dev_enabled);
if (lockstat_baseb != NULL) {
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Wed Mar 11 20:27:04 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 58[12] To generate a diff of this commit: cvs rdiff -u -r1.1.2.225 -r1.1.2.226 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.225 src/doc/CHANGES-7.0:1.1.2.226 --- src/doc/CHANGES-7.0:1.1.2.225 Wed Mar 11 07:26:20 2015 +++ src/doc/CHANGES-7.0 Wed Mar 11 20:27:04 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.225 2015/03/11 07:26:20 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.226 2015/03/11 20:27:04 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -18476,3 +18476,40 @@ xsrc/external/mit/xfs/include/config.h - Update xfs to 1.1.4 [mrg, ticket #585] +external/broadcom/rpi-firmware/dist/bootcode.bin 1.7 +external/broadcom/rpi-firmware/dist/fixup.dat 1.7 +external/broadcom/rpi-firmware/dist/fixup_cd.dat 1.7 +external/broadcom/rpi-firmware/dist/start.elf 1.7 +external/broadcom/rpi-firmware/dist/start_cd.elf 1.7 + + Update RPI firmware to add RPI2 support. + [skrll, ticket #581] + +distrib/utils/embedded/conf/rpi.conf 1.27 +etc/etc.evbarm/Makefile.inc 1.70 +sys/arch/arm/broadcom/bcm2835_intr.c 1.5-1.7 +sys/arch/arm/broadcom/bcm2835_obio.c 1.23, 1.24 +sys/arch/arm/broadcom/bcm2835_space.c 1.8 +sys/arch/arm/broadcom/bcm2835reg.h 1.14 +sys/arch/arm/broadcom/bcm2835var.h 1.2 +sys/arch/arm/broadcom/files.bcm2835 1.24 +sys/arch/arm/cortex/a9_mpsubr.S 1.30 +sys/arch/arm/cortex/armperiph.c 1.8, 1.9 +sys/arch/arm/cortex/gtmr.c 1.9 +sys/arch/arm/cortex/gtmr_var.h 1.5 +sys/arch/arm/cortex/mpcore_var.h 1.3 +sys/arch/arm/include/cpu.h 1.84 +sys/arch/evbarm/conf/RPI2 1.1, 1.2 +sys/arch/evbarm/conf/RPI2_INSTALL 1.1 +sys/arch/evbarm/conf/RPI 1.59, 1.60 +sys/arch/evbarm/conf/mk.rpi 1.4 +sys/arch/evbarm/conf/std.rpi 1.16-1.19 via patch +sys/arch/evbarm/rpi/genassym.cf 1.2 +sys/arch/evbarm/rpi/rpi.h 1.4 +sys/arch/evbarm/rpi/rpi2_start.S 1.1 +sys/arch/evbarm/rpi/rpi_machdep.c 1.57, 1.58 via patch +sys/arch/evbarm/rpi/rpi_start.S 1.13 + + Add support for RPI2. On + [skrll, ticket #582] +
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: jnemeth Date: Wed Mar 11 17:35:16 UTC 2015 Modified Files: src/usr.bin/calendar/calendars: calendar.birthday Log Message: note birth and death of Douglas Adams To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/usr.bin/calendar/calendars/calendar.birthday 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/calendar/calendars/calendar.birthday diff -u src/usr.bin/calendar/calendars/calendar.birthday:1.24 src/usr.bin/calendar/calendars/calendar.birthday:1.25 --- src/usr.bin/calendar/calendars/calendar.birthday:1.24 Sun Apr 14 08:03:15 2013 +++ src/usr.bin/calendar/calendars/calendar.birthday Wed Mar 11 17:35:16 2015 @@ -76,6 +76,7 @@ 03/08 Howard Aiken born, 1900 03/11 Robert Treat Paine born, 1737 03/11 Vannevar Bush born, 1890 +03/11 Douglas Adams born, 1952 03/12 Gustav Robert Kirchhoff born, 1824, physicist 03/14 Albert Einstein born, 1879 03/14 Casey Jones born, 1864 @@ -122,6 +123,7 @@ 05/09 Pinza died, 1957 05/10 Fred Astaire (Frederick Austerlitz) born in Omaha, Nebraska, 1899 05/11 Johnny Appleseed born, 1768 +05/11 Douglas Adams died, 2001 05/12 Florence Nightingale born in Florence, Italy, 1820 05/13 Arthur S. Sullivan born, 1842 05/15 Mike Oldfield born in Essex, England, 1953
CVS commit: [netbsd-7] src/external/broadcom/rpi-firmware/dist
Module Name:src Committed By: snj Date: Wed Mar 11 19:49:53 UTC 2015 Modified Files: src/external/broadcom/rpi-firmware/dist [netbsd-7]: bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf Log Message: Pull up following revision(s) (requested by skrll in ticket #581): external/broadcom/rpi-firmware/dist/bootcode.bin: revision 1.7 external/broadcom/rpi-firmware/dist/fixup.dat: revision 1.7 external/broadcom/rpi-firmware/dist/fixup_cd.dat: revision 1.7 external/broadcom/rpi-firmware/dist/start.elf: revision 1.7 external/broadcom/rpi-firmware/dist/start_cd.elf: revision 1.7 New RPI and RPI2 firmware from commit b0079452ebce0158ce31d259d251f83a833f23c5 Author: popcornmixpopcorn...@gmail.com Date: Tue Mar 3 15:49:57 2015 + To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.2.1 \ src/external/broadcom/rpi-firmware/dist/bootcode.bin \ src/external/broadcom/rpi-firmware/dist/fixup.dat \ src/external/broadcom/rpi-firmware/dist/fixup_cd.dat \ src/external/broadcom/rpi-firmware/dist/start.elf \ src/external/broadcom/rpi-firmware/dist/start_cd.elf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/broadcom/rpi-firmware/dist/bootcode.bin Binary files are different Index: src/external/broadcom/rpi-firmware/dist/fixup.dat Binary files are different Index: src/external/broadcom/rpi-firmware/dist/fixup_cd.dat Binary files are different Index: src/external/broadcom/rpi-firmware/dist/start.elf Binary files are different Index: src/external/broadcom/rpi-firmware/dist/start_cd.elf Binary files are different
CVS commit: [netbsd-7] xsrc/external/mit
Module Name:xsrc Committed By: snj Date: Wed Mar 11 07:19:49 UTC 2015 Modified Files: xsrc/external/mit/fontsproto/dist [netbsd-7]: ChangeLog Makefile.in aclocal.m4 config.guess config.sub configure configure.ac font.h fontproto.h fontstruct.h install-sh missing xsrc/external/mit/fontsproto/dist/specs [netbsd-7]: Makefile.am Makefile.in fsproto.xml xsrc/external/mit/libXfont/dist [netbsd-7]: ChangeLog Makefile.in README aclocal.m4 config.guess config.sub configure configure.ac missing xsrc/external/mit/libXfont/dist/doc [netbsd-7]: Makefile.in xsrc/external/mit/libXfont/dist/include/X11/fonts [netbsd-7]: fntfil.h fontmisc.h xsrc/external/mit/libXfont/dist/src [netbsd-7]: Makefile.am Makefile.in xsrc/external/mit/libXfont/dist/src/FreeType [netbsd-7]: Makefile.in ftfuncs.c xsrc/external/mit/libXfont/dist/src/bitmap [netbsd-7]: Makefile.am Makefile.in bitmap.c bitmapfunc.c bitscale.c xsrc/external/mit/libXfont/dist/src/builtins [netbsd-7]: Makefile.in builtin.h dir.c file.c fpe.c xsrc/external/mit/libXfont/dist/src/fc [netbsd-7]: Makefile.in fsconvert.c fserve.c fserve.h xsrc/external/mit/libXfont/dist/src/fontfile [netbsd-7]: Makefile.in catalogue.c dirfile.c fileio.c filewr.c fontfile.c renderers.c xsrc/external/mit/libXfont/dist/src/stubs [netbsd-7]: Makefile.am Makefile.in cauthgen.c csignal.c delfntcid.c errorf.c findoldfnt.c getcres.c getdefptsize.c getnewfntcid.c gettime.c initfshdl.c regfpefunc.c rmfshdl.c servclient.c setfntauth.c stfntcfnt.c stubs.h xsrc/external/mit/libXfont/dist/src/util [netbsd-7]: Makefile.in atom.c miscutil.c patcache.c xsrc/external/mit/libXfont/include [netbsd-7]: config.h xsrc/external/mit/xfs/dist [netbsd-7]: ChangeLog INSTALL Makefile.am Makefile.in aclocal.m4 config.guess config.h.in config.sub configure configure.ac depcomp install-sh missing xsrc/external/mit/xfs/dist/config [netbsd-7]: Makefile.in xsrc/external/mit/xfs/dist/difs [netbsd-7]: difsutils.c dispatch.c extensions.c fonts.c initfonts.c main.c resource.c xsrc/external/mit/xfs/dist/doc [netbsd-7]: Makefile.in xsrc/external/mit/xfs/dist/include [netbsd-7]: assert.h difs.h difsutils.h extentst.h fsresource.h misc.h xsrc/external/mit/xfs/dist/man [netbsd-7]: Makefile.in xfs.man xsrc/external/mit/xfs/dist/os [netbsd-7]: config.c connection.c error.c io.c osglue.c utils.c xfstrans.c xsrc/external/mit/xfs/include [netbsd-7]: config.h xsrc/external/mit/xtrans/dist [netbsd-7]: ChangeLog Xtrans.c Xtrans.h Xtransint.h Xtranslcl.c Xtranssock.c aclocal.m4 config.guess config.sub configure configure.ac xsrc/external/mit/xtrans/dist/doc [netbsd-7]: xtrans.xml Added Files: xsrc/external/mit/fontsproto/dist [netbsd-7]: compile docbook.am xsrc/external/mit/libXfont/dist/src/stubs [netbsd-7]: stubsinit.c xsrc/external/mit/xfs/dist [netbsd-7]: compile Removed Files: xsrc/external/mit/fontsproto/dist [netbsd-7]: autogen.sh mkinstalldirs xsrc/external/mit/libXfont/dist/src/stubs [netbsd-7]: fatalerror.c xsrc/external/mit/xtrans/dist [netbsd-7]: Xtransdnet.c Xtransos2.c Log Message: Pull up following revision(s) (requested by mrg in ticket #585): xsrc/external/mit/xtrans/dist/ChangeLog: up to revision 1.1.1.9 xsrc/external/mit/xtrans/dist/Xtrans.c: up to revision 1.1.1.8 xsrc/external/mit/xtrans/dist/Xtrans.h: up to revision 1.1.1.5 xsrc/external/mit/xtrans/dist/Xtransdnet.c: delete xsrc/external/mit/xtrans/dist/Xtransint.h: up to revision 1.1.1.7 xsrc/external/mit/xtrans/dist/Xtranslcl.c: up to revision 1.1.1.7 xsrc/external/mit/xtrans/dist/Xtransos2.c: delete xsrc/external/mit/xtrans/dist/Xtranssock.c: up to revision 1.1.1.9 xsrc/external/mit/xtrans/dist/aclocal.m4: up to revision 1.1.1.9 xsrc/external/mit/xtrans/dist/config.gues: up to revision 1.1.1.4 xsrc/external/mit/xtrans/dist/config.sub: up to revision 1.1.1.4 xsrc/external/mit/xtrans/dist/configure : up to revision 1.1.1.9 xsrc/external/mit/xtrans/dist/configure.a: up to revision 1.1.1.9 xsrc/external/mit/xtrans/dist/doc/xtrans.x: up to revision 1.1.1.4 xsrc/external/mit/fontsproto revision/dist/ChangeLog: up to 1.1.1.6 xsrc/external/mit/fontsproto revision/dist/Makefile.i: up to 1.1.1.6 xsrc/external/mit/fontsproto revision/dist/aclocal.m4: up to 1.1.1.6 xsrc/external/mit/fontsproto revision/dist/autogen.sh: delete xsrc/external/mit/fontsproto revision/dist/compile: up to 1.3
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Wed Mar 11 07:26:20 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 583-585 To generate a diff of this commit: cvs rdiff -u -r1.1.2.224 -r1.1.2.225 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.224 src/doc/CHANGES-7.0:1.1.2.225 --- src/doc/CHANGES-7.0:1.1.2.224 Mon Mar 9 17:46:33 2015 +++ src/doc/CHANGES-7.0 Wed Mar 11 07:26:20 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.224 2015/03/09 17:46:33 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.225 2015/03/11 07:26:20 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -18317,3 +18317,162 @@ sys/arch/i386/stand/Makefile.booters 1. architecture is amd64. Fixes PR port-i386/49725. [martin, ticket #579] +xsrc/external/mit/xsm/dist/auth.c 1.2, 1.3 +xsrc/external/mit/xsm/dist/choose.c 1.2, 1.3 +xsrc/external/mit/xsm/dist/lock.c 1.2, 1.3 +xsrc/external/mit/xsm/dist/remote.c 1.2, 1.3 +xsrc/external/mit/xsm/dist/restart.c 1.2, 1.3 +xsrc/external/mit/xsm/dist/saveutil.c 1.2, 1.3 + + Set close-on-exec for all fds opened. + [mrg, ticket #583] + +xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h 1.2 + + Fix cut-n-paste error in DRM_IOCTL_I915_GET_SPRITE_COLORKEY. + [mrg, ticket #584] + +distrib/sets/lists/xcomp/mi 1.157 +external/mit/xorg/include/xtrans/Makefile 1.4 +external/mit/xorg/lib/libXfont/Makefile 1.10 +xsrc/external/mit/xtrans/dist/ChangeLog up to 1.1.1.9 +xsrc/external/mit/xtrans/dist/Xtrans.c up to 1.1.1.8 +xsrc/external/mit/xtrans/dist/Xtrans.h up to 1.1.1.5 +xsrc/external/mit/xtrans/dist/Xtransdnet.c delete +xsrc/external/mit/xtrans/dist/Xtransint.h up to 1.1.1.7 +xsrc/external/mit/xtrans/dist/Xtranslcl.c up to 1.1.1.7 +xsrc/external/mit/xtrans/dist/Xtransos2.c delete +xsrc/external/mit/xtrans/dist/Xtranssock.c up to 1.1.1.9 +xsrc/external/mit/xtrans/dist/aclocal.m4 up to 1.1.1.9 +xsrc/external/mit/xtrans/dist/config.guess up to 1.1.1.4 +xsrc/external/mit/xtrans/dist/config.sub up to 1.1.1.4 +xsrc/external/mit/xtrans/dist/configure up to 1.1.1.9 +xsrc/external/mit/xtrans/dist/configure.ac up to 1.1.1.9 +xsrc/external/mit/xtrans/dist/doc/xtrans.xml up to 1.1.1.4 +xsrc/external/mit/fontsproto/dist/ChangeLog up to 1.1.1.6 +xsrc/external/mit/fontsproto/dist/Makefile.in up to 1.1.1.6 +xsrc/external/mit/fontsproto/dist/aclocal.m4 up to 1.1.1.6 +xsrc/external/mit/fontsproto/dist/autogen.sh delete +xsrc/external/mit/fontsproto/dist/compile up to 1.3 +xsrc/external/mit/fontsproto/dist/config.guess up to 1.1.1.4 +xsrc/external/mit/fontsproto/dist/config.sub up to 1.1.1.4 +xsrc/external/mit/fontsproto/dist/configure up to 1.1.1.6 +xsrc/external/mit/fontsproto/dist/configure.ac up to 1.1.1.6 +xsrc/external/mit/fontsproto/dist/docbook.am up to 1.3 +xsrc/external/mit/fontsproto/dist/font.h up to 1.1.1.5 +xsrc/external/mit/fontsproto/dist/fontproto.h up to 1.1.1.5 +xsrc/external/mit/fontsproto/dist/fontstruct.h up to 1.1.1.5 +xsrc/external/mit/fontsproto/dist/install-sh up to 1.1.1.6 +xsrc/external/mit/fontsproto/dist/missing up to 1.1.1.6 +xsrc/external/mit/fontsproto/dist/mkinstalldirs delete +xsrc/external/mit/fontsproto/dist/specs/Makefile.am up to 1.1.1.4 +xsrc/external/mit/fontsproto/dist/specs/Makefile.in up to 1.1.1.4 +xsrc/external/mit/fontsproto/dist/specs/fsproto.xml up to 1.1.1.4 +xsrc/external/mit/libXfont/dist/ChangeLog up to 1.1.1.8 +xsrc/external/mit/libXfont/dist/Makefile.in up to 1.1.1.7 +xsrc/external/mit/libXfont/dist/README up to 1.1.1.3 +xsrc/external/mit/libXfont/dist/aclocal.m4 up to 1.1.1.8 +xsrc/external/mit/libXfont/dist/config.guess up to 1.1.1.6 +xsrc/external/mit/libXfont/dist/config.sub up to 1.1.1.6 +xsrc/external/mit/libXfont/dist/configure up to 1.1.1.8 +xsrc/external/mit/libXfont/dist/configure.ac up to 1.1.1.8 +xsrc/external/mit/libXfont/dist/doc/Makefile.in up to 1.1.1.3 +xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfil.h up to 1.1.1.3 +xsrc/external/mit/libXfont/dist/include/X11/fonts/fontmisc.h up to 1.1.1.4 +xsrc/external/mit/libXfont/dist/missing up to 1.1.1.6 +xsrc/external/mit/libXfont/dist/src/FreeType/Makefile.in up to 1.1.1.7 +xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c up to 1.6 +xsrc/external/mit/libXfont/dist/src/Makefile.am up to 1.1.1.5 +xsrc/external/mit/libXfont/dist/src/Makefile.in up to 1.1.1.7 +xsrc/external/mit/libXfont/dist/src/bitmap/Makefile.am up to 1.1.1.4 +xsrc/external/mit/libXfont/dist/src/bitmap/Makefile.in up to 1.1.1.7 +xsrc/external/mit/libXfont/dist/src/bitmap/bitmap.c up to 1.1.1.3 +xsrc/external/mit/libXfont/dist/src/bitmap/bitmapfunc.c up to 1.1.1.4 +xsrc/external/mit/libXfont/dist/src/bitmap/bitscale.c up to 1.1.1.4 +xsrc/external/mit/libXfont/dist/src/builtins/Makefile.in up to 1.1.1.7
CVS commit: [netbsd-7] xsrc/external/mit/libdrm/dist/include/drm
Module Name:xsrc
Committed By: snj
Date: Wed Mar 11 06:26:44 UTC 2015
Modified Files:
xsrc/external/mit/libdrm/dist/include/drm [netbsd-7]: i915_drm.h
Log Message:
Pull up following revision(s) (requested by mrg in ticket #584):
external/mit/libdrm/dist/include/drm/i915_drm.h: revision 1.2
fix cut-n-paste error
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5.2.1 -r1.1.1.5.2.2 \
xsrc/external/mit/libdrm/dist/include/drm/i915_drm.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/libdrm/dist/include/drm/i915_drm.h
diff -u xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h:1.1.1.5.2.1 xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h:1.1.1.5.2.2
--- xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h:1.1.1.5.2.1 Tue Dec 23 01:16:57 2014
+++ xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h Wed Mar 11 06:26:44 2015
@@ -268,7 +268,7 @@ typedef struct _drm_i915_sarea {
#define DRM_IOCTL_I915_OVERLAY_PUT_IMAGE DRM_IOW(DRM_COMMAND_BASE + DRM_I915_OVERLAY_PUT_IMAGE, struct drm_intel_overlay_put_image)
#define DRM_IOCTL_I915_OVERLAY_ATTRS DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_OVERLAY_ATTRS, struct drm_intel_overlay_attrs)
#define DRM_IOCTL_I915_SET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
-#define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
+#define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
#define DRM_IOCTL_I915_GEM_WAIT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_WAIT, struct drm_i915_gem_wait)
#define DRM_IOCTL_I915_GEM_CONTEXT_CREATE DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_CREATE, struct drm_i915_gem_context_create)
#define DRM_IOCTL_I915_GEM_CONTEXT_DESTROY DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_DESTROY, struct drm_i915_gem_context_destroy)
CVS commit: [netbsd-7] xsrc/external/mit/xsm/dist
Module Name:xsrc
Committed By: snj
Date: Wed Mar 11 06:24:39 UTC 2015
Modified Files:
xsrc/external/mit/xsm/dist [netbsd-7]: auth.c choose.c lock.c remote.c
restart.c saveutil.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #583):
external/mit/xsm/dist/choose.c: revision 1.2, 1.3
external/mit/xsm/dist/saveutil.c: revision 1.2, 1.3
external/mit/xsm/dist/auth.c: revision 1.2, 1.3
external/mit/xsm/dist/lock.c: revision 1.2, 1.3
external/mit/xsm/dist/remote.c: revision 1.2, 1.3
external/mit/xsm/dist/restart.c: revision 1.2, 1.3
set close-on-exec for all fds opened...
--
Switch to the version of the close-on-exec patch that was committed upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 xsrc/external/mit/xsm/dist/auth.c \
xsrc/external/mit/xsm/dist/choose.c xsrc/external/mit/xsm/dist/lock.c \
xsrc/external/mit/xsm/dist/remote.c xsrc/external/mit/xsm/dist/restart.c \
xsrc/external/mit/xsm/dist/saveutil.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/xsm/dist/auth.c
diff -u xsrc/external/mit/xsm/dist/auth.c:1.1.1.3 xsrc/external/mit/xsm/dist/auth.c:1.1.1.3.4.1
--- xsrc/external/mit/xsm/dist/auth.c:1.1.1.3 Fri May 31 07:51:30 2013
+++ xsrc/external/mit/xsm/dist/auth.c Wed Mar 11 06:24:39 2015
@@ -156,24 +156,28 @@ SetAuthentication(int count, IceListenOb
if (!(addfp = fopen (addAuthFile, w)))
goto bad;
+fcntl(fileno(addfp), F_SETFD, FD_CLOEXEC);
if ((remAuthFile = unique_filename (path, .xsm)) == NULL)
goto bad;
if (!(removefp = fopen (remAuthFile, w)))
goto bad;
+fcntl(fileno(removefp), F_SETFD, FD_CLOEXEC);
#else
if ((addAuthFile = unique_filename (path, .xsm, fd)) == NULL)
goto bad;
if (!(addfp = fdopen(fd, wb)))
goto bad;
+fcntl(fileno(addfp), F_SETFD, FD_CLOEXEC);
if ((remAuthFile = unique_filename (path, .xsm, fd)) == NULL)
goto bad;
if (!(removefp = fdopen(fd, wb)))
goto bad;
+fcntl(fileno(removefp), F_SETFD, FD_CLOEXEC);
#endif
if ((*authDataEntries = (IceAuthDataEntry *) XtMalloc (
Index: xsrc/external/mit/xsm/dist/choose.c
diff -u xsrc/external/mit/xsm/dist/choose.c:1.1.1.3 xsrc/external/mit/xsm/dist/choose.c:1.1.1.3.4.1
--- xsrc/external/mit/xsm/dist/choose.c:1.1.1.3 Fri May 31 07:51:31 2013
+++ xsrc/external/mit/xsm/dist/choose.c Wed Mar 11 06:24:39 2015
@@ -98,6 +98,8 @@ GetSessionNames(int *count_ret, String *
if ((dir = opendir (path)) == NULL)
return 0;
+fcntl(dirfd(dir), F_SETFD, FD_CLOEXEC);
+
count = 0;
while ((entry = readdir (dir)) != NULL)
Index: xsrc/external/mit/xsm/dist/lock.c
diff -u xsrc/external/mit/xsm/dist/lock.c:1.1.1.3 xsrc/external/mit/xsm/dist/lock.c:1.1.1.3.4.1
--- xsrc/external/mit/xsm/dist/lock.c:1.1.1.3 Fri May 31 07:51:30 2013
+++ xsrc/external/mit/xsm/dist/lock.c Wed Mar 11 06:24:39 2015
@@ -121,6 +121,7 @@ GetLockId(const char *session_name)
{
return (NULL);
}
+fcntl(fileno(fp), F_SETFD, FD_CLOEXEC);
buf[0] = '\0';
fscanf (fp, %255s\n, buf);
Index: xsrc/external/mit/xsm/dist/remote.c
diff -u xsrc/external/mit/xsm/dist/remote.c:1.1.1.3 xsrc/external/mit/xsm/dist/remote.c:1.1.1.3.4.1
--- xsrc/external/mit/xsm/dist/remote.c:1.1.1.3 Fri May 31 07:51:30 2013
+++ xsrc/external/mit/xsm/dist/remote.c Wed Mar 11 06:24:39 2015
@@ -111,7 +111,8 @@ remote_start(const char *restart_protoco
default: /* parent */
close (pipefd[0]);
- fp = (FILE *) fdopen (pipefd[1], w);
+ fcntl(pipefd[1], F_SETFD, FD_CLOEXEC);
+ fp = fdopen (pipefd[1], w);
fprintf (fp, CONTEXT X\n);
fprintf (fp, DIR %s\n, cwd);
Index: xsrc/external/mit/xsm/dist/restart.c
diff -u xsrc/external/mit/xsm/dist/restart.c:1.1.1.3 xsrc/external/mit/xsm/dist/restart.c:1.1.1.3.4.1
--- xsrc/external/mit/xsm/dist/restart.c:1.1.1.3 Fri May 31 07:51:30 2013
+++ xsrc/external/mit/xsm/dist/restart.c Wed Mar 11 06:24:39 2015
@@ -543,6 +543,7 @@ StartDefaultApps (void)
exit (1);
}
}
+fcntl(fileno(f), F_SETFD, FD_CLOEXEC);
buf = NULL;
buflen = 0;
Index: xsrc/external/mit/xsm/dist/saveutil.c
diff -u xsrc/external/mit/xsm/dist/saveutil.c:1.1.1.3 xsrc/external/mit/xsm/dist/saveutil.c:1.1.1.3.4.1
--- xsrc/external/mit/xsm/dist/saveutil.c:1.1.1.3 Fri May 31 07:51:30 2013
+++ xsrc/external/mit/xsm/dist/saveutil.c Wed Mar 11 06:24:39 2015
@@ -72,6 +72,7 @@ ReadSave(const char *session_name, char
*sm_id = NULL;
return 0;
}
+fcntl(fileno(f), F_SETFD, FD_CLOEXEC);
if (verbose)
printf(Reading session save file...\n);
@@ -319,6 +320,7 @@ WriteSave(const char *sm_id)
}
else
{
+ fcntl(fileno(f), F_SETFD, FD_CLOEXEC);
fprintf (f, %d\n, SAVEFILE_VERSION);
fprintf (f, %s\n, sm_id);
@@ -431,6 +433,7 @@ DeleteSession(const char *session_name)
CVS commit: src
Module Name:src Committed By: skrll Date: Wed Mar 11 08:50:32 UTC 2015 Modified Files: src: UPDATING Log Message: Add a note about recent arm openssl update. To generate a diff of this commit: cvs rdiff -u -r1.259 -r1.260 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/UPDATING diff -u src/UPDATING:1.259 src/UPDATING:1.260 --- src/UPDATING:1.259 Mon Oct 27 11:21:28 2014 +++ src/UPDATING Wed Mar 11 08:50:32 2015 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.259 2014/10/27 11:21:28 msaitoh Exp $ +$NetBSD: UPDATING,v 1.260 2015/03/11 08:50:32 skrll Exp $ This file (UPDATING) is intended to be a brief reference to recent changes that might cause problems in the build process, and a guide for @@ -19,6 +19,11 @@ See also: BUILDING, build.sh, Makefile. Recent changes: ^^^ +20150310: + Improvements to openssl for arm mean that update builds of + the openssl libraries will fail. A make cleandir in + external/bsd/openssl/lib is needed + 20141026: A mishap during the import of pppd may cause your corruption in your cvs directory if you happened to do a cvs update
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: wiz Date: Wed Mar 11 09:57:35 UTC 2015 Modified Files: src/lib/libc/stdlib: strtol.3 Log Message: Use existing month for Dd. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/lib/libc/stdlib/strtol.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/stdlib/strtol.3 diff -u src/lib/libc/stdlib/strtol.3:1.30 src/lib/libc/stdlib/strtol.3:1.31 --- src/lib/libc/stdlib/strtol.3:1.30 Tue Mar 10 13:00:58 2015 +++ src/lib/libc/stdlib/strtol.3 Wed Mar 11 09:57:35 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: strtol.3,v 1.30 2015/03/10 13:00:58 christos Exp $ +.\ $NetBSD: strtol.3,v 1.31 2015/03/11 09:57:35 wiz Exp $ .\ .\ Copyright (c) 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -33,7 +33,7 @@ .\ .\ from: @(#)strtol.3 8.1 (Berkeley) 6/4/93 .\ -.Dd Match 10, 2015 +.Dd March 10, 2015 .Dt STRTOL 3 .Os .Sh NAME
CVS commit: src/sys/arch/evbmips/ingenic
Module Name:src
Committed By: macallan
Date: Wed Mar 11 12:40:36 UTC 2015
Modified Files:
src/sys/arch/evbmips/ingenic: intr.c
Log Message:
add an event counter for clock interrupts
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/ingenic/intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/ingenic/intr.c
diff -u src/sys/arch/evbmips/ingenic/intr.c:1.6 src/sys/arch/evbmips/ingenic/intr.c:1.7
--- src/sys/arch/evbmips/ingenic/intr.c:1.6 Sat Mar 7 15:37:46 2015
+++ src/sys/arch/evbmips/ingenic/intr.c Wed Mar 11 12:40:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.6 2015/03/07 15:37:46 macallan Exp $ */
+/* $NetBSD: intr.c,v 1.7 2015/03/11 12:40:36 macallan Exp $ */
/*-
* Copyright (c) 2014 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.6 2015/03/07 15:37:46 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.7 2015/03/11 12:40:36 macallan Exp $);
#define __INTR_PRIVATE
@@ -89,6 +89,7 @@ struct intrhand {
};
struct intrhand intrs[NINTR];
+struct evcnt clockintrs;
void ingenic_irq(int);
@@ -100,6 +101,9 @@ evbmips_intr_init(void)
ipl_sr_map = ingenic_ipl_sr_map;
+ evcnt_attach_dynamic(clockintrs,
+ EVCNT_TYPE_INTR, NULL, timer, intr);
+
/* zero all handlers */
for (i = 0; i NINTR; i++) {
intrs[i].ih_func = NULL;
@@ -181,6 +185,7 @@ evbmips_iointr(int ipl, vaddr_t pc, uint
if (ipending MIPS_INT_MASK_2) {
/* this is a timer interrupt */
ingenic_clockintr(id);
+ clockintrs.ev_count++;
ingenic_puts(INT2\n);
}
if (ipending MIPS_INT_MASK_0) {
@@ -202,6 +207,7 @@ evbmips_iointr(int ipl, vaddr_t pc, uint
writereg(JZ_ICMSR0, mask);
ingenic_clockintr(id);
writereg(JZ_ICMCR0, mask);
+ clockintrs.ev_count++;
}
ingenic_irq(ipl);
KASSERT(id == 0);
CVS commit: [netbsd-7] src
Module Name:src
Committed By: snj
Date: Wed Mar 11 07:21:15 UTC 2015
Modified Files:
src/distrib/sets/lists/xcomp [netbsd-7]: mi
src/external/mit/xorg/include/xtrans [netbsd-7]: Makefile
src/external/mit/xorg/lib/libXfont [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #585):
distrib/sets/lists/xcomp/mi: revision 1.157
external/mit/xorg/include/xtrans/Makefile: revision 1.4
external/mit/xorg/lib/libXfont/Makefile: revision 1.10
don't install Xtransdnet.c or Xtransos2.c, which were last part of xtrans
1.2.1.
--
update for libXfont 1.5.0
To generate a diff of this commit:
cvs rdiff -u -r1.152.2.4 -r1.152.2.5 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.3 -r1.3.4.1 src/external/mit/xorg/include/xtrans/Makefile
cvs rdiff -u -r1.9 -r1.9.10.1 src/external/mit/xorg/lib/libXfont/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.2.4 src/distrib/sets/lists/xcomp/mi:1.152.2.5
--- src/distrib/sets/lists/xcomp/mi:1.152.2.4 Sat Feb 21 19:30:41 2015
+++ src/distrib/sets/lists/xcomp/mi Wed Mar 11 07:21:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.152.2.4 2015/02/21 19:30:41 martin Exp $
+# $NetBSD: mi,v 1.152.2.5 2015/03/11 07:21:15 snj Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -5332,10 +5332,10 @@
./usr/X11R7/include/X11/Xtos.h-unknown- xorg
./usr/X11R7/include/X11/Xtrans/Xtrans.c -unknown- xorg
./usr/X11R7/include/X11/Xtrans/Xtrans.h -unknown- xorg
-./usr/X11R7/include/X11/Xtrans/Xtransdnet.c -unknown- xorg
+./usr/X11R7/include/X11/Xtrans/Xtransdnet.c -obsolete- obsolete
./usr/X11R7/include/X11/Xtrans/Xtransint.h -unknown- xorg
./usr/X11R7/include/X11/Xtrans/Xtranslcl.c -unknown- xorg
-./usr/X11R7/include/X11/Xtrans/Xtransos2.c -unknown- xorg
+./usr/X11R7/include/X11/Xtrans/Xtransos2.c -obsolete- obsolete
./usr/X11R7/include/X11/Xtrans/Xtranssock.c -unknown- xorg
./usr/X11R7/include/X11/Xtrans/Xtranstli.c -obsolete- obsolete
./usr/X11R7/include/X11/Xtrans/Xtransutil.c -unknown- xorg
Index: src/external/mit/xorg/include/xtrans/Makefile
diff -u src/external/mit/xorg/include/xtrans/Makefile:1.3 src/external/mit/xorg/include/xtrans/Makefile:1.3.4.1
--- src/external/mit/xorg/include/xtrans/Makefile:1.3 Mon Mar 17 01:09:07 2014
+++ src/external/mit/xorg/include/xtrans/Makefile Wed Mar 11 07:21:15 2015
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2014/03/17 01:09:07 mrg Exp $
+# $NetBSD: Makefile,v 1.3.4.1 2015/03/11 07:21:15 snj Exp $
.include bsd.own.mk
.PATH: ${X11SRCDIR.xtrans}
-INCS= Xtrans.c Xtrans.h Xtransdnet.c Xtransint.h Xtranslcl.c \
- Xtransos2.c Xtranssock.c Xtransutil.c transport.c
+INCS= Xtrans.c Xtrans.h Xtransint.h Xtranslcl.c \
+ Xtranssock.c Xtransutil.c transport.c
INCSDIR=${X11INCDIR}/X11/Xtrans
NOOBJ= # defined
Index: src/external/mit/xorg/lib/libXfont/Makefile
diff -u src/external/mit/xorg/lib/libXfont/Makefile:1.9 src/external/mit/xorg/lib/libXfont/Makefile:1.9.10.1
--- src/external/mit/xorg/lib/libXfont/Makefile:1.9 Wed Apr 4 10:59:45 2012
+++ src/external/mit/xorg/lib/libXfont/Makefile Wed Mar 11 07:21:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/04/04 10:59:45 joerg Exp $
+# $NetBSD: Makefile,v 1.9.10.1 2015/03/11 07:21:15 snj Exp $
.include bsd.own.mk
@@ -25,11 +25,11 @@ SRCS= ftenc.c ftfuncs.c fttools.c xttcap
bitsource.c bufio.c catalogue.c decompress.c defaults.c \
dirfile.c fileio.c filewr.c fontdir.c fontencc.c fontfile.c \
fontscale.c gunzip.c register.c renderers.c bunzip2.c cauthgen.c \
- csignal.c delfntcid.c errorf.c fatalerror.c findoldfnt.c \
+ csignal.c delfntcid.c errorf.c findoldfnt.c \
getcres.c getdefptsize.c getnewfntcid.c gettime.c initfshdl.c \
regfpefunc.c rmfshdl.c servclient.c setfntauth.c stfntcfnt.c \
atom.c fontaccel.c fontnames.c fontutil.c fontxlfd.c \
- format.c miscutil.c patcache.c private.c utilbitmap.c
+ format.c miscutil.c patcache.c private.c utilbitmap.c stubsinit.c
INCS= bdfint.h bitmap.h bufio.h fntfil.h fntfilio.h fntfilst.h \
fontconf.h fontencc.h fontmisc.h fontshow.h \
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Wed Mar 11 07:48:42 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: usbdi.c
Log Message:
Fix malloc to kmem conversion by grabbing nendpt before calling
usbd_fill_iface_data
To generate a diff of this commit:
cvs rdiff -u -r1.162.2.18 -r1.162.2.19 src/sys/dev/usb/usbdi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.162.2.18 src/sys/dev/usb/usbdi.c:1.162.2.19
--- src/sys/dev/usb/usbdi.c:1.162.2.18 Fri Mar 6 14:08:39 2015
+++ src/sys/dev/usb/usbdi.c Wed Mar 11 07:48:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.162.2.18 2015/03/06 14:08:39 skrll Exp $ */
+/* $NetBSD: usbdi.c,v 1.162.2.19 2015/03/11 07:48:42 skrll Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usbdi.c,v 1.162.2.18 2015/03/06 14:08:39 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: usbdi.c,v 1.162.2.19 2015/03/11 07:48:42 skrll Exp $);
#ifdef _KERNEL_OPT
#include opt_usb.h
@@ -748,13 +748,13 @@ usbd_set_interface(usbd_interface_handle
return USBD_IN_USE;
endpoints = iface-ui_endpoints;
+ int nendpt = iface-ui_idesc-bNumEndpoints;
err = usbd_fill_iface_data(iface-ui_dev, iface-ui_index, altidx);
if (err)
return err;
/* new setting works, we can free old endpoints */
if (endpoints != NULL) {
- int nendpt = iface-ui_idesc-bNumEndpoints;
kmem_free(endpoints, nendpt * sizeof(struct usbd_endpoint));
}
CVS commit: src/distrib/common/bootimage
Module Name:src
Committed By: snj
Date: Thu Mar 12 04:41:23 UTC 2015
Modified Files:
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
unbreak amd64 install images by passing ipty to MAKEDEV. revision 1.21
of etc/etc.amd64/MAKEDEV.conf removed them from 'all'. (hi christos!)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/common/bootimage/Makefile.bootimage
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/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.9 src/distrib/common/bootimage/Makefile.bootimage:1.10
--- src/distrib/common/bootimage/Makefile.bootimage:1.9 Tue Aug 5 15:40:58 2014
+++ src/distrib/common/bootimage/Makefile.bootimage Thu Mar 12 04:41:23 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.9 2014/08/05 15:40:58 apb Exp $
+# $NetBSD: Makefile.bootimage,v 1.10 2015/03/12 04:41:23 snj Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -276,7 +276,7 @@ ${TARGETFS}: prepare_md_post
${RM} -f ${WORKSPEC}
cat ${WORKDIR}/etc/mtree/* | \
${TOOL_SED} -e 's/ size=[0-9]*//' ${WORKSPEC}
- ${HOST_SH} ${WORKDIR}/dev/MAKEDEV -s all | \
+ ${HOST_SH} ${WORKDIR}/dev/MAKEDEV -s all ipty | \
${TOOL_SED} -e '/^\. type=dir/d' -e 's,^\.,./dev,' ${WORKSPEC}
cat ${SPEC_IN} ${WORKSPEC}
.if defined(SECONDARY_BOOT)
