svn commit: r185966 - in projects/arpv2_merge_1: contrib/binutils/bfd contrib/binutils/gas/config contrib/binutils/ld/emulparams gnu/usr.bin/binutils/as gnu/usr.bin/binutils/as/mips-freebsd gnu/usr...

Thu Dec 11 18:11:51 PST 2008

Author: kmacy
Date: Fri Dec 12 02:11:49 2008
New Revision: 185966
URL: http://svn.freebsd.org/changeset/base/185966

Log:
  IFC 185919:185965
  
  daily merge from -CURRENT

Added:
  projects/arpv2_merge_1/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh
  projects/arpv2_merge_1/gnu/usr.bin/binutils/as/mips-freebsd/
  projects/arpv2_merge_1/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h
  projects/arpv2_merge_1/gnu/usr.bin/binutils/as/mips-freebsd/targ-cpu.h
  projects/arpv2_merge_1/gnu/usr.bin/binutils/ld/Makefile.mips
  projects/arpv2_merge_1/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh
  projects/arpv2_merge_1/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh
  projects/arpv2_merge_1/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh
  projects/arpv2_merge_1/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh
  projects/arpv2_merge_1/gnu/usr.bin/binutils/libbfd/Makefile.mips
  projects/arpv2_merge_1/gnu/usr.bin/binutils/libopcodes/Makefile.mips
  projects/arpv2_merge_1/share/man/man9/VOP_VPTOCNP.9
Modified:
  projects/arpv2_merge_1/contrib/binutils/bfd/config.bfd
  projects/arpv2_merge_1/contrib/binutils/gas/config/tc-mips.c
  projects/arpv2_merge_1/gnu/usr.bin/binutils/as/Makefile
  projects/arpv2_merge_1/gnu/usr.bin/binutils/libbfd/bfd.h
  projects/arpv2_merge_1/share/man/man9/Makefile
  projects/arpv2_merge_1/share/man/man9/ifnet.9
  projects/arpv2_merge_1/sys/amd64/amd64/local_apic.c
  projects/arpv2_merge_1/sys/amd64/include/apicreg.h
  projects/arpv2_merge_1/sys/amd64/include/apicvar.h
  projects/arpv2_merge_1/sys/boot/zfs/zfs.c
  projects/arpv2_merge_1/sys/conf/options
  projects/arpv2_merge_1/sys/dev/usb/usbdevs
  projects/arpv2_merge_1/sys/dev/usb2/bluetooth/ng_ubt2.c
  projects/arpv2_merge_1/sys/dev/usb2/bluetooth/ubtbcmfw2.c
  projects/arpv2_merge_1/sys/dev/usb2/controller/at91dci.c
  projects/arpv2_merge_1/sys/dev/usb2/controller/at91dci_atmelarm.c
  projects/arpv2_merge_1/sys/dev/usb2/controller/ehci2.c
  projects/arpv2_merge_1/sys/dev/usb2/controller/ehci2_pci.c
  projects/arpv2_merge_1/sys/dev/usb2/controller/musb2_otg.c
  projects/arpv2_merge_1/sys/dev/usb2/controller/musb2_otg_atmelarm.c
  projects/arpv2_merge_1/sys/dev/usb2/controller/ohci2.c
  projects/arpv2_merge_1/sys/dev/usb2/controller/uhci2.c
  projects/arpv2_merge_1/sys/dev/usb2/controller/usb2_controller.c
  projects/arpv2_merge_1/sys/dev/usb2/controller/uss820dci.c
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_busdma.c
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_busdma.h
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_compat_linux.c
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_compat_linux.h
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_config_td.c
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_config_td.h
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_core.h
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_debug.c
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_dev.c
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_dev.h
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_device.c
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_device.h
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_dynamic.c
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_dynamic.h
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_error.c
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_generic.c
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_handle_request.c
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_hid.h
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_hub.c
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_hub.h
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_lookup.h
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_mbuf.h
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_msctest.c
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_msctest.h
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_parse.h
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_process.c
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_process.h
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_request.c
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_request.h
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_sw_transfer.c
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_sw_transfer.h
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_transfer.c
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_transfer.h
  projects/arpv2_merge_1/sys/dev/usb2/core/usb2_util.c
  projects/arpv2_merge_1/sys/dev/usb2/ethernet/if_aue2.c
  projects/arpv2_merge_1/sys/dev/usb2/ethernet/if_axe2.c
  projects/arpv2_merge_1/sys/dev/usb2/ethernet/if_cdce2.c
  projects/arpv2_merge_1/sys/dev/usb2/ethernet/if_cue2.c
  projects/arpv2_merge_1/sys/dev/usb2/ethernet/if_kue2.c
  projects/arpv2_merge_1/sys/dev/usb2/ethernet/if_rue2.c
  projects/arpv2_merge_1/sys/dev/usb2/ethernet/if_udav2.c
  projects/arpv2_merge_1/sys/dev/usb2/ethernet/usb2_ethernet.c
  projects/arpv2_merge_1/sys/dev/usb2/ethernet/usb2_ethernet.h
  projects/arpv2_merge_1/sys/dev/usb2/image/uscanner2.c
  projects/arpv2_merge_1/sys/dev/usb2/input/uhid2.c
  projects/arpv2_merge_1/sys/dev/usb2/input/ukbd2.c
  projects/arpv2_merge_1/sys/dev/usb2/input/ums2.c
  projects/arpv2_merge_1/sys/dev/usb2/misc/udbp2.c
  projects/arpv2_merge_1/sys/dev/usb2/misc/ufm2.c
  projects/arpv2_merge_1/sys/dev/usb2/quirk/usb2_quirk.c
  projects/arpv2_merge_1/sys/dev/usb2/serial/uark2.c
  projects/arpv2_merge_1/sys/dev/usb2/serial/ubsa2.c
  projects/arpv2_merge_1/sys/dev/usb2/serial/ubser2.c
  projects/arpv2_merge_1/sys/dev/usb2/serial/uchcom2.c
  projects/arpv2_merge_1/sys/dev/usb2/serial/ucycom2.c
  projects/arpv2_merge_1/sys/dev/usb2/serial/ufoma2.c
  projects/arpv2_merge_1/sys/dev/usb2/serial/uftdi2.c
  projects/arpv2_merge_1/sys/dev/usb2/serial/ugensa2.c
  projects/arpv2_merge_1/sys/dev/usb2/serial/uipaq2.c
  projects/arpv2_merge_1/sys/dev/usb2/serial/ulpt2.c
  projects/arpv2_merge_1/sys/dev/usb2/serial/umct2.c
  projects/arpv2_merge_1/sys/dev/usb2/serial/umodem2.c
  projects/arpv2_merge_1/sys/dev/usb2/serial/umoscom2.c
  projects/arpv2_merge_1/sys/dev/usb2/serial/uplcom2.c
  projects/arpv2_merge_1/sys/dev/usb2/serial/usb2_serial.c
  projects/arpv2_merge_1/sys/dev/usb2/serial/usb2_serial.h
  projects/arpv2_merge_1/sys/dev/usb2/serial/uvisor2.c
  projects/arpv2_merge_1/sys/dev/usb2/serial/uvscom2.c
  projects/arpv2_merge_1/sys/dev/usb2/sound/uaudio2.c
  projects/arpv2_merge_1/sys/dev/usb2/sound/uaudio2.h
  projects/arpv2_merge_1/sys/dev/usb2/storage/ata-usb2.c
  projects/arpv2_merge_1/sys/dev/usb2/storage/umass2.c
  projects/arpv2_merge_1/sys/dev/usb2/storage/urio2.c
  projects/arpv2_merge_1/sys/dev/usb2/storage/ustorage2_fs.c
  projects/arpv2_merge_1/sys/dev/usb2/template/usb2_template.c
  projects/arpv2_merge_1/sys/dev/usb2/wlan/if_rum2.c
  projects/arpv2_merge_1/sys/dev/usb2/wlan/if_ural2.c
  projects/arpv2_merge_1/sys/dev/usb2/wlan/if_zyd2.c
  projects/arpv2_merge_1/sys/dev/vr/if_vr.c
  projects/arpv2_merge_1/sys/fs/deadfs/dead_vnops.c
  projects/arpv2_merge_1/sys/fs/devfs/devfs_vnops.c
  projects/arpv2_merge_1/sys/i386/i386/local_apic.c
  projects/arpv2_merge_1/sys/i386/include/apicreg.h
  projects/arpv2_merge_1/sys/i386/include/apicvar.h
  projects/arpv2_merge_1/sys/kern/kern_poll.c
  projects/arpv2_merge_1/sys/kern/tty_pts.c
  projects/arpv2_merge_1/sys/kern/vfs_cache.c
  projects/arpv2_merge_1/sys/kern/vfs_default.c
  projects/arpv2_merge_1/sys/kern/vnode_if.src
  projects/arpv2_merge_1/sys/net/if.c
  projects/arpv2_merge_1/sys/net/if_tun.c
  projects/arpv2_merge_1/sys/net/raw_cb.h
  projects/arpv2_merge_1/sys/netinet/in_pcb.h
  projects/arpv2_merge_1/sys/netinet/ip_fw2.c
  projects/arpv2_merge_1/sys/netinet/ip_fw_nat.c
  projects/arpv2_merge_1/sys/netinet/ip_fw_pfil.c
  projects/arpv2_merge_1/sys/netinet/ip_var.h
  projects/arpv2_merge_1/sys/netinet/tcp_subr.c
  projects/arpv2_merge_1/sys/netinet/tcp_var.h
  projects/arpv2_merge_1/sys/netinet/udp_var.h
  projects/arpv2_merge_1/sys/netinet6/in6_ifattach.c
  projects/arpv2_merge_1/sys/netinet6/in6_proto.c
  projects/arpv2_merge_1/sys/netinet6/in6_var.h
  projects/arpv2_merge_1/sys/netinet6/ip6_var.h
  projects/arpv2_merge_1/sys/netinet6/nd6.h
  projects/arpv2_merge_1/sys/netinet6/tcp6_var.h
  projects/arpv2_merge_1/sys/netinet6/vinet6.h
  projects/arpv2_merge_1/sys/netipx/ipx_usrreq.c
  projects/arpv2_merge_1/sys/sys/resource.h
  projects/arpv2_merge_1/sys/sys/vimage.h
  projects/arpv2_merge_1/sys/sys/vnode.h

