Re: CVS commit: src/lib/librumpuser

2014-03-10 Thread Martin Husemann
On Sun, Mar 09, 2014 at 11:01:11PM +, Justin Cormack wrote:
 Module Name:  src
 Committed By: justin
 Date: Sun Mar  9 23:01:11 UTC 2014
 
 Modified Files:
   src/lib/librumpuser: rumpuser_pth.c
 
 Log Message:
 Use __thread rather than pthread_getspecific for rumpuser curlwp.
 This has better performance and curlwp is a performance bottleneck
 in rump kernel code.

You can't do this, it breaks the build on non TLS supporting platforms.

Martin


Re: CVS commit: src/lib/librumpuser

2014-03-10 Thread Justin Cormack
On Mon, Mar 10, 2014 at 8:38 AM, Martin Husemann
mar...@homeworld.netbsd.org wrote:
 On Sun, Mar 09, 2014 at 11:01:11PM +, Justin Cormack wrote:
 Module Name:  src
 Committed By: justin
 Date: Sun Mar  9 23:01:11 UTC 2014

 Modified Files:
   src/lib/librumpuser: rumpuser_pth.c

 Log Message:
 Use __thread rather than pthread_getspecific for rumpuser curlwp.
 This has better performance and curlwp is a performance bottleneck
 in rump kernel code.

 You can't do this, it breaks the build on non TLS supporting platforms.

Argh sorry. Will make it conditional on TLS support. I misread the gcc docs.

Justin


CVS commit: src/external/cddl/osnet/dev/dtrace/arm

2014-03-10 Thread Ryota Ozaki
Module Name:src
Committed By:   ozaki-r
Date:   Mon Mar 10 06:38:22 UTC 2014

Modified Files:
src/external/cddl/osnet/dev/dtrace/arm: dtrace_asm.S

Log Message:
Fix header inclusions


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S

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/dev/dtrace/arm/dtrace_asm.S
diff -u src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S:1.3 src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S:1.4
--- src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S:1.3	Wed Mar  5 03:09:17 2014
+++ src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S	Mon Mar 10 06:38:22 2014
@@ -34,8 +34,7 @@
 #include sys/dtrace.h
 
 #include machine/asm.h
-
-#include assym.s
+#include arm/armreg.h
 
 /*
 void dtrace_membar_producer(void)



CVS commit: src/external/gpl3/binutils/lib/libbfd

2014-03-10 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Mar 10 07:28:33 UTC 2014

Modified Files:
src/external/gpl3/binutils/lib/libbfd: Makefile

Log Message:
make elf{32,64}-ia64.c depend upon the right parent.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/binutils/lib/libbfd/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/lib/libbfd/Makefile
diff -u src/external/gpl3/binutils/lib/libbfd/Makefile:1.11 src/external/gpl3/binutils/lib/libbfd/Makefile:1.12
--- src/external/gpl3/binutils/lib/libbfd/Makefile:1.11	Sun Sep 29 14:20:35 2013
+++ src/external/gpl3/binutils/lib/libbfd/Makefile	Mon Mar 10 07:28:33 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2013/09/29 14:20:35 christos Exp $
+#	$NetBSD: Makefile,v 1.12 2014/03/10 07:28:33 mrg Exp $
 
 NOLINKLIB=	# defined
 NOLINT=		# defined
@@ -78,11 +78,11 @@ elf64-target.h: elfxx-target.h
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/64/g  $  $@
 
-elf32-ia64.c: elfxx-ia64.c
+elf32-ia64.c: elfnn-ia64.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/32/g  $  $@
 
-elf64-ia64.c: elfxx-ia64.c
+elf64-ia64.c: elfnn-ia64.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/64/g  $  $@
 



CVS commit: src/external/gpl3/gcc/dist/gcc

2014-03-10 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Mar 10 07:32:18 UTC 2014

Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc

Log Message:
also look at netbsd.opt and netbsd-elf.opt.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/gpl3/gcc/dist/gcc/config.gcc

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.22 src/external/gpl3/gcc/dist/gcc/config.gcc:1.23
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.22	Thu Mar  6 19:02:58 2014
+++ src/external/gpl3/gcc/dist/gcc/config.gcc	Mon Mar 10 07:32:18 2014
@@ -1628,6 +1628,7 @@ ia64*-*-netbsd*)
 		tmake_file=${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind
 	fi
 	extra_parts=crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o
+	extra_options=${extra_options} netbsd.opt netbsd-elf.opt
 	;;
 ia64*-*-freebsd*)
 	tm_file=${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} ia64/sysv4.h ia64/freebsd.h



CVS commit: src/distrib/sets/lists/base

2014-03-10 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Mar 10 08:45:30 UTC 2014

Modified Files:
src/distrib/sets/lists/base: md.sparc64

Log Message:
Fix compat libelf version


To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/distrib/sets/lists/base/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/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.216 src/distrib/sets/lists/base/md.sparc64:1.217
--- src/distrib/sets/lists/base/md.sparc64:1.216	Sun Mar  9 20:35:30 2014
+++ src/distrib/sets/lists/base/md.sparc64	Mon Mar 10 08:45:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.216 2014/03/09 20:35:30 htodd Exp $
+# $NetBSD: md.sparc64,v 1.217 2014/03/10 08:45:30 martin Exp $
 ./lib/sparc	base-npf-shlib		compat
 ./lib/sparc/npf	base-npf-shlib		compat
 ./lib/sparc/npf/ext_log.so			base-npf-shlib		compat,pic
@@ -113,7 +113,8 @@
 ./usr/lib/sparc/libdwarf.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libedit.so.3			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libedit.so.3.1			base-compat-shlib	compat,pic
-./usr/lib/sparc/libelf.so.0			base-compat-shlib	compat,pic
+./usr/lib/sparc/libelf.so.1			base-compat-shlib	compat,pic
+./usr/lib/sparc/libelf.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libevent.so.4			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libevent.so.4.0			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libevent_openssl.so.4		base-compat-shlib	compat,pic,crypto



CVS commit: src/sys/arch/arm/imx

2014-03-10 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Mar 10 09:35:18 UTC 2014

Modified Files:
src/sys/arch/arm/imx: imx51_tzic.c

Log Message:
Assume reads from hardware do something even if the result isn't required.

Hi htodd@!


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/imx51_tzic.c

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

Modified files:

Index: src/sys/arch/arm/imx/imx51_tzic.c
diff -u src/sys/arch/arm/imx/imx51_tzic.c:1.5 src/sys/arch/arm/imx/imx51_tzic.c:1.6
--- src/sys/arch/arm/imx/imx51_tzic.c:1.5	Mon Mar 10 04:25:51 2014
+++ src/sys/arch/arm/imx/imx51_tzic.c	Mon Mar 10 09:35:18 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx51_tzic.c,v 1.5 2014/03/10 04:25:51 htodd Exp $	*/
+/*	$NetBSD: imx51_tzic.c,v 1.6 2014/03/10 09:35:18 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2010 SHIMIZU Ryo r...@nerv.org
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: imx51_tzic.c,v 1.5 2014/03/10 04:25:51 htodd Exp $);
+__KERNEL_RCSID(0, $NetBSD: imx51_tzic.c,v 1.6 2014/03/10 09:35:18 skrll Exp $);
 
 #define	_INTR_PRIVATE	/* for arm/pic/picvar.h */
 
@@ -262,10 +262,14 @@ tzic_intr_init(struct tzic_softc * const
 
 	disable_interrupts(I32_bit|F32_bit);
 
+	(void) INTC_READ(tzic, TZIC_INTCNTL);
 	INTC_WRITE(tzic, TZIC_INTCNTL, INTCNTL_NSEN_MASK|INTCNTL_NSEN|INTCNTL_EN);
+	(void) INTC_READ(tzic, TZIC_INTCNTL);
 	INTC_WRITE(tzic, TZIC_PRIOMASK, SW_TO_HW_IPL(IPL_NONE));
+	(void) INTC_READ(tzic, TZIC_PRIOMASK);
 
 	INTC_WRITE(tzic, TZIC_SYNCCTRL, 0x00);
+	(void) INTC_READ(tzic, TZIC_SYNCCTRL);
 
 	/* route all interrupts to IRQ.  secure interrupts are for FIQ */
 	for (i = 0; i  4; i++)



CVS commit: src/external/gpl3/binutils/dist/bfd

2014-03-10 Thread Takeshi Nakayama
Module Name:src
Committed By:   nakayama
Date:   Mon Mar 10 12:01:19 UTC 2014

Modified Files:
src/external/gpl3/binutils/dist/bfd: config.bfd

Log Message:
Enable 64-bit integer handling for gas even on 32-bit host since
sparc64 kernel now uses 64-bit constant with %hh operator.

Fix for PR toolchain/48630.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/binutils/dist/bfd/config.bfd

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/dist/bfd/config.bfd
diff -u src/external/gpl3/binutils/dist/bfd/config.bfd:1.10 src/external/gpl3/binutils/dist/bfd/config.bfd:1.11
--- src/external/gpl3/binutils/dist/bfd/config.bfd:1.10	Tue Dec 24 15:06:39 2013
+++ src/external/gpl3/binutils/dist/bfd/config.bfd	Mon Mar 10 12:01:19 2014
@@ -1460,6 +1460,7 @@ case ${targ} in
   sparc-*-netbsdelf*)
 targ_defvec=bfd_elf32_sparc_vec
 targ_selvecs=sparcnetbsd_vec sunos_big_vec
+want64=true
 ;;
   sparc-*-netbsd*)
 targ_defvec=sparcnetbsd_vec



CVS commit: src/external/gpl3/binutils/lib/libbfd/arch/sparc

2014-03-10 Thread Takeshi Nakayama
Module Name:src
Committed By:   nakayama
Date:   Mon Mar 10 12:02:36 UTC 2014

Modified Files:
src/external/gpl3/binutils/lib/libbfd/arch/sparc: bfd.h defs.mk

Log Message:
Regenerate for sparc's want64=true change.

Native toolchain fix for PR toolchain/48630.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk

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/lib/libbfd/arch/sparc/bfd.h
diff -u src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h:1.5 src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h:1.6
--- src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h:1.5	Mon Sep 30 06:01:36 2013
+++ src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h	Mon Mar 10 12:02:36 2014
@@ -1,6 +1,6 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: 	NetBSD: mknative-binutils,v 1.8 2011/09/25 04:00:58 christos Exp  */
-/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
+/* Generated from: NetBSD: mknative-binutils,v 1.9 2013/10/01 15:41:17 skrll Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
 
 /* DO NOT EDIT!  -*- buffer-read-only: t -*-  This file is automatically 
generated from bfd-in.h, init.c, opncls.c, libbfd.c, 
@@ -89,7 +89,7 @@ extern C {
 /* The word size used by BFD on the host.  This may be 64 with a 32
bit target if the host is 64 bit, or if other 64 bit targets have
been selected with --enable-targets, or if --enable-64-bit-bfd.  */
-#define BFD_ARCH_SIZE 32
+#define BFD_ARCH_SIZE 64
 
 /* The word size of the default bfd target.  */
 #define BFD_DEFAULT_TARGET_SIZE 32

Index: src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk
diff -u src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk:1.2 src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk:1.3
--- src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk:1.2	Sun Sep 25 07:53:27 2011
+++ src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk	Mon Mar 10 12:02:36 2014
@@ -1,8 +1,8 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: 	NetBSD: mknative-binutils,v 1.8 2011/09/25 04:00:58 christos Exp 
-# Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp 
+# Generated from: NetBSD: mknative-binutils,v 1.9 2013/10/01 15:41:17 skrll Exp 
+# Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp 
 #
-G_libbfd_la_DEPENDENCIES=elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo elf.lo elflink.lo elf-attrs.lo elf-strtab.lo elf-eh-frame.lo dwarf1.lo sparcnetbsd.lo aout32.lo sunos.lo elf32-gen.lo cpu-sparc.lo netbsd-core.lo ofiles
+G_libbfd_la_DEPENDENCIES=elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo elf.lo elflink.lo elf-attrs.lo elf-strtab.lo elf-eh-frame.lo dwarf1.lo sparcnetbsd.lo aout32.lo sunos.lo elf32-gen.lo cpu-sparc.lo netbsd-core.lo archive64.lo ofiles
 G_libbfd_la_OBJECTS=archive.lo archures.lo bfd.lo bfdio.lo bfdwin.lo  cache.lo coffgen.lo corefile.lo format.lo init.lo libbfd.lo  opncls.lo reloc.lo section.lo syms.lo targets.lo hash.lo  linker.lo srec.lo binary.lo tekhex.lo ihex.lo stabs.lo  stab-syms.lo merge.lo dwarf2.lo simple.lo compress.lo  verilog.lo
 G_DEFS=-DHAVE_CONFIG_H
 G_INCLUDES=-DNETBSD_CORE   -I. -I${GNUHOSTDIST}/bfd -I${GNUHOSTDIST}/bfd/../include   -DHAVE_bfd_elf32_sparc_vec -DHAVE_sparcnetbsd_vec -DHAVE_sunos_big_vec -DHAVE_bfd_elf32_little_generic_vec -DHAVE_bfd_elf32_big_generic_vec -I./../intl



