CVS commit: src/external/gpl3/gdb/lib

2016-10-13 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Fri Oct 14 05:37:45 UTC 2016

Modified Files:
src/external/gpl3/gdb/lib/libbfd/arch/earmv4: bfd_stdint.h targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/sparc: bfd_stdint.h
src/external/gpl3/gdb/lib/libbfd/arch/sparc64: bfd_stdint.h targmatch.h
src/external/gpl3/gdb/lib/libdecnumber/arch/earmv4: gstdint.h
src/external/gpl3/gdb/lib/libdecnumber/arch/sparc: gstdint.h
src/external/gpl3/gdb/lib/libdecnumber/arch/sparc64: gstdint.h
src/external/gpl3/gdb/lib/libgdb/arch/earmv4/build-gnulib: config.h
src/external/gpl3/gdb/lib/libgdb/arch/sparc/build-gnulib: config.h
src/external/gpl3/gdb/lib/libgdb/arch/sparc64: config.h
src/external/gpl3/gdb/lib/libgdb/arch/sparc64/build-gnulib: config.h

Log Message:
mknative for gdb 7.12 and sparc*, and earmv4.  sparc64 doesn't build yet.
others not yet tested.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gdb/lib/libbfd/arch/earmv4/bfd_stdint.h \
src/external/gpl3/gdb/lib/libbfd/arch/earmv4/targmatch.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gdb/lib/libbfd/arch/sparc/bfd_stdint.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gdb/lib/libbfd/arch/sparc64/bfd_stdint.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gdb/lib/libbfd/arch/sparc64/targmatch.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gdb/lib/libdecnumber/arch/earmv4/gstdint.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gdb/lib/libdecnumber/arch/sparc/gstdint.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gdb/lib/libdecnumber/arch/sparc64/gstdint.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gdb/lib/libgdb/arch/earmv4/build-gnulib/config.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gdb/lib/libgdb/arch/sparc/build-gnulib/config.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gdb/lib/libgdb/arch/sparc64/config.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gdb/lib/libgdb/arch/sparc64/build-gnulib/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gdb/lib/libbfd/arch/earmv4/bfd_stdint.h
diff -u src/external/gpl3/gdb/lib/libbfd/arch/earmv4/bfd_stdint.h:1.2 src/external/gpl3/gdb/lib/libbfd/arch/earmv4/bfd_stdint.h:1.3
--- src/external/gpl3/gdb/lib/libbfd/arch/earmv4/bfd_stdint.h:1.2	Thu Feb  4 00:32:33 2016
+++ src/external/gpl3/gdb/lib/libbfd/arch/earmv4/bfd_stdint.h	Fri Oct 14 05:37:44 2016
@@ -2,7 +2,7 @@
 /* Generated from: NetBSD: mknative-gdb,v 1.6 2013/10/03 18:58:37 christos Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
 
-/* generated for  armv4--netbsdelf-eabi-gcc (NetBSD nb3 20151015) 4.8.5 */
+/* generated for  armv4--netbsdelf-eabi-gcc (NetBSD nb1 20160606) 5.4.0 */
 
 #ifndef GCC_GENERATED_STDINT_H
 #define GCC_GENERATED_STDINT_H 1
Index: src/external/gpl3/gdb/lib/libbfd/arch/earmv4/targmatch.h
diff -u src/external/gpl3/gdb/lib/libbfd/arch/earmv4/targmatch.h:1.2 src/external/gpl3/gdb/lib/libbfd/arch/earmv4/targmatch.h:1.3
--- src/external/gpl3/gdb/lib/libbfd/arch/earmv4/targmatch.h:1.2	Thu Feb  4 00:32:33 2016
+++ src/external/gpl3/gdb/lib/libbfd/arch/earmv4/targmatch.h	Fri Oct 14 05:37:44 2016
@@ -1518,24 +1518,7 @@
 
 
 
-#ifdef BFD64
-#if !defined (SELECT_VECS) || defined (HAVE_mips_elf32_trad_le_vec)
-
-{ "mips*el-*-netbsd*",
-_elf32_trad_le_vec },
-#endif
-
-
-
-#if !defined (SELECT_VECS) || defined (HAVE_mips_elf32_trad_be_vec)
-
-{ "mips*-*-netbsd*",
-_elf32_trad_be_vec },
-#endif
-
 