Modified: projects/arpv2_merge_1/contrib/binutils/bfd/config.bfd
==============================================================================

--- projects/arpv2_merge_1/contrib/binutils/bfd/config.bfd	Fri Dec 12 02:07:45 2008	(r185965)
+++ projects/arpv2_merge_1/contrib/binutils/bfd/config.bfd	Fri Dec 12 02:11:49 2008	(r185966)
@@ -768,6 +768,10 @@ case "${targ}" in
     targ_defvec=bfd_elf32_littlemips_vec
     targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec"
     ;;
+  mips*-*-freebsd*)
+    targ_defvec=bfd_elf32_tradbigmips_vec
+    targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmisp_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec"
+    ;;
   mips*-*-netbsd*)
     targ_defvec=bfd_elf32_bigmips_vec
     targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec"

Modified: projects/arpv2_merge_1/contrib/binutils/gas/config/tc-mips.c
==============================================================================
--- projects/arpv2_merge_1/contrib/binutils/gas/config/tc-mips.c	Fri Dec 12 02:07:45 2008	(r185965)
+++ projects/arpv2_merge_1/contrib/binutils/gas/config/tc-mips.c	Fri Dec 12 02:11:49 2008	(r185966)
@@ -281,6 +281,9 @@ static int mips_32bitmode = 0;
 
 #define HAVE_64BIT_OBJECTS (mips_abi == N64_ABI)
 
+/* True if relocations are stored in-place.  */
+#define HAVE_IN_PLACE_ADDENDS (!HAVE_NEWABI)
+
 /* We can only have 64bit addresses if the object file format
    supports it.  */
 #define HAVE_32BIT_ADDRESSES                           \
@@ -13020,6 +13023,26 @@ mips_fix_adjustable (fixS *fixp)
   if (fixp->fx_addsy == NULL)
     return 1;
 