CVS commit: src/share/mk

2014-03-10 Thread Takeshi Nakayama
Module Name:src
Committed By:   nakayama
Date:   Mon Mar 10 12:13:14 UTC 2014

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

Log Message:
-mcmodel option is CPU specific not machine specific.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/share/mk/bsd.kmodule.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.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.42 src/share/mk/bsd.kmodule.mk:1.43
--- src/share/mk/bsd.kmodule.mk:1.42	Fri Feb 21 20:44:03 2014
+++ src/share/mk/bsd.kmodule.mk	Mon Mar 10 12:13:14 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.kmodule.mk,v 1.42 2014/02/21 20:44:03 joerg Exp $
+#	$NetBSD: bsd.kmodule.mk,v 1.43 2014/03/10 12:13:14 nakayama Exp $
 
 # We are not building this with PIE
 MKPIE=no
@@ -36,7 +36,7 @@ CFLAGS+=	-mlongcall
 CFLAGS+=	-fno-pic
 .endif
 
-.if ${MACHINE} == sparc64
+.if ${MACHINE_CPU} == sparc64
 # force same memory model as rest of the kernel
 CFLAGS+=	${${ACTIVE_CC} == gcc:? -mcmodel=medlow :}
 CFLAGS+=	${${ACTIVE_CC} == clang:? -mcmodel=small :}



CVS commit: src/sys/dev/usb

2014-03-10 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Mar 10 13:01:28 UTC 2014

Modified Files:
src/sys/dev/usb: xhci.c

Log Message:
Comment style.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.13 src/sys/dev/usb/xhci.c:1.14
--- src/sys/dev/usb/xhci.c:1.13	Thu Jan 16 20:55:56 2014
+++ src/sys/dev/usb/xhci.c	Mon Mar 10 13:01:28 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: xhci.c,v 1.13 2014/01/16 20:55:56 dsl Exp $	*/
+/*	$NetBSD: xhci.c,v 1.14 2014/03/10 13:01:28 skrll Exp $	*/
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.13 2014/01/16 20:55:56 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.14 2014/03/10 13:01:28 skrll Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -579,7 +579,8 @@ xhci_init(struct xhci_softc *sc)
 
 	DPRINTF((%s\n, __func__));
 
-	sc-sc_bus.usbrev = USBREV_2_0; /* XXX Low/Full/High speeds for now */
+	/* XXX Low/Full/High speeds for now */
+	sc-sc_bus.usbrev = USBREV_2_0;
 
 	cap = xhci_read_4(sc, XHCI_CAPLENGTH);
 	caplength = XHCI_CAP_CAPLENGTH(cap);



CVS commit: src/sys/dev

2014-03-10 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Mar 10 13:10:41 UTC 2014

Modified Files:
src/sys/dev/pci: xhci_pci.c
src/sys/dev/usb: xhci.c xhcivar.h

Log Message:
Don't abuse usbd_status in xhci_init


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/xhci_pci.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/xhcivar.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/xhci_pci.c
diff -u src/sys/dev/pci/xhci_pci.c:1.1 src/sys/dev/pci/xhci_pci.c:1.2
--- src/sys/dev/pci/xhci_pci.c:1.1	Sat Sep 14 00:40:31 2013
+++ src/sys/dev/pci/xhci_pci.c	Mon Mar 10 13:10:41 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: xhci_pci.c,v 1.1 2013/09/14 00:40:31 jakllsch Exp $	*/
+/*	$NetBSD: xhci_pci.c,v 1.2 2014/03/10 13:10:41 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xhci_pci.c,v 1.1 2013/09/14 00:40:31 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: xhci_pci.c,v 1.2 2014/03/10 13:10:41 skrll Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -82,7 +82,7 @@ xhci_pci_attach(device_t parent, device_
 	char const *intrstr;
 	pci_intr_handle_t ih;
 	pcireg_t csr, memtype;
-	usbd_status r;
+	int err;
 	//const char *vendor;
 	uint32_t hccparams;
 
@@ -164,9 +164,9 @@ xhci_pci_attach(device_t parent, device_
 		vendor 0x%04x, PCI_VENDOR(pa-pa_id));
 #endif
 
-	r = xhci_init(sc);
-	if (r != USBD_NORMAL_COMPLETION) {
-		aprint_error_dev(self, init failed, error=%d\n, r);
+	err = xhci_init(sc);
+	if (err) {
+		aprint_error_dev(self, init failed, error=%d\n, err);
 		goto fail;
 	}
 

Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.14 src/sys/dev/usb/xhci.c:1.15
--- src/sys/dev/usb/xhci.c:1.14	Mon Mar 10 13:01:28 2014
+++ src/sys/dev/usb/xhci.c	Mon Mar 10 13:10:41 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: xhci.c,v 1.14 2014/03/10 13:01:28 skrll Exp $	*/
+/*	$NetBSD: xhci.c,v 1.15 2014/03/10 13:10:41 skrll Exp $	*/
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.14 2014/03/10 13:01:28 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.15 2014/03/10 13:10:41 skrll Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -566,7 +566,7 @@ hexdump(const char *msg, const void *bas
 }
 
 
-usbd_status
+int
 xhci_init(struct xhci_softc *sc)
 {
 	bus_size_t bsz;
@@ -598,7 +598,7 @@ xhci_init(struct xhci_softc *sc)
 	if (bus_space_subregion(sc-sc_iot, sc-sc_ioh, 0, caplength,
 	sc-sc_cbh) != 0) {
 		aprint_error_dev(sc-sc_dev, capability subregion failure\n);
-		return USBD_NOMEM;
+		return ENOMEM;
 	}
 
 	hcs1 = xhci_cap_read_4(sc, XHCI_HCSPARAMS1);
@@ -654,21 +654,21 @@ xhci_init(struct xhci_softc *sc)
 	if (bus_space_subregion(sc-sc_iot, sc-sc_ioh, caplength, bsz,
 	sc-sc_obh) != 0) {
 		aprint_error_dev(sc-sc_dev, operational subregion failure\n);
-		return USBD_NOMEM;
+		return ENOMEM;
 	}
 
 	dboff = xhci_cap_read_4(sc, XHCI_DBOFF);
 	if (bus_space_subregion(sc-sc_iot, sc-sc_ioh, dboff,
 	sc-sc_maxslots * 4, sc-sc_dbh) != 0) {
 		aprint_error_dev(sc-sc_dev, doorbell subregion failure\n);
-		return USBD_NOMEM;
+		return ENOMEM;
 	}
 
 	rtsoff = xhci_cap_read_4(sc, XHCI_RTSOFF);
 	if (bus_space_subregion(sc-sc_iot, sc-sc_ioh, rtsoff,
 	sc-sc_maxintrs * 0x20, sc-sc_rbh) != 0) {
 		aprint_error_dev(sc-sc_dev, runtime subregion failure\n);
-		return USBD_NOMEM;
+		return ENOMEM;
 	}
 
 	for (i = 0; i  100; i++) {
@@ -678,7 +678,7 @@ xhci_init(struct xhci_softc *sc)
 		usb_delay_ms(sc-sc_bus, 1);
 	}
 	if (i = 100)
-		return USBD_IOERROR;
+		return EIO;
 
 	usbcmd = 0;
 	xhci_op_write_4(sc, XHCI_USBCMD, usbcmd);
@@ -693,7 +693,7 @@ xhci_init(struct xhci_softc *sc)
 		usb_delay_ms(sc-sc_bus, 1);
 	}
 	if (i = 100)
-		return USBD_IOERROR;
+		return EIO;
 
 	for (i = 0; i  100; i++) {
 		usbsts = xhci_op_read_4(sc, XHCI_USBSTS);
@@ -702,13 +702,13 @@ xhci_init(struct xhci_softc *sc)
 		usb_delay_ms(sc-sc_bus, 1);
 	}
 	if (i = 100)
-		return USBD_IOERROR;
+		return EIO;
 
 	pagesize = xhci_op_read_4(sc, XHCI_PAGESIZE);
 	aprint_debug_dev(sc-sc_dev, PAGESIZE 0x%08x\n, pagesize);
 	pagesize = ffs(pagesize);
 	if (pagesize == 0)
-		return USBD_IOERROR;
+		return EIO;
 	sc-sc_pgsz = 1  (12 + (pagesize - 1));
 	aprint_debug_dev(sc-sc_dev, sc_pgsz 0x%08x\n, (uint32_t)sc-sc_pgsz);
 	aprint_debug_dev(sc-sc_dev, sc_maxslots 0x%08x\n,

Index: src/sys/dev/usb/xhcivar.h
diff -u src/sys/dev/usb/xhcivar.h:1.2 src/sys/dev/usb/xhcivar.h:1.3
--- src/sys/dev/usb/xhcivar.h:1.2	Mon Oct 28 17:49:33 2013
+++ src/sys/dev/usb/xhcivar.h	Mon Mar 10 13:10:41 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: xhcivar.h,v 1.2 2013/10/28 17:49:33 matt Exp $	*/
+/*	$NetBSD: xhcivar.h,v 1.3 2014/03/10 13:10:41 skrll Exp $	*/
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -116,7 

CVS commit: src/sys/dev/usb

2014-03-10 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Mar 10 13:12:02 UTC 2014

Modified Files:
src/sys/dev/usb: xhcivar.h

Log Message:
Whtiespace.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/xhcivar.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/usb/xhcivar.h
diff -u src/sys/dev/usb/xhcivar.h:1.3 src/sys/dev/usb/xhcivar.h:1.4
--- src/sys/dev/usb/xhcivar.h:1.3	Mon Mar 10 13:10:41 2014
+++ src/sys/dev/usb/xhcivar.h	Mon Mar 10 13:12:02 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: xhcivar.h,v 1.3 2014/03/10 13:10:41 skrll Exp $	*/
+/*	$NetBSD: xhcivar.h,v 1.4 2014/03/10 13:12:02 skrll Exp $	*/
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -116,14 +116,14 @@ struct xhci_softc {
 	uint8_t sc_conf;
 };
 
-int xhci_init(struct xhci_softc *);
-int xhci_intr(void *);
-int xhci_detach(struct xhci_softc *, int);
-int xhci_activate(device_t, enum devact);
-voidxhci_childdet(device_t, device_t);
-boolxhci_suspend(device_t, const pmf_qual_t *);
-boolxhci_resume(device_t, const pmf_qual_t *);
-boolxhci_shutdown(device_t, int);
+int	xhci_init(struct xhci_softc *);
+int	xhci_intr(void *);
+int	xhci_detach(struct xhci_softc *, int);
+int	xhci_activate(device_t, enum devact);
+void	xhci_childdet(device_t, device_t);
+bool	xhci_suspend(device_t, const pmf_qual_t *);
+bool	xhci_resume(device_t, const pmf_qual_t *);
+bool	xhci_shutdown(device_t, int);
 
 #define XHCI_TRANSFER_RING_TRBS 256
 



CVS commit: src/distrib/sets/lists/base

2014-03-10 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Mar 10 13:19:53 UTC 2014

Modified Files:
src/distrib/sets/lists/base: ad.mips ad.powerpc

Log Message:
Fix compat libelf version numbers


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base/ad.powerpc

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

Modified files:

Index: src/distrib/sets/lists/base/ad.mips
diff -u src/distrib/sets/lists/base/ad.mips:1.35 src/distrib/sets/lists/base/ad.mips:1.36
--- src/distrib/sets/lists/base/ad.mips:1.35	Sun Mar  9 20:35:30 2014
+++ src/distrib/sets/lists/base/ad.mips	Mon Mar 10 13:19:53 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.35 2014/03/09 20:35:30 htodd Exp $
+# $NetBSD: ad.mips,v 1.36 2014/03/10 13:19:53 martin Exp $
 ./lib/64	base-compat-shlib	compat,arch64
 ./lib/64/npf	base-npf-shlib		compat,arch64
 ./lib/64/npf/ext_log.sobase-npf-shlib		compat,pic,arch64
@@ -123,7 +123,8 @@
 ./usr/lib/64/libdwarf.so.1.0			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libedit.so.3			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libedit.so.3.1			base-compat-shlib	compat,pic,arch64
-./usr/lib/64/libelf.so.0			base-compat-shlib	compat,pic,arch64
+./usr/lib/64/libelf.so.1			base-compat-shlib	compat,pic,arch64
+./usr/lib/64/libelf.so.1.0			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libevent.so.4			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libevent.so.4.0			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libevent_openssl.so.4		base-compat-shlib	compat,pic,crypto,arch64
@@ -456,7 +457,8 @@
 ./usr/lib/o32/libdwarf.so.1.0			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libedit.so.3			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libedit.so.3.1			base-compat-shlib	compat,pic,arch64
-./usr/lib/o32/libelf.so.0			base-compat-shlib	compat,pic,arch64
+./usr/lib/o32/libelf.so.1			base-compat-shlib	compat,pic,arch64
+./usr/lib/o32/libelf.so.1.0			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libevent.so.4			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libevent.so.4.0			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libevent_openssl.so.4		base-compat-shlib	compat,pic,crypto,arch64

Index: src/distrib/sets/lists/base/ad.powerpc
diff -u src/distrib/sets/lists/base/ad.powerpc:1.4 src/distrib/sets/lists/base/ad.powerpc:1.5
--- src/distrib/sets/lists/base/ad.powerpc:1.4	Sun Mar  9 20:35:30 2014
+++ src/distrib/sets/lists/base/ad.powerpc	Mon Mar 10 13:19:53 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.powerpc,v 1.4 2014/03/09 20:35:30 htodd Exp $
+# $NetBSD: ad.powerpc,v 1.5 2014/03/10 13:19:53 martin Exp $
 ./usr/bin/fdformatbase-util-bin
 ./lib/powerpc	base-npf-shlib		compat,arch64
 ./lib/powerpc/npfbase-npf-shlib		compat,arch64
@@ -108,7 +108,8 @@
 ./usr/lib/powerpc/libdwarf.so.1.0		base-compat-shlib	compat,arch64,pic
 ./usr/lib/powerpc/libedit.so.3			base-compat-shlib	compat,arch64,pic
 ./usr/lib/powerpc/libedit.so.3.1		base-compat-shlib	compat,arch64,pic
-./usr/lib/powerpc/libelf.so.0			base-compat-shlib	compat,arch64,pic
+./usr/lib/powerpc/libelf.so.1			base-compat-shlib	compat,arch64,pic
+./usr/lib/powerpc/libelf.so.1.0			base-compat-shlib	compat,arch64,pic
 ./usr/lib/powerpc/libevent.so.4			base-compat-shlib	compat,arch64,pic
 ./usr/lib/powerpc/libevent.so.4.0		base-compat-shlib	compat,arch64,pic
 ./usr/lib/powerpc/libevent_openssl.so.4		base-compat-shlib	compat,arch64,pic,crypto



CVS commit: src/sys/dev/usb

2014-03-10 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Mar 10 13:21:22 UTC 2014

Modified Files:
src/sys/dev/usb: xhci.c

Log Message:
Code style. No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 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/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.15 src/sys/dev/usb/xhci.c:1.16
--- src/sys/dev/usb/xhci.c:1.15	Mon Mar 10 13:10:41 2014
+++ src/sys/dev/usb/xhci.c	Mon Mar 10 13:21:22 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: xhci.c,v 1.15 2014/03/10 13:10:41 skrll Exp $	*/
+/*	$NetBSD: xhci.c,v 1.16 2014/03/10 13:21:22 skrll Exp $	*/
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.15 2014/03/10 13:10:41 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.16 2014/03/10 13:21:22 skrll Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -762,45 +762,45 @@ xhci_init(struct xhci_softc *sc)
 		return err;
 	}
 