-
-#endif
 #if !defined (SELECT_VECS) || defined (HAVE_mips_ecoff_le_vec)
 
 { "mips*-dec-*", NULL },{ "mips*el-*-ecoff*",
@@ -1677,6 +1660,38 @@
 
 
 
+#if !defined (SELECT_VECS) || defined (HAVE_mips_elf32_ntrad_le_vec)
+
+{ "mips64*el-*-netbsd*",
+_elf32_ntrad_le_vec },
+#endif
+
+
+
+#if !defined (SELECT_VECS) || defined (HAVE_mips_elf32_ntrad_be_vec)
+
+{ "mips64*-*-netbsd*",
+_elf32_ntrad_be_vec },
+#endif
+
+
+
+#if !defined (SELECT_VECS) || defined (HAVE_mips_elf32_trad_le_vec)
+
+{ "mips*el-*-netbsd*",
+_elf32_trad_le_vec },
+#endif
+
+
+
+#if !defined (SELECT_VECS) || defined (HAVE_mips_elf32_trad_be_vec)
+
+{ "mips*-*-netbsd*",
+_elf32_trad_be_vec },
+#endif
+
+
+
 #if !defined (SELECT_VECS) || defined (HAVE_mips_elf64_trad_be_vec)
 
 { "mips64*-*-openbsd*",

Index: src/external/gpl3/gdb/lib/libbfd/arch/sparc/bfd_stdint.h
diff -u src/external/gpl3/gdb/lib/libbfd/arch/sparc/bfd_stdint.h:1.5 src/external/gpl3/gdb/lib/libbfd/arch/sparc/bfd_stdint.h:1.6
--- src/external/gpl3/gdb/lib/libbfd/arch/sparc/bfd_stdint.h:1.5	Sat Mar 26 10:29:44 2016
+++ src/external/gpl3/gdb/lib/libbfd/arch/sparc/bfd_stdint.h	Fri Oct 14 05:37:44 2016
@@ -2,7 +2,7 @@
 /* Generated from: NetBSD: mknative-gdb,v 1.6 2013/10/03 18:58:37 christos Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43

CVS commit: src/games/fortune/datfiles

2016-10-13 Thread David A. Holland 
Module Name:src
Committed By:   dholland
Date:   Fri Oct 14 03:20:04 UTC 2016

Modified Files:
src/games/fortune/datfiles: fortunes

Log Message:
add a couple


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/games/fortune/datfiles/fortunes

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/games/fortune/datfiles/fortunes
diff -u src/games/fortune/datfiles/fortunes:1.60 src/games/fortune/datfiles/fortunes:1.61
--- src/games/fortune/datfiles/fortunes:1.60	Fri Jul 15 06:13:50 2016
+++ src/games/fortune/datfiles/fortunes	Fri Oct 14 03:20:04 2016
@@ -16183,3 +16183,18 @@ be named Eustace Clarence Scrubb.
 Never leave a macassar and an antimacassar in the same room together.
 %
 Why did the furry install Unix? Because it supports catman(8).
+%
+Many people don't realize that trailhead doggerel is illegal -- but
+surely you've heard of "hike rhymes and misdemeanors"...
+%
+We all know political bumper stickers and some of us even put them on
+our cars. However, if you show up at headquarters on Friday afternoon
+after a long campaign week, you're more likely to see a stumper
+bicker.
+%
+When you're under siege by a winter storm, that's a "frontal assault".
+%
+Somebody has mail.
+%
+'Agnosis' is when you don't know. 'Diagnosis' is when you don't know
+twice.

CVS commit: xsrc/external/mit/libX11/dist/modules/im/ximcp

2016-10-13 Thread Joerg Sonnenberger 
Module Name:xsrc
Committed By:   joerg
Date:   Thu Oct 13 23:38:48 UTC 2016

Modified Files:
xsrc/external/mit/libX11/dist/modules/im/ximcp: imLcLkup.c

Log Message:
Add explicit char cast to deal with constants being implicitly changed
on signed char platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.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/libX11/dist/modules/im/ximcp/imLcLkup.c
diff -u xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c:1.1.1.5 xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c:1.2
--- xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c:1.1.1.5	Thu May 30 23:04:43 2013
+++ xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c	Thu Oct 13 23:38:47 2016
@@ -219,9 +219,9 @@ _XimLocalUtf8LookupString(XIC xic, XKeyE
 		if(status) *status = XBufferOverflow;
 		return (ret);
 	}
-	buffer[0] = 0xe0 | ((BRL_UC_ROW >> 12) & 0x0f);
-	buffer[1] = 0x80 | ((BRL_UC_ROW >> 8) & 0x30) | (pattern >> 6);
-	buffer[2] = 0x80 | (pattern & 0x3f);
+	buffer[0] = (char)(0xe0 | ((BRL_UC_ROW >> 12) & 0x0f));
+	buffer[1] = (char)(0x80 | ((BRL_UC_ROW >> 8) & 0x30) | (pattern >> 6));
+	buffer[2] = (char)(0x80 | (pattern & 0x3f));
 	if(keysym) {
 		*keysym = XK_braille_blank | pattern;
 		if(status) *status = XLookupBoth;

CVS commit: xsrc/external/mit/pixman/dist/pixman

2016-10-13 Thread Joerg Sonnenberger 
Module Name:xsrc
Committed By:   joerg
Date:   Thu Oct 13 23:26:59 UTC 2016

Modified Files:
xsrc/external/mit/pixman/dist/pixman: pixman-x86.c

Log Message:
Using defined() in a macro as condition for another #if is not portable C.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/pixman/dist/pixman/pixman-x86.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/pixman/dist/pixman/pixman-x86.c
diff -u xsrc/external/mit/pixman/dist/pixman/pixman-x86.c:1.1.1.2 xsrc/external/mit/pixman/dist/pixman/pixman-x86.c:1.2
--- xsrc/external/mit/pixman/dist/pixman/pixman-x86.c:1.1.1.2	Mon Mar 17 01:18:22 2014
+++ xsrc/external/mit/pixman/dist/pixman/pixman-x86.c	Thu Oct 13 23:26:59 2016
@@ -74,8 +74,11 @@ detect_cpu_features (void)
 
 #else
 
-#define _PIXMAN_X86_64			\
-(defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64))
+#if defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64)
+#define _PIXMAN_X86_64 1
+#else
+#define _PIXMAN_X86_64 0
+#endif
 
 static pixman_bool_t
 have_cpuid (void)

CVS commit: src/external/gpl3/gdb/lib

2016-10-13 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Oct 13 21:09:14 UTC 2016

Modified Files:
src/external/gpl3/gdb/lib/libbfd/arch/hppa: bfd-in3.h bfd.h
bfd_stdint.h bfdver.h config.h targmatch.h
src/external/gpl3/gdb/lib/libdecnumber/arch/hppa: gstdint.h
src/external/gpl3/gdb/lib/libgdb/arch/hppa: config.h defs.mk init.c
jit-reader.h observer.h observer.inc version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/hppa/build-gnulib: config.h
src/external/gpl3/gdb/lib/libiberty/arch/hppa: config.h
src/external/gpl3/gdb/lib/libopcodes/arch/hppa: config.h

Log Message:
mknative for hppa gdb 7.12


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/lib/libbfd/arch/hppa/bfd-in3.h \
src/external/gpl3/gdb/lib/libbfd/arch/hppa/bfd.h \
src/external/gpl3/gdb/lib/libbfd/arch/hppa/bfdver.h \
src/external/gpl3/gdb/lib/libbfd/arch/hppa/config.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gdb/lib/libbfd/arch/hppa/bfd_stdint.h \
src/external/gpl3/gdb/lib/libbfd/arch/hppa/targmatch.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gdb/lib/libdecnumber/arch/hppa/gstdint.h
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/lib/libgdb/arch/hppa/config.h \
src/external/gpl3/gdb/lib/libgdb/arch/hppa/version.c \
src/external/gpl3/gdb/lib/libgdb/arch/hppa/xml-builtin.c
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/lib/libgdb/arch/hppa/defs.mk \
src/external/gpl3/gdb/lib/libgdb/arch/hppa/init.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gdb/lib/libgdb/arch/hppa/jit-reader.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gdb/lib/libgdb/arch/hppa/observer.h \
src/external/gpl3/gdb/lib/libgdb/arch/hppa/observer.inc
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gdb/lib/libgdb/arch/hppa/build-gnulib/config.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gdb/lib/libiberty/arch/hppa/config.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gdb/lib/libopcodes/arch/hppa/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gdb/lib/libbfd/arch/hppa/bfd-in3.h
diff -u src/external/gpl3/gdb/lib/libbfd/arch/hppa/bfd-in3.h:1.5 src/external/gpl3/gdb/lib/libbfd/arch/hppa/bfd-in3.h:1.6
--- src/external/gpl3/gdb/lib/libbfd/arch/hppa/bfd-in3.h:1.5	Wed Feb  3 22:13:37 2016
+++ src/external/gpl3/gdb/lib/libbfd/arch/hppa/bfd-in3.h	Thu Oct 13 21:09:13 2016
@@ -11,7 +11,7 @@
 
 /* Main header file for the bfd library -- portable access to object files.
 
-   Copyright (C) 1990-2015 Free Software Foundation, Inc.
+   Copyright (C) 1990-2016 Free Software Foundation, Inc.
 
Contributed by Cygnus Support.
 
@@ -267,7 +267,7 @@ struct orl 			/* Output ranlib.  */
   } u;			/* bfd* or file position.  */
   int namidx;		/* Index into string table.  */
 };