+  /* If symbol SYM is in a mergeable section, relocations of the form
+     SYM + 0 can usually be made section-relative.  The mergeable data
+     is then identified by the section offset rather than by the symbol.
+
+     However, if we're generating REL LO16 relocations, the offset is split
+     between the LO16 and parterning high part relocation.  The linker will
+     need to recalculate the complete offset in order to correctly identify
+     the merge data.
+
+     The linker has traditionally not looked for the parterning high part
+     relocation, and has thus allowed orphaned R_MIPS_LO16 relocations to be
+     placed anywhere.  Rather than break backwards compatibility by changing
+     this, it seems better not to force the issue, and instead keep the
+     original symbol.  This will work with either linker behavior.  */
+  if ((fixp->fx_r_type == BFD_RELOC_LO16
+       || reloc_needs_lo_p (fixp->fx_r_type))
+      && HAVE_IN_PLACE_ADDENDS
+      && (S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_MERGE) != 0)
+    return 0;
+
 #ifdef OBJ_ELF
   if (OUTPUT_FLAVOR == bfd_target_elf_flavour
       && S_GET_OTHER (fixp->fx_addsy) == STO_MIPS16

Added: projects/arpv2_merge_1/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/arpv2_merge_1/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh	Fri Dec 12 02:11:49 2008	(r185966)
@@ -0,0 +1,3 @@
+. ${srcdir}/emulparams/elf32bmip.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+GENERATE_PIE_SCRIPT=yes

Modified: projects/arpv2_merge_1/gnu/usr.bin/binutils/as/Makefile
==============================================================================
--- projects/arpv2_merge_1/gnu/usr.bin/binutils/as/Makefile	Fri Dec 12 02:07:45 2008	(r185965)
+++ projects/arpv2_merge_1/gnu/usr.bin/binutils/as/Makefile	Fri Dec 12 02:11:49 2008	(r185966)
@@ -20,6 +20,10 @@ SRCS+=	app.c as.c atof-generic.c atof-ie
 # DEO: why not used?
 #SRCS+=	itbl-ops.c
 
+.if ${TARGET_ARCH} == "mips"
+SRCS+=	itbl-ops.c itbl-parse.y itbl-lex.l
+.endif
+
 .if ${TARGET_ARCH} == "amd64"
 SRCS+=	tc-i386.c
 .elif ${TARGET_ARCH} == "powerpc"

Added: projects/arpv2_merge_1/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/arpv2_merge_1/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h	Fri Dec 12 02:11:49 2008	(r185966)
@@ -0,0 +1,19 @@
+/* $FreeBSD$ */
+
+#include "itbl-mips.h"
+
+/* Choose a default ABI for MIPS targets.  */
+/* XXX: Where should this be ? */
+#define MIPS_DEFAULT_ABI NO_ABI
+
+/* Default CPU for MIPS targets.  */
+#define MIPS_CPU_STRING_DEFAULT "from-abi"
+
+/* Generate 64-bit code by default on MIPS targets.  */
+#define MIPS_DEFAULT_64BIT 0
+
+/* Allow use of E_MIPS_ABI_O32 on MIPS targets.  */
+#define USE_E_MIPS_ABI_O32 1
+
+/* Use traditional mips */
+#define TE_TMIPS 1

Added: projects/arpv2_merge_1/gnu/usr.bin/binutils/as/mips-freebsd/targ-cpu.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/arpv2_merge_1/gnu/usr.bin/binutils/as/mips-freebsd/targ-cpu.h	Fri Dec 12 02:11:49 2008	(r185966)
@@ -0,0 +1,4 @@
+/* $FreeBSD$ */
+#define TE_TMIPS 1
+
+#include "tc-mips.h"

Added: projects/arpv2_merge_1/gnu/usr.bin/binutils/ld/Makefile.mips
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/arpv2_merge_1/gnu/usr.bin/binutils/ld/Makefile.mips	Fri Dec 12 02:11:49 2008	(r185966)
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+#xxxIMPxxx: size?
+#xxxIMPxxx: TARGET_BIG_ENDIAN is lame.  We should use the netbsd convention
+# of mipsel and mips.
+_sz?=32
+.if defined(TARGET_BIG_ENDIAN)
+NATIVE_EMULATION=elf${_sz}btsmip_fbsd
+.else
+NATIVE_EMULATION=elf${_sz}ltsmip_fbsd
+.endif
+
+SRCS+=	e${NATIVE_EMULATION}.c 
+CLEANFILES+=	e${NATIVE_EMULATION}.c
+
+# nb: elf32 handles both elf32 and elf64 targets
+e${NATIVE_EMULATION}.c:	${.CURDIR}/${NATIVE_EMULATION}.sh emultempl/elf32.em \
+    scripttempl/elf.sc genscripts.sh stringify.sed
+	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \
+	    ${TOOLS_PREFIX}/usr \
+	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
+	    ${NATIVE_EMULATION} ""  no ${NATIVE_EMULATION} ${TARGET_TUPLE} \
+	    ${.CURDIR}/${NATIVE_EMULATION}.sh
+

Added: projects/arpv2_merge_1/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/arpv2_merge_1/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh	Fri Dec 12 02:11:49 2008	(r185966)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+. ${srcdir}/emulparams/elf32btsmip.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+GENERATE_PIE_SCRIPT=yes

Added: projects/arpv2_merge_1/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/arpv2_merge_1/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh	Fri Dec 12 02:11:49 2008	(r185966)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+. ${srcdir}/emulparams/elf32ltsmip.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+GENERATE_PIE_SCRIPT=yes

Added: projects/arpv2_merge_1/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/arpv2_merge_1/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh	Fri Dec 12 02:11:49 2008	(r185966)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+. ${srcdir}/emulparams/elf64btsmip.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+GENERATE_PIE_SCRIPT=yes

Added: projects/arpv2_merge_1/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/arpv2_merge_1/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh	Fri Dec 12 02:11:49 2008	(r185966)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+. ${srcdir}/emulparams/elf64ltsmip.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+GENERATE_PIE_SCRIPT=yes

Added: projects/arpv2_merge_1/gnu/usr.bin/binutils/libbfd/Makefile.mips
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/arpv2_merge_1/gnu/usr.bin/binutils/libbfd/Makefile.mips	Fri Dec 12 02:11:49 2008	(r185966)
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+#xxxIMPxxx: endian and size
+DEFAULT_VECTOR=	bfd_elf32_tradbigmips_vec
+
+SRCS+=	coff-mips.c \
+	cpu-mips.c \
+	ecoff.c \
+	ecofflink.c \
+	elf32.c \
+	elf64.c \
+	elfn32-mips.c \
+	elf32-mips.c \
+	elf64-mips.c \
+	elfxx-mips.c \
+	elf32-target.h \
+	elf64-target.h \
+	elflink.c
+
+VECS=	bfd_elf32_tradbigmips_vec \
+	bfd_elf32_tradlittlemips_vec \
+	bfd_elf32_ntradbigmips_vec \
+	bfd_elf32_ntradlittlemips_vec \
+	bfd_elf64_tradbigmips_vec \
+	bfd_elf64_tradlittlemips_vec \
+	ecoff_little_vec \
+	ecoff_big_vec

Modified: projects/arpv2_merge_1/gnu/usr.bin/binutils/libbfd/bfd.h
==============================================================================
--- projects/arpv2_merge_1/gnu/usr.bin/binutils/libbfd/bfd.h	Fri Dec 12 02:07:45 2008	(r185965)
+++ projects/arpv2_merge_1/gnu/usr.bin/binutils/libbfd/bfd.h	Fri Dec 12 02:11:49 2008	(r185966)
@@ -57,7 +57,7 @@ extern "C" {
 #define BFD_ARCH_SIZE 64
 
 
-#if defined(__i386__) || defined(__powerpc__) || defined(__arm__)
+#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) || defined(__mips__)
 #define BFD_HOST_64BIT_LONG 0
 #define BFD_HOST_64_BIT long long
 #define BFD_HOST_U_64_BIT unsigned long long

Added: projects/arpv2_merge_1/gnu/usr.bin/binutils/libopcodes/Makefile.mips
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/arpv2_merge_1/gnu/usr.bin/binutils/libopcodes/Makefile.mips	Fri Dec 12 02:11:49 2008	(r185966)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+SRCS+=	mips-dis.c mips-opc.c mips16-opc.c
+CFLAGS+= -DARCH_mips

Modified: projects/arpv2_merge_1/share/man/man9/Makefile
==============================================================================
--- projects/arpv2_merge_1/share/man/man9/Makefile	Fri Dec 12 02:07:45 2008	(r185965)
+++ projects/arpv2_merge_1/share/man/man9/Makefile	Fri Dec 12 02:11:49 2008	(r185966)
@@ -348,6 +348,7 @@ MAN=	accept_filter.9 \
 	VOP_SETACL.9 \
 	VOP_SETEXTATTR.9 \
 	VOP_STRATEGY.9 \
+	VOP_VPTOCNP.9 \
 	VOP_VPTOFH.9 \
 	vput.9 \
 	vref.9 \

Added: projects/arpv2_merge_1/share/man/man9/VOP_VPTOCNP.9
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/arpv2_merge_1/share/man/man9/VOP_VPTOCNP.9	Fri Dec 12 02:11:49 2008	(r185966)
@@ -0,0 +1,110 @@
+.\" -*- nroff -*-
+.\"
+.\" Copyright (c) 2008 Joe Marcus Clarke
+.\"
+.\" All rights reserved.
+.\"
+.\" This program is free software.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE DEVELOPERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd December 7, 2008
+.Os
+.Dt VOP_VPTOCNP 9
+.Sh NAME
+.Nm VOP_VPTOCNP
+.Nd translate a vnode to its component name
+.Sh SYNOPSIS
+.In sys/param.h
+.In sys/vnode.h
+.Ft int
+.Fn VOP_VPTOCNP "struct vnode *vp" "struct vnode **dvp" "char *buf" "int *buflen"
+.Sh DESCRIPTION
+This translates a vnode into its component name, and writes that name to
+the head of the buffer specified by
+.Fa buf
+.Bl -tag -width buflen
+.It Fa vp
+The vnode to translate.
+.It Fa dvp
+The vnode of the parent directory of
+.Fa vp .
+.It Fa buf
+The buffer into which to preprend the component name.
+.It Fa buflen
+The remaining size of the buffer.
+.El
+.Pp
+The default implementation of
+.Nm
+simply returns ENOENT.
+.Sh LOCKS
+The vnode should be locked on entry and will still be locked on exit.  The
+parent directory vnode will be unlocked on a successful exit.  However, it
+will have its hold count incremented.
+.Sh RETURN VALUES
+Zero is returned on success, otherwise an error code is returned.
+.Sh PSEUDOCODE
+.Bd -literal
+int
+vop_vptocnp(struct vnode *vp, struct vnode **dvp, char *buf, int *buflen)
+{
+    int error = 0;
+
+    /*
+     * Translate the vnode to its component name.
+     *
+     * Decrement the component name's length from buflen.
+     *
+     * Obtain the vnode's parent directory vnode.
+     */
+    ...;
+
+    /*
+     * Increment the parent directory's hold count.
+     */
+    vhold(*dvp);
+
+    return error;
+}
+.Ed
+.Sh ERRORS
+.Bl -tag -width Er
+.It Bq Er ENOMEM
+The buffer was not large enough to hold the vnode's component name.
+.It Bq Er ENOENT
+The vnode was not found on the file system.
+.El
+.Sh SEE ALSO
+.Xr VOP_LOOKUP 9 ,
+.Xr vnode 9
+.Sh NOTES
+This interface is a work in progress.
+.Sh HISTORY
+The function
+.Nm
+appeared in
+.Fx 8.0 .
+.Sh AUTHORS
+This manual page was written by
+.An Joe Marcus Clarke .

Modified: projects/arpv2_merge_1/share/man/man9/ifnet.9
==============================================================================
--- projects/arpv2_merge_1/share/man/man9/ifnet.9	Fri Dec 12 02:07:45 2008	(r185965)
+++ projects/arpv2_merge_1/share/man/man9/ifnet.9	Fri Dec 12 02:11:49 2008	(r185966)
@@ -103,6 +103,10 @@
 .Ft void
 .Fn \*(lp*if_start\*(rp "struct ifnet *ifp"
 .Ft int
+.Fn \*(lp*if_transmit\*(rp "struct ifnet *ifp" "struct mbuf *m"
+.Ft void
+.Fn \*(lp*if_qflush\*(rp "struct ifnet *ifp"
+.Ft int
 .Fn \*(lp*if_ioctl\*(rp "struct ifnet *ifp" "int cmd" "caddr_t data"
 .Ft void
 .Fn \*(lp*if_watchdog\*(rp "struct ifnet *ifp"
@@ -350,6 +354,20 @@ framing, e.g., Ethernet.
 Output a packet on interface
 .Fa ifp ,
 or queue it on the output queue if the interface is already active.
+.It Fn if_transmit
+Transmit a packet on an interface or queue it if the interface is
+in use. This function will return
+.Dv ENOBUFS
+if the devices software and hardware queues are both full. This 
+function must be installed after 
+.It Fn if_qflush
+Free mbufs in internally managed queues when the interface is marked down.
+This function must be installed after 
+.Fn if_attach 
+to override the default implementation. This function is exposed in order
+to allow drivers to manage their own queues and to reduce the latency 
+caused by a frequently gratuitous enqueue / dequeue pair to ifq. The 
+suggested internal software queueing mechanism is buf_ring.
 .It Fn if_start
 Start queued output on an interface.
 This function is exposed in
@@ -363,7 +381,8 @@ flag is not set.
 (Thus,
 .Dv IFF_OACTIVE
 does not literally mean that output is active, but rather that the
-device's internal output queue is full.)
+device's internal output queue is full.) Please note that this function
+will soon be deprecated.
 .It Fn if_done
 Not used.
 We are not even sure what it was ever for.

Modified: projects/arpv2_merge_1/sys/amd64/amd64/local_apic.c
==============================================================================
--- projects/arpv2_merge_1/sys/amd64/amd64/local_apic.c	Fri Dec 12 02:07:45 2008	(r185965)
+++ projects/arpv2_merge_1/sys/amd64/amd64/local_apic.c	Fri Dec 12 02:11:49 2008	(r185966)
@@ -299,6 +299,7 @@ lapic_setup(int boot)
 	/* Program LINT[01] LVT entries. */
 	lapic->lvt_lint0 = lvt_mode(la, LVT_LINT0, lapic->lvt_lint0);
 	lapic->lvt_lint1 = lvt_mode(la, LVT_LINT1, lapic->lvt_lint1);
+
 #ifdef	HWPMC_HOOKS
 	/* Program the PMC LVT entry if present. */
 	if (maxlvt >= LVT_PMC)
@@ -644,6 +645,18 @@ lapic_eoi(void)
 	lapic->eoi = 0;
 }
 
+/*
+ * Read the contents of the error status register.  We have to write
+ * to the register first before reading from it.
+ */
+u_int
+lapic_error(void)
+{
+
+	lapic->esr = 0;
+	return (lapic->esr);
+}
+
 void
 lapic_handle_intr(int vector, struct trapframe *frame)
 {

Modified: projects/arpv2_merge_1/sys/amd64/include/apicreg.h
==============================================================================
--- projects/arpv2_merge_1/sys/amd64/include/apicreg.h	Fri Dec 12 02:07:45 2008	(r185965)
+++ projects/arpv2_merge_1/sys/amd64/include/apicreg.h	Fri Dec 12 02:11:49 2008	(r185966)
@@ -260,6 +260,14 @@ typedef struct IOAPIC ioapic_t;
 # define APIC_TPR_INT		0x000000f0
 # define APIC_TPR_SUB		0x0000000f
 
+/* fields in ESR */
+#define	APIC_ESR_SEND_CS_ERROR		0x00000001
+#define	APIC_ESR_RECEIVE_CS_ERROR	0x00000002
+#define	APIC_ESR_SEND_ACCEPT		0x00000004
+#define	APIC_ESR_RECEIVE_ACCEPT		0x00000008
+#define	APIC_ESR_SEND_ILLEGAL_VECTOR	0x00000020
+#define	APIC_ESR_RECEIVE_ILLEGAL_VECTOR	0x00000040
+#define	APIC_ESR_ILLEGAL_REGISTER	0x00000080
 
 /* fields in ICR_LOW */
 #define APIC_VECTOR_MASK	0x000000ff

Modified: projects/arpv2_merge_1/sys/amd64/include/apicvar.h
==============================================================================
--- projects/arpv2_merge_1/sys/amd64/include/apicvar.h	Fri Dec 12 02:07:45 2008	(r185965)
+++ projects/arpv2_merge_1/sys/amd64/include/apicvar.h	Fri Dec 12 02:11:49 2008	(r185966)
@@ -200,6 +200,7 @@ void	lapic_create(u_int apic_id, int boo
 void	lapic_disable(void);
 void	lapic_dump(const char *str);
 void	lapic_eoi(void);
+u_int	lapic_error(void);
 int	lapic_id(void);
 void	lapic_init(vm_paddr_t addr);
 int	lapic_intr_pending(u_int vector);

Modified: projects/arpv2_merge_1/sys/boot/zfs/zfs.c
==============================================================================
--- projects/arpv2_merge_1/sys/boot/zfs/zfs.c	Fri Dec 12 02:07:45 2008	(r185965)
+++ projects/arpv2_merge_1/sys/boot/zfs/zfs.c	Fri Dec 12 02:11:49 2008	(r185966)
@@ -486,6 +486,7 @@ zfs_dev_open(struct open_file *f, ...)
 	}
 
 	f->f_devdata = spa;
+	free(dev);
 	return (0);
 }
 

Modified: projects/arpv2_merge_1/sys/conf/options
==============================================================================
--- projects/arpv2_merge_1/sys/conf/options	Fri Dec 12 02:07:45 2008	(r185965)
+++ projects/arpv2_merge_1/sys/conf/options	Fri Dec 12 02:11:49 2008	(r185966)
@@ -415,7 +415,6 @@ TCPDEBUG
 TCP_OFFLOAD_DISABLE	opt_inet.h #Disable code to dispatch tcp offloading
 TCP_SIGNATURE		opt_inet.h
 VLAN_ARRAY		opt_vlan.h
-VIMAGE_GLOBALS		opt_global.h
 XBONEHACK
 
 #
@@ -786,3 +785,4 @@ IEEE80211_AMPDU_AGE	opt_wlan.h
 
 # Virtualize the network stack
 VIMAGE			opt_global.h
+VIMAGE_GLOBALS		opt_global.h

Modified: projects/arpv2_merge_1/sys/dev/usb/usbdevs
==============================================================================
--- projects/arpv2_merge_1/sys/dev/usb/usbdevs	Fri Dec 12 02:07:45 2008	(r185965)
+++ projects/arpv2_merge_1/sys/dev/usb/usbdevs	Fri Dec 12 02:11:49 2008	(r185966)
@@ -620,6 +620,7 @@ vendor AMIT		0x18c5	AMIT
 vendor QCOM		0x18e8	Qcom
 vendor LINKSYS3		0x1915	Linksys
 vendor QUALCOMMINC	0x19d2	Qualcomm, Incorporated
+vendor STELERA		0x1a8d	Stelera Wireless
 vendor DLINK		0x2001	D-Link
 vendor PLANEX2		0x2019	Planex Communications
 vendor ERICSSON		0x2282	Ericsson
@@ -1876,6 +1877,7 @@ product OPTION VODAFONEMC3G	0x5000	Vodaf
 product OPTION GT3G		0x6000	GlobeTrotter 3G datacard
 product OPTION GT3GQUAD		0x6300	GlobeTrotter 3G QUAD datacard
 product OPTION GT3GPLUS		0x6600	GlobeTrotter 3G+ datacard
+product OPTION GTICON322	0xd033	GlobeTrotter Icon322 storage
 product OPTION GTMAX36		0x6701	GlobeTrotter Max 3.6 Modem
 product OPTION GTMAXHSUPA	0x7001	GlobeTrotter HSUPA
 
@@ -2125,12 +2127,14 @@ product SIERRA AIRCARD595	0x0019	Sierra 
 product SIERRA AC595U		0x0120	Sierra Wireless AirCard 595U
 product SIERRA AC597E		0x0021	Sierra Wireless AirCard 597E
 product SIERRA C597		0x0023	Sierra Wireless Compass 597
+product SIERRA AC875		0x6820	Sierra Wireless AirCard 875
 product SIERRA AC880		0x6850	Sierra Wireless AirCard 880
 product SIERRA AC881		0x6851	Sierra Wireless AirCard 881
 product SIERRA AC880E		0x6852	Sierra Wireless AirCard 880E
 product SIERRA AC881E		0x6853	Sierra Wireless AirCard 881E
 product SIERRA AC880U		0x6855	Sierra Wireless AirCard 880U
 product SIERRA AC881U		0x6856	Sierra Wireless AirCard 881U
+product SIERRA AC885U		0x6880	Sierra Wireless AirCard 885U
 product SIERRA EM5625		0x0017	EM5625
 product SIERRA MC5720		0x0218	MC5720 Wireless Modem
 product SIERRA MC5720_2		0x0018	MC5720
@@ -2253,6 +2257,10 @@ product SPARKLAN RT2573		0x0004	 RT2573
 /* Sphairon Access Systems GmbH products */
 product SPHAIRON UB801R		0x0110	UB801R
 
+/* Stelera Wireless products */
+product STELERA ZEROCD		0x1000	Zerocd Installer
+product STELERA C105		0x1002	Stelera/Bandrish C105 USB
+
 /* STMicroelectronics products */
 product STMICRO BIOCPU		0x2016	Biometric Coprocessor
 product STMICRO COMMUNICATOR	0x7554	USB Communicator

Modified: projects/arpv2_merge_1/sys/dev/usb2/bluetooth/ng_ubt2.c
==============================================================================
--- projects/arpv2_merge_1/sys/dev/usb2/bluetooth/ng_ubt2.c	Fri Dec 12 02:07:45 2008	(r185965)
+++ projects/arpv2_merge_1/sys/dev/usb2/bluetooth/ng_ubt2.c	Fri Dec 12 02:11:49 2008	(r185966)
@@ -193,10 +193,10 @@ static usb2_callback_t ubt_bulk_write_cl
 static usb2_callback_t ubt_isoc_read_callback;
 static usb2_callback_t ubt_isoc_write_callback;
 
-static int ubt_modevent(module_t mod, int event, void *data);
-static void ubt_intr_read_complete(node_p node, hook_p hook, void *arg1, int arg2);
-static void ubt_bulk_read_complete(node_p node, hook_p hook, void *arg1, int arg2);
-static void ubt_isoc_read_complete(node_p node, hook_p hook, void *arg1, int arg2);
+static int	ubt_modevent(module_t, int, void *);
+static void	ubt_intr_read_complete(node_p, hook_p, void *, int);
+static void	ubt_bulk_read_complete(node_p, hook_p, void *, int);
+static void	ubt_isoc_read_complete(node_p, hook_p, void *, int);
 
 /* USB config */
 static const struct usb2_config ubt_config_if_0[UBT_IF_0_N_TRANSFER] = {
@@ -818,7 +818,6 @@ ubt_intr_read_clear_stall_callback(struc
 		sc->sc_flags &= ~UBT_FLAG_INTR_STALL;
 		usb2_transfer_start(xfer_other);
 	}
-	return;
 }
 
 static void
@@ -883,8 +882,6 @@ done:
 	usb2_transfer_start(sc->sc_xfer_if_0[2]);
 
 	mtx_unlock(&sc->sc_mtx);
-
-	return;
 }
 
 static void
@@ -972,7 +969,6 @@ ubt_bulk_read_clear_stall_callback(struc
 		sc->sc_flags &= ~UBT_FLAG_READ_STALL;
 		usb2_transfer_start(xfer_other);
 	}
-	return;
 }
 
 static void
@@ -1040,8 +1036,6 @@ done:
 	usb2_transfer_start(sc->sc_xfer_if_0[1]);
 
 	mtx_unlock(&sc->sc_mtx);
-
-	return;
 }
 
 static void
@@ -1121,7 +1115,6 @@ ubt_bulk_write_clear_stall_callback(stru
 		sc->sc_flags &= ~UBT_FLAG_WRITE_STALL;
 		usb2_transfer_start(xfer_other);
 	}
-	return;
 }
 
 static void
@@ -1265,8 +1258,6 @@ done:
 	}
 
 	mtx_unlock(&sc->sc_mtx);
-
-	return;
 }
 
 static void

Modified: projects/arpv2_merge_1/sys/dev/usb2/bluetooth/ubtbcmfw2.c
==============================================================================
--- projects/arpv2_merge_1/sys/dev/usb2/bluetooth/ubtbcmfw2.c	Fri Dec 12 02:07:45 2008	(r185965)
+++ projects/arpv2_merge_1/sys/dev/usb2/bluetooth/ubtbcmfw2.c	Fri Dec 12 02:11:49 2008	(r185966)
@@ -305,7 +305,6 @@ ubtbcmfw_write_clear_stall_callback(stru
 		sc->sc_flags &= ~UBTBCMFW_FLAG_WRITE_STALL;
 		usb2_transfer_start(xfer_other);
 	}
-	return;
 }
 
 static void
@@ -351,7 +350,6 @@ ubtbcmfw_read_clear_stall_callback(struc
 		sc->sc_flags &= ~UBTBCMFW_FLAG_READ_STALL;
 		usb2_transfer_start(xfer_other);
 	}
-	return;
 }
 
 static void
@@ -360,7 +358,6 @@ ubtbcmfw_start_read(struct usb2_fifo *fi
 	struct ubtbcmfw_softc *sc = fifo->priv_sc0;
 
 	usb2_transfer_start(sc->sc_xfer[1]);
-	return;
 }
 
 static void
@@ -370,7 +367,6 @@ ubtbcmfw_stop_read(struct usb2_fifo *fif
 
 	usb2_transfer_stop(sc->sc_xfer[3]);
 	usb2_transfer_stop(sc->sc_xfer[1]);
-	return;
 }
 
 static void
@@ -379,7 +375,6 @@ ubtbcmfw_start_write(struct usb2_fifo *f
 	struct ubtbcmfw_softc *sc = fifo->priv_sc0;
 
 	usb2_transfer_start(sc->sc_xfer[0]);
-	return;
 }
 
 static void
@@ -389,7 +384,6 @@ ubtbcmfw_stop_write(struct usb2_fifo *fi
 
 	usb2_transfer_stop(sc->sc_xfer[2]);
 	usb2_transfer_stop(sc->sc_xfer[0]);
-	return;
 }
 
 static int
@@ -424,7 +418,6 @@ ubtbcmfw_close(struct usb2_fifo *fifo, i
 	if (fflags & (FREAD | FWRITE)) {
 		usb2_fifo_free_buffer(fifo);
 	}
-	return;
 }
 
 static int

Modified: projects/arpv2_merge_1/sys/dev/usb2/controller/at91dci.c
==============================================================================
--- projects/arpv2_merge_1/sys/dev/usb2/controller/at91dci.c	Fri Dec 12 02:07:45 2008	(r185965)
+++ projects/arpv2_merge_1/sys/dev/usb2/controller/at91dci.c	Fri Dec 12 02:11:49 2008	(r185966)
@@ -99,10 +99,10 @@ static at91dci_cmd_t at91dci_setup_rx;
 static at91dci_cmd_t at91dci_data_rx;
 static at91dci_cmd_t at91dci_data_tx;
 static at91dci_cmd_t at91dci_data_tx_sync;
-static void at91dci_device_done(struct usb2_xfer *xfer, usb2_error_t error);
-static void at91dci_do_poll(struct usb2_bus *bus);
-static void at91dci_root_ctrl_poll(struct at91dci_softc *sc);
-static void at91dci_standard_done(struct usb2_xfer *xfer);
+static void	at91dci_device_done(struct usb2_xfer *, usb2_error_t);
+static void	at91dci_do_poll(struct usb2_bus *);
+static void	at91dci_root_ctrl_poll(struct at91dci_softc *);
+static void	at91dci_standard_done(struct usb2_xfer *);
 
 static usb2_sw_transfer_func_t at91dci_root_intr_done;
 static usb2_sw_transfer_func_t at91dci_root_ctrl_done;
@@ -200,7 +200,6 @@ at91dci_get_hw_ep_profile(struct usb2_de
 	} else {
 		*ppf = NULL;
 	}
-	return;
 }
 
 static void
@@ -219,7 +218,6 @@ at91dci_clocks_on(struct at91dci_softc *
 		/* enable Transceiver */
 		AT91_UDP_WRITE_4(sc, AT91_UDP_TXVC, 0);
 	}
-	return;
 }
 
 static void
@@ -237,7 +235,6 @@ at91dci_clocks_off(struct at91dci_softc 
 		}
 		sc->sc_flags.clocks_off = 1;
 	}
-	return;
 }
 
 static void
