CVS commit: src/sys/net
Module Name:src Committed By: ozaki-r Date: Wed Sep 30 06:25:59 UTC 2015 Modified Files: src/sys/net: if_fddisubr.c Log Message: Remove extra opt_gateway.h To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/sys/net/if_fddisubr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/if_fddisubr.c diff -u src/sys/net/if_fddisubr.c:1.93 src/sys/net/if_fddisubr.c:1.94 --- src/sys/net/if_fddisubr.c:1.93 Mon Aug 24 22:21:26 2015 +++ src/sys/net/if_fddisubr.c Wed Sep 30 06:25:59 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_fddisubr.c,v 1.93 2015/08/24 22:21:26 pooka Exp $ */ +/* $NetBSD: if_fddisubr.c,v 1.94 2015/09/30 06:25:59 ozaki-r Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -96,7 +96,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.93 2015/08/24 22:21:26 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.94 2015/09/30 06:25:59 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_gateway.h" @@ -132,7 +132,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_fddisubr. #include #include #include -#include "opt_gateway.h" #endif #include
CVS commit: src/tests/bin/sh
Module Name:src Committed By: ozaki-r Date: Wed Sep 30 06:08:36 UTC 2015 Modified Files: src/tests/bin/sh: t_wait.sh Log Message: Add delay to improve stability of test To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/bin/sh/t_wait.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/bin/sh/t_wait.sh diff -u src/tests/bin/sh/t_wait.sh:1.2 src/tests/bin/sh/t_wait.sh:1.3 --- src/tests/bin/sh/t_wait.sh:1.2 Sun Aug 23 07:15:16 2015 +++ src/tests/bin/sh/t_wait.sh Wed Sep 30 06:08:36 2015 @@ -1,4 +1,4 @@ -# $NetBSD: t_wait.sh,v 1.2 2015/08/23 07:15:16 christos Exp $ +# $NetBSD: t_wait.sh,v 1.3 2015/09/30 06:08:36 ozaki-r Exp $ # # Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -64,6 +64,8 @@ kill_body() { # a helper script that executes /bin/sh directly. local s=$PWD/killhelper.sh local z=/tmp/killhelper.$$ + local pid= + cat >$s <<\EOF #!/bin/sh trap "echo SIGHUP" 1 @@ -73,9 +75,15 @@ wait echo $? EOF chmod +x $s + $s > $z & + pid=$! + sleep 1 + # XXX: built-in kill does not work? - /bin/kill -HUP $! + /bin/kill -HUP $pid + sleep 1 + output="$(cat $z | tr '\n' ' ')" rm -f $s $z if [ "$output" != "SIGHUP 129 " ]; then
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Sep 30 04:28:04 UTC 2015 Modified Files: src/sys/dev/pci: if_wm.c if_wmreg.h Log Message: - Add workaround for 82574 Errata 25 and 82583 Errata 12 "Dropped RX packets" and for 82573 (unknown). Set GCR_L1_ACT_WITHOUT_L0S_RX bit. The NVM Image version 2.1.4 and newer have this workaround. - Print the NVM image version on 82583, too. Pointed by joerg@. To generate a diff of this commit: cvs rdiff -u -r1.349 -r1.350 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.79 -r1.80 src/sys/dev/pci/if_wmreg.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/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.349 src/sys/dev/pci/if_wm.c:1.350 --- src/sys/dev/pci/if_wm.c:1.349 Mon Sep 28 07:02:57 2015 +++ src/sys/dev/pci/if_wm.c Wed Sep 30 04:28:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.349 2015/09/28 07:02:57 knakahara Exp $ */ +/* $NetBSD: if_wm.c,v 1.350 2015/09/30 04:28:04 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -83,7 +83,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.349 2015/09/28 07:02:57 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.350 2015/09/30 04:28:04 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -334,6 +334,7 @@ struct wm_softc { int sc_nvm_ver_major; int sc_nvm_ver_minor; + int sc_nvm_ver_build; int sc_nvm_addrbits; /* NVM address bits */ unsigned int sc_nvm_wordsize; /* NVM word size */ int sc_ich8_flash_base; @@ -3580,6 +3581,17 @@ wm_initialize_hardware_bits(struct wm_so CSR_WRITE(sc, WMREG_CTRL, sc->sc_ctrl); /* PCIe Control Register */ + /* + * 82573 Errata (unknown). + * + * 82574 Errata 25 and 82583 Errata 12 + * "Dropped Rx Packets": + * NVM Image Version 2.1.4 and newer has no this bug. + */ + reg = CSR_READ(sc, WMREG_GCR); + reg |= GCR_L1_ACT_WITHOUT_L0S_RX; + CSR_WRITE(sc, WMREG_GCR, reg); + if ((sc->sc_type == WM_T_82574) || (sc->sc_type == WM_T_82583)) { /* @@ -9822,6 +9834,7 @@ wm_nvm_version(struct wm_softc *sc) case WM_T_82571: case WM_T_82572: case WM_T_82574: + case WM_T_82583: check_version = true; check_optionrom = true; have_build = true; @@ -9867,8 +9880,10 @@ wm_nvm_version(struct wm_softc *sc) printver: aprint_verbose(", version %d.%d", sc->sc_nvm_ver_major, sc->sc_nvm_ver_minor); - if (have_build) + if (have_build) { + sc->sc_nvm_ver_build = build; aprint_verbose(".%d", build); + } } if (check_optionrom) { wm_nvm_read(sc, NVM_OFF_COMB_VER_PTR, 1, &off); Index: src/sys/dev/pci/if_wmreg.h diff -u src/sys/dev/pci/if_wmreg.h:1.79 src/sys/dev/pci/if_wmreg.h:1.80 --- src/sys/dev/pci/if_wmreg.h:1.79 Mon Sep 7 15:19:05 2015 +++ src/sys/dev/pci/if_wmreg.h Wed Sep 30 04:28:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wmreg.h,v 1.79 2015/09/07 15:19:05 msaitoh Exp $ */ +/* $NetBSD: if_wmreg.h,v 1.80 2015/09/30 04:28:04 msaitoh Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -918,6 +918,7 @@ struct livengood_tcpip_ctxdesc { #define GCR_CMPL_TMOUT_10MS 0x1000 #define GCR_CMPL_TMOUT_RESEND 0x0001 #define GCR_CAP_VER2 0x0004 +#define GCR_L1_ACT_WITHOUT_L0S_RX 0x0800 #define WMREG_FACTPS 0x5b30 /* Function Active and Power State to MNG */ #define FACTPS_MNGCG 0x2000
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: ozaki-r Date: Wed Sep 30 02:45:33 UTC 2015 Modified Files: src/sys/rump/librump/rumpkern: locks.c Log Message: Add lockdebug_barrier ok pooka@ To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/rump/librump/rumpkern/locks.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/librump/rumpkern/locks.c diff -u src/sys/rump/librump/rumpkern/locks.c:1.70 src/sys/rump/librump/rumpkern/locks.c:1.71 --- src/sys/rump/librump/rumpkern/locks.c:1.70 Wed Sep 30 01:31:56 2015 +++ src/sys/rump/librump/rumpkern/locks.c Wed Sep 30 02:45:33 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: locks.c,v 1.70 2015/09/30 01:31:56 ozaki-r Exp $ */ +/* $NetBSD: locks.c,v 1.71 2015/09/30 02:45:33 ozaki-r Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.70 2015/09/30 01:31:56 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.71 2015/09/30 02:45:33 ozaki-r Exp $"); #include #include @@ -71,12 +71,15 @@ static lockops_t rw_lockops = { lockdebug_locked(lock, NULL, (uintptr_t)__builtin_return_address(0), shar) #define UNLOCKED(lock, shar) \ lockdebug_unlocked(lock, (uintptr_t)__builtin_return_address(0), shar) +#define BARRIER(lock, slp) \ +lockdebug_barrier(lock, slp) #else #define ALLOCK(a, b) #define FREELOCK(a) #define WANTLOCK(a, b) #define LOCKED(a, b) #define UNLOCKED(a, b) +#define BARRIER(a, b) #endif /* @@ -138,6 +141,7 @@ mutex_enter(kmutex_t *mtx) { WANTLOCK(mtx, 0); + BARRIER(mtx, 1); rumpuser_mutex_enter(RUMPMTX(mtx)); LOCKED(mtx, false); } @@ -147,6 +151,7 @@ mutex_spin_enter(kmutex_t *mtx) { WANTLOCK(mtx, 0); + BARRIER(mtx, 1); rumpuser_mutex_enter_nowrap(RUMPMTX(mtx)); LOCKED(mtx, false); } @@ -229,8 +234,8 @@ void rw_enter(krwlock_t *rw, const krw_t op) { - WANTLOCK(rw, op == RW_READER); + BARRIER(rw, 1); rumpuser_rw_enter(krw2rumprw(op), RUMPRW(rw)); LOCKED(rw, op == RW_READER); }
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: ozaki-r Date: Wed Sep 30 01:31:56 UTC 2015 Modified Files: src/sys/rump/librump/rumpkern: locks.c Log Message: Remove redundant UNLOCKED and LOCKED UNLOCKED and LOCKED are done inside mutex_exit and mutex_enter respectively so we don't need to do them outside mutex_exit and mutex_enter. Reviewed by pooka@ To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/rump/librump/rumpkern/locks.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/librump/rumpkern/locks.c diff -u src/sys/rump/librump/rumpkern/locks.c:1.69 src/sys/rump/librump/rumpkern/locks.c:1.70 --- src/sys/rump/librump/rumpkern/locks.c:1.69 Fri Apr 25 18:13:59 2014 +++ src/sys/rump/librump/rumpkern/locks.c Wed Sep 30 01:31:56 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: locks.c,v 1.69 2014/04/25 18:13:59 pooka Exp $ */ +/* $NetBSD: locks.c,v 1.70 2015/09/30 01:31:56 ozaki-r Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.69 2014/04/25 18:13:59 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.70 2015/09/30 01:31:56 ozaki-r Exp $"); #include #include @@ -368,7 +368,6 @@ docvwait(kcondvar_t *cv, kmutex_t *mtx, if (__predict_false(l->l_flag & LW_RUMP_QEXIT)) { struct proc *p = l->l_proc; - UNLOCKED(mtx, false); mutex_exit(mtx); /* drop and retake later */ mutex_enter(p->p_lock); @@ -383,7 +382,6 @@ docvwait(kcondvar_t *cv, kmutex_t *mtx, /* ok, we can exit and remove "reference" to l->private */ mutex_enter(mtx); - LOCKED(mtx, false); rv = EINTR; } l->l_private = NULL;
CVS commit: src/external/bsd
Module Name:src Committed By: christos Date: Wed Sep 30 00:35:47 UTC 2015 Removed Files: src/external/bsd/libdwarf: Makefile Makefile.inc prepare-import.sh src/external/bsd/libdwarf/dist: Makefile _libdwarf.h dwarf.h dwarf_abbrev.c dwarf_attr.c dwarf_attrval.c dwarf_cu.c dwarf_dealloc.c dwarf_die.c dwarf_dump.c dwarf_errmsg.c dwarf_errno.c dwarf_finish.c dwarf_form.c dwarf_func.c dwarf_init.c dwarf_loc.c libdwarf.h src/external/bsd/libdwarf/lib: Makefile shlib_version src/external/bsd/libelf: Makefile Makefile.inc prepare-import.sh src/external/bsd/libelf/dist: Makefile README Version.map _libelf.h elf.3 elf_begin.3 elf_begin.c elf_cntl.3 elf_cntl.c elf_data.c elf_end.3 elf_end.c elf_errmsg.3 elf_errmsg.c elf_errno.c elf_fill.3 elf_fill.c elf_flag.c elf_flagdata.3 elf_getarhdr.3 elf_getarhdr.c elf_getarsym.3 elf_getarsym.c elf_getbase.3 elf_getbase.c elf_getdata.3 elf_getident.3 elf_getident.c elf_getphnum.3 elf_getscn.3 elf_getshnum.3 elf_getshstrndx.3 elf_hash.3 elf_hash.c elf_kind.3 elf_kind.c elf_memory.3 elf_memory.c elf_next.3 elf_next.c elf_phnum.c elf_rand.3 elf_rand.c elf_rawfile.3 elf_rawfile.c elf_scn.c elf_shnum.c elf_shstrndx.c elf_strptr.3 elf_strptr.c elf_types.m4 elf_update.3 elf_update.c elf_version.3 elf_version.c gelf.3 gelf.h gelf_cap.c gelf_checksum.3 gelf_checksum.c gelf_dyn.c gelf_ehdr.c gelf_fsize.3 gelf_fsize.c gelf_getcap.3 gelf_getclass.3 gelf_getclass.c gelf_getdyn.3 gelf_getehdr.3 gelf_getmove.3 gelf_getphdr.3 gelf_getrel.3 gelf_getrela.3 gelf_getshdr.3 gelf_getsym.3 gelf_getsyminfo.3 gelf_getsymshndx.3 gelf_move.c gelf_newehdr.3 gelf_newphdr.3 gelf_phdr.c gelf_rel.c gelf_rela.c gelf_shdr.c gelf_sym.c gelf_syminfo.c gelf_symshndx.c gelf_update_ehdr.3 gelf_xlate.c gelf_xlatetof.3 libelf.c libelf.h libelf_align.c libelf_allocate.c libelf_ar.c libelf_checksum.c libelf_convert.m4 libelf_data.c libelf_ehdr.c libelf_extended.c libelf_fsize.m4 libelf_msize.m4 libelf_phdr.c libelf_shdr.c libelf_xlate.c src/external/bsd/libelf/lib: Makefile shlib_version Log Message: We switched to newer versions in elftoolchain a while ago. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/external/bsd/libdwarf/Makefile \ src/external/bsd/libdwarf/Makefile.inc cvs rdiff -u -r1.2 -r0 src/external/bsd/libdwarf/prepare-import.sh cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/libdwarf/dist/Makefile \ src/external/bsd/libdwarf/dist/dwarf.h \ src/external/bsd/libdwarf/dist/libdwarf.h cvs rdiff -u -r1.3 -r0 src/external/bsd/libdwarf/dist/_libdwarf.h \ src/external/bsd/libdwarf/dist/dwarf_abbrev.c \ src/external/bsd/libdwarf/dist/dwarf_attr.c \ src/external/bsd/libdwarf/dist/dwarf_attrval.c \ src/external/bsd/libdwarf/dist/dwarf_cu.c \ src/external/bsd/libdwarf/dist/dwarf_dealloc.c \ src/external/bsd/libdwarf/dist/dwarf_die.c \ src/external/bsd/libdwarf/dist/dwarf_dump.c \ src/external/bsd/libdwarf/dist/dwarf_errmsg.c \ src/external/bsd/libdwarf/dist/dwarf_errno.c \ src/external/bsd/libdwarf/dist/dwarf_finish.c \ src/external/bsd/libdwarf/dist/dwarf_form.c \ src/external/bsd/libdwarf/dist/dwarf_func.c cvs rdiff -u -r1.5 -r0 src/external/bsd/libdwarf/dist/dwarf_init.c cvs rdiff -u -r1.4 -r0 src/external/bsd/libdwarf/dist/dwarf_loc.c cvs rdiff -u -r1.3 -r0 src/external/bsd/libdwarf/lib/Makefile cvs rdiff -u -r1.2 -r0 src/external/bsd/libdwarf/lib/shlib_version cvs rdiff -u -r1.1 -r0 src/external/bsd/libelf/Makefile \ src/external/bsd/libelf/Makefile.inc cvs rdiff -u -r1.3 -r0 src/external/bsd/libelf/prepare-import.sh cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libelf/dist/Makefile \ src/external/bsd/libelf/dist/README \ src/external/bsd/libelf/dist/Version.map \ src/external/bsd/libelf/dist/elf_begin.3 \ src/external/bsd/libelf/dist/elf_cntl.3 \ src/external/bsd/libelf/dist/elf_end.3 \ src/external/bsd/libelf/dist/elf_errmsg.3 \ src/external/bsd/libelf/dist/elf_fill.3 \ src/external/bsd/libelf/dist/elf_flagdata.3 \ src/external/bsd/libelf/dist/elf_getarhdr.3 \ src/external/bsd/libelf/dist/elf_getarsym.3 \ src/external/bsd/libelf/dist/elf_getbase.3 \ src/external/bsd/libelf/dist/elf_getident.3 \ src/external/bsd/libelf/dist/elf_getphnum.3 \ src/external/bsd/libelf/dist/elf_getscn.3 \ src/external/bsd/libelf/dist/elf_getshnum.3 \ src/external/bsd/libelf/dist/elf_getshstrndx.3 \ src/external/bsd/libelf/dist/elf_hash.3 \ src/external/bsd/libelf/dist/elf_kind.3 \ src/external/bsd/libelf/dist/elf_memory.3 \ src/external/bsd/libelf/dist/elf_next.3 \ src/external/bsd/libelf/dist/elf_rand.3 \
CVS commit: src/external/cddl/osnet/lib/libdtrace
Module Name:src Committed By: christos Date: Wed Sep 30 00:17:09 UTC 2015 Modified Files: src/external/cddl/osnet/lib/libdtrace: Makefile Log Message: do the stack protector stuff like the other files. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/cddl/osnet/lib/libdtrace/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/cddl/osnet/lib/libdtrace/Makefile diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.12 src/external/cddl/osnet/lib/libdtrace/Makefile:1.13 --- src/external/cddl/osnet/lib/libdtrace/Makefile:1.12 Tue Sep 29 19:50:17 2015 +++ src/external/cddl/osnet/lib/libdtrace/Makefile Tue Sep 29 20:17:09 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2015/09/29 23:50:17 christos Exp $ +# $NetBSD: Makefile,v 1.13 2015/09/30 00:17:09 christos Exp $ # $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $ @@ -83,6 +83,7 @@ COPTS.dt_link.c += -Wno-stack-protector COPTS.dt_options.c += -Wno-stack-protector COPTS.dt_parser.c += -Wno-stack-protector COPTS.dt_pragma.c += -Wno-stack-protector +COPTS.dt_print.c += -Wno-stack-protector COPTS.dt_printf.c += -Wno-stack-protector COPTS.dt_program.c += -Wno-stack-protector COPTS.dt_provider.c += -Wno-stack-protector @@ -107,10 +108,6 @@ YFLAGS+=-d CLEANFILES= dt_errtags.c dt_names.c dt_grammar.h -.if ${_HOST_OSNAME} == "Darwin" -COPTS.dt_print.c+= -fno-stack-protector -.endif - MKERRTAGS=${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/mkerrtags.sh dt_errtags.c: ${MKERRTAGS} ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/dt_errtags.h sh ${MKERRTAGS} < ${.ALLSRC:M*.h} > ${.TARGET}
CVS commit: src/external/cddl/osnet/lib/libdtrace
Module Name:src Committed By: christos Date: Tue Sep 29 23:50:17 UTC 2015 Modified Files: src/external/cddl/osnet/lib/libdtrace: Makefile Log Message: - make the generated file rules depend on the source files - hack for clang on Darwin To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/cddl/osnet/lib/libdtrace/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/cddl/osnet/lib/libdtrace/Makefile diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.11 src/external/cddl/osnet/lib/libdtrace/Makefile:1.12 --- src/external/cddl/osnet/lib/libdtrace/Makefile:1.11 Thu Sep 24 10:36:54 2015 +++ src/external/cddl/osnet/lib/libdtrace/Makefile Tue Sep 29 19:50:17 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2015/09/24 14:36:54 christos Exp $ +# $NetBSD: Makefile,v 1.12 2015/09/29 23:50:17 christos Exp $ # $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $ @@ -107,11 +107,17 @@ YFLAGS+=-d CLEANFILES= dt_errtags.c dt_names.c dt_grammar.h -dt_errtags.c: - sh ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/mkerrtags.sh < ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/dt_errtags.h > dt_errtags.c +.if ${_HOST_OSNAME} == "Darwin" +COPTS.dt_print.c+= -fno-stack-protector +.endif -dt_names.c: - sh ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/mknames.sh < ${OPENSOLARIS_SYS_DISTDIR}/uts/common/sys/dtrace.h > dt_names.c +MKERRTAGS=${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/mkerrtags.sh +dt_errtags.c: ${MKERRTAGS} ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/dt_errtags.h + sh ${MKERRTAGS} < ${.ALLSRC:M*.h} > ${.TARGET} + +MKNAMES=${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/mknames.sh +dt_names.c: ${MKNAMES} ${OPENSOLARIS_SYS_DISTDIR}/uts/common/sys/dtrace.h + sh ${MKNAMES} < ${.ALLSRC:M*.h} > ${.TARGET} beforedepend: dt_errtags.c dt_names.c
CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common
Module Name:src Committed By: christos Date: Tue Sep 29 23:50:52 UTC 2015 Modified Files: src/external/cddl/osnet/dist/lib/libdtrace/common: mkerrtags.sh mknames.sh Log Message: detect dynamically if we need -e for echo To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh \ src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh:1.6 src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh:1.7 --- src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh:1.6 Thu Sep 24 10:25:29 2015 +++ src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh Tue Sep 29 19:50:52 2015 @@ -26,7 +26,10 @@ # #ident "%Z%%M% %I% %E% SMI" -BSDECHO=-e + +if [ "x$(echo -e)" != "x-e" ]; then + BSDECHO=-e +fi echo ${BSDECHO} "\ /*\n\ Index: src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh:1.6 src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh:1.7 --- src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh:1.6 Thu Sep 24 10:25:29 2015 +++ src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh Tue Sep 29 19:50:52 2015 @@ -26,7 +26,9 @@ # #ident "%Z%%M% %I% %E% SMI" -BSDECHO=-e +if [ "x$(echo -e)" != "x-e" ]; then + BSDECHO=-e +fi echo ${BSDECHO} "\ /*\n\
CVS commit: src/external/bsd/elftoolchain/dist/libelf
Module Name:src Committed By: christos Date: Tue Sep 29 22:14:14 UTC 2015 Modified Files: src/external/bsd/elftoolchain/dist/libelf: libelf.h Log Message: fix the native build To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/elftoolchain/dist/libelf/libelf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/elftoolchain/dist/libelf/libelf.h diff -u src/external/bsd/elftoolchain/dist/libelf/libelf.h:1.3 src/external/bsd/elftoolchain/dist/libelf/libelf.h:1.4 --- src/external/bsd/elftoolchain/dist/libelf/libelf.h:1.3 Tue Sep 29 15:43:39 2015 +++ src/external/bsd/elftoolchain/dist/libelf/libelf.h Tue Sep 29 18:14:14 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: libelf.h,v 1.3 2015/09/29 19:43:39 christos Exp $ */ +/* $NetBSD: libelf.h,v 1.4 2015/09/29 22:14:14 christos Exp $ */ /*- * Copyright (c) 2006,2008-2010 Joseph Koshy @@ -39,8 +39,10 @@ #if HAVE_NBTOOL_CONFIG_H # include #elif defined(__NetBSD__) +# include # include #elif defined(__FreeBSD__) +# include # include # include #else
CVS commit: src/external/cddl/osnet/dist/tools/ctf/cvt
Module Name:src Committed By: christos Date: Tue Sep 29 20:43:16 UTC 2015 Modified Files: src/external/cddl/osnet/dist/tools/ctf/cvt: dwarf.c output.c Log Message: for the endian macros don't use the _ names, Darwin does not define them. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dist/tools/ctf/cvt/output.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.13 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.14 --- src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.13 Thu Sep 24 15:16:06 2015 +++ src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c Tue Sep 29 16:43:16 2015 @@ -952,7 +952,7 @@ die_sou_create(dwarf_t *dw, Dwarf_Die st int type, const char *typename) { Dwarf_Unsigned sz, bitsz, bitoff, maxsz=0; -#if BYTE_ORDER == _LITTLE_ENDIAN +#if BYTE_ORDER == LITTLE_ENDIAN Dwarf_Unsigned bysz; #endif Dwarf_Die mem; @@ -1027,7 +1027,7 @@ die_sou_create(dwarf_t *dw, Dwarf_Die st ml->ml_size = tdesc_bitsize(ml->ml_type); if (die_unsigned(dw, mem, DW_AT_bit_offset, &bitoff, 0)) { -#if BYTE_ORDER == _BIG_ENDIAN +#if BYTE_ORDER == BIG_ENDIAN ml->ml_offset += bitoff; #else /* Index: src/external/cddl/osnet/dist/tools/ctf/cvt/output.c diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/output.c:1.5 src/external/cddl/osnet/dist/tools/ctf/cvt/output.c:1.6 --- src/external/cddl/osnet/dist/tools/ctf/cvt/output.c:1.5 Sun Mar 9 13:04:00 2014 +++ src/external/cddl/osnet/dist/tools/ctf/cvt/output.c Tue Sep 29 16:43:16 2015 @@ -755,7 +755,7 @@ write_ctf(tdata_t *td, const char *curna elfterminate(curname, "Cannot write"); if (gelf_getehdr(elf, &ehdr)) { -#if BYTE_ORDER == _BIG_ENDIAN +#if BYTE_ORDER == BIG_ENDIAN byteorder = ELFDATA2MSB; #else byteorder = ELFDATA2LSB;
CVS commit: src/external/cddl/osnet/usr.bin/ctfmerge
Module Name:src Committed By: christos Date: Tue Sep 29 20:31:43 UTC 2015 Modified Files: src/external/cddl/osnet/usr.bin/ctfmerge: Makefile Log Message: no other ctf program needs -lrt, why does this one? To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/usr.bin/ctfmerge/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/cddl/osnet/usr.bin/ctfmerge/Makefile diff -u src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.6 src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.7 --- src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.6 Sun Mar 9 18:01:31 2014 +++ src/external/cddl/osnet/usr.bin/ctfmerge/Makefile Tue Sep 29 16:31:43 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/03/09 22:01:31 christos Exp $ +# $NetBSD: Makefile,v 1.7 2015/09/29 20:31:43 christos Exp $ # $FreeBSD: src/cddl/usr.bin/ctfmerge/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $ @@ -28,8 +28,7 @@ SRCS= alist.c \ tdata.c \ traverse.c \ util.c - -LDADD+=-lrt -lpthread -DPADD+=${LIBRT} ${LIBPTHREAD} +LDADD+=-lpthread +DPADD+=${LIBPTHREAD} .include
CVS commit: src/external/bsd/elftoolchain/dist
Module Name:src Committed By: christos Date: Tue Sep 29 19:43:39 UTC 2015 Modified Files: src/external/bsd/elftoolchain/dist/common: _elftc.h src/external/bsd/elftoolchain/dist/libelf: _libelf_config.h libelf.h Log Message: make this tools friendly. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/elftoolchain/dist/common/_elftc.h cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h \ src/external/bsd/elftoolchain/dist/libelf/libelf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/elftoolchain/dist/common/_elftc.h diff -u src/external/bsd/elftoolchain/dist/common/_elftc.h:1.2 src/external/bsd/elftoolchain/dist/common/_elftc.h:1.3 --- src/external/bsd/elftoolchain/dist/common/_elftc.h:1.2 Sun Mar 9 12:58:03 2014 +++ src/external/bsd/elftoolchain/dist/common/_elftc.h Tue Sep 29 15:43:39 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: _elftc.h,v 1.2 2014/03/09 16:58:03 christos Exp $ */ +/* $NetBSD: _elftc.h,v 1.3 2015/09/29 19:43:39 christos Exp $ */ /*- * Copyright (c) 2009 Joseph Koshy @@ -317,6 +317,10 @@ struct name { \ #endif /* __GNUC__ */ #endif +#ifndef ELFTC_VCSID +#define ELFTC_VCSID(ID) /**/ +#endif + #endif /* ELFTC_VCSID */ /* Index: src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h diff -u src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h:1.2 src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h:1.3 --- src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h:1.2 Sun Mar 9 12:58:04 2014 +++ src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h Tue Sep 29 15:43:39 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: _libelf_config.h,v 1.2 2014/03/09 16:58:04 christos Exp $ */ +/* $NetBSD: _libelf_config.h,v 1.3 2015/09/29 19:43:39 christos Exp $ */ /*- * Copyright (c) 2008-2011 Joseph Koshy @@ -115,7 +115,7 @@ #endif /* __minix */ -#ifdef __NetBSD__ +#if defined(__NetBSD__) || defined(HAVE_NBTOOL_CONFIG_H) #include @@ -135,7 +135,7 @@ #define Elf_Note Elf64_Nhdr #endif -#endif /* __NetBSD__ */ +#endif /* __NetBSD__ || HAVE_NBTOOL_CONFIG_H */ #if defined(__OpenBSD__) Index: src/external/bsd/elftoolchain/dist/libelf/libelf.h diff -u src/external/bsd/elftoolchain/dist/libelf/libelf.h:1.2 src/external/bsd/elftoolchain/dist/libelf/libelf.h:1.3 --- src/external/bsd/elftoolchain/dist/libelf/libelf.h:1.2 Sun Mar 9 12:58:04 2014 +++ src/external/bsd/elftoolchain/dist/libelf/libelf.h Tue Sep 29 15:43:39 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: libelf.h,v 1.2 2014/03/09 16:58:04 christos Exp $ */ +/* $NetBSD: libelf.h,v 1.3 2015/09/29 19:43:39 christos Exp $ */ /*- * Copyright (c) 2006,2008-2010 Joseph Koshy @@ -35,12 +35,16 @@ # include "nbtool_config.h" #endif -#include -#ifdef __NetBSD__ -#include + +#if HAVE_NBTOOL_CONFIG_H +# include +#elif defined(__NetBSD__) +# include +#elif defined(__FreeBSD__) +# include +# include #else -#include -#include +# error "Unsupported platform" #endif /* Library private data structures */
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src Committed By: phx Date: Tue Sep 29 15:12:53 UTC 2015 Modified Files: src/sys/arch/sandpoint/stand/altboot: dsk.c globals.h Log Message: The disk's unittag is not equal to the channel, so we need an additional unitchan entry to make lba_read() work in all cases. The libsa-printf() does not seem to support 64-bit output, so cast the block number to unsigned when printing an error message. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sandpoint/stand/altboot/dsk.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sandpoint/stand/altboot/globals.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/sandpoint/stand/altboot/dsk.c diff -u src/sys/arch/sandpoint/stand/altboot/dsk.c:1.17 src/sys/arch/sandpoint/stand/altboot/dsk.c:1.18 --- src/sys/arch/sandpoint/stand/altboot/dsk.c:1.17 Tue Aug 5 17:55:20 2014 +++ src/sys/arch/sandpoint/stand/altboot/dsk.c Tue Sep 29 15:12:52 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: dsk.c,v 1.17 2014/08/05 17:55:20 joerg Exp $ */ +/* $NetBSD: dsk.c,v 1.18 2015/09/29 15:12:52 phx Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -125,6 +125,7 @@ disk_scan(void *drv) } d = &ldisk[ndrive]; d->dvops = l; + d->unitchan = n; d->unittag = ndrive; snprintf(d->xname, sizeof(d->xname), "wd%d", d->unittag); set_xfermode(l, n); @@ -404,7 +405,7 @@ lba_read(struct disk *d, int64_t bno, in int error; l = d->dvops; - n = d->unittag; + n = d->unitchan; p = (uint16_t *)buf; chan = &l->chan[n]; error = 0; @@ -414,7 +415,8 @@ lba_read(struct disk *d, int64_t bno, in (*issue)(chan, bno, rdcnt); for (k = 0; k < rdcnt; k++) { if (spinwait_unbusy(l, n, 1000, &err) == 0) { -printf("%s blk %lld %s\n", d->xname, bno, err); +printf("%s blk %u %s\n", + d->xname, (unsigned)bno, err); error = EIO; break; } Index: src/sys/arch/sandpoint/stand/altboot/globals.h diff -u src/sys/arch/sandpoint/stand/altboot/globals.h:1.19 src/sys/arch/sandpoint/stand/altboot/globals.h:1.20 --- src/sys/arch/sandpoint/stand/altboot/globals.h:1.19 Thu Apr 26 19:59:37 2012 +++ src/sys/arch/sandpoint/stand/altboot/globals.h Tue Sep 29 15:12:52 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: globals.h,v 1.19 2012/04/26 19:59:37 phx Exp $ */ +/* $NetBSD: globals.h,v 1.20 2015/09/29 15:12:52 phx Exp $ */ #ifdef DEBUG #define DPRINTF(x) printf x @@ -172,6 +172,7 @@ NIF_DECL(stg); struct disk { char xname[8]; void *dvops; + unsigned unitchan; unsigned unittag; uint16_t ident[128]; uint64_t nsect;
CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common
Module Name:src Committed By: christos Date: Tue Sep 29 14:31:22 UTC 2015 Modified Files: src/external/cddl/osnet/dist/lib/libdtrace/common: dt_consume.c Log Message: return an error for actions we don't understand. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c:1.8 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c:1.9 --- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c:1.8 Thu Sep 24 10:25:29 2015 +++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c Tue Sep 29 10:31:22 2015 @@ -2674,6 +2674,8 @@ dt_consume_cpu(dtrace_hdl_t *dtp, FILE * case DTRACEACT_FREOPEN: func = dtrace_freopen; break; +default: + return (dt_set_errno(dtp, EDT_BADAGG)); } n = (*func)(dtp, fp, fmtdata, &data,
CVS commit: src/usr.bin/usbhidaction
Module Name:src Committed By: christos Date: Tue Sep 29 14:27:00 UTC 2015 Modified Files: src/usr.bin/usbhidaction: usbhidaction.c Log Message: - PR/50291: Fix memory leak - estrdup/emalloc - use EXIT_FAILURE instead of 1 To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/usr.bin/usbhidaction/usbhidaction.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/usbhidaction/usbhidaction.c diff -u src/usr.bin/usbhidaction/usbhidaction.c:1.25 src/usr.bin/usbhidaction/usbhidaction.c:1.26 --- src/usr.bin/usbhidaction/usbhidaction.c:1.25 Thu Jan 24 12:46:00 2013 +++ src/usr.bin/usbhidaction/usbhidaction.c Tue Sep 29 10:27:00 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: usbhidaction.c,v 1.25 2013/01/24 17:46:00 christos Exp $ */ +/* $NetBSD: usbhidaction.c,v 1.26 2015/09/29 14:27:00 christos Exp $ */ /* * Copyright (c) 2000, 2002 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include #ifndef lint -__RCSID("$NetBSD: usbhidaction.c,v 1.25 2013/01/24 17:46:00 christos Exp $"); +__RCSID("$NetBSD: usbhidaction.c,v 1.26 2015/09/29 14:27:00 christos Exp $"); #endif #include @@ -50,6 +50,7 @@ __RCSID("$NetBSD: usbhidaction.c,v 1.25 #include #include #include +#include static int verbose = 0; static int isdemon = 0; @@ -136,22 +137,23 @@ main(int argc, char **argv) if (dev[0] != '/') { (void)snprintf(devnamebuf, sizeof(devnamebuf), "/dev/%s%s", - isdigit((unsigned char)dev[0]) ? "uhid" : "", dev); + isdigit((unsigned char)dev[0]) ? "uhid" : "", dev); dev = devnamebuf; } if (demon && conf[0] != '/') - errx(1, "config file must have an absolute path, %s", conf); + errx(EXIT_FAILURE, + "config file must have an absolute path, %s", conf); fd = open(dev, O_RDWR | O_CLOEXEC); if (fd < 0) - err(1, "%s", dev); + err(EXIT_FAILURE, "%s", dev); if (ioctl(fd, USB_GET_REPORT_ID, &reportid) < 0) reportid = -1; repd = hid_get_report_desc(fd); if (repd == NULL) - err(1, "hid_get_report_desc() failed"); + err(EXIT_FAILURE, "hid_get_report_desc() failed"); commands = parse_conf(conf, repd, reportid, ignore); @@ -159,14 +161,14 @@ main(int argc, char **argv) if (verbose) (void)printf("report size %d\n", sz); - if (sz > (int)sizeof(buf)) - errx(1, "report too large"); + if ((size_t)sz > sizeof(buf)) + errx(EXIT_FAILURE, "report too large"); (void)signal(SIGHUP, sighup); if (demon) { if (daemon(0, 0) < 0) - err(1, "daemon()"); + err(EXIT_FAILURE, "daemon()"); (void)pidfile(NULL); isdemon = 1; } @@ -181,13 +183,13 @@ main(int argc, char **argv) } if (n < 0) { if (verbose) -err(1, "read"); +err(EXIT_FAILURE, "read"); else -exit(1); +exit(EXIT_FAILURE); } #if 0 if (n != sz) { - err(2, "read size"); + err(EXIT_FAILURE, "read size"); } #endif for (cmd = commands; cmd; cmd = cmd->next) { @@ -213,7 +215,7 @@ usage(void) (void)fprintf(stderr, "usage: %s -c config_file [-d] -f hid_dev " "[-i] [-t table] [-v]\n", getprogname()); - exit(1); + exit(EXIT_FAILURE); } static int @@ -242,7 +244,7 @@ parse_conf(const char *conf, report_desc f = fopen(conf, "r"); if (f == NULL) - err(1, "%s", conf); + err(EXIT_FAILURE, "%s", conf); cmds = NULL; for (line = 1; ; line++) { @@ -268,14 +270,12 @@ parse_conf(const char *conf, report_desc (void)fclose(f); return (NULL); } else { -errx(1, "config file `%s', line %d," +errx(EXIT_FAILURE, "config file `%s', line %d," ", syntax error: %s", conf, line, buf); } } - cmd = malloc(sizeof *cmd); - if (cmd == NULL) - err(1, "malloc failed"); + cmd = emalloc(sizeof *cmd); cmd->next = cmds; cmds = cmd; cmd->line = line; @@ -294,9 +294,10 @@ parse_conf(const char *conf, report_desc (void)fclose(f); return (NULL); } else { - errx(1, "config file `%s', line %d, " - "bad value: %s\n", - conf, line, value); + errx(EXIT_FAILURE, + "config file `%s', line %d, " + "bad value: %s\n", + conf, line, value); } } } @@ -375,15 +376,15 @@ parse_conf(const char *conf, report_desc (void)fclose(f); return (NULL); } else { - errx(1, "config file `%s', line %d, HID item " - "not found: `%s'", conf, line, name); + errx(EXIT_FAILURE, "config file `%s', line %d," + " HID item not found: `%s'", conf, line, name); } foundhid: hid_end_parse(d); cmd->item = h; - cmd->name = strdup(name); - cmd->action = strdup(action); + cmd->name = estrdup(name); + cmd->action = estrdup(action); if (range) { if (cmd->value == 1) cmd->value = u - lo; @@ -413,7 +414,7 @@ docmd(struct command *cmd, int value, co if (isdigit((unsigned char)*p)) { n = strtol(p, &p, 10) - 1; if (n >= 0 && n < argc) { - (void)strncpy(q, argv[n], len); + (void)str
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Tue Sep 29 11:38:29 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: aubtfwl.c if_rum.c if_rumreg.h if_run.c if_runvar.h if_ural.c if_uralreg.h if_urtw.c if_zyd.c if_zydreg.h uatp.c uaudio.c uchcom.c uhci.c uhcivar.h uhid.c uhidev.c uhub.c ukyopon.c umass_isdata.c umass_scsipi.c umcs.c umidi.c usb.c usb_mem.c usb_subr.c usbdi.h usbdi_util.c usscanner.c uvisor.c xhci.c Log Message: sizeof KNF To generate a diff of this commit: cvs rdiff -u -r1.5.10.6 -r1.5.10.7 src/sys/dev/usb/aubtfwl.c cvs rdiff -u -r1.48.6.8 -r1.48.6.9 src/sys/dev/usb/if_rum.c cvs rdiff -u -r1.4 -r1.4.34.1 src/sys/dev/usb/if_rumreg.h cvs rdiff -u -r1.10.6.5 -r1.10.6.6 src/sys/dev/usb/if_run.c cvs rdiff -u -r1.1.20.1 -r1.1.20.2 src/sys/dev/usb/if_runvar.h cvs rdiff -u -r1.44.14.5 -r1.44.14.6 src/sys/dev/usb/if_ural.c cvs rdiff -u -r1.3 -r1.3.128.1 src/sys/dev/usb/if_uralreg.h cvs rdiff -u -r1.6.6.8 -r1.6.6.9 src/sys/dev/usb/if_urtw.c cvs rdiff -u -r1.36.14.6 -r1.36.14.7 src/sys/dev/usb/if_zyd.c cvs rdiff -u -r1.7.16.2 -r1.7.16.3 src/sys/dev/usb/if_zydreg.h cvs rdiff -u -r1.10.4.5 -r1.10.4.6 src/sys/dev/usb/uatp.c cvs rdiff -u -r1.140.2.9 -r1.140.2.10 src/sys/dev/usb/uaudio.c cvs rdiff -u -r1.13.6.5 -r1.13.6.6 src/sys/dev/usb/uchcom.c cvs rdiff -u -r1.264.4.34 -r1.264.4.35 src/sys/dev/usb/uhci.c cvs rdiff -u -r1.52.14.6 -r1.52.14.7 src/sys/dev/usb/uhcivar.h cvs rdiff -u -r1.92.4.6 -r1.92.4.7 src/sys/dev/usb/uhid.c cvs rdiff -u -r1.61.4.8 -r1.61.4.9 src/sys/dev/usb/uhidev.c cvs rdiff -u -r1.126.2.14 -r1.126.2.15 src/sys/dev/usb/uhub.c cvs rdiff -u -r1.16.16.4 -r1.16.16.5 src/sys/dev/usb/ukyopon.c cvs rdiff -u -r1.30.2.4 -r1.30.2.5 src/sys/dev/usb/umass_isdata.c cvs rdiff -u -r1.49.2.2 -r1.49.2.3 src/sys/dev/usb/umass_scsipi.c cvs rdiff -u -r1.8.2.4 -r1.8.2.5 src/sys/dev/usb/umcs.c cvs rdiff -u -r1.65.14.6 -r1.65.14.7 src/sys/dev/usb/umidi.c cvs rdiff -u -r1.156.2.9 -r1.156.2.10 src/sys/dev/usb/usb.c cvs rdiff -u -r1.65.2.9 -r1.65.2.10 src/sys/dev/usb/usb_mem.c cvs rdiff -u -r1.198.2.17 -r1.198.2.18 src/sys/dev/usb/usb_subr.c cvs rdiff -u -r1.90.4.6 -r1.90.4.7 src/sys/dev/usb/usbdi.h cvs rdiff -u -r1.63.2.10 -r1.63.2.11 src/sys/dev/usb/usbdi_util.c cvs rdiff -u -r1.38.6.8 -r1.38.6.9 src/sys/dev/usb/usscanner.c cvs rdiff -u -r1.45.24.5 -r1.45.24.6 src/sys/dev/usb/uvisor.c cvs rdiff -u -r1.28.2.38 -r1.28.2.39 src/sys/dev/usb/xhci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/aubtfwl.c diff -u src/sys/dev/usb/aubtfwl.c:1.5.10.6 src/sys/dev/usb/aubtfwl.c:1.5.10.7 --- src/sys/dev/usb/aubtfwl.c:1.5.10.6 Tue Jun 23 12:07:20 2015 +++ src/sys/dev/usb/aubtfwl.c Tue Sep 29 11:38:28 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: aubtfwl.c,v 1.5.10.6 2015/06/23 12:07:20 skrll Exp $ */ +/* $NetBSD: aubtfwl.c,v 1.5.10.7 2015/09/29 11:38:28 skrll Exp $ */ /* * Copyright (c) 2011 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: aubtfwl.c,v 1.5.10.6 2015/06/23 12:07:20 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aubtfwl.c,v 1.5.10.7 2015/09/29 11:38:28 skrll Exp $"); #include #include @@ -119,7 +119,7 @@ aubtfwl_firmware_load(device_t self, con size_t fwo = 0; uint32_t n; - memset(&req, 0, sizeof req); + memset(&req, 0, sizeof(req)); error = firmware_open("ubt", name, &fwh); if (error != 0) { @@ -218,13 +218,13 @@ aubtfwl_get_state(struct aubtfwl_softc * usb_device_request_t req; int error = 0; - memset(&req, 0, sizeof req); + memset(&req, 0, sizeof(req)); req.bRequest = AR3K_GET_STATE; req.bmRequestType = UT_READ_VENDOR_DEVICE; USETW(req.wValue, 0); USETW(req.wIndex, 0); - USETW(req.wLength, sizeof *state); + USETW(req.wLength, sizeof(*state)); error = usbd_do_request(sc->sc_udev, &req, state); @@ -236,13 +236,13 @@ aubtfwl_get_version(struct aubtfwl_softc usb_device_request_t req; int error = 0; - memset(&req, 0, sizeof req); + memset(&req, 0, sizeof(req)); req.bRequest = AR3K_GET_VERSION; req.bmRequestType = UT_READ_VENDOR_DEVICE; USETW(req.wValue, 0); USETW(req.wIndex, 0); - USETW(req.wLength, sizeof *ver); + USETW(req.wLength, sizeof(*ver)); error = usbd_do_request(sc->sc_udev, &req, ver); @@ -261,7 +261,7 @@ aubtfwl_send_command(struct aubtfwl_soft usb_device_request_t req; int error = 0; - memset(&req, 0, sizeof req); + memset(&req, 0, sizeof(req)); req.bRequest = cmd; req.bmRequestType = UT_WRITE_VENDOR_DEVICE; @@ -298,7 +298,7 @@ aubtfwl_attach_hook(device_t self) aprint_verbose_dev(self, "state is 0x%02x\n", state); if (!(state & AR3K_STATE_IS_PATCHED)) { - snprintf(firmware_name, sizeof firmware_name, + snprintf(firmware_name, sizeof(firmware_name), "ar3k/AthrBT_0x%08x.dfu", ver.rom); error = aubtfwl_firmware_load(self, firmware_name); @@ -318,7 +318,7 @@ aubtfwl_attach_hook(device_t s
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Tue Sep 29 09:48:20 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: uchcom.c Log Message: Trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.13.6.4 -r1.13.6.5 src/sys/dev/usb/uchcom.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/uchcom.c diff -u src/sys/dev/usb/uchcom.c:1.13.6.4 src/sys/dev/usb/uchcom.c:1.13.6.5 --- src/sys/dev/usb/uchcom.c:1.13.6.4 Mon Sep 28 16:24:19 2015 +++ src/sys/dev/usb/uchcom.c Tue Sep 29 09:48:20 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: uchcom.c,v 1.13.6.4 2015/09/28 16:24:19 skrll Exp $ */ +/* $NetBSD: uchcom.c,v 1.13.6.5 2015/09/29 09:48:20 skrll Exp $ */ /* * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.13.6.4 2015/09/28 16:24:19 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.13.6.5 2015/09/29 09:48:20 skrll Exp $"); /* * driver for WinChipHead CH341/340, the worst USB-serial chip in the world. @@ -226,7 +226,7 @@ CFATTACH_DECL2_NEW(uchcom, * driver entry points */ -int +int uchcom_match(device_t parent, cfdata_t match, void *aux) { struct usb_attach_arg *uaa = aux; @@ -235,7 +235,7 @@ uchcom_match(device_t parent, cfdata_t m UMATCH_VENDOR_PRODUCT : UMATCH_NONE); } -void +void uchcom_attach(device_t parent, device_t self, void *aux) { struct uchcom_softc *sc = device_private(self); @@ -317,7 +317,7 @@ uchcom_childdet(device_t self, device_t sc->sc_subdev = NULL; } -int +int uchcom_detach(device_t self, int flags) { struct uchcom_softc *sc = device_private(self);
CVS commit: src/doc
Module Name:src Committed By: roy Date: Tue Sep 29 09:14:11 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of openresolv-3.7.1 To generate a diff of this commit: cvs rdiff -u -r1.1256 -r1.1257 src/doc/3RDPARTY cvs rdiff -u -r1.2104 -r1.2105 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1256 src/doc/3RDPARTY:1.1257 --- src/doc/3RDPARTY:1.1256 Sun Sep 27 07:04:05 2015 +++ src/doc/3RDPARTY Tue Sep 29 09:14:11 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1256 2015/09/27 07:04:05 taca Exp $ +# $NetBSD: 3RDPARTY,v 1.1257 2015/09/29 09:14:11 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -972,8 +972,8 @@ Location: external/bsd/openpam/dist Notes: Package: openresolv -Version: 3.7.0 -Current Vers: 3.7.0 +Version: 3.7.1 +Current Vers: 3.7.1 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/openresolv/ Home Page: http://roy.marples.name/projects/openresolv/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2104 src/doc/CHANGES:1.2105 --- src/doc/CHANGES:1.2104 Thu Sep 24 14:37:56 2015 +++ src/doc/CHANGES Tue Sep 29 09:14:11 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2104 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2105 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -201,3 +201,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: netstat(1): Now knows how tall the display is. [mrg 20150919] libproc, librtld_db: Added from FreeBSD [christos 20150924] dtrace: Updated from FreeBSD [christos 20150924] + resolvconf: Import openresolv-3.7.1 [roy 20150929]
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Tue Sep 29 09:11:47 UTC 2015 Modified Files: src/external/bsd/openresolv/dist: resolvconf.8.in resolvconf.conf.5.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openresolv/dist/resolvconf.8.in cvs rdiff -u -r1.12 -r1.13 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.8.in diff -u src/external/bsd/openresolv/dist/resolvconf.8.in:1.5 src/external/bsd/openresolv/dist/resolvconf.8.in:1.6 --- src/external/bsd/openresolv/dist/resolvconf.8.in:1.5 Fri May 1 18:23:11 2015 +++ src/external/bsd/openresolv/dist/resolvconf.8.in Tue Sep 29 09:11:47 2015 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 27, 2014 +.Dd April 27, 2015 .Dt RESOLVCONF 8 .Os .Sh NAME Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.12 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.13 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.12 Fri May 1 18:23:11 2015 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Tue Sep 29 09:11:47 2015 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 20, 2015 +.Dd May 14, 2015 .Dt RESOLVCONF.CONF 5 .Os .Sh NAME @@ -91,6 +91,11 @@ To remove a block, you can use 192.168.* These interfaces name servers will only be queried for the domains listed in their resolv.conf. Useful for VPN domains. +Setting +.Sy private_interfaces Ns ="*" +will stop the forwarding of the root zone and allows the local resolver to +recursively query the root servers directly. +Requires a local nameserver other than libc. This is equivalent to the .Nm resolvconf -p option. @@ -149,7 +154,7 @@ When set to /dev/null or NULL, .Sy resolv_conf_local_only is defaulted to NO, .Sy local_nameservers -is unset unless overriden and only the information set in +is unset unless overridden and only the information set in .Nm is written to .Sy resolv_conf . @@ -271,7 +276,7 @@ Each subscriber attempts to automaticall distribution has been catered for. Also, users could equally want to use a different version from the one installed by default, such as bind8 and bind9. -To accomodate this, the subscribers have these files in configurable +To accommodate this, the subscribers have these files in configurable variables, documented below. .Pp .Bl -tag -width indent
CVS import: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Tue Sep 29 09:10:07 UTC 2015 Update of /cvsroot/src/external/bsd/openresolv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12075 Log Message: Import openresolv-3.7.1 with the following changes: * Typo's, thanks to Herbert Parentes Fortes Neto * Clarify that private_interfaces="*" will not forward the root zone * ensure that domain-insecure always appears in a server clause for the unbound subscriber Status: Vendor Tag: roy Release Tags: openresolv-3-7-1 U src/external/bsd/openresolv/dist/README U src/external/bsd/openresolv/dist/resolvconf.in C src/external/bsd/openresolv/dist/resolvconf.8.in C src/external/bsd/openresolv/dist/resolvconf.conf.5.in U src/external/bsd/openresolv/dist/libc.in U src/external/bsd/openresolv/dist/dnsmasq.in U src/external/bsd/openresolv/dist/named.in U src/external/bsd/openresolv/dist/pdnsd.in U src/external/bsd/openresolv/dist/unbound.in 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/openresolv/dist
CVS commit: src/tests/net/net
Module Name:src Committed By: ozaki-r Date: Tue Sep 29 08:27:24 UTC 2015 Modified Files: src/tests/net/net: t_forwarding.sh Log Message: Let ftp use a different output file from httpd's one Previously the target file served by httpd and the output file of ftp were identical (both index.html) on the filesystem. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/tests/net/net/t_forwarding.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/net/net/t_forwarding.sh diff -u src/tests/net/net/t_forwarding.sh:1.8 src/tests/net/net/t_forwarding.sh:1.9 --- src/tests/net/net/t_forwarding.sh:1.8 Mon Sep 28 01:54:14 2015 +++ src/tests/net/net/t_forwarding.sh Tue Sep 29 08:27:24 2015 @@ -1,4 +1,4 @@ -# $NetBSD: t_forwarding.sh,v 1.8 2015/09/28 01:54:14 ozaki-r Exp $ +# $NetBSD: t_forwarding.sh,v 1.9 2015/09/29 08:27:24 ozaki-r Exp $ # # Copyright (c) 2015 The NetBSD Foundation, Inc. # All rights reserved. @@ -180,7 +180,7 @@ test_http_get() # get the webpage atf_check -s exit:0 env LD_PRELOAD=/usr/lib/librumphijack.so \ - ftp -q $TIMEOUT http://$IP4DST/$HTML_FILE + ftp -q $TIMEOUT -o out http://$IP4DST/$HTML_FILE } test_setup()
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: hannken Date: Tue Sep 29 08:01:29 UTC 2015 Modified Files: src/distrib/sets/lists/debug: md.amd64 Log Message: Compat libproc.so.0.0.debug and librtld_db.so.0.0.debug depend on "dtrace". To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/distrib/sets/lists/debug/md.amd64 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/debug/md.amd64 diff -u src/distrib/sets/lists/debug/md.amd64:1.87 src/distrib/sets/lists/debug/md.amd64:1.88 --- src/distrib/sets/lists/debug/md.amd64:1.87 Thu Sep 24 14:49:38 2015 +++ src/distrib/sets/lists/debug/md.amd64 Tue Sep 29 08:01:29 2015 @@ -1,12 +1,12 @@ -# $NetBSD: md.amd64,v 1.87 2015/09/24 14:49:38 christos Exp $ +# $NetBSD: md.amd64,v 1.88 2015/09/29 08:01:29 hannken Exp $ ./usr/lib/i386/libi386_g.a comp-c-debuglib debuglib,compat ./usr/lib/libx86_64_g.acomp-c-debuglib debuglib ./usr/libdata/debug/libexec/ld.elf_so-i386.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/iasl.debug comp-util-debug debug ./usr/libdata/debug/usr/lib/i386/libi386.so.1.0.debug comp-compat-shlib compat,pic,debug -./usr/libdata/debug/usr/lib/i386/libproc.so.0.0.debug comp-compat-shlib compat,pic,debug -./usr/libdata/debug/usr/lib/i386/librtld_db.so.0.0.debug comp-compat-shlib compat,pic,debug +./usr/libdata/debug/usr/lib/i386/libproc.so.0.0.debug comp-compat-shlib compat,pic,debug,dtrace +./usr/libdata/debug/usr/lib/i386/librtld_db.so.0.0.debug comp-compat-shlib compat,pic,debug,dtrace ./usr/libdata/debug/usr/lib/libx86_64.so.0.0.debug comp-sys-shlib pic,debug ./usr/libdata/debug/usr/libexec/ld.elf_so-i386 comp-obsolete obsolete ./usr/libdata/debug/usr/libexec/ld.elf_so-i386.debug comp-sys-debug debug,compat
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: hannken Date: Tue Sep 29 08:00:59 UTC 2015 Modified Files: src/distrib/sets/lists/debug: md.sparc64 Log Message: Typo (ompat -> compat). To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/debug/md.sparc64 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/debug/md.sparc64 diff -u src/distrib/sets/lists/debug/md.sparc64:1.86 src/distrib/sets/lists/debug/md.sparc64:1.87 --- src/distrib/sets/lists/debug/md.sparc64:1.86 Fri Sep 25 10:30:37 2015 +++ src/distrib/sets/lists/debug/md.sparc64 Tue Sep 29 08:00:59 2015 @@ -1,9 +1,9 @@ -# $NetBSD: md.sparc64,v 1.86 2015/09/25 10:30:37 martin Exp $ +# $NetBSD: md.sparc64,v 1.87 2015/09/29 08:00:59 hannken Exp $ ./usr/libdata/debug/libexec/ld.elf_so-sparc.debug comp-sys-debug debug,compat ./usr/libdata/debug/sbin/edlabel.debug comp-sysutil-debug obsolete ./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug ./usr/libdata/debug/usr/libexec/ld.elf_so-sparc.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/libexec/ld.elf_so.sparc comp-obsolete obsolete -./usr/libdata/debug/usr/lib/sparc/librtld_db.so.0.0.debug comp-compat-shlib ompat,pic,debug,dtrace +./usr/libdata/debug/usr/lib/sparc/librtld_db.so.0.0.debug comp-compat-shlib compat,pic,debug,dtrace ./usr/libdata/debug/usr/sbin/eeprom.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/ofctl.debug comp-sysutil-debug debug
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: hannken Date: Tue Sep 29 08:00:22 UTC 2015 Modified Files: src/distrib/sets/lists/comp: shl.mi Log Message: Typo (trailing comma). To generate a diff of this commit: cvs rdiff -u -r1.280 -r1.281 src/distrib/sets/lists/comp/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.280 src/distrib/sets/lists/comp/shl.mi:1.281 --- src/distrib/sets/lists/comp/shl.mi:1.280 Fri Sep 25 10:30:36 2015 +++ src/distrib/sets/lists/comp/shl.mi Tue Sep 29 08:00:22 2015 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.280 2015/09/25 10:30:36 martin Exp $ +# $NetBSD: shl.mi,v 1.281 2015/09/29 08:00:22 hannken Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -126,7 +126,7 @@ ./usr/lib/libposix_pic.a comp-c-piclib compatfile,picinstall ./usr/lib/libppath_pic.a comp-c-piclib compatfile,picinstall ./usr/lib/libproc.socomp-c-shlib compatfile,dtrace -./usr/lib/libproc.so.0comp-c-shlib compatfile,dtrace, +./usr/lib/libproc.so.0comp-c-shlib compatfile,dtrace ./usr/lib/libproc_pic.acomp-c-piclib compatfile,dtrace ./usr/lib/libprop_pic.acomp-c-piclib compatfile,picinstall ./usr/lib/libpthread_dbg_pic.a comp-c-piclib compatfile,picinstall
CVS commit: src/share/man/man7
Module Name:src Committed By: wiz Date: Tue Sep 29 07:59:15 UTC 2015 Modified Files: src/share/man/man7: sysctl.7 Log Message: Reduce whitespace. To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/share/man/man7/sysctl.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/sysctl.7 diff -u src/share/man/man7/sysctl.7:1.93 src/share/man/man7/sysctl.7:1.94 --- src/share/man/man7/sysctl.7:1.93 Thu Sep 24 14:56:41 2015 +++ src/share/man/man7/sysctl.7 Tue Sep 29 07:59:15 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysctl.7,v 1.93 2015/09/24 14:56:41 christos Exp $ +.\" $NetBSD: sysctl.7,v 1.94 2015/09/29 07:59:15 wiz Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -2282,7 +2282,7 @@ The returned data consists of a .It vm.user_va0_disable A flag which controls whether user processes can map virtual address\ 0. .It Li vm.proc.map ( Dv VM_PROC ) -The third level is +The third level is .dv VM_PROC_MAP , the fourth is the pid of the process to display the vm object entries for, and the fifth is the size of
CVS commit: xsrc/external/mit/xf86-video-chips/dist/src
Module Name:xsrc Committed By: wiz Date: Tue Sep 29 07:42:35 UTC 2015 Modified Files: xsrc/external/mit/xf86-video-chips/dist/src: ct_driver.c Log Message: Reduce diffs to upstream: return Bool as function wants. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 \ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.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-chips/dist/src/ct_driver.c diff -u xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.15 xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.16 --- xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.15 Wed Mar 5 21:29:31 2014 +++ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c Tue Sep 29 07:42:35 2015 @@ -822,7 +822,7 @@ CHIPSPciProbe(DriverPtr drv, int entity_ pScrn->ValidMode = CHIPSValidMode; if (!CHIPSGetRec(pScrn)) { - return 0; + return FALSE; } cPtr = CHIPSPTR(pScrn); cPtr->Chipset = match_data;