-
+
 /* Linenumber stuff.  */
 typedef struct lineno_cache_entry
 {
@@ -281,11 +281,19 @@ typedef struct lineno_cache_entry
 alent;
 
 /* Object and core file sections.  */
+typedef struct bfd_section *sec_ptr;
 
 #define	align_power(addr, align)	\
-  (((addr) + ((bfd_vma) 1 << (align)) - 1) & ((bfd_vma) -1 << (align)))
+  (((addr) + ((bfd_vma) 1 << (align)) - 1) & (-((bfd_vma) 1 << (align
 
-typedef struct bfd_section *sec_ptr;
+/* Align an address upward to a boundary, expressed as a number of bytes.
+   E.g. align to an 8-byte boundary with argument of 8.  Take care never
+   to wrap around if the address is within boundary-1 of the end of the
+   address space.  */
+#define BFD_ALIGN(this, boundary)	  \
+  bfd_vma) (this) + (boundary) - 1) >= (bfd_vma) (this))		  \
+   ? (((bfd_vma) (this) + ((boundary) - 1)) & ~ (bfd_vma) ((boundary)-1)) \
+   : ~ (bfd_vma) 0)
 
 #define bfd_get_section_name(bfd, ptr) ((void) bfd, (ptr)->name)
 #define bfd_get_section_vma(bfd, ptr) ((void) bfd, (ptr)->vma)
@@ -522,7 +530,6 @@ extern void warn_deprecated (const char 
 #define bfd_get_file_flags(abfd) ((abfd)->flags)
 #define bfd_applicable_file_flags(abfd) ((abfd)->xvec->object_flags)
 #define bfd_applicable_section_flags(abfd) ((abfd)->xvec->section_flags)
-#define bfd_my_archive(abfd) ((abfd)->my_archive)
 #define bfd_has_map(abfd) ((abfd)->has_armap)
 #define bfd_is_thin_archive(abfd) ((abfd)->is_thin_archive)
 
@@ -860,6 +867,23 @@ extern bfd_boolean bfd_elf32_arm_vfp11_e
 extern void bfd_elf32_arm_vfp11_fix_veneer_locations
   (bfd *, struct bfd_link_info *);
 
+/* ARM STM STM32L4XX erratum workaround support.  */
+typedef enum
+{
+  BFD_ARM_STM32L4XX_FIX_NONE,
+  BFD_ARM_STM32L4XX_FIX_DEFAULT,
+  BFD_ARM_STM32L4XX_FIX_ALL
+} bfd_arm_stm32l4xx_fix;
+
+extern void bfd_elf32_arm_set_stm32l4xx_fix
+  (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean bfd_elf32_arm_stm32l4xx_erratum_scan
+  (bfd *, struct bfd_link_info *);
+
+extern void bfd_elf32_arm_stm32l4xx_fix_veneer_locations
+  (bfd *, struct bfd_link_info *);
+
 /* ARM

CVS commit: src/sys/dev/pci

2016-10-13 Thread Jaromir Dolecek 
Module Name:src
Committed By:   jdolecek
Date:   Thu Oct 13 20:05:06 UTC 2016

Modified Files:
src/sys/dev/pci: ehci_pci.c ichsmb.c xhci_pci.c
src/sys/dev/pci/ixgbe: ixgbe.c

Log Message:
provide intr xname


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/pci/ehci_pci.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/pci/ichsmb.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/xhci_pci.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/pci/ixgbe/ixgbe.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/ehci_pci.c
diff -u src/sys/dev/pci/ehci_pci.c:1.63 src/sys/dev/pci/ehci_pci.c:1.64
--- src/sys/dev/pci/ehci_pci.c:1.63	Sat Apr 23 10:15:31 2016
+++ src/sys/dev/pci/ehci_pci.c	Thu Oct 13 20:05:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci_pci.c,v 1.63 2016/04/23 10:15:31 skrll Exp $	*/
+/*	$NetBSD: ehci_pci.c,v 1.64 2016/10/13 20:05:06 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.63 2016/04/23 10:15:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.64 2016/10/13 20:05:06 jdolecek Exp $");
 
 #include 
 #include 
@@ -176,7 +176,8 @@ ehci_pci_attach(device_t parent, device_
 	 * Allocate IRQ
 	 */
 	intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
-	sc->sc_ih = pci_intr_establish(pc, ih, IPL_USB, ehci_intr, sc);
+	sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_USB, ehci_intr, sc,
+	device_xname(self));
 	if (sc->sc_ih == NULL) {
 		aprint_error_dev(self, "couldn't establish interrupt");
 		if (intrstr != NULL)

Index: src/sys/dev/pci/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.46 src/sys/dev/pci/ichsmb.c:1.47
--- src/sys/dev/pci/ichsmb.c:1.46	Thu Jul  7 06:55:41 2016
+++ src/sys/dev/pci/ichsmb.c	Thu Oct 13 20:05:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ichsmb.c,v 1.46 2016/07/07 06:55:41 msaitoh Exp $	*/
+/*	$NetBSD: ichsmb.c,v 1.47 2016/10/13 20:05:06 jdolecek Exp $	*/
 /*	$OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $	*/
 
 /*
@@ -22,7 +22,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.46 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.47 2016/10/13 20:05:06 jdolecek Exp $");
 
 #include 
 #include 
@@ -175,8 +175,8 @@ ichsmb_attach(device_t parent, device_t 
 		if (pci_intr_map(pa, ) == 0) {
 			intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf,
 			sizeof(intrbuf));
-			sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO,
-			ichsmb_intr, sc);
+			sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih,
+			IPL_BIO, ichsmb_intr, sc, device_xname(sc->sc_dev));
 			if (sc->sc_ih != NULL) {
 aprint_normal_dev(self, "interrupting at %s\n",
 intrstr);

Index: src/sys/dev/pci/xhci_pci.c
diff -u src/sys/dev/pci/xhci_pci.c:1.6 src/sys/dev/pci/xhci_pci.c:1.7
--- src/sys/dev/pci/xhci_pci.c:1.6	Tue May  3 13:14:44 2016
+++ src/sys/dev/pci/xhci_pci.c	Thu Oct 13 20:05:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: xhci_pci.c,v 1.6 2016/05/03 13:14:44 skrll Exp $	*/
+/*	$NetBSD: xhci_pci.c,v 1.7 2016/10/13 20:05:06 jdolecek Exp $	*/
 /*	OpenBSD: xhci_pci.c,v 1.4 2014/07/12 17:38:51 yuo Exp	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.6 2016/05/03 13:14:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.7 2016/10/13 20:05:06 jdolecek Exp $");
 
 #include 
 #include 
@@ -181,8 +181,8 @@ xhci_pci_attach(device_t parent, device_
 	}
 	intrstr = pci_intr_string(pc, psc->sc_pihp[0], intrbuf,
 	sizeof(intrbuf));
-	psc->sc_ih = pci_intr_establish(pc, psc->sc_pihp[0], IPL_USB,
-	xhci_intr, sc);
+	psc->sc_ih = pci_intr_establish_xname(pc, psc->sc_pihp[0], IPL_USB,
+	xhci_intr, sc, device_xname(sc->sc_dev));
 	if (psc->sc_ih == NULL) {
 		aprint_error_dev(self, "couldn't establish interrupt");
 		if (intrstr != NULL)

Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.39 src/sys/dev/pci/ixgbe/ixgbe.c:1.40
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.39	Mon Jul 11 06:14:51 2016
+++ src/sys/dev/pci/ixgbe/ixgbe.c	Thu Oct 13 20:05:06 2016
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: head/sys/dev/ixgbe/ixgbe.c 279805 2015-03-09 10:29:15Z araujo $*/
-/*$NetBSD: ixgbe.c,v 1.39 2016/07/11 06:14:51 knakahara Exp $*/
+/*$NetBSD: ixgbe.c,v 1.40 2016/10/13 20:05:06 jdolecek Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -2516,8 +2516,8 @@ ixgbe_allocate_legacy(struct adapter *ad
 		intrstr = pci_intr_string(adapter->osdep.pc, ih, intrbuf,
 		sizeof(intrbuf));
 	}
-	adapter->osdep.ihs[0] = pci_intr_establish(adapter->osdep.pc, ih,
-	IPL_NET, ixgbe_legacy_irq, que);
+	adapter->osdep.ihs[0] = pci_intr_establish_xname(adapter->osdep.pc, ih,
+	IPL_NET, ixgbe_legacy_irq, que, device_xname(dev));
 #else
 	/* Allocation settings */
 	max_type = PCI_INTR_TYPE_MSI;
@@ -2533,8 +2533,9 @@

CVS commit: src/sys/kern

2016-10-13 Thread Valeriy E. Ushakov 
Module Name:src
Committed By:   uwe
Date:   Thu Oct 13 19:10:23 UTC 2016

Modified Files:
src/sys/kern: uipc_socket.c

Log Message:
Revert to revision 1.249 to undo changes from PR 49636.

Marking up some zeroes with a type suffix, while not marking others in
the very same function does nothing but places cognitive burden on the
reader.

Spelling "clear bits" as "&~" is actually not uncommon (and some say
is more readable).


To generate a diff of this commit:
cvs rdiff -u -r1.251 -r1.252 src/sys/kern/uipc_socket.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.251 src/sys/kern/uipc_socket.c:1.252
--- src/sys/kern/uipc_socket.c:1.251	Mon Oct 10 01:22:51 2016
+++ src/sys/kern/uipc_socket.c	Thu Oct 13 19:10:23 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.251 2016/10/10 01:22:51 dholland Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.252 2016/10/13 19:10:23 uwe Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.251 2016/10/10 01:22:51 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.252 2016/10/13 19:10:23 uwe Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -346,7 +346,7 @@ sosend_loan(struct socket *so, struct ui
 	int i;
 
 	if (VMSPACE_IS_KERNEL_P(uio->uio_vmspace))
-		return 0L;
+		return (0);
 
 	if (iov->iov_len < (size_t) space)
 		space = iov->iov_len;
@@ -362,13 +362,13 @@ sosend_loan(struct socket *so, struct ui
 
 	lva = sokvaalloc(sva, len, so);
 	if (lva == 0)
-		return 0L;
+		return 0;
 
 	error = uvm_loan(>uio_vmspace->vm_map, sva, len,
 	m->m_ext.ext_pgs, UVM_LOAN_TOPAGE);
 	if (error) {
 		sokvafree(lva, len);
-		return 0L;
+		return (0);
 	}
 
 	for (i = 0, va = lva; i < npgs; i++, va += PAGE_SIZE)
@@ -1008,7 +1008,7 @@ sosend(struct socket *so, struct sockadd
 uio->uio_iov->iov_len >= sock_loan_thresh &&
 space >= sock_loan_thresh &&
 (len = sosend_loan(so, uio, m,
-		   space)) != 0L) {
+		   space)) != 0) {
 	SOSEND_COUNTER_INCR(_loan_big);
 	space -= len;
 	goto have_data;
@@ -1175,7 +1175,7 @@ soreceive(struct socket *so, struct mbuf
 	if (controlp != NULL)
 		*controlp = NULL;
 	if (flagsp != NULL)
-		flags = *flagsp & ~MSG_EOR;
+		flags = *flagsp &~ MSG_EOR;
 	else
 		flags = 0;

CVS commit: src/sys/arch/mips/mips

2016-10-13 Thread Michael Lorenz 
Module Name:src
Committed By:   macallan
Date:   Thu Oct 13 18:58:00 UTC 2016

Modified Files:
src/sys/arch/mips/mips: locore.S

Log Message:
include locore.h for MIPS3_PLUS, while there annotate some #else and #endif


To generate a diff of this commit:
cvs rdiff -u -r1.206 -r1.207 src/sys/arch/mips/mips/locore.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/mips/mips/locore.S
diff -u src/sys/arch/mips/mips/locore.S:1.206 src/sys/arch/mips/mips/locore.S:1.207
--- src/sys/arch/mips/mips/locore.S:1.206	Fri Aug 19 10:05:35 2016
+++ src/sys/arch/mips/mips/locore.S	Thu Oct 13 18:58:00 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.206 2016/08/19 10:05:35 skrll Exp $	*/
+/*	$NetBSD: locore.S,v 1.207 2016/10/13 18:58:00 macallan Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -61,8 +61,9 @@
 #include 
 #include 
 #include 
+#include 
 
-RCSID("$NetBSD: locore.S,v 1.206 2016/08/19 10:05:35 skrll Exp $")
+RCSID("$NetBSD: locore.S,v 1.207 2016/10/13 18:58:00 macallan Exp $")
 
 #include "assym.h"
 
@@ -143,10 +144,10 @@ _C_LABEL(kernel_text):
 	li	t0, MIPS_SR_KX | MIPS_SR_UX	# turn on XKSEG and XKPHYS
 #else
 	li	t0, 0# Disable interrupts and
-#endif
+#endif /* n32 */
 	mtc0	t0, MIPS_COP_0_STATUS		# the fp coprocessor
 	COP0_SYNC
-#endif
+#endif /* !emips */
 #ifdef HPCMIPS_L1CACHE_DISABLE
 	mfc0	t0, MIPS_COP_0_CONFIG
 	li	t1, 0xfff8
@@ -155,7 +156,7 @@ _C_LABEL(kernel_text):
 	mtc0	t0, MIPS_COP_0_CONFIG
 	COP0_SYNC
 #endif /* HPCMIPS_L1CACHE_DISABLE */
-#else
+#else /* NOFPU */
 	mfc0	t0, MIPS_COP_0_STATUS
 	MFC0_HAZARD
 #if defined(_LP64) || defined(__mips_n32)

CVS commit: src/sys/arch/mips/mips

2016-10-13 Thread Michael Lorenz 
Module Name:src
Committed By:   macallan
Date:   Thu Oct 13 18:54:46 UTC 2016

Modified Files:
src/sys/arch/mips/mips: fp.S

Log Message:
include locore.h so MIPS3_PLUS is visible and we build support for MIPS-III
and newer FPUs as needed
no more SIGILLs on trunc.d.* with n32 userlands


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/mips/mips/fp.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/mips/mips/fp.S
diff -u src/sys/arch/mips/mips/fp.S:1.46 src/sys/arch/mips/mips/fp.S:1.47
--- src/sys/arch/mips/mips/fp.S:1.46	Mon Jun  8 16:25:29 2015
+++ src/sys/arch/mips/mips/fp.S	Thu Oct 13 18:54:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fp.S,v 1.46 2015/06/08 16:25:29 matt Exp $	*/
+/*	$NetBSD: fp.S,v 1.47 2016/10/13 18:54:46 macallan Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -40,6 +40,8 @@
 #include 
 #include 
 
+#include 
+
 #include "assym.h"
 
 #define SEXP_INF	0xff

CVS commit: src/sys/arch/mips/include

2016-10-13 Thread Michael Lorenz 
Module Name:src
Committed By:   macallan
Date:   Thu Oct 13 18:52:30 UTC 2016

Modified Files:
src/sys/arch/mips/include: locore.h

Log Message:
sprinkle #ifndef __ASSEMBLER__ to make this file usable from .S - mostly for
macros like MIPS3_PLUS


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/mips/include/locore.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/mips/include/locore.h
diff -u src/sys/arch/mips/include/locore.h:1.100 src/sys/arch/mips/include/locore.h:1.101
--- src/sys/arch/mips/include/locore.h:1.100	Mon Jul 11 16:15:35 2016
+++ src/sys/arch/mips/include/locore.h	Thu Oct 13 18:52:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.100 2016/07/11 16:15:35 matt Exp $ */
+/* $NetBSD: locore.h,v 1.101 2016/10/13 18:52:30 macallan Exp $ */
 
 /*
  * This file should not be included by MI code!!!
@@ -32,6 +32,8 @@
 #include "opt_cputype.h"
 #endif
 
+#ifndef __ASSEMBLER__
+
 #include 
 
 #include 
@@ -45,6 +47,7 @@ typedef uint32_t pt_entry_t;
 #endif
 
 #include 
+#endif /* !__ASSEMBLER__ */
 
 #ifdef _KERNEL
 
@@ -90,6 +93,9 @@ typedef uint32_t pt_entry_t;
 #error MIPS1 does not support non-4KB page sizes.
 #endif
 
+/* XXX some .S files look for MIPS3_PLUS */
+#ifndef __ASSEMBLER__
+
 /* XXX simonb
  * Should the following be in a cpu_info type structure?
  * And how many of these are per-cpu vs. per-system?  (Ie,
@@ -122,6 +128,8 @@ struct mips_options {
 #endif
 };
 
+#endif /* !__ASSEMBLER__ */
+
 /*
  * Macros to find the CPU architecture we're on at run-time,
  * or if possible, at compile-time.
@@ -309,6 +317,8 @@ struct mips_options {
 
 #endif /* run-time test */
 
+#ifndef __ASSEMBLER__
+
 struct tlbmask;
 struct trapframe;
 
@@ -966,7 +976,7 @@ struct pridtab {
 # define MIPS_CIDFL_RMI_L2SZ(cidfl)	\
 		((256*1024) << (((cidfl) & MIPS_CIDFL_RMI_L2SZ_MASK)	\
 			>> MIPS_CIDFL_RMI_L2SZ_SHIFT))
-
+#endif /* !__ASSEMBLER__ */
 #endif	/* _KERNEL */
 
 #endif	/* _MIPS_LOCORE_H */

CVS commit: src/external/public-domain/sqlite

2016-10-13 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Thu Oct 13 18:11:20 UTC 2016

Modified Files:
src/external/public-domain/sqlite: Makefile.inc
src/external/public-domain/sqlite/dist: sqlite3.c

Log Message:
PR lib/51533: make big endian arm support work again, patch from
Rin Okuyama.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/public-domain/sqlite/Makefile.inc
cvs rdiff -u -r1.14 -r1.15 src/external/public-domain/sqlite/dist/sqlite3.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/public-domain/sqlite/Makefile.inc
diff -u src/external/public-domain/sqlite/Makefile.inc:1.6 src/external/public-domain/sqlite/Makefile.inc:1.7
--- src/external/public-domain/sqlite/Makefile.inc:1.6	Sun Jul  3 10:27:00 2016
+++ src/external/public-domain/sqlite/Makefile.inc	Thu Oct 13 18:11:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2016/07/03 10:27:00 abhinav Exp $
+# $NetBSD: Makefile.inc,v 1.7 2016/10/13 18:11:19 martin Exp $
 
 WARNS=		2
 
@@ -14,6 +14,7 @@ CPPFLAGS+=	\
 		-DHAVE_STDINT_H=1 \
 		-DHAVE_STRERROR_R=1 \
 		-DHAVE_USLEEP=1 \
+		-DHAVE_SYS_ENDIAN_H=1 \
 		-DSQLITE_ENABLE_COLUMN_METADATA \
 		-DSQLITE_ENABLE_FTS3_PARENTHESIS \
 		-DSQLITE_ENABLE_FTS4 \

Index: src/external/public-domain/sqlite/dist/sqlite3.c
diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.14 src/external/public-domain/sqlite/dist/sqlite3.c:1.15
--- src/external/public-domain/sqlite/dist/sqlite3.c:1.14	Mon Jul  4 03:04:25 2016
+++ src/external/public-domain/sqlite/dist/sqlite3.c	Thu Oct 13 18:11:19 2016
@@ -11567,23 +11567,31 @@ typedef INT16_TYPE LogEst;
 ** -DSQLITE_RUNTIME_BYTEORDER=1 is set, then byte-order is determined
 ** at run-time.
 */
-#if (defined(i386) || defined(__i386__)   || defined(_M_IX86) ||\
+#if defined(HAVE_SYS_ENDIAN_H) && !defined(SQLITE_RUNTIME_BYTEORDER)
+# include 
+# define SQLITE_BYTEORDER _BYTE_ORDER
+#elif (defined(i386)   || defined(__i386__)   || defined(_M_IX86) ||\
  defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||\
  defined(_M_AMD64) || defined(_M_ARM) || defined(__x86)   ||\
  defined(__arm__)) && !defined(SQLITE_RUNTIME_BYTEORDER)
 # define SQLITE_BYTEORDER1234
-# define SQLITE_BIGENDIAN0
-# define SQLITE_LITTLEENDIAN 1
-# define SQLITE_UTF16NATIVE  SQLITE_UTF16LE
-#endif
-#if (defined(sparc)|| defined(__ppc__))  \
+#elif (defined(sparc)  || defined(__ppc__))  \
 && !defined(SQLITE_RUNTIME_BYTEORDER)
 # define SQLITE_BYTEORDER4321
-# define SQLITE_BIGENDIAN1
-# define SQLITE_LITTLEENDIAN 0
-# define SQLITE_UTF16NATIVE  SQLITE_UTF16BE
 #endif
-#if !defined(SQLITE_BYTEORDER)
+#ifdef SQLITE_BYTEORDER
+# if   SQLITE_BYTEORDER == 1234
+#  define SQLITE_BIGENDIAN0
+#  define SQLITE_LITTLEENDIAN 1
+#  define SQLITE_UTF16NATIVE  SQLITE_UTF16LE
+# elif SQLITE_BYTEORDER == 4321
+#  define SQLITE_BIGENDIAN1
+#  define SQLITE_LITTLEENDIAN 0
+#  define SQLITE_UTF16NATIVE  SQLITE_UTF16BE
+# else
+#  error "Unknown byte order."
+# endif
+#else
 # ifdef SQLITE_AMALGAMATION
   const int sqlite3one = 1;
 # else

CVS commit: src/sys/dev/pci

2016-10-13 Thread Jaromir Dolecek 
Module Name:src
Committed By:   jdolecek
Date:   Thu Oct 13 17:11:09 UTC 2016

Modified Files:
src/sys/dev/pci: ahcisata_pci.c bha_pci.c pciide_common.c piixpm.c

Log Message:
provide intr xname


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/pci/ahcisata_pci.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/pci/bha_pci.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/pciide_common.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pci/piixpm.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/ahcisata_pci.c
diff -u src/sys/dev/pci/ahcisata_pci.c:1.37 src/sys/dev/pci/ahcisata_pci.c:1.38
--- src/sys/dev/pci/ahcisata_pci.c:1.37	Tue Aug 23 09:47:50 2016
+++ src/sys/dev/pci/ahcisata_pci.c	Thu Oct 13 17:11:09 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahcisata_pci.c,v 1.37 2016/08/23 09:47:50 msaitoh Exp $	*/
+/*	$NetBSD: ahcisata_pci.c,v 1.38 2016/10/13 17:11:09 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.37 2016/08/23 09:47:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.38 2016/10/13 17:11:09 jdolecek Exp $");
 
 #include 
 #include 
@@ -292,7 +292,8 @@ ahci_pci_attach(device_t parent, device_
 	}
 	intrstr = pci_intr_string(pa->pa_pc, intrhandle,
 	intrbuf, sizeof(intrbuf));
-	psc->sc_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO, ahci_intr, sc);
+	psc->sc_ih = pci_intr_establish_xname(pa->pa_pc, intrhandle, IPL_BIO,
+	ahci_intr, sc, device_xname(sc->sc_atac.atac_dev));
 	if (psc->sc_ih == NULL) {
 		aprint_error_dev(self, "couldn't establish interrupt\n");
 		return;

Index: src/sys/dev/pci/bha_pci.c
diff -u src/sys/dev/pci/bha_pci.c:1.40 src/sys/dev/pci/bha_pci.c:1.41
--- src/sys/dev/pci/bha_pci.c:1.40	Sat Oct 18 08:33:28 2014
+++ src/sys/dev/pci/bha_pci.c	Thu Oct 13 17:11:09 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: bha_pci.c,v 1.40 2014/10/18 08:33:28 snj Exp $	*/
+/*	$NetBSD: bha_pci.c,v 1.41 2016/10/13 17:11:09 jdolecek Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.40 2014/10/18 08:33:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.41 2016/10/13 17:11:09 jdolecek Exp $");
 
 #include 
 #include 
@@ -133,7 +133,8 @@ bha_pci_attach(device_t parent, device_t
 		return;
 	}
 	intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
-	sc->sc_ih = pci_intr_establish(pc, ih, IPL_BIO, bha_intr, sc);
+	sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_BIO, bha_intr, sc,
+	device_xname(sc->sc_dev));
 	if (sc->sc_ih == NULL) {
 		aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
 		if (intrstr != NULL)

Index: src/sys/dev/pci/pciide_common.c
diff -u src/sys/dev/pci/pciide_common.c:1.61 src/sys/dev/pci/pciide_common.c:1.62
--- src/sys/dev/pci/pciide_common.c:1.61	Thu Jul  7 06:55:41 2016
+++ src/sys/dev/pci/pciide_common.c	Thu Oct 13 17:11:09 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pciide_common.c,v 1.61 2016/07/07 06:55:41 msaitoh Exp $	*/
+/*	$NetBSD: pciide_common.c,v 1.62 2016/10/13 17:11:09 jdolecek Exp $	*/
 
 
 /*
@@ -70,7 +70,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.61 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.62 2016/10/13 17:11:09 jdolecek Exp $");
 
 #include 
 #include 
@@ -354,8 +354,9 @@ pciide_mapregs_native(const struct pci_a
 			goto bad;
 		}
 		intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf));
-		sc->sc_pci_ih = pci_intr_establish(pa->pa_pc,
-		intrhandle, IPL_BIO, pci_intr, sc);
+		sc->sc_pci_ih = pci_intr_establish_xname(pa->pa_pc,
+		intrhandle, IPL_BIO, pci_intr, sc,
+		device_xname(sc->sc_wdcdev.sc_atac.atac_dev));
 		if (sc->sc_pci_ih != NULL) {
 			aprint_normal_dev(sc->sc_wdcdev.sc_atac.atac_dev,
 			"using %s for native-PCI interrupt\n",

Index: src/sys/dev/pci/piixpm.c
diff -u src/sys/dev/pci/piixpm.c:1.50 src/sys/dev/pci/piixpm.c:1.51
--- src/sys/dev/pci/piixpm.c:1.50	Mon Jul 18 21:09:05 2016
+++ src/sys/dev/pci/piixpm.c	Thu Oct 13 17:11:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpm.c,v 1.50 2016/07/18 21:09:05 pgoyette Exp $ */
+/* $NetBSD: piixpm.c,v 1.51 2016/10/13 17:11:09 jdolecek Exp $ */
 /*	$OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $	*/
 
 /*
@@ -22,7 +22,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.50 2016/07/18 21:09:05 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.51 2016/10/13 17:11:09 jdolecek Exp $");
 
 #include 
 #include 
@@ -256,8 +256,8 @@ nopowermanagement:
 		if (pci_intr_map(pa, ) == 0) {
 			intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf,
 			sizeof(intrbuf));
-			sc->sc_smb_ih = pci_intr_establish(pa->pa_pc, ih,
-			IPL_BIO, piixpm_intr, sc);
+			sc->sc_smb_ih = pci_intr_establish_xname(pa->pa_pc, ih,
+			IPL_BIO,

CVS commit: src/sys/arch/alpha

2016-10-13 Thread Felix Deichmann 
Module Name:src
Committed By:   flxd
Date:   Thu Oct 13 16:18:20 UTC 2016

Modified Files:
src/sys/arch/alpha/alpha: machdep.c prom.c
src/sys/arch/alpha/stand/common: booted_dev.c prom.c

Log Message:
Match the two prom_getenv() and fix buffer overflow causing wrong host 
controller SCSI ID for DEC 3000.
OK skrll@


To generate a diff of this commit:
cvs rdiff -u -r1.346 -r1.347 src/sys/arch/alpha/alpha/machdep.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/alpha/alpha/prom.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/stand/common/booted_dev.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/alpha/stand/common/prom.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/alpha/alpha/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.346 src/sys/arch/alpha/alpha/machdep.c:1.347
--- src/sys/arch/alpha/alpha/machdep.c:1.346	Fri Oct 17 18:14:42 2014
+++ src/sys/arch/alpha/alpha/machdep.c	Thu Oct 13 16:18:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.346 2014/10/17 18:14:42 uebayasi Exp $ */
+/* $NetBSD: machdep.c,v 1.347 2016/10/13 16:18:20 flxd Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.346 2014/10/17 18:14:42 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.347 2016/10/13 16:18:20 flxd Exp $");
 
 #include 
 #include 
@@ -173,7 +173,7 @@ struct bootinfo_kernel bootinfo;
 
 /* For built-in TCDS */
 #if defined(DEC_3000_300) || defined(DEC_3000_500)
-uint8_t	dec_3000_scsiid[2], dec_3000_scsifast[2];
+uint8_t	dec_3000_scsiid[3], dec_3000_scsifast[3];
 #endif
 
 struct platform platform;

Index: src/sys/arch/alpha/alpha/prom.c
diff -u src/sys/arch/alpha/alpha/prom.c:1.48 src/sys/arch/alpha/alpha/prom.c:1.49
--- src/sys/arch/alpha/alpha/prom.c:1.48	Mon Feb  6 02:14:12 2012
+++ src/sys/arch/alpha/alpha/prom.c	Thu Oct 13 16:18:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: prom.c,v 1.48 2012/02/06 02:14:12 matt Exp $ */
+/* $NetBSD: prom.c,v 1.49 2016/10/13 16:18:20 flxd Exp $ */
 
 /*
  * Copyright (c) 1992, 1994, 1995, 1996 Carnegie Mellon University
@@ -27,7 +27,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.48 2012/02/06 02:14:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.49 2016/10/13 16:18:20 flxd Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -95,7 +95,7 @@ init_bootstrap_console(void)
 
 	init_prom_interface(hwrpb);
 
-	prom_getenv(PROM_E_TTY_DEV, buf, 4);
+	prom_getenv(PROM_E_TTY_DEV, buf, sizeof(buf));
 	alpha_console = buf[0] - '0';
 
 	/* XXX fake out the console routines, for now */
@@ -238,14 +238,14 @@ prom_getenv(int id, char *buf, int len)
 
 	prom_enter();
 	ret.bits = prom_getenv_disp(id, to, len);
-	memcpy(buf, to, len);
-	prom_leave();
-
 	if (ret.u.status & 0x4)
 		ret.u.retval = 0;
-	buf[ret.u.retval] = '\0';
+	len = min(len - 1, ret.u.retval);
+	memcpy(buf, to, len);
+	buf[len] = '\0';
+	prom_leave();
 
-	return (ret.bits);
+	return len;
 }
 
 void

Index: src/sys/arch/alpha/stand/common/booted_dev.c
diff -u src/sys/arch/alpha/stand/common/booted_dev.c:1.3 src/sys/arch/alpha/stand/common/booted_dev.c:1.4
--- src/sys/arch/alpha/stand/common/booted_dev.c:1.3	Sat Nov 13 21:38:20 1999
+++ src/sys/arch/alpha/stand/common/booted_dev.c	Thu Oct 13 16:18:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: booted_dev.c,v 1.3 1999/11/13 21:38:20 thorpej Exp $ */
+/* $NetBSD: booted_dev.c,v 1.4 2016/10/13 16:18:20 flxd Exp $ */
 
 /*
  * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
@@ -53,9 +53,8 @@ booted_dev_open(void)
 	 * We don't know what device names look like yet,
 	 * so we can't change them.
 	 */
-	ret.bits = prom_getenv(PROM_E_BOOTED_DEV, booted_dev_name,
+	devlen = prom_getenv(PROM_E_BOOTED_DEV, booted_dev_name,
 	sizeof(booted_dev_name));
-	devlen = ret.u.retval;
 
 	ret.bits = prom_open(booted_dev_name, devlen);
 

Index: src/sys/arch/alpha/stand/common/prom.c
diff -u src/sys/arch/alpha/stand/common/prom.c:1.14 src/sys/arch/alpha/stand/common/prom.c:1.15
--- src/sys/arch/alpha/stand/common/prom.c:1.14	Wed Mar 18 10:22:22 2009
+++ src/sys/arch/alpha/stand/common/prom.c	Thu Oct 13 16:18:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: prom.c,v 1.14 2009/03/18 10:22:22 cegger Exp $ */
+/* $NetBSD: prom.c,v 1.15 2016/10/13 16:18:20 flxd Exp $ */
 
 /*  
  * Mach Operating System
@@ -57,7 +57,7 @@ init_prom_calls(void)
 	prom_dispatch_v.routine = c->crb_v_dispatch->entry_va;
 
 	/* Look for console tty. */
-	prom_getenv(PROM_E_TTY_DEV, buf, 4);
+	prom_getenv(PROM_E_TTY_DEV, buf, sizeof(buf));
 	console = buf[0] - '0';
 }

CVS commit: src/external/gpl3/binutils/usr.bin/ld

2016-10-13 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Thu Oct 13 13:29:39 UTC 2016

Modified Files:
src/external/gpl3/binutils/usr.bin/ld: Makefile

Log Message:
Install the arm ldscripts for big endian variants too


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/external/gpl3/binutils/usr.bin/ld/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/binutils/usr.bin/ld/Makefile
diff -u src/external/gpl3/binutils/usr.bin/ld/Makefile:1.24 src/external/gpl3/binutils/usr.bin/ld/Makefile:1.25
--- src/external/gpl3/binutils/usr.bin/ld/Makefile:1.24	Tue Oct 11 07:23:52 2016
+++ src/external/gpl3/binutils/usr.bin/ld/Makefile	Thu Oct 13 13:29:39 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.24 2016/10/11 07:23:52 mrg Exp $
+#	$NetBSD: Makefile,v 1.25 2016/10/13 13:29:39 martin Exp $
 
 CPPFLAGS+=	-I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH} \
 		-I${DIST}/ld \
@@ -94,8 +94,8 @@ e${f}.c: ${DIST}/ld/genscripts.sh ${.CUR
 
 .if ${BINUTILS_MACHINE_ARCH} == "x86_64" || \
 ${BINUTILS_MACHINE_ARCH} == "sparc64" || \
-${BINUTILS_MACHINE_ARCH} == "earm" || \
-${BINUTILS_MACHINE_ARCH} == "arm" || \
+!empty(BINUTILS_MACHINE_ARCH:Mearm*) || \
+!empty(BINUTILS_MACHINE_ARCH:Marm*) || \
 ${BINUTILS_MACHINE_ARCH} == "aarch64" || \
 !empty(BINUTILS_MACHINE_ARCH:Mmips64*)
 FILES+=		${f}.x ${f}.xbn ${f}.xn ${f}.xr ${f}.xu
@@ -104,8 +104,8 @@ FILES+=		${f}.x ${f}.xbn ${f}.xn ${f}.xr
 HAS_XS!=	grep '^GENERATE_SHLIB_SCRIPT' ${DIST}/ld/emulparams/${f}.sh || echo
 # XXX
 #HAS_XC!=	grep '^GENERATE_COMBRELOC_SCRIPT' ${DIST}/ld/emulparams/${f}.sh || echo
-.if ${BINUTILS_MACHINE_ARCH} == "earm" || \
-${BINUTILS_MACHINE_ARCH} == "arm" || \
+.if !empty(BINUTILS_MACHINE_ARCH:Mearm*) || \
+!empty(BINUTILS_MACHINE_ARCH:Marm*) || \
 ${BINUTILS_MACHINE_ARCH} == "aarch64"
 HAS_XS=		yes
 .endif

CVS commit: src/share/man/man4

2016-10-13 Thread Masatake Daimon 
Module Name:src
Committed By:   pho
Date:   Thu Oct 13 13:04:02 UTC 2016

Modified Files:
src/share/man/man4: auich.4

Log Message:
PR kern/32569: Describe the sysctl variable the driver provides


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/share/man/man4/auich.4

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/man4/auich.4
diff -u src/share/man/man4/auich.4:1.23 src/share/man/man4/auich.4:1.24
--- src/share/man/man4/auich.4:1.23	Wed Apr 30 13:10:53 2008
+++ src/share/man/man4/auich.4	Thu Oct 13 13:04:02 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: auich.4,v 1.23 2008/04/30 13:10:53 martin Exp $
+.\"	$NetBSD: auich.4,v 1.24 2016/10/13 13:04:02 pho Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd March 14, 2006
+.Dd October 13, 2016
 .Dt AUICH 4
 .Os
 .Sh NAME
@@ -46,10 +46,25 @@ i82801BA (ICH2), i82440MX, i82801CA (ICH
 i82801FB (ICH6), i82801GB/GR (ICH7), and Intel 6300ESB.
 The driver also supports SiS 7012, nForce MCP, nForce2 MCP-T,
 nForce3 MCP-T, nForce3 250 MCP-T, nForce4, and AMD 8111.
+.Pp
+The driver provides the following
+.Xr sysctl 8
+read/write variable (when hardware support is available):
+.Bl -tag -width Ds
+.It Va hw.auich0.ac97rate
+Link rate of the device in Hz. The driver automatically measures and
+calculates the correct rate so you usually don't need to change
+this. There is, however, a chance that the driver miscalculates the
+rate especially on an emulated hardware, resulting in an incorrect
+playback pitch. When this happens you need to manually set this
+variable to the correct value. Try
+.Li 48000
+if you don't know the correct value as it is the default link rate.
 .Sh SEE ALSO
 .Xr ac97 4 ,
 .Xr audio 4 ,
-.Xr pci 4
+.Xr pci 4 ,
+.Xr sysctl 8
 .Sh HISTORY
 The
 .Nm

CVS commit: src/share/mk

2016-10-13 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Thu Oct 13 11:57:55 UTC 2016

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
Build the new X server on AArch64, it is slightly less offensive.


To generate a diff of this commit:
cvs rdiff -u -r1.970 -r1.971 src/share/mk/bsd.own.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.970 src/share/mk/bsd.own.mk:1.971
--- src/share/mk/bsd.own.mk:1.970	Wed Oct 12 20:22:05 2016
+++ src/share/mk/bsd.own.mk	Thu Oct 13 11:57:55 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.970 2016/10/12 20:22:05 christos Exp $
+#	$NetBSD: bsd.own.mk,v 1.971 2016/10/13 11:57:55 joerg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1364,7 +1364,8 @@ X11SRCDIR.${_proto}proto?=		${X11SRCDIRM
 ${MACHINE} == "sparc"	|| \
 ${MACHINE} == "sparc64"	|| \
 ${MACHINE} == "evbmips"	|| \
-${MACHINE} == "x68k"
+${MACHINE} == "x68k"	|| \
+${MACHINE_CPU} == "aarch64"
 HAVE_XORG_SERVER_VER?=118
 .else
 HAVE_XORG_SERVER_VER?=110

CVS commit: src/tests/crypto/libcrypto

2016-10-13 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Thu Oct 13 09:25:37 UTC 2016

Modified Files:
src/tests/crypto/libcrypto: t_libcrypto.sh t_pubkey.sh

Log Message:
Bump timeouts so they work on a 32bit sparc (poor Krups)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/crypto/libcrypto/t_libcrypto.sh \
src/tests/crypto/libcrypto/t_pubkey.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/crypto/libcrypto/t_libcrypto.sh
diff -u src/tests/crypto/libcrypto/t_libcrypto.sh:1.3 src/tests/crypto/libcrypto/t_libcrypto.sh:1.4
--- src/tests/crypto/libcrypto/t_libcrypto.sh:1.3	Mon Nov  8 19:06:12 2010
+++ src/tests/crypto/libcrypto/t_libcrypto.sh	Thu Oct 13 09:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_libcrypto.sh,v 1.3 2010/11/08 19:06:12 pooka Exp $
+# $NetBSD: t_libcrypto.sh,v 1.4 2016/10/13 09:25:37 martin Exp $
 #
 # Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -49,7 +49,7 @@ atf_test_case bn
 bn_head()
 {
 	atf_set "descr" "Checks BIGNUM library"
-	atf_set "timeout" "300"
+	atf_set "timeout" "360"
 }
 bn_body()
 {
Index: src/tests/crypto/libcrypto/t_pubkey.sh
diff -u src/tests/crypto/libcrypto/t_pubkey.sh:1.3 src/tests/crypto/libcrypto/t_pubkey.sh:1.4
--- src/tests/crypto/libcrypto/t_pubkey.sh:1.3	Thu Jun  9 05:25:21 2011
+++ src/tests/crypto/libcrypto/t_pubkey.sh	Thu Oct 13 09:25:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_pubkey.sh,v 1.3 2011/06/09 05:25:21 spz Exp $
+# $NetBSD: t_pubkey.sh,v 1.4 2016/10/13 09:25:37 martin Exp $
 #
 # Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -49,7 +49,7 @@ atf_test_case rsa
 rsa_head()
 {
 	atf_set "descr" "Checks RSA"
-	atf_set "timeout" "300"
+	atf_set "timeout" "420"
 }
 rsa_body()
 {
@@ -60,7 +60,7 @@ atf_test_case ec
 ec_head()
 {
 	atf_set "descr" "Checks EC cipher"
-	atf_set "timeout" "300"
+	atf_set "timeout" "480"
 }
 ec_body()
 {
@@ -81,7 +81,7 @@ atf_test_case ecdsa
 ecdsa_head()
 {
 	atf_set "descr" "Checks ECDSA algorithm"
-	atf_set "timeout" "300"
+	atf_set "timeout" "480"
 }
 ecdsa_body()
 {

CVS commit: src/sys/dev

2016-10-13 Thread Ryo Shimizu 
Module Name:src
Committed By:   ryo
Date:   Thu Oct 13 08:56:31 UTC 2016

Modified Files:
src/sys/dev: mm.c

Log Message:
/dev/mem cannot lseek over 0x8000 on 32bit architectures.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/mm.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/mm.c
diff -u src/sys/dev/mm.c:1.21 src/sys/dev/mm.c:1.22
--- src/sys/dev/mm.c:1.21	Mon Jul 11 16:13:28 2016
+++ src/sys/dev/mm.c	Thu Oct 13 08:56:31 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: mm.c,v 1.21 2016/07/11 16:13:28 matt Exp $	*/
+/*	$NetBSD: mm.c,v 1.22 2016/10/13 08:56:31 ryo Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2008, 2010 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mm.c,v 1.21 2016/07/11 16:13:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mm.c,v 1.22 2016/10/13 08:56:31 ryo Exp $");
 
 #include "opt_compat_netbsd.h"
 
@@ -164,7 +164,7 @@ dev_mem_readwrite(struct uio *uio, struc
 	int color = 0;
 
 	/* Check for wrap around. */
-	if ((intptr_t)uio->uio_offset != uio->uio_offset) {
+	if ((uintptr_t)uio->uio_offset != uio->uio_offset) {
 		return EFAULT;
 	}
 	paddr = uio->uio_offset & ~PAGE_MASK;

CVS commit: src/sys/arch/atari/atari

2016-10-13 Thread Maya Rashish 
Module Name:src
Committed By:   maya
Date:   Thu Oct 13 06:48:07 UTC 2016

Modified Files:
src/sys/arch/atari/atari: le_bus.c

Log Message:
Correct misleading indentation.
While here, remove whitespace.

NFC


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/atari/atari/le_bus.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/atari/atari/le_bus.c
diff -u src/sys/arch/atari/atari/le_bus.c:1.18 src/sys/arch/atari/atari/le_bus.c:1.19
--- src/sys/arch/atari/atari/le_bus.c:1.18	Fri Jul  1 20:34:05 2011
+++ src/sys/arch/atari/atari/le_bus.c	Thu Oct 13 06:48:07 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: le_bus.c,v 1.18 2011/07/01 20:34:05 dyoung Exp $	*/
+/*	$NetBSD: le_bus.c,v 1.19 2016/10/13 06:48:07 maya Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: le_bus.c,v 1.18 2011/07/01 20:34:05 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: le_bus.c,v 1.19 2016/10/13 06:48:07 maya Exp $");
 
 #include 
 #include 
@@ -268,10 +268,10 @@ leb_alloc_bus_space_tag(bus_space_tag_t 
 		leb_t = storage;
 	else {
 		if ((leb_t = malloc(sizeof(*leb_t), M_TEMP, M_NOWAIT)) == NULL)
-		return NULL;
+			return NULL;
 	}
 	memset(leb_t, 0, sizeof(*leb_t));
-	
+
 	leb_t->abs_p_1   = leb_bus_space_peek_1;
 	leb_t->abs_p_2   = leb_bus_space_peek_2;
 	leb_t->abs_p_4   = leb_bus_space_peek_4;

CVS commit: src/usr.bin/timeout

2016-10-13 Thread David A. Holland 
Module Name:src
Committed By:   dholland
Date:   Thu Oct 13 06:22:26 UTC 2016

Modified Files:
src/usr.bin/timeout: timeout.1

Log Message:
typo


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/timeout/timeout.1

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/timeout/timeout.1
diff -u src/usr.bin/timeout/timeout.1:1.3 src/usr.bin/timeout/timeout.1:1.4
--- src/usr.bin/timeout/timeout.1:1.3	Sat Aug  2 06:20:56 2014
+++ src/usr.bin/timeout/timeout.1	Thu Oct 13 06:22:26 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: timeout.1,v 1.3 2014/08/02 06:20:56 wiz Exp $
+.\"	$NetBSD: timeout.1,v 1.4 2016/10/13 06:22:26 dholland Exp $
 .\"
 .\" Copyright (c) 2014 Baptiste Daroussin 
 .\" All rights reserved.
@@ -53,7 +53,7 @@ is still running after
 .Ar duration ,
 it is killed.
 By default,
-.Dv SIGTERM .
+.Dv SIGTERM
 is sent.
 .Bl -tag -width "-k time, --kill-after time"
 .It Fl Fl preserve-status
@@ -67,7 +67,7 @@ children.
 .It Fl s Ar sig , Fl Fl signal Ar sig
 Specify the signal to send on timeout.
 By default,
-.Dv SIGTERM .
+.Dv SIGTERM
 is sent.
 .It Fl k Ar time , Fl Fl kill-after Ar time
 Send a second kill signal if