@@ -250,7 +247,6 @@ at91dci_pull_up(struct at91dci_softc *sc
 		sc->sc_flags.d_pulled_up = 1;
 		(sc->sc_pull_up) (sc->sc_pull_arg);
 	}
-	return;
 }
 
 static void
@@ -262,7 +258,6 @@ at91dci_pull_down(struct at91dci_softc *
 		sc->sc_flags.d_pulled_up = 0;
 		(sc->sc_pull_down) (sc->sc_pull_arg);
 	}
-	return;
 }
 
 static void
@@ -279,8 +274,6 @@ at91dci_wakeup_peer(struct at91dci_softc
 		return;
 	}
 	AT91_UDP_WRITE_4(sc, AT91_UDP_GSTATE, temp);
-
-	return;
 }
 
 static void
@@ -304,8 +297,6 @@ at91dci_rem_wakeup_set(struct usb2_devic
 	}
 
 	AT91_UDP_WRITE_4(sc, AT91_UDP_GSTATE, temp);
-
-	return;
 }
 
 static void
@@ -315,8 +306,6 @@ at91dci_set_address(struct at91dci_softc
 
 	AT91_UDP_WRITE_4(sc, AT91_UDP_FADDR, addr |
 	    AT91_UDP_FADDR_EN);
-
-	return;
 }
 
 static uint8_t