-	{
-		usb_dma_t *dma;
-		size_t size;
-		size_t align;
-
-		dma = sc-sc_eventst_dma;
-		size = roundup2(XHCI_EVENT_RING_SEGMENTS * XHCI_ERSTE_SIZE,
-		XHCI_EVENT_RING_SEGMENT_TABLE_ALIGN);
-		KASSERT(size = (512 * 1024));
-		align = XHCI_EVENT_RING_SEGMENT_TABLE_ALIGN;
-		err = usb_allocmem(sc-sc_bus, size, align, dma);
-		memset(KERNADDR(dma, 0), 0, size);
-		usb_syncmem(dma, 0, size, BUS_DMASYNC_PREWRITE);
-		aprint_debug_dev(sc-sc_dev, eventst: %s %016jx %p %zx\n,
-		usbd_errstr(err),
-		(uintmax_t)DMAADDR(sc-sc_eventst_dma, 0),
-		KERNADDR(sc-sc_eventst_dma, 0),
-		sc-sc_eventst_dma.block-size);
-
-		dma = sc-sc_dcbaa_dma;
-		size = (1 + sc-sc_maxslots) * sizeof(uint64_t);
-		KASSERT(size = 2048);
-		align = XHCI_DEVICE_CONTEXT_BASE_ADDRESS_ARRAY_ALIGN;
-		err = usb_allocmem(sc-sc_bus, size, align, dma);
-		memset(KERNADDR(dma, 0), 0, size);
-		if (sc-sc_maxspbuf != 0) {
-			/*
-			 * DCBA entry 0 hold the scratchbuf array pointer.
-			 */
-			*(uint64_t *)KERNADDR(dma, 0) =
-			htole64(DMAADDR(sc-sc_spbufarray_dma, 0));
-		}
-		usb_syncmem(dma, 0, size, BUS_DMASYNC_PREWRITE);
-		aprint_debug_dev(sc-sc_dev, dcbaa: %s %016jx %p %zx\n,
-		usbd_errstr(err),
-		(uintmax_t)DMAADDR(sc-sc_dcbaa_dma, 0),
-		KERNADDR(sc-sc_dcbaa_dma, 0),
-		sc-sc_dcbaa_dma.block-size);
+	usb_dma_t *dma;
+	size_t size;
+	size_t align;
+
+	dma = sc-sc_eventst_dma;
+	size = roundup2(XHCI_EVENT_RING_SEGMENTS * XHCI_ERSTE_SIZE,
+	XHCI_EVENT_RING_SEGMENT_TABLE_ALIGN);
+	KASSERT(size = (512 * 1024));
+	align = XHCI_EVENT_RING_SEGMENT_TABLE_ALIGN;
+	err = usb_allocmem(sc-sc_bus, size, align, dma);
+
+	memset(KERNADDR(dma, 0), 0, size);
+	usb_syncmem(dma, 0, size, BUS_DMASYNC_PREWRITE);
+	aprint_debug_dev(sc-sc_dev, eventst: %s %016jx %p %zx\n,
+	usbd_errstr(err),
+	(uintmax_t)DMAADDR(sc-sc_eventst_dma, 0),
+	KERNADDR(sc-sc_eventst_dma, 0),
+	sc-sc_eventst_dma.block-size);
+
+	dma = sc-sc_dcbaa_dma;
+	size = (1 + sc-sc_maxslots) * sizeof(uint64_t);
+	KASSERT(size = 2048);
+	align = XHCI_DEVICE_CONTEXT_BASE_ADDRESS_ARRAY_ALIGN;
+	err = usb_allocmem(sc-sc_bus, size, align, dma);
+
+	memset(KERNADDR(dma, 0), 0, size);
+	if (sc-sc_maxspbuf != 0) {
+		/*
+		 * DCBA entry 0 hold the scratchbuf array pointer.
+		 */
+		*(uint64_t *)KERNADDR(dma, 0) =
+		htole64(DMAADDR(sc-sc_spbufarray_dma, 0));
 	}
+	usb_syncmem(dma, 0, size, BUS_DMASYNC_PREWRITE);
+	aprint_debug_dev(sc-sc_dev, dcbaa: %s %016jx %p %zx\n,
+	usbd_errstr(err),
+	(uintmax_t)DMAADDR(sc-sc_dcbaa_dma, 0),
+	KERNADDR(sc-sc_dcbaa_dma, 0),
+	sc-sc_dcbaa_dma.block-size);
 
 	sc-sc_slots = kmem_zalloc(sizeof(*sc-sc_slots) * sc-sc_maxslots,
 	KM_SLEEP);



CVS commit: src/sys/arch/ia64/unwind

2014-03-10 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Mar 10 13:47:16 UTC 2014

Modified Files:
src/sys/arch/ia64/unwind: stackframe.c

Log Message:
Remove unused variable


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/unwind/stackframe.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/ia64/unwind/stackframe.c
diff -u src/sys/arch/ia64/unwind/stackframe.c:1.4 src/sys/arch/ia64/unwind/stackframe.c:1.5
--- src/sys/arch/ia64/unwind/stackframe.c:1.4	Wed Mar 18 16:00:13 2009
+++ src/sys/arch/ia64/unwind/stackframe.c	Mon Mar 10 13:47:16 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: stackframe.c,v 1.4 2009/03/18 16:00:13 cegger Exp $	*/
+/*	$NetBSD: stackframe.c,v 1.5 2014/03/10 13:47:16 martin Exp $	*/
 
 /* Contributed to the NetBSD foundation by Cherry G. Mathew che...@mahiti.org
  * This file contains routines to use decoded unwind descriptor entries
@@ -932,11 +932,6 @@ struct staterecord *buildrecordstack(str
 	uint64_t rlen = 0;		/* Current region length, defaults to zero, if not specified */
 	uint64_t roffset = 0;		/* Accumulated region length */
 	uint64_t rdepth = 0;		/* Offset within current region */
-
-
-	char *spill_mask = NULL;	/* Specifies when preserved registers are spilled, as a bit mask */
-
-	spill_mask = NULL;
 	bool rtype;
 
 	unwind_rsp = recordstack; /* Start with bottom of staterecord stack. */



CVS commit: src/sys/arch/ia64/ia64

2014-03-10 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Mar 10 13:47:45 UTC 2014

Modified Files:
src/sys/arch/ia64/ia64: cpu.c pmap.c trap.c

Log Message:
Remove unused variables


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ia64/ia64/cpu.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/ia64/ia64/pmap.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/ia64/ia64/trap.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/ia64/ia64/cpu.c
diff -u src/sys/arch/ia64/ia64/cpu.c:1.11 src/sys/arch/ia64/ia64/cpu.c:1.12
--- src/sys/arch/ia64/ia64/cpu.c:1.11	Sun Feb 17 06:46:23 2013
+++ src/sys/arch/ia64/ia64/cpu.c	Mon Mar 10 13:47:45 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.11 2013/02/17 06:46:23 kiyohara Exp $	*/
+/*	$NetBSD: cpu.c,v 1.12 2014/03/10 13:47:45 martin Exp $	*/
 
 /*
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.11 2013/02/17 06:46:23 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.12 2014/03/10 13:47:45 martin Exp $);
 
 #include sys/param.h
 #include sys/proc.h
@@ -117,7 +117,7 @@ identifycpu(struct cpu_softc *sc)
 	uint64_t vendor[3];
 	const char *family_name, *model_name;
 	uint64_t features, tmp;
-	int number, revision, model, family, archrev;
+	int revision, model, family;
 	char bitbuf[32];
 	extern uint64_t processor_frequency;
 
@@ -129,11 +129,11 @@ identifycpu(struct cpu_softc *sc)
 	vendor[2] = '\0';
 
 	tmp = ia64_get_cpuid(3);
-	number = (tmp  0)  0xff;
+	/* number = (tmp  0)  0xff; */
 	revision = (tmp  8)  0xff;
 	model = (tmp  16)  0xff;
 	family = (tmp  24)  0xff;
-	archrev = (tmp  32)  0xff;
+	/* archrev = (tmp  32)  0xff; */
 
 	family_name = model_name = unknown;
 	switch (family) {

Index: src/sys/arch/ia64/ia64/pmap.c
diff -u src/sys/arch/ia64/ia64/pmap.c:1.31 src/sys/arch/ia64/ia64/pmap.c:1.32
--- src/sys/arch/ia64/ia64/pmap.c:1.31	Sun Mar 24 06:56:14 2013
+++ src/sys/arch/ia64/ia64/pmap.c	Mon Mar 10 13:47:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.31 2013/03/24 06:56:14 kiyohara Exp $ */
+/* $NetBSD: pmap.c,v 1.32 2014/03/10 13:47:45 martin Exp $ */
 
 
 /*-
@@ -85,7 +85,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.31 2013/03/24 06:56:14 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.32 2014/03/10 13:47:45 martin Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -1097,8 +1097,6 @@ pmap_protect(pmap_t pmap, vaddr_t sva, v
 {
 	pmap_t oldpmap;
 	struct ia64_lpte *pte;
-	vaddr_t pa;
-	struct vm_page *pg;
 
 	if ((prot  VM_PROT_READ) == VM_PROT_NONE) {
 		pmap_remove(pmap, sva, eva);
@@ -1125,8 +1123,6 @@ pmap_protect(pmap_t pmap, vaddr_t sva, v
 
 		if (pmap_prot(pte) != prot) {
 			if (pmap_managed(pte)) {
-pa = pmap_ppn(pte);
-pg = PHYS_TO_VM_PAGE(pa);
 if (pmap_dirty(pte))
 	pmap_clear_dirty(pte);
 if (pmap_accessed(pte)) {
@@ -1154,9 +1150,7 @@ pmap_extract(pmap_t pmap, vaddr_t va, pa
 {
 	struct ia64_lpte *pte;
 	pmap_t oldpmap;
-	paddr_t pa;
 
-	pa = 0;
 	mutex_enter(pmap-pm_slock);
 	oldpmap = pmap_install(pmap); /*XXX: isn't this a little inefficient ?*/
 	pte = pmap_find_vhpt(va);

Index: src/sys/arch/ia64/ia64/trap.c
diff -u src/sys/arch/ia64/ia64/trap.c:1.12 src/sys/arch/ia64/ia64/trap.c:1.13
--- src/sys/arch/ia64/ia64/trap.c:1.12	Sat Jan 12 08:42:53 2013
+++ src/sys/arch/ia64/ia64/trap.c	Mon Mar 10 13:47:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.12 2013/01/12 08:42:53 kiyohara Exp $ */
+/* $NetBSD: trap.c,v 1.13 2014/03/10 13:47:45 martin Exp $ */
 
 /*-
  * Copyright (c) 2005 Marcel Moolenaar
@@ -61,7 +61,7 @@
 
 #include sys/cdefs.h			/* RCS ID  Copyright macro defns */
 
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.12 2013/01/12 08:42:53 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.13 2014/03/10 13:47:45 martin Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -382,7 +382,6 @@ trap(int vector, struct trapframe *tf)
 	struct lwp *l;
 	uint64_t ucode;
 	int sig, user;
-	u_int sticks;
 	ksiginfo_t ksi;
 
 	user = TRAPF_USERMODE(tf) ? 1 : 0;
@@ -397,11 +396,9 @@ trap(int vector, struct trapframe *tf)
 	if (user) {
 		ia64_set_fpsr(IA64_FPSR_DEFAULT);
 		p = l-l_proc;
-		sticks = p-p_sticks;
 		l-l_md.md_tf = tf;
 		LWP_CACHE_CREDS(l, p);
 	} else {
-		sticks = 0;		/* XXX bogus -Wuninitialized warning */
 		p = NULL;
 	}
 	sig = 0;



CVS commit: src/sys/arch/hpcarm/hpcarm

2014-03-10 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Mar 10 14:51:15 UTC 2014

Modified Files:
src/sys/arch/hpcarm/hpcarm: sa11x0_hpc_machdep.c

Log Message:
Avoid unused variable warning by borrowing sa1_cache_clean_addr briefly


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c

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

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.8 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.9
--- src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.8	Sun Aug 18 22:26:51 2013
+++ src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c	Mon Mar 10 14:51:15 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0_hpc_machdep.c,v 1.8 2013/08/18 22:26:51 matt Exp $	*/
+/*	$NetBSD: sa11x0_hpc_machdep.c,v 1.9 2014/03/10 14:51:15 skrll Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sa11x0_hpc_machdep.c,v 1.8 2013/08/18 22:26:51 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: sa11x0_hpc_machdep.c,v 1.9 2014/03/10 14:51:15 skrll Exp $);
 
 #include opt_ddb.h
 #include opt_dram_pages.h
@@ -342,10 +342,8 @@ init_sa11x0(int argc, char **argv, struc
 		if (!(sa1_cc_base  (CPU_SA110_CACHE_CLEAN_SIZE - 1)))
 			break;
 	}
-	{
-		vaddr_t dummy;
-		alloc_pages(dummy, CPU_SA110_CACHE_CLEAN_SIZE / PAGE_SIZE - 1);
-	}
+	alloc_pages(sa1_cache_clean_addr, CPU_SA110_CACHE_CLEAN_SIZE / PAGE_SIZE - 1);
+
 	sa1_cache_clean_addr = sa1_cc_base;
 	sa1_cache_clean_size = CPU_SA110_CACHE_CLEAN_SIZE / 2;
 



CVS commit: src/sbin/fdisk

2014-03-10 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Mon Mar 10 15:42:51 UTC 2014

Modified Files:
src/sbin/fdisk: fdisk.c

Log Message:
Always print the MBR drive serial number, even if it's 0.


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/sbin/fdisk/fdisk.c

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

Modified files:

Index: src/sbin/fdisk/fdisk.c
diff -u src/sbin/fdisk/fdisk.c:1.145 src/sbin/fdisk/fdisk.c:1.146
--- src/sbin/fdisk/fdisk.c:1.145	Sun Apr 14 22:48:22 2013
+++ src/sbin/fdisk/fdisk.c	Mon Mar 10 15:42:51 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: fdisk.c,v 1.145 2013/04/14 22:48:22 jakllsch Exp $ */
+/*	$NetBSD: fdisk.c,v 1.146 2014/03/10 15:42:51 jakllsch Exp $ */
 
 /*
  * Mach Operating System
@@ -39,7 +39,7 @@
 #include sys/cdefs.h
 
 #ifndef lint
-__RCSID($NetBSD: fdisk.c,v 1.145 2013/04/14 22:48:22 jakllsch Exp $);
+__RCSID($NetBSD: fdisk.c,v 1.146 2014/03/10 15:42:51 jakllsch Exp $);
 #endif /* not lint */
 
 #define MBRPTYPENAMES
@@ -705,7 +705,7 @@ print_s0(int which)
 			else
 printf(First active partition: %d\n, active);
 		}
-		if (!sh_flag  mboot.mbr_dsn != 0)
+		if (!sh_flag)
 			printf(Drive serial number: %PRIu32 (0x%08x)\n,
 			le32toh(mboot.mbr_dsn),
 			le32toh(mboot.mbr_dsn));



CVS commit: src/crypto/external/bsd/netpgp/bin/netpgpverify

2014-03-10 Thread Alistair G. Crooks
Module Name:src
Committed By:   agc
Date:   Mon Mar 10 17:00:53 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile

Log Message:
fix typo in previous commit


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile

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

Modified files:

Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.8 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.9
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.8	Sun Mar  9 07:00:52 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile	Mon Mar 10 17:00:53 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2014/03/09 07:00:52 christos Exp $
+#	$NetBSD: Makefile,v 1.9 2014/03/10 17:00:53 agc Exp $
 
 PROG=netpgpverify
 BINDIR=		/usr/bin
@@ -11,7 +11,7 @@ SRCS+= bzlib.c zlib.c
 
 SRCS+= md5c.c rmd160.c sha1.c sha2.c tiger.c
 
-CPPFLAGS+=-I${.CURDIR} ${EXTDIST}/src/netpgpverify
+CPPFLAGS+=-I${.CURDIR} -I${EXTDIST}/src/netpgpverify
 
 .ifndef PRODUCTION
 CPPFLAGS+=-g -O0



CVS commit: src/share/misc

2014-03-10 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Mon Mar 10 17:56:21 UTC 2014

Modified Files:
src/share/misc: acronyms

Log Message:
add UGT


To generate a diff of this commit:
cvs rdiff -u -r1.222 -r1.223 src/share/misc/acronyms

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

Modified files:

Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.222 src/share/misc/acronyms:1.223
--- src/share/misc/acronyms:1.222	Wed Mar  5 03:51:25 2014
+++ src/share/misc/acronyms	Mon Mar 10 17:56:21 2014
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.222 2014/03/05 03:51:25 ginsbach Exp $
+$NetBSD: acronyms,v 1.223 2014/03/10 17:56:21 mbalmer Exp $
 10Q	thank you
 10X	thanks
 1337	elite (leet)
@@ -521,6 +521,7 @@ TWIAVBP	the world is a very big place
 TY	thank you
 TYVM	thank you very much
 U/L	upload
+UGT	universal greeting time
 UTSL	use the source, Luke
 VCR	video cassette recorder
 VEG	very evil grin



CVS commit: src/share/misc

2014-03-10 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Mon Mar 10 18:22:54 UTC 2014

Modified Files:
src/share/misc: language

Log Message:
reformat comment


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/misc/language

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

Modified files:

Index: src/share/misc/language
diff -u src/share/misc/language:1.3 src/share/misc/language:1.4
--- src/share/misc/language:1.3	Sat Sep 13 21:53:19 2003
+++ src/share/misc/language	Mon Mar 10 18:22:54 2014
@@ -1,13 +1,13 @@
-# $NetBSD: language,v 1.3 2003/09/13 21:53:19 kleink Exp $
+# $NetBSD: language,v 1.4 2014/03/10 18:22:54 mbalmer Exp $
 #
 # ISO 639-1 and 639-2 Language Codes
 #
 # The format of an entry is:
 # Language nameTABISO-639-2-codeTABISO-639-1-code-optional
 #
-# Further information can be found at the ISO 639/Joint Advisory Committee
-# (ISO 639/JAC) web site,
-# http://lcweb.loc.gov/standards/iso639-2/iso639jac.html.
+# Further information can be found at the ISO 639/Joint Advisory Committee (JAC)
+# web site, http://lcweb.loc.gov/standards/iso639-2/iso639jac.html.
+#
 # This list is up-to-date as of 2003-08-04.
 #
 Abkhazian	abk	ab



CVS commit: src/share/misc

2014-03-10 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Mon Mar 10 18:44:29 UTC 2014

Modified Files:
src/share/misc: world.phone

Log Message:
note that kropla.com/dialcode.htm redirects to countrycode.org


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/misc/world.phone

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

Modified files:

Index: src/share/misc/world.phone
diff -u src/share/misc/world.phone:1.1 src/share/misc/world.phone:1.2
--- src/share/misc/world.phone:1.1	Sat Jul  7 21:35:27 2001
+++ src/share/misc/world.phone	Mon Mar 10 18:44:29 2014
@@ -258,4 +258,4 @@ Zimbabwe:263:00:0
 #   is 1; the numbers that follow function similar to area codes in
 #   the U.S. and Canada.
 # ~ Await a second tone at this stage 
-# From: http://kropla.com/dialcode.htm
+# From: http://kropla.com/dialcode.htm (redirects to http://countrycode.org)



CVS commit: src/share/misc

2014-03-10 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Mon Mar 10 18:45:44 UTC 2014

Modified Files:
src/share/misc: world.phone

Log Message:
add a nice CVS marker


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/misc/world.phone

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

Modified files:

Index: src/share/misc/world.phone
diff -u src/share/misc/world.phone:1.2 src/share/misc/world.phone:1.3
--- src/share/misc/world.phone:1.2	Mon Mar 10 18:44:29 2014
+++ src/share/misc/world.phone	Mon Mar 10 18:45:44 2014
@@ -1,3 +1,4 @@
+# $NetBSD: world.phone,v 1.3 2014/03/10 18:45:44 mbalmer Exp $
 # Country Name:Country code:IDD International prefix:NDD national prefix
 Afghanistan:93:00:0:
 Albania:355:00:0:



CVS commit: src/external/gpl3/gcc/usr.bin/backend

2014-03-10 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Mar 10 18:57:36 UTC 2014

Modified Files:
src/external/gpl3/gcc/usr.bin/backend: Makefile

Log Message:
pass $LD and $AS to the auto-build.h generation, so its configure
gets the right answers for many things.  in particular, it enables
HAVE_AS_TLS which the sparc port needs for TARGET_TLS to work.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gcc/usr.bin/backend/Makefile

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

Modified files:

Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.19 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.20
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.19	Sat Mar  1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile	Mon Mar 10 18:57:35 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2014/03/01 10:00:49 mrg Exp $
+#	$NetBSD: Makefile,v 1.20 2014/03/10 18:57:35 mrg Exp $
 
 LIBISPRIVATE=	yes
 
@@ -170,6 +170,8 @@ auto-build.h: gmp.h Makefile
 		CC=${HOST_CC:Q} CFLAGS=${HOST_CFLAGS:Q} \
 		MAKE=${MAKE:Q} \
 		CONFIG_SHELL=${HOST_SH:Q} \
+		gcc_cv_ld=${LD} \
+		gcc_cv_as=${AS} \
 		${HOST_SH} ${GNUHOSTDIST}/gcc/configure \
 			--build=`${HOST_SH} ${GNUHOSTDIST}/config.guess` \
 			--host=`${HOST_SH} ${GNUHOSTDIST}/config.guess` \



CVS commit: src/external/gpl3/gcc

2014-03-10 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Mar 10 19:06:35 UTC 2014

Modified Files:
src/external/gpl3/gcc: README.gcc48

Log Message:
update a bit.  delete ports that have switched to GCC 4.8.  with this
we still need significant work on these ports:

- mips*
- powerpc
- sh*
- vax
- m68k*

the x86 platforms are probably ready to switch, but i'm not in a good
position to test them.  these platforms are probably ready to switch,
as they're still mostly in bringup mode anyway:

- powerpc64
- coldfire
- ia64


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/README.gcc48

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

Modified files:

Index: src/external/gpl3/gcc/README.gcc48
diff -u src/external/gpl3/gcc/README.gcc48:1.2 src/external/gpl3/gcc/README.gcc48:1.3
--- src/external/gpl3/gcc/README.gcc48:1.2	Sun Mar  9 21:01:14 2014
+++ src/external/gpl3/gcc/README.gcc48	Mon Mar 10 19:06:35 2014
@@ -1,10 +1,9 @@
-$Id: README.gcc48,v 1.2 2014/03/09 21:01:14 mrg Exp $
+$Id: README.gcc48,v 1.3 2014/03/10 19:06:35 mrg Exp $
 
 usr.bin:
 	note:
 		-static-libstdc++ -static-libgcc
 		-rdynamic  -lz
-
 lib:
 
 	G_NOEXCEPTION_FLAGS -- need to use this
@@ -23,59 +22,35 @@ x86_64 port:
 - copied manually i386-builtin-types.inc instead of generating it.
 
 
-arch/feature list:
+arch/feature list.  anything not here has been switched already:
 
 architecture	tools	kernels	libgcc	native-gcc	make release	runs	atf
 	-	---	--	--			---
-alpha		yes	no[2]	yes	yes		yes
-arm		yes	yes	yes	yes		yes		yes	no[7]
-armeb		yes	?	yes	builds
-coldfire	yes	?	yes	yes		no[8]		?	?
-earm		yes	?	yes	builds
-earmeb		yes	?	yes	builds
-earmhf		yes	?	yes	builds
-earmhfeb	yes	?	yes	builds
-earmv4		yes	?	yes	yes[13]		yes[shark]	yes	no
-earmv4eb	yes	?	yes	builds
-earmv6		yes	yes	yes	builds
-earmv6eb	yes	?	yes	builds
-earmv6hf	yes	yes	yes	builds
-earmv6hfeb	yes	?	yes	builds
-earmv7		yes	?	yes	builds
-earmv7eb	yes	?	yes	builds
-earmv7hf	yes	?	yes	builds
-earmv7hfeb	yes	?	yes	builds
-hppa		yes	yes	yes	yes		yes		yes	yes
+coldfire	yes	?	yes	yes		no[7]		?	?
 i386		yes	yes	yes	yes		yes
-ia64
+ia64		yes	?	yes[6]	yes		no
 m68000		yes	?	yes	no[3]		
-m68k		yes	yes	yes	yes		no[8]
+m68k		yes	yes	yes	yes		no[7]
 mips64eb	yes	yes[5]	yes	yes		
-mips64el	yes	yes	yes	yes		yes[9]		no[10]
+mips64el	yes	yes	yes	yes		yes[8]		no
 mipseb		yes	yes[5]	yes	yes		yes
-mipsel		yes	yes	yes	yes		yes		yes[10]	no[11]
+mipsel		yes	yes	yes	yes		yes		yes	no[2]
 powerpc		yes	yes[1]	yes	yes		yes		yes	yes
-powerpc64	yes[12]
-sh3eb		yes	?	yes	yes		no[8]
-sh3el		yes	?	yes	yes		no[8]
-sparc		yes	yes	yes	yes		yes		yes	yes
-sparc64		yes	yes	yes	yes		yes		yes	yes
-vax		yes	yes	yes	yes		no[8]
+powerpc64	yes[4]
+sh3eb		yes	?	yes	yes		no[7]
+sh3el		yes	?	yes	yes		no[7]
+vax		yes	yes	yes	yes		no[7]
 x86_64		yes	yes	yes	yes		yes		?
 
 [1] ofppc/pegasos has issues with symtab loading.
 sandpoint works fine in multi-user, found an annoyance by com(4) change.
-[2] a kernel has it's text overwritten by something before alpha_init
+[2] weird failures.
 [3] relocations fail in libgcc
+[4] cc1 gets segv compiling libgcc.
 [5] mips*eb kernels seem to work as well as gcc 4.5 ones.
-[7] shark atf-report fails with: Unexpected token `tc-start'; expected end of test program
-[8] m68k/vax/sh3 gcc seem to randomly get -fstack-protector/-Wstack-protector
+[6] there are some uncommited hacks.
+[7] m68k/vax/sh3 gcc seem to randomly get -fstack-protector/-Wstack-protector
 wrong, for example m68k flags alarm() as unprotected in
 libc/gen/alarm.c:53, vax ifinit() in sbin/routed/if.c:680.
-- hacked around
-[9] LOONGSON kernel has general problems
-[10] mips64el fails -- something in /sbin/init or /rescue/init jumps to zero.
-in -current.  a hack for o32 works.
-[11] weird failures.
-[12] cc1 gets segv compiling libgcc.
-[13] some answers about C99 support in libstdc++-v3 are wrong.
+[8] LOONGSON kernel has general problems



CVS commit: src/sys/dev/usb

2014-03-10 Thread Reinoud Zandijk
Module Name:src
Committed By:   reinoud
Date:   Mon Mar 10 19:55:18 UTC 2014

Modified Files:
src/sys/dev/usb: uslsa.c

Log Message:
Improve support for the CP2104. This particular device has a higher maximum
baud rate and thus the SLSA_R_SET_BAUDDIV sets the wrong rate.

Changed to code to use the SLSA_R_SET_BAUDRATE command and providing a
fallback for the old SLSA_R_SET_BAUDDIV command if the device doesn't
recognize the command. Unknown yet if the CP2101 has this command or not.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/usb/uslsa.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/uslsa.c
diff -u src/sys/dev/usb/uslsa.c:1.18 src/sys/dev/usb/uslsa.c:1.19
--- src/sys/dev/usb/uslsa.c:1.18	Sat Jan 14 21:15:48 2012
+++ src/sys/dev/usb/uslsa.c	Mon Mar 10 19:55:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uslsa.c,v 1.18 2012/01/14 21:15:48 jakllsch Exp $ */
+/* $NetBSD: uslsa.c,v 1.19 2014/03/10 19:55:18 reinoud Exp $ */
 
 /* from ugensa.c */
 
@@ -58,7 +58,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uslsa.c,v 1.18 2012/01/14 21:15:48 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: uslsa.c,v 1.19 2014/03/10 19:55:18 reinoud Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -388,8 +388,11 @@ static int
 uslsa_param(void *vsc, int portno, struct termios *t)
 {
 	struct uslsa_softc *sc;
-	int ret;
+	usb_device_request_t req;
+	usbd_status status;
 	uint16_t value;
+	uint32_t baud;
+	int ret;
 
 	sc = vsc;
 
@@ -399,12 +402,27 @@ uslsa_param(void *vsc, int portno, struc
 		return EIO;
 	}
 
-	value = SLSA_RV_BAUDDIV(t-c_ospeed);
+	req.bmRequestType = UT_WRITE_VENDOR_INTERFACE;
+	req.bRequest = SLSA_R_SET_BAUDRATE;
+	USETW(req.wValue, 0);
+	USETW(req.wIndex, sc-sc_ifnum);
+	USETW(req.wLength, 4);
 
-	if ((ret = uslsa_request_set(sc, SLSA_R_SET_BAUDDIV, value)) != 0) {
-		device_printf(sc-sc_dev, %s: SET_BAUDDIV failed\n,
-		   __func__);
-		return ret;
+	baud = t-c_ospeed;
+	status = usbd_do_request(sc-sc_udev, req, baud);
+	if (status != USBD_NORMAL_COMPLETION) {
+		/* fallback method for devices that don't know SET_BAUDRATE */
+		/* hope we calculate it right */
+		device_printf(sc-sc_dev, %s: set baudrate %d, failed %s,
+ using set bauddiv\n,
+		__func__, baud, usbd_errstr(status));
+
+		value = SLSA_RV_BAUDDIV(t-c_ospeed);
+		if ((ret = uslsa_request_set(sc, SLSA_R_SET_BAUDDIV, value)) != 0) {
+			device_printf(sc-sc_dev, %s: SET_BAUDDIV failed\n,
+			   __func__);
+			return ret;
+		}
 	}
 
 	value = 0;



CVS commit: src/external/gpl3/gcc

2014-03-10 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Mar 10 19:55:51 UTC 2014

Modified Files:
src/external/gpl3/gcc: README.gcc48

Log Message:
updaet a little more:
- coldfire release works, but there are no kernels yet
- ia64 port gets much further now
- i386 port runs


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/README.gcc48

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

Modified files:

Index: src/external/gpl3/gcc/README.gcc48
diff -u src/external/gpl3/gcc/README.gcc48:1.3 src/external/gpl3/gcc/README.gcc48:1.4
--- src/external/gpl3/gcc/README.gcc48:1.3	Mon Mar 10 19:06:35 2014
+++ src/external/gpl3/gcc/README.gcc48	Mon Mar 10 19:55:51 2014
@@ -1,4 +1,4 @@
-$Id: README.gcc48,v 1.3 2014/03/10 19:06:35 mrg Exp $
+$Id: README.gcc48,v 1.4 2014/03/10 19:55:51 mrg Exp $
 
 usr.bin:
 	note:
@@ -26,9 +26,9 @@ arch/feature list.  anything not here ha
 
 architecture	tools	kernels	libgcc	native-gcc	make release	runs	atf
 	-	---	--	--			---
-coldfire	yes	?	yes	yes		no[7]		?	?
-i386		yes	yes	yes	yes		yes
-ia64		yes	?	yes[6]	yes		no
+coldfire	yes	N/A[9]	yes	yes		yes[7]		?	?
+i386		yes	yes	yes	yes		yes		yes
+ia64		yes	?	yes[6]	yes		no[6]
 m68000		yes	?	yes	no[3]		
 m68k		yes	yes	yes	yes		no[7]
 mips64eb	yes	yes[5]	yes	yes		
@@ -48,9 +48,10 @@ x86_64		yes	yes	yes	yes		yes		?
 [3] relocations fail in libgcc
 [4] cc1 gets segv compiling libgcc.
 [5] mips*eb kernels seem to work as well as gcc 4.5 ones.
-[6] there are some uncommited hacks.
+[6] ia64 port is missing libc, libkvm and more support.  libgcc has some uncommited hacks.
 [7] m68k/vax/sh3 gcc seem to randomly get -fstack-protector/-Wstack-protector
 wrong, for example m68k flags alarm() as unprotected in
 libc/gen/alarm.c:53, vax ifinit() in sbin/routed/if.c:680.
-- hacked around
 [8] LOONGSON kernel has general problems
+[9] no kernels in evbcf port yet



CVS commit: src/lib/librumpuser

2014-03-10 Thread Justin Cormack
Module Name:src
Committed By:   justin
Date:   Mon Mar 10 22:37:51 UTC 2014

Modified Files:
src/lib/librumpuser: rumpuser_pth.c

Log Message:
Revert conversion to __thread as breaks on archs without TLS support


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/lib/librumpuser/rumpuser_pth.c

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

Modified files:

Index: src/lib/librumpuser/rumpuser_pth.c
diff -u src/lib/librumpuser/rumpuser_pth.c:1.35 src/lib/librumpuser/rumpuser_pth.c:1.36
--- src/lib/librumpuser/rumpuser_pth.c:1.35	Sun Mar  9 23:01:11 2014
+++ src/lib/librumpuser/rumpuser_pth.c	Mon Mar 10 22:37:51 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser_pth.c,v 1.35 2014/03/09 23:01:11 justin Exp $	*/
+/*	$NetBSD: rumpuser_pth.c,v 1.36 2014/03/10 22:37:51 justin Exp $	*/
 
 /*
  * Copyright (c) 2007-2010 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
 #include rumpuser_port.h
 
 #if !defined(lint)
-__RCSID($NetBSD: rumpuser_pth.c,v 1.35 2014/03/09 23:01:11 justin Exp $);
+__RCSID($NetBSD: rumpuser_pth.c,v 1.36 2014/03/10 22:37:51 justin Exp $);
 #endif /* !lint */
 
 #include sys/queue.h
@@ -622,15 +622,13 @@ rumpuser_cv_has_waiters(struct rumpuser_
  * curlwp
  */
 
-static __thread struct lwp *curlwp;
+static pthread_key_t curlwpkey;
 
 /*
  * the if0'd curlwp implementation is not used by this hypervisor,
  * but serves as test code to check that the intended usage works.
  */
 #if 0
-static pthread_key_t curlwpkey;
-
 struct rumpuser_lwp {
 	struct lwp *l;
 	LIST_ENTRY(rumpuser_lwp) l_entries;
@@ -718,12 +716,12 @@ rumpuser_curlwpop(int enum_rumplwpop, st
 	case RUMPUSER_LWP_DESTROY:
 		break;
 	case RUMPUSER_LWP_SET:
-		assert(curlwp == NULL);
-		curlwp = l;
+		assert(pthread_getspecific(curlwpkey) == NULL);
+		pthread_setspecific(curlwpkey, l);
 		break;
 	case RUMPUSER_LWP_CLEAR:
-		assert(curlwp == l);
-		curlwp = NULL;
+		assert(pthread_getspecific(curlwpkey) == l);
+		pthread_setspecific(curlwpkey, NULL);
 		break;
 	}
 }
@@ -732,7 +730,7 @@ struct lwp *
 rumpuser_curlwp(void)
 {
 
-	return curlwp;
+	return pthread_getspecific(curlwpkey);
 }
 #endif
 
@@ -740,5 +738,5 @@ rumpuser_curlwp(void)
 void
 rumpuser__thrinit(void)
 {
-
+	pthread_key_create(curlwpkey, NULL);
 }



CVS commit: src

2014-03-10 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Mon Mar 10 22:38:53 UTC 2014

Modified Files:
src/share/mk: bsd.own.mk
src/sys/rump: Makefile.rump
src/sys/rump/include/rump: rump.h
src/sys/rump/librump/rumpkern: Makefile.rumpkern rump.c
src/tests/rump/modautoload: Makefile t_modautoload.c

Log Message:
Move the is arch capable of loading native kernel modules into
rump kernel clauses from bsd.own.mk to Makefile.rump.  Also,
add a rump_nativeabi_p() call to determine if rump kernel is
compiled with native ABI support.


To generate a diff of this commit:
cvs rdiff -u -r1.782 -r1.783 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.89 -r1.90 src/sys/rump/Makefile.rump
cvs rdiff -u -r1.58 -r1.59 src/sys/rump/include/rump/rump.h
cvs rdiff -u -r1.138 -r1.139 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.287 -r1.288 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.1 -r1.2 src/tests/rump/modautoload/Makefile \
src/tests/rump/modautoload/t_modautoload.c

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.782 src/share/mk/bsd.own.mk:1.783
--- src/share/mk/bsd.own.mk:1.782	Sun Mar  9 19:58:43 2014
+++ src/share/mk/bsd.own.mk	Mon Mar 10 22:38:53 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.782 2014/03/09 19:58:43 matt Exp $
+#	$NetBSD: bsd.own.mk,v 1.783 2014/03/10 22:38:53 pooka Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -792,14 +792,6 @@ ARM_APCS_FLAGS+=${${ACTIVE_CC} == clang
 
 GENASSYM_CPPFLAGS+=	${${ACTIVE_CC} == clang:? -no-integrated-as :}
 
-#
-# Determine if arch uses native kernel modules with rump
-#
-.if ${MACHINE_ARCH} == i386 || \
-${MACHINE_ARCH} == x86_64
-RUMPKMOD=	# defined
-.endif
-
 TARGETS+=	all clean cleandir depend dependall includes \
 		install lint obj regress tags html analyze
 PHONY_NOTMAIN =	all clean cleandir depend dependall distclean includes \

Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.89 src/sys/rump/Makefile.rump:1.90
--- src/sys/rump/Makefile.rump:1.89	Mon Dec  9 17:57:11 2013
+++ src/sys/rump/Makefile.rump	Mon Mar 10 22:38:53 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.rump,v 1.89 2013/12/09 17:57:11 pooka Exp $
+#	$NetBSD: Makefile.rump,v 1.90 2014/03/10 22:38:53 pooka Exp $
 #
 
 WARNS?=		3	# XXX: src/sys won't compile with -Wsign-compare yet
@@ -6,13 +6,16 @@ NOLINT=		# kernel code
 
 .include bsd.own.mk
 
-# If RUMPKMOD is _not_ set (only on capable archs, from bsd.own.mk),
-# use rump ABI instead of the NetBSD kernel ABI.
-.ifndef RUMPKMOD
+# Use NetBSD kernel ABI by default on x86 archs.  Performance-related
+# compile-time options may override this at a later date.
+.if ${MACHINE_ARCH} == i386 || \
+${MACHINE_ARCH} == x86_64
+_RUMP_NATIVEABI= yes
+CPPFLAGS+=	-D_RUMP_NATIVE_ABI
+.else
+_RUMP_NATIVEABI= no
 CPPFLAGS:=	-I${RUMPTOP}/include ${CPPFLAGS}
 CPPFLAGS+=	-D_RUMPKERNEL
-.else
-CPPFLAGS+=	-D_RUMP_NATIVE_ABI
 .endif
 
 CPPFLAGS+=	-DMAXUSERS=32

Index: src/sys/rump/include/rump/rump.h
diff -u src/sys/rump/include/rump/rump.h:1.58 src/sys/rump/include/rump/rump.h:1.59
--- src/sys/rump/include/rump/rump.h:1.58	Thu Feb 20 00:41:05 2014
+++ src/sys/rump/include/rump/rump.h	Mon Mar 10 22:38:53 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.h,v 1.58 2014/02/20 00:41:05 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.59 2014/03/10 22:38:53 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -100,6 +100,8 @@ enum rump_etfs_type {
 _BEGIN_DECLS
 #endif
 
+int	rump_nativeabi_p(void);
+
 int	rump_boot_gethowto(void);
 void	rump_boot_sethowto(int);
 void	rump_boot_setsigmodel(enum rump_sigmodel);

Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.138 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.139
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.138	Fri Feb 28 14:19:25 2014
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern	Mon Mar 10 22:38:53 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.rumpkern,v 1.138 2014/02/28 14:19:25 matt Exp $
+#	$NetBSD: Makefile.rumpkern,v 1.139 2014/03/10 22:38:53 pooka Exp $
 #
 
 .include ${RUMPTOP}/Makefile.rump
@@ -211,7 +211,7 @@ CPPFLAGS+=	-Dsun3
 
 # include libkern source files
 KERNDIR=${RUMPTOP}/../lib/libkern
-.ifdef RUMPKMOD
+.if ${_RUMP_NATIVEABI} == yes
 KERNMISCCPPFLAGS+=	-D_RUMPKERNEL
 .endif
 .include ${RUMPTOP}/../lib/libkern/Makefile.libkern

Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.287 src/sys/rump/librump/rumpkern/rump.c:1.288
--- src/sys/rump/librump/rumpkern/rump.c:1.287	Fri Feb 28 10:16:51 2014
+++ src/sys/rump/librump/rumpkern/rump.c	Mon Mar 10 22:38:53 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.c,v 1.287 2014/02/28 10:16:51 skrll Exp $	*/
+/*	$NetBSD: rump.c,v 1.288 2014/03/10 22:38:53 pooka Exp $	*/
 
 /*
  

CVS commit: src/sys/rump

2014-03-10 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Mon Mar 10 22:44:11 UTC 2014

Modified Files:
src/sys/rump/include/rump: rump.h rumpkern_if_pub.h
src/sys/rump/librump/rumpkern: rump.c rumpkern.ifspec
rumpkern_if_priv.h rumpkern_if_wrappers.c

Log Message:
rump_getversion() does not require a thread context, so make it a straight
call instead of being wrapped around rump_pub_getversion().


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/rump/include/rump/rump.h
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/include/rump/rumpkern_if_pub.h
cvs rdiff -u -r1.288 -r1.289 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/librump/rumpkern/rumpkern.ifspec
cvs rdiff -u -r1.13 -r1.14 src/sys/rump/librump/rumpkern/rumpkern_if_priv.h \
src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.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/include/rump/rump.h
diff -u src/sys/rump/include/rump/rump.h:1.59 src/sys/rump/include/rump/rump.h:1.60
--- src/sys/rump/include/rump/rump.h:1.59	Mon Mar 10 22:38:53 2014
+++ src/sys/rump/include/rump/rump.h	Mon Mar 10 22:44:10 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.h,v 1.59 2014/03/10 22:38:53 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.60 2014/03/10 22:44:10 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -100,6 +100,7 @@ enum rump_etfs_type {
 _BEGIN_DECLS
 #endif
 
+int	rump_getversion(void);
 int	rump_nativeabi_p(void);
 
 int	rump_boot_gethowto(void);

Index: src/sys/rump/include/rump/rumpkern_if_pub.h
diff -u src/sys/rump/include/rump/rumpkern_if_pub.h:1.14 src/sys/rump/include/rump/rumpkern_if_pub.h:1.15
--- src/sys/rump/include/rump/rumpkern_if_pub.h:1.14	Thu Mar  7 18:51:02 2013
+++ src/sys/rump/include/rump/rumpkern_if_pub.h	Mon Mar 10 22:44:10 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpkern_if_pub.h,v 1.14 2013/03/07 18:51:02 pooka Exp $	*/
+/*	$NetBSD: rumpkern_if_pub.h,v 1.15 2014/03/10 22:44:10 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
@@ -6,7 +6,6 @@
  * by:   NetBSD: makerumpif.sh,v 1.6 2013/02/14 10:54:54 pooka Exp 
  */
 
-int rump_pub_getversion(void);
 int rump_pub_module_init(const struct modinfo * const *, size_t);
 int rump_pub_module_fini(const struct modinfo *);
 int rump_pub_kernelfsym_load(void *, uint64_t, char *, uint64_t);

Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.288 src/sys/rump/librump/rumpkern/rump.c:1.289
--- src/sys/rump/librump/rumpkern/rump.c:1.288	Mon Mar 10 22:38:53 2014
+++ src/sys/rump/librump/rumpkern/rump.c	Mon Mar 10 22:44:11 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.c,v 1.288 2014/03/10 22:38:53 pooka Exp $	*/
+/*	$NetBSD: rump.c,v 1.289 2014/03/10 22:44:11 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.288 2014/03/10 22:38:53 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.289 2014/03/10 22:44:11 pooka Exp $);
 
 #include sys/systm.h
 #define ELFSIZE ARCH_ELFSIZE
@@ -942,6 +942,8 @@ rump_getversion(void)
 
 	return __NetBSD_Version__;
 }
+/* compat */
+__strong_alias(rump_pub_getversion,rump_getversion);
 
 int
 rump_nativeabi_p(void)

Index: src/sys/rump/librump/rumpkern/rumpkern.ifspec
diff -u src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.11 src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.12
--- src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.11	Thu Mar  7 18:49:13 2013
+++ src/sys/rump/librump/rumpkern/rumpkern.ifspec	Mon Mar 10 22:44:11 2014
@@ -1,4 +1,4 @@
-;	$NetBSD: rumpkern.ifspec,v 1.11 2013/03/07 18:49:13 pooka Exp $
+;	$NetBSD: rumpkern.ifspec,v 1.12 2014/03/10 22:44:11 pooka Exp $
 
 NAME|kern
 PUBHDR|include/rump/rumpkern_if_pub.h
@@ -8,8 +8,6 @@ WRAPPERS|librump/rumpkern/rumpkern_if_wr
 ; type		| name		| args
 ;
 
-int		|getversion	|void
-
 int		|module_init	|const struct modinfo * const *, size_t
 int		|module_fini	|const struct modinfo *
 int		|kernelfsym_load|void *, uint64_t, char *, uint64_t

Index: src/sys/rump/librump/rumpkern/rumpkern_if_priv.h
diff -u src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.13 src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.14
--- src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.13	Thu Mar  7 18:50:17 2013
+++ src/sys/rump/librump/rumpkern/rumpkern_if_priv.h	Mon Mar 10 22:44:11 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpkern_if_priv.h,v 1.13 2013/03/07 18:50:17 pooka Exp $	*/
+/*	$NetBSD: rumpkern_if_priv.h,v 1.14 2014/03/10 22:44:11 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
@@ -6,7 +6,6 @@
  * by:   NetBSD: makerumpif.sh,v 1.6 2013/02/14 10:54:54 pooka Exp 
  */
 
-int rump_getversion(void);
 int rump_module_init(const struct modinfo * const *, size_t);
 int rump_module_fini(const struct modinfo *);
 int rump_kernelfsym_load(void *, uint64_t, char *, 

CVS commit: src/lib/libp2k

2014-03-10 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Mon Mar 10 22:47:27 UTC 2014

Modified Files:
src/lib/libp2k: p2k.c

Log Message:
rump_pub_getversion - rump_getversion


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/lib/libp2k/p2k.c

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

Modified files:

Index: src/lib/libp2k/p2k.c
diff -u src/lib/libp2k/p2k.c:1.63 src/lib/libp2k/p2k.c:1.64
--- src/lib/libp2k/p2k.c:1.63	Fri Feb  7 15:29:21 2014
+++ src/lib/libp2k/p2k.c	Mon Mar 10 22:47:27 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: p2k.c,v 1.63 2014/02/07 15:29:21 hannken Exp $	*/
+/*	$NetBSD: p2k.c,v 1.64 2014/03/10 22:47:27 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008, 2009  Antti Kantee.  All Rights Reserved.
@@ -754,7 +754,7 @@ needcompat(void)
 
 	/*LINTED*/
 	return __NetBSD_Version__  VERS_TIMECHANGE
-	 rump_pub_getversion() = VERS_TIMECHANGE;
+	 rump_getversion() = VERS_TIMECHANGE;
 }
 
 #define DOCOMPAT(va, va_compat)		\



CVS commit: src/sys/rump/include/rump

2014-03-10 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Mon Mar 10 22:48:29 UTC 2014

Modified Files:
src/sys/rump/include/rump: rump.h

Log Message:
add a compat prototype for rump_getversion()


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/rump/include/rump/rump.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/rump/include/rump/rump.h
diff -u src/sys/rump/include/rump/rump.h:1.60 src/sys/rump/include/rump/rump.h:1.61
--- src/sys/rump/include/rump/rump.h:1.60	Mon Mar 10 22:44:10 2014
+++ src/sys/rump/include/rump/rump.h	Mon Mar 10 22:48:29 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.h,v 1.60 2014/03/10 22:44:10 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.61 2014/03/10 22:48:29 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -101,6 +101,7 @@ _BEGIN_DECLS
 #endif
 
 int	rump_getversion(void);
+int	rump_pub_getversion(void); /* compat */
 int	rump_nativeabi_p(void);
 
 int	rump_boot_gethowto(void);



CVS commit: src/sys/rump/include/machine

2014-03-10 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Mon Mar 10 23:02:07 UTC 2014

Modified Files:
src/sys/rump/include/machine: cpu.h

Log Message:
update comments


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/rump/include/machine/cpu.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/rump/include/machine/cpu.h
diff -u src/sys/rump/include/machine/cpu.h:1.18 src/sys/rump/include/machine/cpu.h:1.19
--- src/sys/rump/include/machine/cpu.h:1.18	Wed Jan 22 23:38:21 2014
+++ src/sys/rump/include/machine/cpu.h	Mon Mar 10 23:02:07 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.18 2014/01/22 23:38:21 christos Exp $	*/
+/*	$NetBSD: cpu.h,v 1.19 2014/03/10 23:02:07 pooka Exp $	*/
 
 /*
  * Copyright (c) 2008-2011 Antti Kantee.  All Rights Reserved.
@@ -25,6 +25,11 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * CPU defitions for a generic arch.  Unfortunately there are some
+ * MD #ifdefs here.  They are required because of MD inlines and macros.
+ */
+
 #ifndef _SYS_RUMP_CPU_H_
 #define _SYS_RUMP_CPU_H_
 
@@ -44,20 +49,12 @@ struct cpu_info {
 	uint64_t ci_pcc_freq;
 #endif
 
-/*
- * XXX: horrible workaround for vax lock.h.
- * I eventually want to nuke rump include/machine, so don't waste
- * energy fighting with this.
- */
 #ifdef __vax__
 	int ci_ipimsgs;
 #define IPI_SEND_CNCHAR 0
 #define IPI_DDB 0
 #endif /* __vax__ */
 
-/*
- * More stinky hacks, this time for powerpc.  Will go away eventually.
- */
 #ifdef __powerpc__
 	struct cache_info {
 		int dcache_size;
@@ -68,14 +65,13 @@ struct cpu_info {
 #endif /* __powerpc */
 };
 
-/* more dirty rotten vax kludges */
 #ifdef __vax__
 static __inline void cpu_handle_ipi(void) {}
 #endif /* __vax__ */
 
 #ifdef __powerpc__
 void __syncicache(void *, size_t);
-#endif
+#endif /* __powerpc__ */
 
 struct lwp *rumpuser_curlwp(void);
 #define curlwp rumpuser_curlwp()



CVS commit: src/sys/rump/librump/rumpkern

2014-03-10 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Tue Mar 11 00:59:38 UTC 2014

Modified Files:
src/sys/rump/librump/rumpkern: emul.c locks.c

Log Message:
Put the syncobjs in emul.c instead of locks.c so that they are
present for both locks.c and locks_up.c alike.


To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.67 -r1.68 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/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.163 src/sys/rump/librump/rumpkern/emul.c:1.164
--- src/sys/rump/librump/rumpkern/emul.c:1.163	Thu Feb 20 01:01:10 2014
+++ src/sys/rump/librump/rumpkern/emul.c	Tue Mar 11 00:59:38 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: emul.c,v 1.163 2014/02/20 01:01:10 pooka Exp $	*/
+/*	$NetBSD: emul.c,v 1.164 2014/03/11 00:59:38 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.163 2014/02/20 01:01:10 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.164 2014/03/11 00:59:38 pooka Exp $);
 
 #include sys/param.h
 #include sys/null.h
@@ -148,6 +148,9 @@ u_int nprocs = 1;
 
 cprng_strong_t *kern_cprng;
 
+/* not used, but need the symbols for pointer comparisons */
+syncobj_t mutex_syncobj, rw_syncobj;
+
 int
 kpause(const char *wmesg, bool intr, int timeo, kmutex_t *mtx)
 {

Index: src/sys/rump/librump/rumpkern/locks.c
diff -u src/sys/rump/librump/rumpkern/locks.c:1.67 src/sys/rump/librump/rumpkern/locks.c:1.68
--- src/sys/rump/librump/rumpkern/locks.c:1.67	Mon Dec  9 17:03:41 2013
+++ src/sys/rump/librump/rumpkern/locks.c	Tue Mar 11 00:59:38 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: locks.c,v 1.67 2013/12/09 17:03:41 pooka Exp $	*/
+/*	$NetBSD: locks.c,v 1.68 2014/03/11 00:59:38 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: locks.c,v 1.67 2013/12/09 17:03:41 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: locks.c,v 1.68 2014/03/11 00:59:38 pooka Exp $);
 
 #include sys/param.h
 #include sys/kmem.h
@@ -73,9 +73,6 @@ static lockops_t rw_lockops = {
 #define UNLOCKED(a, b)
 #endif
 
-/* not used, but need the symbols for pointer comparisons */
-syncobj_t mutex_syncobj, rw_syncobj;
-
 /*
  * We map locks to pthread routines.  The difference between kernel
  * and rumpuser routines is that while the kernel uses static



CVS commit: src/distrib/sets/lists

2014-03-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Mar 11 01:38:16 UTC 2014

Modified Files:
src/distrib/sets/lists/base: ad.arm
src/distrib/sets/lists/debug: ad.arm ad.mips ad.powerpc md.sparc64

Log Message:
fix libelf.so sets


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/debug/ad.arm
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/debug/ad.mips
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug/ad.powerpc
cvs rdiff -u -r1.48 -r1.49 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/base/ad.arm
diff -u src/distrib/sets/lists/base/ad.arm:1.39 src/distrib/sets/lists/base/ad.arm:1.40
--- src/distrib/sets/lists/base/ad.arm:1.39	Sun Mar  9 16:35:30 2014
+++ src/distrib/sets/lists/base/ad.arm	Mon Mar 10 21:38:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.39 2014/03/09 20:35:30 htodd Exp $
+# $NetBSD: ad.arm,v 1.40 2014/03/11 01:38:15 christos Exp $
 ./lib/oabi	base-compat-shlib	compat
 ./lib/oabi/npf	base-npf-shlib		compat
 ./lib/oabi/npf/ext_log.so			base-npf-shlib		compat,pic
@@ -123,7 +123,8 @@
 ./usr/lib/oabi/libdwarf.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libedit.so.3			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libedit.so.3.1			base-compat-shlib	compat,pic
-./usr/lib/oabi/libelf.so.0			base-compat-shlib	compat,pic
+./usr/lib/oabi/libelf.so.1			base-compat-shlib	compat,pic
+./usr/lib/oabi/libelf.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libevent.so.4			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libevent.so.4.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libevent_openssl.so.4		base-compat-shlib	compat,pic,crypto

Index: src/distrib/sets/lists/debug/ad.arm
diff -u src/distrib/sets/lists/debug/ad.arm:1.30 src/distrib/sets/lists/debug/ad.arm:1.31
--- src/distrib/sets/lists/debug/ad.arm:1.30	Sun Mar  9 16:35:30 2014
+++ src/distrib/sets/lists/debug/ad.arm	Mon Mar 10 21:38:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.30 2014/03/09 20:35:30 htodd Exp $
+# $NetBSD: ad.arm,v 1.31 2014/03/11 01:38:15 christos Exp $
 ./usr/lib/libarm_g.acomp-c-debuglib		debuglib
 ./usr/lib/libc_vfp_g.acomp-c-debuglib		debuglib,softfloat
 ./usr/lib/libpmc_g.acomp-c-debuglib		debuglib
@@ -82,7 +82,7 @@
 ./usr/libdata/debug/usr/lib/oabi/libdtrace.so.2.0.debug	comp-sys-debug	dtrace,debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libdwarf.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libedit.so.3.1.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/oabi/libelf.so.0.debug		comp-sys-debug	debug,compat
+./usr/libdata/debug/usr/lib/oabi/libelf.so.1.0.debug		comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libevent.so.4.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libevent_openssl.so.4.0.debug	comp-sys-debug	debug,compat,crypto
 ./usr/libdata/debug/usr/lib/oabi/libevent_pthreads.so.4.0.debug	comp-sys-debug	debug,compat

Index: src/distrib/sets/lists/debug/ad.mips
diff -u src/distrib/sets/lists/debug/ad.mips:1.26 src/distrib/sets/lists/debug/ad.mips:1.27
--- src/distrib/sets/lists/debug/ad.mips:1.26	Sun Mar  9 16:35:30 2014
+++ src/distrib/sets/lists/debug/ad.mips	Mon Mar 10 21:38:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.26 2014/03/09 20:35:30 htodd Exp $
+# $NetBSD: ad.mips,v 1.27 2014/03/11 01:38:15 christos Exp $
 ./usr/lib/64/libcrypto_g.a			comp-c-debuglib		compat,crypto,debuglib,arch64
 ./usr/lib/64/libcrypto_idea_g.a			comp-obsolete		obsolete
 ./usr/lib/64/libcrypto_mdc2_g.a			comp-obsolete		obsolete
@@ -87,7 +87,7 @@
 ./usr/libdata/debug/usr/lib/64/libdtrace.so.2.0.debug	comp-sys-debug	dtrace,debug,compat,arch64
 ./usr/libdata/debug/usr/lib/64/libdwarf.so.1.0.debug	comp-sys-debug	debug,compat,arch64
 ./usr/libdata/debug/usr/lib/64/libedit.so.3.1.debug	comp-sys-debug	debug,compat,arch64
-./usr/libdata/debug/usr/lib/64/libelf.so.0.debug		comp-sys-debug	debug,compat,arch64
+./usr/libdata/debug/usr/lib/64/libelf.so.1.0.debug		comp-sys-debug	debug,compat,arch64
 ./usr/libdata/debug/usr/lib/64/libevent.so.4.0.debug	comp-sys-debug	debug,compat,arch64
 ./usr/libdata/debug/usr/lib/64/libevent_openssl.so.4.0.debug	comp-sys-debug	debug,compat,crypto,arch64
 ./usr/libdata/debug/usr/lib/64/libevent_pthreads.so.4.0.debug	comp-sys-debug	debug,compat,arch64
@@ -263,7 +263,7 @@
 ./usr/libdata/debug/usr/lib/o32/libdtrace.so.2.0.debug	comp-sys-debug	dtrace,debug,compat,arch64
 ./usr/libdata/debug/usr/lib/o32/libdwarf.so.1.0.debug	comp-sys-debug	debug,compat,arch64
 ./usr/libdata/debug/usr/lib/o32/libedit.so.3.1.debug	comp-sys-debug	debug,compat,arch64
-./usr/libdata/debug/usr/lib/o32/libelf.so.0.debug		comp-sys-debug	debug,compat,arch64
+./usr/libdata/debug/usr/lib/o32/libelf.so.1.0.debug		comp-sys-debug	debug,compat,arch64
 

CVS commit: src/sys/arch/hpcarm/hpcarm

2014-03-10 Thread Ryota Ozaki
Module Name:src
Committed By:   ozaki-r
Date:   Tue Mar 11 04:17:36 UTC 2014

Modified Files:
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c

Log Message:
Remove unused variable found by gcc 4.8


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c

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

Modified files:

Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.20 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.21
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.20	Mon Aug 26 15:31:06 2013
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c	Tue Mar 11 04:17:36 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.20 2013/08/26 15:31:06 matt Exp $	*/
+/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.21 2014/03/11 04:17:36 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pxa2x0_hpc_machdep.c,v 1.20 2013/08/26 15:31:06 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pxa2x0_hpc_machdep.c,v 1.21 2014/03/11 04:17:36 ozaki-r Exp $);
 
 #include opt_ddb.h
 #include opt_dram_pages.h
@@ -252,7 +252,6 @@ init_pxa2x0(int argc, char **argv, struc
 	u_int kerneldatasize, symbolsize;
 	u_int l1pagetable;
 	vaddr_t freemempos;
-	vsize_t pt_size;
 	int loop;
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	Elf_Shdr *sh;
@@ -392,8 +391,6 @@ init_pxa2x0(int argc, char **argv, struc
 	 */
 	valloc_pages(systempage, 1);
 
-	pt_size = round_page(freemempos) - physical_start;
-
 	/* Allocate stacks for all modes */
 	valloc_pages(irqstack, IRQ_STACK_SIZE);
 	valloc_pages(abtstack, ABT_STACK_SIZE);



CVS commit: src/external/cddl/osnet/dev/dtrace/arm

2014-03-10 Thread Ryota Ozaki
Module Name:src
Committed By:   ozaki-r
Date:   Mon Mar 10 06:38:22 UTC 2014

Modified Files:
src/external/cddl/osnet/dev/dtrace/arm: dtrace_asm.S

Log Message:
Fix header inclusions


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S

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



CVS commit: src/external/gpl3/binutils/lib/libbfd

2014-03-10 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Mar 10 07:28:33 UTC 2014

Modified Files:
src/external/gpl3/binutils/lib/libbfd: Makefile

Log Message:
make elf{32,64}-ia64.c depend upon the right parent.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/binutils/lib/libbfd/Makefile

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



CVS commit: src/external/gpl3/gcc/dist/gcc

2014-03-10 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Mar 10 07:32:18 UTC 2014

Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc

Log Message:
also look at netbsd.opt and netbsd-elf.opt.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/gpl3/gcc/dist/gcc/config.gcc

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



CVS commit: src/distrib/sets/lists/base

2014-03-10 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Mar 10 08:45:30 UTC 2014

Modified Files:
src/distrib/sets/lists/base: md.sparc64

Log Message:
Fix compat libelf version


To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/distrib/sets/lists/base/md.sparc64

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



CVS commit: src/sys/arch/arm/imx

2014-03-10 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Mar 10 09:35:18 UTC 2014

Modified Files:
src/sys/arch/arm/imx: imx51_tzic.c

Log Message:
Assume reads from hardware do something even if the result isn't required.

Hi htodd@!


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/imx51_tzic.c

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



CVS commit: src/external/gpl3/binutils/dist/bfd

2014-03-10 Thread Takeshi Nakayama
Module Name:src
Committed By:   nakayama
Date:   Mon Mar 10 12:01:19 UTC 2014

Modified Files:
src/external/gpl3/binutils/dist/bfd: config.bfd

Log Message:
Enable 64-bit integer handling for gas even on 32-bit host since
sparc64 kernel now uses 64-bit constant with %hh operator.

Fix for PR toolchain/48630.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/binutils/dist/bfd/config.bfd

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



CVS commit: src/external/gpl3/binutils/lib/libbfd/arch/sparc

2014-03-10 Thread Takeshi Nakayama
Module Name:src
Committed By:   nakayama
Date:   Mon Mar 10 12:02:36 UTC 2014

Modified Files:
src/external/gpl3/binutils/lib/libbfd/arch/sparc: bfd.h defs.mk

Log Message:
Regenerate for sparc's want64=true change.

Native toolchain fix for PR toolchain/48630.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk

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



CVS commit: src/share/mk

2014-03-10 Thread Takeshi Nakayama
Module Name:src
Committed By:   nakayama
Date:   Mon Mar 10 12:13:14 UTC 2014

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

Log Message:
-mcmodel option is CPU specific not machine specific.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/share/mk/bsd.kmodule.mk

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



CVS commit: src/sys/dev/usb

2014-03-10 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Mar 10 13:01:28 UTC 2014

Modified Files:
src/sys/dev/usb: xhci.c

Log Message:
Comment style.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.



CVS commit: src/sys/dev

2014-03-10 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Mar 10 13:10:41 UTC 2014

Modified Files:
src/sys/dev/pci: xhci_pci.c
src/sys/dev/usb: xhci.c xhcivar.h

Log Message:
Don't abuse usbd_status in xhci_init


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/xhci_pci.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/xhcivar.h

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



CVS commit: src/sys/dev/usb

2014-03-10 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Mar 10 13:12:02 UTC 2014

Modified Files:
src/sys/dev/usb: xhcivar.h

Log Message:
Whtiespace.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/xhcivar.h

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



CVS commit: src/distrib/sets/lists/base

2014-03-10 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Mar 10 13:19:53 UTC 2014

Modified Files:
src/distrib/sets/lists/base: ad.mips ad.powerpc

Log Message:
Fix compat libelf version numbers


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base/ad.powerpc

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



CVS commit: src/sys/dev/usb

2014-03-10 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Mar 10 13:21:22 UTC 2014

Modified Files:
src/sys/dev/usb: xhci.c

Log Message:
Code style. No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 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.



CVS commit: src/sys/arch/ia64/unwind

2014-03-10 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Mar 10 13:47:16 UTC 2014

Modified Files:
src/sys/arch/ia64/unwind: stackframe.c

Log Message:
Remove unused variable


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/unwind/stackframe.c

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



CVS commit: src/sys/arch/ia64/ia64

2014-03-10 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Mar 10 13:47:45 UTC 2014

Modified Files:
src/sys/arch/ia64/ia64: cpu.c pmap.c trap.c

Log Message:
Remove unused variables


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ia64/ia64/cpu.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/ia64/ia64/pmap.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/ia64/ia64/trap.c

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



CVS commit: src/sys/arch/hpcarm/hpcarm

2014-03-10 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Mar 10 14:51:15 UTC 2014

Modified Files:
src/sys/arch/hpcarm/hpcarm: sa11x0_hpc_machdep.c

Log Message:
Avoid unused variable warning by borrowing sa1_cache_clean_addr briefly


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c

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



CVS commit: src/sbin/fdisk

2014-03-10 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Mon Mar 10 15:42:51 UTC 2014

Modified Files:
src/sbin/fdisk: fdisk.c

Log Message:
Always print the MBR drive serial number, even if it's 0.


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/sbin/fdisk/fdisk.c

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



CVS commit: src/crypto/external/bsd/netpgp/bin/netpgpverify

2014-03-10 Thread Alistair G. Crooks
Module Name:src
Committed By:   agc
Date:   Mon Mar 10 17:00:53 UTC 2014

Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile

Log Message:
fix typo in previous commit


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile

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



CVS commit: src/share/misc

2014-03-10 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Mon Mar 10 17:56:21 UTC 2014

Modified Files:
src/share/misc: acronyms

Log Message:
add UGT


To generate a diff of this commit:
cvs rdiff -u -r1.222 -r1.223 src/share/misc/acronyms

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



CVS commit: src/share/misc

2014-03-10 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Mon Mar 10 18:22:54 UTC 2014

Modified Files:
src/share/misc: language

Log Message:
reformat comment


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/misc/language

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



CVS commit: src/share/misc

2014-03-10 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Mon Mar 10 18:44:29 UTC 2014

Modified Files:
src/share/misc: world.phone

Log Message:
note that kropla.com/dialcode.htm redirects to countrycode.org


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/misc/world.phone

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



CVS commit: src/share/misc

2014-03-10 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Mon Mar 10 18:45:44 UTC 2014

Modified Files:
src/share/misc: world.phone

Log Message:
add a nice CVS marker


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/misc/world.phone

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



CVS commit: src/external/gpl3/gcc/usr.bin/backend

2014-03-10 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Mar 10 18:57:36 UTC 2014

Modified Files:
src/external/gpl3/gcc/usr.bin/backend: Makefile

Log Message:
pass $LD and $AS to the auto-build.h generation, so its configure
gets the right answers for many things.  in particular, it enables
HAVE_AS_TLS which the sparc port needs for TARGET_TLS to work.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gcc/usr.bin/backend/Makefile

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



CVS commit: src/external/gpl3/gcc

2014-03-10 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Mar 10 19:06:35 UTC 2014

Modified Files:
src/external/gpl3/gcc: README.gcc48

Log Message:
update a bit.  delete ports that have switched to GCC 4.8.  with this
we still need significant work on these ports:

- mips*
- powerpc
- sh*
- vax
- m68k*

the x86 platforms are probably ready to switch, but i'm not in a good
position to test them.  these platforms are probably ready to switch,
as they're still mostly in bringup mode anyway:

- powerpc64
- coldfire
- ia64


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/README.gcc48

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



CVS commit: src/sys/dev/usb

2014-03-10 Thread Reinoud Zandijk
Module Name:src
Committed By:   reinoud
Date:   Mon Mar 10 19:55:18 UTC 2014

Modified Files:
src/sys/dev/usb: uslsa.c

Log Message:
Improve support for the CP2104. This particular device has a higher maximum
baud rate and thus the SLSA_R_SET_BAUDDIV sets the wrong rate.

Changed to code to use the SLSA_R_SET_BAUDRATE command and providing a
fallback for the old SLSA_R_SET_BAUDDIV command if the device doesn't
recognize the command. Unknown yet if the CP2101 has this command or not.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/usb/uslsa.c

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



CVS commit: src/external/gpl3/gcc

2014-03-10 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Mar 10 19:55:51 UTC 2014

Modified Files:
src/external/gpl3/gcc: README.gcc48

Log Message:
updaet a little more:
- coldfire release works, but there are no kernels yet
- ia64 port gets much further now
- i386 port runs


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/README.gcc48

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



CVS commit: src/lib/librumpuser

2014-03-10 Thread Justin Cormack
Module Name:src
Committed By:   justin
Date:   Mon Mar 10 22:37:51 UTC 2014

Modified Files:
src/lib/librumpuser: rumpuser_pth.c

Log Message:
Revert conversion to __thread as breaks on archs without TLS support


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/lib/librumpuser/rumpuser_pth.c

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



CVS commit: src

2014-03-10 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Mon Mar 10 22:38:53 UTC 2014

Modified Files:
src/share/mk: bsd.own.mk
src/sys/rump: Makefile.rump
src/sys/rump/include/rump: rump.h
src/sys/rump/librump/rumpkern: Makefile.rumpkern rump.c
src/tests/rump/modautoload: Makefile t_modautoload.c

Log Message:
Move the is arch capable of loading native kernel modules into
rump kernel clauses from bsd.own.mk to Makefile.rump.  Also,
add a rump_nativeabi_p() call to determine if rump kernel is
compiled with native ABI support.


To generate a diff of this commit:
cvs rdiff -u -r1.782 -r1.783 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.89 -r1.90 src/sys/rump/Makefile.rump
cvs rdiff -u -r1.58 -r1.59 src/sys/rump/include/rump/rump.h
cvs rdiff -u -r1.138 -r1.139 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.287 -r1.288 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.1 -r1.2 src/tests/rump/modautoload/Makefile \
src/tests/rump/modautoload/t_modautoload.c

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



CVS commit: src/sys/rump

2014-03-10 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Mon Mar 10 22:44:11 UTC 2014

Modified Files:
src/sys/rump/include/rump: rump.h rumpkern_if_pub.h
src/sys/rump/librump/rumpkern: rump.c rumpkern.ifspec
rumpkern_if_priv.h rumpkern_if_wrappers.c

Log Message:
rump_getversion() does not require a thread context, so make it a straight
call instead of being wrapped around rump_pub_getversion().


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/rump/include/rump/rump.h
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/include/rump/rumpkern_if_pub.h
cvs rdiff -u -r1.288 -r1.289 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/librump/rumpkern/rumpkern.ifspec
cvs rdiff -u -r1.13 -r1.14 src/sys/rump/librump/rumpkern/rumpkern_if_priv.h \
src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c

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



CVS commit: src/lib/libp2k

2014-03-10 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Mon Mar 10 22:47:27 UTC 2014

Modified Files:
src/lib/libp2k: p2k.c

Log Message:
rump_pub_getversion - rump_getversion


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/lib/libp2k/p2k.c

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



CVS commit: src/sys/rump/include/rump

2014-03-10 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Mon Mar 10 22:48:29 UTC 2014

Modified Files:
src/sys/rump/include/rump: rump.h

Log Message:
add a compat prototype for rump_getversion()


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/rump/include/rump/rump.h

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



CVS commit: src/sys/rump/include/machine

2014-03-10 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Mon Mar 10 23:02:07 UTC 2014

Modified Files:
src/sys/rump/include/machine: cpu.h

Log Message:
update comments


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/rump/include/machine/cpu.h

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



CVS commit: src/sys/rump/librump/rumpkern

2014-03-10 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Tue Mar 11 00:59:38 UTC 2014

Modified Files:
src/sys/rump/librump/rumpkern: emul.c locks.c

Log Message:
Put the syncobjs in emul.c instead of locks.c so that they are
present for both locks.c and locks_up.c alike.


To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.67 -r1.68 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.



CVS commit: src/distrib/sets/lists

2014-03-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Mar 11 01:38:16 UTC 2014

Modified Files:
src/distrib/sets/lists/base: ad.arm
src/distrib/sets/lists/debug: ad.arm ad.mips ad.powerpc md.sparc64

Log Message:
fix libelf.so sets


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/debug/ad.arm
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/debug/ad.mips
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug/ad.powerpc
cvs rdiff -u -r1.48 -r1.49 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.



CVS commit: src/sys/arch/hpcarm/hpcarm

2014-03-10 Thread Ryota Ozaki
Module Name:src
Committed By:   ozaki-r
Date:   Tue Mar 11 04:17:36 UTC 2014

Modified Files:
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c

Log Message:
Remove unused variable found by gcc 4.8


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c

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