From owner-p4-projects@FreeBSD.ORG Mon Jun 24 01:55:08 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB0E4BA0; Mon, 24 Jun 2013 01:55:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id AC742B9E for ; Mon, 24 Jun 2013 01:55:07 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 8E4431737 for ; Mon, 24 Jun 2013 01:55:07 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5O1t7Po047913 for ; Mon, 24 Jun 2013 01:55:07 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5O1t707047910 for perforce@freebsd.org; Mon, 24 Jun 2013 01:55:07 GMT (envelope-from jhb@freebsd.org) Date: Mon, 24 Jun 2013 01:55:07 GMT Message-Id: <201306240155.r5O1t707047910@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 230088 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jun 2013 01:55:08 -0000 http://p4web.freebsd.org/@@230088?ac=10 Change 230088 by jhb@jhb_pippin on 2013/06/24 01:54:55 Compile. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci_pci.c#31 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci_pci.c#31 (text+ko) ==== @@ -224,12 +224,12 @@ /* * If the start address is an alias, the range is an alias. * Otherwise, compute the start of the next alias range and - * check if it is beyond the end of the candidate range. + * check if it is before the end of the candidate range. */ if ((start & 0x300) != 0) goto alias; - next_start = (start & ~0xfful) | 0x100; - if (next_start <= end) + next_alias = (start & ~0xfful) | 0x100; + if (next_alias <= end) goto alias; return (0); @@ -264,7 +264,7 @@ } } -typedef void (*nonisa_callback)(u_long start, u_long end, void *arg); +typedef void (nonisa_callback)(u_long start, u_long end, void *arg); static void pcib_walk_nonisa_ranges(u_long start, u_long end, nonisa_callback *cb, @@ -300,7 +300,7 @@ int *countp; countp = arg; - *countp++; + (*countp)++; } struct alloc_state { @@ -354,7 +354,7 @@ as.sc = sc; as.count = 0; as.error = 0; - pcib_walk_nonisa_ranges(start, end, alloc_ranges &as); + pcib_walk_nonisa_ranges(start, end, alloc_ranges, &as); if (as.error != 0) { for (i = 0; i < as.count; i++) bus_release_resource(sc->dev, SYS_RES_IOPORT, @@ -362,7 +362,7 @@ free(as.res, M_DEVBUF); return (as.error); } - KASSERT(as.count == newcount, ("%s: count mismatch", __func__)); + KASSERT(as.count == new_count, ("%s: count mismatch", __func__)); /* Third, add the ranges to the window. */ pcib_add_window_resources(&sc->io, as.res, as.count); @@ -876,7 +876,7 @@ } if (sc->flags & PCIB_SUBTRACTIVE) printf("%ssubtractive", comma ? ", " : ""); - device_printf("\n"); + printf("\n"); } } @@ -1030,8 +1030,8 @@ u_long start, u_long end, u_long count, u_int flags) { struct resource *res; - u_long base, limit; - int error, rid; + u_long base, limit, wmask; + int rid; /* * If this is an I/O window on a bridge with ISA enable set @@ -1044,7 +1044,7 @@ */ if (type == SYS_RES_IOPORT && sc->bridgectl & PCIB_BCR_ISA_ENABLE && start < 65536) { - for (base = 0xf000; base >= 0; base -= 0x1000) { + for (base = 0xf000; (long)base >= 0; base -= 0x1000) { limit = base + 0xfff; /* @@ -1074,8 +1074,10 @@ return (0); } } + return (ENOSPC); } + wmask = (1ul << w->step) - 1; if (RF_ALIGNMENT(flags) < w->step) { flags &= ~RF_ALIGNMENT_MASK; flags |= RF_ALIGNMENT_LOG2(w->step); @@ -1086,17 +1088,8 @@ rid = w->reg; res = bus_alloc_resource(sc->dev, type, &rid, start, end, count, flags & ~RF_ACTIVE); - if (res == NULL) { - if (bootverbose) - device_printf(sc->dev, - "failed to allocate initial %s window (%#lx-%#lx,%#lx)\n", - w->name, start, end, count); - return (ENXIO); - } - if (bootverbose) - device_printf(sc->dev, - "allocated initial %s window of %#lx-%#lx\n", - w->name, rman_get_start(res), rman_get_end(res)); + if (res == NULL) + return (ENOSPC); pcib_add_window_resources(w, &res, 1); pcib_activate_window(sc, type); w->base = rman_get_start(res); @@ -1131,7 +1124,7 @@ * existing resource. */ if (type == SYS_RES_IOPORT && sc->bridgectl & PCIB_BCR_ISA_ENABLE && - limit <= 65535 || (base <= 65535 && base != w->base)) { + (limit <= 65535 || (base <= 65535 && base != w->base))) { KASSERT(limit == w->limit || limit <= 65535, ("attempting to grow both ends across 64k ISA alias")); @@ -1188,7 +1181,7 @@ w->base = base; } else { error = rman_manage_region(&w->rman, w->limit + 1, limit); - w->limit = rman_get_end(w->res); + w->limit = limit; } if (error) { if (bootverbose) @@ -1208,7 +1201,7 @@ u_long start, u_long end, u_long count, u_int flags) { u_long align, start_free, end_free, front, back, wmask; - int error, rid; + int error; /* * Clamp the desired resource range to the maximum address @@ -1235,8 +1228,17 @@ if (w->res == NULL) { error = pcib_alloc_new_window(sc, w, type, start, end, count, flags); - if (error) + if (error) { + if (bootverbose) + device_printf(sc->dev, + "failed to allocate initial %s window (%#lx-%#lx,%#lx)\n", + w->name, start, end, count); return (error); + } + if (bootverbose) + device_printf(sc->dev, + "allocated initial %s window of %#lx-%#lx\n", + w->name, w->base, w->limit); goto updatewin; } @@ -1250,6 +1252,11 @@ * edge of the window, grow from the inner edge of the free * region. Otherwise grow from the window boundary. * + * Growing an I/O window below 64k for a bridge with the ISA + * enable bit doesn't require any special magic as the step + * size of an I/O window (1k) always includes multiple + * non-alias ranges when it is grown in either direction. + * * XXX: Special case: if w->res is completely empty and the * request size is larger than w->res, we should find the * optimal aligned buffer containing w->res and allocate that. From owner-p4-projects@FreeBSD.ORG Mon Jun 24 16:38:12 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BFC4EF5; Mon, 24 Jun 2013 16:38:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C36F5EF3 for ; Mon, 24 Jun 2013 16:38:11 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id B502B114B for ; Mon, 24 Jun 2013 16:38:11 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5OGcBs7066414 for ; Mon, 24 Jun 2013 16:38:11 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5OGcBEI066411 for perforce@freebsd.org; Mon, 24 Jun 2013 16:38:11 GMT (envelope-from brooks@freebsd.org) Date: Mon, 24 Jun 2013 16:38:11 GMT Message-Id: <201306241638.r5OGcBEI066411@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 230113 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jun 2013 16:38:12 -0000 http://p4web.freebsd.org/@@230113?ac=10 Change 230113 by brooks@brooks_zenith on 2013/06/24 16:37:56 Unhook the compositor demos. The require out of tree files to build. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#15 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#15 (text+ko) ==== @@ -4,7 +4,6 @@ browser \ cheripoint \ compositorctl \ - compositor_demos \ cycle_led \ de4ctl \ flashit \ @@ -17,6 +16,8 @@ wr \ writefile +# compositor_demos \ + .include SUBDIR:= ${SUBDIR:O} From owner-p4-projects@FreeBSD.ORG Tue Jun 25 20:29:33 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5F37EF7; Tue, 25 Jun 2013 20:29:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9A650EF4 for ; Tue, 25 Jun 2013 20:29:32 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 89B561369 for ; Tue, 25 Jun 2013 20:29:32 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5PKTW4U087571 for ; Tue, 25 Jun 2013 20:29:32 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5PKTWpD087567 for perforce@freebsd.org; Tue, 25 Jun 2013 20:29:32 GMT (envelope-from jhb@freebsd.org) Date: Tue, 25 Jun 2013 20:29:32 GMT Message-Id: <201306252029.r5PKTWpD087567@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 230147 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jun 2013 20:29:33 -0000 http://p4web.freebsd.org/@@230147?ac=10 Change 230147 by jhb@jhb_jhbbsd on 2013/06/25 20:28:30 IFC @230144 Affected files ... .. //depot/projects/smpng/share/man/man9/Makefile#36 integrate .. //depot/projects/smpng/share/man/man9/hhook.9#5 integrate .. //depot/projects/smpng/share/man/man9/rmlock.9#9 integrate .. //depot/projects/smpng/share/man/man9/rwlock.9#6 integrate .. //depot/projects/smpng/sys/amd64/include/counter.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#43 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#29 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/mutex.h#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#15 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#18 integrate .. //depot/projects/smpng/sys/conf/files#285 integrate .. //depot/projects/smpng/sys/conf/files.amd64#95 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-intel.c#21 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#44 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#133 integrate .. //depot/projects/smpng/sys/dev/qlxge/README.txt#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_dbg.c#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_dbg.h#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_def.h#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_dump.c#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_dump.h#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_glbl.h#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_hw.c#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_hw.h#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_inline.h#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_ioctl.c#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_ioctl.h#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_isr.c#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_os.c#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_os.h#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_ver.h#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#28 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uark.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umcs.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#180 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtwn.c#2 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_alloc.c#11 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_balloc.c#7 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_bmap.c#7 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_extern.h#5 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_subr.c#6 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2fs.h#9 integrate .. //depot/projects/smpng/sys/fs/ext2fs/fs.h#6 integrate .. //depot/projects/smpng/sys/fs/ext2fs/inode.h#9 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clbio.c#21 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clstate.c#21 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvfsops.c#22 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvnops.c#29 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#52 integrate .. //depot/projects/smpng/sys/kern/kern_cpuset.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_rmlock.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_lock.c#23 integrate .. //depot/projects/smpng/sys/modules/Makefile#196 integrate .. //depot/projects/smpng/sys/modules/qlxge/Makefile#1 branch .. //depot/projects/smpng/sys/modules/runfw/Makefile#3 integrate .. //depot/projects/smpng/sys/net/route.h#44 integrate .. //depot/projects/smpng/sys/net/rtsock.c#92 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#126 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#152 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#110 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#75 integrate .. //depot/projects/smpng/sys/netinet6/ip6_forward.c#36 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#52 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#49 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#73 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.h#7 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#69 integrate .. //depot/projects/smpng/sys/netipsec/ah_var.h#6 integrate .. //depot/projects/smpng/sys/netipsec/esp_var.h#6 integrate .. //depot/projects/smpng/sys/netipsec/ipcomp_var.h#7 integrate .. //depot/projects/smpng/sys/netipsec/ipip_var.h#7 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#44 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.h#25 integrate .. //depot/projects/smpng/sys/netipsec/ipsec6.h#12 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_input.c#31 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_mbuf.c#19 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_output.c#30 integrate .. //depot/projects/smpng/sys/netipsec/key.c#56 integrate .. //depot/projects/smpng/sys/netipsec/keysock.c#27 integrate .. //depot/projects/smpng/sys/netipsec/keysock.h#7 integrate .. //depot/projects/smpng/sys/netipsec/xform_ah.c#24 integrate .. //depot/projects/smpng/sys/netipsec/xform_esp.c#28 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipcomp.c#21 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipip.c#32 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_cpu.c#4 integrate .. //depot/projects/smpng/sys/sys/_rmlock.h#6 integrate .. //depot/projects/smpng/sys/sys/cpuset.h#12 integrate .. //depot/projects/smpng/sys/sys/lock.h#61 integrate .. //depot/projects/smpng/sys/sys/rmlock.h#7 integrate .. //depot/projects/smpng/sys/vm/uma.h#33 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#97 integrate .. //depot/projects/smpng/sys/vm/uma_dbg.c#20 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#41 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#135 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/Makefile#36 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/man/man9/Makefile 251825 2013-06-17 03:32:27Z delphij $ +# $FreeBSD: head/share/man/man9/Makefile 252209 2013-06-25 18:44:15Z jhb $ MAN= accept_filter.9 \ accf_data.9 \ @@ -1084,6 +1084,7 @@ MLINKS+=rmlock.9 rm_assert.9 \ rmlock.9 rm_destroy.9 \ rmlock.9 rm_init.9 \ + rmlock.9 rm_init_flags.9 \ rmlock.9 rm_rlock.9 \ rmlock.9 rm_runlock.9 \ rmlock.9 rm_sleep.9 \ ==== //depot/projects/smpng/share/man/man9/hhook.9#5 (text+ko) ==== @@ -28,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/hhook.9 222286 2011-05-25 14:13:53Z ru $ +.\" $FreeBSD: head/share/man/man9/hhook.9 252052 2013-06-21 03:37:35Z lstewart $ .\" -.Dd February 15, 2011 +.Dd June 21, 2013 .Dt HHOOK 9 .Os .Sh NAME @@ -380,9 +380,3 @@ .An David Hayes Aq david.hayes@ieee.org and .An Lawrence Stewart Aq lstewart@FreeBSD.org . -.Sh BUGS -The framework does not currently support registering hook points in subsystems -which have not been virtualised with VIMAGE. -Fairly minimal internal changes to the -.Nm -implementation are required to address this. ==== //depot/projects/smpng/share/man/man9/rmlock.9#9 (text+ko) ==== @@ -23,10 +23,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/rmlock.9 236768 2012-06-08 21:30:35Z jhb $ +.\" $FreeBSD: head/share/man/man9/rmlock.9 252209 2013-06-25 18:44:15Z jhb $ .\" .\" Based on rwlock.9 man page -.Dd June 8, 2012 +.Dd June 25, 2013 .Dt RMLOCK 9 .Os .Sh NAME ==== //depot/projects/smpng/share/man/man9/rwlock.9#6 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/rwlock.9 236680 2012-06-06 13:35:30Z jhb $ +.\" $FreeBSD: head/share/man/man9/rwlock.9 252037 2013-06-20 17:26:25Z jhb $ .\" -.Dd November 16, 2011 +.Dd June 20, 2013 .Dt RWLOCK 9 .Os .Sh NAME ==== //depot/projects/smpng/sys/amd64/include/counter.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/include/counter.h 249268 2013-04-08 19:40:53Z glebius $ + * $FreeBSD: head/sys/amd64/include/counter.h 252032 2013-06-20 14:30:04Z kib $ */ #ifndef __MACHINE_COUNTER_H__ @@ -44,7 +44,7 @@ __asm __volatile("addq\t%1,%%gs:(%0)" : - : "r" ((char *)c - (char *)&__pcpu[0]), "r" (inc) + : "r" ((char *)c - (char *)&__pcpu[0]), "ri" (inc) : "memory", "cc"); } ==== //depot/projects/smpng/sys/cam/scsi/scsi_all.c#43 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_all.c 251654 2013-06-12 13:36:20Z mav $"); +__FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_all.c 252204 2013-06-25 10:50:17Z mav $"); #include #include @@ -737,6 +737,172 @@ "Logical unit not ready, cause not reportable") } }; +static struct asc_table_entry hgst_entries[] = { + { SST(0x04, 0xF0, SS_RDEF, + "Vendor Unique - Logical Unit Not Ready") }, + { SST(0x0A, 0x01, SS_RDEF, + "Unrecovered Super Certification Log Write Error") }, + { SST(0x0A, 0x02, SS_RDEF, + "Unrecovered Super Certification Log Read Error") }, + { SST(0x15, 0x03, SS_RDEF, + "Unrecovered Sector Error") }, + { SST(0x3E, 0x04, SS_RDEF, + "Unrecovered Self-Test Hard-Cache Test Fail") }, + { SST(0x3E, 0x05, SS_RDEF, + "Unrecovered Self-Test OTF-Cache Fail") }, + { SST(0x40, 0x00, SS_RDEF, + "Unrecovered SAT No Buffer Overflow Error") }, + { SST(0x40, 0x01, SS_RDEF, + "Unrecovered SAT Buffer Overflow Error") }, + { SST(0x40, 0x02, SS_RDEF, + "Unrecovered SAT No Buffer Overflow With ECS Fault") }, + { SST(0x40, 0x03, SS_RDEF, + "Unrecovered SAT Buffer Overflow With ECS Fault") }, + { SST(0x40, 0x81, SS_RDEF, + "DRAM Failure") }, + { SST(0x44, 0x0B, SS_RDEF, + "Vendor Unique - Internal Target Failure") }, + { SST(0x44, 0xF2, SS_RDEF, + "Vendor Unique - Internal Target Failure") }, + { SST(0x44, 0xF6, SS_RDEF, + "Vendor Unique - Internal Target Failure") }, + { SST(0x44, 0xF9, SS_RDEF, + "Vendor Unique - Internal Target Failure") }, + { SST(0x44, 0xFA, SS_RDEF, + "Vendor Unique - Internal Target Failure") }, + { SST(0x5D, 0x22, SS_RDEF, + "Extreme Over-Temperature Warning") }, + { SST(0x5D, 0x50, SS_RDEF, + "Load/Unload cycle Count Warning") }, + { SST(0x81, 0x00, SS_RDEF, + "Vendor Unique - Internal Logic Error") }, + { SST(0x85, 0x00, SS_RDEF, + "Vendor Unique - Internal Key Seed Error") }, +}; + +static struct asc_table_entry seagate_entries[] = { + { SST(0x04, 0xF0, SS_RDEF, + "Logical Unit Not Ready, super certify in Progress") }, + { SST(0x08, 0x86, SS_RDEF, + "Write Fault Data Corruption") }, + { SST(0x09, 0x0D, SS_RDEF, + "Tracking Failure") }, + { SST(0x09, 0x0E, SS_RDEF, + "ETF Failure") }, + { SST(0x0B, 0x5D, SS_RDEF, + "Pre-SMART Warning") }, + { SST(0x0B, 0x85, SS_RDEF, + "5V Voltage Warning") }, + { SST(0x0B, 0x8C, SS_RDEF, + "12V Voltage Warning") }, + { SST(0x0C, 0xFF, SS_RDEF, + "Write Error – Too many error recovery revs") }, + { SST(0x11, 0xFF, SS_RDEF, + "Unrecovered Read Error – Too many error recovery revs") }, + { SST(0x19, 0x0E, SS_RDEF, + "Fewer than 1/2 defect list copies") }, + { SST(0x20, 0xF3, SS_RDEF, + "Illegal CDB linked to skip mask cmd") }, + { SST(0x24, 0xF0, SS_RDEF, + "Illegal byte in CDB, LBA not matching") }, + { SST(0x24, 0xF1, SS_RDEF, + "Illegal byte in CDB, LEN not matching") }, + { SST(0x24, 0xF2, SS_RDEF, + "Mask not matching transfer length") }, + { SST(0x24, 0xF3, SS_RDEF, + "Drive formatted without plist") }, + { SST(0x26, 0x95, SS_RDEF, + "Invalid Field Parameter – CAP File") }, + { SST(0x26, 0x96, SS_RDEF, + "Invalid Field Parameter – RAP File") }, + { SST(0x26, 0x97, SS_RDEF, + "Invalid Field Parameter – TMS Firmware Tag") }, + { SST(0x26, 0x98, SS_RDEF, + "Invalid Field Parameter – Check Sum") }, + { SST(0x26, 0x99, SS_RDEF, + "Invalid Field Parameter – Firmware Tag") }, + { SST(0x29, 0x08, SS_RDEF, + "Write Log Dump data") }, + { SST(0x29, 0x09, SS_RDEF, + "Write Log Dump data") }, + { SST(0x29, 0x0A, SS_RDEF, + "Reserved disk space") }, + { SST(0x29, 0x0B, SS_RDEF, + "SDBP") }, + { SST(0x29, 0x0C, SS_RDEF, + "SDBP") }, + { SST(0x31, 0x91, SS_RDEF, + "Format Corrupted World Wide Name (WWN) is Invalid") }, + { SST(0x32, 0x03, SS_RDEF, + "Defect List – Length exceeds Command Allocated Length") }, + { SST(0x33, 0x00, SS_RDEF, + "Flash not ready for access") }, + { SST(0x3F, 0x70, SS_RDEF, + "Invalid RAP block") }, + { SST(0x3F, 0x71, SS_RDEF, + "RAP/ETF mismatch") }, + { SST(0x3F, 0x90, SS_RDEF, + "Invalid CAP block") }, + { SST(0x3F, 0x91, SS_RDEF, + "World Wide Name (WWN) Mismatch") }, + { SST(0x40, 0x01, SS_RDEF, + "DRAM Parity Error") }, + { SST(0x40, 0x02, SS_RDEF, + "DRAM Parity Error") }, + { SST(0x42, 0x0A, SS_RDEF, + "Loopback Test") }, + { SST(0x42, 0x0B, SS_RDEF, + "Loopback Test") }, + { SST(0x44, 0xF2, SS_RDEF, + "Compare error during data integrity check") }, + { SST(0x44, 0xF6, SS_RDEF, + "Unrecoverable error during data integrity check") }, + { SST(0x47, 0x80, SS_RDEF, + "Fibre Channel Sequence Error") }, + { SST(0x4E, 0x01, SS_RDEF, + "Information Unit Too Short") }, + { SST(0x80, 0x00, SS_RDEF, + "General Firmware Error / Command Timeout") }, + { SST(0x80, 0x01, SS_RDEF, + "Command Timeout") }, + { SST(0x80, 0x02, SS_RDEF, + "Command Timeout") }, + { SST(0x80, 0x80, SS_RDEF, + "FC FIFO Error During Read Transfer") }, + { SST(0x80, 0x81, SS_RDEF, + "FC FIFO Error During Write Transfer") }, + { SST(0x80, 0x82, SS_RDEF, + "DISC FIFO Error During Read Transfer") }, + { SST(0x80, 0x83, SS_RDEF, + "DISC FIFO Error During Write Transfer") }, + { SST(0x80, 0x84, SS_RDEF, + "LBA Seeded LRC Error on Read") }, + { SST(0x80, 0x85, SS_RDEF, + "LBA Seeded LRC Error on Write") }, + { SST(0x80, 0x86, SS_RDEF, + "IOEDC Error on Read") }, + { SST(0x80, 0x87, SS_RDEF, + "IOEDC Error on Write") }, + { SST(0x80, 0x88, SS_RDEF, + "Host Parity Check Failed") }, + { SST(0x80, 0x89, SS_RDEF, + "IOEDC error on read detected by formatter") }, + { SST(0x80, 0x8A, SS_RDEF, + "Host Parity Errors / Host FIFO Initialization Failed") }, + { SST(0x80, 0x8B, SS_RDEF, + "Host Parity Errors") }, + { SST(0x80, 0x8C, SS_RDEF, + "Host Parity Errors") }, + { SST(0x80, 0x8D, SS_RDEF, + "Host Parity Errors") }, + { SST(0x81, 0x00, SS_RDEF, + "LA Check Failed") }, + { SST(0x82, 0x00, SS_RDEF, + "Internal client detected insufficient buffer") }, + { SST(0x84, 0x00, SS_RDEF, + "Scheduled Diagnostic And Repair") }, +}; + static struct scsi_sense_quirk_entry sense_quirk_table[] = { { /* @@ -759,6 +925,26 @@ sizeof(sony_mo_entries)/sizeof(struct asc_table_entry), /*sense key entries*/NULL, sony_mo_entries + }, + { + /* + * HGST vendor-specific error codes + */ + {T_DIRECT, SIP_MEDIA_FIXED, "HGST", "*", "*"}, + /*num_sense_keys*/0, + sizeof(hgst_entries)/sizeof(struct asc_table_entry), + /*sense key entries*/NULL, + hgst_entries + }, + { + /* + * SEAGATE vendor-specific error codes + */ + {T_DIRECT, SIP_MEDIA_FIXED, "SEAGATE", "*", "*"}, + /*num_sense_keys*/0, + sizeof(seagate_entries)/sizeof(struct asc_table_entry), + /*sense key entries*/NULL, + seagate_entries } }; ==== //depot/projects/smpng/sys/cam/scsi/scsi_all.h#29 (text+ko) ==== @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: head/sys/cam/scsi/scsi_all.h 251654 2013-06-12 13:36:20Z mav $ + * $FreeBSD: head/sys/cam/scsi/scsi_all.h 252045 2013-06-20 21:38:08Z smh $ */ /* @@ -917,10 +917,10 @@ #define AP_PROTO_DMA_QUEUED (0x07 << 1) #define AP_PROTO_DEVICE_DIAG (0x08 << 1) #define AP_PROTO_DEVICE_RESET (0x09 << 1) -#define AP_PROTO_UDMA_IN (0x10 << 1) -#define AP_PROTO_UDMA_OUT (0x11 << 1) -#define AP_PROTO_FPDMA (0x12 << 1) -#define AP_PROTO_RESP_INFO (0x15 << 1) +#define AP_PROTO_UDMA_IN (0x0a << 1) +#define AP_PROTO_UDMA_OUT (0x0b << 1) +#define AP_PROTO_FPDMA (0x0c << 1) +#define AP_PROTO_RESP_INFO (0x0f << 1) #define AP_MULTI 0xe0 u_int8_t flags; #define AP_T_LEN 0x03 ==== //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/mutex.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/cddl/compat/opensolaris/sys/mutex.h 219089 2011-02-27 19:41:40Z pjd $ + * $FreeBSD: head/sys/cddl/compat/opensolaris/sys/mutex.h 252061 2013-06-21 15:55:03Z smh $ */ #ifndef _OPENSOLARIS_SYS_MUTEX_H_ @@ -71,8 +71,7 @@ #define mutex_tryenter(lock) sx_try_xlock(lock) #define mutex_exit(lock) sx_xunlock(lock) #define mutex_owned(lock) sx_xlocked(lock) -/* TODO: Change to sx_xholder() once it is moved from kern_sx.c to sx.h. */ -#define mutex_owner(lock) ((lock)->sx_lock & SX_LOCK_SHARED ? NULL : (struct thread *)SX_OWNER((lock)->sx_lock)) +#define mutex_owner(lock) sx_xholder(lock) #endif /* _KERNEL */ ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#15 (text+ko) ==== @@ -1836,6 +1836,7 @@ vdev_config_dirty(vd->vdev_top); } + bzero(&smlock, sizeof (smlock)); mutex_init(&smlock, NULL, MUTEX_DEFAULT, NULL); space_map_create(&smsync, sm->sm_start, sm->sm_size, sm->sm_shift, ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#18 (text+ko) ==== @@ -270,8 +270,7 @@ continue; if (nvlist_lookup_uint64(*config, ZPOOL_CONFIG_POOL_STATE, - &state) != 0 || state == POOL_STATE_DESTROYED || - state > POOL_STATE_L2CACHE) { + &state) != 0 || state > POOL_STATE_L2CACHE) { nvlist_free(*config); *config = NULL; continue; ==== //depot/projects/smpng/sys/conf/files#285 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/conf/files 251964 2013-06-18 21:28:19Z jfv $ +# $FreeBSD: head/sys/conf/files 252064 2013-06-21 18:16:54Z gonzo $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2284,19 +2284,19 @@ dev/usb/wlan/if_rum.c optional rum dev/usb/wlan/if_run.c optional run runfw.c optional runfw \ - compile-with "${AWK} -f $S/tools/fw_stub.awk runfw:runfw -mrunfw -c${.TARGET}" \ + compile-with "${AWK} -f $S/tools/fw_stub.awk run.fw:runfw -mrunfw -c${.TARGET}" \ no-implicit-rule before-depend local \ clean "runfw.c" runfw.fwo optional runfw \ - dependency "runfw" \ + dependency "run.fw" \ compile-with "${NORMAL_FWO}" \ no-implicit-rule \ clean "runfw.fwo" -runfw optional runfw \ +run.fw optional runfw \ dependency "$S/contrib/dev/run/rt2870.fw.uu" \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ - clean "runfw" + clean "run.fw" dev/usb/wlan/if_uath.c optional uath dev/usb/wlan/if_upgt.c optional upgt dev/usb/wlan/if_ural.c optional ural ==== //depot/projects/smpng/sys/conf/files.amd64#95 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: head/sys/conf/files.amd64 250840 2013-05-21 03:05:49Z marcel $ +# $FreeBSD: head/sys/conf/files.amd64 252206 2013-06-25 17:50:22Z davidcs $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -227,6 +227,12 @@ dev/nvram/nvram.c optional nvram isa dev/random/ivy.c optional random rdrand_rng dev/random/nehemiah.c optional random padlock_rng +dev/qlxge/qls_dbg.c optional qlxge pci +dev/qlxge/qls_dump.c optional qlxge pci +dev/qlxge/qls_hw.c optional qlxge pci +dev/qlxge/qls_ioctl.c optional qlxge pci +dev/qlxge/qls_isr.c optional qlxge pci +dev/qlxge/qls_os.c optional qlxge pci dev/qlxgb/qla_dbg.c optional qlxgb pci dev/qlxgb/qla_hw.c optional qlxgb pci dev/qlxgb/qla_ioctl.c optional qlxgb pci ==== //depot/projects/smpng/sys/dev/ata/chipsets/ata-intel.c#21 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/dev/ata/chipsets/ata-intel.c 249213 2013-04-06 19:12:49Z marius $"); +__FBSDID("$FreeBSD: head/sys/dev/ata/chipsets/ata-intel.c 252203 2013-06-25 09:15:49Z mav $"); #include #include @@ -72,6 +72,7 @@ int reg, u_int32_t result); static int ata_intel_sata_sidpr_write(device_t dev, int port, int reg, u_int32_t result); +static int ata_intel_sata_sidpr_test(device_t dev); static int ata_intel_31244_ch_attach(device_t dev); static int ata_intel_31244_ch_detach(device_t dev); static int ata_intel_31244_status(device_t dev); @@ -416,22 +417,20 @@ } if (ch->flags & ATA_SATA) { if ((ctlr->chip->cfg1 & INTEL_ICH5)) { - ch->flags |= ATA_PERIODIC_POLL; - ch->hw.status = ata_intel_sata_status; ch->hw.pm_read = ata_intel_sata_cscr_read; ch->hw.pm_write = ata_intel_sata_cscr_write; } else if (ctlr->r_res2) { - ch->flags |= ATA_PERIODIC_POLL; - ch->hw.status = ata_intel_sata_status; if ((ctlr->chip->cfg1 & INTEL_ICH7)) { ch->hw.pm_read = ata_intel_sata_ahci_read; ch->hw.pm_write = ata_intel_sata_ahci_write; - } else { + } else if (ata_intel_sata_sidpr_test(dev)) { ch->hw.pm_read = ata_intel_sata_sidpr_read; ch->hw.pm_write = ata_intel_sata_sidpr_write; }; } if (ch->hw.pm_write != NULL) { + ch->flags |= ATA_PERIODIC_POLL; + ch->hw.status = ata_intel_sata_status; ata_sata_scr_write(ch, 0, ATA_SERROR, 0xffffffff); if ((ch->flags & ATA_NO_SLAVE) == 0) { @@ -835,6 +834,32 @@ } static int +ata_intel_sata_sidpr_test(device_t dev) +{ + struct ata_channel *ch = device_get_softc(dev); + int port; + uint32_t val; + + port = (ch->flags & ATA_NO_SLAVE) ? 0 : 1; + for (; port >= 0; port--) { + ata_intel_sata_sidpr_read(dev, port, ATA_SCONTROL, &val); + if ((val & ATA_SC_IPM_MASK) == + (ATA_SC_IPM_DIS_PARTIAL | ATA_SC_IPM_DIS_SLUMBER)) + return (1); + val |= ATA_SC_IPM_DIS_PARTIAL | ATA_SC_IPM_DIS_SLUMBER; + ata_intel_sata_sidpr_write(dev, port, ATA_SCONTROL, val); + ata_intel_sata_sidpr_read(dev, port, ATA_SCONTROL, &val); + if ((val & ATA_SC_IPM_MASK) == + (ATA_SC_IPM_DIS_PARTIAL | ATA_SC_IPM_DIS_SLUMBER)) + return (1); + } + if (bootverbose) + device_printf(dev, + "SControl registers are not functional: %08x\n", val); + return (0); +} + +static int ata_intel_31244_ch_attach(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); ==== //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#44 (text+ko) ==== @@ -94,7 +94,7 @@ * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: head/sys/dev/mpt/mpt_cam.c 249468 2013-04-14 09:55:48Z mav $"); +__FBSDID("$FreeBSD: head/sys/dev/mpt/mpt_cam.c 252180 2013-06-24 21:27:15Z marius $"); #include #include @@ -1254,7 +1254,8 @@ } /* - * Callback routine from "bus_dmamap_load" or, in simple cases, called directly. + * Callback routine from bus_dmamap_load_ccb(9) or, in simple cases, called + * directly. * * Takes a list of physical segments and builds the SGL for SCSI IO command * and forwards the commard to the IOC after one last check that CAM has not @@ -1688,7 +1689,6 @@ hdrp = req->req_vbuf; mpt_off = req->req_vbuf; - if (error == 0 && ((uint32_t)nseg) >= mpt->max_seg_cnt) { error = EFBIG; } @@ -3595,21 +3595,21 @@ #ifdef CAM_NEW_TRAN_CODE cpi->protocol = PROTO_SCSI; if (mpt->is_fc) { - cpi->hba_misc = PIM_NOBUSRESET; + cpi->hba_misc = PIM_NOBUSRESET | PIM_UNMAPPED; cpi->base_transfer_speed = 100000; cpi->hba_inquiry = PI_TAG_ABLE; cpi->transport = XPORT_FC; cpi->transport_version = 0; cpi->protocol_version = SCSI_REV_SPC; } else if (mpt->is_sas) { - cpi->hba_misc = PIM_NOBUSRESET; + cpi->hba_misc = PIM_NOBUSRESET | PIM_UNMAPPED; cpi->base_transfer_speed = 300000; cpi->hba_inquiry = PI_TAG_ABLE; cpi->transport = XPORT_SAS; cpi->transport_version = 0; cpi->protocol_version = SCSI_REV_SPC2; } else { - cpi->hba_misc = PIM_SEQSCAN; + cpi->hba_misc = PIM_SEQSCAN | PIM_UNMAPPED; cpi->base_transfer_speed = 3300; cpi->hba_inquiry = PI_SDTR_ABLE|PI_TAG_ABLE|PI_WIDE_16; cpi->transport = XPORT_SPI; ==== //depot/projects/smpng/sys/dev/pci/pci.c#133 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/dev/pci/pci.c 250418 2013-05-09 19:24:50Z jhb $"); +__FBSDID("$FreeBSD: head/sys/dev/pci/pci.c 252166 2013-06-24 18:30:44Z jhb $"); #include "opt_bus.h" @@ -280,7 +280,7 @@ enable these bits correctly. We'd like to do this all the time, but there\n\ are some peripherals that this causes problems with."); -static int pci_do_realloc_bars = 1; +static int pci_do_realloc_bars = 0; TUNABLE_INT("hw.pci.realloc_bars", &pci_do_realloc_bars); SYSCTL_INT(_hw_pci, OID_AUTO, realloc_bars, CTLFLAG_RW, &pci_do_realloc_bars, 0, ==== //depot/projects/smpng/sys/dev/usb/net/if_axe.c#28 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/dev/usb/net/if_axe.c 251679 2013-06-13 05:46:19Z kevlo $"); +__FBSDID("$FreeBSD: head/sys/dev/usb/net/if_axe.c 252185 2013-06-25 00:26:30Z yongari $"); /* * ASIX Electronics AX88172/AX88178/AX88778 USB 2.0 ethernet driver. @@ -163,6 +163,7 @@ AXE_DEV(GOODWAY, GWUSB2E, 0), AXE_DEV(IODATA, ETGUS2, AXE_FLAG_178), AXE_DEV(JVC, MP_PRX1, 0), + AXE_DEV(LENOVO, ETHERNET, AXE_FLAG_772B), AXE_DEV(LINKSYS2, USB200M, 0), AXE_DEV(LINKSYS4, USB1000, AXE_FLAG_178), AXE_DEV(LOGITEC, LAN_GTJU2A, AXE_FLAG_178), @@ -1351,15 +1352,14 @@ if (AXE_IS_178_FAMILY(sc)) { sc->sc_flags &= ~(AXE_FLAG_STD_FRAME | AXE_FLAG_CSUM_FRAME); - if ((sc->sc_flags & AXE_FLAG_772B) != 0) + if ((sc->sc_flags & AXE_FLAG_772B) != 0 && + (ifp->if_capenable & IFCAP_RXCSUM) != 0) { sc->sc_lenmask = AXE_CSUM_HDR_LEN_MASK; - else + sc->sc_flags |= AXE_FLAG_CSUM_FRAME; + } else { sc->sc_lenmask = AXE_HDR_LEN_MASK; - if ((sc->sc_flags & AXE_FLAG_772B) != 0 && - (ifp->if_capenable & IFCAP_RXCSUM) != 0) - sc->sc_flags |= AXE_FLAG_CSUM_FRAME; - else sc->sc_flags |= AXE_FLAG_STD_FRAME; + } } /* Configure TX/RX checksum offloading. */ ==== //depot/projects/smpng/sys/dev/usb/serial/uark.c#16 (text+ko) ==== @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: head/sys/dev/usb/serial/uark.c 239299 2012-08-15 15:42:57Z hselasky $ + * $FreeBSD: head/sys/dev/usb/serial/uark.c 252125 2013-06-23 20:22:49Z thomas $ */ /* ==== //depot/projects/smpng/sys/dev/usb/serial/umcs.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: head/sys/dev/usb/serial/umcs.h 222696 2011-06-04 20:40:24Z hselasky $ */ +/* $FreeBSD: head/sys/dev/usb/serial/umcs.h 252123 2013-06-23 20:19:51Z thomas $ */ /*- * Copyright (c) 2010 Lev Serebryakov . * All rights reserved. @@ -596,7 +596,7 @@ #define MCS7840_UART_LSR_RHROVERRUN 0x02 /* Data FIFO/register overflow */ #define MCS7840_UART_LSR_PARITYERR 0x04 /* Parity error */ #define MCS7840_UART_LSR_FRAMEERR 0x10 /* Framing error */ -#define MCS7840_UART_LSR_BREAKERR 0x20 /* BREAK sigmal received */ +#define MCS7840_UART_LSR_BREAKERR 0x20 /* BREAK signal received */ #define MCS7840_UART_LSR_THREMPTY 0x40 /* THR register is empty, * ready for transmit */ #define MCS7840_UART_LSR_HASERR 0x80 /* Has error in receiver FIFO */ ==== //depot/projects/smpng/sys/dev/usb/usbdevs#180 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: head/sys/dev/usb/usbdevs 251538 2013-06-08 16:02:31Z rpaulo $ +$FreeBSD: head/sys/dev/usb/usbdevs 252196 2013-06-25 06:43:04Z kevlo $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -681,6 +681,7 @@ vendor SWEEX2 0x177f Sweex vendor METAGEEK 0x1781 MetaGeek vendor KAMSTRUP 0x17a8 Kamstrup A/S +vendor LENOVO 0x17ef Lenovo vendor WAVESENSE 0x17f4 WaveSense vendor VAISALA 0x1843 Vaisala vendor AMIT 0x18c5 AMIT @@ -1544,6 +1545,7 @@ product DLINK RTL8192CU_1 0x3307 RTL8192CU product DLINK RTL8192CU_2 0x3309 RTL8192CU product DLINK RTL8192CU_3 0x330a RTL8192CU +product DLINK DWA131B 0x330d DWA-131 rev B product DLINK2 DWA120 0x3a0c DWA-120 product DLINK2 DWA120_NF 0x3a0d DWA-120 (no firmware) product DLINK2 DWLG122C1 0x3c03 DWL-G122 c1 @@ -2462,6 +2464,9 @@ /* Leadtek products */ product LEADTEK 9531 0x2101 9531 GPS +/* Lenovo products */ +product LENOVO ETHERNET 0x7203 USB 2.0 Ethernet + /* Lexar products */ product LEXAR JUMPSHOT 0x0001 jumpSHOT CompactFlash Reader product LEXAR CF_READER 0xb002 USB CF Reader ==== //depot/projects/smpng/sys/dev/usb/wlan/if_urtwn.c#2 (text+ko) ==== @@ -17,7 +17,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/dev/usb/wlan/if_urtwn.c 251596 2013-06-10 05:45:16Z rpaulo $"); +__FBSDID("$FreeBSD: head/sys/dev/usb/wlan/if_urtwn.c 252196 2013-06-25 06:43:04Z kevlo $"); /* * Driver for Realtek RTL8188CE-VAU/RTL8188CUS/RTL8188RU/RTL8192CU. @@ -106,6 +106,7 @@ URTWN_DEV(DLINK, RTL8192CU_1), URTWN_DEV(DLINK, RTL8192CU_2), URTWN_DEV(DLINK, RTL8192CU_3), + URTWN_DEV(DLINK, DWA131B), URTWN_DEV(EDIMAX, EW7811UN), URTWN_DEV(EDIMAX, RTL8192CU), URTWN_DEV(FEIXUN, RTL8188CU), ==== //depot/projects/smpng/sys/fs/ext2fs/ext2_alloc.c#11 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_alloc.c 8.8 (Berkeley) 2/21/94 - * $FreeBSD: head/sys/fs/ext2fs/ext2_alloc.c 251809 2013-06-16 16:10:45Z pfg $ + * $FreeBSD: head/sys/fs/ext2fs/ext2_alloc.c 252103 2013-06-23 02:44:42Z pfg $ */ #include @@ -165,7 +165,8 @@ struct ext2mount *ump; struct cluster_save *buflist; struct indir start_ap[NIADDR + 1], end_ap[NIADDR + 1], *idp; - int32_t start_lbn, end_lbn, soff, newblk, blkno; + e2fs_lbn_t start_lbn, end_lbn; + int32_t soff, newblk, blkno; int i, len, start_lvl, end_lvl, pref, ssize; if (doreallocblks == 0) @@ -550,7 +551,7 @@ * that will hold the pointer */ int32_t -ext2_blkpref(struct inode *ip, int32_t lbn, int indx, int32_t *bap, +ext2_blkpref(struct inode *ip, e2fs_lbn_t lbn, int indx, int32_t *bap, int32_t blocknr) { int tmp; ==== //depot/projects/smpng/sys/fs/ext2fs/ext2_balloc.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_balloc.c 8.4 (Berkeley) 9/23/93 - * $FreeBSD: head/sys/fs/ext2fs/ext2_balloc.c 251809 2013-06-16 16:10:45Z pfg $ + * $FreeBSD: head/sys/fs/ext2fs/ext2_balloc.c 252103 2013-06-23 02:44:42Z pfg $ */ #include @@ -57,7 +57,7 @@ * the inode and the logical block number in a file. */ int -ext2_balloc(struct inode *ip, int32_t lbn, int size, struct ucred *cred, +ext2_balloc(struct inode *ip, e2fs_lbn_t lbn, int size, struct ucred *cred, struct buf **bpp, int flags) { struct m_ext2fs *fs; ==== //depot/projects/smpng/sys/fs/ext2fs/ext2_bmap.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95 - * $FreeBSD: head/sys/fs/ext2fs/ext2_bmap.c 251823 2013-06-17 00:39:23Z pfg $ + * $FreeBSD: head/sys/fs/ext2fs/ext2_bmap.c 252103 2013-06-23 02:44:42Z pfg $ */ #include @@ -99,8 +99,8 @@ struct mount *mp; struct vnode *devvp; struct indir a[NIADDR+1], *ap; - int32_t daddr; - long metalbn; + daddr_t daddr; + e2fs_lbn_t metalbn; int error, num, maxrun = 0, bsize; int *nump; @@ -241,7 +241,8 @@ int ext2_getlbns(struct vnode *vp, int32_t bn, struct indir *ap, int *nump) { - long blockcnt, metalbn, realbn; + long blockcnt; + e2fs_lbn_t metalbn, realbn; struct ext2mount *ump; int i, numlevels, off; int64_t qblockcnt; ==== //depot/projects/smpng/sys/fs/ext2fs/ext2_extern.h#5 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_extern.h 8.3 (Berkeley) 4/16/94 - * $FreeBSD: head/sys/fs/ext2fs/ext2_extern.h 228539 2011-12-15 20:31:18Z pfg $ + * $FreeBSD: head/sys/fs/ext2fs/ext2_extern.h 252103 2013-06-23 02:44:42Z pfg $ */ #ifndef _FS_EXT2FS_EXT2_EXTERN_H_ @@ -49,10 +49,10 @@ int ext2_alloc(struct inode *, int32_t, int32_t, int, struct ucred *, int32_t *); int ext2_balloc(struct inode *, - int32_t, int, struct ucred *, struct buf **, int); + e2fs_lbn_t, int, struct ucred *, struct buf **, int); int ext2_blkatoff(struct vnode *, off_t, char **, struct buf **); void ext2_blkfree(struct inode *, int32_t, long); -int32_t ext2_blkpref(struct inode *, int32_t, int, int32_t *, int32_t); +int32_t ext2_blkpref(struct inode *, e2fs_lbn_t, int, int32_t *, int32_t); int ext2_bmap(struct vop_bmap_args *); int ext2_bmaparray(struct vnode *, int32_t, int32_t *, int *, int *); void ext2_clusteracct(struct m_ext2fs *, char *, int, daddr_t, int); ==== //depot/projects/smpng/sys/fs/ext2fs/ext2_subr.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_subr.c 8.2 (Berkeley) 9/21/93 - * $FreeBSD: head/sys/fs/ext2fs/ext2_subr.c 246634 2013-02-10 19:49:37Z pfg $ + * $FreeBSD: head/sys/fs/ext2fs/ext2_subr.c 252103 2013-06-23 02:44:42Z pfg $ */ #include @@ -68,7 +68,7 @@ struct inode *ip; struct m_ext2fs *fs; struct buf *bp; - int32_t lbn; + e2fs_lbn_t lbn; int bsize, error; ip = VTOI(vp); ==== //depot/projects/smpng/sys/fs/ext2fs/ext2fs.h#9 (text+ko) ==== @@ -4,7 +4,7 @@ * Aug 1995, Godmar Back (gback@cs.utah.edu) * University of Utah, Department of Computer Science * - * $FreeBSD: head/sys/fs/ext2fs/ext2fs.h 251952 2013-06-18 15:49:30Z pfg $ + * $FreeBSD: head/sys/fs/ext2fs/ext2fs.h 252012 2013-06-20 00:00:33Z pfg $ */ /*- * Copyright (c) 2009 Aditya Sarawgi @@ -237,12 +237,12 @@ uint16_t ext2bgd_nbfree; /* number of free blocks */ uint16_t ext2bgd_nifree; /* number of free inodes */ uint16_t ext2bgd_ndirs; /* number of directories */ - uint16_t ext2bgd_flags; /* block group flags */ - uint32_t ext2bgd_x_bitmap; /* snapshot exclusion bitmap loc. */ - uint16_t ext2bgd_b_bmap_csum; /* block bitmap checksum */ - uint16_t ext2bgd_i_bmap_csum; /* inode bitmap checksum */ - uint16_t ext2bgd_i_unused; /* unused inode count */ - uint16_t ext2bgd_csum; /* group descriptor checksum */ + uint16_t ext4bgd_flags; /* block group flags */ + uint32_t ext4bgd_x_bitmap; /* snapshot exclusion bitmap loc. */ + uint16_t ext4bgd_b_bmap_csum; /* block bitmap checksum */ + uint16_t ext4bgd_i_bmap_csum; /* inode bitmap checksum */ + uint16_t ext4bgd_i_unused; /* unused inode count */ + uint16_t ext4bgd_csum; /* group descriptor checksum */ }; ==== //depot/projects/smpng/sys/fs/ext2fs/fs.h#6 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)fs.h 8.7 (Berkeley) 4/19/94 - * $FreeBSD: head/sys/fs/ext2fs/fs.h 251809 2013-06-16 16:10:45Z pfg $ + * $FreeBSD: head/sys/fs/ext2fs/fs.h 252103 2013-06-23 02:44:42Z pfg $ */ #ifndef _FS_EXT2FS_FS_H_ @@ -98,8 +98,8 @@ * Turn file system block numbers into disk block addresses. * This maps file system blocks to device size blocks. */ -#define fsbtodb(fs, b) ((b) << ((fs)->e2fs_fsbtodb)) -#define dbtofsb(fs, b) ((b) >> ((fs)->e2fs_fsbtodb)) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 25 20:29:33 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CB9BFCD; Tue, 25 Jun 2013 20:29:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C657EEF5 for ; Tue, 25 Jun 2013 20:29:32 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id A7A7D136A for ; Tue, 25 Jun 2013 20:29:32 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5PKTWVB087577 for ; Tue, 25 Jun 2013 20:29:32 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5PKTW61087574 for perforce@freebsd.org; Tue, 25 Jun 2013 20:29:32 GMT (envelope-from jhb@freebsd.org) Date: Tue, 25 Jun 2013 20:29:32 GMT Message-Id: <201306252029.r5PKTW61087574@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 230148 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jun 2013 20:29:33 -0000 http://p4web.freebsd.org/@@230148?ac=10 Change 230148 by jhb@jhb_jhbbsd on 2013/06/25 20:29:15 IFC @230145 Affected files ... .. //depot/projects/smpng/sys/kern/kern_lock.c#93 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#167 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#39 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#72 integrate Differences ... ==== //depot/projects/smpng/sys/kern/kern_lock.c#93 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_kdtrace.h" #include -__FBSDID("$FreeBSD: head/sys/kern/kern_lock.c 251326 2013-06-03 17:41:11Z jhb $"); +__FBSDID("$FreeBSD: head/sys/kern/kern_lock.c 252212 2013-06-25 20:23:08Z jhb $"); #include #include @@ -238,8 +238,6 @@ u_int realexslp; int queue, wakeup_swapper; - TD_LOCKS_DEC(curthread); - TD_SLOCKS_DEC(curthread); WITNESS_UNLOCK(&lk->lock_object, 0, file, line); LOCK_LOG_LOCK("SUNLOCK", &lk->lock_object, 0, 0, file, line); @@ -339,6 +337,8 @@ } lock_profile_release_lock(&lk->lock_object); + TD_LOCKS_DEC(curthread); + TD_SLOCKS_DEC(curthread); return (wakeup_swapper); } @@ -397,12 +397,12 @@ iflags |= LO_IS_VNODE; iflags |= flags & (LK_ADAPTIVE | LK_NOSHARE); + lock_init(&lk->lock_object, &lock_class_lockmgr, wmesg, NULL, iflags); lk->lk_lock = LK_UNLOCKED; lk->lk_recurse = 0; lk->lk_exslpfail = 0; lk->lk_timo = timo; lk->lk_pri = pri; - lock_init(&lk->lock_object, &lock_class_lockmgr, wmesg, NULL, iflags); STACK_ZERO(lk); } ==== //depot/projects/smpng/sys/kern/kern_mutex.c#167 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/kern/kern_mutex.c 244582 2012-12-22 09:37:34Z attilio $"); +__FBSDID("$FreeBSD: head/sys/kern/kern_mutex.c 252212 2013-06-25 20:23:08Z jhb $"); #include "opt_adaptive_mutexes.h" #include "opt_ddb.h" @@ -243,7 +243,6 @@ KASSERT(LOCK_CLASS(&m->lock_object) == &lock_class_mtx_sleep, ("mtx_unlock() of spin mutex %s @ %s:%d", m->lock_object.lo_name, file, line)); - curthread->td_locks--; WITNESS_UNLOCK(&m->lock_object, opts | LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("UNLOCK", &m->lock_object, opts, m->mtx_recurse, file, line); @@ -252,6 +251,7 @@ if (m->mtx_recurse == 0) LOCKSTAT_PROFILE_RELEASE_LOCK(LS_MTX_UNLOCK_RELEASE, m); __mtx_unlock(m, curthread, opts, file, line); + curthread->td_locks--; } void @@ -894,10 +894,10 @@ flags |= LO_NOPROFILE; /* Initialize mutex. */ + lock_init(&m->lock_object, class, name, type, flags); + m->mtx_lock = MTX_UNOWNED; m->mtx_recurse = 0; - - lock_init(&m->lock_object, class, name, type, flags); } /* ==== //depot/projects/smpng/sys/kern/kern_rwlock.c#39 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/kern/kern_rwlock.c 251323 2013-06-03 17:38:57Z jhb $"); +__FBSDID("$FreeBSD: head/sys/kern/kern_rwlock.c 252212 2013-06-25 20:23:08Z jhb $"); #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" @@ -207,9 +207,9 @@ if (opts & RW_QUIET) flags |= LO_QUIET; + lock_init(&rw->lock_object, &lock_class_rw, name, NULL, flags); rw->rw_lock = RW_UNLOCKED; rw->rw_recurse = 0; - lock_init(&rw->lock_object, &lock_class_rw, name, NULL, flags); } void @@ -319,13 +319,13 @@ KASSERT(rw->rw_lock != RW_DESTROYED, ("rw_wunlock() of destroyed rwlock @ %s:%d", file, line)); __rw_assert(c, RA_WLOCKED, file, line); - curthread->td_locks--; WITNESS_UNLOCK(&rw->lock_object, LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("WUNLOCK", &rw->lock_object, 0, rw->rw_recurse, file, line); if (!rw_recursed(rw)) LOCKSTAT_PROFILE_RELEASE_LOCK(LS_RW_WUNLOCK_RELEASE, rw); __rw_wunlock(rw, curthread, file, line); + curthread->td_locks--; } /* * Determines whether a new reader can acquire a lock. Succeeds if the @@ -598,8 +598,6 @@ KASSERT(rw->rw_lock != RW_DESTROYED, ("rw_runlock() of destroyed rwlock @ %s:%d", file, line)); __rw_assert(c, RA_RLOCKED, file, line); - curthread->td_locks--; - curthread->td_rw_rlocks--; WITNESS_UNLOCK(&rw->lock_object, 0, file, line); LOCK_LOG_LOCK("RUNLOCK", &rw->lock_object, 0, 0, file, line); @@ -693,6 +691,8 @@ break; } LOCKSTAT_PROFILE_RELEASE_LOCK(LS_RW_RUNLOCK_RELEASE, rw); + curthread->td_locks--; + curthread->td_rw_rlocks--; } /* ==== //depot/projects/smpng/sys/kern/kern_sx.c#72 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_no_adaptive_sx.h" #include -__FBSDID("$FreeBSD: head/sys/kern/kern_sx.c 244582 2012-12-22 09:37:34Z attilio $"); +__FBSDID("$FreeBSD: head/sys/kern/kern_sx.c 252212 2013-06-25 20:23:08Z jhb $"); #include #include @@ -228,9 +228,9 @@ flags |= LO_QUIET; flags |= opts & SX_NOADAPTIVE; + lock_init(&sx->lock_object, &lock_class_sx, description, NULL, flags); sx->sx_lock = SX_LOCK_UNLOCKED; sx->sx_recurse = 0; - lock_init(&sx->lock_object, &lock_class_sx, description, NULL, flags); } void @@ -362,11 +362,11 @@ KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_sunlock() of destroyed sx @ %s:%d", file, line)); _sx_assert(sx, SA_SLOCKED, file, line); - curthread->td_locks--; WITNESS_UNLOCK(&sx->lock_object, 0, file, line); LOCK_LOG_LOCK("SUNLOCK", &sx->lock_object, 0, 0, file, line); __sx_sunlock(sx, file, line); LOCKSTAT_PROFILE_RELEASE_LOCK(LS_SX_SUNLOCK_RELEASE, sx); + curthread->td_locks--; } void @@ -378,13 +378,13 @@ KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_xunlock() of destroyed sx @ %s:%d", file, line)); _sx_assert(sx, SA_XLOCKED, file, line); - curthread->td_locks--; WITNESS_UNLOCK(&sx->lock_object, LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("XUNLOCK", &sx->lock_object, 0, sx->sx_recurse, file, line); if (!sx_recursed(sx)) LOCKSTAT_PROFILE_RELEASE_LOCK(LS_SX_XUNLOCK_RELEASE, sx); __sx_xunlock(sx, curthread, file, line); + curthread->td_locks--; } /* From owner-p4-projects@FreeBSD.ORG Wed Jun 26 21:21:50 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1DD81DD; Wed, 26 Jun 2013 21:21:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 91A281DB for ; Wed, 26 Jun 2013 21:21:49 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 822D91E04 for ; Wed, 26 Jun 2013 21:21:49 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5QLLnCS086426 for ; Wed, 26 Jun 2013 21:21:49 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5QLLn28086423 for perforce@freebsd.org; Wed, 26 Jun 2013 21:21:49 GMT (envelope-from jhb@freebsd.org) Date: Wed, 26 Jun 2013 21:21:49 GMT Message-Id: <201306262121.r5QLLn28086423@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 230190 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jun 2013 21:21:50 -0000 http://p4web.freebsd.org/@@230190?ac=10 Change 230190 by jhb@jhb_jhbbsd on 2013/06/26 21:21:08 Finish review of this. Affected files ... .. //depot/projects/smpng/share/man/man9/locking.9#14 edit Differences ... ==== //depot/projects/smpng/share/man/man9/locking.9#14 (text+ko) ==== @@ -42,14 +42,10 @@ A thread acquires (locks) a mutex before accessing data shared with other threads (including interrupt threads), and releases (unlocks) it afterwards. If the mutex cannot be acquired, the thread requesting it will wait. -Mutexes are by default adaptive, meaning that +Mutexes are adaptive by default, meaning that if the owner of a contended mutex is currently running on another CPU, -then a thread attempting to acquire the mutex will briefly spin -in the hope that the owner is only briefly holding it, -and might release it shortly. -If the owner does not do so, the waiting thread proceeds to yield the processor, -allowing other threads to run. -If the owner is not currently actually running then the spin step is skipped. +then a thread attempting to acquire the mutex will spin rather than yielding +the processor. Mutexes fully support priority propagation. .Pp See @@ -62,8 +58,10 @@ Note that a thread that holds a spin mutex must never yield its CPU to avoid deadlock. Unlike ordinary mutexes, spin mutexes disable interrupts when acquired. -Since disabling interrupts can be expensive, they are generally slower. -Spin mutexes should be used only when necessary, e.g. to protect data shared +Since disabling interrupts can be expensive, they are generally slower to +acquire and release. +Spin mutexes should be used only when absolutely necessary, +e.g. to protect data shared with interrupt filter code (see .Xr bus_setup_intr 9 for details), @@ -161,15 +159,15 @@ for details. .Ss Condition variables Condition variables are used in conjunction with locks to wait for -conditions to occur. -A thread must hold the associated lock before calling the -.Fn cv_wait* , +a condition to become true. +A thread must hold the associated lock before calling one of the +.Fn cv_wait , functions. When a thread waits on a condition, the lock -is atomically released before the thread yields the processor, -then reacquired before the function call returns. -Condition variables can be used with blocking mutexes, -reader/writer locks, and shared/exclusive locks. +is atomically released before the thread yields the processor +and reacquired before the function call returns. +Condition variables may be used with blocking mutexes, +reader/writer locks, read-mostly locks, and shared/exclusive locks. .Pp See .Xr condvar 9 @@ -183,7 +181,12 @@ .Fn wakeup , and .Fn wakeup_one -handle event-based thread blocking. +also handle event-based thread blocking. +Unlike condition variables, +arbitrary addresses may be used as wait channels and an dedicated +structure does not need to be allocated. +However, care must be taken to ensure that wait channel addresses are +unique to an event. If a thread must wait for an external event, it is put to sleep by .Fn tsleep , .Fn msleep , @@ -203,9 +206,10 @@ All threads sleeping on a single .Fa chan are woken up later by -.Fn wakeup , -often called from inside an interrupt routine, to indicate that the -resource the thread was blocking on is available now. +.Fn wakeup +.Pq often called from inside an interrupt routine +to indicate that the +event the thread was blocking on has occurred. .Pp Several of the sleep functions including .Fn msleep , @@ -221,7 +225,7 @@ flag, then the lock will not be reacquired before returning. The lock is used to ensure that a condition can be checked atomically, and that the current thread can be suspended without missing a -change to the condition, or an associated wakeup. +change to the condition or an associated wakeup. In addition, all of the sleep routines will fully drop the .Va Giant mutex @@ -232,6 +236,14 @@ .Pq restoring any recursion before the function returns. .Pp +The +.Fn pause +function is a special sleep function that waits for a specified +amount of time to pass before the thread resumes execution. +This sleep cannot be terminated early by either an explicit +.Fn wakeup +or a signal. +.Pp See .Xr sleep 9 for details. @@ -258,103 +270,123 @@ There are places in the kernel that drop Giant and pick it back up again. Sleep locks will do this before sleeping. -Parts of the network or VM code may do this as well, depending on the -setting of a sysctl. +Parts of the network or VM code may do this as well. This means that you cannot count on Giant keeping other code from running if your code sleeps, even if you want it to. .El .Sh INTERACTIONS -The primitives interact and have a number of rules regarding how +The primitives can interact and have a number of rules regarding how they can and can not be combined. Many of these rules are checked by .Xr witness 4 . -.Ss Bounded vs. unbounded sleep -A bounded sleep i - -The following primitives perform bounded sleep: -mutexes, pool mutexes, reader/writer locks and read-mostly locks. +.Ss Bounded vs. Unbounded Sleep +A bounded sleep +.Pq or blocking +is a sleep where the only resource needed to resume execution of a thread +is CPU time for the owner of a lock that the thread is waiting to acquire. +An unbounded sleep +.Po +often referred to as simply +.Dq sleeping +.Pc +is a sleep where a thread is waiting for an external event or for a condition +to become true. +In particular, +since there is always CPU time available, +a dependency chain of threads in bounded sleeps should always make forward +progress. +This requires that no thread in a bounded sleep is waiting for a lock held +by a thread in an unbounded sleep. +To avoid priority inversions, +a thread in a bounded sleep lends its priority to the owner of the lock +that it is waiting for. .Pp -The following primitives may perform an unbounded sleep: -shared/exclusive locks, counting semaphores, condition variables, sleep/wakeup and lockmanager locks. +The following primitives perform bounded sleeps: +mutexes, reader/writer locks and read-mostly locks. .Pp +The following primitives perform unbounded sleeps: +sleepable read-mostly locks, shared/exclusive locks, lockmanager locks, +counting semaphores, condition variables, and sleep/wakeup. +.Ss General Principles +.Bl -bullet +.It It is an error to do any operation that could result in yielding the processor while holding a spin mutex. -.Pp -As a general rule, it is an error to do any operation that could result -in unbounded sleep while holding any primitive from the 'bounded sleep' group. +.It +It is an error to do any operation that could result in unbounded sleep +while holding any primitive from the 'bounded sleep' group. For example, it is an error to try to acquire shared/exclusive lock while -holding mutex, or to try to allocate memory with M_WAITOK while holding +holding mutex, or to try to allocate memory with M_WAITOK while holding a read-write lock. .Pp -As a special case, it is possible to call +Note that the lock passed to one of the .Fn sleep or -.Fn mtx_sleep -while holding a single mutex. -It will atomically drop that mutex and reacquire it as part of waking up. -This is often a bad idea because it generally relies on the programmer having -good knowledge of all of the call graph above the place where -.Fn mtx_sleep -is being called and assumptions the calling code has made. -Because the lock gets dropped during sleep, one must re-test all -the assumptions that were made before, all the way up the call graph to the -place where the lock was acquired. -.Pp +.Fn cv_wait +functions is dropped before the thread enters the unbounded sleep and does +not violate this rule. +.It It is an error to do any operation that could result in yielding of the processor when running inside an interrupt filter. -.Pp +.It It is an error to do any operation that could result in unbounded sleep when running inside an interrupt thread. +.El .Ss Interaction table The following table shows what you can and can not do while holding -one of the synchronization primitives discussed: -.Bl -column ".Ic xxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXX" -offset indent -.It Em " You want:" Ta spin-mtx Ta mutex Ta rwlock Ta rmlock Ta sx Ta sleep -.It Em "You have: " Ta ------ Ta ------ Ta ------ Ta ------ Ta ------ Ta ------ -.It spin mtx Ta \&ok-1 Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no-3 -.It mutex Ta \&ok Ta \&ok-1 Ta \&ok Ta \&ok Ta \&no Ta \&no-3 -.It rwlock Ta \&ok Ta \&ok Ta \&ok-2 Ta \&ok Ta \&no Ta \&no-3 -.It rmlock Ta \&ok Ta \&ok Ta \&ok Ta \&ok-2 Ta \&no-5 Ta \&no-5 -.It sx Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&no-2 Ta \&ok-4 +one of the locking primitives discussed. Note that +.Dq sleep +includes +.Fn sema_wait , +.Fn sema_timedwait , +any of the +.Fn cv_wait +functions, +and any of the +.Fn sleep +functions. +.Bl -column ".Ic xxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXXXX" ".Xr XXXXXX" -offset 3n +.It Em " You want:" Ta spin mtx Ta mutex/rw Ta rmlock Ta sleep rm Ta sx/lk Ta sleep +.It Em "You have: " Ta -------- Ta -------- Ta ------ Ta -------- Ta ------ Ta ------ +.It spin mtx Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no-1 +.It mutex/rw Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no-1 +.It rmlock Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no-1 +.It sleep rm Ta \&ok Ta \&ok Ta \&ok Ta \&ok-2 Ta \&ok-2 Ta \&ok-2/3 +.It sx Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok-3 +.It lockmgr Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok .El .Pp .Em *1 -Recursion is defined per lock. -Lock order is important. +There are calls that atomically release this primitive when going to sleep +and reacquire it on wakeup +.Po +.Fn mtx_sleep , +.Fn rw_sleep , +.Fn msleep_spin , +etc. +.Pc . .Pp .Em *2 -Readers can recurse though writers can not. -Lock order is important. +These cases are only allowed while holding a write lock on a sleepable +read-mostly lock. .Pp .Em *3 -There are calls that atomically release this primitive when going to sleep -and reacquire it on wakeup (e.g. -.Fn mtx_sleep , -.Fn rw_sleep -and -.Fn msleep_spin ) . -.Pp -.Em *4 -Though one can sleep holding an sx lock, one can also use -.Fn sx_sleep -which will atomically release this primitive when going to sleep and +Though one can sleep while holding this lock, +one can also use a +.Fn sleep +function to atomically release this primitive when going to sleep and reacquire it on wakeup. .Pp -.Em *5 -.Em Read-mostly -locks can be initialized to support sleeping while holding a write lock. -See -.Xr rmlock 9 -for details. +Note that non-blocking try operations on locks are always permitted. .Ss Context mode table The next table shows what can be used in different contexts. At this time this is a rather easy to remember table. -.Bl -column ".Ic Xxxxxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXX" -offset indent -.It Em "Context:" Ta spin mtx Ta mutex Ta sx Ta rwlock Ta rmlock Ta sleep +.Bl -column ".Ic Xxxxxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXXXX" ".Xr XXXXXX" -offset 3n +.It Em "Context:" Ta spin mtx Ta mutex/rw Ta rmlock Ta sleep rm Ta sx/lk Ta sleep .It interrupt filter: Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no -.It interrupt thread: Ta \&ok Ta \&ok Ta \&no Ta \&ok Ta \&ok Ta \&no -.It callout: Ta \&ok Ta \&ok Ta \&no Ta \&ok Ta \&no Ta \&no -.It syscall: Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok +.It interrupt thread: Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no +.It callout: Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no +.It system call: Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok .El .Sh SEE ALSO .Xr witness 4 , From owner-p4-projects@FreeBSD.ORG Thu Jun 27 01:21:14 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57A64566; Thu, 27 Jun 2013 01:21:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 163DF564 for ; Thu, 27 Jun 2013 01:21:14 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 0829E1B0E for ; Thu, 27 Jun 2013 01:21:14 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5R1LDqg019034 for ; Thu, 27 Jun 2013 01:21:13 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5R1LDhW019031 for perforce@freebsd.org; Thu, 27 Jun 2013 01:21:13 GMT (envelope-from jhb@freebsd.org) Date: Thu, 27 Jun 2013 01:21:13 GMT Message-Id: <201306270121.r5R1LDhW019031@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 230214 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jun 2013 01:21:14 -0000 http://p4web.freebsd.org/@@230214?ac=10 Change 230214 by jhb@jhb_pipkin on 2013/06/27 01:21:13 Fix build on i386. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci_pci.c#32 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci_pci.c#32 (text+ko) ==== @@ -1237,8 +1237,8 @@ } if (bootverbose) device_printf(sc->dev, - "allocated initial %s window of %#lx-%#lx\n", - w->name, w->base, w->limit); + "allocated initial %s window of %#jx-%#jx\n", + w->name, (uintmax_t)w->base, (uintmax_t)w->limit); goto updatewin; } @@ -1348,8 +1348,8 @@ if (error) return (error); if (bootverbose) - device_printf(sc->dev, "grew %s window to %#lx-%#lx\n", - w->name, w->base, w->limit); + device_printf(sc->dev, "grew %s window to %#jx-%#jx\n", + w->name, (uintmax_t)w->base, (uintmax_t)w->limit); updatewin: /* Write the new window. */ From owner-p4-projects@FreeBSD.ORG Thu Jun 27 02:23:21 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C1531E3; Thu, 27 Jun 2013 02:23:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 205BA1E1 for ; Thu, 27 Jun 2013 02:23:21 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 125CB1D94 for ; Thu, 27 Jun 2013 02:23:21 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5R2NKna027142 for ; Thu, 27 Jun 2013 02:23:20 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5R2NKtt027139 for perforce@freebsd.org; Thu, 27 Jun 2013 02:23:20 GMT (envelope-from jhb@freebsd.org) Date: Thu, 27 Jun 2013 02:23:20 GMT Message-Id: <201306270223.r5R2NKtt027139@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 230215 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jun 2013 02:23:21 -0000 http://p4web.freebsd.org/@@230215?ac=10 Change 230215 by jhb@jhb_pipkin on 2013/06/27 02:22:25 - Give the PCI bus driver its own release_resource method so it can free resources for PCI-PCI bridge windows. - Fix a few bugs with walking the ISA non-alias ranges. With these changes a system with a bridge with ISA enabled set is able to boot ok and appears to DTRT with allocating the little subranges instead of the big I/O port range. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci.c#40 edit .. //depot/projects/pci/sys/dev/pci/pci_pci.c#33 edit .. //depot/projects/pci/sys/dev/pci/pci_private.h#14 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci.c#40 (text+ko) ==== @@ -156,7 +156,7 @@ DEVMETHOD(bus_delete_resource, pci_delete_resource), DEVMETHOD(bus_alloc_resource, pci_alloc_resource), DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource), - DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource), + DEVMETHOD(bus_release_resource, pci_release_resource), DEVMETHOD(bus_activate_resource, pci_activate_resource), DEVMETHOD(bus_deactivate_resource, pci_deactivate_resource), DEVMETHOD(bus_child_detached, pci_child_detached), @@ -4248,11 +4248,11 @@ pci_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { - struct pci_devinfo *dinfo = device_get_ivars(child); - struct resource_list *rl = &dinfo->resources; + struct pci_devinfo *dinfo; + struct resource_list *rl; struct resource_list_entry *rle; struct resource *res; - pcicfgregs *cfg = &dinfo->cfg; + pcicfgregs *cfg; if (device_get_parent(child) != dev) return (BUS_ALLOC_RESOURCE(device_get_parent(dev), child, @@ -4261,6 +4261,9 @@ /* * Perform lazy resource allocation */ + dinfo = device_get_ivars(child); + rl = &dinfo->resources; + cfg = &dinfo->cfg; switch (type) { case SYS_RES_IRQ: /* @@ -4316,6 +4319,41 @@ } int +pci_release_resource(device_t dev, device_t child, int type, int rid, + struct resource *r) +{ + struct pci_devinfo *dinfo; + struct resource_list *rl; + pcicfgregs *cfg; + + if (device_get_parent(child) != dev) + return (BUS_RELEASE_RESOURCE(device_get_parent(dev), child, + type, rid, r)); + + dinfo = device_get_ivars(child); + cfg = &dinfo->cfg; +#ifdef NEW_PCIB + /* + * PCI-PCI bridge I/O window resources are not BARs. For + * those allocations just pass the request up the tree. + */ + if (cfg->hdrtype == PCIM_HDRTYPE_BRIDGE && + (type == SYS_RES_IOPORT || type == SYS_RES_MEMORY)) { + switch (rid) { + case PCIR_IOBASEL_1: + case PCIR_MEMBASE_1: + case PCIR_PMBASEL_1: + return (bus_generic_release_resource(dev, child, type, + rid, r)); + } + } +#endif + + rl = &dinfo->resources; + return (resource_list_release(rl, dev, child, type, rid, r)); +} + +int pci_activate_resource(device_t dev, device_t child, int type, int rid, struct resource *r) { ==== //depot/projects/pci/sys/dev/pci/pci_pci.c#33 (text+ko) ==== @@ -272,22 +272,25 @@ { u_long next_end; - /* ISA aliases are only in the lower 64KB of I/O space. */ - while (start <= MIN(end, 65535)) { - /* - * If start is within an ISA alias range, move up to - * the start of the next non-alias range. As a - * special case, addresses in the range 0x000 - 0x0ff - * should also be skipped since those are used for - * various system I/O devices in ISA systems. - */ + /* + * If start is within an ISA alias range, move up to the start + * of the next non-alias range. As a special case, addresses + * in the range 0x000 - 0x0ff should also be skipped since + * those are used for various system I/O devices in ISA + * systems. + */ + if (start <= 65535) { if (start < 0x100 || (start & 0x300) != 0) { - start &= ~0x3fful; + start &= ~0x3ff; start += 0x400; } + } + + /* ISA aliases are only in the lower 64KB of I/O space. */ + while (start <= MIN(end, 65535)) { next_end = MIN(start | 0xff, end); - cb(start, end, arg); - start = next_end + 1; + cb(start, next_end, arg); + start += 0x400; } if (start <= end) ==== //depot/projects/pci/sys/dev/pci/pci_private.h#14 (text+ko) ==== @@ -98,6 +98,8 @@ struct resource *pci_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags); +int pci_release_resource(device_t dev, device_t child, int type, + int rid, struct resource *r); int pci_activate_resource(device_t dev, device_t child, int type, int rid, struct resource *r); int pci_deactivate_resource(device_t dev, device_t child, int type, From owner-p4-projects@FreeBSD.ORG Thu Jun 27 15:39:48 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECDBF520; Thu, 27 Jun 2013 15:39:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 937CD51D for ; Thu, 27 Jun 2013 15:39:47 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 833CA1E8C for ; Thu, 27 Jun 2013 15:39:47 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5RFdlS8032647 for ; Thu, 27 Jun 2013 15:39:47 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5RFdloN032644 for perforce@freebsd.org; Thu, 27 Jun 2013 15:39:47 GMT (envelope-from jhb@freebsd.org) Date: Thu, 27 Jun 2013 15:39:47 GMT Message-Id: <201306271539.r5RFdloN032644@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 230235 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jun 2013 15:39:48 -0000 http://p4web.freebsd.org/@@230235?ac=10 Change 230235 by jhb@jhb_pipkin on 2013/06/27 15:39:05 Fix an off-by-one error. This now passes allocating a new window range from scratch. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci_pci.c#34 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci_pci.c#34 (text+ko) ==== @@ -1064,10 +1064,10 @@ * The first open region for the window at * 0 is 0x400-0x4ff. */ - if (end - count < 0x400) + if (end - count + 1 < 0x400) continue; } else { - if (end - count < base) + if (end - count + 1 < base) continue; } From owner-p4-projects@FreeBSD.ORG Fri Jun 28 15:29:49 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3B1785A; Fri, 28 Jun 2013 15:29:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 72DEE858 for ; Fri, 28 Jun 2013 15:29:49 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 6263312B2 for ; Fri, 28 Jun 2013 15:29:49 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5SFTnRq022403 for ; Fri, 28 Jun 2013 15:29:49 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5SFTimw022395 for perforce@freebsd.org; Fri, 28 Jun 2013 15:29:44 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jun 2013 15:29:44 GMT Message-Id: <201306281529.r5SFTimw022395@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 230265 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jun 2013 15:29:49 -0000 http://p4web.freebsd.org/@@230265?ac=10 Change 230265 by jhb@jhb_jhbbsd on 2013/06/28 15:28:47 IFC @230264 Affected files ... .. //depot/projects/pci/sys/Makefile#5 integrate .. //depot/projects/pci/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/pci/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/pci/sys/amd64/amd64/exception.S#5 integrate .. //depot/projects/pci/sys/amd64/amd64/fpu.c#4 integrate .. //depot/projects/pci/sys/amd64/amd64/genassym.c#6 integrate .. //depot/projects/pci/sys/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/pci/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/pci/sys/amd64/amd64/minidump_machdep.c#6 integrate .. //depot/projects/pci/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/pci/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/pci/sys/amd64/amd64/support.S#4 integrate .. //depot/projects/pci/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/pci/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/pci/sys/amd64/compile/.cvsignore#2 delete .. //depot/projects/pci/sys/amd64/conf/.cvsignore#2 delete .. //depot/projects/pci/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/pci/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/pci/sys/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/pci/sys/amd64/include/acpica_machdep.h#3 integrate .. //depot/projects/pci/sys/amd64/include/clock.h#6 integrate .. //depot/projects/pci/sys/amd64/include/counter.h#1 branch .. //depot/projects/pci/sys/amd64/include/elf.h#3 integrate .. //depot/projects/pci/sys/amd64/include/fdt.h#1 branch .. //depot/projects/pci/sys/amd64/include/frame.h#4 integrate .. //depot/projects/pci/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/pci/sys/amd64/include/md_var.h#4 integrate .. //depot/projects/pci/sys/amd64/include/metadata.h#3 integrate .. //depot/projects/pci/sys/amd64/include/ofw_machdep.h#1 branch .. //depot/projects/pci/sys/amd64/include/param.h#4 integrate .. //depot/projects/pci/sys/amd64/include/pcb.h#4 integrate .. //depot/projects/pci/sys/amd64/include/pcpu.h#4 integrate .. //depot/projects/pci/sys/amd64/include/pmap.h#6 integrate .. //depot/projects/pci/sys/amd64/include/sigframe.h#3 integrate .. //depot/projects/pci/sys/amd64/include/signal.h#4 integrate .. //depot/projects/pci/sys/amd64/include/ucontext.h#4 integrate .. //depot/projects/pci/sys/amd64/include/vmm.h#2 integrate .. //depot/projects/pci/sys/amd64/include/vmm_dev.h#2 integrate .. //depot/projects/pci/sys/amd64/include/vmm_instruction_emul.h#2 integrate .. //depot/projects/pci/sys/amd64/include/vmparam.h#4 integrate .. //depot/projects/pci/sys/amd64/include/xen/xen-os.h#2 integrate .. //depot/projects/pci/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/pci/sys/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/pci/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/pci/sys/amd64/vmm/intel/vmcs.c#2 integrate .. //depot/projects/pci/sys/amd64/vmm/intel/vmcs.h#2 integrate .. //depot/projects/pci/sys/amd64/vmm/intel/vmx.c#2 integrate .. //depot/projects/pci/sys/amd64/vmm/io/ppt.c#2 integrate .. //depot/projects/pci/sys/amd64/vmm/io/vlapic.c#2 integrate .. //depot/projects/pci/sys/amd64/vmm/vmm.c#2 integrate .. //depot/projects/pci/sys/amd64/vmm/vmm_dev.c#2 integrate .. //depot/projects/pci/sys/amd64/vmm/vmm_instruction_emul.c#2 integrate .. //depot/projects/pci/sys/amd64/vmm/vmm_stat.c#2 integrate .. //depot/projects/pci/sys/amd64/vmm/vmm_stat.h#2 integrate .. //depot/projects/pci/sys/amd64/vmm/x86.c#2 integrate .. //depot/projects/pci/sys/arm/allwinner/a10_clk.c#1 branch .. //depot/projects/pci/sys/arm/allwinner/a10_clk.h#1 branch .. //depot/projects/pci/sys/arm/allwinner/a10_ehci.c#1 branch .. //depot/projects/pci/sys/arm/allwinner/a10_gpio.c#1 branch .. //depot/projects/pci/sys/arm/allwinner/a10_machdep.c#2 integrate .. //depot/projects/pci/sys/arm/allwinner/a10_wdog.c#1 branch .. //depot/projects/pci/sys/arm/allwinner/a10_wdog.h#1 branch .. //depot/projects/pci/sys/arm/allwinner/aintc.c#2 integrate .. //depot/projects/pci/sys/arm/allwinner/common.c#2 integrate .. //depot/projects/pci/sys/arm/allwinner/files.a10#2 integrate .. //depot/projects/pci/sys/arm/allwinner/timer.c#2 integrate .. //depot/projects/pci/sys/arm/arm/bcopy_page.S#3 integrate .. //depot/projects/pci/sys/arm/arm/bcopyinout.S#3 integrate .. //depot/projects/pci/sys/arm/arm/bcopyinout_xscale.S#3 integrate .. //depot/projects/pci/sys/arm/arm/blockio.S#3 integrate .. //depot/projects/pci/sys/arm/arm/bus_space_asm_generic.S#3 integrate .. //depot/projects/pci/sys/arm/arm/busdma_machdep-v6.c#2 integrate .. //depot/projects/pci/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/pci/sys/arm/arm/copystr.S#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm.S#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_arm10.S#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_arm11.S#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_arm11x6.S#2 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_arm7tdmi.S#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_arm8.S#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_arm9.S#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_armv4.S#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_armv5.S#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_armv5_ec.S#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_armv6.S#2 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_armv7.S#2 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_fa526.S#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_ixp12x0.S#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_pj4b.S#2 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_sa1.S#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_sa11x0.S#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_sheeva.S#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_xscale.S#3 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc_asm_xscale_c3.S#3 integrate .. //depot/projects/pci/sys/arm/arm/db_trace.c#3 integrate .. //depot/projects/pci/sys/arm/arm/disassem.c#3 integrate .. //depot/projects/pci/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/pci/sys/arm/arm/exception.S#3 integrate .. //depot/projects/pci/sys/arm/arm/fiq_subr.S#3 integrate .. //depot/projects/pci/sys/arm/arm/fusu.S#3 integrate .. //depot/projects/pci/sys/arm/arm/gic.c#2 integrate .. //depot/projects/pci/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/pci/sys/arm/arm/in_cksum_arm.S#3 integrate .. //depot/projects/pci/sys/arm/arm/intr.c#3 integrate .. //depot/projects/pci/sys/arm/arm/irq_dispatch.S#6 integrate .. //depot/projects/pci/sys/arm/arm/locore.S#3 integrate .. //depot/projects/pci/sys/arm/arm/machdep.c#4 integrate .. //depot/projects/pci/sys/arm/arm/mp_machdep.c#2 integrate .. //depot/projects/pci/sys/arm/arm/mpcore_timer.c#2 integrate .. //depot/projects/pci/sys/arm/arm/pmap-v6.c#2 integrate .. //depot/projects/pci/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/pci/sys/arm/arm/setcpsr.S#3 integrate .. //depot/projects/pci/sys/arm/arm/stack_machdep.c#3 integrate .. //depot/projects/pci/sys/arm/arm/stdatomic.c#1 branch .. //depot/projects/pci/sys/arm/arm/support.S#3 integrate .. //depot/projects/pci/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/pci/sys/arm/arm/trap.c#4 integrate .. //depot/projects/pci/sys/arm/arm/vfp.c#2 integrate .. //depot/projects/pci/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/pci/sys/arm/at91/at91_machdep.c#4 integrate .. //depot/projects/pci/sys/arm/at91/at91_mci.c#4 integrate .. //depot/projects/pci/sys/arm/at91/at91_pio.c#4 integrate .. //depot/projects/pci/sys/arm/at91/at91_piovar.h#3 integrate .. //depot/projects/pci/sys/arm/at91/at91_pmc.c#3 integrate .. //depot/projects/pci/sys/arm/at91/at91rm9200.c#3 integrate .. //depot/projects/pci/sys/arm/at91/at91rm9200_devices.c#2 integrate .. //depot/projects/pci/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/pci/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/pci/sys/arm/broadcom/bcm2835/bcm2835_dma.c#1 branch .. //depot/projects/pci/sys/arm/broadcom/bcm2835/bcm2835_dma.h#1 branch .. //depot/projects/pci/sys/arm/broadcom/bcm2835/bcm2835_gpio.c#2 integrate .. //depot/projects/pci/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c#2 integrate .. //depot/projects/pci/sys/arm/broadcom/bcm2835/bcm2835_systimer.c#2 integrate .. //depot/projects/pci/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h#2 integrate .. //depot/projects/pci/sys/arm/broadcom/bcm2835/files.bcm2835#2 integrate .. //depot/projects/pci/sys/arm/compile/.cvsignore#2 delete .. //depot/projects/pci/sys/arm/conf/.cvsignore#2 delete .. //depot/projects/pci/sys/arm/conf/AC100#2 integrate .. //depot/projects/pci/sys/arm/conf/ARMADAXP#2 integrate .. //depot/projects/pci/sys/arm/conf/ATMEL#2 integrate .. //depot/projects/pci/sys/arm/conf/AVILA#6 integrate .. //depot/projects/pci/sys/arm/conf/BEAGLEBONE#2 integrate .. //depot/projects/pci/sys/arm/conf/CAMBRIA#7 integrate .. //depot/projects/pci/sys/arm/conf/CRB#5 integrate .. //depot/projects/pci/sys/arm/conf/CUBIEBOARD#2 integrate .. //depot/projects/pci/sys/arm/conf/DOCKSTAR#4 integrate .. //depot/projects/pci/sys/arm/conf/DREAMPLUG-1001#1 branch .. //depot/projects/pci/sys/arm/conf/EFIKA_MX#1 branch .. //depot/projects/pci/sys/arm/conf/EP80219#5 integrate .. //depot/projects/pci/sys/arm/conf/IQ31244#5 integrate .. //depot/projects/pci/sys/arm/conf/NOTES#2 integrate .. //depot/projects/pci/sys/arm/conf/RPI-B#2 integrate .. //depot/projects/pci/sys/arm/conf/SHEEVAPLUG#4 integrate .. //depot/projects/pci/sys/arm/conf/TS7800#4 integrate .. //depot/projects/pci/sys/arm/conf/ZEDBOARD#1 branch .. //depot/projects/pci/sys/arm/econa/econa_machdep.c#3 integrate .. //depot/projects/pci/sys/arm/freescale/imx/bus_space.c#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/common.c#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/console.c#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/i2c.c#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx.files#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx51_ccm.c#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx51_ccmreg.h#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx51_ccmvar.h#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx51_dpllreg.h#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx51_gpio.c#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx51_iomux.c#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx51_iomuxreg.h#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx51_iomuxvar.h#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx51_ipuv3.c#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx51_ipuv3reg.h#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx51_sdmareg.h#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx51_ssireg.h#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx51_tzicreg.h#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx_gpt.c#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx_gptreg.h#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx_gptvar.h#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx_machdep.c#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx_wdog.c#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/imx_wdogreg.h#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/std.imx#1 branch .. //depot/projects/pci/sys/arm/freescale/imx/tzic.c#1 branch .. //depot/projects/pci/sys/arm/include/armreg.h#3 integrate .. //depot/projects/pci/sys/arm/include/asm.h#3 integrate .. //depot/projects/pci/sys/arm/include/asmacros.h#4 integrate .. //depot/projects/pci/sys/arm/include/at91_gpio.h#1 branch .. //depot/projects/pci/sys/arm/include/bus.h#3 integrate .. //depot/projects/pci/sys/arm/include/counter.h#1 branch .. //depot/projects/pci/sys/arm/include/frame.h#3 integrate .. //depot/projects/pci/sys/arm/include/machdep.h#3 integrate .. //depot/projects/pci/sys/arm/include/param.h#4 integrate .. //depot/projects/pci/sys/arm/include/pcpu.h#3 integrate .. //depot/projects/pci/sys/arm/include/pmap.h#5 integrate .. //depot/projects/pci/sys/arm/include/setjmp.h#3 integrate .. //depot/projects/pci/sys/arm/include/signal.h#3 integrate .. //depot/projects/pci/sys/arm/include/sysarch.h#4 integrate .. //depot/projects/pci/sys/arm/include/vfp.h#2 integrate .. //depot/projects/pci/sys/arm/include/vmparam.h#5 integrate .. //depot/projects/pci/sys/arm/lpc/lpc_timer.c#2 integrate .. //depot/projects/pci/sys/arm/mv/armadaxp/armadaxp.c#2 integrate .. //depot/projects/pci/sys/arm/mv/armadaxp/armadaxp_mp.c#2 integrate .. //depot/projects/pci/sys/arm/mv/armadaxp/std.armadaxp#2 integrate .. //depot/projects/pci/sys/arm/mv/common.c#5 integrate .. //depot/projects/pci/sys/arm/mv/kirkwood/files.sheevaplug#3 delete .. //depot/projects/pci/sys/arm/mv/kirkwood/sheevaplug.c#3 delete .. //depot/projects/pci/sys/arm/mv/kirkwood/std.sheevaplug#3 delete .. //depot/projects/pci/sys/arm/mv/mv_machdep.c#6 integrate .. //depot/projects/pci/sys/arm/mv/mvreg.h#4 integrate .. //depot/projects/pci/sys/arm/mv/mvvar.h#3 integrate .. //depot/projects/pci/sys/arm/mv/mvwin.h#3 integrate .. //depot/projects/pci/sys/arm/mv/timer.c#3 integrate .. //depot/projects/pci/sys/arm/s3c2xx0/s3c24x0_machdep.c#3 integrate .. //depot/projects/pci/sys/arm/s3c2xx0/uart_dev_s3c2410.c#3 integrate .. //depot/projects/pci/sys/arm/sa11x0/assabet_machdep.c#4 integrate .. //depot/projects/pci/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/pci/sys/arm/ti/aintc.c#2 integrate .. //depot/projects/pci/sys/arm/ti/am335x/am335x_dmtimer.c#2 integrate .. //depot/projects/pci/sys/arm/ti/am335x/am335x_lcd.c#1 branch .. //depot/projects/pci/sys/arm/ti/am335x/am335x_lcd.h#1 branch .. //depot/projects/pci/sys/arm/ti/am335x/am335x_lcd_syscons.c#1 branch .. //depot/projects/pci/sys/arm/ti/am335x/am335x_prcm.c#2 integrate .. //depot/projects/pci/sys/arm/ti/am335x/am335x_pwm.c#1 branch .. //depot/projects/pci/sys/arm/ti/am335x/am335x_pwm.h#1 branch .. //depot/projects/pci/sys/arm/ti/am335x/am335x_scm.h#1 branch .. //depot/projects/pci/sys/arm/ti/am335x/am335x_scm_padconf.c#2 integrate .. //depot/projects/pci/sys/arm/ti/am335x/files.am335x#2 integrate .. //depot/projects/pci/sys/arm/ti/cpsw/if_cpsw.c#2 integrate .. //depot/projects/pci/sys/arm/ti/cpsw/if_cpswreg.h#2 integrate .. //depot/projects/pci/sys/arm/ti/cpsw/if_cpswvar.h#2 integrate .. //depot/projects/pci/sys/arm/ti/omap4/omap4_prcm_clks.c#2 integrate .. //depot/projects/pci/sys/arm/ti/ti_cpuid.c#2 integrate .. //depot/projects/pci/sys/arm/ti/ti_gpio.c#2 integrate .. //depot/projects/pci/sys/arm/ti/ti_machdep.c#2 integrate .. //depot/projects/pci/sys/arm/ti/ti_mmchs.c#2 integrate .. //depot/projects/pci/sys/arm/ti/ti_prcm.h#2 integrate .. //depot/projects/pci/sys/arm/ti/ti_scm.c#2 integrate .. //depot/projects/pci/sys/arm/versatile/sp804.c#2 integrate .. //depot/projects/pci/sys/arm/xilinx/files.zynq7#1 branch .. //depot/projects/pci/sys/arm/xilinx/std.zynq7#1 branch .. //depot/projects/pci/sys/arm/xilinx/uart_dev_cdnc.c#1 branch .. //depot/projects/pci/sys/arm/xilinx/zedboard/files.zedboard#1 branch .. //depot/projects/pci/sys/arm/xilinx/zedboard/std.zedboard#1 branch .. //depot/projects/pci/sys/arm/xilinx/zy7_bus_space.c#1 branch .. //depot/projects/pci/sys/arm/xilinx/zy7_devcfg.c#1 branch .. //depot/projects/pci/sys/arm/xilinx/zy7_ehci.c#1 branch .. //depot/projects/pci/sys/arm/xilinx/zy7_gpio.c#1 branch .. //depot/projects/pci/sys/arm/xilinx/zy7_l2cache.c#1 branch .. //depot/projects/pci/sys/arm/xilinx/zy7_machdep.c#1 branch .. //depot/projects/pci/sys/arm/xilinx/zy7_reg.h#1 branch .. //depot/projects/pci/sys/arm/xilinx/zy7_slcr.c#1 branch .. //depot/projects/pci/sys/arm/xilinx/zy7_slcr.h#1 branch .. //depot/projects/pci/sys/arm/xscale/i80321/ep80219_machdep.c#3 integrate .. //depot/projects/pci/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/pci/sys/arm/xscale/i8134x/crb_machdep.c#5 integrate .. //depot/projects/pci/sys/arm/xscale/ixp425/avila_gpio.c#4 integrate .. //depot/projects/pci/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/pci/sys/arm/xscale/ixp425/cambria_gpio.c#4 integrate .. //depot/projects/pci/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/pci/sys/arm/xscale/pxa/pxa_machdep.c#3 integrate .. //depot/projects/pci/sys/boot/arm/at91/Makefile.inc#3 integrate .. //depot/projects/pci/sys/boot/arm/at91/boot2/Makefile#3 integrate .. //depot/projects/pci/sys/boot/arm/ixp425/Makefile.inc#3 integrate .. //depot/projects/pci/sys/boot/arm/ixp425/boot2/Makefile#3 integrate .. //depot/projects/pci/sys/boot/arm/uboot/Makefile#3 integrate .. //depot/projects/pci/sys/boot/arm/uboot/start.S#3 integrate .. //depot/projects/pci/sys/boot/common/bootstrap.h#4 integrate .. //depot/projects/pci/sys/boot/common/load_elf.c#5 integrate .. //depot/projects/pci/sys/boot/common/module.c#4 integrate .. //depot/projects/pci/sys/boot/common/part.c#2 integrate .. //depot/projects/pci/sys/boot/common/util.c#4 integrate .. //depot/projects/pci/sys/boot/fdt/dts/am335x-evm.dts#1 branch .. //depot/projects/pci/sys/boot/fdt/dts/am335x.dtsi#1 branch .. //depot/projects/pci/sys/boot/fdt/dts/bcm2835-rpi-b.dts#2 integrate .. //depot/projects/pci/sys/boot/fdt/dts/beaglebone-black.dts#1 branch .. //depot/projects/pci/sys/boot/fdt/dts/beaglebone.dts#2 integrate .. //depot/projects/pci/sys/boot/fdt/dts/cubieboard.dts#2 integrate .. //depot/projects/pci/sys/boot/fdt/dts/db78460.dts#2 integrate .. //depot/projects/pci/sys/boot/fdt/dts/dreamplug-1001.dts#1 branch .. //depot/projects/pci/sys/boot/fdt/dts/dreamplug-1001N.dts#1 branch .. //depot/projects/pci/sys/boot/fdt/dts/efikamx.dts#1 branch .. //depot/projects/pci/sys/boot/fdt/dts/imx51x.dtsi#1 branch .. //depot/projects/pci/sys/boot/fdt/dts/zedboard.dts#1 branch .. //depot/projects/pci/sys/boot/fdt/fdt_loader_cmd.c#3 integrate .. //depot/projects/pci/sys/boot/fdt/help.fdt#1 branch .. //depot/projects/pci/sys/boot/ficl/arm/sysdep.h#3 integrate .. //depot/projects/pci/sys/boot/ficl/tools.c#3 integrate .. //depot/projects/pci/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/pci/sys/boot/i386/libi386/comconsole.c#4 integrate .. //depot/projects/pci/sys/boot/pc98/btx/btx/btx.S#3 integrate .. //depot/projects/pci/sys/boot/pc98/libpc98/biosdisk.c#3 integrate .. //depot/projects/pci/sys/boot/pc98/libpc98/comconsole.c#4 integrate .. //depot/projects/pci/sys/boot/powerpc/ps3/Makefile#6 integrate .. //depot/projects/pci/sys/boot/powerpc/uboot/Makefile#3 integrate .. //depot/projects/pci/sys/boot/sparc64/loader/main.c#6 integrate .. //depot/projects/pci/sys/boot/uboot/common/metadata.c#3 integrate .. //depot/projects/pci/sys/boot/uboot/lib/copy.c#3 integrate .. //depot/projects/pci/sys/boot/uboot/lib/elf_freebsd.c#3 integrate .. //depot/projects/pci/sys/boot/usb/Makefile#1 branch .. //depot/projects/pci/sys/boot/usb/Makefile.test#1 branch .. //depot/projects/pci/sys/boot/usb/bsd_busspace.c#1 branch .. //depot/projects/pci/sys/boot/usb/bsd_global.h#1 branch .. //depot/projects/pci/sys/boot/usb/bsd_kernel.c#1 branch .. //depot/projects/pci/sys/boot/usb/bsd_kernel.h#1 branch .. //depot/projects/pci/sys/boot/usb/bsd_usbloader_test.c#1 branch .. //depot/projects/pci/sys/boot/usb/tools/sysinit.c#1 branch .. //depot/projects/pci/sys/boot/usb/tools/sysinit.h#1 branch .. //depot/projects/pci/sys/boot/usb/usb_busdma_loader.c#1 branch .. //depot/projects/pci/sys/boot/userboot/userboot/elf32_freebsd.c#3 integrate .. //depot/projects/pci/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/pci/sys/cam/ata/ata_all.c#5 integrate .. //depot/projects/pci/sys/cam/ata/ata_all.h#4 integrate .. //depot/projects/pci/sys/cam/ata/ata_da.c#8 integrate .. //depot/projects/pci/sys/cam/ata/ata_pmp.c#5 integrate .. //depot/projects/pci/sys/cam/ata/ata_xpt.c#7 integrate .. //depot/projects/pci/sys/cam/cam.c#3 integrate .. //depot/projects/pci/sys/cam/cam.h#3 integrate .. //depot/projects/pci/sys/cam/cam_ccb.h#6 integrate .. //depot/projects/pci/sys/cam/cam_compat.c#1 branch .. //depot/projects/pci/sys/cam/cam_compat.h#1 branch .. //depot/projects/pci/sys/cam/cam_periph.c#7 integrate .. //depot/projects/pci/sys/cam/cam_periph.h#5 integrate .. //depot/projects/pci/sys/cam/cam_queue.c#4 integrate .. //depot/projects/pci/sys/cam/cam_queue.h#3 integrate .. //depot/projects/pci/sys/cam/cam_sim.c#4 integrate .. //depot/projects/pci/sys/cam/cam_sim.h#4 integrate .. //depot/projects/pci/sys/cam/cam_xpt.c#8 integrate .. //depot/projects/pci/sys/cam/cam_xpt_internal.h#5 integrate .. //depot/projects/pci/sys/cam/cam_xpt_periph.h#3 integrate .. //depot/projects/pci/sys/cam/cam_xpt_sim.h#3 integrate .. //depot/projects/pci/sys/cam/ctl/README.ctl.txt#3 integrate .. //depot/projects/pci/sys/cam/ctl/ctl.c#4 integrate .. //depot/projects/pci/sys/cam/ctl/ctl_backend.c#3 integrate .. //depot/projects/pci/sys/cam/ctl/ctl_backend_block.c#4 integrate .. //depot/projects/pci/sys/cam/ctl/ctl_frontend_cam_sim.c#3 integrate .. //depot/projects/pci/sys/cam/ctl/ctl_frontend_internal.c#3 integrate .. //depot/projects/pci/sys/cam/ctl/scsi_ctl.c#3 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_all.c#5 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_all.h#5 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_cd.c#7 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_ch.c#5 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_ch.h#4 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_enc_ses.c#2 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_pass.c#5 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_sa.c#5 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_sg.c#5 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_xpt.c#6 integrate .. //depot/projects/pci/sys/cddl/boot/zfs/README#3 integrate .. //depot/projects/pci/sys/cddl/boot/zfs/lz4.c#1 branch .. //depot/projects/pci/sys/cddl/boot/zfs/zfsimpl.h#3 integrate .. //depot/projects/pci/sys/cddl/boot/zfs/zfssubr.c#4 integrate .. //depot/projects/pci/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c#1 branch .. //depot/projects/pci/sys/cddl/compat/opensolaris/sys/byteorder.h#3 integrate .. //depot/projects/pci/sys/cddl/compat/opensolaris/sys/cred.h#3 integrate .. //depot/projects/pci/sys/cddl/compat/opensolaris/sys/file.h#4 integrate .. //depot/projects/pci/sys/cddl/compat/opensolaris/sys/freebsd_rwlock.h#1 branch .. //depot/projects/pci/sys/cddl/compat/opensolaris/sys/kcondvar.h#3 integrate .. //depot/projects/pci/sys/cddl/compat/opensolaris/sys/kmem.h#4 integrate .. //depot/projects/pci/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/pci/sys/cddl/compat/opensolaris/sys/sdt.h#3 integrate .. //depot/projects/pci/sys/cddl/compat/opensolaris/sys/sig.h#3 integrate .. //depot/projects/pci/sys/cddl/compat/opensolaris/sys/time.h#4 integrate .. //depot/projects/pci/sys/cddl/compat/opensolaris/sys/vm.h#1 branch .. //depot/projects/pci/sys/cddl/compat/opensolaris/sys/vnode.h#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/nvpair/fnvpair.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#6 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4#1 branch .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4.descrip#1 branch .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#6 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c#1 branch .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c#1 branch .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lz4.c#1 branch .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h#1 branch .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_destroy.h#1 branch .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_userhold.h#1 branch .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#6 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/trim_map.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#6 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#6 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#6 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c#4 integrate .. //depot/projects/pci/sys/cddl/dev/dtmalloc/dtmalloc.c#3 integrate .. //depot/projects/pci/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#3 integrate .. //depot/projects/pci/sys/cddl/dev/dtrace/dtrace_ioctl.c#3 integrate .. //depot/projects/pci/sys/cddl/dev/dtrace/dtrace_test.c#3 integrate .. //depot/projects/pci/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S#2 integrate .. //depot/projects/pci/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c#2 integrate .. //depot/projects/pci/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c#2 integrate .. //depot/projects/pci/sys/cddl/dev/fbt/fbt.c#4 integrate .. //depot/projects/pci/sys/cddl/dev/fbt/fbt_powerpc.c#1 branch .. //depot/projects/pci/sys/cddl/dev/sdt/sdt.c#3 integrate .. //depot/projects/pci/sys/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/pci/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/pci/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/pci/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/pci/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/pci/sys/compat/freebsd32/freebsd32_systrace_args.c#7 integrate .. //depot/projects/pci/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/pci/sys/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/pci/sys/compat/linux/linux_emul.c#5 integrate .. //depot/projects/pci/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/pci/sys/compat/linux/linux_file.h#4 integrate .. //depot/projects/pci/sys/compat/linux/linux_fork.c#4 integrate .. //depot/projects/pci/sys/compat/linux/linux_futex.c#5 integrate .. //depot/projects/pci/sys/compat/linux/linux_ioctl.h#4 integrate .. //depot/projects/pci/sys/compat/linux/linux_ipc.h#3 integrate .. //depot/projects/pci/sys/compat/linux/linux_mib.c#5 integrate .. //depot/projects/pci/sys/compat/linux/linux_misc.h#4 integrate .. //depot/projects/pci/sys/compat/linux/linux_signal.h#3 integrate .. //depot/projects/pci/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/pci/sys/compat/linux/linux_socket.h#4 integrate .. //depot/projects/pci/sys/compat/linux/linux_sysctl.c#3 integrate .. //depot/projects/pci/sys/compat/linux/linux_time.c#3 integrate .. //depot/projects/pci/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/pci/sys/compat/svr4/svr4_fcntl.c#4 integrate .. //depot/projects/pci/sys/compat/svr4/svr4_filio.c#4 integrate .. //depot/projects/pci/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/pci/sys/compat/svr4/svr4_stream.c#4 integrate .. //depot/projects/pci/sys/conf/Makefile.amd64#4 integrate .. //depot/projects/pci/sys/conf/Makefile.arm#4 integrate .. //depot/projects/pci/sys/conf/Makefile.i386#4 integrate .. //depot/projects/pci/sys/conf/NOTES#11 integrate .. //depot/projects/pci/sys/conf/files#11 integrate .. //depot/projects/pci/sys/conf/files.amd64#7 integrate .. //depot/projects/pci/sys/conf/files.arm#5 integrate .. //depot/projects/pci/sys/conf/files.i386#9 integrate .. //depot/projects/pci/sys/conf/files.mips#8 integrate .. //depot/projects/pci/sys/conf/files.powerpc#7 integrate .. //depot/projects/pci/sys/conf/files.sparc64#6 integrate .. //depot/projects/pci/sys/conf/kern.mk#8 integrate .. //depot/projects/pci/sys/conf/kern.pre.mk#8 integrate .. //depot/projects/pci/sys/conf/ldscript.arm#3 integrate .. //depot/projects/pci/sys/conf/makeLINT.mk#5 integrate .. //depot/projects/pci/sys/conf/newvers.sh#6 integrate .. //depot/projects/pci/sys/conf/options#12 integrate .. //depot/projects/pci/sys/conf/options.arm#3 integrate .. //depot/projects/pci/sys/conf/options.mips#7 integrate .. //depot/projects/pci/sys/conf/options.sparc64#3 integrate .. //depot/projects/pci/sys/contrib/altq/altq/altq_hfsc.c#4 integrate .. //depot/projects/pci/sys/contrib/altq/altq/altq_hfsc.h#2 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/acpica_prep.sh#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/changes.txt#7 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/common/adisasm.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/common/adwalk.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/common/ahpredef.c#2 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/common/dmextern.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/common/dmrestag.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/common/dmtable.c#6 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/common/dmtbdump.c#6 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/common/dmtbinfo.c#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/common/getopt.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslanalyze.c#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslbtypes.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslcodegen.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslcompile.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslcompiler.h#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/asldefine.h#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslerror.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslfiles.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslfold.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslglobal.h#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslhex.c#2 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/asllength.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/asllisting.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/asllistsup.c#1 branch .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslload.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/asllookup.c#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslmain.c#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslmessages.h#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslmethod.c#2 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslnamesp.c#2 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/asloffset.c#1 branch .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslopcodes.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/asloperands.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/asloptions.c#1 branch .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslpredef.c#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslprepkg.c#1 branch .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslresource.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslrestype1i.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslrestype2s.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslstartup.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslsupport.l#2 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/asltransform.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/asltree.c#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/asltypes.h#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslutils.c#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslwalks.c#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslxref.c#2 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtcompiler.h#6 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtexpress.c#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtfield.c#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtio.c#6 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtsubtable.c#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dttable.c#6 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dttemplate.h#6 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtutils.c#6 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/preprocess.h#2 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/compiler/prscan.c#2 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/debugger/dbcmds.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/debugger/dbconvert.c#2 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/debugger/dbdisply.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/debugger/dbexec.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/debugger/dbhistry.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/debugger/dbinput.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/debugger/dbmethod.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/debugger/dbnames.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/debugger/dbstats.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/debugger/dbutils.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/debugger/dbxface.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c#2 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/disassembler/dmnames.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/disassembler/dmobject.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/disassembler/dmopcode.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/disassembler/dmresrc.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/disassembler/dmwalk.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/dispatcher/dsfield.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/dispatcher/dsinit.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/dispatcher/dsobject.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/dispatcher/dsutils.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/dispatcher/dswexec.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/dispatcher/dswload.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/dispatcher/dswload2.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/events/evevent.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/events/evglock.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/events/evgpe.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/events/evgpeblk.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/events/evgpeinit.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/events/evhandler.c#2 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/events/evmisc.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/events/evregion.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/events/evrgnini.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/events/evsci.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/events/evxface.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/events/evxfevnt.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/events/evxfgpe.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/events/evxfregn.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exconfig.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exconvrt.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/excreate.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exdebug.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exdump.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exfield.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exfldio.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exmisc.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exnames.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exoparg1.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exoparg2.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exoparg3.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exoparg6.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exprep.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exregion.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exresnte.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exresolv.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exresop.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exstore.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exstoren.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/executer/exutils.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/hardware/hwacpi.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/hardware/hwgpe.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/hardware/hwregs.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/hardware/hwxface.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/namespace/nsaccess.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/namespace/nsarguments.c#1 branch .. //depot/projects/pci/sys/contrib/dev/acpica/components/namespace/nsconvert.c#1 branch .. //depot/projects/pci/sys/contrib/dev/acpica/components/namespace/nsdump.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/namespace/nseval.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/namespace/nsinit.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/namespace/nspredef.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/namespace/nsprepkg.c#2 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/namespace/nsrepair.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/namespace/nsrepair2.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/namespace/nsutils.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/namespace/nsxfeval.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/namespace/nsxfname.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/parser/psargs.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/parser/psloop.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/parser/psobject.c#2 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/parser/psparse.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/parser/pstree.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/parser/psxface.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/resources/rscalc.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/resources/rscreate.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/resources/rsdump.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/resources/rslist.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/resources/rsmisc.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/resources/rsutils.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/resources/rsxface.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/tables/tbfadt.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/tables/tbinstal.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/tables/tbprint.c#1 branch .. //depot/projects/pci/sys/contrib/dev/acpica/components/tables/tbutils.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/tables/tbxface.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/tables/tbxfload.c#2 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/tables/tbxfroot.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/utaddress.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/utbuffer.c#1 branch .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/utcache.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/utcopy.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/utdebug.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/utdelete.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/uterror.c#1 branch .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/uteval.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/utexcep.c#2 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/utglobal.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/utids.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/utmisc.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/utmutex.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/utobject.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/utosi.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/utpredef.c#1 branch .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/utstring.c#2 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/uttrack.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/utxface.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/components/utilities/utxferror.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/acapps.h#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/acconfig.h#6 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/acdisasm.h#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/acexcep.h#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/acglobal.h#6 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/aclocal.h#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/acmacros.h#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/acnamesp.h#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/acoutput.h#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/acpiosxf.h#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/acpixf.h#7 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/acpredef.h#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/acstruct.h#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/actables.h#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/actbl2.h#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/actbl3.h#3 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/actypes.h#5 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/acutils.h#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/platform/acenv.h#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/include/platform/acfreebsd.h#4 integrate .. //depot/projects/pci/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c#3 integrate .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_aic.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_ani.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_aphrodite10.ini#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_beacon.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_devid.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_gpio.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_interrupts.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_jupiter10.ini#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_jupiter20.ini#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_keycache.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_mci.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_osprey22.ini#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_osprey22_scoemu.ini#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_paprd.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_phy.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_radar.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_radio.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_raw_adc_capture.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv_ds.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_rtt.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_sim.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_sim.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_spectral.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub_funcs.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub_funcs.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_timer.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_tx99_tgt.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_txbf.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_txbf.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_txbf_cal.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit_ds.c#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300desc.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300paprd.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300phy.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300radar.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300reg.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_ap121.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_aphrodite.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_cus157.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_generic.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_hb112.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_hb116.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_osprey_k31.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_wasp_2.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_wasp_k31.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_xb112.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_xb113.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9330_11.ini#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9330_12.ini#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9340.ini#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9485.ini#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9485_1_1.ini#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar955x.ini#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9580.ini#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/eeprom.diff#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/osprey_reg_map.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/osprey_reg_map_macro.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/poseidon_reg_map_macro.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/scorpion_reg_map.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/scorpion_reg_map_macro.h#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/sources#1 branch .. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/wasp_reg_map.h#1 branch .. //depot/projects/pci/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate .. //depot/projects/pci/sys/contrib/octeon-sdk/cvmx-app-init.h#3 integrate .. //depot/projects/pci/sys/contrib/octeon-sdk/cvmx-helper-board.c#4 integrate .. //depot/projects/pci/sys/contrib/octeon-sdk/cvmx-helper-sgmii.c#3 integrate .. //depot/projects/pci/sys/contrib/octeon-sdk/cvmx-mgmt-port.c#3 integrate .. //depot/projects/pci/sys/contrib/octeon-sdk/cvmx-mgmt-port.h#3 integrate .. //depot/projects/pci/sys/contrib/octeon-sdk/cvmx-pcie.c#4 integrate .. //depot/projects/pci/sys/contrib/octeon-sdk/cvmx-rtc.h#3 integrate .. //depot/projects/pci/sys/contrib/octeon-sdk/cvmx-usbd.c#3 integrate .. //depot/projects/pci/sys/crypto/aesni/aesni_wrap.c#4 integrate .. //depot/projects/pci/sys/dev/aac/aac.c#5 integrate .. //depot/projects/pci/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/pci/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/pci/sys/dev/aac/aac_pci.c#7 integrate .. //depot/projects/pci/sys/dev/aac/aac_tables.h#3 integrate .. //depot/projects/pci/sys/dev/aac/aacvar.h#4 integrate .. //depot/projects/pci/sys/dev/aacraid/aacraid.c#1 branch .. //depot/projects/pci/sys/dev/aacraid/aacraid_cam.c#1 branch .. //depot/projects/pci/sys/dev/aacraid/aacraid_debug.c#1 branch .. //depot/projects/pci/sys/dev/aacraid/aacraid_debug.h#1 branch .. //depot/projects/pci/sys/dev/aacraid/aacraid_linux.c#1 branch .. //depot/projects/pci/sys/dev/aacraid/aacraid_pci.c#1 branch .. //depot/projects/pci/sys/dev/aacraid/aacraid_reg.h#1 branch .. //depot/projects/pci/sys/dev/aacraid/aacraid_var.h#1 branch .. //depot/projects/pci/sys/dev/acpi_support/acpi_asus_wmi.c#2 integrate .. //depot/projects/pci/sys/dev/acpi_support/acpi_fujitsu.c#3 integrate .. //depot/projects/pci/sys/dev/acpi_support/acpi_hp.c#3 integrate .. //depot/projects/pci/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/pci/sys/dev/acpi_support/acpi_panasonic.c#3 integrate .. //depot/projects/pci/sys/dev/acpi_support/acpi_rapidstart.c#1 branch .. //depot/projects/pci/sys/dev/acpi_support/acpi_sony.c#3 integrate .. //depot/projects/pci/sys/dev/acpi_support/acpi_toshiba.c#3 integrate .. //depot/projects/pci/sys/dev/acpi_support/atk0110.c#4 integrate .. //depot/projects/pci/sys/dev/acpica/Osd/OsdSchedule.c#4 integrate .. //depot/projects/pci/sys/dev/acpica/Osd/OsdTable.c#4 integrate .. //depot/projects/pci/sys/dev/acpica/acpi.c#11 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_acad.c#3 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_button.c#3 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_cmbat.c#4 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_hpet.c#5 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_lid.c#3 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_pci.c#7 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_pcib.c#3 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#31 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_pcib_pci.c#5 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_perf.c#4 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_powerres.c#4 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_resource.c#9 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_smbat.c#4 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_thermal.c#6 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_throttle.c#3 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_timer.c#7 integrate .. //depot/projects/pci/sys/dev/adlink/adlink.c#3 integrate .. //depot/projects/pci/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/pci/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/pci/sys/dev/age/if_age.c#6 integrate .. //depot/projects/pci/sys/dev/age/if_agevar.h#3 integrate .. //depot/projects/pci/sys/dev/agp/agp.c#4 integrate .. //depot/projects/pci/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/pci/sys/dev/aha/aha.c#3 integrate .. //depot/projects/pci/sys/dev/ahb/ahb.c#3 integrate .. //depot/projects/pci/sys/dev/ahci/ahci.c#10 integrate .. //depot/projects/pci/sys/dev/ahci/ahci.h#7 integrate .. //depot/projects/pci/sys/dev/ahci/ahciem.c#2 integrate .. //depot/projects/pci/sys/dev/aic/aic.c#3 integrate .. //depot/projects/pci/sys/dev/aic7xxx/ahc_isa.c#3 integrate .. //depot/projects/pci/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/pci/sys/dev/aic7xxx/aic7xxx.h#3 integrate .. //depot/projects/pci/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/pci/sys/dev/altera/jtag_uart/altera_jtag_uart.h#2 integrate .. //depot/projects/pci/sys/dev/amdsbwd/amdsbwd.c#4 integrate .. //depot/projects/pci/sys/dev/amdtemp/amdtemp.c#4 integrate .. //depot/projects/pci/sys/dev/amr/amr_cam.c#4 integrate .. //depot/projects/pci/sys/dev/arcmsr/arcmsr.c#5 integrate .. //depot/projects/pci/sys/dev/arcmsr/arcmsr.h#4 integrate .. //depot/projects/pci/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/pci/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/pci/sys/dev/ata/ata-cbus.c#4 integrate .. //depot/projects/pci/sys/dev/ata/ata-disk.c#4 delete .. //depot/projects/pci/sys/dev/ata/ata-disk.h#4 delete .. //depot/projects/pci/sys/dev/ata/ata-dma.c#5 integrate .. //depot/projects/pci/sys/dev/ata/ata-isa.c#4 integrate .. //depot/projects/pci/sys/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/pci/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/pci/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/pci/sys/dev/ata/ata-queue.c#4 delete .. //depot/projects/pci/sys/dev/ata/ata-raid-ddf.h#3 delete .. //depot/projects/pci/sys/dev/ata/ata-raid.c#4 delete .. //depot/projects/pci/sys/dev/ata/ata-raid.h#4 delete .. //depot/projects/pci/sys/dev/ata/ata-sata.c#5 integrate .. //depot/projects/pci/sys/dev/ata/ata_if.m#4 integrate .. //depot/projects/pci/sys/dev/ata/atapi-cam.c#4 delete .. //depot/projects/pci/sys/dev/ata/atapi-cd.c#4 delete .. //depot/projects/pci/sys/dev/ata/atapi-cd.h#4 delete .. //depot/projects/pci/sys/dev/ata/atapi-fd.c#4 delete .. //depot/projects/pci/sys/dev/ata/atapi-fd.h#4 delete .. //depot/projects/pci/sys/dev/ata/atapi-tape.c#4 delete .. //depot/projects/pci/sys/dev/ata/atapi-tape.h#4 delete .. //depot/projects/pci/sys/dev/ata/chipsets/ata-acard.c#5 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-acerlabs.c#5 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-adaptec.c#4 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-ahci.c#6 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-amd.c#4 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-ati.c#4 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-cenatek.c#4 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-cypress.c#4 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-cyrix.c#4 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-fsl.c#1 branch .. //depot/projects/pci/sys/dev/ata/chipsets/ata-highpoint.c#4 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-intel.c#7 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-ite.c#4 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-jmicron.c#4 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-marvell.c#5 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-micron.c#4 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-national.c#4 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-netcell.c#4 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-nvidia.c#5 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-promise.c#5 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-serverworks.c#4 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-siliconimage.c#5 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-sis.c#4 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-via.c#4 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah.c#7 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah.h#10 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah_debug.h#5 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah_desc.h#7 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah_devid.h#6 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah_internal.h#8 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h#3 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h#3 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5210/ar5210.h#4 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#6 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#3 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5211/ar5211.h#4 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#6 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#3 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5211/boss.ini#3 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5212/ar5212.h#6 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#7 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#6 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416.h#8 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#9 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.c#2 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#6 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 28 15:34:56 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3E68AED; Fri, 28 Jun 2013 15:34:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A509BAEB for ; Fri, 28 Jun 2013 15:34:55 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 9600B12E6 for ; Fri, 28 Jun 2013 15:34:55 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5SFYtHw023274 for ; Fri, 28 Jun 2013 15:34:55 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5SFYtgL023271 for perforce@freebsd.org; Fri, 28 Jun 2013 15:34:55 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jun 2013 15:34:55 GMT Message-Id: <201306281534.r5SFYtgL023271@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 230266 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jun 2013 15:34:56 -0000 http://p4web.freebsd.org/@@230266?ac=10 Change 230266 by jhb@jhb_jhbbsd on 2013/06/28 15:34:53 Remove comment as this is now done if this patch works. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci_pci.c#35 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci_pci.c#35 (text+ko) ==== @@ -111,14 +111,6 @@ "Clear firmware-assigned resources for PCI-PCI bridge I/O windows."); /* - * NEW_PCIB todo: - * - properly handle the ISA enable bit. If it is set, we should change - * the behavior of the I/O window resource and rman to not allocate the - * blocked ranges (upper 768 bytes of each 1K in the first 64k of the - * I/O port address space). - */ - -/* * Is a resource from a child device sub-allocated from one of our * resource managers? */ From owner-p4-projects@FreeBSD.ORG Fri Jun 28 18:28:05 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D669DC; Fri, 28 Jun 2013 18:28:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2D8A2DA for ; Fri, 28 Jun 2013 18:28:05 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) by mx1.freebsd.org (Postfix) with ESMTP id 1C5F01DC7 for ; Fri, 28 Jun 2013 18:28:05 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5SIS5Qe046329 for ; Fri, 28 Jun 2013 18:28:05 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5SIS4dW046326 for perforce@freebsd.org; Fri, 28 Jun 2013 18:28:04 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jun 2013 18:28:04 GMT Message-Id: <201306281828.r5SIS4dW046326@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 230274 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jun 2013 18:28:05 -0000 http://p4web.freebsd.org/@@230274?ac=10 Change 230274 by jhb@jhb_jhbbsd on 2013/06/28 18:27:15 IFC @230272 Affected files ... .. //depot/projects/smpng/share/man/man9/locking.9#15 integrate .. //depot/projects/smpng/sys/amd64/include/acpica_machdep.h#9 integrate .. //depot/projects/smpng/sys/amd64/vmm/x86.c#4 integrate .. //depot/projects/smpng/sys/arm/arm/db_trace.c#24 integrate .. //depot/projects/smpng/sys/arm/arm/exception.S#12 integrate .. //depot/projects/smpng/sys/arm/include/asmacros.h#12 integrate .. //depot/projects/smpng/sys/arm/ti/am335x/am335x_lcd.c#2 integrate .. //depot/projects/smpng/sys/arm/ti/ti_scm.c#5 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#44 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#37 integrate .. //depot/projects/smpng/sys/cddl/dev/dtmalloc/dtmalloc.c#3 integrate .. //depot/projects/smpng/sys/conf/files#286 integrate .. //depot/projects/smpng/sys/conf/options#201 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#23 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/changes.txt#24 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmrestag.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtable.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtbdump.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtbinfo.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompile.c#23 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmessages.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltree.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslutils.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtfield.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtio.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dttable.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dttemplate.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtutils.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/preprocess.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/prscan.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/debugger/dbcmds.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/debugger/dbdisply.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/debugger/dbinput.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/debugger/dbnames.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/disassembler/dmopcode.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/events/evgpeinit.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/executer/exdump.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/namespace/nsdump.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/namespace/nsrepair2.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/namespace/nsxfname.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/resources/rsdump.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/resources/rsutils.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/tables/tbxfroot.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/utilities/uteval.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/components/utilities/utstring.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acdisasm.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpixf.h#24 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/actables.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/actypes.h#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acutils.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/platform/acfreebsd.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_radio.c#2 integrate .. //depot/projects/smpng/sys/dev/acpi_support/atk0110.c#5 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#40 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah.c#23 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_internal.h#26 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_ahb.c#8 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#131 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_main.c#14 integrate .. //depot/projects/smpng/sys/dev/isci/scil/sati_passthrough.c#3 integrate .. //depot/projects/smpng/sys/dev/nvme/nvme.h#4 integrate .. //depot/projects/smpng/sys/dev/nvme/nvme_ctrlr.c#4 integrate .. //depot/projects/smpng/sys/dev/nvme/nvme_private.h#4 integrate .. //depot/projects/smpng/sys/dev/nvme/nvme_qpair.c#4 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#134 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#30 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#100 integrate .. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#35 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#181 integrate .. //depot/projects/smpng/sys/dev/xen/blkfront/blkfront.c#19 integrate .. //depot/projects/smpng/sys/dev/xen/blkfront/block.h#9 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_extern.h#6 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#61 integrate .. //depot/projects/smpng/sys/i386/include/acpica_machdep.h#11 integrate .. //depot/projects/smpng/sys/ia64/include/acpica_machdep.h#8 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#79 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#147 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#105 integrate .. //depot/projects/smpng/sys/kern/subr_vmem.c#1 branch .. //depot/projects/smpng/sys/kern/vfs_bio.c#147 integrate .. //depot/projects/smpng/sys/mips/conf/AR933X_BASE#2 integrate .. //depot/projects/smpng/sys/mips/conf/AR933X_BASE.hints#2 integrate .. //depot/projects/smpng/sys/mips/conf/CARAMBOLA2.hints#2 integrate .. //depot/projects/smpng/sys/sys/bus.h#53 integrate .. //depot/projects/smpng/sys/sys/malloc.h#33 integrate .. //depot/projects/smpng/sys/sys/vmem.h#1 branch .. //depot/projects/smpng/sys/vm/uma.h#34 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#98 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#42 integrate .. //depot/projects/smpng/sys/vm/vm.h#22 integrate .. //depot/projects/smpng/sys/vm/vm_init.c#22 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#57 integrate .. //depot/projects/smpng/sys/vm/vm_kern.h#10 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#130 integrate .. //depot/projects/smpng/sys/vm/vm_pager.c#35 integrate .. //depot/projects/smpng/sys/vm/vm_pager.h#24 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/locking.9#15 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/locking.9 250912 2013-05-22 16:33:28Z emaste $ +.\" $FreeBSD: head/share/man/man9/locking.9 252346 2013-06-28 16:33:45Z jhb $ .\" .Dd May 22, 2013 .Dt LOCKING 9 @@ -315,9 +315,9 @@ .It It is an error to do any operation that could result in unbounded sleep while holding any primitive from the 'bounded sleep' group. -For example, it is an error to try to acquire shared/exclusive lock while -holding mutex, or to try to allocate memory with M_WAITOK while holding a -read-write lock. +For example, it is an error to try to acquire a shared/exclusive lock while +holding a mutex, or to try to allocate memory with M_WAITOK while holding a +reader/writer lock. .Pp Note that the lock passed to one of the .Fn sleep ==== //depot/projects/smpng/sys/amd64/include/acpica_machdep.h#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/include/acpica_machdep.h 197439 2009-09-23 15:42:35Z jhb $ + * $FreeBSD: head/sys/amd64/include/acpica_machdep.h 252280 2013-06-27 00:22:40Z jkim $ */ /****************************************************************************** @@ -69,16 +69,12 @@ (Acq) = acpi_release_global_lock(&((GLptr)->GlobalLock)); \ } while (0) -#endif /* _KERNEL */ - -#define ACPI_MACHINE_WIDTH 64 -#define COMPILER_DEPENDENT_INT64 long -#define COMPILER_DEPENDENT_UINT64 unsigned long - void acpi_SetDefaultIntrModel(int model); void acpi_cpu_c1(void); void *acpi_map_table(vm_paddr_t pa, const char *sig); void acpi_unmap_table(void *table); vm_paddr_t acpi_find_table(const char *sig); +#endif /* _KERNEL */ + #endif /* __ACPICA_MACHDEP_H__ */ ==== //depot/projects/smpng/sys/amd64/vmm/x86.c#4 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/x86.c 249324 2013-04-10 05:59:07Z neel $ + * $FreeBSD: head/sys/amd64/vmm/x86.c 252335 2013-06-28 06:05:33Z grehan $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/x86.c 249324 2013-04-10 05:59:07Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/x86.c 252335 2013-06-28 06:05:33Z grehan $"); #include #include @@ -45,7 +45,9 @@ #define CPUID_VM_HIGH 0x40000000 -static const char bhyve_id[12] = "BHyVE BHyVE "; +static const char bhyve_id[12] = "bhyve bhyve "; + +static uint64_t bhyve_xcpuids; int x86_emulate_cpuid(struct vm *vm, int vcpu_id, @@ -77,15 +79,13 @@ * no multi-core or SMT. */ switch (func) { + /* + * Pass these through to the guest + */ case CPUID_0000_0000: case CPUID_0000_0002: case CPUID_0000_0003: - case CPUID_0000_000A: - cpuid_count(*eax, *ecx, regs); - break; - case CPUID_8000_0000: - case CPUID_8000_0001: case CPUID_8000_0002: case CPUID_8000_0003: case CPUID_8000_0004: @@ -94,6 +94,15 @@ cpuid_count(*eax, *ecx, regs); break; + case CPUID_8000_0001: + /* + * Hide rdtscp/ia32_tsc_aux until we know how + * to deal with them. + */ + cpuid_count(*eax, *ecx, regs); + regs[3] &= ~AMDID_RDTSCP; + break; + case CPUID_8000_0007: cpuid_count(*eax, *ecx, regs); /* @@ -150,6 +159,11 @@ */ regs[2] &= ~CPUID2_MON; + /* + * Hide the performance and debug features. + */ + regs[2] &= ~CPUID2_PDCM; + /* * Hide thermal monitoring */ @@ -161,6 +175,11 @@ */ regs[3] &= ~(CPUID_MCA | CPUID_MCE | CPUID_MTRR); + /* + * Hide the debug store capability. + */ + regs[3] &= ~CPUID_DS; + /* * Disable multi-core. */ @@ -180,6 +199,7 @@ case CPUID_0000_0006: case CPUID_0000_0007: + case CPUID_0000_000A: /* * Handle the access, but report 0 for * all options @@ -203,17 +223,25 @@ case 0x40000000: regs[0] = CPUID_VM_HIGH; bcopy(bhyve_id, ®s[1], 4); - bcopy(bhyve_id, ®s[2], 4); - bcopy(bhyve_id, ®s[3], 4); + bcopy(bhyve_id + 4, ®s[2], 4); + bcopy(bhyve_id + 8, ®s[3], 4); break; + default: - /* XXX: Leaf 5? */ - return (0); + /* + * The leaf value has already been clamped so + * simply pass this through, keeping count of + * how many unhandled leaf values have been seen. + */ + atomic_add_long(&bhyve_xcpuids, 1); + cpuid_count(*eax, *ecx, regs); + break; } *eax = regs[0]; *ebx = regs[1]; *ecx = regs[2]; *edx = regs[3]; + return (1); } ==== //depot/projects/smpng/sys/arm/arm/db_trace.c#24 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/db_trace.c 250254 2013-05-04 20:02:34Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/db_trace.c 252320 2013-06-27 22:26:56Z andrew $"); #include #include @@ -108,6 +108,7 @@ #define INSN_VSP_REG 0x90 #define INSN_POP_COUNT 0xa0 #define INSN_FINISH 0xb0 +#define INSN_POP_REGS 0xb1 #define INSN_VSP_LARGE_INC 0xb2 /* An item in the exception index table */ @@ -268,6 +269,24 @@ /* Stop processing */ state->entries = 0; + } else if ((insn == INSN_POP_REGS)) { + unsigned int mask, reg; + + mask = db_unwind_exec_read_byte(state); + if (mask == 0 || (mask & 0xf0) != 0) + return 1; + + /* Update SP */ + update_vsp = 1; + + /* Load the registers */ + for (reg = 0; mask && reg < 4; mask >>= 1, reg++) { + if (mask & 1) { + state->registers[reg] = *vsp++; + state->update_mask |= 1 << reg; + } + } + } else if ((insn & INSN_VSP_LARGE_INC_MASK) == INSN_VSP_LARGE_INC) { unsigned int uleb128; ==== //depot/projects/smpng/sys/arm/arm/exception.S#12 (text+ko) ==== @@ -51,7 +51,7 @@ #include #include #include -__FBSDID("$FreeBSD: head/sys/arm/arm/exception.S 250253 2013-05-04 19:59:35Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/exception.S 252311 2013-06-27 18:54:18Z andrew $"); .text .align 0 @@ -206,7 +206,7 @@ */ ASENTRY_NP(exception_exit) - STOP_UNWINDING + UNWINDSVCFRAME DO_AST PULLFRAMEFROMSVCANDEXIT END(exception_exit) ==== //depot/projects/smpng/sys/arm/include/asmacros.h#12 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/arm/include/asmacros.h 239268 2012-08-15 03:03:03Z gonzo $ + * $FreeBSD: head/sys/arm/include/asmacros.h 252311 2013-06-27 18:54:18Z andrew $ */ #ifndef _MACHINE_ASMACROS_H_ @@ -206,7 +206,16 @@ mov r0, r0; /* NOP for previous instruction */ \ add sp, sp, #(4*15); /* Adjust the stack pointer */ \ ldmia sp, {sp, lr, pc}^ /* Restore lr and exit */ -#endif +#endif +#if defined(__ARM_EABI__) +#define UNWINDSVCFRAME \ + .save {r13-r15}; /* Restore sp, lr, pc */ \ + .pad #(2*4); /* Skip user sp and lr */ \ + .save {r0-r12}; /* Restore r0-r12 */ \ + .pad #(4) /* Skip spsr */ +#else +#define UNWINDSVCFRAME +#endif #define DATA(name) \ .data ; \ ==== //depot/projects/smpng/sys/arm/ti/am335x/am335x_lcd.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/ti/am335x/am335x_lcd.c 251018 2013-05-27 00:23:01Z gonzo $"); +__FBSDID("$FreeBSD: head/sys/arm/ti/am335x/am335x_lcd.c 252282 2013-06-27 00:33:08Z gonzo $"); #include #include @@ -42,6 +42,10 @@ #include #include +/* syscons bits */ +#include +#include + #include #include @@ -49,6 +53,9 @@ #include #include +#include +#include + #include #include @@ -395,12 +402,19 @@ static int am335x_lcd_probe(device_t dev) { + int err; + if (!ofw_bus_is_compatible(dev, "ti,am335x-lcd")) return (ENXIO); device_set_desc(dev, "AM335x LCD controller"); - return (0); + err = sc_probe_unit(device_get_unit(dev), + device_get_flags(dev) | SC_AUTODETECT_KBD); + if (err != 0) + return (err); + + return (BUS_PROBE_DEFAULT); } static int @@ -480,7 +494,7 @@ goto fail; err = bus_dmamem_alloc(sc->sc_dma_tag, (void **)&sc->sc_fb_base, - 0, &sc->sc_dma_map); + BUS_DMA_COHERENT, &sc->sc_dma_map); if (err) { device_printf(dev, "cannot allocate framebuffer\n"); @@ -631,6 +645,14 @@ PWM_PERIOD, PWM_PERIOD) == 0) sc->sc_backlight = 100; + err = (sc_attach_unit(device_get_unit(dev), + device_get_flags(dev) | SC_AUTODETECT_KBD)); + + if (err) { + device_printf(dev, "failed to attach syscons\n"); + goto fail; + } + am335x_lcd_syscons_setup((vm_offset_t)sc->sc_fb_base, sc->sc_fb_phys, &panel); return (0); ==== //depot/projects/smpng/sys/arm/ti/ti_scm.c#5 (text+ko) ==== @@ -46,7 +46,7 @@ * */ #include -__FBSDID("$FreeBSD: head/sys/arm/ti/ti_scm.c 245672 2013-01-19 17:12:23Z kientzle $"); +__FBSDID("$FreeBSD: head/sys/arm/ti/ti_scm.c 252229 2013-06-26 02:56:54Z rpaulo $"); #include #include @@ -163,7 +163,9 @@ /* set the mux mode */ reg_val |= (uint16_t)(mode & ti_scm_dev.padconf_muxmode_mask); - printf("setting internal %x for %s\n", reg_val, muxmode); + if (bootverbose) + device_printf(sc->sc_dev, "setting internal %x for %s\n", + reg_val, muxmode); /* write the register value (16-bit writes) */ ti_scm_write_2(sc, padconf->reg_off, reg_val); ==== //depot/projects/smpng/sys/cam/scsi/scsi_all.c#44 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_all.c 252204 2013-06-25 10:50:17Z mav $"); +__FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_all.c 252250 2013-06-26 09:56:33Z mav $"); #include #include @@ -796,9 +796,9 @@ { SST(0x0B, 0x8C, SS_RDEF, "12V Voltage Warning") }, { SST(0x0C, 0xFF, SS_RDEF, - "Write Error – Too many error recovery revs") }, + "Write Error - Too many error recovery revs") }, { SST(0x11, 0xFF, SS_RDEF, - "Unrecovered Read Error – Too many error recovery revs") }, + "Unrecovered Read Error - Too many error recovery revs") }, { SST(0x19, 0x0E, SS_RDEF, "Fewer than 1/2 defect list copies") }, { SST(0x20, 0xF3, SS_RDEF, @@ -812,15 +812,15 @@ { SST(0x24, 0xF3, SS_RDEF, "Drive formatted without plist") }, { SST(0x26, 0x95, SS_RDEF, - "Invalid Field Parameter – CAP File") }, + "Invalid Field Parameter - CAP File") }, { SST(0x26, 0x96, SS_RDEF, - "Invalid Field Parameter – RAP File") }, + "Invalid Field Parameter - RAP File") }, { SST(0x26, 0x97, SS_RDEF, - "Invalid Field Parameter – TMS Firmware Tag") }, + "Invalid Field Parameter - TMS Firmware Tag") }, { SST(0x26, 0x98, SS_RDEF, - "Invalid Field Parameter – Check Sum") }, + "Invalid Field Parameter - Check Sum") }, { SST(0x26, 0x99, SS_RDEF, - "Invalid Field Parameter – Firmware Tag") }, + "Invalid Field Parameter - Firmware Tag") }, { SST(0x29, 0x08, SS_RDEF, "Write Log Dump data") }, { SST(0x29, 0x09, SS_RDEF, @@ -834,7 +834,7 @@ { SST(0x31, 0x91, SS_RDEF, "Format Corrupted World Wide Name (WWN) is Invalid") }, { SST(0x32, 0x03, SS_RDEF, - "Defect List – Length exceeds Command Allocated Length") }, + "Defect List - Length exceeds Command Allocated Length") }, { SST(0x33, 0x00, SS_RDEF, "Flash not ready for access") }, { SST(0x3F, 0x70, SS_RDEF, ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c#3 (text+ko) ==== @@ -129,9 +129,6 @@ if (pair != NULL) return (fnvpair_value_int32(pair)); - if (nvlist_empty(dsda->dsda_successful_snaps)) - return (SET_ERROR(ENOENT)); - return (0); } ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c#3 (text+ko) ==== @@ -126,10 +126,6 @@ } } - /* Return ENOENT if no holds would be created. */ - if (nvlist_empty(dduha->dduha_chkholds)) - return (SET_ERROR(ENOENT)); - return (0); } @@ -468,10 +464,6 @@ } } - /* Return ENOENT if none of the holds existed. */ - if (nvlist_empty(ddura->ddura_chkholds)) - return (SET_ERROR(ENOENT)); - return (0); } ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#37 (text+ko) ==== @@ -345,10 +345,13 @@ vm_page_sleep(pp, "zfsmwb"); continue; } - } else { + } else if (pp == NULL) { pp = vm_page_alloc(obj, OFF_TO_IDX(start), VM_ALLOC_SYSTEM | VM_ALLOC_IFCACHED | VM_ALLOC_NOBUSY); + } else { + ASSERT(pp != NULL && !pp->valid); + pp = NULL; } if (pp != NULL) { ==== //depot/projects/smpng/sys/cddl/dev/dtmalloc/dtmalloc.c#3 (text+ko) ==== @@ -20,7 +20,7 @@ * * Portions Copyright 2006-2008 John Birrell jb@freebsd.org * - * $FreeBSD: head/sys/cddl/dev/dtmalloc/dtmalloc.c 179237 2008-05-23 05:59:42Z jb $ + * $FreeBSD: head/sys/cddl/dev/dtmalloc/dtmalloc.c 252325 2013-06-28 03:14:40Z markj $ * */ @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -111,8 +112,17 @@ { char name[DTRACE_FUNCNAMELEN]; struct malloc_type_internal *mtip = mtp->ks_handle; + int i; + /* + * malloc_type descriptions are allowed to contain whitespace, but + * DTrace probe identifiers are not, so replace the whitespace with + * underscores. + */ strlcpy(name, mtp->ks_shortdesc, sizeof(name)); + for (i = 0; name[i] != 0; i++) + if (isspace(name[i])) + name[i] = '_'; if (dtrace_probe_lookup(dtmalloc_id, NULL, name, "malloc") != 0) return; ==== //depot/projects/smpng/sys/conf/files#286 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/conf/files 252064 2013-06-21 18:16:54Z gonzo $ +# $FreeBSD: head/sys/conf/files 252330 2013-06-28 03:51:20Z jeff $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2797,6 +2797,7 @@ kern/subr_turnstile.c standard kern/subr_uio.c standard kern/subr_unit.c standard +kern/subr_vmem.c standard kern/subr_witness.c optional witness kern/sys_capability.c standard kern/sys_generic.c standard ==== //depot/projects/smpng/sys/conf/options#201 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/conf/options 250963 2013-05-24 09:22:43Z achim $ +# $FreeBSD: head/sys/conf/options 252240 2013-06-26 05:01:50Z adrian $ # # On the handling of kernel options # @@ -785,6 +785,10 @@ # XXX when actually targetting AR9130. AH_SUPPORT_AR9130 opt_ah.h +# This is required for AR933x SoC support +AH_SUPPORT_AR9330 opt_ah.h +AH_SUPPORT_AR9340 opt_ah.h + AH_DEBUG opt_ah.h AH_ASSERT opt_ah.h AH_DEBUG_ALQ opt_ah.h ==== //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#23 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: head/sys/contrib/dev/acpica/acpica_prep.sh 250838 2013-05-20 23:52:49Z jkim $ +# $FreeBSD: head/sys/contrib/dev/acpica/acpica_prep.sh 252279 2013-06-27 00:16:54Z jkim $ # # Unpack an ACPI CA drop and restructure it to fit the FreeBSD layout # @@ -20,8 +20,8 @@ stripdirs="generate libraries tests tools" stripfiles="Makefile README accygwin.h acefi.h achaiku.h acintel.h \ aclinux.h acmacosx.h acmsvc.h acnetbsd.h acos2.h acwin.h \ - acwin64.h new_table.txt oslinuxtbl.c osunixdir.c oswindir.c \ - oswintbl.c oswinxf.c readme.txt utclib.c" + acwin64.h new_table.txt osfreebsdtbl.c oslinuxtbl.c osunixdir.c \ + oswindir.c oswintbl.c oswinxf.c readme.txt utclib.c" # include files to canonify src_headers="acapps.h acbuffer.h accommon.h acconfig.h acdebug.h \ ==== //depot/projects/smpng/sys/contrib/dev/acpica/changes.txt#24 (text+ko) ==== @@ -1,4 +1,60 @@ ---------------------------------------- +26 June 2013. Summary of changes for version 20130626: + +1) ACPICA kernel-resident subsystem: + +Fixed an issue with runtime repair of the _CST object. Null or invalid +elements were not always removed properly. Lv Zheng. + +Removed an arbitrary restriction of 256 GPEs per GPE block (such as the +FADT-defined GPE0 and GPE1). For GPE0, GPE1, and each GPE Block Device, +the maximum number of GPEs is 1016. Use of multiple GPE block devices +makes the system-wide number of GPEs essentially unlimited. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. + + Current Release: + Non-Debug Version: 95.9K Code, 26.9K Data, 122.8K Total + Debug Version: 184.1K Code, 76.7K Data, 260.8K Total + Previous Release: + Non-Debug Version: 96.0K Code, 27.0K Data, 123.0K Total + Debug Version: 184.1K Code, 76.8K Data, 260.9K Total + + +2) iASL Compiler/Disassembler and Tools: + +Portable AcpiDump: Implemented full support for the Linux and FreeBSD +hosts. Now supports Linux, FreeBSD, and Windows. + +Disassembler: Added some missing types for the HEST and EINJ tables: "Set +Error Type With Address", "CMCI", "MCE", and "Flush Cacheline". + +iASL/Preprocessor: Implemented full support for nested +#if/#else/#elif/#endif blocks. Allows arbitrary depth of nested blocks. + +Disassembler: Expanded maximum output string length to 64K. Was 256 bytes +max. The original purpose of this constraint was to limit the amount of +debug output. However, the string function in question (UtPrintString) is +now used for the disassembler also, where 256 bytes is insufficient. +Reported by RehabMan@GitHub. + +iASL/DataTables: Fixed some problems and issues with compilation of DMAR +tables. ACPICA BZ 999. Lv Zheng. + +iASL: Fixed a couple of error exit issues that could result in a "Could +not delete " message during ASL compilation. + +AcpiDump: Allow "FADT" and "MADT" as valid table signatures, even though +the actual signatures for these tables are "FACP" and "APIC", +respectively. + +AcpiDump: Added support for multiple UEFI tables. Only SSDT and UEFI +tables are allowed to have multiple instances. + +---------------------------------------- 17 May 2013. Summary of changes for version 20130517: 1) ACPICA kernel-resident subsystem: ==== //depot/projects/smpng/sys/contrib/dev/acpica/common/dmrestag.c#13 (text+ko) ==== @@ -666,6 +666,7 @@ Status = AcpiNsBuildExternalPath (BufferNode, RequiredSize, Pathname); if (ACPI_FAILURE (Status)) { + ACPI_FREE (Pathname); return (NULL); } ==== //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtable.c#16 (text+ko) ==== @@ -100,6 +100,7 @@ "Execute Operation", "Check Busy Status", "Get Command Status", + "Set Error Type With Address", "Unknown Action" }; @@ -110,6 +111,7 @@ "Write Register", "Write Register Value", "Noop", + "Flush Cacheline", "Unknown Instruction" }; @@ -180,6 +182,8 @@ "Local Interrupt", "SCI", "NMI", + "CMCI", /* ACPI 5.0 */ + "MCE", /* ACPI 5.0 */ "Unknown Notify Type" /* Reserved */ }; @@ -744,6 +748,11 @@ ByteLength = 8; break; + case ACPI_DMT_BUF10: + + ByteLength = 10; + break; + case ACPI_DMT_BUF16: case ACPI_DMT_UUID: @@ -862,6 +871,7 @@ break; case ACPI_DMT_BUF7: + case ACPI_DMT_BUF10: case ACPI_DMT_BUF16: case ACPI_DMT_BUF128: /* ==== //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtbdump.c#14 (text+ko) ==== @@ -872,6 +872,7 @@ { return; } + AcpiOsPrintf ("\n"); switch (SubTable->Type) { @@ -924,6 +925,7 @@ { return; } + AcpiOsPrintf ("\n"); /* Dump the PCI Path entries for this device scope */ @@ -941,6 +943,7 @@ PathOffset += 2; PciPath += 2; + AcpiOsPrintf ("\n"); } /* Point to next device scope entry */ ==== //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtbinfo.c#14 (text+ko) ==== @@ -780,6 +780,7 @@ { {ACPI_DMT_UINT8, ACPI_DMAR_OFFSET (Width), "Host Address Width", 0}, {ACPI_DMT_UINT8, ACPI_DMAR_OFFSET (Flags), "Flags", 0}, + {ACPI_DMT_BUF10, ACPI_DMAR_OFFSET (Reserved[0]), "Reserved", 0}, ACPI_DMT_TERMINATOR }; ==== //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompile.c#23 (text+ko) ==== @@ -966,7 +966,19 @@ /* Close all open files */ - Gbl_Files[ASL_FILE_PREPROCESSOR].Handle = NULL; /* the .i file is same as source file */ + /* + * Take care with the preprocessor file (.i), it might be the same + * as the "input" file, depending on where the compiler has terminated + * or aborted. Prevent attempt to close the same file twice in + * loop below. + */ + if (Gbl_Files[ASL_FILE_PREPROCESSOR].Handle == + Gbl_Files[ASL_FILE_INPUT].Handle) + { + Gbl_Files[ASL_FILE_PREPROCESSOR].Handle = NULL; + } + + /* Close the standard I/O files */ for (i = ASL_FILE_INPUT; i < ASL_MAX_FILE_TYPE; i++) { ==== //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmessages.h#12 (text+ko) ==== @@ -248,7 +248,7 @@ ASL_MSG_TOO_MANY_ARGUMENTS, ASL_MSG_UNKNOWN_DIRECTIVE, ASL_MSG_UNKNOWN_PRAGMA, - + ASL_MSG_WARNING_DIRECTIVE, /* These messages are used by the data table compiler only */ @@ -433,6 +433,7 @@ /* ASL_MSG_TOO_MANY_ARGUMENTS */ "Too many macro arguments", /* ASL_MSG_UNKNOWN_DIRECTIVE */ "Unknown directive", /* ASL_MSG_UNKNOWN_PRAGMA */ "Unknown pragma", +/* ASL_MSG_WARNING_DIRECTIVE */ "#warning", /* Table compiler */ ==== //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltree.c#15 (text+ko) ==== @@ -823,6 +823,7 @@ { AslError (ASL_WARNING, ASL_MSG_COMPILER_INTERNAL, Child, "Child node list invalid"); + va_end(ap); return (Op); } @@ -869,8 +870,8 @@ } PrevChild = Child; } + va_end(ap); - DbgPrint (ASL_PARSE_OUTPUT, "\n\n"); return (Op); } ==== //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslutils.c#19 (text+ko) ==== @@ -353,8 +353,6 @@ va_list Args; - va_start (Args, Fmt); - if (!Gbl_DebugFlag) { return; @@ -366,6 +364,7 @@ return; } + va_start (Args, Fmt); (void) vfprintf (stderr, Fmt, Args); va_end (Args); return; ==== //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtfield.c#8 (text+ko) ==== @@ -467,12 +467,13 @@ if (ACPI_FAILURE (Status)) { DtError (ASL_ERROR, ASL_MSG_BUFFER_ELEMENT, Field, MsgBuffer); - return (ByteLength - Count); + goto Exit; } Buffer[i] = (UINT8) Value; } +Exit: ACPI_FREE (StringValue); return (ByteLength - Count); } ==== //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtio.c#11 (text+ko) ==== @@ -287,31 +287,21 @@ while (Start < Colon) { - if (*Start == ' ') + if (*Start == '[') { - Start++; - continue; - } + /* Found left bracket, go to the right bracket */ - /* Found left bracket, go to the right bracket */ - - if (*Start == '[') - { while (Start < Colon && *Start != ']') { Start++; } - - if (Start == Colon) - { - break; - } - - Start++; - continue; + } + else if (*Start != ' ') + { + break; } - break; + Start++; } >>> TRUNCATED FOR MAIL (1000 lines) <<<