@@ -756,7 +745,6 @@ repeat:
 			goto repeat;
 		}
 	}
-	return;
 }
 
 static void
@@ -792,8 +780,6 @@ at91dci_vbus_interrupt(struct usb2_bus *
 	}
 
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 void
@@ -880,8 +866,6 @@ at91dci_interrupt(struct at91dci_softc *
 		at91dci_interrupt_poll(sc);
 	}
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 static void
@@ -906,7 +890,6 @@ at91dci_setup_standard_chain_sub(struct 
 	td->did_stall = 0;
 	td->short_pkt = temp->short_pkt;
 	td->alt_next = temp->setup_alt_next;
-	return;
 }
 
 static void
@@ -1054,7 +1037,6 @@ at91dci_setup_standard_chain(struct usb2
 		td = xfer->td_transfer_first;
 		td->fifo_bank = 1;
 	}
-	return;
 }
 
 static void
@@ -1071,8 +1053,6 @@ at91dci_timeout(void *arg)
 	at91dci_device_done(xfer, USB_ERR_TIMEOUT);
 
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 static void
@@ -1104,7 +1084,6 @@ at91dci_start_standard_chain(struct usb2
 			    &at91dci_timeout, xfer->timeout);
 		}
 	}
-	return;
 }
 
 static void
