From owner-svn-src-user@FreeBSD.ORG Sun Feb 22 17:57:36 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 364601065670; Sun, 22 Feb 2009 17:57:36 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 256638FC13; Sun, 22 Feb 2009 17:57:36 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1MHvaIb002484; Sun, 22 Feb 2009 17:57:36 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1MHvaoV002483; Sun, 22 Feb 2009 17:57:36 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <200902221757.n1MHvaoV002483@svn.freebsd.org> From: Alan Cox Date: Sun, 22 Feb 2009 17:57:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188920 - user/alc/pagelock/sys/vm X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Feb 2009 17:57:36 -0000 Author: alc Date: Sun Feb 22 17:57:35 2009 New Revision: 188920 URL: http://svn.freebsd.org/changeset/base/188920 Log: Maintain the lock on the object containing the page being mapped. Modified: user/alc/pagelock/sys/vm/vm_fault.c Modified: user/alc/pagelock/sys/vm/vm_fault.c ============================================================================== --- user/alc/pagelock/sys/vm/vm_fault.c Sun Feb 22 15:03:29 2009 (r188919) +++ user/alc/pagelock/sys/vm/vm_fault.c Sun Feb 22 17:57:35 2009 (r188920) @@ -1210,7 +1210,6 @@ vm_fault_copy_entry(dst_map, src_map, ds pmap_copy_page(src_m, dst_m); VM_OBJECT_UNLOCK(object); dst_m->valid = VM_PAGE_BITS_ALL; - VM_OBJECT_UNLOCK(dst_object); /* * Enter it in the pmap as a read and/or execute access. @@ -1221,7 +1220,6 @@ vm_fault_copy_entry(dst_map, src_map, ds /* * Mark it no longer busy, and put it on the active list. */ - VM_OBJECT_LOCK(dst_object); vm_page_lock_queues(); vm_page_activate(dst_m); vm_page_unlock_queues(); From owner-svn-src-user@FreeBSD.ORG Sun Feb 22 19:59:42 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 72204106566B; Sun, 22 Feb 2009 19:59:42 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5DEC48FC13; Sun, 22 Feb 2009 19:59:42 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1MJxgr4005186; Sun, 22 Feb 2009 19:59:42 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1MJxfWL005170; Sun, 22 Feb 2009 19:59:41 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <200902221959.n1MJxfWL005170@svn.freebsd.org> From: Alan Cox Date: Sun, 22 Feb 2009 19:59:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188930 - in user/alc/pagelock/sys: . amd64/amd64 conf dev/ata dev/ata/chipsets dev/md dev/usb2/controller fs/tmpfs i386/i386 net80211 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Feb 2009 19:59:42 -0000 Author: alc Date: Sun Feb 22 19:59:41 2009 New Revision: 188930 URL: http://svn.freebsd.org/changeset/base/188930 Log: Merge r188902 through r188929. Modified: user/alc/pagelock/sys/ (props changed) user/alc/pagelock/sys/amd64/amd64/local_apic.c user/alc/pagelock/sys/conf/kern.mk user/alc/pagelock/sys/dev/ata/ata-all.c user/alc/pagelock/sys/dev/ata/ata-all.h user/alc/pagelock/sys/dev/ata/ata-pci.h user/alc/pagelock/sys/dev/ata/ata-sata.c user/alc/pagelock/sys/dev/ata/chipsets/ata-ahci.c user/alc/pagelock/sys/dev/ata/chipsets/ata-promise.c user/alc/pagelock/sys/dev/ata/chipsets/ata-siliconimage.c user/alc/pagelock/sys/dev/md/md.c user/alc/pagelock/sys/dev/usb2/controller/usb2_bus.h user/alc/pagelock/sys/dev/usb2/controller/usb2_controller.c user/alc/pagelock/sys/fs/tmpfs/tmpfs_vnops.c user/alc/pagelock/sys/i386/i386/local_apic.c user/alc/pagelock/sys/net80211/ieee80211_scan.c user/alc/pagelock/sys/net80211/ieee80211_tdma.c Modified: user/alc/pagelock/sys/amd64/amd64/local_apic.c ============================================================================== --- user/alc/pagelock/sys/amd64/amd64/local_apic.c Sun Feb 22 19:50:09 2009 (r188929) +++ user/alc/pagelock/sys/amd64/amd64/local_apic.c Sun Feb 22 19:59:41 2009 (r188930) @@ -900,7 +900,13 @@ apic_disable_vector(u_int apic_id, u_int KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry")); KASSERT(ioint_handlers[vector / 32] != NULL, ("No ISR handler for vector %u", vector)); +#ifdef notyet + /* + * We can not currently clear the idt entry because other cpus + * may have a valid vector at this offset. + */ setidt(vector, &IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0); +#endif } /* Release an APIC vector when it's no longer in use. */ @@ -924,9 +930,11 @@ apic_free_vector(u_int apic_id, u_int ve if (sched_is_bound(td)) panic("apic_free_vector: Thread already bound.\n"); sched_bind(td, apic_cpuid(apic_id)); + thread_unlock(td); mtx_lock_spin(&icu_lock); lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = 0; mtx_unlock_spin(&icu_lock); + thread_lock(td); sched_unbind(td); thread_unlock(td); Modified: user/alc/pagelock/sys/conf/kern.mk ============================================================================== --- user/alc/pagelock/sys/conf/kern.mk Sun Feb 22 19:50:09 2009 (r188929) +++ user/alc/pagelock/sys/conf/kern.mk Sun Feb 22 19:59:41 2009 (r188930) @@ -78,9 +78,10 @@ INLINE_LIMIT?= 8000 # # For PowerPC we tell gcc to use floating point emulation. This avoids using # floating point registers for integer operations which it has a tendency to do. +# Also explicitly disable Altivec instructions inside the kernel. # .if ${MACHINE_ARCH} == "powerpc" -CFLAGS+= -msoft-float +CFLAGS+= -msoft-float -mno-altivec INLINE_LIMIT?= 15000 .endif Modified: user/alc/pagelock/sys/dev/ata/ata-all.c ============================================================================== --- user/alc/pagelock/sys/dev/ata/ata-all.c Sun Feb 22 19:50:09 2009 (r188929) +++ user/alc/pagelock/sys/dev/ata/ata-all.c Sun Feb 22 19:59:41 2009 (r188930) @@ -62,6 +62,7 @@ static struct cdevsw ata_cdevsw = { /* prototypes */ static void ata_boot_attach(void); static device_t ata_add_child(device_t, struct ata_device *, int); +static void ata_conn_event(void *, int); static void bswap(int8_t *, int); static void btrim(int8_t *, int); static void bpack(int8_t *, int8_t *, int); @@ -127,6 +128,7 @@ ata_attach(device_t dev) bzero(&ch->queue_mtx, sizeof(struct mtx)); mtx_init(&ch->queue_mtx, "ATA queue lock", NULL, MTX_DEF); TAILQ_INIT(&ch->ata_queue); + TASK_INIT(&ch->conntask, 0, ata_conn_event, dev); /* reset the controller HW, the channel and device(s) */ while (ATA_LOCKING(dev, ATA_LF_LOCK) != ch->unit) @@ -181,6 +183,7 @@ ata_detach(device_t dev) device_delete_child(dev, children[i]); free(children, M_TEMP); } + taskqueue_drain(taskqueue_thread, &ch->conntask); /* release resources */ bus_teardown_intr(dev, ch->r_irq, ch->ih); @@ -196,6 +199,14 @@ ata_detach(device_t dev) return 0; } +static void +ata_conn_event(void *context, int dummy) +{ + device_t dev = (device_t)context; + + ata_reinit(dev); +} + int ata_reinit(device_t dev) { @@ -217,6 +228,11 @@ ata_reinit(device_t dev) /* catch eventual request in ch->running */ mtx_lock(&ch->state_mtx); + if (ch->state & ATA_STALL_QUEUE) { + /* Recursive reinits and reinits during detach prohobited. */ + mtx_unlock(&ch->state_mtx); + return (ENXIO); + } if ((request = ch->running)) callout_stop(&request->callout); ch->running = NULL; @@ -274,6 +290,9 @@ ata_reinit(device_t dev) mtx_unlock(&ch->state_mtx); ATA_LOCKING(dev, ATA_LF_UNLOCK); + /* Add new children. */ + ata_identify(dev); + if (bootverbose) device_printf(dev, "reinit done ..\n"); @@ -684,14 +703,27 @@ ata_identify(device_t dev) { struct ata_channel *ch = device_get_softc(dev); struct ata_device *atadev; + device_t *children; device_t child; - int i; + int nchildren, i, n = ch->devices; if (bootverbose) - device_printf(dev, "identify ch->devices=%08x\n", ch->devices); + device_printf(dev, "Identifying devices: %08x\n", ch->devices); + mtx_lock(&Giant); + /* Skip existing devices. */ + if (!device_get_children(dev, &children, &nchildren)) { + for (i = 0; i < nchildren; i++) { + if (children[i] && (atadev = device_get_softc(children[i]))) + n &= ~((ATA_ATA_MASTER | ATA_ATAPI_MASTER) << atadev->unit); + } + free(children, M_TEMP); + } + /* Create new devices. */ + if (bootverbose) + device_printf(dev, "New devices: %08x\n", n); for (i = 0; i < ATA_PM; ++i) { - if (ch->devices & (((ATA_ATA_MASTER | ATA_ATAPI_MASTER) << i))) { + if (n & (((ATA_ATA_MASTER | ATA_ATAPI_MASTER) << i))) { int unit = -1; if (!(atadev = malloc(sizeof(struct ata_device), @@ -701,7 +733,7 @@ ata_identify(device_t dev) } atadev->unit = i; #ifdef ATA_STATIC_ID - if (ch->devices & ((ATA_ATA_MASTER << i))) + if (n & (ATA_ATA_MASTER << i)) unit = (device_get_unit(dev) << 1) + i; #endif if ((child = ata_add_child(dev, atadev, unit))) { @@ -716,6 +748,7 @@ ata_identify(device_t dev) } bus_generic_probe(dev); bus_generic_attach(dev); + mtx_unlock(&Giant); return 0; } @@ -899,8 +932,7 @@ ata_atapi(device_t dev) struct ata_channel *ch = device_get_softc(device_get_parent(dev)); struct ata_device *atadev = device_get_softc(dev); - return ((atadev->unit == ATA_MASTER && ch->devices & ATA_ATAPI_MASTER) || - (atadev->unit == ATA_SLAVE && ch->devices & ATA_ATAPI_SLAVE)); + return (ch->devices & (ATA_ATAPI_MASTER << atadev->unit)); } int Modified: user/alc/pagelock/sys/dev/ata/ata-all.h ============================================================================== --- user/alc/pagelock/sys/dev/ata/ata-all.h Sun Feb 22 19:50:09 2009 (r188929) +++ user/alc/pagelock/sys/dev/ata/ata-all.h Sun Feb 22 19:59:41 2009 (r188930) @@ -530,6 +530,7 @@ struct ata_channel { TAILQ_HEAD(, ata_request) ata_queue; /* head of ATA queue */ struct ata_request *freezepoint; /* composite freezepoint */ struct ata_request *running; /* currently running request */ + struct task conntask; /* PHY events handling task */ }; /* disk bay/enclosure related */ Modified: user/alc/pagelock/sys/dev/ata/ata-pci.h ============================================================================== --- user/alc/pagelock/sys/dev/ata/ata-pci.h Sun Feb 22 19:50:09 2009 (r188929) +++ user/alc/pagelock/sys/dev/ata/ata-pci.h Sun Feb 22 19:59:41 2009 (r188930) @@ -66,15 +66,6 @@ struct ata_pci_controller { } interrupt[8]; /* XXX SOS max ch# for now */ }; -/* structure for SATA connection update hotplug/hotswap support */ -struct ata_connect_task { - struct task task; - device_t dev; - int action; -#define ATA_C_ATTACH 1 -#define ATA_C_DETACH 2 -}; - /* defines for known chipset PCI id's */ #define ATA_ACARD_ID 0x1191 #define ATA_ATP850 0x00021191 @@ -451,7 +442,6 @@ int ata_check_80pin(device_t dev, int mo int ata_mode2idx(int mode); /* global prototypes ata-sata.c */ -void ata_sata_phy_event(void *context, int dummy); void ata_sata_phy_check_events(device_t dev); int ata_sata_phy_reset(device_t dev); void ata_sata_setmode(device_t dev, int mode); Modified: user/alc/pagelock/sys/dev/ata/ata-sata.c ============================================================================== --- user/alc/pagelock/sys/dev/ata/ata-sata.c Sun Feb 22 19:50:09 2009 (r188929) +++ user/alc/pagelock/sys/dev/ata/ata-sata.c Sun Feb 22 19:59:41 2009 (r188930) @@ -50,41 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include -/* - * SATA support functions - */ -void -ata_sata_phy_event(void *context, int dummy) -{ - struct ata_connect_task *tp = (struct ata_connect_task *)context; - struct ata_channel *ch = device_get_softc(tp->dev); - device_t *children; - int nchildren, i; - - mtx_lock(&Giant); /* newbus suckage it needs Giant */ - if (tp->action == ATA_C_ATTACH) { - if (bootverbose) - device_printf(tp->dev, "CONNECTED\n"); - ATA_RESET(tp->dev); - ata_identify(tp->dev); - } - if (tp->action == ATA_C_DETACH) { - if (!device_get_children(tp->dev, &children, &nchildren)) { - for (i = 0; i < nchildren; i++) - if (children[i]) - device_delete_child(tp->dev, children[i]); - free(children, M_TEMP); - } - mtx_lock(&ch->state_mtx); - ch->state = ATA_IDLE; - mtx_unlock(&ch->state_mtx); - if (bootverbose) - device_printf(tp->dev, "DISCONNECTED\n"); - } - mtx_unlock(&Giant); /* suckage code dealt with, release Giant */ - free(tp, M_ATA); -} - void ata_sata_phy_check_events(device_t dev) { @@ -94,32 +59,17 @@ ata_sata_phy_check_events(device_t dev) /* clear error bits/interrupt */ ATA_IDX_OUTL(ch, ATA_SERROR, error); - /* do we have any events flagged ? */ - if (error) { - struct ata_connect_task *tp; - u_int32_t status = ATA_IDX_INL(ch, ATA_SSTATUS); - - /* if we have a connection event deal with it */ - if ((error & ATA_SE_PHY_CHANGED) && - (tp = (struct ata_connect_task *) - malloc(sizeof(struct ata_connect_task), - M_ATA, M_NOWAIT | M_ZERO))) { - + /* if we have a connection event deal with it */ + if (error & ATA_SE_PHY_CHANGED) { + if (bootverbose) { + u_int32_t status = ATA_IDX_INL(ch, ATA_SSTATUS); if (((status & ATA_SS_CONWELL_MASK) == ATA_SS_CONWELL_GEN1) || ((status & ATA_SS_CONWELL_MASK) == ATA_SS_CONWELL_GEN2)) { - if (bootverbose) device_printf(dev, "CONNECT requested\n"); - tp->action = ATA_C_ATTACH; - } - else { - if (bootverbose) + } else device_printf(dev, "DISCONNECT requested\n"); - tp->action = ATA_C_DETACH; - } - tp->dev = dev; - TASK_INIT(&tp->task, 0, ata_sata_phy_event, tp); - taskqueue_enqueue(taskqueue_thread, &tp->task); } + taskqueue_enqueue(taskqueue_thread, &ch->conntask); } } @@ -345,11 +295,11 @@ ata_pm_identify(device_t dev) device_printf(dev, "p%d: SIGNATURE=%08x\n", port, signature); /* figure out whats there */ - switch (signature) { - case 0x00000101: + switch (signature >> 16) { + case 0x0000: ch->devices |= (ATA_ATA_MASTER << port); continue; - case 0xeb140101: + case 0xeb14: ch->devices |= (ATA_ATAPI_MASTER << port); continue; } Modified: user/alc/pagelock/sys/dev/ata/chipsets/ata-ahci.c ============================================================================== --- user/alc/pagelock/sys/dev/ata/chipsets/ata-ahci.c Sun Feb 22 19:50:09 2009 (r188929) +++ user/alc/pagelock/sys/dev/ata/chipsets/ata-ahci.c Sun Feb 22 19:59:41 2009 (r188930) @@ -486,11 +486,13 @@ ata_ahci_issue_cmd(device_t dev, u_int16 ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_IS + offset, ATA_INL(ctlr->r_res2, ATA_AHCI_P_IS + offset)); - if (bootverbose) - device_printf(dev, "ahci_issue_cmd time=%dms cnt=%dms status=%08x\n", - timeout, count, status); - if (timeout && (count >= timeout)) + if (timeout && (count >= timeout)) { + if (bootverbose) { + device_printf(dev, "ahci_issue_cmd timeout: %d of %dms, status=%08x\n", + count, timeout, status); + } return EIO; + } return 0; } @@ -624,7 +626,7 @@ ata_ahci_start(device_t dev) } static int -ata_ahci_wait_ready(device_t dev) +ata_ahci_wait_ready(device_t dev, int t) { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); @@ -634,8 +636,8 @@ ata_ahci_wait_ready(device_t dev) while (ATA_INL(ctlr->r_res2, ATA_AHCI_P_TFD + offset) & (ATA_S_BUSY | ATA_S_DRQ)) { DELAY(1000); - if (timeout++ > 1000) { - device_printf(dev, "port is not ready\n"); + if (timeout++ > t) { + device_printf(dev, "port is not ready (timeout %dms)\n", t); return (-1); } } @@ -653,6 +655,9 @@ ata_ahci_softreset(device_t dev, int por struct ata_ahci_cmd_tab *ctp = (struct ata_ahci_cmd_tab *)(ch->dma.work + ATA_AHCI_CT_OFFSET); + if (bootverbose) + device_printf(dev, "software reset port %d...\n", port); + /* kick controller into sane state */ ata_ahci_stop(dev); ata_ahci_clo(dev); @@ -665,9 +670,10 @@ ata_ahci_softreset(device_t dev, int por //ctp->cfis[7] = ATA_D_LBA | ATA_D_IBM; ctp->cfis[15] = (ATA_A_4BIT | ATA_A_RESET); - if (ata_ahci_issue_cmd(dev, ATA_AHCI_CMD_RESET | ATA_AHCI_CMD_CLR_BUSY,100)) - device_printf(dev, "setting SRST failed ??\n"); - //return -1; + if (ata_ahci_issue_cmd(dev, ATA_AHCI_CMD_RESET | ATA_AHCI_CMD_CLR_BUSY,100)) { + device_printf(dev, "software reset set timeout\n"); + return (-1); + } ata_udelay(50); @@ -680,8 +686,10 @@ ata_ahci_softreset(device_t dev, int por if (ata_ahci_issue_cmd(dev, 0, 0)) return -1; - if (ata_ahci_wait_ready(dev)) + if (ata_ahci_wait_ready(dev, 1000)) { + device_printf(dev, "software reset clear timeout\n"); return (-1); + } return ATA_INL(ctlr->r_res2, ATA_AHCI_P_SIG + offset); } @@ -695,6 +703,9 @@ ata_ahci_reset(device_t dev) u_int32_t signature; int offset = ch->unit << 7; + if (bootverbose) + device_printf(dev, "AHCI reset...\n"); + /* Disable port interrupts */ ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_IE + offset, 0); @@ -718,7 +729,7 @@ ata_ahci_reset(device_t dev) if (!ata_sata_phy_reset(dev)) { if (bootverbose) - device_printf(dev, "phy reset found no device\n"); + device_printf(dev, "AHCI reset done: phy reset found no device\n"); ch->devices = 0; /* enable wanted port interrupts */ @@ -738,7 +749,7 @@ ata_ahci_reset(device_t dev) ATA_AHCI_P_IX_PS | ATA_AHCI_P_IX_DHR)); /* Wait for initial TFD from device. */ - ata_ahci_wait_ready(dev); + ata_ahci_wait_ready(dev, 10000); /* only probe for PortMultiplier if HW has support */ if (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_CAP_SPM) { @@ -754,24 +765,24 @@ ata_ahci_reset(device_t dev) if (bootverbose) device_printf(dev, "SIGNATURE: %08x\n", signature); - switch (signature) { - case 0x00000101: + switch (signature >> 16) { + case 0x0000: ch->devices = ATA_ATA_MASTER; break; - case 0x96690101: + case 0x9669: ch->devices = ATA_PORTMULTIPLIER; ata_pm_identify(dev); break; - case 0xeb140101: + case 0xeb14: ch->devices = ATA_ATAPI_MASTER; break; default: /* SOS XXX */ if (bootverbose) - device_printf(dev, "No signature, asuming disk device\n"); + device_printf(dev, "Unknown signature, asuming disk device\n"); ch->devices = ATA_ATA_MASTER; } if (bootverbose) - device_printf(dev, "ahci_reset devices=%08x\n", ch->devices); + device_printf(dev, "AHCI reset done: devices=%08x\n", ch->devices); } static void Modified: user/alc/pagelock/sys/dev/ata/chipsets/ata-promise.c ============================================================================== --- user/alc/pagelock/sys/dev/ata/chipsets/ata-promise.c Sun Feb 22 19:50:09 2009 (r188929) +++ user/alc/pagelock/sys/dev/ata/chipsets/ata-promise.c Sun Feb 22 19:59:41 2009 (r188930) @@ -637,7 +637,6 @@ ata_promise_mio_status(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); - struct ata_connect_task *tp; u_int32_t fake_reg, stat_reg, vector, status; switch (ctlr->chip->cfg2) { @@ -663,31 +662,17 @@ ata_promise_mio_status(device_t dev) ATA_OUTL(ctlr->r_res2, stat_reg, status & (0x00000011 << ch->unit)); /* check for and handle disconnect events */ - if ((status & (0x00000001 << ch->unit)) && - (tp = (struct ata_connect_task *) - malloc(sizeof(struct ata_connect_task), - M_ATA, M_NOWAIT | M_ZERO))) { - + if (status & (0x00000001 << ch->unit)) { if (bootverbose) device_printf(dev, "DISCONNECT requested\n"); - tp->action = ATA_C_DETACH; - tp->dev = dev; - TASK_INIT(&tp->task, 0, ata_sata_phy_event, tp); - taskqueue_enqueue(taskqueue_thread, &tp->task); + taskqueue_enqueue(taskqueue_thread, &ch->conntask); } /* check for and handle connect events */ - if ((status & (0x00000010 << ch->unit)) && - (tp = (struct ata_connect_task *) - malloc(sizeof(struct ata_connect_task), - M_ATA, M_NOWAIT | M_ZERO))) { - + if (status & (0x00000010 << ch->unit)) { if (bootverbose) device_printf(dev, "CONNECT requested\n"); - tp->action = ATA_C_ATTACH; - tp->dev = dev; - TASK_INIT(&tp->task, 0, ata_sata_phy_event, tp); - taskqueue_enqueue(taskqueue_thread, &tp->task); + taskqueue_enqueue(taskqueue_thread, &ch->conntask); } /* do we have any device action ? */ @@ -823,15 +808,15 @@ ata_promise_mio_reset(device_t dev) if (1 | bootverbose) device_printf(dev, "SIGNATURE: %08x\n", signature); - switch (signature) { - case 0x00000101: + switch (signature >> 16) { + case 0x0000: ch->devices = ATA_ATA_MASTER; break; - case 0x96690101: + case 0x9669: ch->devices = ATA_PORTMULTIPLIER; ata_pm_identify(dev); break; - case 0xeb140101: + case 0xeb14: ch->devices = ATA_ATAPI_MASTER; break; default: /* SOS XXX */ Modified: user/alc/pagelock/sys/dev/ata/chipsets/ata-siliconimage.c ============================================================================== --- user/alc/pagelock/sys/dev/ata/chipsets/ata-siliconimage.c Sun Feb 22 19:50:09 2009 (r188929) +++ user/alc/pagelock/sys/dev/ata/chipsets/ata-siliconimage.c Sun Feb 22 19:59:41 2009 (r188930) @@ -849,17 +849,17 @@ ata_siiprb_reset(device_t dev) device_printf(dev, "SIGNATURE=%08x\n", signature); /* figure out whats there */ - switch (signature) { - case 0x00000101: + switch (signature >> 16) { + case 0x0000: ch->devices = ATA_ATA_MASTER; break; - case 0x96690101: + case 0x9669: ch->devices = ATA_PORTMULTIPLIER; ATA_OUTL(ctlr->r_res2, 0x1000 + offset, 0x2000); /* enable PM support */ //SOS XXX need to clear all PM status and interrupts!!!! ata_pm_identify(dev); break; - case 0xeb140101: + case 0xeb14: ch->devices = ATA_ATAPI_MASTER; break; default: Modified: user/alc/pagelock/sys/dev/md/md.c ============================================================================== --- user/alc/pagelock/sys/dev/md/md.c Sun Feb 22 19:50:09 2009 (r188929) +++ user/alc/pagelock/sys/dev/md/md.c Sun Feb 22 19:59:41 2009 (r188930) @@ -629,9 +629,7 @@ mdstart_swap(struct md_s *sc, struct bio if (rv == VM_PAGER_ERROR) { sf_buf_free(sf); sched_unpin(); - vm_page_lock_queues(); vm_page_wakeup(m); - vm_page_unlock_queues(); break; } bcopy((void *)(sf_buf_kva(sf) + offs), p, len); @@ -641,9 +639,7 @@ mdstart_swap(struct md_s *sc, struct bio if (rv == VM_PAGER_ERROR) { sf_buf_free(sf); sched_unpin(); - vm_page_lock_queues(); vm_page_wakeup(m); - vm_page_unlock_queues(); break; } bcopy(p, (void *)(sf_buf_kva(sf) + offs), len); @@ -655,9 +651,7 @@ mdstart_swap(struct md_s *sc, struct bio if (rv == VM_PAGER_ERROR) { sf_buf_free(sf); sched_unpin(); - vm_page_lock_queues(); vm_page_wakeup(m); - vm_page_unlock_queues(); break; } bzero((void *)(sf_buf_kva(sf) + offs), len); @@ -667,8 +661,8 @@ mdstart_swap(struct md_s *sc, struct bio } sf_buf_free(sf); sched_unpin(); - vm_page_lock_queues(); vm_page_wakeup(m); + vm_page_lock_queues(); vm_page_activate(m); if (bp->bio_cmd == BIO_WRITE) vm_page_dirty(m); Modified: user/alc/pagelock/sys/dev/usb2/controller/usb2_bus.h ============================================================================== --- user/alc/pagelock/sys/dev/usb2/controller/usb2_bus.h Sun Feb 22 19:50:09 2009 (r188929) +++ user/alc/pagelock/sys/dev/usb2/controller/usb2_bus.h Sun Feb 22 19:59:41 2009 (r188930) @@ -53,6 +53,7 @@ struct usb2_bus { struct usb2_bus_stat stats_ok; struct usb2_process explore_proc; struct usb2_process roothub_proc; + struct root_hold_token *bus_roothold; /* * There are two callback processes. One for Giant locked * callbacks. One for non-Giant locked callbacks. This should Modified: user/alc/pagelock/sys/dev/usb2/controller/usb2_controller.c ============================================================================== --- user/alc/pagelock/sys/dev/usb2/controller/usb2_controller.c Sun Feb 22 19:50:09 2009 (r188929) +++ user/alc/pagelock/sys/dev/usb2/controller/usb2_controller.c Sun Feb 22 19:59:41 2009 (r188930) @@ -126,6 +126,10 @@ usb2_attach(device_t dev) DPRINTFN(0, "USB device has no ivars\n"); return (ENXIO); } + + /* delay vfs_mountroot until the bus is explored */ + bus->bus_roothold = root_mount_hold(device_get_nameunit(dev)); + if (usb2_post_init_called) { mtx_lock(&Giant); usb2_attach_sub(dev, bus); @@ -153,6 +157,10 @@ usb2_detach(device_t dev) usb2_callout_drain(&bus->power_wdog); /* Let the USB explore process detach all devices. */ + if (bus->bus_roothold != NULL) { + root_mount_rel(bus->bus_roothold); + bus->bus_roothold = NULL; + } USB_BUS_LOCK(bus); if (usb2_proc_msignal(&bus->explore_proc, @@ -225,6 +233,10 @@ usb2_bus_explore(struct usb2_proc_msg *p USB_BUS_LOCK(bus); } + if (bus->bus_roothold != NULL) { + root_mount_rel(bus->bus_roothold); + bus->bus_roothold = NULL; + } } /*------------------------------------------------------------------------* Modified: user/alc/pagelock/sys/fs/tmpfs/tmpfs_vnops.c ============================================================================== --- user/alc/pagelock/sys/fs/tmpfs/tmpfs_vnops.c Sun Feb 22 19:50:09 2009 (r188929) +++ user/alc/pagelock/sys/fs/tmpfs/tmpfs_vnops.c Sun Feb 22 19:59:41 2009 (r188930) @@ -52,8 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include + #include #include @@ -436,10 +435,9 @@ tmpfs_mappedread(vm_object_t vobj, vm_ob { vm_pindex_t idx; vm_page_t m; - struct sf_buf *sf; - off_t offset, addr; + vm_offset_t offset; + off_t addr; size_t tlen; - caddr_t va; int error; addr = uio->uio_offset; @@ -458,12 +456,7 @@ lookupvpg: goto lookupvpg; vm_page_busy(m); VM_OBJECT_UNLOCK(vobj); - sched_pin(); - sf = sf_buf_alloc(m, SFB_CPUPRIVATE); - va = (caddr_t)sf_buf_kva(sf); - error = uiomove(va + offset, tlen, uio); - sf_buf_free(sf); - sched_unpin(); + error = uiomove_fromphys(&m, offset, tlen, uio); VM_OBJECT_LOCK(vobj); vm_page_wakeup(m); VM_OBJECT_UNLOCK(vobj); @@ -487,17 +480,11 @@ nocache: vm_page_zero_invalid(m, TRUE); } VM_OBJECT_UNLOCK(tobj); - sched_pin(); - sf = sf_buf_alloc(m, SFB_CPUPRIVATE); - va = (caddr_t)sf_buf_kva(sf); - error = uiomove(va + offset, tlen, uio); - sf_buf_free(sf); - sched_unpin(); + error = uiomove_fromphys(&m, offset, tlen, uio); VM_OBJECT_LOCK(tobj); out: vm_page_lock_queues(); - vm_page_unwire(m, 0); - vm_page_activate(m); + vm_page_unwire(m, TRUE); vm_page_unlock_queues(); vm_page_wakeup(m); vm_object_pip_subtract(tobj, 1); @@ -558,10 +545,9 @@ tmpfs_mappedwrite(vm_object_t vobj, vm_o { vm_pindex_t idx; vm_page_t vpg, tpg; - struct sf_buf *sf; - off_t offset, addr; + vm_offset_t offset; + off_t addr; size_t tlen; - caddr_t va; int error; error = 0; @@ -587,12 +573,7 @@ lookupvpg: vm_page_undirty(vpg); vm_page_unlock_queues(); VM_OBJECT_UNLOCK(vobj); - sched_pin(); - sf = sf_buf_alloc(vpg, SFB_CPUPRIVATE); - va = (caddr_t)sf_buf_kva(sf); - error = uiomove(va + offset, tlen, uio); - sf_buf_free(sf); - sched_unpin(); + error = uiomove_fromphys(&vpg, offset, tlen, uio); } else { VM_OBJECT_UNLOCK(vobj); vpg = NULL; @@ -614,14 +595,9 @@ nocache: vm_page_zero_invalid(tpg, TRUE); } VM_OBJECT_UNLOCK(tobj); - if (vpg == NULL) { - sched_pin(); - sf = sf_buf_alloc(tpg, SFB_CPUPRIVATE); - va = (caddr_t)sf_buf_kva(sf); - error = uiomove(va + offset, tlen, uio); - sf_buf_free(sf); - sched_unpin(); - } else { + if (vpg == NULL) + error = uiomove_fromphys(&tpg, offset, tlen, uio); + else { KASSERT(vpg->valid == VM_PAGE_BITS_ALL, ("parts of vpg invalid")); pmap_copy_page(vpg, tpg); } @@ -635,8 +611,7 @@ out: vm_page_zero_invalid(tpg, TRUE); vm_page_dirty(tpg); } - vm_page_unwire(tpg, 0); - vm_page_activate(tpg); + vm_page_unwire(tpg, TRUE); vm_page_unlock_queues(); vm_page_wakeup(tpg); if (vpg != NULL) Modified: user/alc/pagelock/sys/i386/i386/local_apic.c ============================================================================== --- user/alc/pagelock/sys/i386/i386/local_apic.c Sun Feb 22 19:50:09 2009 (r188929) +++ user/alc/pagelock/sys/i386/i386/local_apic.c Sun Feb 22 19:59:41 2009 (r188930) @@ -903,8 +903,14 @@ apic_disable_vector(u_int apic_id, u_int KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry")); KASSERT(ioint_handlers[vector / 32] != NULL, ("No ISR handler for vector %u", vector)); +#ifdef notyet + /* + * We can not currently clear the idt entry because other cpus + * may have a valid vector at this offset. + */ setidt(vector, &IDTVEC(rsvd), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); +#endif } /* Release an APIC vector when it's no longer in use. */ @@ -928,9 +934,11 @@ apic_free_vector(u_int apic_id, u_int ve if (sched_is_bound(td)) panic("apic_free_vector: Thread already bound.\n"); sched_bind(td, apic_cpuid(apic_id)); + thread_unlock(td); mtx_lock_spin(&icu_lock); lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = 0; mtx_unlock_spin(&icu_lock); + thread_lock(td); sched_unbind(td); thread_unlock(td); Modified: user/alc/pagelock/sys/net80211/ieee80211_scan.c ============================================================================== --- user/alc/pagelock/sys/net80211/ieee80211_scan.c Sun Feb 22 19:50:09 2009 (r188929) +++ user/alc/pagelock/sys/net80211/ieee80211_scan.c Sun Feb 22 19:59:41 2009 (r188930) @@ -346,7 +346,8 @@ scan_dump(struct ieee80211_scan_state *s if_printf(vap->iv_ifp, "scan set "); ieee80211_scan_dump_channels(ss); - printf(" dwell min %lu max %lu\n", ss->ss_mindwell, ss->ss_maxdwell); + printf(" dwell min %lums max %lums\n", + ticks_to_msecs(ss->ss_mindwell), ticks_to_msecs(ss->ss_maxdwell)); } #endif /* IEEE80211_DEBUG */ @@ -919,7 +920,7 @@ again: maxdwell = ss->ss_maxdwell; IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, - "%s: chan %3d%c -> %3d%c [%s, dwell min %lu max %lu]\n", + "%s: chan %3d%c -> %3d%c [%s, dwell min %lums max %lums]\n", __func__, ieee80211_chan2ieee(ic, ic->ic_curchan), channel_type(ic->ic_curchan), @@ -927,7 +928,7 @@ again: (ss->ss_flags & IEEE80211_SCAN_ACTIVE) && (chan->ic_flags & IEEE80211_CHAN_PASSIVE) == 0 ? "active" : "passive", - ss->ss_mindwell, maxdwell); + ticks_to_msecs(ss->ss_mindwell), ticks_to_msecs(maxdwell)); /* * Potentially change channel and phy mode. Modified: user/alc/pagelock/sys/net80211/ieee80211_tdma.c ============================================================================== --- user/alc/pagelock/sys/net80211/ieee80211_tdma.c Sun Feb 22 19:50:09 2009 (r188929) +++ user/alc/pagelock/sys/net80211/ieee80211_tdma.c Sun Feb 22 19:59:41 2009 (r188930) @@ -240,11 +240,14 @@ tdma_newstate(struct ieee80211vap *vap, if (status == 0 && nstate == IEEE80211_S_RUN && ostate != IEEE80211_S_RUN && (vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS) && - ts->tdma_slot != 0) { + ts->tdma_slot != 0 && + vap->iv_des_chan == IEEE80211_CHAN_ANYC) { /* * Start s/w beacon miss timer for slave devices w/o - * hardware support. The 2x is a fudge for our doing - * this in software. + * hardware support. Note we do this only if we're + * not locked to a channel (i.e. roam to follow the + * master). The 2x is a fudge for our doing this in + * software. */ vap->iv_swbmiss_period = IEEE80211_TU_TO_TICKS( 2 * vap->iv_bmissthreshold * ts->tdma_bintval * From owner-svn-src-user@FreeBSD.ORG Sun Feb 22 20:11:10 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5AB31106566C; Sun, 22 Feb 2009 20:11:10 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 490DC8FC1A; Sun, 22 Feb 2009 20:11:10 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1MKBA8V005435; Sun, 22 Feb 2009 20:11:10 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1MKBA3i005434; Sun, 22 Feb 2009 20:11:10 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <200902222011.n1MKBA3i005434@svn.freebsd.org> From: Alan Cox Date: Sun, 22 Feb 2009 20:11:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188931 - user/alc/pagelock/sys/fs/tmpfs X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Feb 2009 20:11:10 -0000 Author: alc Date: Sun Feb 22 20:11:10 2009 New Revision: 188931 URL: http://svn.freebsd.org/changeset/base/188931 Log: Eliminate unnecessary page queues locking. Modified: user/alc/pagelock/sys/fs/tmpfs/tmpfs_vnops.c Modified: user/alc/pagelock/sys/fs/tmpfs/tmpfs_vnops.c ============================================================================== --- user/alc/pagelock/sys/fs/tmpfs/tmpfs_vnops.c Sun Feb 22 19:59:41 2009 (r188930) +++ user/alc/pagelock/sys/fs/tmpfs/tmpfs_vnops.c Sun Feb 22 20:11:10 2009 (r188931) @@ -569,9 +569,7 @@ lookupvpg: if (vm_page_sleep_if_busy(vpg, FALSE, "tmfsmw")) goto lookupvpg; vm_page_busy(vpg); - vm_page_lock_queues(); vm_page_undirty(vpg); - vm_page_unlock_queues(); VM_OBJECT_UNLOCK(vobj); error = uiomove_fromphys(&vpg, offset, tlen, uio); } else { @@ -605,12 +603,12 @@ nocache: out: if (vobj != NULL) VM_OBJECT_LOCK(vobj); - vm_page_lock_queues(); if (error == 0) { vm_page_set_validclean(tpg, offset, tlen); vm_page_zero_invalid(tpg, TRUE); vm_page_dirty(tpg); } + vm_page_lock_queues(); vm_page_unwire(tpg, TRUE); vm_page_unlock_queues(); vm_page_wakeup(tpg); From owner-svn-src-user@FreeBSD.ORG Mon Feb 23 06:47:10 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF9E7106564A; Mon, 23 Feb 2009 06:47:10 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B3A5D8FC13; Mon, 23 Feb 2009 06:47:10 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1N6lA3k017109; Mon, 23 Feb 2009 06:47:10 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1N6lAqD017107; Mon, 23 Feb 2009 06:47:10 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <200902230647.n1N6lAqD017107@svn.freebsd.org> From: Alan Cox Date: Mon, 23 Feb 2009 06:47:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188933 - in user/alc/pagelock/sys: . amd64/amd64 i386/i386 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Feb 2009 06:47:11 -0000 Author: alc Date: Mon Feb 23 06:47:10 2009 New Revision: 188933 URL: http://svn.freebsd.org/changeset/base/188933 Log: Merge r188930 through r188932. Modified: user/alc/pagelock/sys/ (props changed) user/alc/pagelock/sys/amd64/amd64/pmap.c user/alc/pagelock/sys/i386/i386/pmap.c Modified: user/alc/pagelock/sys/amd64/amd64/pmap.c ============================================================================== --- user/alc/pagelock/sys/amd64/amd64/pmap.c Mon Feb 23 06:00:24 2009 (r188932) +++ user/alc/pagelock/sys/amd64/amd64/pmap.c Mon Feb 23 06:47:10 2009 (r188933) @@ -1936,15 +1936,15 @@ free_pv_entry(pmap_t pmap, pv_entry_t pv pc->pc_map[field] |= 1ul << bit; /* move to head of list */ TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); - TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); if (pc->pc_map[0] != PC_FREE0 || pc->pc_map[1] != PC_FREE1 || - pc->pc_map[2] != PC_FREE2) + pc->pc_map[2] != PC_FREE2) { + TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); return; + } PV_STAT(pv_entry_spare -= _NPCPV); PV_STAT(pc_chunk_count--); PV_STAT(pc_chunk_frees++); /* entire chunk is free, return it */ - TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); dump_drop_page(m->phys_addr); m->wire_count--; Modified: user/alc/pagelock/sys/i386/i386/pmap.c ============================================================================== --- user/alc/pagelock/sys/i386/i386/pmap.c Mon Feb 23 06:00:24 2009 (r188932) +++ user/alc/pagelock/sys/i386/i386/pmap.c Mon Feb 23 06:47:10 2009 (r188933) @@ -1975,15 +1975,15 @@ free_pv_entry(pmap_t pmap, pv_entry_t pv pc->pc_map[field] |= 1ul << bit; /* move to head of list */ TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); - TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); for (idx = 0; idx < _NPCM; idx++) - if (pc->pc_map[idx] != pc_freemask[idx]) + if (pc->pc_map[idx] != pc_freemask[idx]) { + TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); return; + } PV_STAT(pv_entry_spare -= _NPCPV); PV_STAT(pc_chunk_count--); PV_STAT(pc_chunk_frees++); /* entire chunk is free, return it */ - TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(pmap_kextract((vm_offset_t)pc)); pmap_qremove((vm_offset_t)pc, 1); vm_page_unwire(m, 0); From owner-svn-src-user@FreeBSD.ORG Tue Feb 24 10:48:16 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 019701065687; Tue, 24 Feb 2009 10:48:16 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E3F118FC14; Tue, 24 Feb 2009 10:48:15 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1OAmFLN063357; Tue, 24 Feb 2009 10:48:15 GMT (envelope-from dfr@svn.freebsd.org) Received: (from dfr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1OAmFZP063356; Tue, 24 Feb 2009 10:48:15 GMT (envelope-from dfr@svn.freebsd.org) Message-Id: <200902241048.n1OAmFZP063356@svn.freebsd.org> From: Doug Rabson Date: Tue, 24 Feb 2009 10:48:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188991 - user/dfr/xenhvm/7/sys/dev/xen/netfront X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Feb 2009 10:48:16 -0000 Author: dfr Date: Tue Feb 24 10:48:15 2009 New Revision: 188991 URL: http://svn.freebsd.org/changeset/base/188991 Log: Enable LRO. Modified: user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c Modified: user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c ============================================================================== --- user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c Tue Feb 24 08:15:44 2009 (r188990) +++ user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c Tue Feb 24 10:48:15 2009 (r188991) @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -47,6 +48,10 @@ __FBSDID("$FreeBSD$"); #include #include #include +#if __FreeBSD_version >= 700000 +#include +#include +#endif #include #include @@ -83,6 +88,15 @@ __FBSDID("$FreeBSD$"); #define NET_TX_RING_SIZE __RING_SIZE((netif_tx_sring_t *)0, PAGE_SIZE) #define NET_RX_RING_SIZE __RING_SIZE((netif_rx_sring_t *)0, PAGE_SIZE) +/* + * Should the driver do LRO on the RX end + * this can be toggled on the fly, but the + * interface must be reset (down/up) for it + * to take effect. + */ +static int xn_enable_lro = 1; +TUNABLE_INT("hw.xn.enable_lro", &xn_enable_lro); + #ifdef CONFIG_XEN static int MODPARM_rx_copy = 0; module_param_named(rx_copy, MODPARM_rx_copy, bool, 0); @@ -196,6 +210,9 @@ struct net_device_stats struct netfront_info { struct ifnet *xn_ifp; +#if __FreeBSD_version >= 700000 + struct lro_ctrl xn_lro; +#endif struct net_device_stats stats; u_int tx_full; @@ -399,6 +416,11 @@ netfront_attach(device_t dev) return err; } + SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, "enable_lro", CTLTYPE_INT|CTLFLAG_RW, + &xn_enable_lro, 0, "Large Receive Offload"); + return 0; } @@ -847,6 +869,10 @@ static void xn_rxeof(struct netfront_info *np) { struct ifnet *ifp; +#if __FreeBSD_version >= 700000 + struct lro_ctrl *lro = &np->xn_lro; + struct lro_entry *queued; +#endif struct netfront_rx_info rinfo; struct netif_rx_response *rx = &rinfo.rx; struct netif_extra_info *extras = rinfo.extras; @@ -941,13 +967,34 @@ xn_rxeof(struct netfront_info *np) * Do we really need to drop the rx lock? */ XN_RX_UNLOCK(np); - /* Pass it up. */ +#if __FreeBSD_version >= 700000 + /* Use LRO if possible */ + if (lro->lro_cnt == 0 || tcp_lro_rx(lro, m, 0)) { + /* + * If LRO fails, pass up to the stack + * directly. + */ + (*ifp->if_input)(ifp, m); + } +#else (*ifp->if_input)(ifp, m); +#endif XN_RX_LOCK(np); } np->rx.rsp_cons = i; +#if __FreeBSD_version >= 700000 + /* + * Flush any outstanding LRO work + */ + while (!SLIST_EMPTY(&lro->lro_active)) { + queued = SLIST_FIRST(&lro->lro_active); + SLIST_REMOVE_HEAD(&lro->lro_active, next); + tcp_lro_flush(lro, queued); + } +#endif + #if 0 /* If we get a callback with very few responses, reduce fill target. */ /* NB. Note exponential increase, linear decrease. */ @@ -1788,6 +1835,15 @@ create_netdev(device_t dev) ifp->if_capabilities = IFCAP_HWCSUM; #if __FreeBSD_version >= 700000 ifp->if_capabilities |= IFCAP_TSO4; + if (xn_enable_lro) { + int err = tcp_lro_init(&np->xn_lro); + if (err) { + device_printf(dev, "LRO initialization failed\n"); + goto exit; + } + np->xn_lro.ifp = ifp; + ifp->if_capabilities |= IFCAP_LRO; + } #endif ifp->if_capenable = ifp->if_capabilities; From owner-svn-src-user@FreeBSD.ORG Tue Feb 24 16:17:30 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2CD7D1065672; Tue, 24 Feb 2009 16:17:30 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 01F178FC1B; Tue, 24 Feb 2009 16:17:30 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1OGHTBP069918; Tue, 24 Feb 2009 16:17:29 GMT (envelope-from dfr@svn.freebsd.org) Received: (from dfr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1OGHTUb069917; Tue, 24 Feb 2009 16:17:29 GMT (envelope-from dfr@svn.freebsd.org) Message-Id: <200902241617.n1OGHTUb069917@svn.freebsd.org> From: Doug Rabson Date: Tue, 24 Feb 2009 16:17:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188996 - user/dfr/xenhvm/7/sys/dev/xen/netfront X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Feb 2009 16:17:30 -0000 Author: dfr Date: Tue Feb 24 16:17:29 2009 New Revision: 188996 URL: http://svn.freebsd.org/changeset/base/188996 Log: Pay attention to whether or not LRO is enabled. Modified: user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c Modified: user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c ============================================================================== --- user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c Tue Feb 24 16:14:15 2009 (r188995) +++ user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c Tue Feb 24 16:17:29 2009 (r188996) @@ -969,7 +969,8 @@ xn_rxeof(struct netfront_info *np) XN_RX_UNLOCK(np); #if __FreeBSD_version >= 700000 /* Use LRO if possible */ - if (lro->lro_cnt == 0 || tcp_lro_rx(lro, m, 0)) { + if ((ifp->if_capenable & IFCAP_LRO) == 0 || + lro->lro_cnt == 0 || tcp_lro_rx(lro, m, 0)) { /* * If LRO fails, pass up to the stack * directly. @@ -1614,13 +1615,37 @@ xn_ioctl(struct ifnet *ifp, u_long cmd, break; case SIOCSIFCAP: mask = ifr->ifr_reqcap ^ ifp->if_capenable; - if (mask & IFCAP_HWCSUM) { - ifp->if_capenable ^= IFCAP_HWCSUM; + if (mask & IFCAP_TXCSUM) { + if (IFCAP_TXCSUM & ifp->if_capenable) { + ifp->if_capenable &= ~(IFCAP_TXCSUM|IFCAP_TSO4); + ifp->if_hwassist &= ~(CSUM_TCP | CSUM_UDP + | CSUM_IP | CSUM_TSO); + } else { + ifp->if_capenable |= IFCAP_TXCSUM; + ifp->if_hwassist |= (CSUM_TCP | CSUM_UDP + | CSUM_IP); + } + } + if (mask & IFCAP_RXCSUM) { + ifp->if_capenable ^= IFCAP_RXCSUM; } #if __FreeBSD_version >= 700000 if (mask & IFCAP_TSO4) { - ifp->if_capenable ^= IFCAP_TSO4; - /* XXX inform backend? */ + if (IFCAP_TSO4 & ifp->if_capenable) { + ifp->if_capenable &= ~IFCAP_TSO4; + ifp->if_hwassist &= ~CSUM_TSO; + } else if (IFCAP_TXCSUM & ifp->if_capenable) { + ifp->if_capenable |= IFCAP_TSO4; + ifp->if_hwassist |= CSUM_TSO; + } else { + DPRINTK("Xen requires tx checksum offload" + " be enabled to use TSO\n"); + error = EINVAL; + } + } + if (mask & IFCAP_LRO) { + ifp->if_capenable ^= IFCAP_LRO; + } #endif error = 0; From owner-svn-src-user@FreeBSD.ORG Tue Feb 24 16:39:58 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5341106564A; Tue, 24 Feb 2009 16:39:58 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 92F2C8FC29; Tue, 24 Feb 2009 16:39:58 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1OGdwAm070495; Tue, 24 Feb 2009 16:39:58 GMT (envelope-from dfr@svn.freebsd.org) Received: (from dfr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1OGdwHt070494; Tue, 24 Feb 2009 16:39:58 GMT (envelope-from dfr@svn.freebsd.org) Message-Id: <200902241639.n1OGdwHt070494@svn.freebsd.org> From: Doug Rabson Date: Tue, 24 Feb 2009 16:39:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188998 - user/dfr/xenhvm/6/sys/dev/xen/netfront X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Feb 2009 16:39:59 -0000 Author: dfr Date: Tue Feb 24 16:39:58 2009 New Revision: 188998 URL: http://svn.freebsd.org/changeset/base/188998 Log: Merge TSO and LRO, mostly for diff reduction purposes (its not supported in FreeBSD 6.x). Modified: user/dfr/xenhvm/6/sys/dev/xen/netfront/ (props changed) user/dfr/xenhvm/6/sys/dev/xen/netfront/netfront.c Modified: user/dfr/xenhvm/6/sys/dev/xen/netfront/netfront.c ============================================================================== --- user/dfr/xenhvm/6/sys/dev/xen/netfront/netfront.c Tue Feb 24 16:23:34 2009 (r188997) +++ user/dfr/xenhvm/6/sys/dev/xen/netfront/netfront.c Tue Feb 24 16:39:58 2009 (r188998) @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -47,6 +48,10 @@ __FBSDID("$FreeBSD$"); #include #include #include +#if __FreeBSD_version >= 700000 +#include +#include +#endif #include #include @@ -76,13 +81,22 @@ __FBSDID("$FreeBSD$"); #include "xenbus_if.h" -#define XN_CSUM_FEATURES (CSUM_TCP | CSUM_UDP) +#define XN_CSUM_FEATURES (CSUM_TCP | CSUM_UDP | CSUM_TSO) #define GRANT_INVALID_REF 0 #define NET_TX_RING_SIZE __RING_SIZE((netif_tx_sring_t *)0, PAGE_SIZE) #define NET_RX_RING_SIZE __RING_SIZE((netif_rx_sring_t *)0, PAGE_SIZE) +/* + * Should the driver do LRO on the RX end + * this can be toggled on the fly, but the + * interface must be reset (down/up) for it + * to take effect. + */ +static int xn_enable_lro = 1; +TUNABLE_INT("hw.xn.enable_lro", &xn_enable_lro); + #ifdef CONFIG_XEN static int MODPARM_rx_copy = 0; module_param_named(rx_copy, MODPARM_rx_copy, bool, 0); @@ -95,6 +109,7 @@ static const int MODPARM_rx_copy = 1; static const int MODPARM_rx_flip = 0; #endif +#define MAX_SKB_FRAGS (65536/PAGE_SIZE + 2) #define RX_COPY_THRESHOLD 256 #define net_ratelimit() 0 @@ -195,6 +210,9 @@ struct net_device_stats struct netfront_info { struct ifnet *xn_ifp; +#if __FreeBSD_version >= 700000 + struct lro_ctrl xn_lro; +#endif struct net_device_stats stats; u_int tx_full; @@ -339,28 +357,6 @@ xennet_get_rx_ref(struct netfront_info * #define DPRINTK(fmt, args...) #endif -static __inline struct mbuf* -makembuf (struct mbuf *buf) -{ - struct mbuf *m = NULL; - - MGETHDR (m, M_DONTWAIT, MT_DATA); - - if (! m) - return 0; - - M_MOVE_PKTHDR(m, buf); - - m_cljget(m, M_DONTWAIT, MJUMPAGESIZE); - m->m_pkthdr.len = buf->m_pkthdr.len; - m->m_len = buf->m_len; - m_copydata(buf, 0, buf->m_pkthdr.len, mtod(m,caddr_t) ); - - m->m_ext.ext_args = (caddr_t *)(uintptr_t)(vtophys(mtod(m,caddr_t)) >> PAGE_SHIFT); - - return m; -} - /** * Read the 'mac' node at the given device's node in the store, and parse that * as colon-separated octets, placing result the given mac array. mac must be @@ -420,6 +416,11 @@ netfront_attach(device_t dev) return err; } + SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, "enable_lro", CTLTYPE_INT|CTLFLAG_RW, + &xn_enable_lro, 0, "Large Receive Offload"); + return 0; } @@ -500,7 +501,7 @@ talk_to_backend(device_t dev, struct net message = "writing feature-sg"; goto abort_transaction; } -#ifdef HAVE_TSO +#if __FreeBSD_version >= 700000 err = xenbus_printf(xbt, node, "feature-gso-tcpv4", "%d", 1); if (err) { message = "writing feature-gso-tcpv4"; @@ -868,6 +869,10 @@ static void xn_rxeof(struct netfront_info *np) { struct ifnet *ifp; +#if __FreeBSD_version >= 700000 + struct lro_ctrl *lro = &np->xn_lro; + struct lro_entry *queued; +#endif struct netfront_rx_info rinfo; struct netif_rx_response *rx = &rinfo.rx; struct netif_extra_info *extras = rinfo.extras; @@ -962,13 +967,35 @@ xn_rxeof(struct netfront_info *np) * Do we really need to drop the rx lock? */ XN_RX_UNLOCK(np); - /* Pass it up. */ +#if __FreeBSD_version >= 700000 + /* Use LRO if possible */ + if ((ifp->if_capenable & IFCAP_LRO) == 0 || + lro->lro_cnt == 0 || tcp_lro_rx(lro, m, 0)) { + /* + * If LRO fails, pass up to the stack + * directly. + */ + (*ifp->if_input)(ifp, m); + } +#else (*ifp->if_input)(ifp, m); +#endif XN_RX_LOCK(np); } np->rx.rsp_cons = i; +#if __FreeBSD_version >= 700000 + /* + * Flush any outstanding LRO work + */ + while (!SLIST_EMPTY(&lro->lro_active)) { + queued = SLIST_FIRST(&lro->lro_active); + SLIST_REMOVE_HEAD(&lro->lro_active, next); + tcp_lro_flush(lro, queued); + } +#endif + #if 0 /* If we get a callback with very few responses, reduce fill target. */ /* NB. Note exponential increase, linear decrease. */ @@ -989,6 +1016,7 @@ xn_txeof(struct netfront_info *np) RING_IDX i, prod; unsigned short id; struct ifnet *ifp; + netif_tx_response_t *txr; struct mbuf *m; XN_TX_LOCK_ASSERT(np); @@ -1004,10 +1032,19 @@ xn_txeof(struct netfront_info *np) rmb(); /* Ensure we see responses up to 'rp'. */ for (i = np->tx.rsp_cons; i != prod; i++) { - id = RING_GET_RESPONSE(&np->tx, i)->id; + txr = RING_GET_RESPONSE(&np->tx, i); + if (txr->status == NETIF_RSP_NULL) + continue; + + id = txr->id; m = np->xn_cdata.xn_tx_chain[id]; - ifp->if_opackets++; + /* + * Increment packet count if this is the last + * mbuf of the chain. + */ + if (!m->m_next) + ifp->if_opackets++; KASSERT(m != NULL, ("mbuf not found in xn_tx_chain")); M_ASSERTVALID(m); if (unlikely(gnttab_query_foreign_access( @@ -1025,7 +1062,7 @@ xn_txeof(struct netfront_info *np) np->xn_cdata.xn_tx_chain[id] = NULL; add_id_to_freelist(np->xn_cdata.xn_tx_chain, id); - m_freem(m); + m_free(m); } np->tx.rsp_cons = prod; @@ -1320,13 +1357,14 @@ xn_start_locked(struct ifnet *ifp) { int otherend_id; unsigned short id; - struct mbuf *m_head, *new_m; + struct mbuf *m_head, *m; struct netfront_info *sc; netif_tx_request_t *tx; + netif_extra_info_t *extra; RING_IDX i; grant_ref_t ref; u_long mfn, tx_bytes; - int notify; + int notify, nfrags; sc = ifp->if_softc; otherend_id = xenbus_get_otherend_id(sc->xbdev); @@ -1346,36 +1384,96 @@ xn_start_locked(struct ifnet *ifp) break; } - id = get_id_from_freelist(sc->xn_cdata.xn_tx_chain); + + /* + * Defragment the mbuf if necessary. + */ + for (m = m_head, nfrags = 0; m; m = m->m_next) + nfrags++; + if (nfrags > MAX_SKB_FRAGS) { + m = m_defrag(m_head, M_DONTWAIT); + if (!m) { + m_freem(m_head); + break; + } + m_head = m; + } /* * Start packing the mbufs in this chain into * the fragment pointers. Stop when we run out * of fragments or hit the end of the mbuf chain. */ - new_m = makembuf(m_head); - tx = RING_GET_REQUEST(&sc->tx, i); - tx->id = id; - ref = gnttab_claim_grant_reference(&sc->gref_tx_head); - KASSERT((short)ref >= 0, ("Negative ref")); - mfn = virt_to_mfn(mtod(new_m, vm_offset_t)); - gnttab_grant_foreign_access_ref(ref, otherend_id, - mfn, GNTMAP_readonly); - tx->gref = sc->grant_tx_ref[id] = ref; - tx->size = new_m->m_pkthdr.len; - if (new_m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) - tx->flags = NETTXF_csum_blank | NETTXF_data_validated; - else + m = m_head; + extra = NULL; + for (m = m_head; m; m = m->m_next) { + tx = RING_GET_REQUEST(&sc->tx, i); + id = get_id_from_freelist(sc->xn_cdata.xn_tx_chain); + sc->xn_cdata.xn_tx_chain[id] = m; + tx->id = id; + ref = gnttab_claim_grant_reference(&sc->gref_tx_head); + KASSERT((short)ref >= 0, ("Negative ref")); + mfn = virt_to_mfn(mtod(m, vm_offset_t)); + gnttab_grant_foreign_access_ref(ref, otherend_id, + mfn, GNTMAP_readonly); + tx->gref = sc->grant_tx_ref[id] = ref; + tx->offset = mtod(m, vm_offset_t) & (PAGE_SIZE - 1); tx->flags = 0; - new_m->m_next = NULL; - new_m->m_nextpkt = NULL; + if (m == m_head) { + /* + * The first fragment has the entire packet + * size, subsequent fragments have just the + * fragment size. The backend works out the + * true size of the first fragment by + * subtracting the sizes of the other + * fragments. + */ + tx->size = m->m_pkthdr.len; - m_freem(m_head); + /* + * The first fragment contains the + * checksum flags and is optionally + * followed by extra data for TSO etc. + */ + if (m->m_pkthdr.csum_flags + & CSUM_DELAY_DATA) { + tx->flags |= (NETTXF_csum_blank + | NETTXF_data_validated); + } +#if __FreeBSD_version >= 700000 + if (m->m_pkthdr.csum_flags & CSUM_TSO) { + struct netif_extra_info *gso = + (struct netif_extra_info *) + RING_GET_REQUEST(&sc->tx, ++i); + + if (extra) + extra->flags |= XEN_NETIF_EXTRA_FLAG_MORE; + else + tx->flags |= NETTXF_extra_info; + + gso->u.gso.size = m->m_pkthdr.tso_segsz; + gso->u.gso.type = + XEN_NETIF_GSO_TYPE_TCPV4; + gso->u.gso.pad = 0; + gso->u.gso.features = 0; + + gso->type = XEN_NETIF_EXTRA_TYPE_GSO; + gso->flags = 0; + extra = gso; + } +#endif + } else { + tx->size = m->m_len; + } + if (m->m_next) { + tx->flags |= NETTXF_more_data; + i++; + } + } - sc->xn_cdata.xn_tx_chain[id] = new_m; - BPF_MTAP(ifp, new_m); + BPF_MTAP(ifp, m_head); - sc->stats.tx_bytes += new_m->m_pkthdr.len; + sc->stats.tx_bytes += m_head->m_pkthdr.len; sc->stats.tx_packets++; } @@ -1517,12 +1615,39 @@ xn_ioctl(struct ifnet *ifp, u_long cmd, break; case SIOCSIFCAP: mask = ifr->ifr_reqcap ^ ifp->if_capenable; - if (mask & IFCAP_HWCSUM) { - if (IFCAP_HWCSUM & ifp->if_capenable) - ifp->if_capenable &= ~IFCAP_HWCSUM; - else - ifp->if_capenable |= IFCAP_HWCSUM; + if (mask & IFCAP_TXCSUM) { + if (IFCAP_TXCSUM & ifp->if_capenable) { + ifp->if_capenable &= ~(IFCAP_TXCSUM|IFCAP_TSO4); + ifp->if_hwassist &= ~(CSUM_TCP | CSUM_UDP + | CSUM_IP | CSUM_TSO); + } else { + ifp->if_capenable |= IFCAP_TXCSUM; + ifp->if_hwassist |= (CSUM_TCP | CSUM_UDP + | CSUM_IP); + } + } + if (mask & IFCAP_RXCSUM) { + ifp->if_capenable ^= IFCAP_RXCSUM; + } +#if __FreeBSD_version >= 700000 + if (mask & IFCAP_TSO4) { + if (IFCAP_TSO4 & ifp->if_capenable) { + ifp->if_capenable &= ~IFCAP_TSO4; + ifp->if_hwassist &= ~CSUM_TSO; + } else if (IFCAP_TXCSUM & ifp->if_capenable) { + ifp->if_capenable |= IFCAP_TSO4; + ifp->if_hwassist |= CSUM_TSO; + } else { + DPRINTK("Xen requires tx checksum offload" + " be enabled to use TSO\n"); + error = EINVAL; + } + } + if (mask & IFCAP_LRO) { + ifp->if_capenable ^= IFCAP_LRO; + } +#endif error = 0; break; case SIOCADDMULTI: @@ -1733,6 +1858,18 @@ create_netdev(device_t dev) ifp->if_hwassist = XN_CSUM_FEATURES; ifp->if_capabilities = IFCAP_HWCSUM; +#if __FreeBSD_version >= 700000 + ifp->if_capabilities |= IFCAP_TSO4; + if (xn_enable_lro) { + int err = tcp_lro_init(&np->xn_lro); + if (err) { + device_printf(dev, "LRO initialization failed\n"); + goto exit; + } + np->xn_lro.ifp = ifp; + ifp->if_capabilities |= IFCAP_LRO; + } +#endif ifp->if_capenable = ifp->if_capabilities; ether_ifattach(ifp, np->mac); From owner-svn-src-user@FreeBSD.ORG Tue Feb 24 16:42:42 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 511931065680; Tue, 24 Feb 2009 16:42:42 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3FD638FC2A; Tue, 24 Feb 2009 16:42:42 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1OGggDm070577; Tue, 24 Feb 2009 16:42:42 GMT (envelope-from dfr@svn.freebsd.org) Received: (from dfr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1OGggBO070576; Tue, 24 Feb 2009 16:42:42 GMT (envelope-from dfr@svn.freebsd.org) Message-Id: <200902241642.n1OGggBO070576@svn.freebsd.org> From: Doug Rabson Date: Tue, 24 Feb 2009 16:42:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188999 - user/dfr/xenhvm/6/sys/dev/xen/netfront X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Feb 2009 16:42:42 -0000 Author: dfr Date: Tue Feb 24 16:42:41 2009 New Revision: 188999 URL: http://svn.freebsd.org/changeset/base/188999 Log: Fix build. Modified: user/dfr/xenhvm/6/sys/dev/xen/netfront/netfront.c Modified: user/dfr/xenhvm/6/sys/dev/xen/netfront/netfront.c ============================================================================== --- user/dfr/xenhvm/6/sys/dev/xen/netfront/netfront.c Tue Feb 24 16:39:58 2009 (r188998) +++ user/dfr/xenhvm/6/sys/dev/xen/netfront/netfront.c Tue Feb 24 16:42:41 2009 (r188999) @@ -88,6 +88,7 @@ __FBSDID("$FreeBSD$"); #define NET_TX_RING_SIZE __RING_SIZE((netif_tx_sring_t *)0, PAGE_SIZE) #define NET_RX_RING_SIZE __RING_SIZE((netif_rx_sring_t *)0, PAGE_SIZE) +#if __FreeBSD_version >= 700000 /* * Should the driver do LRO on the RX end * this can be toggled on the fly, but the @@ -96,6 +97,12 @@ __FBSDID("$FreeBSD$"); */ static int xn_enable_lro = 1; TUNABLE_INT("hw.xn.enable_lro", &xn_enable_lro); +#else + +#define IFCAP_TSO4 0 +#define CSUM_TSO 0 + +#endif #ifdef CONFIG_XEN static int MODPARM_rx_copy = 0; @@ -416,10 +423,12 @@ netfront_attach(device_t dev) return err; } +#if __FreeBSD_version >= 700000 SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "enable_lro", CTLTYPE_INT|CTLFLAG_RW, &xn_enable_lro, 0, "Large Receive Offload"); +#endif return 0; } From owner-svn-src-user@FreeBSD.ORG Tue Feb 24 22:25:08 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A857110656C5; Tue, 24 Feb 2009 22:25:08 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7701E8FC0C; Tue, 24 Feb 2009 22:25:08 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1OMP8x3077853; Tue, 24 Feb 2009 22:25:08 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1OMP8Ap077852; Tue, 24 Feb 2009 22:25:08 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200902242225.n1OMP8Ap077852@svn.freebsd.org> From: Kip Macy Date: Tue, 24 Feb 2009 22:25:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189016 - user/kmacy/releng_7_fast_net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Feb 2009 22:25:14 -0000 Author: kmacy Date: Tue Feb 24 22:25:08 2009 New Revision: 189016 URL: http://svn.freebsd.org/changeset/base/189016 Log: remove releng 7 branch for networking speed ups Deleted: user/kmacy/releng_7_fast_net/ From owner-svn-src-user@FreeBSD.ORG Wed Feb 25 10:52:10 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4CCF6106564A; Wed, 25 Feb 2009 10:52:10 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 310628FC15; Wed, 25 Feb 2009 10:52:10 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1PAq9dP093987; Wed, 25 Feb 2009 10:52:09 GMT (envelope-from dfr@svn.freebsd.org) Received: (from dfr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1PAq9h4093986; Wed, 25 Feb 2009 10:52:09 GMT (envelope-from dfr@svn.freebsd.org) Message-Id: <200902251052.n1PAq9h4093986@svn.freebsd.org> From: Doug Rabson Date: Wed, 25 Feb 2009 10:52:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189025 - user/dfr/xenhvm/7/sys/amd64/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Feb 2009 10:52:10 -0000 Author: dfr Date: Wed Feb 25 10:52:09 2009 New Revision: 189025 URL: http://svn.freebsd.org/changeset/base/189025 Log: Add a sample kernel config for Xen HVM. Added: user/dfr/xenhvm/7/sys/amd64/conf/XENHVM Added: user/dfr/xenhvm/7/sys/amd64/conf/XENHVM ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/dfr/xenhvm/7/sys/amd64/conf/XENHVM Wed Feb 25 10:52:09 2009 (r189025) @@ -0,0 +1,152 @@ +# +# GENERIC -- Generic kernel configuration file for FreeBSD/amd64 +# +# For more information on this file, please read the handbook section on +# Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD$ + +cpu HAMMER +ident XENHVM + +# To statically compile in device wiring instead of /boot/device.hints +#hints "GENERIC.hints" # Default places to look for devices. + +makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +makeoptions MODULES_OVERRIDE="" + +options SCHED_ULE # ULE scheduler +options PREEMPTION # Enable kernel thread preemption +options INET # InterNETworking +options INET6 # IPv6 communications protocols +options SCTP # Stream Control Transmission Protocol +options FFS # Berkeley Fast Filesystem +options SOFTUPDATES # Enable FFS soft updates support +options UFS_ACL # Support for access control lists +options UFS_DIRHASH # Improve performance on big directories +options UFS_GJOURNAL # Enable gjournal-based UFS journaling +options MD_ROOT # MD is a potential root device +options NFSCLIENT # Network Filesystem Client +options NFSSERVER # Network Filesystem Server +options NFSLOCKD # Network Lock Manager +options NFS_ROOT # NFS usable as /, requires NFSCLIENT +options NTFS # NT File System +options MSDOSFS # MSDOS Filesystem +options CD9660 # ISO 9660 Filesystem +options PROCFS # Process filesystem (requires PSEUDOFS) +options PSEUDOFS # Pseudo-filesystem framework +options GEOM_PART_GPT # GUID Partition Tables. +options GEOM_LABEL # Provides labelization +options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!] +options COMPAT_IA32 # Compatible with i386 binaries +options COMPAT_FREEBSD4 # Compatible with FreeBSD4 +options COMPAT_FREEBSD5 # Compatible with FreeBSD5 +options COMPAT_FREEBSD6 # Compatible with FreeBSD6 +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI +options KTRACE # ktrace(1) support +options STACK # stack(9) support +options SYSVSHM # SYSV-style shared memory +options SYSVMSG # SYSV-style message queues +options SYSVSEM # SYSV-style semaphores +options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions +options KBD_INSTALL_CDEV # install a CDEV entry in /dev +options ADAPTIVE_GIANT # Giant mutex is adaptive. +options STOP_NMI # Stop CPUS using NMI instead of IPI +options AUDIT # Security event auditing +#options KDTRACE_FRAME # Ensure frames are compiled in +#options KDTRACE_HOOKS # Kernel DTrace hooks + +options KDB +options DDB +options GDB + +# Make an SMP-capable kernel by default +options SMP # Symmetric MultiProcessor Kernel + +# CPU frequency control +device cpufreq + +# Bus support. +device acpi +device pci + +# Floppy drives +device fdc + +# Xen HVM support +options XENHVM +device xenpci + +# ATA and ATAPI devices +device ata +device atadisk # ATA disk drives +device ataraid # ATA RAID drives +device atapicd # ATAPI CDROM drives +device atapifd # ATAPI floppy drives +device atapist # ATAPI tape drives +options ATA_STATIC_ID # Static device numbering + +# SCSI peripherals +device scbus # SCSI bus (required for SCSI) +device ch # SCSI media changers +device da # Direct Access (disks) +device sa # Sequential Access (tape etc) +device cd # CD +device pass # Passthrough device (direct SCSI access) +device ses # SCSI Environmental Services (and SAF-TE) + +# atkbdc0 controls both the keyboard and the PS/2 mouse +device atkbdc # AT keyboard controller +device atkbd # AT keyboard +device psm # PS/2 mouse + +device kbdmux # keyboard multiplexer + +device vga # VGA video card driver + +device splash # Splash screen and screen saver support + +# syscons is the default console driver, resembling an SCO console +device sc + +device agp # support several AGP chipsets + +# Serial (COM) ports +device sio # 8250, 16[45]50 based serial ports +device uart # Generic UART driver + +# PCI Ethernet NICs that use the common MII bus controller code. +# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! +device miibus # MII bus support +device re # RealTek 8139C+/8169/8169S/8110S + +# Pseudo devices. +device loop # Network loopback +device random # Entropy device +device ether # Ethernet support +device sl # Kernel SLIP +device ppp # Kernel PPP +device tun # Packet tunnel. +device pty # Pseudo-ttys (telnet etc) +device md # Memory "disks" +device gif # IPv6 and IPv4 tunneling +device faith # IPv6-to-IPv4 relaying (translation) +device firmware # firmware assist module + +# The `bpf' device enables the Berkeley Packet Filter. +# Be aware of the administrative consequences of enabling this! +# Note that 'bpf' is required for DHCP. +device bpf # Berkeley packet filter + From owner-svn-src-user@FreeBSD.ORG Wed Feb 25 11:12:34 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E886B1065670; Wed, 25 Feb 2009 11:12:34 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D776E8FC1A; Wed, 25 Feb 2009 11:12:34 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1PBCYMB094489; Wed, 25 Feb 2009 11:12:34 GMT (envelope-from dfr@svn.freebsd.org) Received: (from dfr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1PBCYlC094488; Wed, 25 Feb 2009 11:12:34 GMT (envelope-from dfr@svn.freebsd.org) Message-Id: <200902251112.n1PBCYlC094488@svn.freebsd.org> From: Doug Rabson Date: Wed, 25 Feb 2009 11:12:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189027 - user/dfr/xenhvm/7/sys/amd64/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Feb 2009 11:12:35 -0000 Author: dfr Date: Wed Feb 25 11:12:34 2009 New Revision: 189027 URL: http://svn.freebsd.org/changeset/base/189027 Log: Fix comment. Pointed out by: Ivan Voras Modified: user/dfr/xenhvm/7/sys/amd64/conf/XENHVM Modified: user/dfr/xenhvm/7/sys/amd64/conf/XENHVM ============================================================================== --- user/dfr/xenhvm/7/sys/amd64/conf/XENHVM Wed Feb 25 10:59:56 2009 (r189026) +++ user/dfr/xenhvm/7/sys/amd64/conf/XENHVM Wed Feb 25 11:12:34 2009 (r189027) @@ -1,5 +1,5 @@ # -# GENERIC -- Generic kernel configuration file for FreeBSD/amd64 +# XENHVM -- Xen HVM kernel configuration file for FreeBSD/amd64 # # For more information on this file, please read the handbook section on # Kernel Configuration Files: From owner-svn-src-user@FreeBSD.ORG Wed Feb 25 11:13:14 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 147DF106566C; Wed, 25 Feb 2009 11:13:14 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 035CE8FC13; Wed, 25 Feb 2009 11:13:14 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1PBDDWG094538; Wed, 25 Feb 2009 11:13:13 GMT (envelope-from dfr@svn.freebsd.org) Received: (from dfr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1PBDDfX094537; Wed, 25 Feb 2009 11:13:13 GMT (envelope-from dfr@svn.freebsd.org) Message-Id: <200902251113.n1PBDDfX094537@svn.freebsd.org> From: Doug Rabson Date: Wed, 25 Feb 2009 11:13:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189028 - user/dfr/xenhvm/6/sys/amd64/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Feb 2009 11:13:14 -0000 Author: dfr Date: Wed Feb 25 11:13:13 2009 New Revision: 189028 URL: http://svn.freebsd.org/changeset/base/189028 Log: Fix comment. Modified: user/dfr/xenhvm/6/sys/amd64/conf/XENHVM Modified: user/dfr/xenhvm/6/sys/amd64/conf/XENHVM ============================================================================== --- user/dfr/xenhvm/6/sys/amd64/conf/XENHVM Wed Feb 25 11:12:34 2009 (r189027) +++ user/dfr/xenhvm/6/sys/amd64/conf/XENHVM Wed Feb 25 11:13:13 2009 (r189028) @@ -1,5 +1,5 @@ # -# GENERIC -- Generic kernel configuration file for FreeBSD/amd64 +# XENHVM -- Xen HVM kernel configuration file for FreeBSD/amd64 # # For more information on this file, please read the handbook section on # Kernel Configuration Files: @@ -71,6 +71,7 @@ device atpic # 8259A compatability # Linux 32-bit ABI support options LINPROCFS # Cannot be a module yet. options SMP +options GDB # Bus support. device acpi From owner-svn-src-user@FreeBSD.ORG Sat Feb 28 01:05:21 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D55BC106566B; Sat, 28 Feb 2009 01:05:21 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BE0ED8FC17; Sat, 28 Feb 2009 01:05:21 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1S15LPV089525; Sat, 28 Feb 2009 01:05:21 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1S15KjP089500; Sat, 28 Feb 2009 01:05:20 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200902280105.n1S15KjP089500@svn.freebsd.org> From: Andrew Thompson Date: Sat, 28 Feb 2009 01:05:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189129 - in user/thompsa/vaptq: . bin/chmod bin/dd bin/pax bin/ps contrib/bind9 contrib/bsnmp/snmp_mibII contrib/cpio contrib/csup contrib/file contrib/gdtoa contrib/gdtoa/test contrib... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Feb 2009 01:05:22 -0000 Author: thompsa Date: Sat Feb 28 01:05:18 2009 New Revision: 189129 URL: http://svn.freebsd.org/changeset/base/189129 Log: MFH r187542-189128 Added: user/thompsa/vaptq/contrib/gdtoa/gdtoa_fltrnds.h - copied unchanged from r189128, head/contrib/gdtoa/gdtoa_fltrnds.h user/thompsa/vaptq/contrib/gdtoa/test/obad/ - copied from r189128, head/contrib/gdtoa/test/obad/ user/thompsa/vaptq/gnu/usr.bin/gdb/gdbserver/fbsd-ppc-low.c - copied unchanged from r189128, head/gnu/usr.bin/gdb/gdbserver/fbsd-ppc-low.c user/thompsa/vaptq/gnu/usr.bin/gdb/gdbserver/reg-ppc.c - copied unchanged from r189128, head/gnu/usr.bin/gdb/gdbserver/reg-ppc.c user/thompsa/vaptq/lib/libarchive/test/test_write_disk_sparse.c - copied unchanged from r189128, head/lib/libarchive/test/test_write_disk_sparse.c user/thompsa/vaptq/lib/libc/gen/fdevname.c - copied unchanged from r189128, head/lib/libc/gen/fdevname.c user/thompsa/vaptq/lib/libmp/Symbol.map - copied unchanged from r189128, head/lib/libmp/Symbol.map user/thompsa/vaptq/lib/libusbhid/descr_compat.c - copied unchanged from r189128, head/lib/libusbhid/descr_compat.c user/thompsa/vaptq/sbin/ipfw/altq.c - copied unchanged from r189128, head/sbin/ipfw/altq.c user/thompsa/vaptq/sbin/ipfw/dummynet.c - copied unchanged from r189128, head/sbin/ipfw/dummynet.c user/thompsa/vaptq/sbin/ipfw/ipfw2.h - copied unchanged from r189128, head/sbin/ipfw/ipfw2.h user/thompsa/vaptq/sbin/ipfw/ipv6.c - copied unchanged from r189128, head/sbin/ipfw/ipv6.c user/thompsa/vaptq/sbin/ipfw/main.c - copied unchanged from r189128, head/sbin/ipfw/main.c user/thompsa/vaptq/sbin/ipfw/nat.c - copied unchanged from r189128, head/sbin/ipfw/nat.c user/thompsa/vaptq/share/man/man4/man4.powerpc/snd_ai2s.4 - copied unchanged from r189128, head/share/man/man4/man4.powerpc/snd_ai2s.4 user/thompsa/vaptq/share/man/man4/man4.powerpc/snd_davbus.4 - copied unchanged from r189128, head/share/man/man4/man4.powerpc/snd_davbus.4 user/thompsa/vaptq/share/man/man4/urtw.4 - copied unchanged from r189128, head/share/man/man4/urtw.4 user/thompsa/vaptq/share/man/man5/portindex.5 - copied unchanged from r189128, head/share/man/man5/portindex.5 user/thompsa/vaptq/share/man/man7/adding_user.7 - copied unchanged from r189128, head/share/man/man7/adding_user.7 user/thompsa/vaptq/sys/boot/ficl/mips/ - copied from r189128, head/sys/boot/ficl/mips/ user/thompsa/vaptq/sys/dev/ata/ata-raid-ddf.h - copied unchanged from r189128, head/sys/dev/ata/ata-raid-ddf.h user/thompsa/vaptq/sys/dev/cfi/cfi_bus_ixp4xx.c - copied unchanged from r189128, head/sys/dev/cfi/cfi_bus_ixp4xx.c user/thompsa/vaptq/sys/dev/drm/i915_reg.h - copied unchanged from r189128, head/sys/dev/drm/i915_reg.h user/thompsa/vaptq/sys/dev/sound/macio/ - copied from r189128, head/sys/dev/sound/macio/ user/thompsa/vaptq/sys/geom/part/g_part_ebr.c - copied unchanged from r189128, head/sys/geom/part/g_part_ebr.c user/thompsa/vaptq/sys/legacy/ - copied from r189128, head/sys/legacy/ user/thompsa/vaptq/sys/modules/geom/geom_part/geom_part_ebr/ - copied from r189128, head/sys/modules/geom/geom_part/geom_part_ebr/ user/thompsa/vaptq/sys/modules/sound/driver/ai2s/ - copied from r189128, head/sys/modules/sound/driver/ai2s/ user/thompsa/vaptq/sys/modules/sound/driver/davbus/ - copied from r189128, head/sys/modules/sound/driver/davbus/ user/thompsa/vaptq/sys/netinet/libalias/alias_sctp.c - copied unchanged from r189128, head/sys/netinet/libalias/alias_sctp.c user/thompsa/vaptq/sys/netinet/libalias/alias_sctp.h - copied unchanged from r189128, head/sys/netinet/libalias/alias_sctp.h user/thompsa/vaptq/sys/powerpc/include/altivec.h - copied unchanged from r189128, head/sys/powerpc/include/altivec.h user/thompsa/vaptq/sys/powerpc/powerpc/altivec.c - copied unchanged from r189128, head/sys/powerpc/powerpc/altivec.c user/thompsa/vaptq/tools/regression/file/newfileops_on_fork/ - copied from r189128, head/tools/regression/file/newfileops_on_fork/ user/thompsa/vaptq/tools/regression/lib/msun/test-conj.c - copied unchanged from r189128, head/tools/regression/lib/msun/test-conj.c user/thompsa/vaptq/tools/regression/lib/msun/test-conj.t - copied unchanged from r189128, head/tools/regression/lib/msun/test-conj.t user/thompsa/vaptq/tools/tools/cfi/ - copied from r189128, head/tools/tools/cfi/ user/thompsa/vaptq/tools/tools/nanobsd/gateworks/Files/root/updatep1 - copied unchanged from r189128, head/tools/tools/nanobsd/gateworks/Files/root/updatep1 user/thompsa/vaptq/tools/tools/nanobsd/gateworks/Files/root/updatep2 - copied unchanged from r189128, head/tools/tools/nanobsd/gateworks/Files/root/updatep2 user/thompsa/vaptq/tools/tools/nanobsd/rescue/ - copied from r189128, head/tools/tools/nanobsd/rescue/ user/thompsa/vaptq/usr.bin/truss/mips-fbsd.c - copied unchanged from r189128, head/usr.bin/truss/mips-fbsd.c user/thompsa/vaptq/usr.sbin/bluetooth/btpand/ - copied from r189128, head/usr.sbin/bluetooth/btpand/ user/thompsa/vaptq/usr.sbin/dumpcis/cardinfo.h - copied unchanged from r189128, head/usr.sbin/dumpcis/cardinfo.h user/thompsa/vaptq/usr.sbin/dumpcis/cis.h - copied unchanged from r189128, head/usr.sbin/dumpcis/cis.h user/thompsa/vaptq/usr.sbin/i2c/ - copied from r189128, head/usr.sbin/i2c/ Replaced: user/thompsa/vaptq/sys/dev/ata/ata-usb.c - copied unchanged from r189128, head/sys/dev/ata/ata-usb.c user/thompsa/vaptq/sys/dev/sound/usb/uaudio.c - copied unchanged from r189128, head/sys/dev/sound/usb/uaudio.c user/thompsa/vaptq/sys/dev/sound/usb/uaudio.h - copied unchanged from r189128, head/sys/dev/sound/usb/uaudio.h user/thompsa/vaptq/sys/dev/sound/usb/uaudio_pcm.c - copied unchanged from r189128, head/sys/dev/sound/usb/uaudio_pcm.c user/thompsa/vaptq/sys/dev/sound/usb/uaudioreg.h - copied unchanged from r189128, head/sys/dev/sound/usb/uaudioreg.h user/thompsa/vaptq/sys/dev/usb/ - copied from r189128, head/sys/dev/usb/ user/thompsa/vaptq/sys/dev/usb/usb.h - copied unchanged from r189128, head/sys/dev/usb/usb.h user/thompsa/vaptq/sys/dev/usb/usb_if.m - copied unchanged from r189128, head/sys/dev/usb/usb_if.m user/thompsa/vaptq/sys/dev/usb/usbdevs - copied unchanged from r189128, head/sys/dev/usb/usbdevs user/thompsa/vaptq/sys/dev/usb/usbhid.h - copied unchanged from r189128, head/sys/dev/usb/usbhid.h user/thompsa/vaptq/sys/modules/usb/ - copied from r189128, head/sys/modules/usb/ user/thompsa/vaptq/sys/modules/usb/Makefile - copied unchanged from r189128, head/sys/modules/usb/Makefile Deleted: user/thompsa/vaptq/gnu/games/ user/thompsa/vaptq/share/man/man8/adding_user.8 user/thompsa/vaptq/sys/dev/usb2/ user/thompsa/vaptq/sys/modules/aue/ user/thompsa/vaptq/sys/modules/axe/ user/thompsa/vaptq/sys/modules/cdce/ user/thompsa/vaptq/sys/modules/cue/ user/thompsa/vaptq/sys/modules/ehci/ user/thompsa/vaptq/sys/modules/kue/ user/thompsa/vaptq/sys/modules/ohci/ user/thompsa/vaptq/sys/modules/rue/ user/thompsa/vaptq/sys/modules/rum/ user/thompsa/vaptq/sys/modules/slhci/ user/thompsa/vaptq/sys/modules/u3g/ user/thompsa/vaptq/sys/modules/uark/ user/thompsa/vaptq/sys/modules/ubsa/ user/thompsa/vaptq/sys/modules/ucom/ user/thompsa/vaptq/sys/modules/udav/ user/thompsa/vaptq/sys/modules/udbp/ user/thompsa/vaptq/sys/modules/ufm/ user/thompsa/vaptq/sys/modules/ufoma/ user/thompsa/vaptq/sys/modules/uftdi/ user/thompsa/vaptq/sys/modules/ugen/ user/thompsa/vaptq/sys/modules/uhci/ user/thompsa/vaptq/sys/modules/uhid/ user/thompsa/vaptq/sys/modules/uipaq/ user/thompsa/vaptq/sys/modules/ukbd/ user/thompsa/vaptq/sys/modules/ulpt/ user/thompsa/vaptq/sys/modules/umass/ user/thompsa/vaptq/sys/modules/umct/ user/thompsa/vaptq/sys/modules/umodem/ user/thompsa/vaptq/sys/modules/ums/ user/thompsa/vaptq/sys/modules/upgt/ user/thompsa/vaptq/sys/modules/uplcom/ user/thompsa/vaptq/sys/modules/ural/ user/thompsa/vaptq/sys/modules/urio/ user/thompsa/vaptq/sys/modules/usb2/ user/thompsa/vaptq/sys/modules/uscanner/ user/thompsa/vaptq/sys/modules/uslcom/ user/thompsa/vaptq/sys/modules/uvisor/ user/thompsa/vaptq/sys/modules/uvscom/ user/thompsa/vaptq/sys/modules/zyd/ user/thompsa/vaptq/sys/pccard/ user/thompsa/vaptq/usr.bin/netstat/mcast.c user/thompsa/vaptq/usr.sbin/pccard/ user/thompsa/vaptq/usr.sbin/sysinstall/pccard.c Modified: user/thompsa/vaptq/ (props changed) user/thompsa/vaptq/Makefile.inc1 user/thompsa/vaptq/ObsoleteFiles.inc user/thompsa/vaptq/UPDATING user/thompsa/vaptq/bin/chmod/chmod.1 user/thompsa/vaptq/bin/dd/dd.1 user/thompsa/vaptq/bin/pax/file_subs.c user/thompsa/vaptq/bin/ps/extern.h user/thompsa/vaptq/bin/ps/keyword.c user/thompsa/vaptq/bin/ps/print.c user/thompsa/vaptq/contrib/bind9/ (props changed) user/thompsa/vaptq/contrib/bsnmp/snmp_mibII/mibII.c user/thompsa/vaptq/contrib/cpio/ (props changed) user/thompsa/vaptq/contrib/csup/ (props changed) user/thompsa/vaptq/contrib/csup/proto.c user/thompsa/vaptq/contrib/csup/updater.c user/thompsa/vaptq/contrib/file/ (props changed) user/thompsa/vaptq/contrib/gdtoa/ (props changed) user/thompsa/vaptq/contrib/gdtoa/README user/thompsa/vaptq/contrib/gdtoa/g_Qfmt.c user/thompsa/vaptq/contrib/gdtoa/g__fmt.c user/thompsa/vaptq/contrib/gdtoa/g_ddfmt.c user/thompsa/vaptq/contrib/gdtoa/g_dfmt.c user/thompsa/vaptq/contrib/gdtoa/g_ffmt.c user/thompsa/vaptq/contrib/gdtoa/g_xLfmt.c user/thompsa/vaptq/contrib/gdtoa/g_xfmt.c user/thompsa/vaptq/contrib/gdtoa/gdtoa.c user/thompsa/vaptq/contrib/gdtoa/gdtoa.h user/thompsa/vaptq/contrib/gdtoa/gdtoaimp.h user/thompsa/vaptq/contrib/gdtoa/gethex.c user/thompsa/vaptq/contrib/gdtoa/makefile user/thompsa/vaptq/contrib/gdtoa/smisc.c user/thompsa/vaptq/contrib/gdtoa/strtod.c user/thompsa/vaptq/contrib/gdtoa/strtodg.c user/thompsa/vaptq/contrib/gdtoa/strtof.c user/thompsa/vaptq/contrib/gdtoa/strtopQ.c user/thompsa/vaptq/contrib/gdtoa/strtopd.c user/thompsa/vaptq/contrib/gdtoa/strtopdd.c user/thompsa/vaptq/contrib/gdtoa/strtopf.c user/thompsa/vaptq/contrib/gdtoa/strtopx.c user/thompsa/vaptq/contrib/gdtoa/strtopxL.c user/thompsa/vaptq/contrib/gdtoa/test/README user/thompsa/vaptq/contrib/gdtoa/test/getround.c user/thompsa/vaptq/contrib/gdtoa/test/makefile user/thompsa/vaptq/contrib/gdtoa/test/xsum0.out user/thompsa/vaptq/contrib/gdtoa/xsum0.out user/thompsa/vaptq/contrib/ncurses/ (props changed) user/thompsa/vaptq/contrib/netcat/ (props changed) user/thompsa/vaptq/contrib/ntp/ (props changed) user/thompsa/vaptq/contrib/openbsm/ (props changed) user/thompsa/vaptq/contrib/openpam/ (props changed) user/thompsa/vaptq/contrib/openpam/include/security/openpam.h user/thompsa/vaptq/contrib/openpam/lib/openpam_dynamic.c user/thompsa/vaptq/contrib/opie/opiekey.1 user/thompsa/vaptq/contrib/pf/ (props changed) user/thompsa/vaptq/contrib/sendmail/ (props changed) user/thompsa/vaptq/contrib/smbfs/mount_smbfs/mount_smbfs.8 user/thompsa/vaptq/contrib/smbfs/mount_smbfs/mount_smbfs.c user/thompsa/vaptq/contrib/telnet/libtelnet/pk.c user/thompsa/vaptq/contrib/telnet/telnetd/sys_term.c user/thompsa/vaptq/contrib/top/ (props changed) user/thompsa/vaptq/contrib/wpa_supplicant/ (props changed) user/thompsa/vaptq/contrib/wpa_supplicant/ChangeLog user/thompsa/vaptq/contrib/wpa_supplicant/Makefile user/thompsa/vaptq/contrib/wpa_supplicant/base64.c user/thompsa/vaptq/contrib/wpa_supplicant/ctrl_iface.c user/thompsa/vaptq/contrib/wpa_supplicant/ctrl_iface_dbus.c user/thompsa/vaptq/contrib/wpa_supplicant/ctrl_iface_unix.c user/thompsa/vaptq/contrib/wpa_supplicant/dbus_dict_helpers.c user/thompsa/vaptq/contrib/wpa_supplicant/doc/docbook/wpa_background.8 user/thompsa/vaptq/contrib/wpa_supplicant/doc/docbook/wpa_cli.8 user/thompsa/vaptq/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml user/thompsa/vaptq/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8 user/thompsa/vaptq/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8 user/thompsa/vaptq/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5 user/thompsa/vaptq/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml user/thompsa/vaptq/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml user/thompsa/vaptq/contrib/wpa_supplicant/driver_ndis.c user/thompsa/vaptq/contrib/wpa_supplicant/eap.c user/thompsa/vaptq/contrib/wpa_supplicant/eap_aka.c user/thompsa/vaptq/contrib/wpa_supplicant/eap_gpsk.c user/thompsa/vaptq/contrib/wpa_supplicant/eap_gpsk_common.c user/thompsa/vaptq/contrib/wpa_supplicant/eap_ttls.c user/thompsa/vaptq/contrib/wpa_supplicant/eloop.c user/thompsa/vaptq/contrib/wpa_supplicant/eloop.h user/thompsa/vaptq/contrib/wpa_supplicant/eloop_none.c user/thompsa/vaptq/contrib/wpa_supplicant/mlme.c user/thompsa/vaptq/contrib/wpa_supplicant/os_unix.c user/thompsa/vaptq/contrib/wpa_supplicant/preauth_test.c user/thompsa/vaptq/contrib/wpa_supplicant/radius.c user/thompsa/vaptq/contrib/wpa_supplicant/sha1.c user/thompsa/vaptq/contrib/wpa_supplicant/tls_openssl.c user/thompsa/vaptq/contrib/wpa_supplicant/version.h user/thompsa/vaptq/contrib/wpa_supplicant/wpa.c user/thompsa/vaptq/contrib/wpa_supplicant/wpa.h user/thompsa/vaptq/contrib/wpa_supplicant/wpa_cli.c user/thompsa/vaptq/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp user/thompsa/vaptq/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp user/thompsa/vaptq/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp user/thompsa/vaptq/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h user/thompsa/vaptq/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h user/thompsa/vaptq/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h user/thompsa/vaptq/contrib/wpa_supplicant/wpa_i.h user/thompsa/vaptq/contrib/wpa_supplicant/wpa_supplicant.c user/thompsa/vaptq/crypto/openssh/ (props changed) user/thompsa/vaptq/crypto/openssl/ (props changed) user/thompsa/vaptq/etc/defaults/rc.conf user/thompsa/vaptq/etc/devd.conf user/thompsa/vaptq/etc/etc.amd64/ttys user/thompsa/vaptq/etc/etc.arm/ttys user/thompsa/vaptq/etc/etc.i386/ttys user/thompsa/vaptq/etc/etc.ia64/ttys user/thompsa/vaptq/etc/etc.mips/ttys user/thompsa/vaptq/etc/etc.powerpc/ttys user/thompsa/vaptq/etc/etc.sparc64/ttys user/thompsa/vaptq/etc/mtree/BSD.include.dist user/thompsa/vaptq/etc/network.subr user/thompsa/vaptq/etc/rc.d/defaultroute user/thompsa/vaptq/etc/rc.d/jail user/thompsa/vaptq/etc/rc.d/named user/thompsa/vaptq/etc/rc.shutdown user/thompsa/vaptq/etc/regdomain.xml user/thompsa/vaptq/gnu/lib/csu/Makefile user/thompsa/vaptq/gnu/lib/libgcc/Makefile user/thompsa/vaptq/gnu/lib/libssp/Makefile user/thompsa/vaptq/gnu/usr.bin/gdb/Makefile user/thompsa/vaptq/gnu/usr.bin/gdb/gdbserver/Makefile user/thompsa/vaptq/gnu/usr.bin/grep/savedir.c user/thompsa/vaptq/include/Makefile user/thompsa/vaptq/include/paths.h user/thompsa/vaptq/include/stdlib.h user/thompsa/vaptq/include/string.h user/thompsa/vaptq/include/wchar.h user/thompsa/vaptq/lib/csu/Makefile.inc user/thompsa/vaptq/lib/libarchive/archive_read_support_format_ar.c user/thompsa/vaptq/lib/libarchive/archive_write_disk.c user/thompsa/vaptq/lib/libarchive/test/Makefile user/thompsa/vaptq/lib/libc/ (props changed) user/thompsa/vaptq/lib/libc/arm/sys/Ovfork.S user/thompsa/vaptq/lib/libc/db/man/dbm.3 user/thompsa/vaptq/lib/libc/gen/Makefile.inc user/thompsa/vaptq/lib/libc/gen/Symbol.map user/thompsa/vaptq/lib/libc/gen/devname.3 user/thompsa/vaptq/lib/libc/gen/getttyent.c user/thompsa/vaptq/lib/libc/gen/sysctl.3 user/thompsa/vaptq/lib/libc/gen/ttyname.c user/thompsa/vaptq/lib/libc/gen/ttyslot.c user/thompsa/vaptq/lib/libc/mips/Symbol.map user/thompsa/vaptq/lib/libc/mips/sys/Ovfork.S user/thompsa/vaptq/lib/libc/net/getaddrinfo.c user/thompsa/vaptq/lib/libc/net/gethostbydns.c user/thompsa/vaptq/lib/libc/sparc64/sys/__sparc_utrap.c user/thompsa/vaptq/lib/libc/stdio/ferror.3 user/thompsa/vaptq/lib/libc/stdio/printf.3 user/thompsa/vaptq/lib/libc/stdio/vfprintf.c user/thompsa/vaptq/lib/libc/stdio/vfwprintf.c user/thompsa/vaptq/lib/libc/stdlib/atol.3 user/thompsa/vaptq/lib/libc/stdlib/ptsname.c user/thompsa/vaptq/lib/libc/stdtime/ (props changed) user/thompsa/vaptq/lib/libc/string/ffsll.c (props changed) user/thompsa/vaptq/lib/libc/string/flsll.c (props changed) user/thompsa/vaptq/lib/libc/string/memccpy.c user/thompsa/vaptq/lib/libc/string/memchr.c user/thompsa/vaptq/lib/libc/string/memcmp.c user/thompsa/vaptq/lib/libc/string/memmem.c user/thompsa/vaptq/lib/libc/string/strcasecmp.c user/thompsa/vaptq/lib/libc/string/strcasestr.c user/thompsa/vaptq/lib/libc/string/strcmp.c user/thompsa/vaptq/lib/libc/string/strcoll.c user/thompsa/vaptq/lib/libc/string/strdup.c user/thompsa/vaptq/lib/libc/string/strlen.c user/thompsa/vaptq/lib/libc/string/strmode.c user/thompsa/vaptq/lib/libc/string/strncmp.c user/thompsa/vaptq/lib/libc/string/strncpy.c user/thompsa/vaptq/lib/libc/string/strnstr.c user/thompsa/vaptq/lib/libc/string/strpbrk.c user/thompsa/vaptq/lib/libc/string/strsep.c user/thompsa/vaptq/lib/libc/string/strstr.c user/thompsa/vaptq/lib/libc/string/wcscat.c user/thompsa/vaptq/lib/libc/string/wcscmp.c user/thompsa/vaptq/lib/libc/string/wcscpy.c user/thompsa/vaptq/lib/libc/string/wcscspn.c user/thompsa/vaptq/lib/libc/string/wcslcat.c user/thompsa/vaptq/lib/libc/string/wcslcpy.c user/thompsa/vaptq/lib/libc/string/wcslen.c user/thompsa/vaptq/lib/libc/string/wcsncat.c user/thompsa/vaptq/lib/libc/string/wcsncmp.c user/thompsa/vaptq/lib/libc/string/wcspbrk.c user/thompsa/vaptq/lib/libc/string/wcsspn.c user/thompsa/vaptq/lib/libc/string/wcsstr.c user/thompsa/vaptq/lib/libc/string/wmemchr.c user/thompsa/vaptq/lib/libc/string/wmemcmp.c user/thompsa/vaptq/lib/libc/string/wmemcpy.c user/thompsa/vaptq/lib/libc/string/wmemmove.c user/thompsa/vaptq/lib/libc/string/wmemset.c user/thompsa/vaptq/lib/libc/sys/send.2 user/thompsa/vaptq/lib/libc_r/Makefile user/thompsa/vaptq/lib/libc_r/uthread/uthread_init.c user/thompsa/vaptq/lib/libcompat/4.3/rexec.c user/thompsa/vaptq/lib/libdisk/open_disk.c user/thompsa/vaptq/lib/libkse/Makefile user/thompsa/vaptq/lib/libmp/Makefile user/thompsa/vaptq/lib/libmp/libmp.3 user/thompsa/vaptq/lib/libmp/mp.h user/thompsa/vaptq/lib/libmp/mpasbn.c user/thompsa/vaptq/lib/libpam/modules/Makefile.inc user/thompsa/vaptq/lib/libpmc/libpmc.c user/thompsa/vaptq/lib/librpcsvc/rnusers.c user/thompsa/vaptq/lib/librpcsvc/rstat.c user/thompsa/vaptq/lib/librpcsvc/rwall.c user/thompsa/vaptq/lib/librpcsvc/secretkey.c user/thompsa/vaptq/lib/librpcsvc/xcrypt.c user/thompsa/vaptq/lib/libstand/Makefile user/thompsa/vaptq/lib/libtelnet/Makefile user/thompsa/vaptq/lib/libthr/Makefile user/thompsa/vaptq/lib/libusb20/libusb20.3 user/thompsa/vaptq/lib/libusb20/libusb20.c user/thompsa/vaptq/lib/libusb20/libusb20.h user/thompsa/vaptq/lib/libusb20/libusb20_compat01.c user/thompsa/vaptq/lib/libusb20/libusb20_int.h user/thompsa/vaptq/lib/libusb20/libusb20_ugen20.c user/thompsa/vaptq/lib/libusbhid/Makefile user/thompsa/vaptq/lib/libusbhid/descr.c user/thompsa/vaptq/lib/libusbhid/usbhid.3 user/thompsa/vaptq/lib/libusbhid/usbhid.h user/thompsa/vaptq/lib/libusbhid/usbvar.h user/thompsa/vaptq/lib/libutil/ (props changed) user/thompsa/vaptq/lib/msun/src/math.h user/thompsa/vaptq/libexec/ftpd/ftpd.8 user/thompsa/vaptq/libexec/rtld-elf/Makefile user/thompsa/vaptq/release/Makefile user/thompsa/vaptq/release/picobsd/bridge/PICOBSD user/thompsa/vaptq/release/picobsd/bridge/PICOBSD.hints user/thompsa/vaptq/release/picobsd/bridge/crunch.conf user/thompsa/vaptq/release/picobsd/build/picobsd user/thompsa/vaptq/release/picobsd/floppy.tree/etc/ttys user/thompsa/vaptq/release/scripts/doFS.sh user/thompsa/vaptq/rescue/librescue/Makefile user/thompsa/vaptq/rescue/rescue/Makefile user/thompsa/vaptq/sbin/ (props changed) user/thompsa/vaptq/sbin/atacontrol/atacontrol.8 user/thompsa/vaptq/sbin/atacontrol/atacontrol.c user/thompsa/vaptq/sbin/dumpfs/dumpfs.8 user/thompsa/vaptq/sbin/dumpfs/dumpfs.c user/thompsa/vaptq/sbin/fsck/fsck.8 user/thompsa/vaptq/sbin/fsck/fsck.c user/thompsa/vaptq/sbin/fsck/fsutil.h user/thompsa/vaptq/sbin/fsck_ffs/fsck.h user/thompsa/vaptq/sbin/fsck_ffs/fsck_ffs.8 user/thompsa/vaptq/sbin/fsck_ffs/fsutil.c user/thompsa/vaptq/sbin/fsck_ffs/inode.c user/thompsa/vaptq/sbin/fsck_ffs/main.c user/thompsa/vaptq/sbin/fsck_ffs/pass1.c user/thompsa/vaptq/sbin/fsck_ffs/setup.c user/thompsa/vaptq/sbin/geom/class/journal/gjournal.8 user/thompsa/vaptq/sbin/geom/class/part/geom_part.c user/thompsa/vaptq/sbin/geom/core/geom.c user/thompsa/vaptq/sbin/ifconfig/ifclone.c user/thompsa/vaptq/sbin/ifconfig/ifconfig.h user/thompsa/vaptq/sbin/ifconfig/ifieee80211.c user/thompsa/vaptq/sbin/ifconfig/ifvlan.c user/thompsa/vaptq/sbin/ifconfig/regdomain.c user/thompsa/vaptq/sbin/ifconfig/regdomain.h user/thompsa/vaptq/sbin/ipfw/Makefile user/thompsa/vaptq/sbin/ipfw/ipfw.8 user/thompsa/vaptq/sbin/ipfw/ipfw2.c user/thompsa/vaptq/sbin/mount_nfs/mount_nfs.c user/thompsa/vaptq/sbin/newfs/mkfs.c user/thompsa/vaptq/sbin/newfs/newfs.c user/thompsa/vaptq/sbin/newfs_msdos/newfs_msdos.c user/thompsa/vaptq/sbin/reboot/reboot.c user/thompsa/vaptq/sbin/restore/interactive.c user/thompsa/vaptq/share/man/man4/Makefile user/thompsa/vaptq/share/man/man4/geom.4 user/thompsa/vaptq/share/man/man4/iic.4 user/thompsa/vaptq/share/man/man4/iwi.4 user/thompsa/vaptq/share/man/man4/man4.powerpc/Makefile user/thompsa/vaptq/share/man/man4/ng_bpf.4 user/thompsa/vaptq/share/man/man4/nge.4 user/thompsa/vaptq/share/man/man4/re.4 user/thompsa/vaptq/share/man/man4/rum.4 user/thompsa/vaptq/share/man/man4/sk.4 user/thompsa/vaptq/share/man/man4/smb.4 user/thompsa/vaptq/share/man/man4/snd_hda.4 user/thompsa/vaptq/share/man/man4/u3g.4 user/thompsa/vaptq/share/man/man4/usb2_core.4 user/thompsa/vaptq/share/man/man5/Makefile user/thompsa/vaptq/share/man/man5/rc.conf.5 user/thompsa/vaptq/share/man/man5/src.conf.5 user/thompsa/vaptq/share/man/man7/Makefile user/thompsa/vaptq/share/man/man7/build.7 user/thompsa/vaptq/share/man/man7/hier.7 user/thompsa/vaptq/share/man/man7/ports.7 user/thompsa/vaptq/share/man/man7/tuning.7 user/thompsa/vaptq/share/man/man8/Makefile user/thompsa/vaptq/share/man/man9/Makefile user/thompsa/vaptq/share/man/man9/disk.9 user/thompsa/vaptq/share/man/man9/kthread.9 user/thompsa/vaptq/share/man/man9/lock.9 user/thompsa/vaptq/share/misc/bsd-family-tree user/thompsa/vaptq/share/misc/committers-ports.dot user/thompsa/vaptq/share/misc/committers-src.dot user/thompsa/vaptq/share/mk/bsd.cpu.mk user/thompsa/vaptq/share/zoneinfo/ (props changed) user/thompsa/vaptq/share/zoneinfo/asia user/thompsa/vaptq/share/zoneinfo/backward user/thompsa/vaptq/share/zoneinfo/europe user/thompsa/vaptq/share/zoneinfo/northamerica user/thompsa/vaptq/share/zoneinfo/zone.tab user/thompsa/vaptq/sys/ (props changed) user/thompsa/vaptq/sys/Makefile user/thompsa/vaptq/sys/amd64/amd64/busdma_machdep.c user/thompsa/vaptq/sys/amd64/amd64/cpu_switch.S user/thompsa/vaptq/sys/amd64/amd64/exception.S user/thompsa/vaptq/sys/amd64/amd64/fpu.c user/thompsa/vaptq/sys/amd64/amd64/identcpu.c user/thompsa/vaptq/sys/amd64/amd64/io_apic.c user/thompsa/vaptq/sys/amd64/amd64/local_apic.c user/thompsa/vaptq/sys/amd64/amd64/machdep.c user/thompsa/vaptq/sys/amd64/amd64/mp_machdep.c user/thompsa/vaptq/sys/amd64/amd64/msi.c user/thompsa/vaptq/sys/amd64/amd64/pmap.c user/thompsa/vaptq/sys/amd64/conf/DEFAULTS user/thompsa/vaptq/sys/amd64/conf/GENERIC user/thompsa/vaptq/sys/amd64/conf/NOTES user/thompsa/vaptq/sys/amd64/ia32/ia32_signal.c user/thompsa/vaptq/sys/amd64/ia32/ia32_sigtramp.S user/thompsa/vaptq/sys/amd64/include/apicvar.h user/thompsa/vaptq/sys/amd64/include/cpufunc.h user/thompsa/vaptq/sys/amd64/include/fpu.h user/thompsa/vaptq/sys/amd64/include/intr_machdep.h user/thompsa/vaptq/sys/amd64/include/legacyvar.h user/thompsa/vaptq/sys/amd64/linux32/linux32_locore.s user/thompsa/vaptq/sys/amd64/linux32/linux32_machdep.c user/thompsa/vaptq/sys/amd64/linux32/linux32_sysvec.c user/thompsa/vaptq/sys/amd64/pci/pci_bus.c user/thompsa/vaptq/sys/arm/arm/busdma_machdep.c user/thompsa/vaptq/sys/arm/arm/dump_machdep.c user/thompsa/vaptq/sys/arm/arm/elf_trampoline.c user/thompsa/vaptq/sys/arm/arm/genassym.c user/thompsa/vaptq/sys/arm/arm/machdep.c user/thompsa/vaptq/sys/arm/arm/pmap.c user/thompsa/vaptq/sys/arm/arm/swtch.S user/thompsa/vaptq/sys/arm/arm/vm_machdep.c user/thompsa/vaptq/sys/arm/at91/at91.c user/thompsa/vaptq/sys/arm/at91/at91_mci.c user/thompsa/vaptq/sys/arm/at91/at91_twi.c user/thompsa/vaptq/sys/arm/at91/at91_twireg.h user/thompsa/vaptq/sys/arm/at91/at91var.h user/thompsa/vaptq/sys/arm/at91/files.at91 user/thompsa/vaptq/sys/arm/at91/uart_bus_at91usart.c user/thompsa/vaptq/sys/arm/at91/uart_cpu_at91rm9200usart.c user/thompsa/vaptq/sys/arm/at91/uart_dev_at91usart.c user/thompsa/vaptq/sys/arm/conf/AVILA user/thompsa/vaptq/sys/arm/conf/AVILA.hints user/thompsa/vaptq/sys/arm/conf/BWCT user/thompsa/vaptq/sys/arm/conf/CAMBRIA user/thompsa/vaptq/sys/arm/conf/HL200 user/thompsa/vaptq/sys/arm/conf/KB920X user/thompsa/vaptq/sys/arm/conf/NSLU user/thompsa/vaptq/sys/arm/include/atomic.h user/thompsa/vaptq/sys/arm/include/proc.h user/thompsa/vaptq/sys/arm/include/sysarch.h user/thompsa/vaptq/sys/arm/include/vmparam.h user/thompsa/vaptq/sys/arm/mv/files.mv user/thompsa/vaptq/sys/arm/sa11x0/assabet_machdep.c user/thompsa/vaptq/sys/arm/xscale/ixp425/avila_machdep.c user/thompsa/vaptq/sys/arm/xscale/ixp425/files.ixp425 user/thompsa/vaptq/sys/arm/xscale/ixp425/ixp425.c user/thompsa/vaptq/sys/arm/xscale/ixp425/ixp425reg.h user/thompsa/vaptq/sys/boot/Makefile user/thompsa/vaptq/sys/boot/Makefile.inc user/thompsa/vaptq/sys/boot/common/loader.8 user/thompsa/vaptq/sys/boot/common/module.c user/thompsa/vaptq/sys/boot/forth/loader.conf user/thompsa/vaptq/sys/boot/i386/btx/btx/btx.S user/thompsa/vaptq/sys/boot/i386/loader/Makefile user/thompsa/vaptq/sys/boot/i386/pxeldr/pxeboot.8 user/thompsa/vaptq/sys/boot/ia64/common/Makefile user/thompsa/vaptq/sys/boot/ia64/efi/Makefile user/thompsa/vaptq/sys/boot/ia64/ski/Makefile user/thompsa/vaptq/sys/boot/pc98/loader/Makefile user/thompsa/vaptq/sys/boot/powerpc/ofw/Makefile user/thompsa/vaptq/sys/boot/sparc64/loader/Makefile user/thompsa/vaptq/sys/boot/sparc64/loader/main.c user/thompsa/vaptq/sys/cam/cam_periph.c user/thompsa/vaptq/sys/cam/cam_xpt.c user/thompsa/vaptq/sys/cam/scsi/scsi_cd.c user/thompsa/vaptq/sys/cam/scsi/scsi_da.c user/thompsa/vaptq/sys/cam/scsi/scsi_low.c user/thompsa/vaptq/sys/cam/scsi/scsi_pass.c user/thompsa/vaptq/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c user/thompsa/vaptq/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c user/thompsa/vaptq/sys/compat/linprocfs/linprocfs.c user/thompsa/vaptq/sys/compat/linux/linux_file.c user/thompsa/vaptq/sys/compat/linux/linux_getcwd.c user/thompsa/vaptq/sys/compat/linux/linux_ioctl.c user/thompsa/vaptq/sys/compat/linux/linux_stats.c user/thompsa/vaptq/sys/compat/ndis/kern_ndis.c user/thompsa/vaptq/sys/compat/ndis/kern_windrv.c user/thompsa/vaptq/sys/compat/ndis/subr_hal.c user/thompsa/vaptq/sys/compat/ndis/subr_ndis.c user/thompsa/vaptq/sys/compat/ndis/subr_ntoskrnl.c user/thompsa/vaptq/sys/compat/ndis/subr_usbd.c user/thompsa/vaptq/sys/compat/ndis/winx32_wrap.S user/thompsa/vaptq/sys/compat/svr4/svr4_misc.c user/thompsa/vaptq/sys/compat/svr4/svr4_sockio.c user/thompsa/vaptq/sys/compat/svr4/svr4_types.h user/thompsa/vaptq/sys/conf/NOTES user/thompsa/vaptq/sys/conf/files user/thompsa/vaptq/sys/conf/files.amd64 user/thompsa/vaptq/sys/conf/files.i386 user/thompsa/vaptq/sys/conf/files.ia64 user/thompsa/vaptq/sys/conf/files.pc98 user/thompsa/vaptq/sys/conf/files.powerpc user/thompsa/vaptq/sys/conf/files.sparc64 user/thompsa/vaptq/sys/conf/kern.mk user/thompsa/vaptq/sys/conf/kern.pre.mk user/thompsa/vaptq/sys/conf/kmod.mk user/thompsa/vaptq/sys/conf/options user/thompsa/vaptq/sys/conf/options.amd64 user/thompsa/vaptq/sys/conf/options.i386 user/thompsa/vaptq/sys/conf/options.ia64 user/thompsa/vaptq/sys/conf/options.mips user/thompsa/vaptq/sys/conf/options.pc98 user/thompsa/vaptq/sys/contrib/altq/altq/altq_subr.c user/thompsa/vaptq/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c user/thompsa/vaptq/sys/contrib/pf/ (props changed) user/thompsa/vaptq/sys/contrib/pf/net/pf_if.c user/thompsa/vaptq/sys/contrib/pf/net/pf_ioctl.c user/thompsa/vaptq/sys/crypto/via/padlock.c user/thompsa/vaptq/sys/dev/aac/aac.c user/thompsa/vaptq/sys/dev/aac/aac_debug.c user/thompsa/vaptq/sys/dev/aac/aac_pci.c user/thompsa/vaptq/sys/dev/aac/aacreg.h user/thompsa/vaptq/sys/dev/aac/aacvar.h user/thompsa/vaptq/sys/dev/acpi_support/acpi_panasonic.c user/thompsa/vaptq/sys/dev/acpica/acpi_cpu.c user/thompsa/vaptq/sys/dev/acpica/acpi_pcib_acpi.c user/thompsa/vaptq/sys/dev/adb/adb_mouse.c user/thompsa/vaptq/sys/dev/ae/if_ae.c user/thompsa/vaptq/sys/dev/agp/agp.c user/thompsa/vaptq/sys/dev/agp/agp_via.c user/thompsa/vaptq/sys/dev/an/if_an.c user/thompsa/vaptq/sys/dev/an/if_anreg.h user/thompsa/vaptq/sys/dev/arcmsr/arcmsr.c user/thompsa/vaptq/sys/dev/ata/ata-all.c user/thompsa/vaptq/sys/dev/ata/ata-all.h user/thompsa/vaptq/sys/dev/ata/ata-card.c user/thompsa/vaptq/sys/dev/ata/ata-cbus.c user/thompsa/vaptq/sys/dev/ata/ata-disk.c user/thompsa/vaptq/sys/dev/ata/ata-dma.c user/thompsa/vaptq/sys/dev/ata/ata-isa.c user/thompsa/vaptq/sys/dev/ata/ata-pci.c user/thompsa/vaptq/sys/dev/ata/ata-pci.h user/thompsa/vaptq/sys/dev/ata/ata-queue.c user/thompsa/vaptq/sys/dev/ata/ata-raid.c user/thompsa/vaptq/sys/dev/ata/ata-raid.h user/thompsa/vaptq/sys/dev/ata/ata-sata.c user/thompsa/vaptq/sys/dev/ata/atapi-cam.c user/thompsa/vaptq/sys/dev/ata/atapi-cd.c user/thompsa/vaptq/sys/dev/ata/atapi-fd.c user/thompsa/vaptq/sys/dev/ata/atapi-tape.c user/thompsa/vaptq/sys/dev/ata/chipsets/ata-acard.c user/thompsa/vaptq/sys/dev/ata/chipsets/ata-acerlabs.c user/thompsa/vaptq/sys/dev/ata/chipsets/ata-ahci.c user/thompsa/vaptq/sys/dev/ata/chipsets/ata-highpoint.c user/thompsa/vaptq/sys/dev/ata/chipsets/ata-intel.c user/thompsa/vaptq/sys/dev/ata/chipsets/ata-jmicron.c user/thompsa/vaptq/sys/dev/ata/chipsets/ata-marvell.c user/thompsa/vaptq/sys/dev/ata/chipsets/ata-netcell.c user/thompsa/vaptq/sys/dev/ata/chipsets/ata-nvidia.c user/thompsa/vaptq/sys/dev/ata/chipsets/ata-promise.c user/thompsa/vaptq/sys/dev/ata/chipsets/ata-serverworks.c user/thompsa/vaptq/sys/dev/ata/chipsets/ata-siliconimage.c user/thompsa/vaptq/sys/dev/ata/chipsets/ata-sis.c user/thompsa/vaptq/sys/dev/ata/chipsets/ata-via.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ah.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ah.h user/thompsa/vaptq/sys/dev/ath/ath_hal/ah_internal.h user/thompsa/vaptq/sys/dev/ath/ath_hal/ah_regdomain.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5210/ar5210.h user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5211/ar5211.h user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5212/ar2316.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5212/ar2317.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5212/ar2413.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5212/ar2425.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5212/ar5111.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5212/ar5112.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5212/ar5212.h user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5212/ar5413.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5312/ar5312.h user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar2133.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar5416.h user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar5416.ini user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar5416reg.h user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar9160.ini user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c user/thompsa/vaptq/sys/dev/ath/if_ath.c user/thompsa/vaptq/sys/dev/ath/if_athioctl.h user/thompsa/vaptq/sys/dev/ath/if_athvar.h user/thompsa/vaptq/sys/dev/atkbdc/atkbdc_isa.c user/thompsa/vaptq/sys/dev/bce/if_bce.c user/thompsa/vaptq/sys/dev/bce/if_bcefw.h user/thompsa/vaptq/sys/dev/bce/if_bcereg.h user/thompsa/vaptq/sys/dev/bge/if_bge.c user/thompsa/vaptq/sys/dev/bm/if_bm.c user/thompsa/vaptq/sys/dev/cardbus/cardbus.c user/thompsa/vaptq/sys/dev/cardbus/cardbus_device.c user/thompsa/vaptq/sys/dev/ce/if_ce.c user/thompsa/vaptq/sys/dev/cfi/cfi_core.c user/thompsa/vaptq/sys/dev/cfi/cfi_dev.c user/thompsa/vaptq/sys/dev/cfi/cfi_reg.h user/thompsa/vaptq/sys/dev/cfi/cfi_var.h user/thompsa/vaptq/sys/dev/ciss/ciss.c user/thompsa/vaptq/sys/dev/cm/smc90cx6.c user/thompsa/vaptq/sys/dev/cp/if_cp.c user/thompsa/vaptq/sys/dev/ctau/if_ct.c user/thompsa/vaptq/sys/dev/cx/if_cx.c user/thompsa/vaptq/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c user/thompsa/vaptq/sys/dev/de/if_de.c user/thompsa/vaptq/sys/dev/drm/drmP.h user/thompsa/vaptq/sys/dev/drm/drm_bufs.c user/thompsa/vaptq/sys/dev/drm/drm_drv.c user/thompsa/vaptq/sys/dev/drm/drm_irq.c user/thompsa/vaptq/sys/dev/drm/drm_lock.c user/thompsa/vaptq/sys/dev/drm/i915_dma.c user/thompsa/vaptq/sys/dev/drm/i915_drv.c user/thompsa/vaptq/sys/dev/drm/i915_drv.h user/thompsa/vaptq/sys/dev/drm/i915_irq.c user/thompsa/vaptq/sys/dev/drm/radeon_irq.c user/thompsa/vaptq/sys/dev/exca/exca.c user/thompsa/vaptq/sys/dev/firewire/firewire.c user/thompsa/vaptq/sys/dev/firewire/firewire.h user/thompsa/vaptq/sys/dev/firewire/fwohci.c user/thompsa/vaptq/sys/dev/firewire/fwohci_pci.c user/thompsa/vaptq/sys/dev/firewire/fwohcireg.h user/thompsa/vaptq/sys/dev/firewire/fwohcivar.h user/thompsa/vaptq/sys/dev/firewire/fwphyreg.h user/thompsa/vaptq/sys/dev/firewire/if_fwe.c user/thompsa/vaptq/sys/dev/firewire/if_fwip.c user/thompsa/vaptq/sys/dev/firewire/sbp.c user/thompsa/vaptq/sys/dev/fxp/if_fxp.c user/thompsa/vaptq/sys/dev/hifn/hifn7751.c user/thompsa/vaptq/sys/dev/hwpmc/hwpmc_core.c user/thompsa/vaptq/sys/dev/hwpmc/hwpmc_intel.c user/thompsa/vaptq/sys/dev/hwpmc/pmc_events.h user/thompsa/vaptq/sys/dev/ichsmb/ichsmb.c user/thompsa/vaptq/sys/dev/if_ndis/if_ndis.c user/thompsa/vaptq/sys/dev/if_ndis/if_ndis_pccard.c user/thompsa/vaptq/sys/dev/if_ndis/if_ndis_pci.c user/thompsa/vaptq/sys/dev/if_ndis/if_ndis_usb.c user/thompsa/vaptq/sys/dev/iicbus/if_ic.c user/thompsa/vaptq/sys/dev/iicbus/iic.c user/thompsa/vaptq/sys/dev/iicbus/iic.h user/thompsa/vaptq/sys/dev/iicbus/iicbb.c user/thompsa/vaptq/sys/dev/iicbus/iicbus.c user/thompsa/vaptq/sys/dev/iicbus/iicsmb.c user/thompsa/vaptq/sys/dev/ipmi/ipmi_acpi.c user/thompsa/vaptq/sys/dev/ipmi/ipmi_smbios.c user/thompsa/vaptq/sys/dev/iscsi/initiator/isc_subr.c user/thompsa/vaptq/sys/dev/iwn/if_iwn.c user/thompsa/vaptq/sys/dev/kbdmux/kbdmux.c user/thompsa/vaptq/sys/dev/lmc/if_lmc.c user/thompsa/vaptq/sys/dev/lmc/if_lmc.h user/thompsa/vaptq/sys/dev/mca/mca_bus.c user/thompsa/vaptq/sys/dev/md/md.c user/thompsa/vaptq/sys/dev/mmc/mmc.c user/thompsa/vaptq/sys/dev/mmc/mmcreg.h user/thompsa/vaptq/sys/dev/mmc/mmcsd.c user/thompsa/vaptq/sys/dev/mxge/eth_z8e.h user/thompsa/vaptq/sys/dev/mxge/ethp_z8e.h user/thompsa/vaptq/sys/dev/mxge/if_mxge.c user/thompsa/vaptq/sys/dev/mxge/if_mxge_var.h user/thompsa/vaptq/sys/dev/mxge/mxge_mcp.h user/thompsa/vaptq/sys/dev/mxge/rss_eth_z8e.h user/thompsa/vaptq/sys/dev/mxge/rss_ethp_z8e.h user/thompsa/vaptq/sys/dev/my/if_my.c user/thompsa/vaptq/sys/dev/nsp/nsp.c user/thompsa/vaptq/sys/dev/nve/if_nve.c user/thompsa/vaptq/sys/dev/pccard/card_if.m user/thompsa/vaptq/sys/dev/pccard/pccard.c user/thompsa/vaptq/sys/dev/pccard/pccard_cis.c user/thompsa/vaptq/sys/dev/pccard/pccardvarp.h user/thompsa/vaptq/sys/dev/pccbb/pccbb.c user/thompsa/vaptq/sys/dev/pccbb/pccbb_pci.c user/thompsa/vaptq/sys/dev/pccbb/pccbbvar.h user/thompsa/vaptq/sys/dev/pci/pci.c user/thompsa/vaptq/sys/dev/pci/pci_user.c user/thompsa/vaptq/sys/dev/pci/pcireg.h user/thompsa/vaptq/sys/dev/pcn/if_pcn.c user/thompsa/vaptq/sys/dev/ppbus/if_plip.c user/thompsa/vaptq/sys/dev/ppbus/immio.c user/thompsa/vaptq/sys/dev/ppbus/lpbb.c user/thompsa/vaptq/sys/dev/ppbus/lpt.c user/thompsa/vaptq/sys/dev/ppbus/pcfclock.c user/thompsa/vaptq/sys/dev/ppbus/ppb_1284.c user/thompsa/vaptq/sys/dev/ppbus/ppb_base.c user/thompsa/vaptq/sys/dev/ppbus/ppb_msq.c user/thompsa/vaptq/sys/dev/ppbus/ppbconf.c user/thompsa/vaptq/sys/dev/ppbus/ppbconf.h user/thompsa/vaptq/sys/dev/ppbus/ppi.c user/thompsa/vaptq/sys/dev/ppbus/pps.c user/thompsa/vaptq/sys/dev/ppbus/vpo.c user/thompsa/vaptq/sys/dev/ppbus/vpoio.c user/thompsa/vaptq/sys/dev/ppc/ppc.c user/thompsa/vaptq/sys/dev/ppc/ppc_acpi.c user/thompsa/vaptq/sys/dev/ppc/ppc_isa.c user/thompsa/vaptq/sys/dev/ppc/ppc_pci.c user/thompsa/vaptq/sys/dev/ppc/ppc_puc.c user/thompsa/vaptq/sys/dev/ppc/ppcreg.h user/thompsa/vaptq/sys/dev/ppc/ppcvar.h user/thompsa/vaptq/sys/dev/puc/pucdata.c user/thompsa/vaptq/sys/dev/re/if_re.c user/thompsa/vaptq/sys/dev/safe/safe.c user/thompsa/vaptq/sys/dev/scc/scc_if.m user/thompsa/vaptq/sys/dev/sdhci/sdhci.c user/thompsa/vaptq/sys/dev/si/si.c user/thompsa/vaptq/sys/dev/sis/if_sis.c user/thompsa/vaptq/sys/dev/smbus/smb.c user/thompsa/vaptq/sys/dev/snp/snp.c user/thompsa/vaptq/sys/dev/sound/pci/ds1.c user/thompsa/vaptq/sys/dev/sound/pci/envy24.c user/thompsa/vaptq/sys/dev/sound/pci/envy24ht.c user/thompsa/vaptq/sys/dev/sound/pci/hda/hdac.c user/thompsa/vaptq/sys/dev/sound/pci/spicds.c user/thompsa/vaptq/sys/dev/speaker/spkr.c user/thompsa/vaptq/sys/dev/stg/tmc18c30.c user/thompsa/vaptq/sys/dev/streams/streams.c user/thompsa/vaptq/sys/dev/tl/if_tl.c user/thompsa/vaptq/sys/dev/tsec/if_tsec.c user/thompsa/vaptq/sys/dev/tsec/if_tsec.h user/thompsa/vaptq/sys/dev/tsec/if_tsec_ocp.c user/thompsa/vaptq/sys/dev/tsec/if_tsecreg.h user/thompsa/vaptq/sys/dev/tx/if_tx.c user/thompsa/vaptq/sys/dev/txp/3c990img.h user/thompsa/vaptq/sys/dev/txp/if_txp.c user/thompsa/vaptq/sys/dev/txp/if_txpreg.h user/thompsa/vaptq/sys/dev/uart/uart_bus_pci.c user/thompsa/vaptq/sys/dev/wpi/if_wpi.c user/thompsa/vaptq/sys/dev/xen/blkback/blkback.c user/thompsa/vaptq/sys/dev/xen/netback/netback.c user/thompsa/vaptq/sys/dev/xen/netfront/netfront.c user/thompsa/vaptq/sys/fs/cd9660/cd9660_lookup.c user/thompsa/vaptq/sys/fs/cd9660/cd9660_node.c user/thompsa/vaptq/sys/fs/cd9660/cd9660_node.h user/thompsa/vaptq/sys/fs/cd9660/cd9660_rrip.c user/thompsa/vaptq/sys/fs/cd9660/cd9660_vfsops.c user/thompsa/vaptq/sys/fs/cd9660/cd9660_vnops.c user/thompsa/vaptq/sys/fs/coda/coda_vfsops.c user/thompsa/vaptq/sys/fs/coda/coda_vnops.c user/thompsa/vaptq/sys/fs/devfs/devfs_devs.c user/thompsa/vaptq/sys/fs/devfs/devfs_vnops.c user/thompsa/vaptq/sys/fs/fifofs/fifo_vnops.c user/thompsa/vaptq/sys/fs/hpfs/hpfs_vfsops.c user/thompsa/vaptq/sys/fs/msdosfs/denode.h user/thompsa/vaptq/sys/fs/msdosfs/msdosfs_denode.c user/thompsa/vaptq/sys/fs/msdosfs/msdosfs_vfsops.c user/thompsa/vaptq/sys/fs/msdosfs/msdosfs_vnops.c user/thompsa/vaptq/sys/fs/msdosfs/msdosfsmount.h user/thompsa/vaptq/sys/fs/nullfs/null_vnops.c user/thompsa/vaptq/sys/fs/nwfs/nwfs_subr.c user/thompsa/vaptq/sys/fs/nwfs/nwfs_vnops.c user/thompsa/vaptq/sys/fs/procfs/procfs.c user/thompsa/vaptq/sys/fs/pseudofs/pseudofs_vnops.c user/thompsa/vaptq/sys/fs/smbfs/smbfs_vnops.c user/thompsa/vaptq/sys/fs/tmpfs/tmpfs.h user/thompsa/vaptq/sys/fs/tmpfs/tmpfs_subr.c user/thompsa/vaptq/sys/fs/tmpfs/tmpfs_vnops.c user/thompsa/vaptq/sys/fs/udf/ecma167-udf.h user/thompsa/vaptq/sys/fs/udf/udf.h user/thompsa/vaptq/sys/fs/udf/udf_vfsops.c user/thompsa/vaptq/sys/fs/udf/udf_vnops.c user/thompsa/vaptq/sys/geom/geom.h user/thompsa/vaptq/sys/geom/geom_dev.c user/thompsa/vaptq/sys/geom/geom_subr.c user/thompsa/vaptq/sys/geom/label/g_label_msdosfs.c user/thompsa/vaptq/sys/geom/part/g_part.c user/thompsa/vaptq/sys/geom/part/g_part.h user/thompsa/vaptq/sys/geom/part/g_part_apm.c user/thompsa/vaptq/sys/geom/part/g_part_bsd.c user/thompsa/vaptq/sys/geom/part/g_part_gpt.c user/thompsa/vaptq/sys/geom/part/g_part_if.m user/thompsa/vaptq/sys/geom/part/g_part_mbr.c user/thompsa/vaptq/sys/geom/part/g_part_pc98.c user/thompsa/vaptq/sys/geom/part/g_part_vtoc8.c user/thompsa/vaptq/sys/i386/acpica/acpi_wakeup.c user/thompsa/vaptq/sys/i386/conf/DEFAULTS user/thompsa/vaptq/sys/i386/conf/GENERIC user/thompsa/vaptq/sys/i386/conf/NOTES user/thompsa/vaptq/sys/i386/conf/XBOX user/thompsa/vaptq/sys/i386/cpufreq/smist.c user/thompsa/vaptq/sys/i386/i386/busdma_machdep.c user/thompsa/vaptq/sys/i386/i386/identcpu.c user/thompsa/vaptq/sys/i386/i386/io_apic.c user/thompsa/vaptq/sys/i386/i386/local_apic.c user/thompsa/vaptq/sys/i386/i386/locore.s user/thompsa/vaptq/sys/i386/i386/mp_machdep.c user/thompsa/vaptq/sys/i386/i386/msi.c user/thompsa/vaptq/sys/i386/i386/pmap.c user/thompsa/vaptq/sys/i386/i386/swtch.s user/thompsa/vaptq/sys/i386/i386/vm86.c user/thompsa/vaptq/sys/i386/i386/vm_machdep.c user/thompsa/vaptq/sys/i386/ibcs2/ibcs2_misc.c user/thompsa/vaptq/sys/i386/ibcs2/ibcs2_sysi86.c user/thompsa/vaptq/sys/i386/include/apicvar.h user/thompsa/vaptq/sys/i386/include/cpufunc.h user/thompsa/vaptq/sys/i386/include/intr_machdep.h user/thompsa/vaptq/sys/i386/isa/npx.c user/thompsa/vaptq/sys/i386/linux/linux_locore.s user/thompsa/vaptq/sys/i386/linux/linux_machdep.c user/thompsa/vaptq/sys/i386/svr4/svr4_locore.s user/thompsa/vaptq/sys/i386/xen/clock.c user/thompsa/vaptq/sys/i386/xen/mp_machdep.c user/thompsa/vaptq/sys/i386/xen/pmap.c user/thompsa/vaptq/sys/i386/xen/xen_machdep.c user/thompsa/vaptq/sys/ia64/conf/GENERIC user/thompsa/vaptq/sys/ia64/conf/NOTES user/thompsa/vaptq/sys/ia64/ia64/busdma_machdep.c user/thompsa/vaptq/sys/ia64/ia64/mca.c user/thompsa/vaptq/sys/ia64/ia64/mp_machdep.c user/thompsa/vaptq/sys/ia64/include/mca.h user/thompsa/vaptq/sys/kern/imgact_elf.c user/thompsa/vaptq/sys/kern/kern_condvar.c user/thompsa/vaptq/sys/kern/kern_cons.c user/thompsa/vaptq/sys/kern/kern_descrip.c user/thompsa/vaptq/sys/kern/kern_exec.c user/thompsa/vaptq/sys/kern/kern_exit.c user/thompsa/vaptq/sys/kern/kern_jail.c user/thompsa/vaptq/sys/kern/kern_linker.c user/thompsa/vaptq/sys/kern/kern_lock.c user/thompsa/vaptq/sys/kern/kern_malloc.c user/thompsa/vaptq/sys/kern/kern_mib.c user/thompsa/vaptq/sys/kern/kern_osd.c user/thompsa/vaptq/sys/kern/kern_poll.c user/thompsa/vaptq/sys/kern/kern_priv.c user/thompsa/vaptq/sys/kern/kern_proc.c user/thompsa/vaptq/sys/kern/kern_rwlock.c user/thompsa/vaptq/sys/kern/kern_sig.c user/thompsa/vaptq/sys/kern/kern_synch.c user/thompsa/vaptq/sys/kern/kern_sysctl.c user/thompsa/vaptq/sys/kern/kern_thr.c user/thompsa/vaptq/sys/kern/kern_time.c user/thompsa/vaptq/sys/kern/kern_timeout.c user/thompsa/vaptq/sys/kern/kern_uuid.c user/thompsa/vaptq/sys/kern/link_elf.c user/thompsa/vaptq/sys/kern/link_elf_obj.c user/thompsa/vaptq/sys/kern/sched_4bsd.c user/thompsa/vaptq/sys/kern/sched_ule.c user/thompsa/vaptq/sys/kern/subr_autoconf.c user/thompsa/vaptq/sys/kern/subr_bus.c user/thompsa/vaptq/sys/kern/subr_clist.c user/thompsa/vaptq/sys/kern/subr_devstat.c user/thompsa/vaptq/sys/kern/subr_disk.c user/thompsa/vaptq/sys/kern/subr_firmware.c user/thompsa/vaptq/sys/kern/subr_kobj.c user/thompsa/vaptq/sys/kern/subr_prf.c user/thompsa/vaptq/sys/kern/subr_prof.c user/thompsa/vaptq/sys/kern/subr_rman.c user/thompsa/vaptq/sys/kern/subr_rtc.c user/thompsa/vaptq/sys/kern/subr_smp.c user/thompsa/vaptq/sys/kern/subr_taskqueue.c user/thompsa/vaptq/sys/kern/subr_witness.c user/thompsa/vaptq/sys/kern/sys_generic.c user/thompsa/vaptq/sys/kern/tty.c user/thompsa/vaptq/sys/kern/tty_info.c user/thompsa/vaptq/sys/kern/tty_inq.c user/thompsa/vaptq/sys/kern/tty_outq.c user/thompsa/vaptq/sys/kern/tty_pts.c user/thompsa/vaptq/sys/kern/tty_pty.c user/thompsa/vaptq/sys/kern/tty_ttydisc.c user/thompsa/vaptq/sys/kern/uipc_debug.c user/thompsa/vaptq/sys/kern/uipc_socket.c user/thompsa/vaptq/sys/kern/vfs_aio.c user/thompsa/vaptq/sys/kern/vfs_bio.c user/thompsa/vaptq/sys/kern/vfs_cache.c user/thompsa/vaptq/sys/kern/vfs_init.c user/thompsa/vaptq/sys/kern/vfs_mount.c user/thompsa/vaptq/sys/kern/vfs_subr.c user/thompsa/vaptq/sys/kern/vfs_syscalls.c user/thompsa/vaptq/sys/legacy/dev/usb/ (props changed) user/thompsa/vaptq/sys/libkern/crc32.c user/thompsa/vaptq/sys/libkern/strtouq.c user/thompsa/vaptq/sys/mips/include/fpu.h user/thompsa/vaptq/sys/mips/include/frame.h user/thompsa/vaptq/sys/mips/include/pmap.h user/thompsa/vaptq/sys/mips/mips/busdma_machdep.c user/thompsa/vaptq/sys/mips/mips/in_cksum.c user/thompsa/vaptq/sys/mips/mips/pmap.c user/thompsa/vaptq/sys/modules/Makefile user/thompsa/vaptq/sys/modules/acpi/acpi/Makefile user/thompsa/vaptq/sys/modules/agp/Makefile user/thompsa/vaptq/sys/modules/ata/atausb/Makefile user/thompsa/vaptq/sys/modules/dtrace/dtrace/Makefile user/thompsa/vaptq/sys/modules/geom/geom_part/Makefile user/thompsa/vaptq/sys/modules/libalias/libalias/Makefile user/thompsa/vaptq/sys/modules/linux/Makefile user/thompsa/vaptq/sys/modules/netgraph/bluetooth/ubt/Makefile user/thompsa/vaptq/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile user/thompsa/vaptq/sys/modules/sound/driver/Makefile user/thompsa/vaptq/sys/modules/sound/driver/uaudio/Makefile user/thompsa/vaptq/sys/modules/svr4/Makefile user/thompsa/vaptq/sys/net/bridgestp.c user/thompsa/vaptq/sys/net/if.c user/thompsa/vaptq/sys/net/if.h user/thompsa/vaptq/sys/net/if_bridge.c user/thompsa/vaptq/sys/net/if_ef.c user/thompsa/vaptq/sys/net/if_ethersubr.c user/thompsa/vaptq/sys/net/if_llatbl.c user/thompsa/vaptq/sys/net/if_loop.c user/thompsa/vaptq/sys/net/if_mib.c user/thompsa/vaptq/sys/net/if_spppsubr.c user/thompsa/vaptq/sys/net/if_vlan.c user/thompsa/vaptq/sys/net/raw_cb.c user/thompsa/vaptq/sys/net/raw_usrreq.c user/thompsa/vaptq/sys/net/rtsock.c user/thompsa/vaptq/sys/net/vnet.h user/thompsa/vaptq/sys/net80211/_ieee80211.h user/thompsa/vaptq/sys/net80211/ieee80211.c user/thompsa/vaptq/sys/net80211/ieee80211.h user/thompsa/vaptq/sys/net80211/ieee80211_adhoc.c user/thompsa/vaptq/sys/net80211/ieee80211_crypto.h user/thompsa/vaptq/sys/net80211/ieee80211_ddb.c user/thompsa/vaptq/sys/net80211/ieee80211_freebsd.h user/thompsa/vaptq/sys/net80211/ieee80211_ht.h user/thompsa/vaptq/sys/net80211/ieee80211_ioctl.c user/thompsa/vaptq/sys/net80211/ieee80211_ioctl.h user/thompsa/vaptq/sys/net80211/ieee80211_node.c user/thompsa/vaptq/sys/net80211/ieee80211_node.h user/thompsa/vaptq/sys/net80211/ieee80211_output.c user/thompsa/vaptq/sys/net80211/ieee80211_phy.c user/thompsa/vaptq/sys/net80211/ieee80211_proto.c user/thompsa/vaptq/sys/net80211/ieee80211_proto.h user/thompsa/vaptq/sys/net80211/ieee80211_regdomain.c user/thompsa/vaptq/sys/net80211/ieee80211_regdomain.h user/thompsa/vaptq/sys/net80211/ieee80211_scan.c user/thompsa/vaptq/sys/net80211/ieee80211_scan_sta.c user/thompsa/vaptq/sys/net80211/ieee80211_var.h user/thompsa/vaptq/sys/netatalk/ddp_usrreq.c user/thompsa/vaptq/sys/netgraph/atm/ng_atm.c user/thompsa/vaptq/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c user/thompsa/vaptq/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c user/thompsa/vaptq/sys/netgraph/ng_ether.c user/thompsa/vaptq/sys/netgraph/ng_gif.c user/thompsa/vaptq/sys/netinet/if_ether.c user/thompsa/vaptq/sys/netinet/if_ether.h user/thompsa/vaptq/sys/netinet/igmp.c user/thompsa/vaptq/sys/netinet/in.c user/thompsa/vaptq/sys/netinet/in_mcast.c user/thompsa/vaptq/sys/netinet/in_pcb.c user/thompsa/vaptq/sys/netinet/in_proto.c user/thompsa/vaptq/sys/netinet/in_rmx.c user/thompsa/vaptq/sys/netinet/in_systm.h user/thompsa/vaptq/sys/netinet/ip.h user/thompsa/vaptq/sys/netinet/ip_divert.c user/thompsa/vaptq/sys/netinet/ip_dummynet.c user/thompsa/vaptq/sys/netinet/ip_fw.h user/thompsa/vaptq/sys/netinet/ip_fw2.c user/thompsa/vaptq/sys/netinet/ip_fw_nat.c user/thompsa/vaptq/sys/netinet/ip_fw_pfil.c user/thompsa/vaptq/sys/netinet/ip_icmp.c user/thompsa/vaptq/sys/netinet/ip_icmp.h user/thompsa/vaptq/sys/netinet/ip_input.c user/thompsa/vaptq/sys/netinet/ip_ipsec.c user/thompsa/vaptq/sys/netinet/ip_options.c user/thompsa/vaptq/sys/netinet/ip_output.c user/thompsa/vaptq/sys/netinet/libalias/alias.c user/thompsa/vaptq/sys/netinet/libalias/alias_db.c user/thompsa/vaptq/sys/netinet/libalias/alias_local.h user/thompsa/vaptq/sys/netinet/raw_ip.c user/thompsa/vaptq/sys/netinet/sctp_auth.c user/thompsa/vaptq/sys/netinet/sctp_constants.h user/thompsa/vaptq/sys/netinet/sctp_crc32.c user/thompsa/vaptq/sys/netinet/sctp_crc32.h user/thompsa/vaptq/sys/netinet/sctp_header.h user/thompsa/vaptq/sys/netinet/sctp_input.c user/thompsa/vaptq/sys/netinet/sctp_os_bsd.h user/thompsa/vaptq/sys/netinet/sctp_output.c user/thompsa/vaptq/sys/netinet/sctp_output.h user/thompsa/vaptq/sys/netinet/sctp_pcb.c user/thompsa/vaptq/sys/netinet/sctp_pcb.h user/thompsa/vaptq/sys/netinet/sctp_structs.h user/thompsa/vaptq/sys/netinet/sctp_sysctl.c user/thompsa/vaptq/sys/netinet/sctp_uio.h user/thompsa/vaptq/sys/netinet/sctp_usrreq.c user/thompsa/vaptq/sys/netinet/sctputil.c user/thompsa/vaptq/sys/netinet/sctputil.h user/thompsa/vaptq/sys/netinet/tcp_debug.h user/thompsa/vaptq/sys/netinet/tcp_subr.c user/thompsa/vaptq/sys/netinet/tcp_usrreq.c user/thompsa/vaptq/sys/netinet/tcp_var.h user/thompsa/vaptq/sys/netinet/udp_usrreq.c user/thompsa/vaptq/sys/netinet/vinet.h user/thompsa/vaptq/sys/netinet6/frag6.c user/thompsa/vaptq/sys/netinet6/icmp6.c user/thompsa/vaptq/sys/netinet6/in6.c user/thompsa/vaptq/sys/netinet6/in6_gif.c user/thompsa/vaptq/sys/netinet6/in6_ifattach.c user/thompsa/vaptq/sys/netinet6/in6_pcb.c user/thompsa/vaptq/sys/netinet6/in6_proto.c user/thompsa/vaptq/sys/netinet6/in6_rmx.c user/thompsa/vaptq/sys/netinet6/in6_src.c user/thompsa/vaptq/sys/netinet6/ip6_forward.c user/thompsa/vaptq/sys/netinet6/ip6_input.c user/thompsa/vaptq/sys/netinet6/ip6_ipsec.c user/thompsa/vaptq/sys/netinet6/ip6_mroute.c user/thompsa/vaptq/sys/netinet6/ip6_output.c user/thompsa/vaptq/sys/netinet6/ip6_var.h user/thompsa/vaptq/sys/netinet6/nd6.c user/thompsa/vaptq/sys/netinet6/nd6_nbr.c user/thompsa/vaptq/sys/netinet6/nd6_rtr.c user/thompsa/vaptq/sys/netinet6/raw_ip6.c user/thompsa/vaptq/sys/netinet6/scope6.c user/thompsa/vaptq/sys/netinet6/sctp6_usrreq.c user/thompsa/vaptq/sys/netinet6/udp6_usrreq.c user/thompsa/vaptq/sys/netinet6/vinet6.h user/thompsa/vaptq/sys/netipsec/ipsec.c user/thompsa/vaptq/sys/netipsec/ipsec.h user/thompsa/vaptq/sys/netipsec/ipsec6.h user/thompsa/vaptq/sys/netipsec/ipsec_mbuf.c user/thompsa/vaptq/sys/netipsec/ipsec_output.c user/thompsa/vaptq/sys/netipsec/key.c user/thompsa/vaptq/sys/netipsec/key_debug.c user/thompsa/vaptq/sys/netipsec/keysock.c user/thompsa/vaptq/sys/netipsec/xform_ipip.c user/thompsa/vaptq/sys/nfs4client/nfs4_subs.c user/thompsa/vaptq/sys/nfsclient/bootp_subr.c user/thompsa/vaptq/sys/nfsclient/nfs_diskless.c user/thompsa/vaptq/sys/nfsclient/nfs_vfsops.c user/thompsa/vaptq/sys/nfsclient/nfs_vnops.c user/thompsa/vaptq/sys/nfsclient/nfsnode.h user/thompsa/vaptq/sys/nfsserver/nfs_serv.c user/thompsa/vaptq/sys/nfsserver/nfs_srvsubs.c user/thompsa/vaptq/sys/nfsserver/nfs_syscalls.c user/thompsa/vaptq/sys/opencrypto/cryptosoft.c user/thompsa/vaptq/sys/pc98/conf/GENERIC user/thompsa/vaptq/sys/pc98/conf/NOTES user/thompsa/vaptq/sys/pci/if_rl.c user/thompsa/vaptq/sys/pci/if_rlreg.h user/thompsa/vaptq/sys/powerpc/aim/machdep.c user/thompsa/vaptq/sys/powerpc/aim/swtch.S user/thompsa/vaptq/sys/powerpc/aim/trap.c user/thompsa/vaptq/sys/powerpc/aim/trap_subr.S user/thompsa/vaptq/sys/powerpc/booke/machdep.c user/thompsa/vaptq/sys/powerpc/booke/swtch.S user/thompsa/vaptq/sys/powerpc/booke/trap.c user/thompsa/vaptq/sys/powerpc/booke/trap_subr.S user/thompsa/vaptq/sys/powerpc/conf/GENERIC user/thompsa/vaptq/sys/powerpc/conf/MPC85XX user/thompsa/vaptq/sys/powerpc/conf/NOTES user/thompsa/vaptq/sys/powerpc/include/frame.h user/thompsa/vaptq/sys/powerpc/include/pcb.h user/thompsa/vaptq/sys/powerpc/include/pcpu.h user/thompsa/vaptq/sys/powerpc/powerpc/genassym.c user/thompsa/vaptq/sys/powerpc/powerpc/intr_machdep.c user/thompsa/vaptq/sys/rpc/clnt_rc.c user/thompsa/vaptq/sys/security/audit/audit_bsm.c user/thompsa/vaptq/sys/security/audit/audit_bsm_klib.c user/thompsa/vaptq/sys/security/audit/audit_pipe.c user/thompsa/vaptq/sys/security/audit/audit_private.h user/thompsa/vaptq/sys/security/mac/mac_audit.c user/thompsa/vaptq/sys/security/mac/mac_framework.c user/thompsa/vaptq/sys/security/mac/mac_priv.c user/thompsa/vaptq/sys/security/mac/mac_process.c user/thompsa/vaptq/sys/sparc64/conf/GENERIC user/thompsa/vaptq/sys/sparc64/include/bus_private.h user/thompsa/vaptq/sys/sparc64/include/vmparam.h user/thompsa/vaptq/sys/sparc64/sparc64/iommu.c user/thompsa/vaptq/sys/sun4v/conf/GENERIC user/thompsa/vaptq/sys/sun4v/include/vmparam.h user/thompsa/vaptq/sys/sys/_null.h user/thompsa/vaptq/sys/sys/bus_dma.h user/thompsa/vaptq/sys/sys/cdefs.h user/thompsa/vaptq/sys/sys/cfictl.h user/thompsa/vaptq/sys/sys/clist.h user/thompsa/vaptq/sys/sys/conf.h user/thompsa/vaptq/sys/sys/disk.h user/thompsa/vaptq/sys/sys/elf_common.h user/thompsa/vaptq/sys/sys/jail.h user/thompsa/vaptq/sys/sys/kobj.h user/thompsa/vaptq/sys/sys/libkern.h user/thompsa/vaptq/sys/sys/lockmgr.h user/thompsa/vaptq/sys/sys/malloc.h user/thompsa/vaptq/sys/sys/mount.h user/thompsa/vaptq/sys/sys/osd.h user/thompsa/vaptq/sys/sys/param.h user/thompsa/vaptq/sys/sys/pciio.h user/thompsa/vaptq/sys/sys/pcpu.h user/thompsa/vaptq/sys/sys/pmc.h user/thompsa/vaptq/sys/sys/syscallsubr.h user/thompsa/vaptq/sys/sys/sysctl.h user/thompsa/vaptq/sys/sys/tty.h user/thompsa/vaptq/sys/sys/ttyqueue.h user/thompsa/vaptq/sys/sys/types.h user/thompsa/vaptq/sys/sys/unistd.h user/thompsa/vaptq/sys/sys/vnode.h user/thompsa/vaptq/sys/ufs/ffs/ffs_alloc.c user/thompsa/vaptq/sys/ufs/ffs/ffs_balloc.c user/thompsa/vaptq/sys/ufs/ffs/ffs_extern.h user/thompsa/vaptq/sys/ufs/ffs/ffs_inode.c user/thompsa/vaptq/sys/ufs/ffs/ffs_vfsops.c user/thompsa/vaptq/sys/ufs/ffs/ffs_vnops.c user/thompsa/vaptq/sys/ufs/ufs/ufs_vnops.c user/thompsa/vaptq/sys/vm/swap_pager.c user/thompsa/vaptq/sys/vm/uma.h user/thompsa/vaptq/sys/vm/uma_core.c user/thompsa/vaptq/sys/vm/uma_dbg.c user/thompsa/vaptq/sys/vm/uma_int.h user/thompsa/vaptq/sys/vm/vm_fault.c user/thompsa/vaptq/sys/vm/vm_kern.c user/thompsa/vaptq/sys/vm/vm_map.c user/thompsa/vaptq/sys/vm/vm_map.h user/thompsa/vaptq/sys/vm/vm_meter.c user/thompsa/vaptq/sys/vm/vm_object.c user/thompsa/vaptq/sys/vm/vm_object.h user/thompsa/vaptq/sys/vm/vm_pager.c user/thompsa/vaptq/sys/vm/vnode_pager.c user/thompsa/vaptq/sys/vm/vnode_pager.h user/thompsa/vaptq/tools/build/options/WITHOUT_LIBPTHREAD user/thompsa/vaptq/tools/build/options/makeman user/thompsa/vaptq/tools/regression/bin/sh/builtins/type1.0.stderr (props changed) user/thompsa/vaptq/tools/regression/fstest/fstest.c user/thompsa/vaptq/tools/regression/lib/libc/stdio/test-printfloat.c user/thompsa/vaptq/tools/regression/lib/libmp/test-libmp.c user/thompsa/vaptq/tools/regression/lib/msun/Makefile user/thompsa/vaptq/tools/sched/schedgraph.py user/thompsa/vaptq/tools/tools/README user/thompsa/vaptq/tools/tools/ath/Makefile.inc user/thompsa/vaptq/tools/tools/ath/athregs/dumpregs_5416.c user/thompsa/vaptq/tools/tools/ath/athstats/Makefile user/thompsa/vaptq/tools/tools/ath/athstats/athstats.c user/thompsa/vaptq/tools/tools/ath/athstats/athstats.h user/thompsa/vaptq/tools/tools/ath/athstats/main.c user/thompsa/vaptq/tools/tools/net80211/wlanstats/main.c user/thompsa/vaptq/tools/tools/net80211/wlanstats/wlanstats.c user/thompsa/vaptq/usr.bin/Makefile user/thompsa/vaptq/usr.bin/basename/basename.1 user/thompsa/vaptq/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c user/thompsa/vaptq/usr.bin/calendar/calendars/calendar.freebsd user/thompsa/vaptq/usr.bin/chkey/Makefile user/thompsa/vaptq/usr.bin/csup/ (props changed) user/thompsa/vaptq/usr.bin/dirname/dirname.c user/thompsa/vaptq/usr.bin/kdump/mkioctls user/thompsa/vaptq/usr.bin/ktrdump/ktrdump.c user/thompsa/vaptq/usr.bin/make/job.c user/thompsa/vaptq/usr.bin/make/main.c user/thompsa/vaptq/usr.bin/netstat/Makefile user/thompsa/vaptq/usr.bin/netstat/inet6.c user/thompsa/vaptq/usr.bin/netstat/main.c user/thompsa/vaptq/usr.bin/netstat/netstat.1 user/thompsa/vaptq/usr.bin/netstat/netstat.h user/thompsa/vaptq/usr.bin/newkey/Makefile user/thompsa/vaptq/usr.bin/newkey/generic.c user/thompsa/vaptq/usr.bin/printenv/printenv.c user/thompsa/vaptq/usr.bin/procstat/ (props changed) user/thompsa/vaptq/usr.bin/sockstat/sockstat.c user/thompsa/vaptq/usr.bin/split/split.1 user/thompsa/vaptq/usr.bin/stat/stat.c user/thompsa/vaptq/usr.bin/talk/get_names.c user/thompsa/vaptq/usr.bin/tar/subst.c user/thompsa/vaptq/usr.bin/tar/write.c user/thompsa/vaptq/usr.bin/truncate/truncate.c user/thompsa/vaptq/usr.bin/truss/extern.h user/thompsa/vaptq/usr.bin/truss/main.c user/thompsa/vaptq/usr.bin/truss/truss.1 user/thompsa/vaptq/usr.bin/usbhidaction/usbhidaction.c user/thompsa/vaptq/usr.bin/usbhidctl/usbhid.c user/thompsa/vaptq/usr.bin/vmstat/vmstat.c user/thompsa/vaptq/usr.bin/window/compress.c user/thompsa/vaptq/usr.bin/window/context.c user/thompsa/vaptq/usr.bin/window/lcmd1.c user/thompsa/vaptq/usr.bin/window/lcmd2.c user/thompsa/vaptq/usr.bin/window/scanner.c user/thompsa/vaptq/usr.bin/window/startup.c user/thompsa/vaptq/usr.bin/window/string.c user/thompsa/vaptq/usr.bin/window/ttoutput.c user/thompsa/vaptq/usr.bin/window/tttermcap.c user/thompsa/vaptq/usr.bin/window/ttzapple.c user/thompsa/vaptq/usr.bin/window/var.c user/thompsa/vaptq/usr.bin/window/wwdump.c user/thompsa/vaptq/usr.bin/window/wwend.c user/thompsa/vaptq/usr.bin/window/wwenviron.c user/thompsa/vaptq/usr.bin/window/wwflush.c user/thompsa/vaptq/usr.bin/window/wwinit.c user/thompsa/vaptq/usr.bin/window/wwpty.c user/thompsa/vaptq/usr.bin/window/wwspawn.c user/thompsa/vaptq/usr.bin/window/xx.c user/thompsa/vaptq/usr.sbin/Makefile user/thompsa/vaptq/usr.sbin/bluetooth/Makefile user/thompsa/vaptq/usr.sbin/bluetooth/bcmfw/bcmfw.c user/thompsa/vaptq/usr.sbin/bluetooth/hcsecd/hcsecd.c user/thompsa/vaptq/usr.sbin/bluetooth/hcseriald/hcseriald.c user/thompsa/vaptq/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c user/thompsa/vaptq/usr.sbin/config/config.8 user/thompsa/vaptq/usr.sbin/config/main.c user/thompsa/vaptq/usr.sbin/crunch/crunchgen/crunchgen.c user/thompsa/vaptq/usr.sbin/dumpcis/printcis.c user/thompsa/vaptq/usr.sbin/dumpcis/readcis.c user/thompsa/vaptq/usr.sbin/fifolog/lib/fifolog_reader.c user/thompsa/vaptq/usr.sbin/fifolog/lib/fifolog_write_poll.c user/thompsa/vaptq/usr.sbin/fwcontrol/fwcontrol.c user/thompsa/vaptq/usr.sbin/fwcontrol/fwdv.c user/thompsa/vaptq/usr.sbin/fwcontrol/fwmpegts.c user/thompsa/vaptq/usr.sbin/gssd/gssd.8 user/thompsa/vaptq/usr.sbin/ifmcstat/ifmcstat.8 user/thompsa/vaptq/usr.sbin/ifmcstat/ifmcstat.c user/thompsa/vaptq/usr.sbin/inetd/inetd.c user/thompsa/vaptq/usr.sbin/jail/jail.8 user/thompsa/vaptq/usr.sbin/keyserv/Makefile user/thompsa/vaptq/usr.sbin/keyserv/setkey.c user/thompsa/vaptq/usr.sbin/lmcconfig/lmcconfig.c user/thompsa/vaptq/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) user/thompsa/vaptq/usr.sbin/makefs/ffs/ffs_subr.c (props changed) user/thompsa/vaptq/usr.sbin/makefs/ffs/ufs_bswap.h (contents, props changed) user/thompsa/vaptq/usr.sbin/makefs/getid.c (props changed) user/thompsa/vaptq/usr.sbin/mtree/create.c user/thompsa/vaptq/usr.sbin/mtree/mtree.5 user/thompsa/vaptq/usr.sbin/mtree/mtree.8 user/thompsa/vaptq/usr.sbin/mtree/spec.c user/thompsa/vaptq/usr.sbin/pciconf/cap.c user/thompsa/vaptq/usr.sbin/pciconf/pciconf.8 user/thompsa/vaptq/usr.sbin/pciconf/pciconf.c user/thompsa/vaptq/usr.sbin/pppd/cbcp.c user/thompsa/vaptq/usr.sbin/pstat/pstat.8 user/thompsa/vaptq/usr.sbin/pstat/pstat.c user/thompsa/vaptq/usr.sbin/rpc.yppasswdd/yppasswdd_server.c user/thompsa/vaptq/usr.sbin/rtadvd/rrenum.c user/thompsa/vaptq/usr.sbin/sysinstall/devices.c user/thompsa/vaptq/usr.sbin/sysinstall/install.c user/thompsa/vaptq/usr.sbin/sysinstall/main.c user/thompsa/vaptq/usr.sbin/sysinstall/menus.c user/thompsa/vaptq/usr.sbin/sysinstall/options.c user/thompsa/vaptq/usr.sbin/sysinstall/sysinstall.h user/thompsa/vaptq/usr.sbin/sysinstall/tcpip.c user/thompsa/vaptq/usr.sbin/timed/timed/Makefile user/thompsa/vaptq/usr.sbin/timed/timed/networkdelta.c user/thompsa/vaptq/usr.sbin/timed/timedc/Makefile user/thompsa/vaptq/usr.sbin/trpt/trpt.c user/thompsa/vaptq/usr.sbin/usbconfig/dump.c user/thompsa/vaptq/usr.sbin/usbconfig/dump.h user/thompsa/vaptq/usr.sbin/usbconfig/usbconfig.c user/thompsa/vaptq/usr.sbin/zic/ (props changed) Modified: user/thompsa/vaptq/Makefile.inc1 ============================================================================== --- user/thompsa/vaptq/Makefile.inc1 Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/Makefile.inc1 Sat Feb 28 01:05:18 2009 (r189129) @@ -230,7 +230,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ - -DWITHOUT_SSP \ + SSP_CFLAGS= \ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF @@ -240,8 +240,9 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ DESTDIR= \ + SSP_CFLAGS= \ BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS \ - -DNO_WARNS -DNO_CTF -DWITHOUT_SSP + -DNO_WARNS -DNO_CTF # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ @@ -458,7 +459,7 @@ build32: .if ${MK_KERBEROS} != "no" .for _t in obj depend all cd ${.CURDIR}/kerberos5/tools; \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= \ + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ ${_t} .endfor .endif @@ -481,7 +482,7 @@ build32: .endfor .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic cd ${.CURDIR}/${_dir}; \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= \ + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ build-tools .endfor cd ${.CURDIR}; \ @@ -702,6 +703,10 @@ distrib-dirs distribution: NO_KERNELCLEAN= t NO_KERNELCONFIG= t NO_KERNELDEPEND= t +# Shortcut for KERNCONF=Blah -DKERNFAST is now KERNFAST=Blah +.if !defined(KERNCONF) && ${KERNFAST} != "1" +KERNCONF=${KERNFAST} +.endif .endif .if !defined(KERNCONF) && defined(KERNEL) KERNCONF= ${KERNEL} @@ -778,14 +783,14 @@ buildkernel: @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; \ MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF \ + ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF \ -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) .for target in obj depend all cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \ MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ - ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF ${target} + ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF ${target} .endfor .endif .if !defined(NO_KERNELDEPEND) Modified: user/thompsa/vaptq/ObsoleteFiles.inc ============================================================================== --- user/thompsa/vaptq/ObsoleteFiles.inc Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/ObsoleteFiles.inc Sat Feb 28 01:05:18 2009 (r189129) @@ -14,6 +14,76 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090226: libmp(3) functions renamed +OLD_LIBS+=usr/lib/libmp.so.6 +# 20090223: changeover of USB stacks +OLD_FILES+=usr/include/dev/usb2/include/ufm2_ioctl.h +OLD_FILES+=usr/include/dev/usb2/include/urio2_ioctl.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_cdc.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_defs.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_devid.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_devtable.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_endian.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_error.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_hid.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_ioctl.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_mfunc.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_revision.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_standard.h +OLD_DIRS+=usr/include/dev/usb2/include +OLD_DIRS+=usr/include/dev/usb2 +OLD_FILES+=usr/include/dev/usb/dsbr100io.h +OLD_FILES+=usr/include/dev/usb/ehcireg.h +OLD_FILES+=usr/include/dev/usb/ehcivar.h +OLD_FILES+=usr/include/dev/usb/hid.h +OLD_FILES+=usr/include/dev/usb/if_auereg.h +OLD_FILES+=usr/include/dev/usb/if_axereg.h +OLD_FILES+=usr/include/dev/usb/if_cdcereg.h +OLD_FILES+=usr/include/dev/usb/if_cuereg.h +OLD_FILES+=usr/include/dev/usb/if_kuereg.h +OLD_FILES+=usr/include/dev/usb/if_ruereg.h +OLD_FILES+=usr/include/dev/usb/if_rumreg.h +OLD_FILES+=usr/include/dev/usb/if_rumvar.h +OLD_FILES+=usr/include/dev/usb/if_udavreg.h +OLD_FILES+=usr/include/dev/usb/if_upgtvar.h +OLD_FILES+=usr/include/dev/usb/if_uralreg.h +OLD_FILES+=usr/include/dev/usb/if_uralvar.h +OLD_FILES+=usr/include/dev/usb/if_zydfw.h +OLD_FILES+=usr/include/dev/usb/if_zydreg.h +OLD_FILES+=usr/include/dev/usb/kue_fw.h +OLD_FILES+=usr/include/dev/usb/ohcireg.h +OLD_FILES+=usr/include/dev/usb/ohcivar.h +OLD_FILES+=usr/include/dev/usb/rio500_usb.h +OLD_FILES+=usr/include/dev/usb/rt2573_ucode.h +OLD_FILES+=usr/include/dev/usb/sl811hsreg.h +OLD_FILES+=usr/include/dev/usb/sl811hsvar.h +OLD_FILES+=usr/include/dev/usb/ubser.h +OLD_FILES+=usr/include/dev/usb/ucomvar.h +OLD_FILES+=usr/include/dev/usb/udbp.h +OLD_FILES+=usr/include/dev/usb/uftdireg.h +OLD_FILES+=usr/include/dev/usb/ugraphire_rdesc.h +OLD_FILES+=usr/include/dev/usb/uhcireg.h +OLD_FILES+=usr/include/dev/usb/uhcivar.h +OLD_FILES+=usr/include/dev/usb/usb_ethersubr.h +OLD_FILES+=usr/include/dev/usb/usb_mem.h +OLD_FILES+=usr/include/dev/usb/usb_port.h +OLD_FILES+=usr/include/dev/usb/usb_quirks.h +OLD_FILES+=usr/include/dev/usb/usbcdc.h +OLD_FILES+=usr/include/dev/usb/usbdi.h +OLD_FILES+=usr/include/dev/usb/usbdi_util.h +OLD_FILES+=usr/include/dev/usb/usbdivar.h +OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h +# 20090203: removal of pccard header files +OLD_FILES+=usr/include/pccard/cardinfo.h +OLD_FILES+=usr/include/pccard/cis.h +OLD_DIRS+=usr/include/pccard +# 20090203: adding_user.8 moved to adding_user.7 +OLD_FILES+=usr/share/man/man8/adding_user.8.gz +# 20090122: tzdata2009a import +OLD_FILES+=usr/share/zoneinfo/Asia/Katmandu +# 20090102: file 4.26 import +OLD_FILES+=usr/share/misc/magic.mime +OLD_FILES+=usr/share/misc/magic.mime.mgc # 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1 OLD_FILES+=usr/share/man/man8/nsupdate.8.gz # 20081223: ipprotosw.h removed @@ -1663,7 +1733,7 @@ OLD_FILES+=usr/lib/libpam_ssh.a OLD_FILES+=usr/lib/libpam_ssh_p.a OLD_FILES+=usr/bin/help OLD_FILES+=usr/bin/sccs -.if ${TARGET_ARCH} != "i386" +.if ${TARGET_ARCH} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "powerpc" OLD_FILES+=usr/bin/gdbserver .endif OLD_FILES+=usr/bin/ssh-keysign Modified: user/thompsa/vaptq/UPDATING ============================================================================== --- user/thompsa/vaptq/UPDATING Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/UPDATING Sat Feb 28 01:05:18 2009 (r189129) @@ -22,6 +22,50 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090227: + The /dev handling for the new USB stack has changed, a + buildworld/installworld is required for libusb20. + +20090223: + The new USB2 stack has now been permanently moved in and all kernel and + module names reverted to their previous values (eg, usb, ehci, ohci, + ums, ...). The old usb stack can be compiled in by prefixing the name + with the letter 'o', the old usb modules have been removed. + Updating entry 20090216 for xorg may still apply. + +20090217: + The rc.conf(5) option if_up_delay has been renamed to + defaultroute_delay to better reflect its purpose. If you have + customized this setting in /etc/rc.conf you need to update it to + use the new name. + +20090216: + xorg 7.4 wants to configure its input devices via hald which does not + yet work with USB2. If the keyboard/mouse does not work in xorg then + add + Option "AllowEmptyInput" "off" + to your ServerLayout section. This will cause X to use the configured + kbd and mouse sections from your xorg.conf. + +20090215: + The GENERIC kernels for all architectures now default to the new USB2 + stack. No kernel config options or code have been removed so if a + problem arises please report it and optionally revert to the old USB + stack. If you are loading USB kernel modules or have a custom kernel + that includes GENERIC then ensure that usb names are also changed over, + eg uftdi -> usb2_serial_ftdi. + +20090203: + The ichsmb(4) driver has been changed to require SMBus slave + addresses be left-justified (xxxxxxx0b) rather than right-justified. + All of the other SMBus controller drivers require left-justified + slave addresses, so this change makes all the drivers provide the + same interface. + +20090201: + INET6 statistics (struct ip6stat) was updated. + netstat(1) needs to be recompiled. + 20090119: NTFS has been removed from GENERIC kernel on amd64 to match GENERIC on i386. Should not cause any issues since mount_ntfs(8) @@ -47,13 +91,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. the base system (it was a port). 20081216: - The afdata and ifnet locks have been changed from mutexes to + The afdata and ifnet locks have been changed from mutexes to rwlocks, network modules will need to be re-compiled. 20081214: __FreeBSD_version 800059 incorporates the new arp-v2 rewrite. RTF_CLONING, RTF_LLINFO and RTF_WASCLONED flags are eliminated. - The new code reduced struct rtentry{} by 16 bytes on 32-bit + The new code reduced struct rtentry{} by 16 bytes on 32-bit architecture and 40 bytes on 64-bit architecture. The userland applications "arp" and "ndp" have been updated accordingly. The output from "netstat -r" shows only routing entries and Modified: user/thompsa/vaptq/bin/chmod/chmod.1 ============================================================================== --- user/thompsa/vaptq/bin/chmod/chmod.1 Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/bin/chmod/chmod.1 Sat Feb 28 01:05:18 2009 (r189129) @@ -32,7 +32,7 @@ .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 .\" $FreeBSD$ .\" -.Dd December 22, 2006 +.Dd January 26, 2009 .Dt CHMOD 1 .Os .Sh NAME @@ -281,6 +281,10 @@ Operations upon the other permissions on ``o'' by itself), in combination with the .Ar perm symbols ``s'' or ``t'', are ignored. +.Pp +The ``w'' permission on directories will permit file creation, relocation, +and copy into that directory. +Files created within the directory itself will inherit its group ID. .Sh EXAMPLES .Bl -tag -width "u=rwx,go=u-w" -compact .It Li 644 @@ -343,4 +347,4 @@ command appeared in .Sh BUGS There is no .Ar perm -option for the naughty bits. +option for the naughty bits of a horse. Modified: user/thompsa/vaptq/bin/dd/dd.1 ============================================================================== --- user/thompsa/vaptq/bin/dd/dd.1 Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/bin/dd/dd.1 Sat Feb 28 01:05:18 2009 (r189129) @@ -32,7 +32,7 @@ .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" $FreeBSD$ .\" -.Dd August 15, 2004 +.Dd January 23, 2009 .Dt DD 1 .Os .Sh NAME @@ -392,6 +392,11 @@ Remove parity bit from a file: Check for (even) parity errors on a file: .Pp .Dl "dd if=file conv=pareven | cmp -x - file" +.Pp +To create an image of a Mode-1 CD-ROM, which is a commonly used format +for data CD-ROM disks, use a block size of 2048 bytes: +.Pp +.Dl "dd if=/dev/acd0 of=filename.iso bs=2048" .Sh SEE ALSO .Xr cp 1 , .Xr mt 1 , Modified: user/thompsa/vaptq/bin/pax/file_subs.c ============================================================================== --- user/thompsa/vaptq/bin/pax/file_subs.c Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/bin/pax/file_subs.c Sat Feb 28 01:05:18 2009 (r189129) @@ -425,19 +425,11 @@ node_creat(ARCHD *arcn) * we were able to create the node. set uid/gid, modes and times */ if (pids) - res = ((arcn->type == PAX_SLK) ? - set_lids(arcn->name, arcn->sb.st_uid, arcn->sb.st_gid) : - set_ids(arcn->name, arcn->sb.st_uid, arcn->sb.st_gid)); + res = set_ids(arcn->name, arcn->sb.st_uid, arcn->sb.st_gid); else res = 0; /* - * symlinks are done now. - */ - if (arcn->type == PAX_SLK) - return(0); - - /* * IMPORTANT SECURITY NOTE: * if not preserving mode or we cannot set uid/gid, then PROHIBIT any * set uid/gid bits @@ -632,7 +624,7 @@ chk_path( char *name, uid_t st_uid, gid_ * used by -t to reset access times). * When ign is zero, only those times the user has asked for are set, the * other ones are left alone. We do not assume the un-documented feature - * of many utimes() implementations that consider a 0 time value as a do + * of many lutimes() implementations that consider a 0 time value as a do * not set request. */ @@ -661,7 +653,7 @@ set_ftime(char *fnm, time_t mtime, time_ /* * set the times */ - if (utimes(fnm, tv) < 0) + if (lutimes(fnm, tv) < 0) syswarn(1, errno, "Access/modification time set failed on: %s", fnm); return; @@ -677,30 +669,6 @@ set_ftime(char *fnm, time_t mtime, time_ int set_ids(char *fnm, uid_t uid, gid_t gid) { - if (chown(fnm, uid, gid) < 0) { - /* - * ignore EPERM unless in verbose mode or being run by root. - * if running as pax, POSIX requires a warning. - */ - if (strcmp(NM_PAX, argv0) == 0 || errno != EPERM || vflag || - geteuid() == 0) - syswarn(1, errno, "Unable to set file uid/gid of %s", - fnm); - return(-1); - } - return(0); -} - -/* - * set_lids() - * set the uid and gid of a file system node - * Return: - * 0 when set, -1 on failure - */ - -int -set_lids(char *fnm, uid_t uid, gid_t gid) -{ if (lchown(fnm, uid, gid) < 0) { /* * ignore EPERM unless in verbose mode or being run by root. @@ -724,7 +692,7 @@ void set_pmode(char *fnm, mode_t mode) { mode &= ABITS; - if (chmod(fnm, mode) < 0) + if (lchmod(fnm, mode) < 0) syswarn(1, errno, "Could not set permissions on %s", fnm); return; } Modified: user/thompsa/vaptq/bin/ps/extern.h ============================================================================== --- user/thompsa/vaptq/bin/ps/extern.h Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/bin/ps/extern.h Sat Feb 28 01:05:18 2009 (r189129) @@ -71,6 +71,7 @@ void priorityr(KINFO *, VARENT *); void rgroupname(KINFO *, VARENT *); void runame(KINFO *, VARENT *); void rvar(KINFO *, VARENT *); +int s_comm(KINFO *); int s_label(KINFO *); int s_rgroupname(KINFO *); int s_runame(KINFO *); Modified: user/thompsa/vaptq/bin/ps/keyword.c ============================================================================== --- user/thompsa/vaptq/bin/ps/keyword.c Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/bin/ps/keyword.c Sat Feb 28 01:05:18 2009 (r189129) @@ -79,8 +79,8 @@ static VAR var[] = { CHAR, NULL, 0}, {"blocked", "", "sigmask", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"caught", "", "sigcatch", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, - {"comm", "COMMAND", NULL, LJUST, ucomm, NULL, MAXCOMLEN, 0, CHAR, - NULL, 0}, + {"comm", "COMMAND", NULL, LJUST|DSIZ, ucomm, s_comm, + COMMLEN + OCOMMLEN + 1, 0, CHAR, NULL, 0}, {"command", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16, 0, CHAR, NULL, 0}, {"cpu", "CPU", NULL, 0, kvar, NULL, 3, KOFF(ki_estcpu), UINT, "d", @@ -135,12 +135,13 @@ static VAR var[] = { LONG, "ld", 0}, {"nvcsw", "NVCSW", NULL, USER, rvar, NULL, 5, ROFF(ru_nvcsw), LONG, "ld", 0}, - {"nwchan", "NWCHAN", NULL, LJUST, nwchan, NULL, 8, 0, CHAR, NULL, 0}, + {"nwchan", "NWCHAN", NULL, LJUST, nwchan, NULL, sizeof(void *) * 2, 0, + CHAR, NULL, 0}, {"oublk", "OUBLK", NULL, USER, rvar, NULL, 4, ROFF(ru_oublock), LONG, "ld", 0}, {"oublock", "", "oublk", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, - {"paddr", "PADDR", NULL, 0, kvar, NULL, 8, KOFF(ki_paddr), KPTR, - "lx", 0}, + {"paddr", "PADDR", NULL, 0, kvar, NULL, sizeof(void *) * 2, + KOFF(ki_paddr), KPTR, "lx", 0}, {"pagein", "PAGEIN", NULL, USER, pagein, NULL, 6, 0, CHAR, NULL, 0}, {"pcpu", "", "%cpu", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"pending", "", "sig", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, @@ -195,13 +196,13 @@ static VAR var[] = { {"tsiz", "TSIZ", NULL, 0, kvar, NULL, 4, KOFF(ki_tsize), PGTOK, "ld", 0}, {"tt", "TT ", NULL, 0, tname, NULL, 4, 0, CHAR, NULL, 0}, {"tty", "TTY", NULL, LJUST, longtname, NULL, 8, 0, CHAR, NULL, 0}, - {"ucomm", "UCOMM", NULL, LJUST, ucomm, NULL, MAXCOMLEN, 0, CHAR, NULL, - 0}, + {"ucomm", "UCOMM", NULL, LJUST|DSIZ, ucomm, s_comm, + COMMLEN + OCOMMLEN + 1, 0, CHAR, NULL, 0}, {"uid", "UID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_uid), UINT, UIDFMT, 0}, {"upr", "UPR", NULL, 0, upr, NULL, 3, 0, CHAR, NULL, 0}, - {"uprocp", "UPROCP", NULL, 0, kvar, NULL, 8, KOFF(ki_paddr), KPTR, - "lx", 0}, + {"uprocp", "UPROCP", NULL, 0, kvar, NULL, sizeof(void *) * 2, + KOFF(ki_paddr), KPTR, "lx", 0}, {"user", "USER", NULL, LJUST|DSIZ, uname, s_uname, USERLEN, 0, CHAR, NULL, 0}, {"usrpri", "", "upr", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, @@ -325,6 +326,8 @@ findvar(char *p, int user, char **header */ rflen = strlen(v->alias) + strlen(hp) + 2; realfmt = malloc(rflen); + if (realfmt == NULL) + errx(1, "malloc failed"); snprintf(realfmt, rflen, "%s=%s", v->alias, hp); parsefmt(realfmt, user); } Modified: user/thompsa/vaptq/bin/ps/print.c ============================================================================== --- user/thompsa/vaptq/bin/ps/print.c Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/bin/ps/print.c Sat Feb 28 01:05:18 2009 (r189129) @@ -177,6 +177,7 @@ command(KINFO *k, VARENT *ve) void ucomm(KINFO *k, VARENT *ve) { + char tmpbuff[COMMLEN + OCOMMLEN + 2]; VAR *v; v = ve->var; @@ -184,8 +185,15 @@ ucomm(KINFO *k, VARENT *ve) (void)printf("%s", k->ki_p->ki_comm); if (showthreads && k->ki_p->ki_numthreads > 1) printf("/%s", k->ki_p->ki_ocomm); - } else - (void)printf("%-*s", v->width, k->ki_p->ki_comm); + } else { + bzero(tmpbuff, sizeof(tmpbuff)); + if (showthreads && k->ki_p->ki_numthreads > 1) + sprintf(tmpbuff, "%s/%s", k->ki_p->ki_comm, + k->ki_p->ki_ocomm); + else + sprintf(tmpbuff, "%s", k->ki_p->ki_comm); + (void)printf("%-*s", v->width, tmpbuff); + } } void @@ -821,6 +829,20 @@ out: } int +s_comm(KINFO *k) +{ + char tmpbuff[COMMLEN + OCOMMLEN + 2]; + + bzero(tmpbuff, sizeof(tmpbuff)); + if (showthreads && k->ki_p->ki_numthreads > 1) + sprintf(tmpbuff, "%s/%s", k->ki_p->ki_comm, + k->ki_p->ki_ocomm); + else + sprintf(tmpbuff, "%s", k->ki_p->ki_comm); + return (strlen(tmpbuff)); +} + +int s_label(KINFO *k) { char *string = NULL; Modified: user/thompsa/vaptq/contrib/bsnmp/snmp_mibII/mibII.c ============================================================================== --- user/thompsa/vaptq/contrib/bsnmp/snmp_mibII/mibII.c Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/contrib/bsnmp/snmp_mibII/mibII.c Sat Feb 28 01:05:18 2009 (r189129) @@ -1013,7 +1013,7 @@ handle_rtmsg(struct rt_msghdr *rtm) break; case RTM_IFINFO: - ifm = (struct if_msghdr *)rtm; + ifm = (struct if_msghdr *)(void *)rtm; mib_extract_addrs(ifm->ifm_addrs, (u_char *)(ifm + 1), addrs); if ((ifp = mib_find_if_sys(ifm->ifm_index)) == NULL) break; Modified: user/thompsa/vaptq/contrib/csup/proto.c ============================================================================== --- user/thompsa/vaptq/contrib/csup/proto.c Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/contrib/csup/proto.c Sat Feb 28 01:05:18 2009 (r189129) @@ -521,12 +521,6 @@ proto_xchgcoll(struct config *config) coll->co_filefilter = globtree_and(fileaccept, globtree_not(filerefuse)); - /* At this point we don't need the pattern lists anymore. */ - pattlist_free(coll->co_accepts); - pattlist_free(coll->co_refusals); - coll->co_accepts = NULL; - coll->co_refusals = NULL; - /* Set up a mask of file attributes that we don't want to sync with the server. */ if (!(coll->co_options & CO_SETOWNER)) Modified: user/thompsa/vaptq/contrib/csup/updater.c ============================================================================== --- user/thompsa/vaptq/contrib/csup/updater.c Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/contrib/csup/updater.c Sat Feb 28 01:05:18 2009 (r189129) @@ -1656,10 +1656,12 @@ updater_rcsedit(struct updater *up, stru if (rf == NULL) { fattr_maskout(oldfattr, ~FA_MODTIME); - if (fattr_equal(oldfattr, sr->sr_serverattr) == 0) + if (fattr_equal(oldfattr, sr->sr_serverattr)) lprintf(1, " SetAttrs %s", fup->coname); else lprintf(1, " Touch %s", fup->coname); + /* Install new attributes. */ + fattr_install(sr->sr_serverattr, fup->destpath, NULL); if (fup->attic) lprintf(1, " -> Attic"); lprintf(1, "\n"); Modified: user/thompsa/vaptq/contrib/gdtoa/README ============================================================================== --- user/thompsa/vaptq/contrib/gdtoa/README Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/contrib/gdtoa/README Sat Feb 28 01:05:18 2009 (r189129) @@ -56,7 +56,9 @@ two letters: whose sum is the desired value For decimal -> binary conversions, there are three families of -helper routines: one for round-nearest: +helper routines: one for round-nearest (or the current rounding +mode on IEEE-arithmetic systems that provide the C99 fegetround() +function, if compiled with -DHonor_FLT_ROUNDS): strtof strtod @@ -191,6 +193,9 @@ in the buffer, if the buffer was long en conversion are easily done with the help of gdtoa(), such as %e or %f style and conversions with direction of rounding specified (so that, if desired, the decimal value is either >= or <= the binary value). +On IEEE-arithmetic systems that provide the C99 fegetround() function, +if compiled with -DHonor_FLT_ROUNDS, these routines honor the current +rounding mode. For an example of more general conversions based on dtoa(), see netlib's "printf.c from ampl/solvers". @@ -342,5 +347,11 @@ standard says it should -- when Honor_FL current rounding mode is obtained from fegetround() rather than from FLT_ROUNDS, unless Trust_FLT_ROUNDS is also #defined. +Compile with -DUSE_LOCALE to use the current locale; otherwise +decimal points are assumed to be '.'. With -DUSE_LOCALE, unless +you also compile with -DNO_LOCALE_CACHE, the details about the +current "decimal point" character string are cached and assumed not +to change during the program's execution. + Please send comments to David M. Gay (dmg at acm dot org, with " at " changed at "@" and " dot " changed to "."). Modified: user/thompsa/vaptq/contrib/gdtoa/g_Qfmt.c ============================================================================== --- user/thompsa/vaptq/contrib/gdtoa/g_Qfmt.c Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/contrib/gdtoa/g_Qfmt.c Sat Feb 28 01:05:18 2009 (r189129) @@ -51,15 +51,20 @@ THIS SOFTWARE. char* #ifdef KR_headers -g_Qfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; unsigned bufsize; +g_Qfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; size_t bufsize; #else -g_Qfmt(char *buf, void *V, int ndig, unsigned bufsize) +g_Qfmt(char *buf, void *V, int ndig, size_t bufsize) #endif { - static FPI fpi = { 113, 1-16383-113+1, 32766 - 16383 - 113 + 1, 1, 0 }; + static FPI fpi0 = { 113, 1-16383-113+1, 32766 - 16383 - 113 + 1, 1, 0 }; char *b, *s, *se; ULong bits[4], *L, sign; int decpt, ex, i, mode; +#ifdef Honor_FLT_ROUNDS +#include "gdtoa_fltrnds.h" +#else +#define fpi &fpi0 +#endif if (ndig < 0) ndig = 0; @@ -109,6 +114,6 @@ g_Qfmt(char *buf, void *V, int ndig, uns return 0; mode = 0; } - s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); - return g__fmt(buf, s, se, decpt, sign); + s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); + return g__fmt(buf, s, se, decpt, sign, bufsize); } Modified: user/thompsa/vaptq/contrib/gdtoa/g__fmt.c ============================================================================== --- user/thompsa/vaptq/contrib/gdtoa/g__fmt.c Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/contrib/gdtoa/g__fmt.c Sat Feb 28 01:05:18 2009 (r189129) @@ -37,24 +37,51 @@ THIS SOFTWARE. char * #ifdef KR_headers -g__fmt(b, s, se, decpt, sign) char *b; char *s; char *se; int decpt; ULong sign; +g__fmt(b, s, se, decpt, sign, blen) char *b; char *s; char *se; int decpt; ULong sign; size_t blen; #else -g__fmt(char *b, char *s, char *se, int decpt, ULong sign) +g__fmt(char *b, char *s, char *se, int decpt, ULong sign, size_t blen) #endif { int i, j, k; - char *s0 = s; + char *be, *s0; + size_t len; #ifdef USE_LOCALE - char decimalpoint = *localeconv()->decimal_point; +#ifdef NO_LOCALE_CACHE + char *decimalpoint = localeconv()->decimal_point; + size_t dlen = strlen(decimalpoint); #else -#define decimalpoint '.' + char *decimalpoint; + static char *decimalpoint_cache; + static size_t dlen; + if (!(s0 = decimalpoint_cache)) { + s0 = localeconv()->decimal_point; + dlen = strlen(s0); + if ((decimalpoint_cache = (char*)malloc(strlen(s0) + 1))) { + strcpy(decimalpoint_cache, s0); + s0 = decimalpoint_cache; + } + } + decimalpoint = s0; +#endif +#else +#define dlen 0 #endif + s0 = s; + len = (se-s) + dlen + 6; /* 6 = sign + e+dd + trailing null */ + if (blen < len) + goto ret0; + be = b + blen - 1; if (sign) *b++ = '-'; if (decpt <= -4 || decpt > se - s + 5) { *b++ = *s++; if (*s) { - *b++ = decimalpoint; +#ifdef USE_LOCALE + while((*b = *decimalpoint++)) + ++b; +#else + *b++ = '.'; +#endif while((*b = *s++) !=0) b++; } @@ -69,6 +96,8 @@ g__fmt(char *b, char *s, char *se, int d for(j = 2, k = 10; 10*k <= decpt; j++, k *= 10){} for(;;) { i = decpt / k; + if (b >= be) + goto ret0; *b++ = i + '0'; if (--j <= 0) break; @@ -78,22 +107,41 @@ g__fmt(char *b, char *s, char *se, int d *b = 0; } else if (decpt <= 0) { - *b++ = decimalpoint; +#ifdef USE_LOCALE + while((*b = *decimalpoint++)) + ++b; +#else + *b++ = '.'; +#endif + if (be < b - decpt + (se - s)) + goto ret0; for(; decpt < 0; decpt++) *b++ = '0'; - while((*b = *s++) !=0) + while((*b = *s++) != 0) b++; } else { - while((*b = *s++) !=0) { + while((*b = *s++) != 0) { b++; - if (--decpt == 0 && *s) - *b++ = decimalpoint; + if (--decpt == 0 && *s) { +#ifdef USE_LOCALE + while(*b = *decimalpoint++) + ++b; +#else + *b++ = '.'; +#endif + } + } + if (b + decpt > be) { + ret0: + b = 0; + goto ret; } for(; decpt > 0; decpt--) *b++ = '0'; *b = 0; } + ret: freedtoa(s0); return b; } Modified: user/thompsa/vaptq/contrib/gdtoa/g_ddfmt.c ============================================================================== --- user/thompsa/vaptq/contrib/gdtoa/g_ddfmt.c Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/contrib/gdtoa/g_ddfmt.c Sat Feb 28 01:05:18 2009 (r189129) @@ -33,9 +33,9 @@ THIS SOFTWARE. char * #ifdef KR_headers -g_ddfmt(buf, dd, ndig, bufsize) char *buf; double *dd; int ndig; unsigned bufsize; +g_ddfmt(buf, dd, ndig, bufsize) char *buf; double *dd; int ndig; size_t bufsize; #else -g_ddfmt(char *buf, double *dd, int ndig, unsigned bufsize) +g_ddfmt(char *buf, double *dd, int ndig, size_t bufsize) #endif { FPI fpi; @@ -44,6 +44,21 @@ g_ddfmt(char *buf, double *dd, int ndig, int bx, by, decpt, ex, ey, i, j, mode; Bigint *x, *y, *z; double ddx[2]; +#ifdef Honor_FLT_ROUNDS /*{{*/ + int Rounding; +#ifdef Trust_FLT_ROUNDS /*{{ only define this if FLT_ROUNDS really works! */ + Rounding = Flt_Rounds; +#else /*}{*/ + Rounding = 1; + switch(fegetround()) { + case FE_TOWARDZERO: Rounding = 0; break; + case FE_UPWARD: Rounding = 2; break; + case FE_DOWNWARD: Rounding = 3; + } +#endif /*}}*/ +#else /*}{*/ +#define Rounding FPI_Round_near +#endif /*}}*/ if (bufsize < 10 || bufsize < ndig + 8) return 0; @@ -144,11 +159,11 @@ g_ddfmt(char *buf, double *dd, int ndig, } fpi.emin = 1-1023-53+1; fpi.emax = 2046-1023-106+1; - fpi.rounding = FPI_Round_near; + fpi.rounding = Rounding; fpi.sudden_underflow = 0; i = STRTOG_Normal; s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); - b = g__fmt(buf, s, se, decpt, z->sign); + b = g__fmt(buf, s, se, decpt, z->sign, bufsize); Bfree(z); return b; } Modified: user/thompsa/vaptq/contrib/gdtoa/g_dfmt.c ============================================================================== --- user/thompsa/vaptq/contrib/gdtoa/g_dfmt.c Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/contrib/gdtoa/g_dfmt.c Sat Feb 28 01:05:18 2009 (r189129) @@ -33,15 +33,20 @@ THIS SOFTWARE. char* #ifdef KR_headers -g_dfmt(buf, d, ndig, bufsize) char *buf; double *d; int ndig; unsigned bufsize; +g_dfmt(buf, d, ndig, bufsize) char *buf; double *d; int ndig; size_t bufsize; #else -g_dfmt(char *buf, double *d, int ndig, unsigned bufsize) +g_dfmt(char *buf, double *d, int ndig, size_t bufsize) #endif { - static FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, 0 }; + static FPI fpi0 = { 53, 1-1023-53+1, 2046-1023-53+1, 1, 0 }; char *b, *s, *se; ULong bits[2], *L, sign; int decpt, ex, i, mode; +#ifdef Honor_FLT_ROUNDS +#include "gdtoa_fltrnds.h" +#else +#define fpi &fpi0 +#endif if (ndig < 0) ndig = 0; @@ -52,6 +57,8 @@ g_dfmt(char *buf, double *d, int ndig, u sign = L[_0] & 0x80000000L; if ((L[_0] & 0x7ff00000) == 0x7ff00000) { /* Infinity or NaN */ + if (bufsize < 10) + return 0; if (L[_0] & 0xfffff || L[_1]) { return strcp(buf, "NaN"); } @@ -78,12 +85,9 @@ g_dfmt(char *buf, double *d, int ndig, u ex = 1; ex -= 0x3ff + 52; mode = 2; - if (ndig <= 0) { - if (bufsize < 25) - return 0; + if (ndig <= 0) mode = 0; - } i = STRTOG_Normal; - s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); - return g__fmt(buf, s, se, decpt, sign); + s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); + return g__fmt(buf, s, se, decpt, sign, bufsize); } Modified: user/thompsa/vaptq/contrib/gdtoa/g_ffmt.c ============================================================================== --- user/thompsa/vaptq/contrib/gdtoa/g_ffmt.c Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/contrib/gdtoa/g_ffmt.c Sat Feb 28 01:05:18 2009 (r189129) @@ -33,15 +33,20 @@ THIS SOFTWARE. char* #ifdef KR_headers -g_ffmt(buf, f, ndig, bufsize) char *buf; float *f; int ndig; unsigned bufsize; +g_ffmt(buf, f, ndig, bufsize) char *buf; float *f; int ndig; size_t bufsize; #else -g_ffmt(char *buf, float *f, int ndig, unsigned bufsize) +g_ffmt(char *buf, float *f, int ndig, size_t bufsize) #endif { - static FPI fpi = { 24, 1-127-24+1, 254-127-24+1, 1, 0 }; + static FPI fpi0 = { 24, 1-127-24+1, 254-127-24+1, 1, 0 }; char *b, *s, *se; ULong bits[1], *L, sign; int decpt, ex, i, mode; +#ifdef Honor_FLT_ROUNDS +#include "gdtoa_fltrnds.h" +#else +#define fpi &fpi0 +#endif if (ndig < 0) ndig = 0; @@ -83,6 +88,6 @@ g_ffmt(char *buf, float *f, int ndig, un mode = 0; } i = STRTOG_Normal; - s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); - return g__fmt(buf, s, se, decpt, sign); + s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); + return g__fmt(buf, s, se, decpt, sign, bufsize); } Modified: user/thompsa/vaptq/contrib/gdtoa/g_xLfmt.c ============================================================================== --- user/thompsa/vaptq/contrib/gdtoa/g_xLfmt.c Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/contrib/gdtoa/g_xLfmt.c Sat Feb 28 01:05:18 2009 (r189129) @@ -49,15 +49,20 @@ THIS SOFTWARE. char* #ifdef KR_headers -g_xLfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; unsigned bufsize; +g_xLfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; size_t bufsize; #else -g_xLfmt(char *buf, void *V, int ndig, unsigned bufsize) +g_xLfmt(char *buf, void *V, int ndig, size_t bufsize) #endif { - static FPI fpi = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0 }; + static FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0 }; char *b, *s, *se; ULong bits[2], *L, sign; int decpt, ex, i, mode; +#ifdef Honor_FLT_ROUNDS +#include "gdtoa_fltrnds.h" +#else +#define fpi &fpi0 +#endif if (ndig < 0) ndig = 0; @@ -103,6 +108,6 @@ g_xLfmt(char *buf, void *V, int ndig, un return 0; mode = 0; } - s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); - return g__fmt(buf, s, se, decpt, sign); + s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); + return g__fmt(buf, s, se, decpt, sign, bufsize); } Modified: user/thompsa/vaptq/contrib/gdtoa/g_xfmt.c ============================================================================== --- user/thompsa/vaptq/contrib/gdtoa/g_xfmt.c Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/contrib/gdtoa/g_xfmt.c Sat Feb 28 01:05:18 2009 (r189129) @@ -53,16 +53,21 @@ THIS SOFTWARE. char* #ifdef KR_headers -g_xfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; unsigned bufsize; +g_xfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; size_t bufsize; #else -g_xfmt(char *buf, void *V, int ndig, unsigned bufsize) +g_xfmt(char *buf, void *V, int ndig, size_t bufsize) #endif { - static FPI fpi = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0 }; + static FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0 }; char *b, *s, *se; ULong bits[2], sign; UShort *L; int decpt, ex, i, mode; +#ifdef Honor_FLT_ROUNDS +#include "gdtoa_fltrnds.h" +#else +#define fpi &fpi0 +#endif if (ndig < 0) ndig = 0; @@ -109,6 +114,6 @@ g_xfmt(char *buf, void *V, int ndig, uns return 0; mode = 0; } - s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); - return g__fmt(buf, s, se, decpt, sign); + s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); + return g__fmt(buf, s, se, decpt, sign, bufsize); } Modified: user/thompsa/vaptq/contrib/gdtoa/gdtoa.c ============================================================================== --- user/thompsa/vaptq/contrib/gdtoa/gdtoa.c Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/contrib/gdtoa/gdtoa.c Sat Feb 28 01:05:18 2009 (r189129) @@ -417,11 +417,9 @@ gdtoa if (dval(d) > ds + dval(eps)) goto bump_up; else if (dval(d) < ds - dval(eps)) { - while(*--s == '0'){} - s++; if (dval(d)) inex = STRTOG_Inexlo; - goto ret1; + goto clear_trailing0; } break; } @@ -479,8 +477,12 @@ gdtoa } ++*s++; } - else + else { inex = STRTOG_Inexlo; + clear_trailing0: + while(*--s == '0'){} + ++s; + } break; } } @@ -738,7 +740,7 @@ gdtoa if (b->wds > 1 || b->x[0]) inex = STRTOG_Inexlo; while(*--s == '0'){} - s++; + ++s; } ret: Bfree(S); Modified: user/thompsa/vaptq/contrib/gdtoa/gdtoa.h ============================================================================== --- user/thompsa/vaptq/contrib/gdtoa/gdtoa.h Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/contrib/gdtoa/gdtoa.h Sat Feb 28 01:05:18 2009 (r189129) @@ -33,6 +33,7 @@ THIS SOFTWARE. #define GDTOA_H_INCLUDED #include "arith.h" +#include /* for size_t */ #ifndef Long #define Long long @@ -111,12 +112,12 @@ extern float strtof ANSI((CONST char *, extern double strtod ANSI((CONST char *, char **)); extern int strtodg ANSI((CONST char*, char**, FPI*, Long*, ULong*)); -extern char* g_ddfmt ANSI((char*, double*, int, unsigned)); -extern char* g_dfmt ANSI((char*, double*, int, unsigned)); -extern char* g_ffmt ANSI((char*, float*, int, unsigned)); -extern char* g_Qfmt ANSI((char*, void*, int, unsigned)); -extern char* g_xfmt ANSI((char*, void*, int, unsigned)); -extern char* g_xLfmt ANSI((char*, void*, int, unsigned)); +extern char* g_ddfmt ANSI((char*, double*, int, size_t)); +extern char* g_dfmt ANSI((char*, double*, int, size_t)); +extern char* g_ffmt ANSI((char*, float*, int, size_t)); +extern char* g_Qfmt ANSI((char*, void*, int, size_t)); +extern char* g_xfmt ANSI((char*, void*, int, size_t)); +extern char* g_xLfmt ANSI((char*, void*, int, size_t)); extern int strtoId ANSI((CONST char*, char**, double*, double*)); extern int strtoIdd ANSI((CONST char*, char**, double*, double*)); Copied: user/thompsa/vaptq/contrib/gdtoa/gdtoa_fltrnds.h (from r189128, head/contrib/gdtoa/gdtoa_fltrnds.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/thompsa/vaptq/contrib/gdtoa/gdtoa_fltrnds.h Sat Feb 28 01:05:18 2009 (r189129, copy of r189128, head/contrib/gdtoa/gdtoa_fltrnds.h) @@ -0,0 +1,18 @@ + FPI *fpi, fpi1; + int Rounding; +#ifdef Trust_FLT_ROUNDS /*{{ only define this if FLT_ROUNDS really works! */ + Rounding = Flt_Rounds; +#else /*}{*/ + Rounding = 1; + switch(fegetround()) { + case FE_TOWARDZERO: Rounding = 0; break; + case FE_UPWARD: Rounding = 2; break; + case FE_DOWNWARD: Rounding = 3; + } +#endif /*}}*/ + fpi = &fpi0; + if (Rounding != 1) { + fpi1 = fpi0; + fpi = &fpi1; + fpi1.rounding = Rounding; + } Modified: user/thompsa/vaptq/contrib/gdtoa/gdtoaimp.h ============================================================================== --- user/thompsa/vaptq/contrib/gdtoa/gdtoaimp.h Fri Feb 27 23:50:55 2009 (r189128) +++ user/thompsa/vaptq/contrib/gdtoa/gdtoaimp.h Sat Feb 28 01:05:18 2009 (r189129) @@ -128,8 +128,10 @@ THIS SOFTWARE. * conversions of IEEE doubles in single-threaded executions with *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***