@@ -1240,7 +1219,6 @@ at91dci_standard_done(struct usb2_xfer *
 	}
 done:
 	at91dci_device_done(xfer, err);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1270,7 +1248,6 @@ at91dci_device_done(struct usb2_xfer *xf
 	}
 	/* dequeue transfer and start next transfer */
 	usb2_transfer_done(xfer, error);
-	return;
 }
 
 static void
@@ -1296,7 +1273,6 @@ at91dci_set_stall(struct usb2_device *ud
 	csr_val = AT91_UDP_READ_4(sc, csr_reg);
 	AT91_CSR_ACK(csr_val, AT91_UDP_CSR_FORCESTALL);
 	AT91_UDP_WRITE_4(sc, csr_reg, csr_val);
-	return;
 }
 
 static void
@@ -1393,8 +1369,6 @@ at91dci_clear_stall_sub(struct at91dci_s
 
 	/* enable endpoint */
 	AT91_UDP_WRITE_4(sc, AT91_UDP_CSR(ep_no), csr_val);
-
-	return;
 }
 
 static void
@@ -1423,7 +1397,6 @@ at91dci_clear_stall(struct usb2_device *
 	    (ed->bEndpointAddress & UE_ADDR),
 	    (ed->bmAttributes & UE_XFERTYPE),
 	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)));
-	return;
 }
 
 usb2_error_t
@@ -1511,8 +1484,6 @@ at91dci_uninit(struct at91dci_softc *sc)
 	at91dci_pull_down(sc);
 	at91dci_clocks_off(sc);
 	USB_BUS_UNLOCK(&sc->sc_bus);
-
-	return;
 }
 
 void
@@ -1536,7 +1507,6 @@ at91dci_do_poll(struct usb2_bus *bus)
 	at91dci_interrupt_poll(sc);
 	at91dci_root_ctrl_poll(sc);
 	USB_BUS_UNLOCK(&sc->sc_bus);
-	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -1552,7 +1522,6 @@ static void
 at91dci_device_bulk_close(struct usb2_xfer *xfer)
 {
 	at91dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1567,7 +1536,6 @@ at91dci_device_bulk_start(struct usb2_xf
 	/* setup TDs */
 	at91dci_setup_standard_chain(xfer);
 	at91dci_start_standard_chain(xfer);
-	return;
 }
 
 struct usb2_pipe_methods at91dci_device_bulk_methods =
@@ -1593,7 +1561,6 @@ static void
 at91dci_device_ctrl_close(struct usb2_xfer *xfer)
 {
 	at91dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1608,7 +1575,6 @@ at91dci_device_ctrl_start(struct usb2_xf
 	/* setup TDs */
 	at91dci_setup_standard_chain(xfer);
 	at91dci_start_standard_chain(xfer);
-	return;
 }
 
 struct usb2_pipe_methods at91dci_device_ctrl_methods =
@@ -1634,7 +1600,6 @@ static void
 at91dci_device_intr_close(struct usb2_xfer *xfer)
 {
 	at91dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1649,7 +1614,6 @@ at91dci_device_intr_start(struct usb2_xf
 	/* setup TDs */
 	at91dci_setup_standard_chain(xfer);
 	at91dci_start_standard_chain(xfer);
-	return;
 }
 
 struct usb2_pipe_methods at91dci_device_intr_methods =
@@ -1675,7 +1639,6 @@ static void
 at91dci_device_isoc_fs_close(struct usb2_xfer *xfer)
 {
 	at91dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -1728,7 +1691,6 @@ at91dci_device_isoc_fs_enter(struct usb2
 
 	/* setup TDs */
 	at91dci_setup_standard_chain(xfer);
-	return;
 }
 
 static void
@@ -1736,7 +1698,6 @@ at91dci_device_isoc_fs_start(struct usb2
 {
 	/* start TD chain */
 	at91dci_start_standard_chain(xfer);
-	return;
 }
 
 struct usb2_pipe_methods at91dci_device_isoc_fs_methods =
@@ -1771,7 +1732,6 @@ at91dci_root_ctrl_close(struct usb2_xfer
 		sc->sc_root_ctrl.xfer = NULL;
 	}
 	at91dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 /*
@@ -1876,8 +1836,6 @@ at91dci_root_ctrl_start(struct usb2_xfer
 
 	usb2_config_td_queue_command(
 	    &sc->sc_config_td, NULL, &at91dci_root_ctrl_task, 0, 0);
-
-	return;
 }
 
 static void
@@ -1885,7 +1843,6 @@ at91dci_root_ctrl_task(struct at91dci_so
     struct at91dci_config_copy *cc, uint16_t refcount)
 {
 	at91dci_root_ctrl_poll(sc);
-	return;
 }
 
 static void
@@ -2294,7 +2251,6 @@ at91dci_root_ctrl_poll(struct at91dci_so
 {
 	usb2_sw_transfer(&sc->sc_root_ctrl,
 	    &at91dci_root_ctrl_done);
-	return;
 }
 
 struct usb2_pipe_methods at91dci_root_ctrl_methods =
@@ -2325,7 +2281,6 @@ at91dci_root_intr_close(struct usb2_xfer
 		sc->sc_root_intr.xfer = NULL;
 	}
 	at91dci_device_done(xfer, USB_ERR_CANCELLED);
-	return;
 }
 
 static void
@@ -2340,7 +2295,6 @@ at91dci_root_intr_start(struct usb2_xfer
 	struct at91dci_softc *sc = xfer->usb2_sc;
 
 	sc->sc_root_intr.xfer = xfer;
-	return;
 }
 
 struct usb2_pipe_methods at91dci_root_intr_methods =
@@ -2465,7 +2419,6 @@ at91dci_xfer_setup(struct usb2_setup_par
 	}
 
 	xfer->td_start[0] = last_obj;
-	return;
 }
 
 static void
@@ -2530,7 +2483,6 @@ at91dci_pipe_init(struct usb2_device *ud
 			break;
 		}
 	}
-	return;
 }
 
 struct usb2_bus_methods at91dci_bus_methods =

Modified: projects/arpv2_merge_1/sys/dev/usb2/controller/at91dci_atmelarm.c
==============================================================================
--- projects/arpv2_merge_1/sys/dev/usb2/controller/at91dci_atmelarm.c	Fri Dec 12 02:07:45 2008	(r185965)
+++ projects/arpv2_merge_1/sys/dev/usb2/controller/at91dci_atmelarm.c	Fri Dec 12 02:11:49 2008	(r185966)
@@ -87,7 +87,6 @@ at91_vbus_interrupt(struct at91_udp_soft
 	vbus_val = at91_pio_gpio_get(VBUS_BASE, VBUS_MASK);
 	(sc->sc_dci.sc_bus.methods->vbus_interrupt)
 	    (&sc->sc_dci.sc_bus, vbus_val);
-	return;
 }
 
 static void
@@ -97,7 +96,6 @@ at91_udp_clocks_on(void *arg)
 
 	at91_pmc_clock_enable(sc->sc_iclk);
 	at91_pmc_clock_enable(sc->sc_fclk);
-	return;
 }
 
 static void
@@ -107,21 +105,18 @@ at91_udp_clocks_off(void *arg)
 
 	at91_pmc_clock_disable(sc->sc_fclk);
 	at91_pmc_clock_disable(sc->sc_iclk);
-	return;
 }
 
 static void
 at91_udp_pull_up(void *arg)
 {
 	at91_pio_gpio_set(PULLUP_BASE, PULLUP_MASK);
-	return;
 }
 
 static void
 at91_udp_pull_down(void *arg)
 {
 	at91_pio_gpio_clear(PULLUP_BASE, PULLUP_MASK);
-	return;
 }
 
 static int

Modified: projects/arpv2_merge_1/sys/dev/usb2/controller/ehci2.c
==============================================================================
--- projects/arpv2_merge_1/sys/dev/usb2/controller/ehci2.c	Fri Dec 12 02:07:45 2008	(r185965)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
