From owner-p4-projects@FreeBSD.ORG Sun Sep 12 00:15:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2559F16A4CE; Sun, 12 Sep 2004 00:15:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C94FF16A4CE for ; Sun, 12 Sep 2004 00:15:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF11043D2F for ; Sun, 12 Sep 2004 00:15:56 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8C0Fuat011874 for ; Sun, 12 Sep 2004 00:15:56 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8C0FuvS011871 for perforce@freebsd.org; Sun, 12 Sep 2004 00:15:56 GMT (envelope-from julian@freebsd.org) Date: Sun, 12 Sep 2004 00:15:56 GMT Message-Id: <200409120015.i8C0FuvS011871@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Sep 2004 00:15:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=61366 Change 61366 by julian@julian_ref on 2004/09/12 00:15:50 tons of debugging stuff Affected files ... .. //depot/projects/nsched/sys/kern/kern_switch.c#19 edit .. //depot/projects/nsched/sys/kern/sched_4bsd.c#48 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_switch.c#19 (text+ko) ==== @@ -367,6 +367,8 @@ CTR3(KTR_RUNQ, "setrunqueue: td:%p kg:%p pid:%d", td, td->td_ksegrp, td->td_proc->p_pid); mtx_assert(&sched_lock, MA_OWNED); + KASSERT((td->td_inhibitors == 0), + ("setrunqueue: trying to run inhibitted thread")); KASSERT((TD_CAN_RUN(td) || TD_IS_RUNNING(td)), ("setrunqueue: bad thread state")); TD_SET_RUNQ(td); @@ -536,6 +538,9 @@ ctd = curthread; KASSERT ((ctd->td_kse != NULL && ctd->td_kse->ke_thread == ctd), ("thread has no (or wrong) sched-private part.")); + KASSERT((td->td_inhibitors == 0), + ("setrunqueue: trying to run inhibitted thread")); + CHECKRUNQ(td->td_ksegrp, td) pri = td->td_priority; cpri = ctd->td_priority; if (pri >= cpri || cold /* || dumping */ || TD_IS_INHIBITED(ctd) || ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#48 (text+ko) ==== @@ -794,6 +794,8 @@ * added to the run queue and selected. */ if (newtd) { + KASSERT((newtd->td_inhibitors == 0), + ("trying to run inhibitted thread")); newtd->td_ksegrp->kg_avail_opennings--; newtd->td_kse->ke_flags |= KEF_DIDRUN; TD_SET_RUNNING(newtd); From owner-p4-projects@FreeBSD.ORG Sun Sep 12 00:22:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3FFA16A4D0; Sun, 12 Sep 2004 00:22:04 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9F20116A4CE for ; Sun, 12 Sep 2004 00:22:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 949E243D1D for ; Sun, 12 Sep 2004 00:22:04 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8C0M4Hs012010 for ; Sun, 12 Sep 2004 00:22:04 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8C0M4uo012007 for perforce@freebsd.org; Sun, 12 Sep 2004 00:22:04 GMT (envelope-from julian@freebsd.org) Date: Sun, 12 Sep 2004 00:22:04 GMT Message-Id: <200409120022.i8C0M4uo012007@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61367 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Sep 2004 00:22:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=61367 Change 61367 by julian@julian_ref on 2004/09/12 00:21:23 Add line and file info Affected files ... .. //depot/projects/nsched/sys/kern/kern_switch.c#20 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_switch.c#20 (text+ko) ==== @@ -119,24 +119,27 @@ CTASSERT((RQB_BPW * RQB_LEN) == RQ_NQS); #ifdef INVARIANTS -#define CHECKRUNQ(kg, td) checkrunq((kg), (td)); +#define CHECKRUNQ(kg, td) checkrunq((kg), (td), __FILE__, __LINE__); static void -checkrunq(struct ksegrp *kg, struct thread *td) +checkrunq(struct ksegrp *kg, struct thread *td, char *file, int line) { struct thread *td2; int count = 0; TAILQ_FOREACH(td2, &kg->kg_runq, td_runq) { /* XXX Debugging hack */ if (!TD_ON_RUNQ(td2)) { + printf("%s: line %d", file line); printf("thread in wrong state, td2= %p\n", td2); panic("corruption in runqueue"); } if (td == td2) { + printf("%s: line %d", file line); printf("thread alreadyin runq, td2= %p\n", td); panic("confusion in runqueue"); } if (++count > 10000) { + printf("%s: line %d", file line); printf("corrupt kg_runq, td= %p\n", td); panic("deadlock in runqueue"); } From owner-p4-projects@FreeBSD.ORG Sun Sep 12 00:23:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 815BE16A4D0; Sun, 12 Sep 2004 00:23:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5DB0716A4CE for ; Sun, 12 Sep 2004 00:23:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54F3643D4C for ; Sun, 12 Sep 2004 00:23:06 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8C0N6f9012029 for ; Sun, 12 Sep 2004 00:23:06 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8C0N6Ck012026 for perforce@freebsd.org; Sun, 12 Sep 2004 00:23:06 GMT (envelope-from julian@freebsd.org) Date: Sun, 12 Sep 2004 00:23:06 GMT Message-Id: <200409120023.i8C0N6Ck012026@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61368 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Sep 2004 00:23:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=61368 Change 61368 by julian@julian_ref on 2004/09/12 00:22:52 Compile! Affected files ... .. //depot/projects/nsched/sys/kern/kern_switch.c#21 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_switch.c#21 (text+ko) ==== @@ -129,17 +129,17 @@ TAILQ_FOREACH(td2, &kg->kg_runq, td_runq) { /* XXX Debugging hack */ if (!TD_ON_RUNQ(td2)) { - printf("%s: line %d", file line); + printf("%s: line %d", file, line); printf("thread in wrong state, td2= %p\n", td2); panic("corruption in runqueue"); } if (td == td2) { - printf("%s: line %d", file line); + printf("%s: line %d", file, line); printf("thread alreadyin runq, td2= %p\n", td); panic("confusion in runqueue"); } if (++count > 10000) { - printf("%s: line %d", file line); + printf("%s: line %d", file, line); printf("corrupt kg_runq, td= %p\n", td); panic("deadlock in runqueue"); } From owner-p4-projects@FreeBSD.ORG Sun Sep 12 05:47:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4526D16A4D0; Sun, 12 Sep 2004 05:47:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 203BA16A4CE for ; Sun, 12 Sep 2004 05:47:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13F1A43D45 for ; Sun, 12 Sep 2004 05:47:38 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8C5lbPY020044 for ; Sun, 12 Sep 2004 05:47:37 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8C5lb8J020041 for perforce@freebsd.org; Sun, 12 Sep 2004 05:47:37 GMT (envelope-from julian@freebsd.org) Date: Sun, 12 Sep 2004 05:47:37 GMT Message-Id: <200409120547.i8C5lb8J020041@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61374 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Sep 2004 05:47:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=61374 Change 61374 by julian@julian_ref on 2004/09/12 05:46:49 A hackish fix for preemption and threads, Affected files ... .. //depot/projects/nsched/sys/kern/kern_switch.c#22 edit .. //depot/projects/nsched/sys/kern/sched_4bsd.c#49 edit .. //depot/projects/nsched/sys/kern/sched_ule.c#31 edit .. //depot/projects/nsched/sys/sys/proc.h#30 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_switch.c#22 (text+ko) ==== @@ -396,6 +396,10 @@ return; } + if (((flags & (SRQ_YIELDING|SRQ_OURSELF|SRQ_NOPREEMPT)) == 0) && + maybe_preempt(td)) + return; + CHECKRUNQ(kg, td) tda = kg->kg_last_assigned; if ((kg->kg_avail_opennings <= 0) && @@ -453,7 +457,7 @@ kg->kg_last_assigned = td2; } kg->kg_avail_opennings--; - sched_add(td2, flags); + sched_add(td2, flags|SRQ_NOPREEMPT); } else { CTR3(KTR_RUNQ, "setrunqueue: held: td%p kg%p pid%d", td, td->td_ksegrp, td->td_proc->p_pid); ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#49 (text+ko) ==== @@ -1018,7 +1018,8 @@ #endif { - if (maybe_preempt(td)) + if (((flags & SRQ_NOPREEMPT) == 0) && + maybe_preempt(td)) return; } } ==== //depot/projects/nsched/sys/kern/sched_ule.c#31 (text+ko) ==== @@ -1662,13 +1662,13 @@ /* let jeff work out how to map the flags better */ /* I'm open to suggestions */ - if (flags & SRQ_YIELDING) + if (flags & (SRQ_YIELDING|SRQ_NOPREEMPT)) { /* * Preempting during switching can be bad JUJU * especially for KSE processes */ sched_add_internal(td, 0); - else + } else sched_add_internal(td, 1); } ==== //depot/projects/nsched/sys/sys/proc.h#30 (text+ko) ==== @@ -658,6 +658,7 @@ #define SRQ_YIELDING 0x0001 /* we are yielding (from mi_switch) */ #define SRQ_OURSELF 0x0002 /* it is ourself (from mi_switch) */ #define SRQ_INTR 0x0004 /* it is probably urgent */ +#define SRQ_NOPREEMPT 0x0008 /* Just don't ok? */ /* How values for thread_single(). */ #define SINGLE_NO_EXIT 0 From owner-p4-projects@FreeBSD.ORG Sun Sep 12 05:47:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18D2E16A4DA; Sun, 12 Sep 2004 05:47:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 940BA16A4D3 for ; Sun, 12 Sep 2004 05:47:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 734C843D45 for ; Sun, 12 Sep 2004 05:47:38 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8C5lc1T020051 for ; Sun, 12 Sep 2004 05:47:38 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8C5lcqw020047 for perforce@freebsd.org; Sun, 12 Sep 2004 05:47:38 GMT (envelope-from julian@freebsd.org) Date: Sun, 12 Sep 2004 05:47:38 GMT Message-Id: <200409120547.i8C5lcqw020047@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61375 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Sep 2004 05:47:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=61375 Change 61375 by julian@julian_ref on 2004/09/12 05:47:26 IFC@61373 Affected files ... .. //depot/projects/nsched/sys/contrib/pf/net/pf.c#7 integrate .. //depot/projects/nsched/sys/dev/aac/aac.c#6 integrate .. //depot/projects/nsched/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/nsched/sys/geom/bde/g_bde_crypt.c#2 integrate .. //depot/projects/nsched/sys/geom/bde/g_bde_lock.c#2 integrate .. //depot/projects/nsched/sys/vm/vm_fault.c#7 integrate Differences ... ==== //depot/projects/nsched/sys/contrib/pf/net/pf.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.18 2004/08/12 13:59:44 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.19 2004/09/11 11:18:25 mlaier Exp $ */ /* $OpenBSD: pf.c,v 1.433.2.2 2004/07/17 03:22:34 brad Exp $ */ /* add $OpenBSD: pf.c,v 1.448 2004/05/11 07:34:11 dhartmei Exp $ */ @@ -5619,9 +5619,8 @@ } else { ip = mtod(m, struct ip *); sum = in_pseudo(ip->ip_src.s_addr, - ip->ip_dst.s_addr, - htonl(m->m_pkthdr.csum_data + - IPPROTO_TCP + ntohs(ip->ip_len))); + ip->ip_dst.s_addr, htonl((u_short)len + + m->m_pkthdr.csum_data + IPPROTO_TCP)); } sum ^= 0xffff; ++hw_assist; ==== //depot/projects/nsched/sys/dev/aac/aac.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.101 2004/08/13 01:44:09 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.102 2004/09/12 03:19:32 scottl Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -2339,26 +2339,26 @@ aac_release_sync_fib(sc); return; } - info = (struct aac_adapter_info *)&fib->data[0]; - - device_printf(sc->aac_dev, "%s %dMHz, %dMB cache memory, %s\n", - aac_describe_code(aac_cpu_variant, info->CpuVariant), - info->ClockSpeed, info->BufferMem / (1024 * 1024), - aac_describe_code(aac_battery_platform, - info->batteryPlatform)); /* save the kernel revision structure for later use */ + info = (struct aac_adapter_info *)&fib->data[0]; sc->aac_revision = info->KernelRevision; - device_printf(sc->aac_dev, "Kernel %d.%d-%d, Build %d, S/N %6X\n", - info->KernelRevision.external.comp.major, - info->KernelRevision.external.comp.minor, - info->KernelRevision.external.comp.dash, - info->KernelRevision.buildNumber, - (u_int32_t)(info->SerialNumber & 0xffffff)); + + if (bootverbose) { + device_printf(sc->aac_dev, "%s %dMHz, %dMB cache memory, %s\n", + aac_describe_code(aac_cpu_variant, info->CpuVariant), + info->ClockSpeed, info->BufferMem / (1024 * 1024), + aac_describe_code(aac_battery_platform, + info->batteryPlatform)); - aac_release_sync_fib(sc); + device_printf(sc->aac_dev, + "Kernel %d.%d-%d, Build %d, S/N %6X\n", + info->KernelRevision.external.comp.major, + info->KernelRevision.external.comp.minor, + info->KernelRevision.external.comp.dash, + info->KernelRevision.buildNumber, + (u_int32_t)(info->SerialNumber & 0xffffff)); - if (1 || bootverbose) { device_printf(sc->aac_dev, "Supported Options=%b\n", sc->supported_options, "\20" @@ -2376,6 +2376,7 @@ "\14ALARM" "\15NONDASD"); } + aac_release_sync_fib(sc); } /* ==== //depot/projects/nsched/sys/dev/vge/if_vge.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.2 2004/09/11 01:07:39 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.3 2004/09/11 22:13:25 wpaul Exp $"); /* * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver. @@ -1547,7 +1547,6 @@ * This is done in case the transmitter has gone idle. */ if (sc->vge_ldata.vge_tx_free != VGE_TX_DESC_CNT) { - CSR_WRITE_2(sc, VGE_TXQCSRS, VGE_TXQCSR_WAK0); CSR_WRITE_1(sc, VGE_CRS1, VGE_CR1_TIMER0_ENABLE); } ==== //depot/projects/nsched/sys/geom/bde/g_bde_crypt.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/bde/g_bde_crypt.c,v 1.19 2004/01/23 11:47:06 phk Exp $ + * $FreeBSD: src/sys/geom/bde/g_bde_crypt.c,v 1.20 2004/09/11 17:58:53 phk Exp $ * * This source file contains the functions responsible for the crypto, keying * and mapping operations on the I/O requests. @@ -311,7 +311,7 @@ /* Compensate for lock sectors */ for (u = 0; u < G_BDE_MAXKEYS; u++) { /* Find the start of this lock sector */ - ko = kp->lsector[u] & ~(kp->sectorsize - 1); + ko = kp->lsector[u] & ~((uint64_t)kp->sectorsize - 1); if (wp->kso >= ko) wp->kso += kp->sectorsize; ==== //depot/projects/nsched/sys/geom/bde/g_bde_lock.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/bde/g_bde_lock.c,v 1.12 2003/10/07 09:28:07 phk Exp $ + * $FreeBSD: src/sys/geom/bde/g_bde_lock.c,v 1.13 2004/09/11 17:57:51 phk Exp $ * * This souce file contains routines which operates on the lock sectors, both * for the kernel and the userland program gbde(1). @@ -428,10 +428,9 @@ return (ENOENT); /* If we have an unsorted lock-sequence, refuse */ - if (gl->lsector[0] > gl->lsector[1] || - gl->lsector[1] > gl->lsector[2] || - gl->lsector[2] > gl->lsector[3]) - return (EINVAL); + for (i = 0; i < G_BDE_MAXKEYS - 1; i++) + if (gl->lsector[i] >= gl->lsector[i + 1]) + return (EINVAL); /* Finally, find out which key was used by matching the byte offset */ for (i = 0; i < G_BDE_MAXKEYS; i++) ==== //depot/projects/nsched/sys/vm/vm_fault.c#7 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.196 2004/09/03 05:11:32 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.197 2004/09/11 18:49:59 alc Exp $"); #include #include @@ -172,7 +172,7 @@ mtx_unlock(&Giant); fs->vp = NULL; } - if (dealloc) + if (dealloc && !fs->map->system_map) VM_UNLOCK_GIANT(); } @@ -291,11 +291,14 @@ * * XXX vnode_pager_lock() can block without releasing the map lock. */ - mtx_lock(&Giant); + if (!fs.map->system_map) + mtx_lock(&Giant); VM_OBJECT_LOCK(fs.first_object); vm_object_reference_locked(fs.first_object); fs.vp = vnode_pager_lock(fs.first_object); - if (debug_mpsafevm) + KASSERT(fs.vp == NULL || !fs.map->system_map, + ("vm_fault: vnode-backed object mapped by system map")); + if (debug_mpsafevm && !fs.map->system_map) mtx_unlock(&Giant); vm_object_pip_add(fs.first_object, 1); @@ -369,7 +372,8 @@ if (!vm_page_sleep_if_busy(fs.m, TRUE, "vmpfw")) vm_page_unlock_queues(); atomic_add_int(&cnt.v_intrans, 1); - VM_UNLOCK_GIANT(); + if (!fs.map->system_map) + VM_UNLOCK_GIANT(); vm_object_deallocate(fs.first_object); goto RetryFault; } @@ -1026,13 +1030,9 @@ * read-only sections. */ for (va = start; va < end; va += PAGE_SIZE) { - if (map->system_map) - mtx_lock(&Giant); rv = vm_fault(map, va, user_wire ? VM_PROT_READ : VM_PROT_READ | VM_PROT_WRITE, user_wire ? VM_FAULT_USER_WIRE : VM_FAULT_CHANGE_WIRING); - if (map->system_map) - mtx_unlock(&Giant); if (rv) { if (va != start) vm_fault_unwire(map, start, va, fictitious); From owner-p4-projects@FreeBSD.ORG Mon Sep 13 18:27:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F23416A4D0; Mon, 13 Sep 2004 18:27:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 198CA16A4CE for ; Mon, 13 Sep 2004 18:27:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E917543D1D for ; Mon, 13 Sep 2004 18:27:05 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8DIR5wl079666 for ; Mon, 13 Sep 2004 18:27:05 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8DIR51w079663 for perforce@freebsd.org; Mon, 13 Sep 2004 18:27:05 GMT (envelope-from jhb@freebsd.org) Date: Mon, 13 Sep 2004 18:27:05 GMT Message-Id: <200409131827.i8DIR51w079663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 61432 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Sep 2004 18:27:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=61432 Change 61432 by jhb@jhb_slimer on 2004/09/13 18:26:18 IFC @61430. Affected files ... .. //depot/projects/smpng/sys/alpha/conf/GENERIC#42 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#33 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#14 integrate .. //depot/projects/smpng/sys/conf/NOTES#80 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#9 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#43 integrate .. //depot/projects/smpng/sys/dev/bktr/msp34xx.c#4 integrate .. //depot/projects/smpng/sys/dev/esp/esp_sbus.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#17 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#36 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#15 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_lock.c#10 integrate .. //depot/projects/smpng/sys/geom/geom_kern.c#18 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#7 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.h#4 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#6 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#5 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_rm.c#3 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_state.c#3 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_subr.c#6 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#71 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#23 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#42 integrate .. //depot/projects/smpng/sys/ia64/conf/SKI#19 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#30 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#38 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#42 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#66 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#17 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#14 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#10 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#65 integrate .. //depot/projects/smpng/sys/sys/conf.h#30 integrate .. //depot/projects/smpng/sys/sys/proc.h#126 integrate .. //depot/projects/smpng/sys/sys/rman.h#9 integrate .. //depot/projects/smpng/sys/sys/sched.h#16 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#29 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#39 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#41 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#42 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.178 2004/09/07 22:37:43 scottl Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.179 2004/09/11 07:26:50 alc Exp $ machine alpha cpu EV4 @@ -163,6 +163,7 @@ device miibus # MII bus support device dc # DEC/Intel 21143 and workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) +device nge # NatSemi DP83820 gigabit ethernet device pcn # AMD Am79C97x PCI 10/100 NICs device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#33 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.497 2004/09/08 18:58:28 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.498 2004/09/12 20:20:40 alc Exp $"); /* * Manages physical address maps. @@ -1784,14 +1784,15 @@ va_next = eva; for (; sva != va_next; sva += PAGE_SIZE) { - pt_entry_t pbits; + pt_entry_t obits, pbits; pt_entry_t *pte; vm_page_t m; pte = pmap_pte(pmap, sva); if (pte == NULL) continue; - pbits = *pte; +retry: + obits = pbits = *pte; if (pbits & PG_MANAGED) { m = NULL; if (pbits & PG_A) { @@ -1805,14 +1806,14 @@ m = PHYS_TO_VM_PAGE(pbits & PG_FRAME); vm_page_dirty(m); - pbits &= ~PG_M; } } - pbits &= ~PG_RW; + pbits &= ~(PG_RW | PG_M); - if (pbits != *pte) { - pte_store(pte, pbits); + if (pbits != obits) { + if (!atomic_cmpset_long(pte, obits, pbits)) + goto retry; anychanged = 1; } } ==== //depot/projects/smpng/sys/amd64/include/pmap.h#14 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.122 2004/07/20 02:40:56 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.123 2004/09/11 01:31:26 scottl Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -97,8 +97,9 @@ ((unsigned long)(l2) << PDRSHIFT) | \ ((unsigned long)(l1) << PAGE_SHIFT)) +/* Initial number of kernel page tables */ #ifndef NKPT -#define NKPT 120 /* initial number of kernel page tables */ +#define NKPT 240 /* Enough for 16GB (2MB page tables) */ #endif #define NKPML4E 1 /* number of kernel PML4 slots */ ==== //depot/projects/smpng/sys/conf/NOTES#80 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1276 2004/09/08 08:42:36 ru Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1277 2004/09/12 12:13:29 ceri Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -201,7 +201,7 @@ # allows interrupt threads to run sooner rather than waiting. # WARNING! Only tested on alpha, amd64, and i386. # FULL_PREEMPTION instructs the kernel to preempt non-realtime kernel -# threads. It sole use is to expose race conditions and other +# threads. Its sole use is to expose race conditions and other # bugs during development. Enabling this option will reduce # performance and increase the frequency of kernel panics by # design. If you aren't sure that you need it then you don't. ==== //depot/projects/smpng/sys/contrib/pf/net/pf.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.18 2004/08/12 13:59:44 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.19 2004/09/11 11:18:25 mlaier Exp $ */ /* $OpenBSD: pf.c,v 1.433.2.2 2004/07/17 03:22:34 brad Exp $ */ /* add $OpenBSD: pf.c,v 1.448 2004/05/11 07:34:11 dhartmei Exp $ */ @@ -5619,9 +5619,8 @@ } else { ip = mtod(m, struct ip *); sum = in_pseudo(ip->ip_src.s_addr, - ip->ip_dst.s_addr, - htonl(m->m_pkthdr.csum_data + - IPPROTO_TCP + ntohs(ip->ip_len))); + ip->ip_dst.s_addr, htonl((u_short)len + + m->m_pkthdr.csum_data + IPPROTO_TCP)); } sum ^= 0xffff; ++hw_assist; ==== //depot/projects/smpng/sys/dev/aac/aac.c#43 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.101 2004/08/13 01:44:09 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.102 2004/09/12 03:19:32 scottl Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -2339,26 +2339,26 @@ aac_release_sync_fib(sc); return; } - info = (struct aac_adapter_info *)&fib->data[0]; - - device_printf(sc->aac_dev, "%s %dMHz, %dMB cache memory, %s\n", - aac_describe_code(aac_cpu_variant, info->CpuVariant), - info->ClockSpeed, info->BufferMem / (1024 * 1024), - aac_describe_code(aac_battery_platform, - info->batteryPlatform)); /* save the kernel revision structure for later use */ + info = (struct aac_adapter_info *)&fib->data[0]; sc->aac_revision = info->KernelRevision; - device_printf(sc->aac_dev, "Kernel %d.%d-%d, Build %d, S/N %6X\n", - info->KernelRevision.external.comp.major, - info->KernelRevision.external.comp.minor, - info->KernelRevision.external.comp.dash, - info->KernelRevision.buildNumber, - (u_int32_t)(info->SerialNumber & 0xffffff)); + + if (bootverbose) { + device_printf(sc->aac_dev, "%s %dMHz, %dMB cache memory, %s\n", + aac_describe_code(aac_cpu_variant, info->CpuVariant), + info->ClockSpeed, info->BufferMem / (1024 * 1024), + aac_describe_code(aac_battery_platform, + info->batteryPlatform)); - aac_release_sync_fib(sc); + device_printf(sc->aac_dev, + "Kernel %d.%d-%d, Build %d, S/N %6X\n", + info->KernelRevision.external.comp.major, + info->KernelRevision.external.comp.minor, + info->KernelRevision.external.comp.dash, + info->KernelRevision.buildNumber, + (u_int32_t)(info->SerialNumber & 0xffffff)); - if (1 || bootverbose) { device_printf(sc->aac_dev, "Supported Options=%b\n", sc->supported_options, "\20" @@ -2376,6 +2376,7 @@ "\14ALARM" "\15NONDASD"); } + aac_release_sync_fib(sc); } /* ==== //depot/projects/smpng/sys/dev/bktr/msp34xx.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bktr/msp34xx.c,v 1.3 2003/12/12 21:18:04 rwatson Exp $ + * $FreeBSD: src/sys/dev/bktr/msp34xx.c,v 1.4 2004/09/11 04:32:55 dwhite Exp $ */ /* @@ -85,6 +85,10 @@ #include #include +#ifdef BKTR_USE_FREEBSD_SMBUS +#include /* required by bktr_reg.h */ +#endif + #include /* required by bktr_reg.h */ #include ==== //depot/projects/smpng/sys/dev/esp/esp_sbus.c#4 (text+ko) ==== @@ -65,7 +65,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/esp/esp_sbus.c,v 1.6 2004/08/12 17:41:29 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/esp/esp_sbus.c,v 1.7 2004/09/13 15:15:38 scottl Exp $"); #include #include @@ -193,8 +193,12 @@ node = ofw_bus_get_node(dev); if (OF_getprop(node, "initiator-id", &sc->sc_id, sizeof(sc->sc_id)) == -1) - sc->sc_id = 7;; - sc->sc_freq = sbus_get_clockfreq(dev); + sc->sc_id = 7; + if (OF_getprop(node, "clock-frequency", &sc->sc_freq, + sizeof(sc->sc_freq)) == -1) { + printf("failed to query OFW for clock-frequency\n"); + sc->sc_freq = sbus_get_clockfreq(dev); + } #ifdef ESP_SBUS_DEBUG device_printf(dev, "espattach_sbus: sc_id %d, freq %d\n", ==== //depot/projects/smpng/sys/dev/sound/isa/sb16.c#17 (text+ko) ==== @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.87 2004/07/16 03:59:54 tanimura Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.88 2004/09/12 18:19:42 truckman Exp $"); #define SB16_BUFFSIZE 4096 #define PLAIN_SB16(x) ((((x)->bd_flags) & (BD_F_SB16|BD_F_SB16X)) == BD_F_SB16) @@ -209,7 +209,7 @@ #if 0 printf("sb_cmd2: %x, %x\n", cmd, val); #endif - sb_lock(sb); + sb_lockassert(sb); r = 0; if (sb_dspwr(sb, cmd)) { if (sb_dspwr(sb, val & 0xff)) { @@ -218,7 +218,6 @@ } } } - sb_unlock(sb); return r; } @@ -243,12 +242,11 @@ { int val; - sb_lock(sb); + sb_lockassert(sb); sb_wr(sb, SB_MIX_ADDR, (u_char) (port & 0xff)); /* Select register */ DELAY(10); val = sb_rd(sb, SB_MIX_DATA); DELAY(10); - sb_unlock(sb); return val; } ==== //depot/projects/smpng/sys/dev/vge/if_vge.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.1 2004/09/10 20:57:45 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.3 2004/09/11 22:13:25 wpaul Exp $"); /* * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver. @@ -1158,7 +1158,6 @@ if (sc->vge_parent_tag) bus_dma_tag_destroy(sc->vge_parent_tag); - VGE_UNLOCK(sc); mtx_destroy(&sc->vge_mtx); return (0); @@ -1548,7 +1547,6 @@ * This is done in case the transmitter has gone idle. */ if (sc->vge_ldata.vge_tx_free != VGE_TX_DESC_CNT) { - CSR_WRITE_2(sc, VGE_TXQCSRS, VGE_TXQCSR_WAK0); CSR_WRITE_1(sc, VGE_CRS1, VGE_CR1_TIMER0_ENABLE); } ==== //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#36 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95 - * $FreeBSD: src/sys/fs/specfs/spec_vnops.c,v 1.226 2004/08/08 13:23:05 phk Exp $ + * $FreeBSD: src/sys/fs/specfs/spec_vnops.c,v 1.227 2004/09/13 06:50:41 phk Exp $ */ #include @@ -54,7 +54,6 @@ static int spec_advlock(struct vop_advlock_args *); static int spec_close(struct vop_close_args *); -static int spec_freeblks(struct vop_freeblks_args *); static int spec_fsync(struct vop_fsync_args *); static int spec_getpages(struct vop_getpages_args *); static int spec_ioctl(struct vop_ioctl_args *); @@ -74,7 +73,6 @@ { &vop_bmap_desc, (vop_t *) vop_panic }, { &vop_close_desc, (vop_t *) spec_close }, { &vop_create_desc, (vop_t *) vop_panic }, - { &vop_freeblks_desc, (vop_t *) spec_freeblks }, { &vop_fsync_desc, (vop_t *) spec_fsync }, { &vop_getpages_desc, (vop_t *) spec_getpages }, { &vop_getwritemount_desc, (vop_t *) vop_stdgetwritemount }, @@ -462,10 +460,8 @@ struct cdevsw *dsw; struct thread *td = curthread; - KASSERT(bp->b_iocmd == BIO_READ || - bp->b_iocmd == BIO_WRITE || - bp->b_iocmd == BIO_DELETE, - ("Wrong b_iocmd buf=%p cmd=%d", bp, bp->b_iocmd)); + KASSERT(bp->b_iocmd == BIO_READ || bp->b_iocmd == BIO_WRITE, + ("Wrong b_iocmd buf=%p cmd=%d", bp, bp->b_iocmd)); /* * Slow down disk requests for niced processes. @@ -529,33 +525,6 @@ return spec_xstrategy(ap->a_vp, ap->a_bp); } -static int -spec_freeblks(ap) - struct vop_freeblks_args /* { - struct vnode *a_vp; - daddr_t a_addr; - daddr_t a_length; - } */ *ap; -{ - struct buf *bp; - - /* - * XXX: This assumes that strategy does the deed right away. - * XXX: this may not be TRTTD. - */ - if ((ap->a_vp->v_rdev->si_flags & SI_CANDELETE) == 0) - return (0); - bp = geteblk(ap->a_length); - bp->b_iocmd = BIO_DELETE; - bp->b_dev = ap->a_vp->v_rdev; - bp->b_blkno = ap->a_addr; - bp->b_offset = dbtob(ap->a_addr); - bp->b_iooffset = bp->b_offset; - bp->b_bcount = ap->a_length; - BUF_KERNPROC(bp); - DEV_STRATEGY(bp); - return (0); -} /* * Device close routine ==== //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#15 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/bde/g_bde_crypt.c,v 1.19 2004/01/23 11:47:06 phk Exp $ + * $FreeBSD: src/sys/geom/bde/g_bde_crypt.c,v 1.20 2004/09/11 17:58:53 phk Exp $ * * This source file contains the functions responsible for the crypto, keying * and mapping operations on the I/O requests. @@ -311,7 +311,7 @@ /* Compensate for lock sectors */ for (u = 0; u < G_BDE_MAXKEYS; u++) { /* Find the start of this lock sector */ - ko = kp->lsector[u] & ~(kp->sectorsize - 1); + ko = kp->lsector[u] & ~((uint64_t)kp->sectorsize - 1); if (wp->kso >= ko) wp->kso += kp->sectorsize; ==== //depot/projects/smpng/sys/geom/bde/g_bde_lock.c#10 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/bde/g_bde_lock.c,v 1.12 2003/10/07 09:28:07 phk Exp $ + * $FreeBSD: src/sys/geom/bde/g_bde_lock.c,v 1.13 2004/09/11 17:57:51 phk Exp $ * * This souce file contains routines which operates on the lock sectors, both * for the kernel and the userland program gbde(1). @@ -428,10 +428,9 @@ return (ENOENT); /* If we have an unsorted lock-sequence, refuse */ - if (gl->lsector[0] > gl->lsector[1] || - gl->lsector[1] > gl->lsector[2] || - gl->lsector[2] > gl->lsector[3]) - return (EINVAL); + for (i = 0; i < G_BDE_MAXKEYS - 1; i++) + if (gl->lsector[i] >= gl->lsector[i + 1]) + return (EINVAL); /* Finally, find out which key was used by matching the byte offset */ for (i = 0; i < G_BDE_MAXKEYS; i++) ==== //depot/projects/smpng/sys/geom/geom_kern.c#18 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_kern.c,v 1.34 2004/02/10 10:54:19 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_kern.c,v 1.35 2004/09/13 14:58:27 pjd Exp $"); #include #include @@ -220,6 +220,7 @@ 0, 0, sysctl_kern_geom_conftxt, "", "Dump the GEOM config in txt"); +TUNABLE_INT("kern.geom.debugflags", &g_debugflags); SYSCTL_INT(_kern_geom, OID_AUTO, debugflags, CTLFLAG_RW, &g_debugflags, 0, ""); ==== //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum.c,v 1.10 2004/08/27 21:32:18 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum.c,v 1.11 2004/09/13 17:27:58 le Exp $"); #include #include @@ -186,7 +186,7 @@ g_topology_unlock(); /* Check if the provided slice is a valid vinum drive. */ - vhdr = g_read_data(cp, GV_HDR_OFFSET, GV_HDR_LEN, &error); + vhdr = g_read_data(cp, GV_HDR_OFFSET, pp->sectorsize, &error); if (vhdr == NULL || error != 0) { g_topology_lock(); g_access(cp, -1, 0, 0); ==== //depot/projects/smpng/sys/geom/vinum/geom_vinum.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/vinum/geom_vinum.h,v 1.3 2004/08/27 21:32:18 le Exp $ + * $FreeBSD: src/sys/geom/vinum/geom_vinum.h,v 1.4 2004/09/13 17:44:47 le Exp $ */ #ifndef _GEOM_VINUM_H_ @@ -68,7 +68,7 @@ void gv_format_config(struct gv_softc *, struct sbuf *, int, char *); int gv_is_striped(struct gv_plex *); int gv_is_open(struct g_geom *); -void gv_kill_thread(struct gv_plex *); +void gv_kill_plex_thread(struct gv_plex *); int gv_object_type(struct gv_softc *, char *); void gv_parse_config(struct gv_softc *, u_char *, int); const char *gv_roughlength(off_t, int); ==== //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.11 2004/08/27 21:32:18 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.13 2004/09/13 17:33:52 le Exp $"); #include #include @@ -318,7 +318,8 @@ s->provider = NULL; s->consumer = NULL; } - gv_set_drive_state(d, GV_DRIVE_DOWN, GV_SETSTATE_FORCE); + gv_set_drive_state(d, GV_DRIVE_DOWN, + GV_SETSTATE_FORCE | GV_SETSTATE_CONFIG); } gp->softc = NULL; g_wither_geom(gp, error); @@ -372,7 +373,7 @@ /* Now check if the provided slice is a valid vinum drive. */ do { - vhdr = g_read_data(cp, GV_HDR_OFFSET, GV_HDR_LEN, &error); + vhdr = g_read_data(cp, GV_HDR_OFFSET, pp->sectorsize, &error); if (vhdr == NULL || error != 0) break; if (vhdr->magic != GV_MAGIC) { ==== //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_plex.c,v 1.8 2004/08/10 20:51:48 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_plex.c,v 1.9 2004/09/13 17:44:47 le Exp $"); #include #include @@ -67,7 +67,7 @@ p = gp->softc; if (p != NULL) { - gv_kill_thread(p); + gv_kill_plex_thread(p); p->geom = NULL; p->provider = NULL; p->consumer = NULL; @@ -468,7 +468,7 @@ * If this is a RAID5 plex, check if its worker thread is still active * and signal it to self destruct. */ - gv_kill_thread(p); + gv_kill_plex_thread(p); /* g_free(sc); */ g_wither_geom(gp, ENXIO); return (0); ==== //depot/projects/smpng/sys/geom/vinum/geom_vinum_rm.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_rm.c,v 1.2 2004/08/22 17:07:55 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_rm.c,v 1.3 2004/09/13 17:44:47 le Exp $"); #include #include @@ -228,7 +228,7 @@ p->vol_sc = NULL; } - gv_kill_thread(p); + gv_kill_plex_thread(p); g_free(p); if (gp != NULL) { ==== //depot/projects/smpng/sys/geom/vinum/geom_vinum_state.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_state.c,v 1.3 2004/08/19 12:03:27 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_state.c,v 1.4 2004/09/13 17:33:52 le Exp $"); #include #include @@ -63,6 +63,10 @@ gv_update_sd_state(s); } + /* Save the config back to disk. */ + if (flags & GV_SETSTATE_CONFIG) + gv_save_config_all(d->vinumconf); + return (1); } ==== //depot/projects/smpng/sys/geom/vinum/geom_vinum_subr.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_subr.c,v 1.7 2004/08/22 13:34:24 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_subr.c,v 1.8 2004/09/13 17:44:47 le Exp $"); #include #include @@ -817,7 +817,7 @@ } void -gv_kill_thread(struct gv_plex *p) +gv_kill_plex_thread(struct gv_plex *p) { if ((p->org == GV_PLEX_RAID5) && (p->flags & GV_PLEX_THREAD_ACTIVE)) { p->flags |= GV_PLEX_THREAD_DIE; ==== //depot/projects/smpng/sys/i386/i386/pmap.c#71 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.501 2004/09/08 18:58:29 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.504 2004/09/12 20:20:40 alc Exp $"); /* * Manages physical address maps. @@ -1814,7 +1814,7 @@ sched_pin(); PMAP_LOCK(pmap); for (; sva < eva; sva = pdnxt) { - unsigned pdirindex; + unsigned obits, pbits, pdirindex; pdnxt = (sva + NBPDR) & ~PDRMASK; @@ -1842,13 +1842,18 @@ pdnxt = eva; for (; sva != pdnxt; sva += PAGE_SIZE) { - pt_entry_t pbits; pt_entry_t *pte; vm_page_t m; if ((pte = pmap_pte_quick(pmap, sva)) == NULL) continue; - pbits = *pte; +retry: + /* + * Regardless of whether a pte is 32 or 64 bits in + * size, PG_RW, PG_A, and PG_M are among the least + * significant 32 bits. + */ + obits = pbits = *(u_int *)pte; if (pbits & PG_MANAGED) { m = NULL; if (pbits & PG_A) { @@ -1861,14 +1866,15 @@ if (m == NULL) m = PHYS_TO_VM_PAGE(pbits); vm_page_dirty(m); - pbits &= ~PG_M; } } - pbits &= ~PG_RW; + pbits &= ~(PG_RW | PG_M); - if (pbits != *pte) { - pte_store(pte, pbits); + if (pbits != obits) { + if (!atomic_cmpset_int((u_int *)pte, obits, + pbits)) + goto retry; anychanged = 1; } } ==== //depot/projects/smpng/sys/i386/include/pmap.h#23 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/pmap.h,v 1.112 2004/06/29 15:57:05 peter Exp $ + * $FreeBSD: src/sys/i386/include/pmap.h,v 1.113 2004/09/11 01:31:26 scottl Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -96,11 +96,12 @@ */ #define VADDR(pdi, pti) ((vm_offset_t)(((pdi)< -__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.156 2004/08/30 01:10:20 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.157 2004/09/13 07:29:44 phk Exp $"); #include #include @@ -293,7 +293,6 @@ si->__si_namebuf[0] = '\0'; si->si_name = si->__si_namebuf; LIST_INIT(&si->si_children); - TAILQ_INIT(&si->si_snapshots); return (si); } ==== //depot/projects/smpng/sys/kern/sched_4bsd.c#38 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.61 2004/09/10 21:04:38 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.63 2004/09/11 10:07:22 scottl Exp $"); #define kse td_sched @@ -87,7 +87,6 @@ } ke_state; /* (j) KSE status. */ int ke_cpticks; /* (j) Ticks of cpu time. */ struct runq *ke_runq; /* runq the kse is currently on */ - int ke_pinned; /* nested count of pinned to a cpu */ }; #define ke_proc ke_thread->td_proc @@ -125,7 +124,7 @@ * cpus. */ #define KSE_CAN_MIGRATE(ke) \ - ((ke)->ke_pinned == 0 && ((ke)->ke_flags & KEF_BOUND) == 0) + ((ke)->ke_thread->td_pinned == 0 && ((ke)->ke_flags & KEF_BOUND) == 0) static struct kse kse0; static struct kg_sched kg_sched0; @@ -764,7 +763,6 @@ if ((p->p_flag & P_NOLOAD) == 0) sched_tdcnt--; - /* * We are volunteering to switch out so we get to nominate * a successor for the rest of our quantum ==== //depot/projects/smpng/sys/kern/sched_ule.c#42 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.126 2004/09/10 21:04:38 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.129 2004/09/11 10:07:22 scottl Exp $"); #include @@ -112,7 +112,6 @@ KES_ONRUNQ } ke_state; /* (j) thread sched specific status. */ int ke_slptime; - int ke_pinned; int ke_slice; struct runq *ke_runq; u_char ke_cpu; /* CPU that we have affinity for. */ ==== //depot/projects/smpng/sys/kern/vfs_bio.c#66 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.444 2004/07/25 21:24:21 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.445 2004/09/13 06:50:41 phk Exp $"); #include #include @@ -1234,8 +1234,7 @@ bp->b_ioflags &= ~BIO_ERROR; bdirty(bp); } else if ((bp->b_flags & (B_NOCACHE | B_INVAL)) || - (bp->b_ioflags & BIO_ERROR) || - bp->b_iocmd == BIO_DELETE || (bp->b_bufsize <= 0)) { + (bp->b_ioflags & BIO_ERROR) || (bp->b_bufsize <= 0)) { /* * Either a failed I/O or we were asked to free or not * cache the buffer. @@ -3130,12 +3129,6 @@ bp->b_flags |= B_DONE; runningbufwakeup(bp); - if (bp->b_iocmd == BIO_DELETE) { - brelse(bp); - splx(s); - return; - } - if (bp->b_iocmd == BIO_WRITE) { vwakeup(bp); } ==== //depot/projects/smpng/sys/kern/vnode_if.src#17 (text+ko) ==== @@ -27,7 +27,7 @@ # SUCH DAMAGE. # # @(#)vnode_if.src 8.12 (Berkeley) 5/14/95 -# $FreeBSD: src/sys/kern/vnode_if.src,v 1.67 2004/04/05 21:03:37 imp Exp $ +# $FreeBSD: src/sys/kern/vnode_if.src,v 1.68 2004/09/13 06:50:42 phk Exp $ # # @@ -478,20 +478,6 @@ }; # -#% freeblks vp - - - -# -# This call is used by the filesystem to release blocks back to -# device-driver. This is useful if the driver has a lengthy -# erase handling or similar. -# - -vop_freeblks { - IN struct vnode *vp; - IN daddr_t addr; - IN daddr_t length; -}; - -# #% getacl vp L L L # vop_getacl { ==== //depot/projects/smpng/sys/netgraph/ng_eiface.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.17 2004/07/14 20:26:29 rwatson Exp $ + * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.18 2004/09/11 08:59:06 glebius Exp $ */ @@ -594,7 +594,6 @@ struct mbuf *m; NGI_GET_M(item, m); - /* Meta-data ends its life here... */ NG_FREE_ITEM(item); if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING)) { ==== //depot/projects/smpng/sys/netinet/ip_fastfwd.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_fastfwd.c,v 1.19 2004/08/27 15:32:28 andre Exp $ + * $FreeBSD: src/sys/netinet/ip_fastfwd.c,v 1.20 2004/09/13 17:01:53 andre Exp $ */ /* @@ -465,14 +465,12 @@ if (in_localip(dest) || m->m_flags & M_FASTFWD_OURS) { #endif /* IPFIREWALL_FORWARD */ forwardlocal: - /* for ip_input */ - m->m_flags |= M_FASTFWD_OURS; - ip->ip_len = htons(ip->ip_len); - ip->ip_off = htons(ip->ip_off); - /* - * Return packet for processing by ip_input() + * Return packet for processing by ip_input(). + * Keep host byte order as expected at ip_input's + * "ours"-label. */ + m->m_flags |= M_FASTFWD_OURS; if (ro.ro_rt) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 13 20:17:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3898016A4CE; Mon, 13 Sep 2004 20:17:25 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC8C116A4CE for ; Mon, 13 Sep 2004 20:17:24 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D323843D46 for ; Mon, 13 Sep 2004 20:17:24 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8DKHOAC087276 for ; Mon, 13 Sep 2004 20:17:24 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8DKHOVL087273 for perforce@freebsd.org; Mon, 13 Sep 2004 20:17:24 GMT (envelope-from julian@freebsd.org) Date: Mon, 13 Sep 2004 20:17:24 GMT Message-Id: <200409132017.i8DKHOVL087273@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61446 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Sep 2004 20:17:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=61446 Change 61446 by julian@julian_ref on 2004/09/13 20:17:09 remove hack solution and add a slightly nicer one for preemption problem. Affected files ... .. //depot/projects/nsched/sys/kern/kern_switch.c#23 edit .. //depot/projects/nsched/sys/kern/sched_4bsd.c#50 edit .. //depot/projects/nsched/sys/kern/sched_ule.c#32 edit .. //depot/projects/nsched/sys/sys/proc.h#31 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_switch.c#23 (text+ko) ==== @@ -226,7 +226,7 @@ * sched_thread_exit() (local) * sched_switch() (local) * sched_thread_exit() (local) - * remrunqueue() (local) + * remrunqueue() (local) (not at the moment) */ static void slot_fill(struct ksegrp *kg) @@ -258,7 +258,6 @@ } } -#ifdef SCHED_4BSD /* * Remove a thread from its KSEGRP's run queue. * This in turn may remove it from a KSE if it was already assigned @@ -310,7 +309,6 @@ } CHECKRUNQ(kg, NULL) } -#endif /* * Change the priority of a thread that is on the run queue. @@ -396,10 +394,6 @@ return; } - if (((flags & (SRQ_YIELDING|SRQ_OURSELF|SRQ_NOPREEMPT)) == 0) && - maybe_preempt(td)) - return; - CHECKRUNQ(kg, td) tda = kg->kg_last_assigned; if ((kg->kg_avail_opennings <= 0) && @@ -457,7 +451,7 @@ kg->kg_last_assigned = td2; } kg->kg_avail_opennings--; - sched_add(td2, flags|SRQ_NOPREEMPT); + sched_add(td2, flags); } else { CTR3(KTR_RUNQ, "setrunqueue: held: td%p kg%p pid%d", td, td->td_ksegrp, td->td_proc->p_pid); @@ -568,8 +562,18 @@ /* * Our thread state says that we are already on a run queue, so * update our state as if we had been dequeued by choosethread(). + * However we must not actually be on the system run queue yet. */ MPASS(TD_ON_RUNQ(td)); + MPASS(td->td_sched->ke_state != KES_ONRUNQ); + if (td->td_proc->p_flag & P_HADTHREADS) { + /* + * If this is a threaded process we actually ARE on the + * ksegrp run queue so take it off that first. + */ + remrunqueue(td); /* maybe use a simpler version */ + } + TD_SET_RUNNING(td); CTR3(KTR_PROC, "preempting to thread %p (pid %d, %s)\n", td, td->td_proc->p_pid, td->td_proc->p_comm); ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#50 (text+ko) ==== @@ -1018,8 +1018,7 @@ #endif { - if (((flags & SRQ_NOPREEMPT) == 0) && - maybe_preempt(td)) + if (maybe_preempt(td)) return; } } ==== //depot/projects/nsched/sys/kern/sched_ule.c#32 (text+ko) ==== @@ -1662,13 +1662,13 @@ /* let jeff work out how to map the flags better */ /* I'm open to suggestions */ - if (flags & (SRQ_YIELDING|SRQ_NOPREEMPT)) { + if (flags & SRQ_YIELDING) /* * Preempting during switching can be bad JUJU * especially for KSE processes */ sched_add_internal(td, 0); - } else + else sched_add_internal(td, 1); } ==== //depot/projects/nsched/sys/sys/proc.h#31 (text+ko) ==== @@ -658,7 +658,6 @@ #define SRQ_YIELDING 0x0001 /* we are yielding (from mi_switch) */ #define SRQ_OURSELF 0x0002 /* it is ourself (from mi_switch) */ #define SRQ_INTR 0x0004 /* it is probably urgent */ -#define SRQ_NOPREEMPT 0x0008 /* Just don't ok? */ /* How values for thread_single(). */ #define SINGLE_NO_EXIT 0 From owner-p4-projects@FreeBSD.ORG Mon Sep 13 22:12:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B82F816A4D0; Mon, 13 Sep 2004 22:12:49 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 764EC16A4CE for ; Mon, 13 Sep 2004 22:12:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47BC743D31 for ; Mon, 13 Sep 2004 22:12:49 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8DMCnsE090625 for ; Mon, 13 Sep 2004 22:12:49 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8DMCm0m090622 for perforce@freebsd.org; Mon, 13 Sep 2004 22:12:48 GMT (envelope-from peter@freebsd.org) Date: Mon, 13 Sep 2004 22:12:48 GMT Message-Id: <200409132212.i8DMCm0m090622@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 61455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Sep 2004 22:12:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=61455 Change 61455 by peter@peter_daintree on 2004/09/13 22:12:46 IFC @61453 Affected files ... .. //depot/projects/hammer/MAINTAINERS#28 integrate .. //depot/projects/hammer/etc/devd.conf#14 integrate .. //depot/projects/hammer/etc/rc.d/ipmon#9 integrate .. //depot/projects/hammer/etc/rc.d/tmp#2 integrate .. //depot/projects/hammer/etc/rc.d/var#2 integrate .. //depot/projects/hammer/gnu/lib/csu/Makefile#8 integrate .. //depot/projects/hammer/include/resolv.h#6 integrate .. //depot/projects/hammer/lib/libautofs/Makefile#3 integrate .. //depot/projects/hammer/lib/libautofs/libautofs.3#2 integrate .. //depot/projects/hammer/lib/libautofs/libautofs.c#3 integrate .. //depot/projects/hammer/lib/libautofs/libautofs.h#2 integrate .. //depot/projects/hammer/lib/libc/db/btree/bt_debug.c#2 integrate .. //depot/projects/hammer/lib/libc/db/btree/bt_split.c#3 integrate .. //depot/projects/hammer/lib/libc/db/hash/hash.c#2 integrate .. //depot/projects/hammer/lib/libc/db/mpool/mpool.c#3 integrate .. //depot/projects/hammer/lib/libc/gmon/gmon.c#6 integrate .. //depot/projects/hammer/lib/libc/net/res_init.c#5 integrate .. //depot/projects/hammer/lib/libdisk/open_disk.c#6 integrate .. //depot/projects/hammer/release/Makefile#57 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#59 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/readme/article.sgml#12 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#76 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/Makefile#5 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/errata/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/errata/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml#2 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#4 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml#2 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml#2 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#5 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml#4 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/readme/article.sgml#5 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#5 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl#3 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#8 integrate .. //depot/projects/hammer/release/doc/share/misc/man2hwnotes.pl#5 integrate .. //depot/projects/hammer/sbin/Makefile#28 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.8#8 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#17 integrate .. //depot/projects/hammer/sbin/gbde/gbde.c#12 integrate .. //depot/projects/hammer/sbin/ggate/ggatec/ggatec.c#2 integrate .. //depot/projects/hammer/sbin/ggate/ggated/ggated.c#3 integrate .. //depot/projects/hammer/sbin/ggate/ggatel/ggatel.c#2 integrate .. //depot/projects/hammer/sbin/ggate/shared/ggate.c#3 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#27 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#30 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#11 integrate .. //depot/projects/hammer/sbin/mount_autofs/Makefile#2 integrate .. //depot/projects/hammer/sbin/mount_autofs/mount_autofs.8#2 integrate .. //depot/projects/hammer/sbin/mount_autofs/mount_autofs.c#2 integrate .. //depot/projects/hammer/share/examples/autofs/driver/Makefile#2 integrate .. //depot/projects/hammer/share/examples/autofs/driver/autodriver.c#2 integrate .. //depot/projects/hammer/share/examples/autofs/driver/autotab#2 integrate .. //depot/projects/hammer/share/man/man4/Makefile#48 integrate .. //depot/projects/hammer/share/man/man4/cnw.4#1 branch .. //depot/projects/hammer/share/man/man4/csa.4#2 delete .. //depot/projects/hammer/share/man/man4/em.4#4 integrate .. //depot/projects/hammer/share/man/man4/esp.4#4 integrate .. //depot/projects/hammer/share/man/man4/fwohci.4#5 integrate .. //depot/projects/hammer/share/man/man4/gusc.4#3 delete .. //depot/projects/hammer/share/man/man4/hifn.4#5 integrate .. //depot/projects/hammer/share/man/man4/mac_bsdextended.4#7 integrate .. //depot/projects/hammer/share/man/man4/maestro3.4#2 delete .. //depot/projects/hammer/share/man/man4/man4.i386/fe.4#7 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ie.4#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/lnc.4#3 integrate .. //depot/projects/hammer/share/man/man4/miibus.4#8 integrate .. //depot/projects/hammer/share/man/man4/ng_ubt.4#7 integrate .. //depot/projects/hammer/share/man/man4/pcm.4#10 integrate .. //depot/projects/hammer/share/man/man4/pcn.4#4 integrate .. //depot/projects/hammer/share/man/man4/rc.4#4 integrate .. //depot/projects/hammer/share/man/man4/safe.4#5 integrate .. //depot/projects/hammer/share/man/man4/sbc.4#3 delete .. //depot/projects/hammer/share/man/man4/snd_ad1816.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_als4000.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_cmi.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_cs4281.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_csa.4#1 branch .. //depot/projects/hammer/share/man/man4/snd_ds1.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_emu10k1.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_es137x.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_gusc.4#1 branch .. //depot/projects/hammer/share/man/man4/snd_maestro3.4#1 branch .. //depot/projects/hammer/share/man/man4/snd_sbc.4#1 branch .. //depot/projects/hammer/share/man/man4/snd_solo.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_uaudio.4#1 branch .. //depot/projects/hammer/share/man/man4/ti.4#8 integrate .. //depot/projects/hammer/share/man/man4/uaudio.4#5 delete .. //depot/projects/hammer/share/man/man4/ubsa.4#4 integrate .. //depot/projects/hammer/share/man/man4/ubsec.4#3 integrate .. //depot/projects/hammer/share/man/man4/ubser.4#3 integrate .. //depot/projects/hammer/share/man/man4/uftdi.4#5 integrate .. //depot/projects/hammer/share/man/man4/uplcom.4#7 integrate .. //depot/projects/hammer/share/man/man4/uvisor.4#4 integrate .. //depot/projects/hammer/share/man/man4/vge.4#1 branch .. //depot/projects/hammer/share/man/man5/resolver.5#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#14 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#23 integrate .. //depot/projects/hammer/sys/alpha/include/atomic.h#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#16 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#104 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#55 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#45 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/main.c#12 integrate .. //depot/projects/hammer/sys/conf/NOTES#66 integrate .. //depot/projects/hammer/sys/conf/files#82 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf.c#12 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#25 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#20 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#35 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#44 integrate .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#16 integrate .. //depot/projects/hammer/sys/dev/bktr/msp34xx.c#4 integrate .. //depot/projects/hammer/sys/dev/esp/esp_sbus.c#5 integrate .. //depot/projects/hammer/sys/dev/mii/ciphy.c#1 branch .. //depot/projects/hammer/sys/dev/mii/ciphyreg.h#1 branch .. //depot/projects/hammer/sys/dev/mii/miidevs#8 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#25 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sb16.c#11 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sndstat.c#7 integrate .. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/uhub.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#15 integrate .. //depot/projects/hammer/sys/dev/vge/if_vge.c#1 branch .. //depot/projects/hammer/sys/dev/vge/if_vgereg.h#1 branch .. //depot/projects/hammer/sys/dev/vge/if_vgevar.h#1 branch .. //depot/projects/hammer/sys/fs/autofs/autofs.h#3 integrate .. //depot/projects/hammer/sys/fs/autofs/autofs_util.c#3 integrate .. //depot/projects/hammer/sys/fs/autofs/autofs_vfsops.c#3 integrate .. //depot/projects/hammer/sys/fs/autofs/autofs_vnops.c#3 integrate .. //depot/projects/hammer/sys/fs/msdosfs/denode.h#5 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_fat.c#4 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#4 integrate .. //depot/projects/hammer/sys/fs/specfs/spec_vnops.c#23 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_crypt.c#11 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_lock.c#6 integrate .. //depot/projects/hammer/sys/geom/geom_kern.c#15 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#6 integrate .. //depot/projects/hammer/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#8 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.h#4 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#8 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#6 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_rm.c#3 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_state.c#4 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_subr.c#7 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#29 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#17 integrate .. //depot/projects/hammer/sys/i386/i386/db_trace.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#53 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#17 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#19 integrate .. //depot/projects/hammer/sys/ia64/conf/SKI#13 integrate .. //depot/projects/hammer/sys/ia64/ia64/busdma_machdep.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#23 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#26 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#40 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#28 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#48 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#33 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#37 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#9 integrate .. //depot/projects/hammer/sys/modules/Makefile#54 integrate .. //depot/projects/hammer/sys/modules/autofs/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/geom/geom_uzip/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/vge/Makefile#1 branch .. //depot/projects/hammer/sys/net/bpf.c#22 integrate .. //depot/projects/hammer/sys/net/bpfdesc.h#9 integrate .. //depot/projects/hammer/sys/net/if.c#30 integrate .. //depot/projects/hammer/sys/net/if.h#15 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#12 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#14 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#12 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#40 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#4 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#39 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#26 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#43 integrate .. //depot/projects/hammer/sys/pci/ncr.c#13 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/busdma_machdep.c#11 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#30 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#12 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#29 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/bus_machdep.c#17 integrate .. //depot/projects/hammer/sys/sys/conf.h#16 integrate .. //depot/projects/hammer/sys/sys/param.h#46 integrate .. //depot/projects/hammer/sys/sys/proc.h#64 integrate .. //depot/projects/hammer/sys/sys/rman.h#6 integrate .. //depot/projects/hammer/sys/sys/sched.h#14 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#14 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#24 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#25 integrate .. //depot/projects/hammer/tools/regression/netinet/tcpstream/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netinet/tcpstream/README#1 branch .. //depot/projects/hammer/tools/regression/netinet/tcpstream/tcpstream.c#1 branch .. //depot/projects/hammer/tools/tools/netrate/Makefile#1 branch .. //depot/projects/hammer/tools/tools/netrate/README#1 branch .. //depot/projects/hammer/tools/tools/netrate/netreceive/Makefile#1 branch .. //depot/projects/hammer/tools/tools/netrate/netreceive/netreceive.c#1 branch .. //depot/projects/hammer/tools/tools/netrate/netsend/Makefile#1 branch .. //depot/projects/hammer/tools/tools/netrate/netsend/netsend.c#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/www/index.cgi#10 integrate .. //depot/projects/hammer/usr.bin/Makefile#34 integrate .. //depot/projects/hammer/usr.bin/compress/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/mkuzip/Makefile#1 branch .. //depot/projects/hammer/usr.bin/mkuzip/mkuzip.8#1 branch .. //depot/projects/hammer/usr.bin/mkuzip/mkuzip.c#1 branch .. //depot/projects/hammer/usr.sbin/cron/crontab/crontab.c#3 integrate .. //depot/projects/hammer/usr.sbin/ifmcstat/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ifmcstat/ifmcstat.c#5 integrate .. //depot/projects/hammer/usr.sbin/ppp/tty.c#4 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/devices.c#12 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#28 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.99 2004/08/16 10:43:41 pjd Exp $ +$FreeBSD: src/MAINTAINERS,v 1.100 2004/09/08 02:08:33 grog Exp $ subsystem login notes ----------------------------- @@ -66,7 +66,6 @@ lpd/recvjob.c and lpd/printjob.c. newsyslog(8) gad Heads-up appreciated. I'm going thru the PR's for it. patch gad I have a WIP which will change the src a lot. -vinum grog Recommends pre-commit review. cvs peter Heads-up appreciated, try not to break it. ncurses peter Heads-up appreciated, try not to break it. nvi peter Try not to break it. ==== //depot/projects/hammer/etc/devd.conf#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.16 2004/09/06 20:09:00 glebius Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.17 2004/09/10 20:57:44 wpaul Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -20,7 +20,8 @@ set ethernet-nic-regex "(an|ar|ath|aue|awi|axe|bfe|bge|cm|cnw|cs|cue|dc|de|ed|el|em|\ ep|ex|fe|fxp|gem|gx|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|\ - rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vr|vx|wb|wi|xe|xl)[0-9]+"; + rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vge|vr|vx|wb|wi|xe|\ + xl)[0-9]+"; set scsi-controller-regex "(adv|advw|aic|aha|ahb|ahc|ahd|bt|ct|iir|isp|mly|mpt|ncv|nsp|\ stg|sym|wds)[0-9]+"; ==== //depot/projects/hammer/etc/rc.d/ipmon#9 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # -# $NetBSD: ipmon,v 2002/04/18 05:02:01 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipmon,v 1.11 2004/04/23 15:43:13 darrenr Exp $ +# $NetBSD: ipmon,v 1.9 2002/04/18 05:02:01 lukem Exp $ +# $FreeBSD: src/etc/rc.d/ipmon,v 1.12 2004/09/09 16:41:55 obrien Exp $ # # PROVIDE: ipmon ==== //depot/projects/hammer/etc/rc.d/tmp#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/tmp,v 1.32 2004/03/23 23:22:35 brooks Exp $ +# $FreeBSD: src/etc/rc.d/tmp,v 1.33 2004/09/13 17:40:14 ru Exp $ # # PROVIDE: tmp @@ -49,7 +49,7 @@ [Nn][Oo]) ;; *) - if (/bin/mkdir /tmp/.diskless 2> /dev/null); then + if (/bin/mkdir -p /tmp/.diskless 2> /dev/null); then rmdir /tmp/.diskless else if [ -h /tmp ]; then ==== //depot/projects/hammer/etc/rc.d/var#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/var,v 1.32 2004/03/23 23:22:35 brooks Exp $ +# $FreeBSD: src/etc/rc.d/var,v 1.33 2004/09/13 17:40:14 ru Exp $ # # PROVIDE: var @@ -67,7 +67,7 @@ [Nn][Oo]) ;; *) - if (/bin/mkdir /var/.diskless 2> /dev/null); then + if (/bin/mkdir -p /var/.diskless 2> /dev/null); then rmdir /var/.diskless else mount_md ${varsize} /var ==== //depot/projects/hammer/gnu/lib/csu/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.22 2004/07/28 05:27:18 kan Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.24 2004/09/10 06:48:04 ru Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc CCDIR= ${.CURDIR}/../../usr.bin/cc @@ -38,7 +38,7 @@ ENDSRC?= crtstuff.c all: ${OBJS} ${SOBJS} ${TGTOBJS} -${OBJS} ${SOBJS}: tm.h +${OBJS} ${SOBJS}: ${SRCS:M*.h} CLEANFILES= ${OBJS} ${SOBJS} ${TGTOBJS} ==== //depot/projects/hammer/include/resolv.h#6 (text+ko) ==== @@ -51,7 +51,7 @@ /* * @(#)resolv.h 8.1 (Berkeley) 6/2/93 * From Id: resolv.h,v 8.12 1998/04/28 19:36:46 halley Exp $ - * $FreeBSD: src/include/resolv.h,v 1.25 2004/03/15 17:08:28 des Exp $ + * $FreeBSD: src/include/resolv.h,v 1.26 2004/09/09 17:39:47 yar Exp $ */ #ifndef _RESOLV_H_ @@ -92,6 +92,7 @@ #define LOCALDOMAINPARTS 2 /* min levels in name that is "local" */ #define RES_TIMEOUT 5 /* min. seconds between retries */ +#define RES_DFLRETRY 4 /* retries per each name server */ #define MAXRESOLVSORT 10 /* number of net to sort on */ #define RES_MAXNDOTS 15 /* should reflect bit field size */ #define RES_MAXRETRANS 30 /* only for resolv.conf/RES_OPTIONS */ ==== //depot/projects/hammer/lib/libautofs/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $Id: Makefile,v 1.4 2004/08/31 16:26:24 bright Exp $ -# $FreeBSD: src/lib/libautofs/Makefile,v 1.3 2004/09/03 18:01:34 alfred Exp $ +# $Id: Makefile,v 1.5 2004/09/08 08:12:21 bright Exp $ +# $FreeBSD: src/lib/libautofs/Makefile,v 1.4 2004/09/08 08:44:14 alfred Exp $ LIB= autofs SHLIB_MAJOR= 1 ==== //depot/projects/hammer/lib/libautofs/libautofs.3#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: libautofs.3,v 1.3 2004/08/31 15:58:40 bright Exp $ -.\" $FreeBSD: src/lib/libautofs/libautofs.3,v 1.1 2004/08/31 16:26:00 alfred Exp $ -.Dd August 30, 2004 +.\" $Id: libautofs.3,v 1.4 2004/09/08 08:12:21 bright Exp $ +.\" $FreeBSD: src/lib/libautofs/libautofs.3,v 1.5 2004/09/09 10:54:08 alfred Exp $ +.Dd September 9, 2004 .Dt LIBAUTOFS 3 .Os .Sh NAME @@ -63,6 +63,8 @@ .Ft void .Fn autoreq_getoffset "autoreq_t req" "off_t *offp" .Ft void +.Fn autoreq_getxid "autoreq_t req" "int *xidp" +.Ft void .Fn autoreq_setino "autoreq_t req" "autoino_t ino" .Ft void .Fn autoreq_seterrno "autoreq_t req" "int errno" @@ -96,7 +98,7 @@ function returns a handle to an .Xr autofs 9 filesystem based on the -.Fn path +.Fa path parameter. The handle returned should be freed via the .Fn autoh_free @@ -114,10 +116,23 @@ .Pp The .Fn autoh_fd -function returns a file descriptor that can selected or polled on -for "excecption" data to detect an +function returns a file descriptor that can be used with +.Xr select 2 +or +.Xr poll 2 +to check for "exceptional" data to detect an .Xr autofs 9 event. +Users of +.Xr select 2 +should set the fd in the +.Fa exceptfds +fd_set. +Users of +.Xr poll 2 +should set POLLPRI in the pollfd +.Fa fds +argument. .Pp The .Fn autoh_mp @@ -163,6 +178,10 @@ return the offset request associated with the request .Fa req . (used for readdir request) +.It Fn autoreq_getxid +return the transaction id associated with an autofs request, these +are unique per mount point, but not system wide. They can be used +for debugging to ensure requests are being accepted by the kernel. .El .Pp The following functions allow one to set the response sent to ==== //depot/projects/hammer/lib/libautofs/libautofs.c#3 (text+ko) ==== @@ -23,8 +23,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libautofs/libautofs.c,v 1.2 2004/09/02 20:44:55 alfred Exp $ - * $Id: libautofs.c,v 1.3 2004/08/31 08:49:56 bright Exp $ + * $FreeBSD: src/lib/libautofs/libautofs.c,v 1.5 2004/09/09 01:23:27 alfred Exp $ + * $Id: libautofs.c,v 1.5 2004/09/08 08:44:12 bright Exp $ */ #include #include @@ -43,7 +43,11 @@ #include #include +#ifdef AUTOFSSTANDALONE +#include "../autofs/autofs.h" +#else #include +#endif #include "libautofs.h" @@ -76,7 +80,7 @@ *sfsp = NULL; cnt = getfsstat(NULL, 0, MNT_NOWAIT); bufsize = cnt * sizeof(**sfsp); - fprintf(stderr, "getmntlst bufsize %ld, cnt %d\n", bufsize, cnt); + /*fprintf(stderr, "getmntlst bufsize %ld, cnt %d\n", bufsize, cnt);*/ *sfsp = malloc(bufsize); if (sfsp == NULL) goto err; @@ -84,12 +88,12 @@ if (cnt == -1) goto err; *cntp = cnt; - fprintf(stderr, "getmntlst ok, cnt %d\n", cnt); + /*fprintf(stderr, "getmntlst ok, cnt %d\n", cnt);*/ return (0); err: safe_free(sfsp); *sfsp = NULL; - fprintf(stderr, "getmntlst bad\n"); + /*fprintf(stderr, "getmntlst bad\n");*/ return (-1); } @@ -113,7 +117,7 @@ break; } if (i == cnt) { - fprintf(stderr, "autoh_get bad %d %d\n", i, cnt); + /*fprintf(stderr, "autoh_get bad %d %d\n", i, cnt);*/ errno = ENOENT; goto err; } @@ -202,10 +206,13 @@ void autoh_freeall(autoh_t *ah) { + autoh_t *ahp; + + ahp = ah; - while (*ah != NULL) { - autoh_free(*ah); - ah++; + while (*ahp != NULL) { + autoh_free(*ahp); + ahp++; } safe_free(ah); } @@ -392,6 +399,13 @@ *offp = req->au_offset - AUTOFS_USEROFF; } +void +autoreq_getxid(autoreq_t req, int *xid) +{ + + *xid = req->au_xid; +} + /* toggle by path. args = handle, AUTO_?, pid (-1 to disable), path. */ int autoh_togglepath(autoh_t ah, int op, pid_t pid, const char *path) ==== //depot/projects/hammer/lib/libautofs/libautofs.h#2 (text+ko) ==== @@ -23,8 +23,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libautofs/libautofs.h,v 1.1 2004/08/31 16:26:00 alfred Exp $ - * $Id: libautofs.h,v 1.3 2004/08/31 08:49:56 bright Exp $ + * $FreeBSD: src/lib/libautofs/libautofs.h,v 1.3 2004/09/09 01:23:27 alfred Exp $ + * $Id: libautofs.h,v 1.4 2004/09/08 08:12:21 bright Exp $ */ #ifndef _LIBAUTOFS_H #define _LIBAUTOFS_H @@ -92,8 +92,9 @@ void autoreq_seterrno(autoreq_t, int); void autoreq_setaux(autoreq_t, void *, size_t); void autoreq_getaux(autoreq_t, void **, size_t *); -void autoreq_seteof(autoreq_t req, int eof); -void autoreq_getoffset(autoreq_t req, off_t *offp); +void autoreq_seteof(autoreq_t, int); +void autoreq_getoffset(autoreq_t, off_t *); +void autoreq_getxid(autoreq_t, int *); /* toggle by path. args = handle, AUTO_?, pid (-1 to disable), path. */ int autoh_togglepath(autoh_t, int, pid_t, const char *); ==== //depot/projects/hammer/lib/libc/db/btree/bt_debug.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_debug.c 8.5 (Berkeley) 8/17/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_debug.c,v 1.2 2002/03/22 21:52:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_debug.c,v 1.3 2004/09/10 05:41:41 kuriyama Exp $"); #include @@ -69,7 +69,7 @@ (void)fprintf(stderr, "%s: pgsz %d", F_ISSET(t, B_INMEM) ? "memory" : "disk", t->bt_psize); if (F_ISSET(t, R_RECNO)) - (void)fprintf(stderr, " keys %lu", t->bt_nrecs); + (void)fprintf(stderr, " keys %u", t->bt_nrecs); #undef X #define X(flag, name) \ if (F_ISSET(t, flag)) { \ @@ -108,12 +108,12 @@ char *sep; m = (BTMETA *)h; - (void)fprintf(stderr, "magic %lx\n", m->magic); - (void)fprintf(stderr, "version %lu\n", m->version); - (void)fprintf(stderr, "psize %lu\n", m->psize); - (void)fprintf(stderr, "free %lu\n", m->free); - (void)fprintf(stderr, "nrecs %lu\n", m->nrecs); - (void)fprintf(stderr, "flags %lu", m->flags); + (void)fprintf(stderr, "magic %x\n", m->magic); + (void)fprintf(stderr, "version %u\n", m->version); + (void)fprintf(stderr, "psize %u\n", m->psize); + (void)fprintf(stderr, "free %u\n", m->free); + (void)fprintf(stderr, "nrecs %u\n", m->nrecs); + (void)fprintf(stderr, "flags %u", m->flags); #undef X #define X(flag, name) \ if (m->flags & flag) { \ @@ -212,14 +212,15 @@ bl = GETBLEAF(h, cur); if (bl->flags & P_BIGKEY) (void)fprintf(stderr, - "big key page %lu size %u/", + "big key page %u size %u/", *(pgno_t *)bl->bytes, *(u_int32_t *)(bl->bytes + sizeof(pgno_t))); else if (bl->ksize) - (void)fprintf(stderr, "%s/", bl->bytes); + (void)fprintf(stderr, "%.*s/", + bl->ksize, bl->bytes); if (bl->flags & P_BIGDATA) (void)fprintf(stderr, - "big data page %lu size %u", + "big data page %u size %u", *(pgno_t *)(bl->bytes + bl->ksize), *(u_int32_t *)(bl->bytes + bl->ksize + sizeof(pgno_t))); @@ -231,7 +232,7 @@ rl = GETRLEAF(h, cur); if (rl->flags & P_BIGDATA) (void)fprintf(stderr, - "big data page %lu size %u", + "big data page %u size %u", *(pgno_t *)rl->bytes, *(u_int32_t *)(rl->bytes + sizeof(pgno_t))); else if (rl->dsize) @@ -304,13 +305,13 @@ (void)fprintf(stderr, "%d level%s with %ld keys", levels, levels == 1 ? "" : "s", nkeys); if (F_ISSET(t, R_RECNO)) - (void)fprintf(stderr, " (%ld header count)", t->bt_nrecs); + (void)fprintf(stderr, " (%d header count)", t->bt_nrecs); (void)fprintf(stderr, - "\n%lu pages (leaf %ld, internal %ld, overflow %ld)\n", + "\n%u pages (leaf %d, internal %d, overflow %d)\n", pinternal + pleaf + pcont, pleaf, pinternal, pcont); (void)fprintf(stderr, "%ld cache hits, %ld cache misses\n", bt_cache_hit, bt_cache_miss); - (void)fprintf(stderr, "%ld splits (%ld root splits, %ld sort splits)\n", + (void)fprintf(stderr, "%lu splits (%lu root splits, %lu sort splits)\n", bt_split, bt_rootsplit, bt_sortsplit); pleaf *= t->bt_psize - BTDATAOFF; if (pleaf) ==== //depot/projects/hammer/lib/libc/db/btree/bt_split.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_split.c 8.9 (Berkeley) 7/26/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.5 2003/02/16 17:29:09 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.6 2004/09/10 14:45:00 kuriyama Exp $"); #include @@ -361,6 +361,8 @@ r->nextpg = h->nextpg; r->prevpg = h->pgno; r->flags = h->flags & P_TYPE; + /* XXX: Workaround for broken page data access. */ + r->linp[0] = 0xffff; /* * If we're splitting the last page on a level because we're appending ==== //depot/projects/hammer/lib/libc/db/hash/hash.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)hash.c 8.9 (Berkeley) 6/16/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash.c,v 1.11 2002/03/21 22:46:26 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash.c,v 1.12 2004/09/10 05:41:41 kuriyama Exp $"); #include "namespace.h" #include @@ -220,7 +220,7 @@ #ifdef DEBUG (void)fprintf(stderr, -"%s\n%s%x\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%x\n%s%x\n%s%d\n%s%d\n", +"%s\n%s%p\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%x\n%s%x\n%s%d\n%s%d\n", "init_htab:", "TABLE POINTER ", hashp, "BUCKET SIZE ", hashp->BSIZE, ==== //depot/projects/hammer/lib/libc/db/mpool/mpool.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)mpool.c 8.5 (Berkeley) 7/26/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/db/mpool/mpool.c,v 1.11 2004/01/20 00:40:35 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/mpool/mpool.c,v 1.12 2004/09/10 05:41:41 kuriyama Exp $"); #include "namespace.h" #include @@ -426,9 +426,9 @@ int cnt; char *sep; - (void)fprintf(stderr, "%lu pages in the file\n", mp->npages); + (void)fprintf(stderr, "%u pages in the file\n", mp->npages); (void)fprintf(stderr, - "page size %lu, cacheing %lu pages of %lu page max cache\n", + "page size %lu, cacheing %u pages of %u page max cache\n", mp->pagesize, mp->curcache, mp->maxcache); (void)fprintf(stderr, "%lu page puts, %lu page gets, %lu page new\n", mp->pageput, mp->pageget, mp->pagenew); ==== //depot/projects/hammer/lib/libc/gmon/gmon.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)gmon.c 8.1 (Berkeley) 6/4/93"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.18 2003/06/02 02:32:22 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.19 2004/09/10 05:44:17 kuriyama Exp $"); #include "namespace.h" #include @@ -186,7 +186,7 @@ _warn("_mcleanup: gmon.log"); return; } - len = sprintf(buf, "[mcleanup1] kcount 0x%x ssiz %d\n", + len = sprintf(buf, "[mcleanup1] kcount 0x%p ssiz %lu\n", p->kcount, p->kcountsize); _write(log, buf, len); #endif @@ -210,7 +210,7 @@ toindex = p->tos[toindex].link) { #ifdef DEBUG len = sprintf(buf, - "[mcleanup2] frompc 0x%x selfpc 0x%x count %d\n" , + "[mcleanup2] frompc 0x%lx selfpc 0x%lx count %lu\n" , frompc, p->tos[toindex].selfpc, p->tos[toindex].count); _write(log, buf, len); ==== //depot/projects/hammer/lib/libc/net/res_init.c#5 (text+ko) ==== @@ -73,7 +73,7 @@ static char orig_rcsid[] = "From: Id: res_init.c,v 8.7 1996/11/18 09:10:04 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/res_init.c,v 1.32 2004/02/25 21:03:45 green Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/res_init.c,v 1.33 2004/09/09 17:42:18 yar Exp $"); #include #include @@ -197,7 +197,7 @@ if (!_res.retrans) _res.retrans = RES_TIMEOUT; if (!_res.retry) - _res.retry = 4; + _res.retry = RES_DFLRETRY; if (!(_res.options & RES_INIT)) _res.options = RES_DEFAULT; ==== //depot/projects/hammer/lib/libdisk/open_disk.c#6 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/open_disk.c,v 1.6 2004/08/02 19:57:37 le Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/open_disk.c,v 1.8 2004/09/13 16:06:14 pjd Exp $"); #include #include @@ -257,18 +257,10 @@ } } else if (!strcmp(t, "GPT")) i = Add_Chunk(d, off, len, n, ty, 0, 0, 0); - else if (!strcmp(t, "BDE")) - ; /* nothing */ - else if (!strcmp(t, "CCD")) - ; /* nothing */ else if (!strcmp(t, "APPLE")) i = Add_Chunk(d, off, len, n, apple, 0, 0, sn); - else if (strstr(t, "VINUM") != NULL) - ; /* nothing */ - else { - printf("BARF %d\n", __LINE__); - exit(0); - } + else + ; /* Ignore unknown classes. */ } /* PLATFORM POLICY BEGIN ------------------------------------- */ /* We have a chance to do things on a blank disk here */ ==== //depot/projects/hammer/release/Makefile#57 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.858 2004/09/07 14:26:02 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.859 2004/09/08 06:05:19 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -341,7 +341,7 @@ .if exists(${CHROOTDIR}) # The first command will fail on a handful of files that have their schg # flags set. But it greatly speeds up the next two commands. - # NB: clear any vestigal devfs mount, just in case + # NB: clear any vestigial devfs mount, just in case -umount ${CHROOTDIR}/dev > /dev/null 2>&1 -rm -rf ${CHROOTDIR} 2>/dev/null -chflags -R noschg ${CHROOTDIR}/. ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#5 (text+ko) ==== @@ -1,17 +1,57 @@ Supported Processors and Motherboards - &os;/&arch; has supported the &arch.print; - (Hammer) architecture since mid-2003. It made its - first debut as an experimental release based on &os; - 5.1-RELEASE. + Since mid-2003 &os;/&arch; has supported the &arch.print; + (Hammer) and Intel EM64T architecture, + and is now one of the Tier-1 platforms (fully + supported architecture), which are expected to be Production + Quality with respects to all aspects of the &os; operating system, + including installation and development environments. + + Note that there are two names for this architecture, + AMD64 (AMD) and Intel EM64T (Extended Memory 64-bit Technology). + 64-bit mode of the two architectures are almost compatible + with each other, and &os;/&arch; should support the both. + + As of this writing, the following processors are + supported: + + + + AMD Athlon64 (Clawhammer). + + + + AMD Opteron (Sledgehammer). + + + + Intel 64-bit Xeon (Nacona). + This processor is fabricated on 90nm process technology, and operates + with 2.80 to 3.60 GHz (FSB 800MHz) and Intel E7520/E7525/E7320 chipsets. + + + + Intel Pentium 4 Processor supporting Intel EM64T + (Prescott). + This is fabricated on 90nm process technology, + uses FC-LGA775 package, and operates with 3.20F/3.40F/3.60F GHz + and Intel 925X Express chipsets. + The corresponding S-Spec numbers are SL7L9, SL7L8, SL7LA, SL7NZ, SL7PZ, + and SL7PX. Note that processors marked as 5xx numbers do not support + EM64T. + + + + Intel EM64T is an extended version of IA-32 (x86) and + different from Intel IA-64 (Itanium) architecture, which &os;/ia64 + supports. Some Intel's old documentation refers to Intel EM64T as + 64-bit extension technology or IA-32e. - As of this writing, this port supports the Athlon64 - (Clawhammer) and Opteron - (Sledgehammer) machines. The largest tested + The largest tested memory configuration to date is 8GB. SMP support has been recently completed and is reasonably robust. ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#59 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.247 2004/09/07 20:14:35 simon Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.255 2004/09/13 10:48:34 brueffer Exp $ Supported Devices @@ -254,49 +254,9 @@ &hwlist.ti; - AMD PCnet NICs (&man.lnc.4; and &man.pcn.4; drivers) - - - AMD PCnet/PCI (79c970 & 53c974 or 79c974) - - - AMD PCnet/FAST - - - Isolan AT 4141-0 (16 bit) - - - Isolink 4110 (8 bit) - - - PCnet/FAST+ - - - PCnet/FAST III - - - PCnet/PRO - - - PCnet/Home - - - HomePNA - - - Contec C-NET(98)S - - - PCI NIC using AMD AM79C97x (PCnet-PCI/Fast) - - - NEC SV-98/2-B05, B06 (PCI) - - - Allied-Telesis LA-PCI (PCI) - - - + &hwlist.pcn; + + &hwlist.lnc; SMC 83c17x (EPIC)-based Ethernet NICs (&man.tx.4; driver) @@ -596,12 +556,9 @@ &hwlist.bge; - Gigabit Ethernet NICs based on the - Intel 82542 and 82543 controller chips (&man.gx.4; and &man.em.4; - drivers), plus NICs supported by the Intel 82540EM, 82544, - 82545EM, and 82546EB - controller chips (&man.em.4; driver only) - + &hwlist.em; + + &hwlist.gx; &hwlist.hme; @@ -616,6 +573,8 @@ &hwlist.ixgb; + &hwlist.vge; + @@ -998,16 +957,7 @@ &hwlist.snd.cmi; - Crystal Semiconductor (&man.csa.4; driver) - - - CS461x/462x Audio Accelerator - - - CS428x Audio Controller - - - + &hwlist.snd.csa; &hwlist.snd.es137x; @@ -1035,16 +985,7 @@ ForteMedia fm801 - Gravis (&man.gusc.4; driver) - - - UltraSound MAX - - - UltraSound PnP - - - + &hwlist.snd.gusc; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 13 22:39:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B60D816A4D0; Mon, 13 Sep 2004 22:39:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E9AE16A4CE for ; Mon, 13 Sep 2004 22:39:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42B6B43D1D for ; Mon, 13 Sep 2004 22:39:23 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8DMdN2p091270 for ; Mon, 13 Sep 2004 22:39:23 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8DMdM1j091267 for perforce@freebsd.org; Mon, 13 Sep 2004 22:39:22 GMT (envelope-from peter@freebsd.org) Date: Mon, 13 Sep 2004 22:39:22 GMT Message-Id: <200409132239.i8DMdM1j091267@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 61458 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Sep 2004 22:39:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=61458 Change 61458 by peter@peter_daintree on 2004/09/13 22:38:59 Integrate/sync i386 and hammer branches. There is some work to do still. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#19 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#102 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#72 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#105 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#54 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#56 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#46 integrate .. //depot/projects/hammer/sys/amd64/include/in_cksum.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#26 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#46 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#22 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#17 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#19 (text+ko) ==== @@ -190,6 +190,7 @@ #define TRAP 1 #define INTERRUPT 2 #define SYSCALL 3 +#define DOUBLE_FAULT 4 static void db_nextframe(struct amd64_frame **, db_addr_t *, struct thread *); static int db_numargs(struct amd64_frame *); @@ -317,6 +318,8 @@ frame_type = INTERRUPT; else if (strcmp(name, "Xfast_syscall") == 0) frame_type = SYSCALL; + else if (strcmp(name, "dblfault_handler") == 0) + frame_type = DOUBLE_FAULT; } /* @@ -331,6 +334,23 @@ db_print_stack_entry(name, 0, 0, 0, rip); /* + * For a double fault, we have to snag the values from the + * previous TSS since a double fault uses a task gate to + * switch to a known good state. + */ + if (frame_type == DOUBLE_FAULT) { + esp = PCPU_GET(common_tss.tss_esp); + eip = PCPU_GET(common_tss.tss_eip); + ebp = PCPU_GET(common_tss.tss_ebp); + db_printf( + "--- trap 0x17, eip = %#r, esp = %#r, ebp = %#r ---\n", + eip, esp, ebp); + *ip = (db_addr_t) eip; + *fp = (struct i386_frame *) ebp; + return; + } + + /* * Point to base of trapframe which is just above the * current frame. */ ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#102 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#72 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#105 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#54 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#56 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#46 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1170) +# (XXX from i386:NOTES,v 1.1172) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.19 2004/08/27 21:29:20 arved Exp $ # @@ -218,7 +218,7 @@ # for AGP r128 and radeon cards. device mgadrm -device "r128drm" +device r128drm device radeondrm device sisdrm device tdfxdrm @@ -327,6 +327,13 @@ # I2C Bus # +# +# Hardware watchdog timers: +# +# ichwd: Intel ICH watchdog timer +# +device ichwd + #--------------------------------------------------------------------------- # ISDN4BSD # @@ -366,20 +373,20 @@ # ifpi2 driver for AVM Fritz!Card PCI version 2 # # AVM Fritz!Card PCI version 2 -#XXX#device "ifpi2" +#XXX#device ifpi2 # #--------------------------------------------------------------------------- # iwic driver for Winbond W6692 chipset # # ASUSCOM P-IN100-ST-D (and other Winbond W6692 based cards) -#XXX#device iwic +#XXX#device iwic # #--------------------------------------------------------------------------- # itjc driver for Siemens ISAC / TJNet Tiger300/320 chipset # # Traverse Technologies NETjet-S # Teles PCI-TJ -#XXX#device itjc +#XXX#device itjc # #--------------------------------------------------------------------------- # iavc driver (AVM active cards, needs i4bcapi driver!) @@ -390,34 +397,38 @@ # ISDN Protocol Stack - mandatory for all hardware drivers # # Q.921 / layer 2 - i4b passive cards D channel handling -#XXX#device "i4bq921" +#XXX#device i4bq921 # # Q.931 / layer 3 - i4b passive cards D channel handling -#XXX#device "i4bq931" +#XXX#device i4bq931 # # layer 4 - i4b common passive and active card handling -#XXX#device "i4b" +#XXX#device i4b # #--------------------------------------------------------------------------- # ISDN devices - mandatory for all hardware drivers # # userland driver to do ISDN tracing (for passive cards only) -#XXX#device "i4btrc" 4 +#XXX#device i4btrc +#XXX#options NI4BTRC=4 # # userland driver to control the whole thing -#XXX#device "i4bctl" +#XXX#device i4bctl # #--------------------------------------------------------------------------- # ISDN devices - optional # # userland driver for access to raw B channel -#XXX#device "i4brbch" 4 +#XXX#device i4brbch +#XXX#options NI4BRBCH=4 # # userland driver for telephony -#XXX#device "i4btel" 2 +#XXX#device i4btel +#XXX#options NI4BTEL=2 # # network driver for IP over raw HDLC ISDN -#XXX#device "i4bipr" 4 +#XXX#device i4bipr +#XXX#options NI4BIPR=4 # enable VJ header compression detection for ipr i/f options IPR_VJ # enable logging of the first n IP packets to isdnd (n=32 here) @@ -425,10 +436,15 @@ # # network driver for sync PPP over ISDN; requires an equivalent # number of sppp device to be configured -#XXX#device "i4bisppp" 4 +#XXX#device i4bisppp +#XXX#options NI4BISPPP=4 # # B-channel interface to the netgraph subsystem -#XXX#device "i4bing" 2 +#XXX#device i4bing +#XXX#options NI4BING=2 +# +# CAPI driver needed for active ISDN cards (see iavc driver above) +#XXX#device i4bcapi # #--------------------------------------------------------------------------- ==== //depot/projects/hammer/sys/amd64/include/in_cksum.h#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/param.h#26 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pmap.h#46 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/profile.h#22 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Sep 13 22:52:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC55516A4D0; Mon, 13 Sep 2004 22:52:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C269716A4CE for ; Mon, 13 Sep 2004 22:52:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4FB443D58 for ; Mon, 13 Sep 2004 22:52:39 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8DMqdHq091620 for ; Mon, 13 Sep 2004 22:52:39 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8DMqdal091617 for perforce@freebsd.org; Mon, 13 Sep 2004 22:52:39 GMT (envelope-from julian@freebsd.org) Date: Mon, 13 Sep 2004 22:52:39 GMT Message-Id: <200409132252.i8DMqdal091617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Sep 2004 22:52:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=61459 Change 61459 by julian@julian_ref on 2004/09/13 22:52:14 fix debug code that always triggered. Affected files ... .. //depot/projects/nsched/sys/kern/kern_switch.c#24 edit .. //depot/projects/nsched/sys/kern/sched_4bsd.c#51 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_switch.c#24 (text+ko) ==== @@ -541,7 +541,7 @@ ("thread has no (or wrong) sched-private part.")); KASSERT((td->td_inhibitors == 0), ("setrunqueue: trying to run inhibitted thread")); - CHECKRUNQ(td->td_ksegrp, td) + CHECKRUNQ(td->td_ksegrp, NULL) pri = td->td_priority; cpri = ctd->td_priority; if (pri >= cpri || cold /* || dumping */ || TD_IS_INHIBITED(ctd) || ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#51 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Sep 13 22:53:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A681116A4D0; Mon, 13 Sep 2004 22:53:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 81F7916A4CE for ; Mon, 13 Sep 2004 22:53:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7271E43D46 for ; Mon, 13 Sep 2004 22:53:41 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8DMrfGO091658 for ; Mon, 13 Sep 2004 22:53:41 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8DMrf8k091655 for perforce@freebsd.org; Mon, 13 Sep 2004 22:53:41 GMT (envelope-from peter@freebsd.org) Date: Mon, 13 Sep 2004 22:53:41 GMT Message-Id: <200409132253.i8DMrf8k091655@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 61460 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Sep 2004 22:53:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=61460 Change 61460 by peter@peter_daintree on 2004/09/13 22:53:08 Hmm. jhb's doublefault tracer wont work in this form. On amd64, we dont save the old register values. Note an XXX about a MIA ist setup for the doublefault. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#20 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#20 (text+ko) ==== @@ -190,7 +190,6 @@ #define TRAP 1 #define INTERRUPT 2 #define SYSCALL 3 -#define DOUBLE_FAULT 4 static void db_nextframe(struct amd64_frame **, db_addr_t *, struct thread *); static int db_numargs(struct amd64_frame *); @@ -318,8 +317,6 @@ frame_type = INTERRUPT; else if (strcmp(name, "Xfast_syscall") == 0) frame_type = SYSCALL; - else if (strcmp(name, "dblfault_handler") == 0) - frame_type = DOUBLE_FAULT; } /* @@ -334,23 +331,6 @@ db_print_stack_entry(name, 0, 0, 0, rip); /* - * For a double fault, we have to snag the values from the - * previous TSS since a double fault uses a task gate to - * switch to a known good state. - */ - if (frame_type == DOUBLE_FAULT) { - esp = PCPU_GET(common_tss.tss_esp); - eip = PCPU_GET(common_tss.tss_eip); - ebp = PCPU_GET(common_tss.tss_ebp); - db_printf( - "--- trap 0x17, eip = %#r, esp = %#r, ebp = %#r ---\n", - eip, esp, ebp); - *ip = (db_addr_t) eip; - *fp = (struct i386_frame *) ebp; - return; - } - - /* * Point to base of trapframe which is just above the * current frame. */ From owner-p4-projects@FreeBSD.ORG Mon Sep 13 22:54:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F9B816A4D0; Mon, 13 Sep 2004 22:54:43 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 794B816A4CE for ; Mon, 13 Sep 2004 22:54:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4EF4B43D39 for ; Mon, 13 Sep 2004 22:54:43 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8DMshd7091698 for ; Mon, 13 Sep 2004 22:54:43 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8DMsgc5091695 for perforce@freebsd.org; Mon, 13 Sep 2004 22:54:42 GMT (envelope-from julian@freebsd.org) Date: Mon, 13 Sep 2004 22:54:42 GMT Message-Id: <200409132254.i8DMsgc5091695@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61461 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Sep 2004 22:54:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=61461 Change 61461 by julian@julian_ref on 2004/09/13 22:54:19 IFC@61457 Affected files ... .. //depot/projects/nsched/sys/amd64/amd64/pmap.c#20 integrate .. //depot/projects/nsched/sys/conf/NOTES#19 integrate .. //depot/projects/nsched/sys/dev/esp/esp_sbus.c#6 integrate .. //depot/projects/nsched/sys/dev/sound/isa/sb16.c#6 integrate .. //depot/projects/nsched/sys/fs/specfs/spec_vnops.c#7 integrate .. //depot/projects/nsched/sys/geom/geom_kern.c#2 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum.c#7 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum.h#4 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_drive.c#6 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_plex.c#5 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_rm.c#3 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_state.c#3 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_subr.c#5 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/nsched/sys/i386/i386/pmap.c#22 integrate .. //depot/projects/nsched/sys/ia64/conf/GENERIC#8 integrate .. //depot/projects/nsched/sys/ia64/conf/SKI#6 integrate .. //depot/projects/nsched/sys/kern/kern_conf.c#9 integrate .. //depot/projects/nsched/sys/kern/kern_fork.c#14 integrate .. //depot/projects/nsched/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/nsched/sys/kern/vnode_if.src#3 integrate .. //depot/projects/nsched/sys/netinet/ip_fastfwd.c#6 integrate .. //depot/projects/nsched/sys/netinet/ip_fw2.c#11 integrate .. //depot/projects/nsched/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/nsched/sys/netinet/ip_output.c#11 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/pmap.c#11 integrate .. //depot/projects/nsched/sys/sys/conf.h#9 integrate .. //depot/projects/nsched/sys/sys/proc.h#32 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_alloc.c#7 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_snapshot.c#7 integrate Differences ... ==== //depot/projects/nsched/sys/amd64/amd64/pmap.c#20 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.497 2004/09/08 18:58:28 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.498 2004/09/12 20:20:40 alc Exp $"); /* * Manages physical address maps. @@ -1784,14 +1784,15 @@ va_next = eva; for (; sva != va_next; sva += PAGE_SIZE) { - pt_entry_t pbits; + pt_entry_t obits, pbits; pt_entry_t *pte; vm_page_t m; pte = pmap_pte(pmap, sva); if (pte == NULL) continue; - pbits = *pte; +retry: + obits = pbits = *pte; if (pbits & PG_MANAGED) { m = NULL; if (pbits & PG_A) { @@ -1805,14 +1806,14 @@ m = PHYS_TO_VM_PAGE(pbits & PG_FRAME); vm_page_dirty(m); - pbits &= ~PG_M; } } - pbits &= ~PG_RW; + pbits &= ~(PG_RW | PG_M); - if (pbits != *pte) { - pte_store(pte, pbits); + if (pbits != obits) { + if (!atomic_cmpset_long(pte, obits, pbits)) + goto retry; anychanged = 1; } } ==== //depot/projects/nsched/sys/conf/NOTES#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1276 2004/09/08 08:42:36 ru Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1277 2004/09/12 12:13:29 ceri Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -201,7 +201,7 @@ # allows interrupt threads to run sooner rather than waiting. # WARNING! Only tested on alpha, amd64, and i386. # FULL_PREEMPTION instructs the kernel to preempt non-realtime kernel -# threads. It sole use is to expose race conditions and other +# threads. Its sole use is to expose race conditions and other # bugs during development. Enabling this option will reduce # performance and increase the frequency of kernel panics by # design. If you aren't sure that you need it then you don't. ==== //depot/projects/nsched/sys/dev/esp/esp_sbus.c#6 (text+ko) ==== @@ -65,7 +65,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/esp/esp_sbus.c,v 1.6 2004/08/12 17:41:29 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/esp/esp_sbus.c,v 1.7 2004/09/13 15:15:38 scottl Exp $"); #include #include @@ -193,8 +193,12 @@ node = ofw_bus_get_node(dev); if (OF_getprop(node, "initiator-id", &sc->sc_id, sizeof(sc->sc_id)) == -1) - sc->sc_id = 7;; - sc->sc_freq = sbus_get_clockfreq(dev); + sc->sc_id = 7; + if (OF_getprop(node, "clock-frequency", &sc->sc_freq, + sizeof(sc->sc_freq)) == -1) { + printf("failed to query OFW for clock-frequency\n"); + sc->sc_freq = sbus_get_clockfreq(dev); + } #ifdef ESP_SBUS_DEBUG device_printf(dev, "espattach_sbus: sc_id %d, freq %d\n", ==== //depot/projects/nsched/sys/dev/sound/isa/sb16.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.87 2004/07/16 03:59:54 tanimura Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.88 2004/09/12 18:19:42 truckman Exp $"); #define SB16_BUFFSIZE 4096 #define PLAIN_SB16(x) ((((x)->bd_flags) & (BD_F_SB16|BD_F_SB16X)) == BD_F_SB16) @@ -209,7 +209,7 @@ #if 0 printf("sb_cmd2: %x, %x\n", cmd, val); #endif - sb_lock(sb); + sb_lockassert(sb); r = 0; if (sb_dspwr(sb, cmd)) { if (sb_dspwr(sb, val & 0xff)) { @@ -218,7 +218,6 @@ } } } - sb_unlock(sb); return r; } @@ -243,12 +242,11 @@ { int val; - sb_lock(sb); + sb_lockassert(sb); sb_wr(sb, SB_MIX_ADDR, (u_char) (port & 0xff)); /* Select register */ DELAY(10); val = sb_rd(sb, SB_MIX_DATA); DELAY(10); - sb_unlock(sb); return val; } ==== //depot/projects/nsched/sys/fs/specfs/spec_vnops.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95 - * $FreeBSD: src/sys/fs/specfs/spec_vnops.c,v 1.226 2004/08/08 13:23:05 phk Exp $ + * $FreeBSD: src/sys/fs/specfs/spec_vnops.c,v 1.227 2004/09/13 06:50:41 phk Exp $ */ #include @@ -54,7 +54,6 @@ static int spec_advlock(struct vop_advlock_args *); static int spec_close(struct vop_close_args *); -static int spec_freeblks(struct vop_freeblks_args *); static int spec_fsync(struct vop_fsync_args *); static int spec_getpages(struct vop_getpages_args *); static int spec_ioctl(struct vop_ioctl_args *); @@ -74,7 +73,6 @@ { &vop_bmap_desc, (vop_t *) vop_panic }, { &vop_close_desc, (vop_t *) spec_close }, { &vop_create_desc, (vop_t *) vop_panic }, - { &vop_freeblks_desc, (vop_t *) spec_freeblks }, { &vop_fsync_desc, (vop_t *) spec_fsync }, { &vop_getpages_desc, (vop_t *) spec_getpages }, { &vop_getwritemount_desc, (vop_t *) vop_stdgetwritemount }, @@ -462,10 +460,8 @@ struct cdevsw *dsw; struct thread *td = curthread; - KASSERT(bp->b_iocmd == BIO_READ || - bp->b_iocmd == BIO_WRITE || - bp->b_iocmd == BIO_DELETE, - ("Wrong b_iocmd buf=%p cmd=%d", bp, bp->b_iocmd)); + KASSERT(bp->b_iocmd == BIO_READ || bp->b_iocmd == BIO_WRITE, + ("Wrong b_iocmd buf=%p cmd=%d", bp, bp->b_iocmd)); /* * Slow down disk requests for niced processes. @@ -529,33 +525,6 @@ return spec_xstrategy(ap->a_vp, ap->a_bp); } -static int -spec_freeblks(ap) - struct vop_freeblks_args /* { - struct vnode *a_vp; - daddr_t a_addr; - daddr_t a_length; - } */ *ap; -{ - struct buf *bp; - - /* - * XXX: This assumes that strategy does the deed right away. - * XXX: this may not be TRTTD. - */ - if ((ap->a_vp->v_rdev->si_flags & SI_CANDELETE) == 0) - return (0); - bp = geteblk(ap->a_length); - bp->b_iocmd = BIO_DELETE; - bp->b_dev = ap->a_vp->v_rdev; - bp->b_blkno = ap->a_addr; - bp->b_offset = dbtob(ap->a_addr); - bp->b_iooffset = bp->b_offset; - bp->b_bcount = ap->a_length; - BUF_KERNPROC(bp); - DEV_STRATEGY(bp); - return (0); -} /* * Device close routine ==== //depot/projects/nsched/sys/geom/geom_kern.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_kern.c,v 1.34 2004/02/10 10:54:19 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_kern.c,v 1.35 2004/09/13 14:58:27 pjd Exp $"); #include #include @@ -220,6 +220,7 @@ 0, 0, sysctl_kern_geom_conftxt, "", "Dump the GEOM config in txt"); +TUNABLE_INT("kern.geom.debugflags", &g_debugflags); SYSCTL_INT(_kern_geom, OID_AUTO, debugflags, CTLFLAG_RW, &g_debugflags, 0, ""); ==== //depot/projects/nsched/sys/geom/vinum/geom_vinum.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum.c,v 1.10 2004/08/27 21:32:18 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum.c,v 1.11 2004/09/13 17:27:58 le Exp $"); #include #include @@ -186,7 +186,7 @@ g_topology_unlock(); /* Check if the provided slice is a valid vinum drive. */ - vhdr = g_read_data(cp, GV_HDR_OFFSET, GV_HDR_LEN, &error); + vhdr = g_read_data(cp, GV_HDR_OFFSET, pp->sectorsize, &error); if (vhdr == NULL || error != 0) { g_topology_lock(); g_access(cp, -1, 0, 0); ==== //depot/projects/nsched/sys/geom/vinum/geom_vinum.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/vinum/geom_vinum.h,v 1.3 2004/08/27 21:32:18 le Exp $ + * $FreeBSD: src/sys/geom/vinum/geom_vinum.h,v 1.5 2004/09/13 21:01:36 le Exp $ */ #ifndef _GEOM_VINUM_H_ @@ -68,7 +68,8 @@ void gv_format_config(struct gv_softc *, struct sbuf *, int, char *); int gv_is_striped(struct gv_plex *); int gv_is_open(struct g_geom *); -void gv_kill_thread(struct gv_plex *); +void gv_kill_drive_thread(struct gv_drive *); +void gv_kill_plex_thread(struct gv_plex *); int gv_object_type(struct gv_softc *, char *); void gv_parse_config(struct gv_softc *, u_char *, int); const char *gv_roughlength(off_t, int); ==== //depot/projects/nsched/sys/geom/vinum/geom_vinum_drive.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.11 2004/08/27 21:32:18 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.14 2004/09/13 21:01:36 le Exp $"); #include #include @@ -47,6 +47,7 @@ #include #include +static void gv_drive_worker(void *); void gv_drive_modify(struct gv_drive *); void @@ -75,6 +76,11 @@ fl->size = d->avail; LIST_INSERT_HEAD(&d->freelist, fl, freelist); d->freelist_entries = 1; + + TAILQ_INIT(&d->bqueue); + mtx_init(&d->bqueue_mtx, "gv_drive", NULL, MTX_DEF); + kthread_create(gv_drive_worker, d, NULL, 0, 0, "gv_d %s", d->name); + d->flags |= GV_DRIVE_THREAD_ACTIVE; } void @@ -181,7 +187,8 @@ gp = pp->geom; cp = LIST_FIRST(&gp->consumer); - KASSERT(cp != NULL, ("gv_drive_access: NULL cp")); + if (cp == NULL) + return (0); d = gp->softc; @@ -225,71 +232,170 @@ } static void +gv_drive_done(struct bio *bp) +{ + struct gv_drive *d; + struct gv_bioq *bq; + + /* Put the BIO on the worker queue again. */ + d = bp->bio_from->geom->softc; + bp->bio_cflags |= GV_BIO_DONE; + bq = g_malloc(sizeof(*bq), M_NOWAIT | M_ZERO); + bq->bp = bp; + mtx_lock(&d->bqueue_mtx); + TAILQ_INSERT_TAIL(&d->bqueue, bq, queue); + wakeup(d); + mtx_unlock(&d->bqueue_mtx); +} + + +static void gv_drive_start(struct bio *bp) { - struct bio *bp2; - struct g_geom *gp; - struct g_consumer *cp; - struct g_provider *pp; struct gv_drive *d; struct gv_sd *s; + struct gv_bioq *bq; - pp = bp->bio_to; - gp = pp->geom; - cp = LIST_FIRST(&gp->consumer); - d = gp->softc; - s = pp->private; + switch (bp->bio_cmd) { + case BIO_READ: + case BIO_WRITE: + case BIO_DELETE: + break; + case BIO_GETATTR: + default: + g_io_deliver(bp, EOPNOTSUPP); + return; + } + s = bp->bio_to->private; if ((s->state == GV_SD_DOWN) || (s->state == GV_SD_STALE)) { g_io_deliver(bp, ENXIO); return; } - switch(bp->bio_cmd) { - case BIO_READ: - case BIO_WRITE: - case BIO_DELETE: - if (bp->bio_offset > s->size) { - g_io_deliver(bp, EINVAL); /* XXX: EWHAT ? */ - return; - } - bp2 = g_clone_bio(bp); - if (bp2 == NULL) { - g_io_deliver(bp, ENOMEM); - return; - } - if (bp2->bio_offset + bp2->bio_length > s->size) - bp2->bio_length = s->size - bp2->bio_offset; - bp2->bio_done = g_std_done; - bp2->bio_offset += s->drive_offset; - g_io_request(bp2, cp); - return; + d = bp->bio_to->geom->softc; + + /* + * Put the BIO on the worker queue, where the worker thread will pick + * it up. + */ + bq = g_malloc(sizeof(*bq), M_NOWAIT | M_ZERO); + bq->bp = bp; + mtx_lock(&d->bqueue_mtx); + TAILQ_INSERT_TAIL(&d->bqueue, bq, queue); + wakeup(d); + mtx_unlock(&d->bqueue_mtx); + +} + +static void +gv_drive_worker(void *arg) +{ + struct bio *bp, *cbp; + struct g_geom *gp; + struct g_provider *pp; + struct g_consumer *cp; + struct gv_drive *d; + struct gv_sd *s; + struct gv_bioq *bq, *bq2; + int error; + + d = arg; + + mtx_lock(&d->bqueue_mtx); + for (;;) { + /* We were signaled to exit. */ + if (d->flags & GV_DRIVE_THREAD_DIE) + break; + + /* Take the first BIO from out queue. */ + bq = TAILQ_FIRST(&d->bqueue); + if (bq == NULL) { + msleep(d, &d->bqueue_mtx, PRIBIO, "-", hz/10); + continue; + } + TAILQ_REMOVE(&d->bqueue, bq, queue); + mtx_unlock(&d->bqueue_mtx); + + bp = bq->bp; + g_free(bq); + pp = bp->bio_to; + gp = pp->geom; + + /* Completed request. */ + if (bp->bio_cflags & GV_BIO_DONE) { + error = bp->bio_error; + + /* Deliver the original request. */ + g_std_done(bp); + + /* The request had an error, we need to clean up. */ + if (error != 0) { + g_topology_lock(); + cp = LIST_FIRST(&gp->consumer); + if (cp->acr > 0 || cp->acw > 0 || cp->ace > 0) + g_access(cp, -cp->acr, -cp->acw, + -cp->ace); + gv_set_drive_state(d, GV_DRIVE_DOWN, + GV_SETSTATE_FORCE | GV_SETSTATE_CONFIG); + if (cp->nstart == cp->nend) { + g_detach(cp); + g_destroy_consumer(cp); + } + g_topology_unlock(); + } + + /* New request, needs to be sent downwards. */ + } else { + s = pp->private; - case BIO_GETATTR: - if (!strcmp("GEOM::kerneldump", bp->bio_attribute)) { - struct g_kerneldump *gkd; + if ((s->state == GV_SD_DOWN) || + (s->state == GV_SD_STALE)) { + g_io_deliver(bp, ENXIO); + mtx_lock(&d->bqueue_mtx); + continue; + } + if (bp->bio_offset > s->size) { + g_io_deliver(bp, EINVAL); + mtx_lock(&d->bqueue_mtx); + continue; + } - gkd = (struct g_kerneldump *)bp->bio_data; - gkd->offset += s->drive_offset; - if (gkd->length > s->size) - gkd->length = s->size; - /* now, pass it on downwards... */ + cbp = g_clone_bio(bp); + if (cbp == NULL) { + g_io_deliver(bp, ENOMEM); + mtx_lock(&d->bqueue_mtx); + continue; + } + if (cbp->bio_offset + cbp->bio_length > s->size) + cbp->bio_length = s->size - + cbp->bio_offset; + cbp->bio_done = gv_drive_done; + cbp->bio_offset += s->drive_offset; + g_io_request(cbp, LIST_FIRST(&gp->consumer)); } - bp2 = g_clone_bio(bp); - if (bp2 == NULL) { - g_io_deliver(bp, ENOMEM); - return; - } - bp2->bio_done = g_std_done; - g_io_request(bp2, cp); - return; + + mtx_lock(&d->bqueue_mtx); + } - default: - g_io_deliver(bp, EOPNOTSUPP); - return; + TAILQ_FOREACH_SAFE(bq, &d->bqueue, queue, bq2) { + TAILQ_REMOVE(&d->bqueue, bq, queue); + mtx_unlock(&d->bqueue_mtx); + bp = bq->bp; + g_free(bq); + if (bp->bio_cflags & GV_BIO_DONE) + g_std_done(bp); + else + g_io_deliver(bp, ENXIO); + mtx_lock(&d->bqueue_mtx); } + mtx_unlock(&d->bqueue_mtx); + d->flags |= GV_DRIVE_THREAD_DEAD; + + kthread_exit(ENXIO); } + static void gv_drive_orphan(struct g_consumer *cp) { @@ -318,7 +424,9 @@ s->provider = NULL; s->consumer = NULL; } - gv_set_drive_state(d, GV_DRIVE_DOWN, GV_SETSTATE_FORCE); + gv_kill_drive_thread(d); + gv_set_drive_state(d, GV_DRIVE_DOWN, + GV_SETSTATE_FORCE | GV_SETSTATE_CONFIG); } gp->softc = NULL; g_wither_geom(gp, error); @@ -372,7 +480,7 @@ /* Now check if the provided slice is a valid vinum drive. */ do { - vhdr = g_read_data(cp, GV_HDR_OFFSET, GV_HDR_LEN, &error); + vhdr = g_read_data(cp, GV_HDR_OFFSET, pp->sectorsize, &error); if (vhdr == NULL || error != 0) break; if (vhdr->magic != GV_MAGIC) { @@ -426,6 +534,12 @@ LIST_INSERT_HEAD(&d->freelist, fl, freelist); d->freelist_entries = 1; + TAILQ_INIT(&d->bqueue); + mtx_init(&d->bqueue_mtx, "gv_drive", NULL, MTX_DEF); + kthread_create(gv_drive_worker, d, NULL, 0, 0, + "gv_d %s", d->name); + d->flags |= GV_DRIVE_THREAD_ACTIVE; + /* Save it into the main configuration. */ LIST_INSERT_HEAD(&sc->drives, d, drive); } @@ -434,6 +548,7 @@ gp->softc = d; d->geom = gp; + d->vinumconf = sc; strncpy(d->device, pp->name, GV_MAXDRIVENAME); /* @@ -511,9 +626,14 @@ gv_drive_destroy_geom(struct gctl_req *req, struct g_class *mp, struct g_geom *gp) { + struct gv_drive *d; + g_trace(G_T_TOPOLOGY, "gv_drive_destroy_geom: %s", gp->name); g_topology_assert(); + d = gp->softc; + gv_kill_drive_thread(d); + g_wither_geom(gp, ENXIO); return (0); } ==== //depot/projects/nsched/sys/geom/vinum/geom_vinum_plex.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_plex.c,v 1.8 2004/08/10 20:51:48 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_plex.c,v 1.9 2004/09/13 17:44:47 le Exp $"); #include #include @@ -67,7 +67,7 @@ p = gp->softc; if (p != NULL) { - gv_kill_thread(p); + gv_kill_plex_thread(p); p->geom = NULL; p->provider = NULL; p->consumer = NULL; @@ -468,7 +468,7 @@ * If this is a RAID5 plex, check if its worker thread is still active * and signal it to self destruct. */ - gv_kill_thread(p); + gv_kill_plex_thread(p); /* g_free(sc); */ g_wither_geom(gp, ENXIO); return (0); ==== //depot/projects/nsched/sys/geom/vinum/geom_vinum_rm.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_rm.c,v 1.2 2004/08/22 17:07:55 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_rm.c,v 1.4 2004/09/13 21:01:36 le Exp $"); #include #include @@ -228,7 +228,7 @@ p->vol_sc = NULL; } - gv_kill_thread(p); + gv_kill_plex_thread(p); g_free(p); if (gp != NULL) { @@ -342,6 +342,7 @@ } LIST_REMOVE(d, drive); + gv_kill_drive_thread(d); gp = d->geom; d->geom = NULL; g_free(d->hdr); ==== //depot/projects/nsched/sys/geom/vinum/geom_vinum_state.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_state.c,v 1.3 2004/08/19 12:03:27 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_state.c,v 1.4 2004/09/13 17:33:52 le Exp $"); #include #include @@ -63,6 +63,10 @@ gv_update_sd_state(s); } + /* Save the config back to disk. */ + if (flags & GV_SETSTATE_CONFIG) + gv_save_config_all(d->vinumconf); + return (1); } ==== //depot/projects/nsched/sys/geom/vinum/geom_vinum_subr.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_subr.c,v 1.7 2004/08/22 13:34:24 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_subr.c,v 1.9 2004/09/13 21:01:36 le Exp $"); #include #include @@ -817,7 +817,20 @@ } void -gv_kill_thread(struct gv_plex *p) +gv_kill_drive_thread(struct gv_drive *d) +{ + if (d->flags & GV_DRIVE_THREAD_ACTIVE) { + d->flags |= GV_DRIVE_THREAD_DIE; + wakeup(d); + while (!(d->flags & GV_DRIVE_THREAD_DEAD)) + tsleep(d, PRIBIO, "gv_die", hz); + d->flags &= ~GV_DRIVE_THREAD_ACTIVE; + mtx_destroy(&d->bqueue_mtx); + } +} + +void +gv_kill_plex_thread(struct gv_plex *p) { if ((p->org == GV_PLEX_RAID5) && (p->flags & GV_PLEX_THREAD_ACTIVE)) { p->flags |= GV_PLEX_THREAD_DIE; ==== //depot/projects/nsched/sys/geom/vinum/geom_vinum_var.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $FreeBSD: src/sys/geom/vinum/geom_vinum_var.h,v 1.1 2004/06/12 21:16:10 le Exp $ + * $FreeBSD: src/sys/geom/vinum/geom_vinum_var.h,v 1.2 2004/09/13 21:01:36 le Exp $ */ #ifndef _GEOM_VINUM_VAR_H_ @@ -107,6 +107,11 @@ #define GV_MAX_SYNCSIZE MAXPHYS #define GV_DFLT_SYNCSIZE 65536 +/* Flags for BIOs, as they are processed within vinum. */ +#define GV_BIO_DONE 0x01 +#define GV_BIO_MALLOC 0x02 +#define GV_BIO_ONHOLD 0x04 + /* * hostname is 256 bytes long, but we don't need to shlep multiple copies in * vinum. We use the host name just to identify this system, and 32 bytes @@ -139,6 +144,16 @@ LIST_ENTRY(gv_freelist) freelist; }; +/* + * Since we share structures between userland and kernel, we need this helper + * struct instead of struct bio_queue_head and friends. Maybe I find a proper + * solution some day. + */ +struct gv_bioq { + struct bio *bp; + TAILQ_ENTRY(gv_bioq) queue; +}; + /* This struct contains the main vinum config. */ struct gv_softc { /*struct mtx config_mtx; XXX not yet */ @@ -164,6 +179,11 @@ off_t avail; /* Available space. */ int sdcount; /* Number of subdisks. */ + int flags; +#define GV_DRIVE_THREAD_ACTIVE 0x01 /* Drive has an active worker thread. */ +#define GV_DRIVE_THREAD_DIE 0x02 /* Signal the worker thread to die. */ +#define GV_DRIVE_THREAD_DEAD 0x04 /* The worker thread has died. */ + struct gv_hdr *hdr; /* The drive header. */ int freelist_entries; /* Count of freelist entries. */ @@ -171,6 +191,9 @@ LIST_HEAD(,gv_sd) subdisks; /* Subdisks on this drive. */ LIST_ENTRY(gv_drive) drive; /* Entry in the vinum config. */ + TAILQ_HEAD(,gv_bioq) bqueue; /* BIO queue of this drive. */ + struct mtx bqueue_mtx; /* Mtx. to protect the queue. */ + struct g_geom *geom; /* The geom of this drive. */ struct gv_softc *vinumconf; /* Pointer to the vinum conf. */ }; ==== //depot/projects/nsched/sys/i386/i386/pmap.c#22 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.503 2004/09/11 10:07:21 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.504 2004/09/12 20:20:40 alc Exp $"); /* * Manages physical address maps. @@ -1814,7 +1814,7 @@ sched_pin(); PMAP_LOCK(pmap); for (; sva < eva; sva = pdnxt) { - unsigned pdirindex; + unsigned obits, pbits, pdirindex; pdnxt = (sva + NBPDR) & ~PDRMASK; @@ -1842,13 +1842,18 @@ pdnxt = eva; for (; sva != pdnxt; sva += PAGE_SIZE) { - pt_entry_t pbits; pt_entry_t *pte; vm_page_t m; if ((pte = pmap_pte_quick(pmap, sva)) == NULL) continue; - pbits = *pte; +retry: + /* + * Regardless of whether a pte is 32 or 64 bits in + * size, PG_RW, PG_A, and PG_M are among the least + * significant 32 bits. + */ + obits = pbits = *(u_int *)pte; if (pbits & PG_MANAGED) { m = NULL; if (pbits & PG_A) { @@ -1861,14 +1866,15 @@ if (m == NULL) m = PHYS_TO_VM_PAGE(pbits); vm_page_dirty(m); - pbits &= ~PG_M; } } - pbits &= ~PG_RW; + pbits &= ~(PG_RW | PG_M); - if (pbits != *pte) { - pte_store(pte, pbits); + if (pbits != obits) { + if (!atomic_cmpset_int((u_int *)pte, obits, + pbits)) + goto retry; anychanged = 1; } } ==== //depot/projects/nsched/sys/ia64/conf/GENERIC#8 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.69 2004/09/02 18:05:26 marcel Exp $ +# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.70 2004/09/12 05:50:32 marcel Exp $ machine ia64 cpu ITANIUM @@ -42,7 +42,8 @@ options NFS_ROOT # NFS usable as root device options PROCFS # Process filesystem (/proc) options PSEUDOFS # Pseudo-filesystem framework -options SCHED_ULE # ULE scheduler +options SCHED_4BSD # 4BSD scheduler +#options SCHED_ULE # ULE scheduler options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI #options SMP # SMP support options SOFTUPDATES # Enable FFS soft updates support ==== //depot/projects/nsched/sys/ia64/conf/SKI#6 (text+ko) ==== @@ -17,7 +17,7 @@ # If you are in doubt as to the purpose or necessity of a line, check # first in NOTES. # -# $FreeBSD: src/sys/ia64/conf/SKI,v 1.20 2004/08/27 15:16:22 andre Exp $ +# $FreeBSD: src/sys/ia64/conf/SKI,v 1.21 2004/09/12 05:50:32 marcel Exp $ machine ia64 cpu ITANIUM @@ -37,7 +37,8 @@ options MD_ROOT # MD usable as root device options PROCFS # Process filesystem (/proc) options PSEUDOFS # Pseudo-filesystem framework -options SCHED_ULE # ULE scheduler +options SCHED_4BSD # 4BSD scheduler +#options SCHED_ULE # ULE scheduler options SKI # Include SKI support code options SOFTUPDATES # Enable FFS soft updates support options SYSVMSG # SYSV-style message queues ==== //depot/projects/nsched/sys/kern/kern_conf.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.156 2004/08/30 01:10:20 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.157 2004/09/13 07:29:44 phk Exp $"); #include #include @@ -293,7 +293,6 @@ si->__si_namebuf[0] = '\0'; si->si_name = si->__si_namebuf; LIST_INIT(&si->si_children); - TAILQ_INIT(&si->si_snapshots); return (si); } ==== //depot/projects/nsched/sys/kern/kern_fork.c#14 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.238 2004/09/05 02:09:53 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.239 2004/09/13 22:10:04 julian Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" ==== //depot/projects/nsched/sys/kern/vfs_bio.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.444 2004/07/25 21:24:21 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.445 2004/09/13 06:50:41 phk Exp $"); #include #include @@ -1234,8 +1234,7 @@ bp->b_ioflags &= ~BIO_ERROR; bdirty(bp); } else if ((bp->b_flags & (B_NOCACHE | B_INVAL)) || - (bp->b_ioflags & BIO_ERROR) || - bp->b_iocmd == BIO_DELETE || (bp->b_bufsize <= 0)) { + (bp->b_ioflags & BIO_ERROR) || (bp->b_bufsize <= 0)) { /* * Either a failed I/O or we were asked to free or not * cache the buffer. @@ -3130,12 +3129,6 @@ bp->b_flags |= B_DONE; runningbufwakeup(bp); - if (bp->b_iocmd == BIO_DELETE) { - brelse(bp); - splx(s); - return; - } - if (bp->b_iocmd == BIO_WRITE) { vwakeup(bp); } ==== //depot/projects/nsched/sys/kern/vnode_if.src#3 (text+ko) ==== @@ -27,7 +27,7 @@ # SUCH DAMAGE. # # @(#)vnode_if.src 8.12 (Berkeley) 5/14/95 -# $FreeBSD: src/sys/kern/vnode_if.src,v 1.67 2004/04/05 21:03:37 imp Exp $ +# $FreeBSD: src/sys/kern/vnode_if.src,v 1.68 2004/09/13 06:50:42 phk Exp $ # # @@ -478,20 +478,6 @@ }; # -#% freeblks vp - - - -# -# This call is used by the filesystem to release blocks back to >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 13 23:17:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5A6816A4D0; Mon, 13 Sep 2004 23:17:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C1BBC16A4CE for ; Mon, 13 Sep 2004 23:17:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0FC843D54 for ; Mon, 13 Sep 2004 23:17:11 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8DNHBKX092759 for ; Mon, 13 Sep 2004 23:17:11 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8DNHBFt092756 for perforce@freebsd.org; Mon, 13 Sep 2004 23:17:11 GMT (envelope-from julian@freebsd.org) Date: Mon, 13 Sep 2004 23:17:11 GMT Message-Id: <200409132317.i8DNHBFt092756@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61464 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Sep 2004 23:17:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=61464 Change 61464 by julian@julian_ref on 2004/09/13 23:16:18 loop back changes Affected files ... .. //depot/projects/nsched/sys/kern/kern_switch.c#25 integrate .. //depot/projects/nsched/sys/kern/sched_4bsd.c#52 integrate .. //depot/projects/nsched/sys/sys/sched.h#20 integrate Differences ... ==== //depot/projects/nsched/sys/kern/kern_switch.c#25 (text+ko) ==== @@ -86,7 +86,7 @@ ***/ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.89 2004/09/10 21:04:38 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.91 2004/09/13 23:06:39 julian Exp $"); #include "opt_sched.h" ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#52 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.63 2004/09/11 10:07:22 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.64 2004/09/13 23:02:52 julian Exp $"); #define kse td_sched ==== //depot/projects/nsched/sys/sys/sched.h#20 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/sched.h,v 1.20 2004/09/11 10:07:22 scottl Exp $ + * $FreeBSD: src/sys/sys/sched.h,v 1.21 2004/09/13 23:01:50 julian Exp $ */ #ifndef _SYS_SCHED_H_ From owner-p4-projects@FreeBSD.ORG Tue Sep 14 06:34:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56F1416A4D1; Tue, 14 Sep 2004 06:34:04 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C7B616A4CF for ; Tue, 14 Sep 2004 06:34:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0692343D49 for ; Tue, 14 Sep 2004 06:34:04 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8E6Y3CN005700 for ; Tue, 14 Sep 2004 06:34:03 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8E6Y1U7005694 for perforce@freebsd.org; Tue, 14 Sep 2004 06:34:01 GMT (envelope-from marcel@freebsd.org) Date: Tue, 14 Sep 2004 06:34:01 GMT Message-Id: <200409140634.i8E6Y1U7005694@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 61477 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2004 06:34:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=61477 Change 61477 by marcel@marcel_nfs on 2004/09/14 06:33:40 IFC @61476 Affected files ... .. //depot/projects/ia64/MAINTAINERS#42 integrate .. //depot/projects/ia64/Makefile.inc1#93 integrate .. //depot/projects/ia64/UPDATING#66 integrate .. //depot/projects/ia64/contrib/cpio/tar.c#2 integrate .. //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#16 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ia64-tdep.c#8 integrate .. //depot/projects/ia64/contrib/gnu-sort/lib/version-etc.c#3 integrate .. //depot/projects/ia64/contrib/pf/man/pf.conf.5#3 integrate .. //depot/projects/ia64/contrib/pf/pfctl/pfctl_table.c#4 integrate .. //depot/projects/ia64/contrib/pf/pflogd/pflogd.c#4 integrate .. //depot/projects/ia64/contrib/smbfs/mount_smbfs/mount_smbfs.c#7 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#51 integrate .. //depot/projects/ia64/etc/devd.conf#13 integrate .. //depot/projects/ia64/etc/mtree/BSD.include.dist#26 integrate .. //depot/projects/ia64/etc/mtree/BSD.usr.dist#34 integrate .. //depot/projects/ia64/etc/network.subr#10 integrate .. //depot/projects/ia64/etc/pf.conf#2 integrate .. //depot/projects/ia64/etc/pf.os#3 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#28 integrate .. //depot/projects/ia64/etc/rc.d/ipmon#10 integrate .. //depot/projects/ia64/etc/rc.d/ntpd#8 integrate .. //depot/projects/ia64/etc/rc.d/ntpdate#8 delete .. //depot/projects/ia64/etc/rc.d/pflog#2 integrate .. //depot/projects/ia64/etc/rc.d/routed#9 integrate .. //depot/projects/ia64/etc/rc.d/rpcbind#8 integrate .. //depot/projects/ia64/etc/rc.d/tmp#2 integrate .. //depot/projects/ia64/etc/rc.d/var#2 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#40 integrate .. //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#14 integrate .. //depot/projects/ia64/gnu/lib/csu/Makefile#19 integrate .. //depot/projects/ia64/gnu/lib/libstdc++/Makefile#24 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/main.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/libgdb/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 integrate .. //depot/projects/ia64/include/Makefile#39 integrate .. //depot/projects/ia64/include/_ctype.h#2 integrate .. //depot/projects/ia64/include/ftw.h#2 integrate .. //depot/projects/ia64/include/resolv.h#7 integrate .. //depot/projects/ia64/include/tgmath.h#2 integrate .. //depot/projects/ia64/lib/Makefile#46 integrate .. //depot/projects/ia64/lib/csu/alpha/crt1.c#8 integrate .. //depot/projects/ia64/lib/libarchive/Makefile#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_extract.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_tar.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_string_sprintf.c#5 integrate .. //depot/projects/ia64/lib/libautofs/Makefile#1 branch .. //depot/projects/ia64/lib/libautofs/libautofs.3#1 branch .. //depot/projects/ia64/lib/libautofs/libautofs.c#1 branch .. //depot/projects/ia64/lib/libautofs/libautofs.h#1 branch .. //depot/projects/ia64/lib/libc/db/btree/bt_debug.c#3 integrate .. //depot/projects/ia64/lib/libc/db/btree/bt_split.c#5 integrate .. //depot/projects/ia64/lib/libc/db/hash/hash.c#3 integrate .. //depot/projects/ia64/lib/libc/db/man/mpool.3#5 integrate .. //depot/projects/ia64/lib/libc/db/mpool/mpool.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/Makefile.inc#28 integrate .. //depot/projects/ia64/lib/libc/gen/fts.3#9 integrate .. //depot/projects/ia64/lib/libc/gen/ftw.c#2 integrate .. //depot/projects/ia64/lib/libc/gen/glob.3#8 integrate .. //depot/projects/ia64/lib/libc/gen/nftw.c#1 branch .. //depot/projects/ia64/lib/libc/gen/tls.c#2 integrate .. //depot/projects/ia64/lib/libc/gmon/gmon.c#8 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#15 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/_mcount.S#1 branch .. //depot/projects/ia64/lib/libc/ia64/string/memcpy.S#3 integrate .. //depot/projects/ia64/lib/libc/ia64/string/memmove.S#3 integrate .. //depot/projects/ia64/lib/libc/locale/frune.c#6 integrate .. //depot/projects/ia64/lib/libc/locale/isalnum.3#4 integrate .. //depot/projects/ia64/lib/libc/locale/isalpha.3#4 integrate .. //depot/projects/ia64/lib/libc/locale/isblank.3#8 integrate .. //depot/projects/ia64/lib/libc/locale/iscntrl.3#5 integrate .. //depot/projects/ia64/lib/libc/locale/isdigit.3#7 integrate .. //depot/projects/ia64/lib/libc/locale/isgraph.3#6 integrate .. //depot/projects/ia64/lib/libc/locale/islower.3#4 integrate .. //depot/projects/ia64/lib/libc/locale/isprint.3#6 integrate .. //depot/projects/ia64/lib/libc/locale/ispunct.3#5 integrate .. //depot/projects/ia64/lib/libc/locale/isspace.3#5 integrate .. //depot/projects/ia64/lib/libc/locale/isupper.3#4 integrate .. //depot/projects/ia64/lib/libc/locale/isxdigit.3#7 integrate .. //depot/projects/ia64/lib/libc/locale/mbrune.3#8 integrate .. //depot/projects/ia64/lib/libc/locale/mbrune.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/rune.3#11 integrate .. //depot/projects/ia64/lib/libc/locale/setinvalidrune.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/setrunelocale.c#14 integrate .. //depot/projects/ia64/lib/libc/locale/tolower.3#5 integrate .. //depot/projects/ia64/lib/libc/locale/toupper.3#5 integrate .. //depot/projects/ia64/lib/libc/locale/utf2.5#3 integrate .. //depot/projects/ia64/lib/libc/net/res_init.c#7 integrate .. //depot/projects/ia64/lib/libc/regex/regcomp.c#8 integrate .. //depot/projects/ia64/lib/libc/stdio/setbuf.3#6 integrate .. //depot/projects/ia64/lib/libc/stdio/vfprintf.c#23 integrate .. //depot/projects/ia64/lib/libc/stdio/vfwprintf.c#14 integrate .. //depot/projects/ia64/lib/libc/stdtime/localtime.c#14 integrate .. //depot/projects/ia64/lib/libc/sys/msync.2#8 integrate .. //depot/projects/ia64/lib/libdisk/open_disk.c#5 integrate .. //depot/projects/ia64/lib/libkvm/kvm_proc.c#24 integrate .. //depot/projects/ia64/lib/libpthread/arch/amd64/include/pthread_md.h#7 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/include/pthread_md.h#8 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_init.c#20 integrate .. //depot/projects/ia64/lib/libstand/ufs.c#9 integrate .. //depot/projects/ia64/lib/libthr/arch/amd64/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libthr/arch/amd64/amd64/_setcurthread.c#1 branch .. //depot/projects/ia64/lib/libthr/arch/i386/i386/_setcurthread.c#12 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_create.c#14 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_private.h#16 integrate .. //depot/projects/ia64/lib/libutil/fparseln.3#2 integrate .. //depot/projects/ia64/lib/libz/infback.c#2 integrate .. //depot/projects/ia64/lib/libz/inflate.c#4 integrate .. //depot/projects/ia64/libexec/lukemftpd/config.h#3 integrate .. //depot/projects/ia64/libexec/rbootd/rbootd.c#3 integrate .. //depot/projects/ia64/release/Makefile#80 integrate .. //depot/projects/ia64/release/Makefile.inc.docports#15 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/errata/article.sgml#11 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/readme/article.sgml#11 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#37 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#30 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#81 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml#5 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/sparc64/dev-sparc64.sgml#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#8 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#5 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/install.sgml#14 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#5 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#12 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml#7 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml#9 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/readme/article.sgml#16 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#142 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/errata/article.sgml#5 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/errata/article.sgml#19 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/Makefile#3 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/errata/Makefile#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/errata/article.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml#2 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#3 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml#2 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml#2 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml#2 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#2 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml#2 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#2 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml#2 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/readme/article.sgml#2 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#3 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile#2 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl#3 integrate .. //depot/projects/ia64/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/ia64/release/doc/share/misc/man2hwnotes.pl#2 integrate .. //depot/projects/ia64/release/doc/share/sgml/release.dsl#6 integrate .. //depot/projects/ia64/release/doc/share/sgml/release.ent#16 integrate .. //depot/projects/ia64/release/fixit.profile#2 integrate .. //depot/projects/ia64/release/ia64/mkisoimages.sh#6 integrate .. //depot/projects/ia64/release/scripts/compat1x-install.sh#2 delete .. //depot/projects/ia64/release/scripts/compat20-install.sh#2 delete .. //depot/projects/ia64/release/scripts/compat21-install.sh#2 delete .. //depot/projects/ia64/release/scripts/compat22-install.sh#2 delete .. //depot/projects/ia64/release/scripts/compat3x-install.sh#2 delete .. //depot/projects/ia64/release/scripts/compat4x-install.sh#2 delete .. //depot/projects/ia64/release/scripts/doFS.sh#22 integrate .. //depot/projects/ia64/release/scripts/split-file.sh#2 integrate .. //depot/projects/ia64/release/sparc64/mkisoimages.sh#6 integrate .. //depot/projects/ia64/sbin/Makefile#39 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.8#8 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#16 integrate .. //depot/projects/ia64/sbin/fsck_ffs/Makefile#8 integrate .. //depot/projects/ia64/sbin/fsck_ffs/dir.c#11 integrate .. //depot/projects/ia64/sbin/fsck_ffs/fsck.h#12 integrate .. //depot/projects/ia64/sbin/fsck_ffs/inode.c#10 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass1.c#12 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass2.c#11 integrate .. //depot/projects/ia64/sbin/gbde/gbde.c#14 integrate .. //depot/projects/ia64/sbin/geom/class/raid3/geom_raid3.c#2 integrate .. //depot/projects/ia64/sbin/geom/class/raid3/graid3.8#2 integrate .. //depot/projects/ia64/sbin/geom/class/stripe/geom_stripe.c#3 integrate .. //depot/projects/ia64/sbin/geom/core/geom.8#3 integrate .. //depot/projects/ia64/sbin/geom/core/geom.c#3 integrate .. //depot/projects/ia64/sbin/ggate/ggatec/ggatec.c#3 integrate .. //depot/projects/ia64/sbin/ggate/ggated/ggated.c#3 integrate .. //depot/projects/ia64/sbin/ggate/ggatel/ggatel.c#3 integrate .. //depot/projects/ia64/sbin/ggate/shared/ggate.c#4 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.c#22 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#35 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#35 integrate .. //depot/projects/ia64/sbin/mdconfig/mdconfig.c#15 integrate .. //depot/projects/ia64/sbin/mount_autofs/Makefile#1 branch .. //depot/projects/ia64/sbin/mount_autofs/mount_autofs.8#1 branch .. //depot/projects/ia64/sbin/mount_autofs/mount_autofs.c#1 branch .. //depot/projects/ia64/sbin/mount_msdosfs/mount_msdosfs.c#10 integrate .. //depot/projects/ia64/sbin/sysctl/sysctl.c#17 integrate .. //depot/projects/ia64/share/colldef/Makefile#22 integrate .. //depot/projects/ia64/share/examples/Makefile#10 integrate .. //depot/projects/ia64/share/examples/autofs/driver/Makefile#1 branch .. //depot/projects/ia64/share/examples/autofs/driver/autodriver.c#1 branch .. //depot/projects/ia64/share/examples/autofs/driver/autotab#1 branch .. //depot/projects/ia64/share/examples/etc/make.conf#39 integrate .. //depot/projects/ia64/share/examples/kld/cdev/module/cdevmod.c#4 integrate .. //depot/projects/ia64/share/examples/kld/dyn_sysctl/dyn_sysctl.c#2 integrate .. //depot/projects/ia64/share/examples/kld/syscall/module/syscall.c#3 integrate .. //depot/projects/ia64/share/examples/pf/Makefile#1 branch .. //depot/projects/ia64/share/examples/pf/ackpri#1 branch .. //depot/projects/ia64/share/examples/pf/faq-example1#1 branch .. //depot/projects/ia64/share/examples/pf/faq-example2#1 branch .. //depot/projects/ia64/share/examples/pf/faq-example3#1 branch .. //depot/projects/ia64/share/examples/pf/queue1#1 branch .. //depot/projects/ia64/share/examples/pf/queue2#1 branch .. //depot/projects/ia64/share/examples/pf/queue3#1 branch .. //depot/projects/ia64/share/examples/pf/queue4#1 branch .. //depot/projects/ia64/share/examples/pf/spamd#1 branch .. //depot/projects/ia64/share/man/man4/Makefile#72 integrate .. //depot/projects/ia64/share/man/man4/aha.4#7 integrate .. //depot/projects/ia64/share/man/man4/ath.4#17 integrate .. //depot/projects/ia64/share/man/man4/ath_hal.4#9 integrate .. //depot/projects/ia64/share/man/man4/axe.4#5 integrate .. //depot/projects/ia64/share/man/man4/bge.4#10 integrate .. //depot/projects/ia64/share/man/man4/cnw.4#1 branch .. //depot/projects/ia64/share/man/man4/csa.4#3 delete .. //depot/projects/ia64/share/man/man4/cue.4#6 integrate .. //depot/projects/ia64/share/man/man4/dc.4#9 integrate .. //depot/projects/ia64/share/man/man4/em.4#10 integrate .. //depot/projects/ia64/share/man/man4/esp.4#2 integrate .. //depot/projects/ia64/share/man/man4/fwohci.4#8 integrate .. //depot/projects/ia64/share/man/man4/gusc.4#3 delete .. //depot/projects/ia64/share/man/man4/gx.4#7 integrate .. //depot/projects/ia64/share/man/man4/hfa.4#2 integrate .. //depot/projects/ia64/share/man/man4/hifn.4#5 integrate .. //depot/projects/ia64/share/man/man4/ipfirewall.4#5 integrate .. //depot/projects/ia64/share/man/man4/ixgb.4#3 integrate .. //depot/projects/ia64/share/man/man4/kue.4#6 integrate .. //depot/projects/ia64/share/man/man4/lge.4#4 integrate .. //depot/projects/ia64/share/man/man4/mac_bsdextended.4#11 integrate .. //depot/projects/ia64/share/man/man4/maestro3.4#3 delete .. //depot/projects/ia64/share/man/man4/man4.i386/ctau.4#3 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/el.4#3 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/ep.4#7 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/ex.4#4 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/fe.4#5 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/ichwd.4#2 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/ie.4#2 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/lnc.4#3 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/snc.4#2 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/vx.4#4 integrate .. //depot/projects/ia64/share/man/man4/miibus.4#6 integrate .. //depot/projects/ia64/share/man/man4/ncr.4#3 integrate .. //depot/projects/ia64/share/man/man4/ng_hci.4#9 integrate .. //depot/projects/ia64/share/man/man4/ng_ubt.4#7 integrate .. //depot/projects/ia64/share/man/man4/ng_vlan.4#2 integrate .. //depot/projects/ia64/share/man/man4/nge.4#6 integrate .. //depot/projects/ia64/share/man/man4/ohci.4#4 integrate .. //depot/projects/ia64/share/man/man4/pcm.4#9 integrate .. //depot/projects/ia64/share/man/man4/pcn.4#5 integrate .. //depot/projects/ia64/share/man/man4/polling.4#10 integrate .. //depot/projects/ia64/share/man/man4/rc.4#2 integrate .. //depot/projects/ia64/share/man/man4/re.4#6 integrate .. //depot/projects/ia64/share/man/man4/rue.4#7 integrate .. //depot/projects/ia64/share/man/man4/safe.4#4 integrate .. //depot/projects/ia64/share/man/man4/sbc.4#4 delete .. //depot/projects/ia64/share/man/man4/sf.4#3 integrate .. //depot/projects/ia64/share/man/man4/sis.4#5 integrate .. //depot/projects/ia64/share/man/man4/sk.4#6 integrate .. //depot/projects/ia64/share/man/man4/sn.4#2 integrate .. //depot/projects/ia64/share/man/man4/snd_ad1816.4#1 branch .. //depot/projects/ia64/share/man/man4/snd_als4000.4#1 branch .. //depot/projects/ia64/share/man/man4/snd_cmi.4#1 branch .. //depot/projects/ia64/share/man/man4/snd_cs4281.4#1 branch .. //depot/projects/ia64/share/man/man4/snd_csa.4#1 branch .. //depot/projects/ia64/share/man/man4/snd_ds1.4#1 branch .. //depot/projects/ia64/share/man/man4/snd_emu10k1.4#1 branch .. //depot/projects/ia64/share/man/man4/snd_es137x.4#1 branch .. //depot/projects/ia64/share/man/man4/snd_gusc.4#1 branch .. //depot/projects/ia64/share/man/man4/snd_maestro3.4#1 branch .. //depot/projects/ia64/share/man/man4/snd_sbc.4#1 branch .. //depot/projects/ia64/share/man/man4/snd_solo.4#1 branch .. //depot/projects/ia64/share/man/man4/snd_uaudio.4#1 branch .. //depot/projects/ia64/share/man/man4/ste.4#5 integrate .. //depot/projects/ia64/share/man/man4/sym.4#5 integrate .. //depot/projects/ia64/share/man/man4/ti.4#9 integrate .. //depot/projects/ia64/share/man/man4/tl.4#6 integrate .. //depot/projects/ia64/share/man/man4/tx.4#3 integrate .. //depot/projects/ia64/share/man/man4/uaudio.4#3 delete .. //depot/projects/ia64/share/man/man4/ubsa.4#3 integrate .. //depot/projects/ia64/share/man/man4/ubsec.4#4 integrate .. //depot/projects/ia64/share/man/man4/ubser.4#3 integrate .. //depot/projects/ia64/share/man/man4/ucom.4#5 integrate .. //depot/projects/ia64/share/man/man4/ucycom.4#1 branch .. //depot/projects/ia64/share/man/man4/uftdi.4#3 integrate .. //depot/projects/ia64/share/man/man4/uhci.4#3 integrate .. //depot/projects/ia64/share/man/man4/umodem.4#4 integrate .. //depot/projects/ia64/share/man/man4/uplcom.4#7 integrate .. //depot/projects/ia64/share/man/man4/uscanner.4#9 integrate .. //depot/projects/ia64/share/man/man4/uvisor.4#4 integrate .. //depot/projects/ia64/share/man/man4/uvscom.4#4 integrate .. //depot/projects/ia64/share/man/man4/vge.4#1 branch .. //depot/projects/ia64/share/man/man4/vr.4#6 integrate .. //depot/projects/ia64/share/man/man4/wb.4#3 integrate .. //depot/projects/ia64/share/man/man4/witness.4#3 integrate .. //depot/projects/ia64/share/man/man5/autofs.5#1 branch .. //depot/projects/ia64/share/man/man5/procfs.5#9 integrate .. //depot/projects/ia64/share/man/man5/resolver.5#4 integrate .. //depot/projects/ia64/share/man/man7/release.7#32 integrate .. //depot/projects/ia64/share/man/man9/altq.9#2 integrate .. //depot/projects/ia64/share/man/man9/bus_dma.9#10 integrate .. //depot/projects/ia64/share/man/man9/mbuf.9#18 integrate .. //depot/projects/ia64/share/man/man9/pfil.9#7 integrate .. //depot/projects/ia64/share/man/man9/suser.9#7 integrate .. //depot/projects/ia64/share/misc/bsd-family-tree#19 integrate .. //depot/projects/ia64/share/misc/pci_vendors#21 integrate .. //depot/projects/ia64/share/mk/bsd.subdir.mk#9 integrate .. //depot/projects/ia64/share/mklocale/Makefile#19 integrate .. //depot/projects/ia64/share/monetdef/Makefile#18 integrate .. //depot/projects/ia64/share/msgdef/Makefile#18 integrate .. //depot/projects/ia64/share/msgdef/eu_ES.ISO8859-1.src#1 branch .. //depot/projects/ia64/share/msgdef/ru_RU.UTF-8.src#2 integrate .. //depot/projects/ia64/share/numericdef/Makefile#18 integrate .. //depot/projects/ia64/share/numericdef/eu_ES.ISO8859-1.src#1 branch .. //depot/projects/ia64/share/timedef/Makefile#18 integrate .. //depot/projects/ia64/share/timedef/eu_ES.ISO8859-1.src#1 branch .. //depot/projects/ia64/share/timedef/sl_SI.ISO8859-2.src#2 integrate .. //depot/projects/ia64/share/timedef/sl_SI.UTF-8.src#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#22 integrate .. //depot/projects/ia64/sys/alpha/alpha/clock.c#12 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#44 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#48 integrate .. //depot/projects/ia64/sys/alpha/alpha/trap.c#32 integrate .. //depot/projects/ia64/sys/alpha/conf/GENERIC#31 integrate .. //depot/projects/ia64/sys/alpha/conf/NOTES#8 integrate .. //depot/projects/ia64/sys/alpha/include/atomic.h#9 integrate .. //depot/projects/ia64/sys/alpha/include/cpu.h#8 integrate .. //depot/projects/ia64/sys/alpha/include/param.h#9 integrate .. //depot/projects/ia64/sys/alpha/include/profile.h#4 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_machdep.c#13 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_proto.h#11 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_syscall.h#10 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_sysent.c#10 integrate .. //depot/projects/ia64/sys/alpha/linux/syscalls.master#10 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#21 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_proto.h#7 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_syscall.h#6 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_sysent.c#6 integrate .. //depot/projects/ia64/sys/alpha/osf1/syscalls.master#6 integrate .. //depot/projects/ia64/sys/alpha/pci/pcibus.c#6 integrate .. //depot/projects/ia64/sys/amd64/amd64/busdma_machdep.c#11 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#24 integrate .. //depot/projects/ia64/sys/amd64/amd64/mp_machdep.c#9 integrate .. //depot/projects/ia64/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/nexus.c#11 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#38 integrate .. //depot/projects/ia64/sys/amd64/amd64/trap.c#17 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#19 integrate .. //depot/projects/ia64/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/ia64/sys/amd64/ia32/ia32_syscall.c#7 integrate .. //depot/projects/ia64/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/ia64/sys/amd64/include/param.h#10 integrate .. //depot/projects/ia64/sys/amd64/include/pmap.h#13 integrate .. //depot/projects/ia64/sys/amd64/include/profile.h#7 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/ia64/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/ia64/sys/arm/include/profile.h#3 integrate .. //depot/projects/ia64/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/ia64/sys/boot/alpha/Makefile.inc#3 integrate .. //depot/projects/ia64/sys/boot/alpha/common/Makefile.common#4 integrate .. //depot/projects/ia64/sys/boot/alpha/common/ldscript#1 branch .. //depot/projects/ia64/sys/boot/common/Makefile.inc#7 integrate .. //depot/projects/ia64/sys/boot/common/bootstrap.h#7 integrate .. //depot/projects/ia64/sys/boot/common/load.c#3 integrate .. //depot/projects/ia64/sys/boot/common/load_elf.c#15 integrate .. //depot/projects/ia64/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/ia64/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/ia64/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/ia64/sys/boot/common/misc.c#3 integrate .. //depot/projects/ia64/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/ia64/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/ia64/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/ia64/sys/boot/ficl/Makefile#10 integrate .. //depot/projects/ia64/sys/boot/i386/boot0/Makefile#8 integrate .. //depot/projects/ia64/sys/boot/i386/boot2/Makefile#16 integrate .. //depot/projects/ia64/sys/boot/i386/boot2/boot1.S#5 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/elf32_freebsd.c#3 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/elf64_freebsd.c#4 integrate .. //depot/projects/ia64/sys/boot/i386/loader/conf.c#8 integrate .. //depot/projects/ia64/sys/boot/i386/mbr/Makefile#5 integrate .. //depot/projects/ia64/sys/boot/i386/mbr/mbr.s#2 integrate .. //depot/projects/ia64/sys/boot/sparc64/loader/main.c#17 integrate .. //depot/projects/ia64/sys/cam/cam_periph.c#17 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#25 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#59 integrate .. //depot/projects/ia64/sys/coda/cnode.h#8 integrate .. //depot/projects/ia64/sys/coda/coda_fbsd.c#11 integrate .. //depot/projects/ia64/sys/coda/coda_psdev.c#11 integrate .. //depot/projects/ia64/sys/coda/coda_vfsops.c#13 integrate .. //depot/projects/ia64/sys/compat/linux/linux_socket.c#15 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_fcntl.c#11 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_proto.h#5 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_stream.c#17 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_syscall.h#4 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_syscallnames.c#4 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_sysent.c#4 integrate .. //depot/projects/ia64/sys/compat/svr4/syscalls.master#4 integrate .. //depot/projects/ia64/sys/conf/Makefile.alpha#13 integrate .. //depot/projects/ia64/sys/conf/Makefile.amd64#8 integrate .. //depot/projects/ia64/sys/conf/Makefile.arm#2 integrate .. //depot/projects/ia64/sys/conf/Makefile.i386#11 integrate .. //depot/projects/ia64/sys/conf/Makefile.ia64#20 integrate .. //depot/projects/ia64/sys/conf/Makefile.pc98#11 integrate .. //depot/projects/ia64/sys/conf/Makefile.powerpc#17 integrate .. //depot/projects/ia64/sys/conf/Makefile.sparc64#18 integrate .. //depot/projects/ia64/sys/conf/NOTES#79 integrate .. //depot/projects/ia64/sys/conf/files#116 integrate .. //depot/projects/ia64/sys/conf/files.amd64#20 integrate .. //depot/projects/ia64/sys/conf/files.pc98#47 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#35 integrate .. //depot/projects/ia64/sys/conf/ldscript.alpha#4 integrate .. //depot/projects/ia64/sys/conf/ldscript.ia64#11 integrate .. //depot/projects/ia64/sys/conf/majors#36 integrate .. //depot/projects/ia64/sys/conf/options#76 integrate .. //depot/projects/ia64/sys/conf/options.amd64#9 integrate .. //depot/projects/ia64/sys/conf/options.i386#29 integrate .. //depot/projects/ia64/sys/conf/options.pc98#28 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_fil.c#14 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_fil.h#7 integrate .. //depot/projects/ia64/sys/contrib/pf/net/if_pflog.c#6 integrate .. //depot/projects/ia64/sys/contrib/pf/net/if_pfsync.c#6 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf.c#6 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf_ioctl.c#6 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#26 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#40 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdDebug.c#7 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#53 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_lid.c#14 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci_link.c#15 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_powerres.c#12 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#17 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_thermal.c#20 integrate .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#29 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_isa.c#2 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_pci.c#19 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_pci.c#14 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#53 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.h#23 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#36 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.c#34 integrate .. //depot/projects/ia64/sys/dev/ata/ata-dma.c#36 integrate .. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#22 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#41 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.h#24 integrate .. //depot/projects/ia64/sys/dev/ata/ata-queue.c#14 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#41 integrate .. //depot/projects/ia64/sys/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/ia64/sys/dev/bfe/if_bfereg.h#4 integrate .. //depot/projects/ia64/sys/dev/bktr/msp34xx.c#3 integrate .. //depot/projects/ia64/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/ia64/sys/dev/cx/if_cx.c#6 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_drv.c#8 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed.c#20 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#37 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#24 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.c#14 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.h#14 integrate .. //depot/projects/ia64/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/ia64/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/ia64/sys/dev/fdc/fdc_acpi.c#2 integrate .. //depot/projects/ia64/sys/dev/fdc/fdc_isa.c#2 integrate .. //depot/projects/ia64/sys/dev/fdc/fdc_pccard.c#2 integrate .. //depot/projects/ia64/sys/dev/fdc/fdcreg.h#2 delete .. //depot/projects/ia64/sys/dev/fdc/fdcvar.h#2 integrate .. //depot/projects/ia64/sys/dev/firewire/fwcrom.c#12 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#50 integrate .. //depot/projects/ia64/sys/dev/hfa/fore_receive.c#10 integrate .. //depot/projects/ia64/sys/dev/idt/idt_harp.c#5 integrate .. //depot/projects/ia64/sys/dev/iir/iir.c#11 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#22 integrate .. //depot/projects/ia64/sys/dev/isp/isp_pci.c#21 integrate .. //depot/projects/ia64/sys/dev/lnc/if_lnc_pci.c#11 integrate .. //depot/projects/ia64/sys/dev/md/md.c#43 integrate .. //depot/projects/ia64/sys/dev/mii/ciphy.c#1 branch .. //depot/projects/ia64/sys/dev/mii/ciphyreg.h#1 branch .. //depot/projects/ia64/sys/dev/mii/miidevs#12 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.c#7 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_debug.c#6 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_freebsd.c#13 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#44 integrate .. //depot/projects/ia64/sys/dev/ppbus/if_plip.c#13 integrate .. //depot/projects/ia64/sys/dev/re/if_re.c#14 integrate .. //depot/projects/ia64/sys/dev/sound/isa/sb16.c#12 integrate .. //depot/projects/ia64/sys/dev/sound/pci/maestro.c#11 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/sndstat.c#12 integrate .. //depot/projects/ia64/sys/dev/sym/sym_hipd.c#19 integrate .. //depot/projects/ia64/sys/dev/tga/tga_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/uart/uart_bus_isa.c#4 integrate .. //depot/projects/ia64/sys/dev/usb/ucycom.c#1 branch .. //depot/projects/ia64/sys/dev/usb/ugen.c#24 integrate .. //depot/projects/ia64/sys/dev/usb/uhub.c#11 integrate .. //depot/projects/ia64/sys/dev/usb/umass.c#39 integrate .. //depot/projects/ia64/sys/dev/usb/uplcom.c#13 integrate .. //depot/projects/ia64/sys/dev/usb/usb_quirks.c#10 integrate .. //depot/projects/ia64/sys/dev/usb/usb_subr.c#19 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#57 integrate .. //depot/projects/ia64/sys/dev/usb/usbdi.c#17 integrate .. //depot/projects/ia64/sys/dev/usb/uscanner.c#21 integrate .. //depot/projects/ia64/sys/dev/vge/if_vge.c#1 branch .. //depot/projects/ia64/sys/dev/vge/if_vgereg.h#1 branch .. //depot/projects/ia64/sys/dev/vge/if_vgevar.h#1 branch .. //depot/projects/ia64/sys/fs/autofs/autofs.h#1 branch .. //depot/projects/ia64/sys/fs/autofs/autofs_util.c#1 branch .. //depot/projects/ia64/sys/fs/autofs/autofs_vfsops.c#1 branch .. //depot/projects/ia64/sys/fs/autofs/autofs_vnops.c#1 branch .. //depot/projects/ia64/sys/fs/msdosfs/denode.h#6 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_denode.c#16 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_fat.c#8 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_lookup.c#6 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#28 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs.h#2 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_io.c#13 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_vnops.c#9 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vnops.c#24 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs.h#7 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_io.c#16 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vnops.c#24 integrate .. //depot/projects/ia64/sys/fs/specfs/spec_vnops.c#31 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_crypt.c#18 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_lock.c#10 integrate .. //depot/projects/ia64/sys/geom/concat/g_concat.c#6 integrate .. //depot/projects/ia64/sys/geom/geom.h#42 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#37 integrate .. //depot/projects/ia64/sys/geom/geom_kern.c#23 integrate .. //depot/projects/ia64/sys/geom/geom_subr.c#41 integrate .. //depot/projects/ia64/sys/geom/label/g_label.c#2 integrate .. //depot/projects/ia64/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/ia64/sys/geom/notes#4 integrate .. //depot/projects/ia64/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/ia64/sys/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/ia64/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/ia64/sys/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/ia64/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_raid5.c#2 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_state.c#2 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/ext2_vnops.c#21 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_panasonic.c#2 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_wakeup.c#26 integrate .. //depot/projects/ia64/sys/i386/bios/mca_machdep.c#4 integrate .. //depot/projects/ia64/sys/i386/bios/vpd.c#5 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#49 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#57 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#29 integrate .. //depot/projects/ia64/sys/i386/i386/db_trace.c#14 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#55 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#37 integrate .. //depot/projects/ia64/sys/i386/i386/nexus.c#12 integrate .. //depot/projects/ia64/sys/i386/i386/p4tcc.c#3 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#76 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#43 integrate .. //depot/projects/ia64/sys/i386/i386/uio_machdep.c#3 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_fcntl.c#7 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_proto.h#6 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_syscall.h#5 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_sysent.c#7 integrate .. //depot/projects/ia64/sys/i386/ibcs2/syscalls.master#5 integrate .. //depot/projects/ia64/sys/i386/include/in_cksum.h#7 integrate .. //depot/projects/ia64/sys/i386/include/param.h#10 integrate .. //depot/projects/ia64/sys/i386/include/pmap.h#21 integrate .. //depot/projects/ia64/sys/i386/include/profile.h#11 integrate .. //depot/projects/ia64/sys/i386/linux/linux_machdep.c#17 integrate .. //depot/projects/ia64/sys/i386/linux/linux_proto.h#11 integrate .. //depot/projects/ia64/sys/i386/linux/linux_syscall.h#11 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysent.c#12 integrate .. //depot/projects/ia64/sys/i386/linux/syscalls.master#10 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_ing.c#10 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_ipr.c#15 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_isppp.c#12 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_rbch.c#14 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_tel.c#12 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_trace.c#14 integrate .. //depot/projects/ia64/sys/i4b/layer4/i4b_i4bdrv.c#17 integrate .. //depot/projects/ia64/sys/i4b/layer4/i4b_l4.c#7 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC#42 integrate .. //depot/projects/ia64/sys/ia64/conf/NOTES#5 integrate .. //depot/projects/ia64/sys/ia64/conf/SKI#18 integrate .. //depot/projects/ia64/sys/ia64/ia64/busdma_machdep.c#18 integrate .. //depot/projects/ia64/sys/ia64/ia64/exception.S#8 integrate .. //depot/projects/ia64/sys/ia64/ia64/locore.S#4 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#107 integrate .. //depot/projects/ia64/sys/ia64/ia64/nexus.c#9 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#83 integrate .. //depot/projects/ia64/sys/ia64/ia64/support.S#4 integrate .. //depot/projects/ia64/sys/ia64/ia64/syscall.S#8 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#73 integrate .. //depot/projects/ia64/sys/ia64/include/asm.h#10 integrate .. //depot/projects/ia64/sys/ia64/include/cpu.h#26 integrate .. //depot/projects/ia64/sys/ia64/include/profile.h#6 integrate .. //depot/projects/ia64/sys/isa/psm.c#24 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vnops.c#21 integrate .. //depot/projects/ia64/sys/kern/init_main.c#43 integrate .. //depot/projects/ia64/sys/kern/kern_conf.c#29 integrate .. //depot/projects/ia64/sys/kern/kern_event.c#25 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#63 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#53 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#52 integrate .. //depot/projects/ia64/sys/kern/kern_idle.c#16 integrate .. //depot/projects/ia64/sys/kern/kern_intr.c#32 integrate .. //depot/projects/ia64/sys/kern/kern_kse.c#2 integrate .. //depot/projects/ia64/sys/kern/kern_kthread.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_linker.c#33 integrate .. //depot/projects/ia64/sys/kern/kern_lock.c#23 integrate .. //depot/projects/ia64/sys/kern/kern_module.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#35 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#53 integrate .. //depot/projects/ia64/sys/kern/kern_prot.c#36 integrate .. //depot/projects/ia64/sys/kern/kern_shutdown.c#25 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#76 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#32 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#53 integrate .. //depot/projects/ia64/sys/kern/kern_thr.c#15 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#78 integrate .. //depot/projects/ia64/sys/kern/link_elf_obj.c#4 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#23 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#36 integrate .. //depot/projects/ia64/sys/kern/subr_bus.c#32 integrate .. //depot/projects/ia64/sys/kern/subr_disk.c#19 integrate .. //depot/projects/ia64/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/ia64/sys/kern/subr_rman.c#14 integrate .. //depot/projects/ia64/sys/kern/subr_smp.c#24 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#41 integrate .. //depot/projects/ia64/sys/kern/subr_turnstile.c#7 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#46 integrate .. //depot/projects/ia64/sys/kern/sys_generic.c#33 integrate .. //depot/projects/ia64/sys/kern/sysv_shm.c#18 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#41 integrate .. //depot/projects/ia64/sys/kern/uipc_usrreq.c#32 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#41 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#69 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#29 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#65 integrate .. //depot/projects/ia64/sys/kern/vnode_if.src#17 integrate .. //depot/projects/ia64/sys/libkern/mcount.c#5 integrate .. //depot/projects/ia64/sys/modules/Makefile#75 integrate .. //depot/projects/ia64/sys/modules/aac/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/agp/Makefile#7 integrate .. //depot/projects/ia64/sys/modules/autofs/Makefile#1 branch .. //depot/projects/ia64/sys/modules/bridge/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/cam/Makefile#9 integrate .. //depot/projects/ia64/sys/modules/coda/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/coda5/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/cp/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/cs/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/ctau/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/cx/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/fdc/Makefile#6 integrate .. //depot/projects/ia64/sys/modules/geom/geom_uzip/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/if_ppp/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/if_tap/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/ipfw/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/linprocfs/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/msdosfs/Makefile#6 integrate .. //depot/projects/ia64/sys/modules/nfs4client/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/nfsclient/Makefile#7 integrate .. //depot/projects/ia64/sys/modules/owi/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/pf/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/smbfs/Makefile#6 integrate .. //depot/projects/ia64/sys/modules/ucycom/Makefile#1 branch .. //depot/projects/ia64/sys/modules/vge/Makefile#1 branch .. //depot/projects/ia64/sys/net/bpf.c#31 integrate .. //depot/projects/ia64/sys/net/bpfdesc.h#10 integrate .. //depot/projects/ia64/sys/net/bridge.c#30 integrate .. //depot/projects/ia64/sys/net/if.c#34 integrate .. //depot/projects/ia64/sys/net/if.h#17 integrate .. //depot/projects/ia64/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/ia64/sys/net/if_loop.c#26 integrate .. //depot/projects/ia64/sys/net/if_ppp.c#19 integrate .. //depot/projects/ia64/sys/net/if_sl.c#14 integrate .. //depot/projects/ia64/sys/net/if_spppsubr.c#18 integrate .. //depot/projects/ia64/sys/net/netisr.c#7 integrate .. //depot/projects/ia64/sys/net/route.c#21 integrate .. //depot/projects/ia64/sys/net/rtsock.c#26 integrate .. //depot/projects/ia64/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#2 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_btsocket.h#6 integrate .. //depot/projects/ia64/sys/netgraph/netgraph.h#8 integrate .. //depot/projects/ia64/sys/netgraph/ng_eiface.c#12 integrate .. //depot/projects/ia64/sys/netgraph/ng_ksocket.c#15 integrate .. //depot/projects/ia64/sys/netgraph/ng_message.h#7 integrate .. //depot/projects/ia64/sys/netgraph/ng_pptpgre.c#14 integrate .. //depot/projects/ia64/sys/netgraph/ng_socket.c#18 integrate .. //depot/projects/ia64/sys/netgraph/ng_tty.c#9 integrate .. //depot/projects/ia64/sys/netinet/if_ether.c#26 integrate .. //depot/projects/ia64/sys/netinet/ip_divert.c#25 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#31 integrate .. //depot/projects/ia64/sys/netinet/ip_fastfwd.c#7 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#37 integrate .. //depot/projects/ia64/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#43 integrate .. //depot/projects/ia64/sys/netinet/ip_mroute.c#30 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#42 integrate .. //depot/projects/ia64/sys/netinet/ip_var.h#22 integrate .. //depot/projects/ia64/sys/netinet/raw_ip.c#35 integrate .. //depot/projects/ia64/sys/netinet/tcp_output.c#24 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#41 integrate .. //depot/projects/ia64/sys/netinet/udp_usrreq.c#31 integrate .. //depot/projects/ia64/sys/netinet6/ah_input.c#10 integrate .. //depot/projects/ia64/sys/netinet6/esp_input.c#14 integrate .. //depot/projects/ia64/sys/netinet6/in6.c#17 integrate .. //depot/projects/ia64/sys/netinet6/in6_ifattach.c#12 integrate .. //depot/projects/ia64/sys/netinet6/in6_pcb.c#24 integrate .. //depot/projects/ia64/sys/netinet6/in6_prefix.c#5 delete .. //depot/projects/ia64/sys/netinet6/in6_prefix.h#2 delete .. //depot/projects/ia64/sys/netinet6/in6_proto.c#10 integrate .. //depot/projects/ia64/sys/netinet6/ip6_forward.c#12 integrate .. //depot/projects/ia64/sys/netinet6/ip6_input.c#27 integrate .. //depot/projects/ia64/sys/netinet6/ip6_output.c#24 integrate .. //depot/projects/ia64/sys/netinet6/ip6_var.h#12 integrate .. //depot/projects/ia64/sys/netinet6/ipsec.c#17 integrate .. //depot/projects/ia64/sys/netinet6/nd6.c#19 integrate .. //depot/projects/ia64/sys/netinet6/raw_ip6.c#17 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_input.c#8 integrate .. //depot/projects/ia64/sys/netipsec/xform_ipip.c#10 integrate .. //depot/projects/ia64/sys/netipx/ipx.c#7 integrate .. //depot/projects/ia64/sys/netkey/key.c#20 integrate .. //depot/projects/ia64/sys/netkey/keysock.c#21 integrate .. //depot/projects/ia64/sys/nfs4client/nfs4_vnops.c#6 integrate .. //depot/projects/ia64/sys/nfsclient/nfs.h#15 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_bio.c#25 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_nfsiod.c#10 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_socket.c#22 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#33 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_serv.c#29 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#43 integrate .. //depot/projects/ia64/sys/pc98/conf/NOTES#21 integrate .. //depot/projects/ia64/sys/pc98/i386/machdep.c#46 integrate .. //depot/projects/ia64/sys/pc98/pc98/atapi.c#5 integrate .. //depot/projects/ia64/sys/pc98/pc98/fd.c#30 integrate .. //depot/projects/ia64/sys/pc98/pc98/wd.c#15 integrate .. //depot/projects/ia64/sys/pci/agp_ali.c#10 integrate .. //depot/projects/ia64/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/ia64/sys/pci/agp_intel.c#18 integrate .. //depot/projects/ia64/sys/pci/agp_sis.c#11 integrate .. //depot/projects/ia64/sys/pci/agp_via.c#12 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#59 integrate .. //depot/projects/ia64/sys/pci/if_pcn.c#24 integrate .. //depot/projects/ia64/sys/pci/if_rlreg.h#23 integrate .. //depot/projects/ia64/sys/pci/if_sf.c#23 integrate .. //depot/projects/ia64/sys/pci/if_sk.c#27 integrate .. //depot/projects/ia64/sys/pci/if_skreg.h#5 integrate .. //depot/projects/ia64/sys/pci/if_ste.c#28 integrate .. //depot/projects/ia64/sys/pci/if_ti.c#33 integrate .. //depot/projects/ia64/sys/pci/if_tl.c#19 integrate .. //depot/projects/ia64/sys/pci/if_wb.c#23 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#49 integrate .. //depot/projects/ia64/sys/pci/ncr.c#18 integrate .. //depot/projects/ia64/sys/powerpc/conf/GENERIC#25 integrate .. //depot/projects/ia64/sys/powerpc/include/pmap.h#11 integrate .. //depot/projects/ia64/sys/powerpc/include/profile.h#3 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/busdma_machdep.c#18 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#38 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#38 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/trap.c#28 integrate .. //depot/projects/ia64/sys/security/mac_bsdextended/mac_bsdextended.c#14 integrate .. //depot/projects/ia64/sys/sparc64/conf/GENERIC#45 integrate .. //depot/projects/ia64/sys/sparc64/include/profile.h#6 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/bus_machdep.c#27 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#51 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/trap.c#34 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/uio_machdep.c#4 integrate .. //depot/projects/ia64/sys/sys/bio.h#22 integrate .. //depot/projects/ia64/sys/sys/conf.h#31 integrate .. //depot/projects/ia64/sys/sys/fdcio.h#3 integrate .. //depot/projects/ia64/sys/sys/kernel.h#19 integrate .. //depot/projects/ia64/sys/sys/linker.h#12 integrate .. //depot/projects/ia64/sys/sys/param.h#59 integrate .. //depot/projects/ia64/sys/sys/proc.h#84 integrate .. //depot/projects/ia64/sys/sys/rman.h#7 integrate .. //depot/projects/ia64/sys/sys/sched.h#8 integrate .. //depot/projects/ia64/sys/sys/smp.h#8 integrate .. //depot/projects/ia64/sys/sys/systm.h#36 integrate .. //depot/projects/ia64/sys/sys/ucred.h#17 integrate .. //depot/projects/ia64/sys/sys/vnode.h#40 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_alloc.c#28 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#35 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#38 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#45 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#42 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#75 integrate .. //depot/projects/ia64/sys/vm/vm_meter.c#16 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#36 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#76 integrate .. //depot/projects/ia64/sys/vm/vm_page.h#30 integrate .. //depot/projects/ia64/sys/vm/vm_zeroidle.c#13 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#46 integrate .. //depot/projects/ia64/tools/lib32/build32.sh#2 integrate .. //depot/projects/ia64/tools/regression/geom_raid3/test-10.sh#1 branch .. //depot/projects/ia64/tools/regression/geom_raid3/test-11.sh#1 branch .. //depot/projects/ia64/tools/regression/geom_raid3/test-12.sh#1 branch .. //depot/projects/ia64/tools/regression/include/tgmath/Makefile#1 branch .. //depot/projects/ia64/tools/regression/include/tgmath/tgmath.c#1 branch .. //depot/projects/ia64/tools/regression/netinet/tcpstream/Makefile#1 branch .. //depot/projects/ia64/tools/regression/netinet/tcpstream/README#1 branch .. //depot/projects/ia64/tools/regression/netinet/tcpstream/tcpstream.c#1 branch .. //depot/projects/ia64/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#2 integrate .. //depot/projects/ia64/tools/regression/sockets/kqueue/Makefile#1 branch .. //depot/projects/ia64/tools/regression/sockets/kqueue/kqueue.c#1 branch .. //depot/projects/ia64/tools/tools/README#14 integrate .. //depot/projects/ia64/tools/tools/crypto/Makefile#8 integrate .. //depot/projects/ia64/tools/tools/crypto/cryptotest.c#6 branch .. //depot/projects/ia64/tools/tools/genericize/Makefile#1 branch .. //depot/projects/ia64/tools/tools/genericize/genericize.pl#1 branch .. //depot/projects/ia64/tools/tools/nanobsd/i386.diskimage#5 integrate .. //depot/projects/ia64/tools/tools/netrate/Makefile#1 branch .. //depot/projects/ia64/tools/tools/netrate/README#1 branch .. //depot/projects/ia64/tools/tools/netrate/netreceive/Makefile#1 branch .. //depot/projects/ia64/tools/tools/netrate/netreceive/netreceive.c#1 branch .. //depot/projects/ia64/tools/tools/netrate/netsend/Makefile#1 branch .. //depot/projects/ia64/tools/tools/netrate/netsend/netsend.c#1 branch .. //depot/projects/ia64/tools/tools/raidtest/Makefile#1 branch .. //depot/projects/ia64/tools/tools/raidtest/README#1 branch .. //depot/projects/ia64/tools/tools/raidtest/raidtest.c#1 branch .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.1#10 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#25 integrate .. //depot/projects/ia64/tools/tools/tinderbox/www/index.cgi#11 integrate .. //depot/projects/ia64/usr.bin/Makefile#63 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#45 integrate .. //depot/projects/ia64/usr.bin/compress/Makefile#4 integrate .. //depot/projects/ia64/usr.bin/fetch/fetch.c#20 integrate .. //depot/projects/ia64/usr.bin/join/join.1#8 integrate .. //depot/projects/ia64/usr.bin/join/join.c#9 integrate .. //depot/projects/ia64/usr.bin/make/Makefile#12 integrate .. //depot/projects/ia64/usr.bin/mklocale/mklocale.1#11 integrate .. //depot/projects/ia64/usr.bin/mkuzip/Makefile#1 branch .. //depot/projects/ia64/usr.bin/mkuzip/mkuzip.8#1 branch .. //depot/projects/ia64/usr.bin/mkuzip/mkuzip.c#1 branch .. //depot/projects/ia64/usr.bin/sockstat/sockstat.1#4 integrate .. //depot/projects/ia64/usr.bin/sockstat/sockstat.c#6 integrate .. //depot/projects/ia64/usr.bin/tar/bsdtar.1#4 integrate .. //depot/projects/ia64/usr.bin/tar/bsdtar.c#4 integrate .. //depot/projects/ia64/usr.bin/tar/read.c#4 integrate .. //depot/projects/ia64/usr.bin/tar/write.c#4 integrate .. //depot/projects/ia64/usr.bin/truss/syscalls.c#15 integrate .. //depot/projects/ia64/usr.bin/truss/truss.1#5 integrate .. //depot/projects/ia64/usr.bin/whois/whois.c#12 integrate .. //depot/projects/ia64/usr.sbin/Makefile#60 integrate .. //depot/projects/ia64/usr.sbin/adduser/adduser.sh#13 integrate .. //depot/projects/ia64/usr.sbin/config/config.h#6 integrate .. //depot/projects/ia64/usr.sbin/config/config.y#7 integrate .. //depot/projects/ia64/usr.sbin/config/configvers.h#7 integrate .. //depot/projects/ia64/usr.sbin/config/lang.l#7 integrate .. //depot/projects/ia64/usr.sbin/config/mkheaders.c#6 integrate .. //depot/projects/ia64/usr.sbin/config/mkmakefile.c#10 integrate .. //depot/projects/ia64/usr.sbin/cron/crontab/crontab.c#3 integrate .. //depot/projects/ia64/usr.sbin/fdcontrol/fdcontrol.c#5 integrate .. //depot/projects/ia64/usr.sbin/fdformat/fdformat.c#5 integrate .. //depot/projects/ia64/usr.sbin/fdread/fdutil.c#6 integrate .. //depot/projects/ia64/usr.sbin/ifmcstat/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/ifmcstat/ifmcstat.c#4 integrate .. //depot/projects/ia64/usr.sbin/kbdcontrol/kbdmap.5#3 integrate .. //depot/projects/ia64/usr.sbin/kgmon/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/kgmon/kgmon.c#6 integrate .. //depot/projects/ia64/usr.sbin/kgzip/kgzcmp.c#6 integrate .. //depot/projects/ia64/usr.sbin/kldxref/Makefile#6 integrate .. //depot/projects/ia64/usr.sbin/kldxref/ef.c#10 integrate .. //depot/projects/ia64/usr.sbin/kldxref/ef.h#6 integrate .. //depot/projects/ia64/usr.sbin/kldxref/ef_amd64.c#1 branch .. //depot/projects/ia64/usr.sbin/kldxref/ef_i386.c#1 branch .. //depot/projects/ia64/usr.sbin/kldxref/ef_nop.c#2 integrate .. //depot/projects/ia64/usr.sbin/kldxref/ef_obj.c#1 branch .. //depot/projects/ia64/usr.sbin/kldxref/ef_sparc64.c#2 integrate .. //depot/projects/ia64/usr.sbin/kldxref/kldxref.c#9 integrate .. //depot/projects/ia64/usr.sbin/ppp/Makefile#9 integrate .. //depot/projects/ia64/usr.sbin/ppp/acf.c#3 integrate .. //depot/projects/ia64/usr.sbin/ppp/arp.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/arp.h#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/async.c#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/atm.c#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/atm.h#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/auth.c#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/auth.h#3 integrate .. //depot/projects/ia64/usr.sbin/ppp/bundle.c#10 integrate .. //depot/projects/ia64/usr.sbin/ppp/bundle.h#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/cbcp.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/ccp.c#9 integrate .. //depot/projects/ia64/usr.sbin/ppp/chap.c#8 integrate .. //depot/projects/ia64/usr.sbin/ppp/chap_ms.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/chap_ms.h#3 integrate .. //depot/projects/ia64/usr.sbin/ppp/chat.c#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/command.c#18 integrate .. //depot/projects/ia64/usr.sbin/ppp/datalink.c#9 integrate .. //depot/projects/ia64/usr.sbin/ppp/datalink.h#3 integrate .. //depot/projects/ia64/usr.sbin/ppp/deflate.c#5 integrate .. //depot/projects/ia64/usr.sbin/ppp/defs.c#7 integrate .. //depot/projects/ia64/usr.sbin/ppp/defs.h#5 integrate .. //depot/projects/ia64/usr.sbin/ppp/ether.c#8 integrate .. //depot/projects/ia64/usr.sbin/ppp/ether.h#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/exec.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/filter.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/filter.h#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/fsm.c#9 integrate .. //depot/projects/ia64/usr.sbin/ppp/fsm.h#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/hdlc.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/hdlc.h#3 integrate .. //depot/projects/ia64/usr.sbin/ppp/i4b.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/i4b.h#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/id.h#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/iface.c#10 integrate .. //depot/projects/ia64/usr.sbin/ppp/iface.h#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/ip.c#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/ipcp.c#10 integrate .. //depot/projects/ia64/usr.sbin/ppp/iplist.c#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/ipv6cp.c#8 integrate .. //depot/projects/ia64/usr.sbin/ppp/lcp.c#9 integrate .. //depot/projects/ia64/usr.sbin/ppp/link.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/lqr.c#5 integrate .. //depot/projects/ia64/usr.sbin/ppp/main.c#8 integrate .. //depot/projects/ia64/usr.sbin/ppp/main.h#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/mbuf.c#5 integrate .. //depot/projects/ia64/usr.sbin/ppp/mbuf.h#3 integrate .. //depot/projects/ia64/usr.sbin/ppp/mp.c#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/mp.h#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/mppe.c#10 integrate .. //depot/projects/ia64/usr.sbin/ppp/nat_cmd.c#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/ncp.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/ncp.h#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/ncpaddr.c#10 integrate .. //depot/projects/ia64/usr.sbin/ppp/netgraph.c#5 integrate .. //depot/projects/ia64/usr.sbin/ppp/netgraph.h#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/pap.c#5 integrate .. //depot/projects/ia64/usr.sbin/ppp/physical.c#12 integrate .. //depot/projects/ia64/usr.sbin/ppp/physical.h#5 integrate .. //depot/projects/ia64/usr.sbin/ppp/pred.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/prompt.c#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/proto.c#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/radius.c#14 integrate .. //depot/projects/ia64/usr.sbin/ppp/route.c#8 integrate .. //depot/projects/ia64/usr.sbin/ppp/server.c#5 integrate .. //depot/projects/ia64/usr.sbin/ppp/slcompress.c#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/sync.c#3 integrate .. //depot/projects/ia64/usr.sbin/ppp/systems.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/tcp.c#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/tcpmss.c#5 integrate .. //depot/projects/ia64/usr.sbin/ppp/tty.c#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/tty.h#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/udp.c#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/udp.h#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/vjcomp.c#4 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/config.c#23 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/devices.c#16 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/dispatch.c#7 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/dist.c#29 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/dist.h#11 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/install.c#31 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#45 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.8#13 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.h#31 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#42 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.99 2004/08/16 10:43:41 pjd Exp $ +$FreeBSD: src/MAINTAINERS,v 1.100 2004/09/08 02:08:33 grog Exp $ subsystem login notes ----------------------------- @@ -66,7 +66,6 @@ lpd/recvjob.c and lpd/printjob.c. newsyslog(8) gad Heads-up appreciated. I'm going thru the PR's for it. patch gad I have a WIP which will change the src a lot. -vinum grog Recommends pre-commit review. cvs peter Heads-up appreciated, try not to break it. ncurses peter Heads-up appreciated, try not to break it. nvi peter Try not to break it. ==== //depot/projects/ia64/Makefile.inc1#93 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.440 2004/08/18 13:21:40 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.445 2004/09/07 15:27:10 imp Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -83,6 +83,7 @@ .endif CVS?= cvs +CVSFLAGS?= -A -P -d SUP?= /usr/local/bin/cvsup SUPFLAGS?= -g -L 2 -P - .if defined(SUPHOST) @@ -173,13 +174,13 @@ GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 14 08:15:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7277416A4D0; Tue, 14 Sep 2004 08:15:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 454F116A4CE for ; Tue, 14 Sep 2004 08:15:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F4EA43D49 for ; Tue, 14 Sep 2004 08:15:07 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8E8F70X008503 for ; Tue, 14 Sep 2004 08:15:07 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8E8F6Uu008500 for perforce@freebsd.org; Tue, 14 Sep 2004 08:15:06 GMT (envelope-from julian@freebsd.org) Date: Tue, 14 Sep 2004 08:15:06 GMT Message-Id: <200409140815.i8E8F6Uu008500@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61481 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2004 08:15:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=61481 Change 61481 by julian@julian_ref on 2004/09/14 08:14:20 try be more rigorous about counting threads in run queue etc. Affected files ... .. //depot/projects/nsched/sys/kern/kern_switch.c#26 edit .. //depot/projects/nsched/sys/kern/sched_4bsd.c#53 edit .. //depot/projects/nsched/sys/kern/sched_ule.c#33 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_switch.c#26 (text+ko) ==== @@ -389,7 +389,6 @@ } kg->kg_avail_opennings = 1; } - kg->kg_avail_opennings--; sched_add(td, flags); return; } @@ -450,7 +449,6 @@ td2 = TAILQ_NEXT(tda, td_runq); kg->kg_last_assigned = td2; } - kg->kg_avail_opennings--; sched_add(td2, flags); } else { CTR3(KTR_RUNQ, "setrunqueue: held: td%p kg%p pid%d", ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#53 (text+ko) ==== @@ -1024,6 +1024,7 @@ } if ((td->td_proc->p_flag & P_NOLOAD) == 0) sched_tdcnt++; + td->td_ksegrp->kg_avail_opennings--; runq_add(ke->ke_runq, ke); ke->ke_ksegrp->kg_runq_kses++; ke->ke_state = KES_ONRUNQ; ==== //depot/projects/nsched/sys/kern/sched_ule.c#33 (text+ko) ==== @@ -1773,6 +1773,7 @@ curthread->td_flags |= TDF_NEEDRESCHED; if (preemptive && maybe_preempt(td)) return; + td->td_ksegrp->kg_avail_opennings--; ke->ke_ksegrp->kg_runq_threads++; ke->ke_state = KES_ONRUNQ; From owner-p4-projects@FreeBSD.ORG Tue Sep 14 22:46:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9696616A4D0; Tue, 14 Sep 2004 22:46:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 712C816A4CE for ; Tue, 14 Sep 2004 22:46:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 562D343D2F for ; Tue, 14 Sep 2004 22:46:46 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8EMkkKg033572 for ; Tue, 14 Sep 2004 22:46:46 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8EMkjj3033569 for perforce@freebsd.org; Tue, 14 Sep 2004 22:46:45 GMT (envelope-from julian@freebsd.org) Date: Tue, 14 Sep 2004 22:46:45 GMT Message-Id: <200409142246.i8EMkjj3033569@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61511 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2004 22:46:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=61511 Change 61511 by julian@julian_ref on 2004/09/14 22:46:41 tweek debugging Affected files ... .. //depot/projects/nsched/sys/kern/kern_switch.c#27 edit .. //depot/projects/nsched/sys/kern/kern_synch.c#14 edit .. //depot/projects/nsched/sys/kern/kern_thread.c#35 edit .. //depot/projects/nsched/sys/kern/sched_4bsd.c#54 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_switch.c#27 (text+ko) ==== @@ -126,23 +126,43 @@ { struct thread *td2; int count = 0; + int seenlast = 0 + + if (kg->kg_last_assigned == NULL) + seenlast = 1; TAILQ_FOREACH(td2, &kg->kg_runq, td_runq) { /* XXX Debugging hack */ if (!TD_ON_RUNQ(td2)) { - printf("%s: line %d", file, line); + printf("%s: line %d: ", file, line); printf("thread in wrong state, td2= %p\n", td2); panic("corruption in runqueue"); } if (td == td2) { - printf("%s: line %d", file, line); - printf("thread alreadyin runq, td2= %p\n", td); + printf("%s: line %d: ", file, line); + printf("thread alreadyin runq, td2= %p\n", td2); panic("confusion in runqueue"); } if (++count > 10000) { - printf("%s: line %d", file, line); + printf("%s: line %d: ", file, line); printf("corrupt kg_runq, td= %p\n", td); panic("deadlock in runqueue"); } + if (td2->td_sched->ke_state == KES_ONRUNQ) { + if (seenlast) { + printf("%s: line %d: ", file, line); + printf ("Sys td past last, td2= %p\n", td2); + panic("corrupted kg_runq"); + } + } else { + if (!seenlast) { + printf("%s: line %d: ", file, line); + printf ("unsched before last, td2= %p\n", td2); + panic("corrupted kg_runq"); + } + } + if (td2 == kg->kg_last_assigned) { + seenlast = 1; + } } } @@ -185,7 +205,6 @@ td = ke->ke_thread; KASSERT((td->td_kse == ke), ("kse/thread mismatch")); kg = ke->ke_ksegrp; - CHECKRUNQ(kg, NULL) if (td->td_proc->p_flag & P_HADTHREADS) { if (kg->kg_last_assigned == td) { kg->kg_last_assigned = TAILQ_PREV(td, @@ -193,7 +212,6 @@ } TAILQ_REMOVE(&kg->kg_runq, td, td_runq); kg->kg_runnable--; - CHECKRUNQ(kg, td) } CTR2(KTR_RUNQ, "choosethread: td=%p pri=%d", td, td->td_priority); @@ -290,7 +308,6 @@ td3 = TAILQ_PREV(td, threadqueue, td_runq); TAILQ_REMOVE(&kg->kg_runq, td, td_runq); kg->kg_runnable--; - CHECKRUNQ(kg, td) if (ke->ke_state == KES_ONRUNQ) { /* * This thread has been assigned to the system run queue. @@ -307,7 +324,6 @@ kg->kg_last_assigned = td3; /* slot_fill(kg); */ /* will replace it with another */ } - CHECKRUNQ(kg, NULL) } /* @@ -339,7 +355,6 @@ /* It is a threaded process */ kg = td->td_ksegrp; - CHECKRUNQ(kg, NULL) if (ke->ke_state == KES_ONRUNQ) { if (kg->kg_last_assigned == td) { kg->kg_last_assigned = @@ -351,10 +366,8 @@ TAILQ_REMOVE(&kg->kg_runq, td, td_runq); kg->kg_runnable--; TD_SET_CAN_RUN(td); - CHECKRUNQ(kg, td) td->td_priority = newpri; setrunqueue(td, SRQ_BORING); - CHECKRUNQ(kg, NULL) } int limitcount; void @@ -363,7 +376,6 @@ struct ksegrp *kg; struct thread *td2; struct thread *tda; - int count; CTR3(KTR_RUNQ, "setrunqueue: td:%p kg:%p pid:%d", td, td->td_ksegrp, td->td_proc->p_pid); @@ -394,9 +406,20 @@ } CHECKRUNQ(kg, td) + + /* + * If the concurrency has reduced, and we would go in the + * assigned section, then keep removing entries from the + * system run queue, until we are not in that section + * or there is room for us to be put in that section. + * What we MUST avoid is the case where there are threads of less + * priority than the new one scheduled, but it can not + * be scheduled itself. That would lead to a non contiguous set + * of scheduled threads, and everything would break. + */ tda = kg->kg_last_assigned; - if ((kg->kg_avail_opennings <= 0) && - (tda && (tda->td_priority > td->td_priority))) { + while ((kg->kg_avail_opennings <= 0) && + (tda && (tda->td_priority > td->td_priority))) { /* * None free, but there is one we can commandeer. */ @@ -412,7 +435,6 @@ * Add the thread to the ksegrp's run queue at * the appropriate place. */ - count = 0; TAILQ_FOREACH(td2, &kg->kg_runq, td_runq) { if (td2->td_priority > td->td_priority) { kg->kg_runnable++; @@ -425,16 +447,19 @@ kg->kg_runnable++; TAILQ_INSERT_TAIL(&kg->kg_runq, td, td_runq); } - CHECKRUNQ(kg, NULL) + /* * If we have a slot to use, then put the thread on the system * run queue and if needed, readjust the last_assigned pointer. + * it may be that we need to schedule something anyhow + * even if the availabel slots are -ve so that + * all the items < last_assigned are scheduled. */ if (kg->kg_avail_opennings > 0) { if (tda == NULL) { /* * No pre-existing last assigned so whoever is first - * gets the KSE we brought in.. (maybe us) + * gets the slot.. (maybe us) */ td2 = TAILQ_FIRST(&kg->kg_runq); kg->kg_last_assigned = td2; @@ -443,7 +468,7 @@ } else { /* * We are past last_assigned, so - * gave the next slot to whatever is next, + * give the next slot to whatever is next, * which may or may not be us. */ td2 = TAILQ_NEXT(tda, td_runq); @@ -454,6 +479,7 @@ CTR3(KTR_RUNQ, "setrunqueue: held: td%p kg%p pid%d", td, td->td_ksegrp, td->td_proc->p_pid); } + CHECKRUNQ(kg, NULL) } /* @@ -539,7 +565,6 @@ ("thread has no (or wrong) sched-private part.")); KASSERT((td->td_inhibitors == 0), ("setrunqueue: trying to run inhibitted thread")); - CHECKRUNQ(td->td_ksegrp, NULL) pri = td->td_priority; cpri = ctd->td_priority; if (pri >= cpri || cold /* || dumping */ || TD_IS_INHIBITED(ctd) || ==== //depot/projects/nsched/sys/kern/kern_synch.c#14 (text+ko) ==== @@ -335,7 +335,7 @@ PCPU_SET(switchticks, ticks); CTR4(KTR_PROC, "mi_switch: old thread %p (kse %p, pid %ld, %s)", (void *)td, td->td_sched, (long)p->p_pid, p->p_comm); - if (td->td_proc->p_flag & P_SA) + if ((flags & SW_VOL) && (td->td_proc->p_flag & P_SA)) newtd = thread_switchout(td, flags, newtd); sched_switch(td, newtd, flags); ==== //depot/projects/nsched/sys/kern/kern_thread.c#35 (text+ko) ==== ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#54 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Sep 14 22:48:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F2FD16A4D0; Tue, 14 Sep 2004 22:48:49 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 54CC216A4CE for ; Tue, 14 Sep 2004 22:48:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 492FE43D39 for ; Tue, 14 Sep 2004 22:48:49 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8EMmnqW033607 for ; Tue, 14 Sep 2004 22:48:49 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8EMmmMe033604 for perforce@freebsd.org; Tue, 14 Sep 2004 22:48:48 GMT (envelope-from julian@freebsd.org) Date: Tue, 14 Sep 2004 22:48:48 GMT Message-Id: <200409142248.i8EMmmMe033604@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61512 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2004 22:48:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=61512 Change 61512 by julian@julian_ref on 2004/09/14 22:48:19 fix small mismerge Affected files ... .. //depot/projects/nsched/sys/kern/kern_switch.c#28 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_switch.c#28 (text+ko) ==== @@ -564,7 +564,7 @@ KASSERT ((ctd->td_kse != NULL && ctd->td_kse->ke_thread == ctd), ("thread has no (or wrong) sched-private part.")); KASSERT((td->td_inhibitors == 0), - ("setrunqueue: trying to run inhibitted thread")); + ("maybe_preempt: trying to run inhibitted thread")); pri = td->td_priority; cpri = ctd->td_priority; if (pri >= cpri || cold /* || dumping */ || TD_IS_INHIBITED(ctd) || From owner-p4-projects@FreeBSD.ORG Tue Sep 14 22:50:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FFE116A4D0; Tue, 14 Sep 2004 22:50:52 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6668616A4CE for ; Tue, 14 Sep 2004 22:50:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4276A43D41 for ; Tue, 14 Sep 2004 22:50:52 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8EMoquq033718 for ; Tue, 14 Sep 2004 22:50:52 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8EMopU6033715 for perforce@freebsd.org; Tue, 14 Sep 2004 22:50:51 GMT (envelope-from julian@freebsd.org) Date: Tue, 14 Sep 2004 22:50:51 GMT Message-Id: <200409142250.i8EMopU6033715@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61513 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2004 22:50:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=61513 Change 61513 by julian@julian_ref on 2004/09/14 22:50:51 use real C syntax Affected files ... .. //depot/projects/nsched/sys/kern/kern_switch.c#29 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_switch.c#29 (text+ko) ==== @@ -126,7 +126,7 @@ { struct thread *td2; int count = 0; - int seenlast = 0 + int seenlast = 0; if (kg->kg_last_assigned == NULL) seenlast = 1; From owner-p4-projects@FreeBSD.ORG Tue Sep 14 23:27:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72F7F16A4D0; Tue, 14 Sep 2004 23:27:37 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D2D316A4CE for ; Tue, 14 Sep 2004 23:27:37 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5AEA43D54 for ; Tue, 14 Sep 2004 23:27:36 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8ENRasK034590 for ; Tue, 14 Sep 2004 23:27:36 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8ENRaXk034587 for perforce@freebsd.org; Tue, 14 Sep 2004 23:27:36 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Sep 2004 23:27:36 GMT Message-Id: <200409142327.i8ENRaXk034587@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 61514 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2004 23:27:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=61514 Change 61514 by peter@peter_daintree on 2004/09/14 23:26:51 IFC @61510 Affected files ... .. //depot/projects/hammer/UPDATING#54 integrate .. //depot/projects/hammer/contrib/pf/man/pf.conf.5#3 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#33 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#28 integrate .. //depot/projects/hammer/etc/pf.conf#2 integrate .. //depot/projects/hammer/etc/pf.os#3 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#25 integrate .. //depot/projects/hammer/etc/rc.d/ntpd#6 integrate .. //depot/projects/hammer/etc/rc.d/ntpdate#8 delete .. //depot/projects/hammer/etc/rc.d/rpcbind#5 integrate .. //depot/projects/hammer/gnu/usr.bin/send-pr/send-pr.sh#6 integrate .. //depot/projects/hammer/lib/libc/db/btree/bt_split.c#4 integrate .. //depot/projects/hammer/release/Makefile#58 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#60 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#77 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#9 integrate .. //depot/projects/hammer/share/examples/Makefile#6 integrate .. //depot/projects/hammer/share/examples/pf/Makefile#1 branch .. //depot/projects/hammer/share/examples/pf/ackpri#1 branch .. //depot/projects/hammer/share/examples/pf/faq-example1#1 branch .. //depot/projects/hammer/share/examples/pf/faq-example2#1 branch .. //depot/projects/hammer/share/examples/pf/faq-example3#1 branch .. //depot/projects/hammer/share/examples/pf/queue1#1 branch .. //depot/projects/hammer/share/examples/pf/queue2#1 branch .. //depot/projects/hammer/share/examples/pf/queue3#1 branch .. //depot/projects/hammer/share/examples/pf/queue4#1 branch .. //depot/projects/hammer/share/examples/pf/spamd#1 branch .. //depot/projects/hammer/share/man/man4/divert.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_ubt.4#8 integrate .. //depot/projects/hammer/share/man/man4/vge.4#2 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#9 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#10 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_if.c#4 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#12 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#13 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#15 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#8 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_pccard.c#6 integrate .. //depot/projects/hammer/sys/dev/fdc/fdcvar.h#5 integrate .. //depot/projects/hammer/sys/dev/md/md.c#38 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#21 integrate .. //depot/projects/hammer/sys/dev/nge/if_ngereg.h#4 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#41 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#27 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#29 integrate .. //depot/projects/hammer/sys/sys/sched.h#15 integrate .. //depot/projects/hammer/usr.bin/uniq/uniq.c#4 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/parser.y#4 integrate .. //depot/projects/hammer/usr.sbin/boot0cfg/boot0cfg.8#7 integrate .. //depot/projects/hammer/usr.sbin/boot0cfg/boot0cfg.c#7 integrate .. //depot/projects/hammer/usr.sbin/cron/crontab/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/cron/crontab/crontab.c#4 integrate Differences ... ==== //depot/projects/hammer/UPDATING#54 (text+ko) ==== @@ -23,6 +23,22 @@ developers choose to disable these features on build machines to maximize performance. +20040914: + /etc/rc.d/ntpdate has been removed in favor of using the -g + flag to ntpd(1). By default, if ntpd is enabled, it will sync + with the time servers listed in /etc/ntp.conf regardless of the + time difference (slew). To prevent this, add + ntpd_sync_on_start="NO" to /etc/rc.conf. + + NOTE: Doing a sync (ntpd -g) is noticably slower than ntpdate(1), + but is also more accurate (hence ntpdate(1) being depreciated). + +20040914: + The format of the pflogd(8) logfile "/var/log/pflog" has changed for + architectures that have a 64 bit long type to make it compatible to + the standard pcap format. In order to prevent corruption move away + any old logfile before using a new pflogd(8). + 20040906: debug.witness_* has been renamed to debug.witness.*. There are compatibility tunables left in for a few days. Update loader.conf @@ -1853,4 +1869,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.356 2004/09/06 23:37:16 jmg Exp $ +$FreeBSD: src/UPDATING,v 1.358 2004/09/14 03:01:38 seanc Exp $ ==== //depot/projects/hammer/contrib/pf/man/pf.conf.5#3 (text+ko) ==== @@ -1,3 +1,4 @@ +.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.2 2004/09/14 01:07:19 mlaier Exp $ .\" $OpenBSD: pf.conf.5,v 1.292 2004/02/24 05:44:48 mcbride Exp $ .\" .\" Copyright (c) 2002, Daniel Hartmeier @@ -27,7 +28,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 19, 2002 +.Dd September 14, 2004 .Dt PF.CONF 5 .Os .Sh NAME @@ -2595,7 +2596,7 @@ "(" bandwidth-spec number bandwidth-spec ")" ) .Ed .Sh FILES -.Bl -tag -width "/etc/protocols" -compact +.Bl -tag -width "/usr/share/examples/pf" -compact .It Pa /etc/hosts Host name database. .It Pa /etc/pf.conf @@ -2606,7 +2607,7 @@ Protocol name database. .It Pa /etc/services Service name database. -.It Pa /usr/share/pf +.It Pa /usr/share/examples/pf Example rulesets. .El .Sh SEE ALSO ==== //depot/projects/hammer/etc/defaults/rc.conf#33 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.212 2004/07/27 00:28:16 mlaier Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.213 2004/09/14 03:01:38 seanc Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -219,11 +219,9 @@ ### Network Time Services options: ### timed_enable="NO" # Run the time daemon (or NO). timed_flags="" # Flags to timed (if enabled). -ntpdate_enable="NO" # Run ntpdate to sync time on boot (or NO). -ntpdate_program="/usr/sbin/ntpdate" # path to ntpdate, if you want a different one. -ntpdate_flags="-b" # Flags to ntpdate (if enabled). ntpd_enable="NO" # Run ntpd Network Time Protocol (or NO). ntpd_program="/usr/sbin/ntpd" # path to ntpd, if you want a different one. +ntpd_sync_on_start="YES" # Sync time on ntpd startup, even if offset is high ntpd_flags="-p /var/run/ntpd.pid -f /var/db/ntpd.drift" # Flags to ntpd (if enabled). ==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.306 2004/08/28 12:52:30 tjr Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.307 2004/09/14 01:07:18 mlaier Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -245,6 +245,8 @@ .. perfmon .. + pf + .. portal .. ppi ==== //depot/projects/hammer/etc/pf.conf#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/etc/pf.conf,v 1.1 2004/03/08 22:03:27 mlaier Exp $ +# $FreeBSD: src/etc/pf.conf,v 1.2 2004/09/14 01:07:18 mlaier Exp $ # $OpenBSD: pf.conf,v 1.21 2003/09/02 20:38:44 david Exp $ # -# See pf.conf(5) and /usr/share/pf for syntax and examples. +# See pf.conf(5) and /usr/share/examples/pf for syntax and examples. # Required order: options, normalization, queueing, translation, filtering. # Macros and tables may be defined and used anywhere. # Note that translation rules are first match while filter rules are last match. ==== //depot/projects/hammer/etc/pf.os#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/etc/pf.os,v 1.2 2004/06/06 11:46:27 schweikh Exp $ -# $OpenBSD: pf.os,v 1.10 2003/09/06 01:37:07 frantzen Exp $ +# $FreeBSD: src/etc/pf.os,v 1.3 2004/09/14 00:30:14 mlaier Exp $ +# $OpenBSD: pf.os,v 1.17 2004/04/28 01:01:27 deraadt Exp $ # passive OS fingerprinting # ------------------------- # @@ -22,7 +22,8 @@ # # # This fingerprint database is adapted from Michal Zalewski's p0f passive -# operating system package. +# operating system package. The last database sync was from a Nov 3 2003 +# p0f.fp. # # # Each line in this file specifies a single fingerprint. Please read the @@ -141,8 +142,8 @@ # Wnnn - window scaling option, value nnn (or * or %nnn) # Mnnn - maximum segment size option, value nnn (or * or %nnn) # S - selective ACK OK -# T - timestamp -# T0 - timestamp with a zero value +# T - timestamp +# T0 - timestamp with a zero value # # To denote no TCP options, use a single '.'. # @@ -151,6 +152,10 @@ # frantzen@openbsd.org and bugs@openbsd.org with a tcpdump packet # capture of the relevant SYN packet(s) # +# A test and submission page is available at +# http://lcamtuf.coredump.cx/p0f-help/ +# +# # WARNING WARNING WARNING # ----------------------- # @@ -193,6 +198,7 @@ # Linux 2.0, but it uses a fairly rare MSSes, at least sometimes... # This is a shoddy hack, though. +45046:64:0:44:M*: AIX:4.3::AIX 4.3 16384:64:0:44:M512: AIX:4.3:2-3:AIX 4.3.2 and earlier 16384:64:0:60:M512,N,W%2,N,N,T: AIX:4.3:3:AIX 4.3.3-5.2 @@ -205,6 +211,7 @@ # ----------------- Linux ------------------- +# S1:64:0:44:M*:A: Linux:1.2::Linux 1.2.x (XXX quirks support) 512:64:0:44:M*: Linux:2.0:3x:Linux 2.0.3x 16384:64:0:44:M*: Linux:2.0:3x:Linux 2.0.3x @@ -220,8 +227,10 @@ S4:64:1:60:M*,S,T,N,W0: Linux:2.4::Linux 2.4/2.6 S4:64:1:60:M*,S,T,N,W0: Linux:2.6::Linux 2.4/2.6 -S3:64:1:60:M*,S,T,N,W1: Linux:2.5::Linux 2.5 +S3:64:1:60:M*,S,T,N,W1: Linux:2.5::Linux 2.5 (sometimes 2.4) S4:64:1:60:M*,S,T,N,W1: Linux:2.5-2.6::Linux 2.5/2.6 +S3:64:1:60:M*,S,T,N,W2: Linux:2.5::Linux 2.5 (sometimes 2.4) +S4:64:1:60:M*,S,T,N,W2: Linux:2.5::Linux 2.5 (sometimes 2.4) S20:64:1:60:M*,S,T,N,W0: Linux:2.2:20-25:Linux 2.2.20 and newer S22:64:1:60:M*,S,T,N,W0: Linux:2.2::Linux 2.2 @@ -268,25 +277,32 @@ 65535:64:1:60:M*,N,W1,N,N,T: FreeBSD:4.7-4.9::FreeBSD 4.7-5.1 65535:64:1:60:M*,N,W1,N,N,T: FreeBSD:5.0-5.1::FreeBSD 4.7-5.1 +# XXX need quirks support +# 65535:64:1:60:M*,N,W0,N,N,T:Z:FreeBSD:5.1-current (1) +# 65535:64:1:60:M*,N,W1,N,N,T:Z:FreeBSD:5.1-current (2) +# 65535:64:1:60:M*,N,W2,N,N,T:Z:FreeBSD:5.1-current (3) + # 16384:64:1:60:M*,N,N,N,N,N,N,T:FreeBSD:4.4:noTS:FreeBSD 4.4 (w/o timestamps) # ----------------- NetBSD ------------------ +16384:64:0:60:M*,N,W0,N,N,T: NetBSD:1.3::NetBSD 1.3 65535:64:0:60:M*,N,W0,N,N,T0: NetBSD:1.6:opera:NetBSD 1.6 (Opera) 16384:64:0:60:M*,N,W0,N,N,T0: NetBSD:1.6::NetBSD 1.6 16384:64:1:60:M*,N,W0,N,N,T0: NetBSD:1.6:df:NetBSD 1.6 (DF) -16384:64:0:60:M*,N,W0,N,N,T: NetBSD:1.3::NetBSD 1.3 65535:64:1:60:M*,N,W1,N,N,T0: NetBSD:1.6::NetBSD 1.6W-current (DF) +65535:64:1:60:M*,N,W0,N,N,T0: NetBSD:1.6::NetBSD 1.6X (DF) +32768:64:1:60:M*,N,W0,N,N,T0: NetBSD:1.6:randomization:NetBSD 1.6ZH-current (w/ ip_id randomization) # ----------------- OpenBSD ----------------- 16384:64:0:60:M*,N,W0,N,N,T: OpenBSD:2.6::NetBSD 1.3 (or OpenBSD 2.6) -16384:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.4::OpenBSD 3.0-3.4 -16384:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.4:no-df:OpenBSD 3.0-3.4 (scrub no-df) -57344:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-3.4::OpenBSD 3.3-3.4 -57344:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-3.4:no-df:OpenBSD 3.3-3.4 (scrub no-df) +16384:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.5::OpenBSD 3.0-3.5 +16384:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.5:no-df:OpenBSD 3.0-3.5 (scrub no-df) +57344:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-3.5::OpenBSD 3.3-3.5 +57344:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-3.5:no-df:OpenBSD 3.3-3.5 (scrub no-df) -65535:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.4:opera:OpenBSD 3.0-3.4 (Opera) +65535:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.5:opera:OpenBSD 3.0-3.5 (Opera) # ----------------- Solaris ----------------- @@ -299,6 +315,10 @@ S34:64:1:48:M*,N,N,S: Solaris:2.9::Solaris 9 S44:255:1:44:M*: Solaris:2.7::Solaris 7 +4096:64:0:44:M1460: SunOS:4.1::SunOS 4.1.x + +S34:64:1:52:M*,N,W0,N,N,S: Solaris:10::Solaris 10 (beta) + # ----------------- IRIX -------------------- 49152:64:0:44:M*: IRIX:6.4::IRIX 6.4 @@ -311,46 +331,58 @@ # ----------------- Tru64 ------------------- -32768:64:1:48:M*,N,W0: Tru64:4.0::Tru64 4.0 +32768:64:1:48:M*,N,W0: Tru64:4.0::Tru64 4.0 (or OS/2 Warp 4) 32768:64:0:48:M*,N,W0: Tru64:5.0::Tru64 5.0 8192:64:0:44:M1460: Tru64:5.1:noRFC1323:Tru64 6.1 (no RFC1323) (or QNX 6) - -# This looks awfully Linuxish :/ -# S22:64:0:60:M*,S,T,N,W0: Tru64:5.0:a:Tru64 5.0a - 61440:64:0:48:M*,N,W0: Tru64:5.1a:JP4:Tru64 v5.1a JP4 (or OpenVMS 7.x on Compaq 5.x stack) - # ----------------- OpenVMS ----------------- 6144:64:1:60:M*,N,W0,N,N,T: OpenVMS:7.2::OpenVMS 7.2 (Multinet 4.4 stack) # ----------------- MacOS ------------------- +# XXX Need EOL tcp opt support +# S2:255:1:48:M*,W0,E:.:MacOS:8.6 classic + +# XXX some of these use EOL too 16616:255:1:48:M*,W0: MacOS:7.3-7.6:OTTCP:MacOS 7.3-8.6 (OTTCP) 16616:255:1:48:M*,W0: MacOS:8.0-8.6:OTTCP:MacOS 7.3-8.6 (OTTCP) -32768:255:1:48:M*,W0,N: MacOS:9.1-9.2::MacOS 9.1/9.2 -32768:64:0:60:M*,N,W0,N,N,T: MacOS:X:10.2:MacOS X 10.2 +16616:255:1:48:M*,N,N,N: MacOS:8.1-8.6:OTTCP:MacOS 8.1-8.6 (OTTCP) +32768:255:1:48:M*,W0,N: MacOS:9.0-9.2::MacOS 9.0-9.2 +65535:255:1:48:M*,N,N,N,N: MacOS:9.1::MacOS 9.1 (OT 2.7.4) + # ----------------- Windows ----------------- -# Windows 95 - need more: +# Windows TCP/IP stack is a mess. For most recent XP, 2000 and +# even 98, the pathlevel, not the actual OS version, is more +# relevant to the signature. They share the same code, so it would +# seem. Luckily for us, almost all Windows 9x boxes have an +# awkward MSS of 536, which I use to tell one from another +# in most difficult cases. -8192:32:1:44:M*: Windows:95::Windows 95 (low TTL) +8192:32:1:44:M*: Windows:3.11::Windows 3.11 (Tucows) +S44:64:1:64:M*,N,W0,N,N,T0,N,N,S: Windows:95::Windows 95 +8192:128:1:64:M*,N,W0,N,N,T0,N,N,S: Windows:95:b:Windows 95b -# Windows 98 - plenty of silly signatures: -S44:32:1:48:M*,N,N,S: Windows:98::Windows 98 (low TTL) -8192:32:1:48:M*,N,N,S: Windows:98::Windows 98 (low TTL) +# There were so many tweaking tools and so many stack versions for +# Windows 98 it is no longer possible to tell them from each other +# without some very serious research. Until then, there's an insane +# number of signatures, for your amusement: -%8192:64:1:48:M*,N,N,S: Windows:98::Windows 98 (or newer XP/2000 with tweaked TTL) +S44:32:1:48:M*,N,N,S: Windows:98:lowTTL:Windows 98 (low TTL) +8192:32:1:48:M*,N,N,S: Windows:98:lowTTL:Windows 98 (low TTL) +%8192:64:1:48:M536,N,N,S: Windows:98::Windows 98 +%8192:128:1:48:M536,N,N,S: Windows:98::Windows 98 S4:64:1:48:M*,N,N,S: Windows:98::Windows 98 S6:64:1:48:M*,N,N,S: Windows:98::Windows 98 S12:64:1:48:M*,N,N,S: Windows:98::Windows 98 +T30:64:1:64:M1460,N,W0,N,N,T0,N,N,S: Windows:98::Windows 98 32767:64:1:48:M*,N,N,S: Windows:98::Windows 98 37300:64:1:48:M*,N,N,S: Windows:98::Windows 98 46080:64:1:52:M*,N,W3,N,N,S: Windows:98:RFC1323:Windows 98 (RFC1323) -65535:64:1:44:M*: Windows:98:noSACK:Windows 98 (no sack) - +65535:64:1:44:M*: Windows:98:noSack:Windows 98 (no sack) S16:128:1:48:M*,N,N,S: Windows:98::Windows 98 S16:128:1:64:M*,N,W0,N,N,T0,N,N,S: Windows:98::Windows 98 S26:128:1:48:M*,N,N,S: Windows:98::Windows 98 @@ -359,36 +391,46 @@ 60352:128:1:48:M*,N,N,S: Windows:98::Windows 98 60352:128:1:64:M*,N,W2,N,N,T0,N,N,S: Windows:98::Windows 98 -# Windows NT 4.0 - need more: - +# What's with 1414 on NT? +T31:128:1:44:M1414: Windows:NT:4.0:Windows NT 4.0 SP6a 64512:128:1:44:M1414: Windows:NT:4.0:Windows NT 4.0 SP6a 8192:128:1:44:M*: Windows:NT:4.0:Windows NT 4.0 (older) -6144:128:1:52:M*,W0,N,S,N,N: Windows:NT:4.0:Windows NT 4.0 (RFC1323) # Windows XP and 2000. Most of the signatures that were # either dubious or non-specific (no service pack data) # were deleted and replaced with generics at the end. 65535:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows 2000 SP4, XP SP1 -%8192:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows 2000 SP4, XP SP1 -S45:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows 2000 SP4 -S6:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows XP SP1, 2000 SP4 -S44:128:1:48:M*,N,N,S: Windows:2000:SP3:Windows XP Pro SP1, 2000 SP3 +65535:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows 2000 SP4, XP SP1 +%8192:128:1:48:M*,N,N,S: Windows:2000:SP2+:Windows 2000 SP2, XP SP1 (seldom 98 4.10.2222) +%8192:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows 2000 SP2, XP SP1 (seldom 98 4.10.2222) +S20:128:1:48:M*,N,N,S: Windows:2000::Windows 2000/XP SP3 +S20:128:1:48:M*,N,N,S: Windows:XP:SP3:Windows 2000/XP SP3 +S45:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows 2000 SP4, XP SP 1 +S45:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows 2000 SP4, XP SP 1 +40320:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows 2000 SP4 -S6:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows XP SP1, 2000 SP4 -S44:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows XP Pro SP1, 2000 SP3 -64512:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows XP SP1 -32767:128:1:48:M1452,N,N,S: Windows:XP:SP1:Windows XP SP1 -65535:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows 2000 SP4, XP SP1 -%8192:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows 2000 SP4, XP SP1 +S6:128:1:48:M*,N,N,S: Windows:2000:SP2:Windows XP, 2000 SP2+ +S6:128:1:48:M*,N,N,S: Windows:XP::Windows XP, 2000 SP2+ +S12:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows XP SP1 +S44:128:1:48:M*,N,N,S: Windows:2000:SP3:Windows Pro SP1, 2000 SP3 +S44:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows Pro SP1, 2000 SP3 +64512:128:1:48:M*,N,N,S: Windows:2000:SP3:Windows SP1, 2000 SP3 +64512:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows SP1, 2000 SP3 +32767:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows SP1, 2000 SP4 +32767:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows SP1, 2000 SP4 # Odds, ends, mods: -S52:128:1:48:M1260,N,N,S: Windows:XP:Cisco:Windows XP/2000 via Cisco -S52:128:1:48:M1260,N,N,S: Windows:2000:Cisco:Windows XP/2000 via Cisco +S52:128:1:48:M1260,N,N,S: Windows:2000:cisco:Windows XP/2000 via Cisco +S52:128:1:48:M1260,N,N,S: Windows:XP:cisco:Windows XP/2000 via Cisco +65520:128:1:48:M*,N,N,S: Windows:XP::Windows XP bare-bone +16384:128:1:52:M536,N,W0,N,N,S: Windows:2000:ZoneAlarm:Windows 2000 w/ZoneAlarm? +2048:255:0:40:.: Windows:.NET::Windows .NET Enterprise Server -# HUNT DOWN: -# *:128:1:48:M*,N,N,S:U:@Windows:XP (leak) (PLEASE REPORT) +# No need to be more specific, it passes: +# *:128:1:48:M*,N,N,S:U:-Windows:XP/2000 while downloading (leak!) XXX quirk +# there is an equiv similar generic sig w/o the quirk # ----------------- HP/UX ------------------- @@ -405,7 +447,12 @@ # We don't yet support the ?12 TCP option #16384:64:1:68:M1460,N,W0,N,N,T,N,N,?12: RISCOS:3.70-4.36::RISC OS 3.70-4.36 +12288:32:0:44:M536: RISC OS:3.70:4.10:RISC OS 3.70 inet 4.10 +# XXX quirk +# 4096:64:1:56:M1460,N,N,T:T: RISC OS:3.70:freenet:RISC OS 3.70 freenet 2.00 + + # ----------------- BSD/OS ------------------ # Once again, power of two WSS is also shared by MacOS X with DF set @@ -432,6 +479,8 @@ 8192:64:1:60:M1440,N,W0,N,N,T: OS/400:VR5::OS/400 VR4/R5 4096:64:1:60:M1440,N,W0,N,N,T: OS/400:V4R5:CF67032:OS/400 V4R5 + CF67032 +# XXX quirk +# 28672:64:0:44:M1460:A:OS/390:? # ------------------ ULTRIX ----------------- @@ -445,16 +494,42 @@ 16384:128:1:44:M1460: Novell:NetWare:5.0:Novel Netware 5.0 6144:128:1:44:M1460: Novell:IntranetWare:4.11:Novell IntranetWare 4.11 +6144:128:1:44:M1368: Novell:BorderManager::Novell BorderManager ? + +6144:128:1:52:M*,W0,N,S,N,N: Novell:Netware:6:Novell Netware 6 SP3 + # ----------------- SCO ------------------ -S17:64:1:44:M1460: SCO:Unixware:7.0:SCO Unixware 7.0.0 or OpenServer 5.0.4-5.06 -S17:64:1:44:M1460: SCO:OpenServer:5.0:SCO Unixware 7.0.0 or OpenServer 5.0.4-5.06 -S3:64:1:60:M1460,N,W0,N,N,T: SCO:UnixWare:7.1:SCO UnixWare 7.1 +S3:64:1:60:M1460,N,W0,N,N,T: SCO:UnixWare:7.1:SCO UnixWare 7.1 +S23:64:1:44:M1380: SCO:OpenServer:5.0:SCO OpenServer 5.0 # ------------------- DOS ------------------- 2048:255:0:44:M536: DOS:WATTCP:1.05:DOS Arachne via WATTCP/1.05 +# ------------------ OS/2 ------------------- + +S56:64:0:44:M512: OS/2:4::OS/2 4 + +# ----------------- TOPS-20 ----------------- + +# Another hardcore MSS, one of the ACK leakers hunted down. +# XXX QUIRK 0:64:0:44:M1460:A:TOPS-20:version 7 +0:64:0:44:M1460: TOPS-20:7::TOPS-20 version 7 + +# ------------------ AMIGA ------------------ + +# XXX TCP option 12 +# S32:64:1:56:M*,N,N,S,N,N,?12:.:AMIGA:3.9 BB2 with Miami stack + +# ------------------ Plan9 ------------------ + +65535:255:0:48:M1460,W0,N: Plan9:4::Plan9 edition 4 + +# ----------------- AMIGAOS ----------------- + +16384:64:1:48:M1560,N,N,S: AMIGAOS:3.9::AMIGAOS 3.9 BB2 MiamiDX + ########################################### # Appliance / embedded / other signatures # ########################################### @@ -466,6 +541,15 @@ 4096:32:0:44:M1460: ExtremeWare:4.x::ExtremeWare 4.x 60352:64:0:52:M1460,N,W2,N,N,S: Clavister:7::Clavister firewall 7.x +# XXX TCP option 12 +# S32:64:0:68:M512,N,W0,N,N,T,N,N,?12:.:Nokia:IPSO w/Checkpoint NG FP3 +# S16:64:0:68:M1024,N,W0,N,N,T,N,N,?12:.:Nokia:IPSO 3.7 build 026 + +S4:64:1:60:W0,N,S,T,M1460: FortiNet:FortiGate:50:FortiNet FortiGate 50 + +8192:64:1:44:M1460: Eagle:::Eagle Secure Gateway + + # ------- Switches and other stuff ---------- 4128:255:0:44:M*: Cisco:::Cisco Catalyst 3500, 7500 etc @@ -480,9 +564,13 @@ 32850:64:1:64:N,W1,N,N,T,N,N,S,M*: NetApp:5.x::NetApp Data OnTap 5.x 16384:64:1:64:M1460,N,N,S,N,W0,N: NetApp:5.3:1:NetApp 5.3.1 -65535:64:0:64:M1460,N,N,S,N,W3,N,N,T: NetApp:5.3:1:NetApp 5.3.1 +65535:64:0:64:M1460,N,N,S,N,W*,N,N,T: NetApp:5.3-5.5::NetApp 5.3-5.5 65535:64:0:60:M1460,N,W0,N,N,T: NetApp:CacheFlow::NetApp CacheFlow 8192:64:1:64:M1460,N,N,S,N,W0,N,N,T: NetApp:5.2:1:NetApp NetCache 5.2.1 +20480:64:1:64:M1460,N,N,S,N,W0,N,N,T: NetApp:4.1::NetApp NetCache4.1 + +65535:64:0:60:M1460,N,W0,N,N,T: CacheFlow:4.1::CacheFlow CacheOS 4.1 +8192:64:0:60:M1380,N,N,N,N,N,N,T: CacheFlow:1.1::CacheFlow CacheOS 1.1 S4:64:0:48:M1460,N,N,S: Cisco:Content Engine::Cisco Content Engine @@ -491,7 +579,6 @@ 65535:255:1:48:N,W1,M1460: Inktomi:crawler::Inktomi crawler S1:255:1:60:M1460,S,T,N,W0: LookSmart:ZyBorg::LookSmart ZyBorg - 16384:255:0:40:.: Proxyblocker:::Proxyblocker (what's this?) # ----------- Embedded systems -------------- @@ -501,6 +588,7 @@ S5:255:0:44:M536: PalmOS:4::PalmOS 3/4 S4:255:0:44:M536: PalmOS:3:5:PalmOS 3.5 2948:255:0:44:M536: PalmOS:3:5:PalmOS 3.5.3 (Handera) +S29:255:0:44:M536: PalmOS:5::PalmOS 5.0 S23:64:1:64:N,W1,N,N,T,N,N,S,M1460: SymbianOS:7::SymbianOS 7 8192:255:0:44:M1460: SymbianOS:6048::SymbianOS 6048 (on Nokia 7650?) @@ -515,6 +603,8 @@ S1:255:0:44:M346: Contiki:1.1:rc0:Contiki 1.1-rc0 4096:128:0:44:M1460: Sega:Dreamcast:3.0:Sega Dreamcast Dreamkey 3.0 +T5:64:0:44:M536: Sega:Dreamcast:HKT-3020:Sega Dreamcast HKT-3020 (browser disc 51027) +S22:64:1:44:M1460: Sony:PS2::Sony Playstation 2 (SOCOM?) S12:64:0:44:M1452: AXIS:5600:v5.64:AXIS Printer Server 5600 v5.64 @@ -546,5 +636,8 @@ *:128:1:64:M*,N,W0,N,N,T0,N,N,S: @Windows:XP:RFC1323:Windows XP/2000 (RFC1323) *:128:1:64:M*,N,W0,N,N,T0,N,N,S: @Windows:2000:RFC1323:Windows XP/2000 (RFC1323) *:128:1:64:M*,N,W*,N,N,T0,N,N,S: @Windows:XP:RFC1323:Windows XP (RFC1323, w+) +*:128:1:48:M536,N,N,S: @Windows:98::Windows 98 *:128:1:48:M*,N,N,S: @Windows:XP::Windows XP/2000 *:128:1:48:M*,N,N,S: @Windows:2000::Windows XP/2000 + + ==== //depot/projects/hammer/etc/rc.d/Makefile#25 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.41 2004/05/24 14:17:19 des Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.42 2004/09/14 03:01:38 seanc Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -23,7 +23,7 @@ mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ network_ipv6 nfsclient nfsd \ - nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \ + nfslocking nfsserver nisdomain nsswitch ntpd \ othermta \ pccard pcvt pf pflog preseedrandom \ power_profile ppp-user pppoed pwcheck \ ==== //depot/projects/hammer/etc/rc.d/ntpd#6 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ntpd,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ntpd,v 1.8 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/ntpd,v 1.9 2004/09/14 03:01:38 seanc Exp $ # # PROVIDE: ntpd @@ -15,10 +15,15 @@ rcvar=`set_rcvar` command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" +start_precmd="ntpd_precmd" required_files="/etc/ntp.conf" ntpd_precmd() { + if checkyesno ntpd_sync_on_start; then + rc_flags="-g ${ntpd_flags}" + fi + if [ -z "$ntpd_chrootdir" ]; then return 0; fi ==== //depot/projects/hammer/etc/rc.d/rpcbind#5 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: rpcbind,v 1.6 2002/01/31 01:26:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/rpcbind,v 1.9 2004/03/05 07:43:38 mtm Exp $ +# $FreeBSD: src/etc/rc.d/rpcbind,v 1.10 2004/09/14 03:01:38 seanc Exp $ # # PROVIDE: rpcbind -# REQUIRE: NETWORKING ntpdate syslogd named +# REQUIRE: NETWORKING ntpd syslogd named # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/hammer/gnu/usr.bin/send-pr/send-pr.sh#6 (text+ko) ==== @@ -20,7 +20,7 @@ # along with GNU GNATS; see the file COPYING. If not, write to # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. # -# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.35 2003/11/12 23:08:23 ceri Exp $ +# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.36 2004/09/14 20:30:35 ceri Exp $ # The version of this send-pr. VERSION=3.113 @@ -262,7 +262,7 @@ # Catch some signals. ($xs kludge needed by Sun /bin/sh) xs=0 trap 'rm -f $REF $TEMP; exit $xs' 0 -trap 'echo "$COMMAND: Aborting ... saving unfinished PR into /tmp/pr.$$"; rm -f $REF ; mv $TEMP /tmp/pr.$$; xs=1; exit' 1 2 3 13 15 +trap 'SAV=`mktemp -t pr`;echo "$COMMAND: Aborting ... saving unfinished PR into $SAV"; rm -f $REF ; mv $TEMP $SAV; xs=1; exit' 1 2 3 13 15 # If they told us to use a specific file, then do so. if [ -n "$IN_FILE" ]; then ==== //depot/projects/hammer/lib/libc/db/btree/bt_split.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_split.c 8.9 (Berkeley) 7/26/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.6 2004/09/10 14:45:00 kuriyama Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.7 2004/09/13 22:07:24 kuriyama Exp $"); #include @@ -361,8 +361,6 @@ r->nextpg = h->nextpg; r->prevpg = h->pgno; r->flags = h->flags & P_TYPE; - /* XXX: Workaround for broken page data access. */ - r->linp[0] = 0xffff; /* * If we're splitting the last page on a level because we're appending @@ -728,7 +726,7 @@ * the right page. */ if (skip <= off) { - skip = 0; + skip = MAX_PAGE_OFFSET; rval = l; } else { rval = r; @@ -738,7 +736,7 @@ for (off = 0; nxt < top; ++off) { if (skip == nxt) { ++off; - skip = 0; + skip = MAX_PAGE_OFFSET; } switch (h->flags & P_TYPE) { case P_BINTERNAL: ==== //depot/projects/hammer/release/Makefile#58 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.859 2004/09/08 06:05:19 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.860 2004/09/14 04:01:57 brooks Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -917,6 +917,14 @@ @echo 'mfsroot_load="YES"' > ${CD_DISC2}/boot/loader.conf @echo 'mfsroot_type="mfs_root"' >> ${CD_DISC2}/boot/loader.conf @echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DISC2}/boot/loader.conf +.if exists(${HINTSFILE}) + # Break the link to device.hints so we can modify it + @rm ${CD_DISC2}/boot/device.hints + @cp ${HINTSFILE} ${CD_DISC2}/boot/device.hints +.if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64" + @echo 'hint.atkbd.0.flags="0x1"' >> ${CD_DISC2}/boot/device.hints +.endif +.endif .if defined(CD_BOOT) @cp -Rp ${CD_DISC2}/boot ${CD_BOOT} .if defined(MINIROOT) @@ -1149,7 +1157,11 @@ @cp -Rp ${BOOTDIR}/*.4th ${BOOTDIR}/defaults ${BOOTDIR}/loader.help \ ${BOOTDIR}/loader.rc ${IMAGEDIR}/boot .if exists(${HINTSFILE}) - @gzip -9nc ${HINTSFILE} > ${IMAGEDIR}/boot/device.hints.gz + @cp ${HINTSFILE} ${IMAGEDIR}/boot/device.hints +.if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64" + @echo 'hint.atkbd.0.flags="0x1"' >> ${IMAGEDIR}/boot/device.hints +.endif + @gzip -9n ${IMAGEDIR}/boot/device.hints .endif @gzip -9n ${IMAGEDIR}/boot/*.4th ${IMAGEDIR}/boot/loader.help \ ${IMAGEDIR}/boot/defaults/loader.conf ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#60 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.255 2004/09/13 10:48:34 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.256 2004/09/14 01:46:27 brueffer Exp $ Supported Devices @@ -623,6 +623,8 @@ &hwlist.awi; + &hwlist.cnw; + &hwlist.ath; ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#77 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.774 2004/09/12 19:11:49 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.775 2004/09/14 05:35:19 hrs Exp $ 2000 @@ -1083,7 +1083,11 @@ The &man.sound.4; (formerly &man.pcm.4;) driver has been modified to read /boot/device.hints on startup, to allow setting - of default values for mixer channels. + of default values for mixer channels. + Note that currently the device driver's name used in + /boot/device.hints is still pcm. + More detailed information and examples can be found in the &man.sound.4; + manual page. ==== //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#9 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.38 2004/09/13 10:44:20 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.39 2004/09/14 01:45:13 brueffer Exp $ # # @@ -52,6 +52,7 @@ bt i386,amd64 ciss i386,ia64,amd64 cm i386 +cnw i386,pc98 cp i386,pc98 ct pc98 ctau i386 ==== //depot/projects/hammer/share/examples/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/Makefile,v 1.42 2004/07/15 15:37:56 scottl Exp $ +# $FreeBSD: src/share/examples/Makefile,v 1.43 2004/09/14 01:07:18 mlaier Exp $ # # Doing a make install builds /usr/share/examples @@ -290,6 +290,9 @@ .if !defined(NO_IPFILTER) SUBDIR+=ipfilter .endif +.if !defined(NO_PF) +SUBDIR+=pf +.endif .endif .include ==== //depot/projects/hammer/share/man/man4/divert.4#5 (text+ko) ==== @@ -1,6 +1,6 @@ -.\" $FreeBSD: src/share/man/man4/divert.4,v 1.29 2004/07/03 18:29:20 ru Exp $ +.\" $FreeBSD: src/share/man/man4/divert.4,v 1.30 2004/09/14 09:35:10 andre Exp $ .\" -.Dd June 18, 1996 +.Dd September 14, 2004 .Dt DIVERT 4 .Os .Sh NAME @@ -128,6 +128,12 @@ If different fragments divert to different ports, then which port ultimately gets chosen is unpredictable. .Pp +Note that packets arriving on the divert socket by the +.Xr ipfw 8 +.Cm tee +action are delivered as-is and packet fragments do not get reassembled +in this case. +.Pp Packets are received and sent unchanged, except that packets read as outgoing have invalid IP header checksums, and packets written as outgoing have their IP header checksums overwritten ==== //depot/projects/hammer/share/man/man4/ng_ubt.4#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $Id: ng_ubt.4,v 1.3 2003/05/21 19:37:35 max Exp $ -.\" $FreeBSD: src/share/man/man4/ng_ubt.4,v 1.7 2004/09/13 10:36:44 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/ng_ubt.4,v 1.8 2004/09/14 16:46:16 brueffer Exp $ .\" .Dd September 13, 2004 .Dt NG_UBT 4 @@ -57,7 +57,8 @@ .Sh HARDWARE The .Nm -driver supports the following Bluetooth USB devices: +driver supports all Bluetooth USB devices that conform with +the Bluetooth specification v1.1 including: .Pp .Bl -bullet -compact .It ==== //depot/projects/hammer/share/man/man4/vge.4#2 (text+ko) ==== @@ -1,6 +1,5 @@ -.\" Copyright (c) 2001 Wind River Systems -.\" Copyright (c) 1997, 1998, 1999, 2000, 2001 -.\" Bill Paul . All rights reserved. +.\" Copyright (c) 2004 +.\" Bill Paul . All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -29,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/vge.4,v 1.4 2004/09/13 17:05:07 wpaul Exp $ +.\" $FreeBSD: src/share/man/man4/vge.4,v 1.5 2004/09/14 16:08:13 wpaul Exp $ .\" .Dd September 10, 2004 .Dt VGE 4 ==== //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.9 2004/06/22 20:13:24 brooks Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.10 2004/09/14 03:12:01 mlaier Exp $ */ /* $OpenBSD: if_pflog.c,v 1.11 2003/12/31 11:18:25 cedric Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -377,6 +377,6 @@ #define PFLOG_MODVER 1 -DECLARE_MODULE(pflog, pflog_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); +DECLARE_MODULE(pflog, pflog_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); MODULE_VERSION(pflog, PFLOG_MODVER); #endif /* __FreeBSD__ */ ==== //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.11 2004/08/14 15:32:40 dwmalone Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.12 2004/09/14 03:12:01 mlaier Exp $ */ /* $OpenBSD: if_pfsync.c,v 1.26 2004/03/28 18:14:20 mcbride Exp $ */ /* @@ -1662,6 +1662,6 @@ #define PFSYNC_MODVER 1 -DECLARE_MODULE(pfsync, pfsync_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); +DECLARE_MODULE(pfsync, pfsync_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); MODULE_VERSION(pfsync, PFSYNC_MODVER); #endif /* __FreeBSD__ */ ==== //depot/projects/hammer/sys/contrib/pf/net/pf_if.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.5 2004/08/16 17:58:12 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.6 2004/09/14 15:20:24 mlaier Exp $ */ /* $OpenBSD: pf_if.c,v 1.11 2004/03/15 11:38:23 cedric Exp $ */ /* add $OpenBSD: pf_if.c,v 1.19 2004/08/11 12:06:44 henning Exp $ */ @@ -638,8 +638,16 @@ af = ia->ifa_addr->sa_family; if (af != AF_INET && af != AF_INET6) continue; -#ifdef notyet - if (!(ia->ifa_flags & IFA_ROUTE)) +#ifdef __FreeBSD__ + /* + * XXX: For point-to-point interfaces, (ifname:0) and IPv4, + * jump over addresses without a proper route to work + * around a problem with ppp not fully removing the + * address used during IPCP. + */ + if ((ifp->if_flags & IFF_POINTOPOINT) && + !(ia->ifa_flags & IFA_ROUTE) && + (flags & PFI_AFLAG_NOALIAS) && (af == AF_INET)) continue; #endif if ((flags & PFI_AFLAG_BROADCAST) && af == AF_INET6) ==== //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.13 2004/08/22 15:23:48 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.14 2004/09/14 03:12:01 mlaier Exp $ */ /* $OpenBSD: pf_ioctl.c,v 1.112.2.2 2004/07/24 18:28:12 brad Exp $ */ /* @@ -3411,6 +3411,6 @@ 0 }; -DECLARE_MODULE(pf, pf_mod, SI_SUB_PSEUDO, SI_ORDER_FIRST); +DECLARE_MODULE(pf, pf_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_FIRST); MODULE_VERSION(pf, PF_MODVER); #endif /* __FreeBSD__ */ ==== //depot/projects/hammer/sys/dev/amr/amr.c#13 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.54 2004/08/16 17:23:09 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.55 2004/09/14 16:36:12 scottl Exp $"); /* * Driver for the AMI MegaRaid family of controllers. @@ -708,7 +708,7 @@ if ((result = malloc(bufsize, M_DEVBUF, M_NOWAIT)) == NULL) goto out; /* set command flags */ - ac->ac_flags |= AMR_CMD_PRIORITY | AMR_CMD_DATAOUT; + ac->ac_flags |= AMR_CMD_PRIORITY | AMR_CMD_DATAIN; /* point the command at our data */ ac->ac_data = result; ==== //depot/projects/hammer/sys/dev/fdc/fdc.c#15 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.286 2004/08/27 17:08:24 phk Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 14 23:36:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8832816A4D0; Tue, 14 Sep 2004 23:36:48 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 649ED16A4CE for ; Tue, 14 Sep 2004 23:36:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4399A43D2F for ; Tue, 14 Sep 2004 23:36:48 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8ENammp034872 for ; Tue, 14 Sep 2004 23:36:48 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8ENalwQ034864 for perforce@freebsd.org; Tue, 14 Sep 2004 23:36:48 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Sep 2004 23:36:48 GMT Message-Id: <200409142336.i8ENalwQ034864@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 61515 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2004 23:36:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=61515 Change 61515 by peter@peter_daintree on 2004/09/14 23:36:05 cnw seems to build on amd64 as well, and there is no obvious reason why it shouldn't run (that I can see). Affected files ... .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#10 edit Differences ... ==== //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#10 (text+ko) ==== @@ -52,7 +52,7 @@ bt i386,amd64 ciss i386,ia64,amd64 cm i386 -cnw i386,pc98 +cnw i386,pc98,amd64 cp i386,pc98 ct pc98 ctau i386 From owner-p4-projects@FreeBSD.ORG Wed Sep 15 05:15:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8124616A4D0; Wed, 15 Sep 2004 05:15:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 55A2A16A4CE for ; Wed, 15 Sep 2004 05:15:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3232A43D2F for ; Wed, 15 Sep 2004 05:15:45 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8F5FjSf066087 for ; Wed, 15 Sep 2004 05:15:45 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8F5FiGe066084 for perforce@freebsd.org; Wed, 15 Sep 2004 05:15:44 GMT (envelope-from julian@freebsd.org) Date: Wed, 15 Sep 2004 05:15:44 GMT Message-Id: <200409150515.i8F5FiGe066084@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61527 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2004 05:15:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=61527 Change 61527 by julian@julian_ref on 2004/09/15 05:15:06 more careful counting of slots Affected files ... .. //depot/projects/nsched/sys/kern/kern_switch.c#30 edit .. //depot/projects/nsched/sys/kern/sched_4bsd.c#55 edit .. //depot/projects/nsched/sys/kern/sched_ule.c#34 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_switch.c#30 (text+ko) ==== @@ -266,7 +266,6 @@ */ if (td) { kg->kg_last_assigned = td; - kg->kg_avail_opennings--; sched_add(td, SRQ_BORING); CTR2(KTR_RUNQ, "slot_fill: td%p -> kg%p", td, kg); } else { @@ -301,7 +300,6 @@ if ((td->td_proc->p_flag & P_HADTHREADS) == 0) { /* remve from sys run queue and free up a slot */ sched_rem(td); - kg->kg_avail_opennings++; ke->ke_state = KES_THREAD; return; } @@ -316,7 +314,6 @@ * see if we need to move the KSE in the run queues. */ sched_rem(td); - kg->kg_avail_opennings++; ke->ke_state = KES_THREAD; td2 = kg->kg_last_assigned; KASSERT((td2 != NULL), ("last assigned has wrong value")); @@ -361,7 +358,6 @@ TAILQ_PREV(td, threadqueue, td_runq); } sched_rem(td); - kg->kg_avail_opennings++; } TAILQ_REMOVE(&kg->kg_runq, td, td_runq); kg->kg_runnable--; ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#55 (text+ko) ==== @@ -792,6 +792,12 @@ /* * The thread we are about to run needs to be counted as if it had been * added to the run queue and selected. + * it came from: + * A preemption + * An upcall + * A followon + * Do this before saving curthread so that the slot count + * doesn't give an overly optimistic view when that happens. */ if (newtd) { KASSERT((newtd->td_inhibitors == 0), @@ -1045,12 +1051,17 @@ if ((td->td_proc->p_flag & P_NOLOAD) == 0) sched_tdcnt--; + td->td_ksegrp->kg_avail_opennings++; runq_remove(ke->ke_runq, ke); ke->ke_state = KES_THREAD; - ke->ke_ksegrp->kg_runq_kses--; + td->td_ksegrp->kg_runq_kses--; } +/* + * Select threads to run. + * Notice that the running threads still consume a slot. + */ struct kse * sched_choose(void) { ==== //depot/projects/nsched/sys/kern/sched_ule.c#34 (text+ko) ==== @@ -1801,6 +1801,7 @@ ("sched_rem: KSE not on run queue")); ke->ke_state = KES_THREAD; + td->td_ksegrp->kg_avail_opennings++; ke->ke_ksegrp->kg_runq_threads--; kseq = KSEQ_CPU(ke->ke_cpu); kseq_runq_rem(kseq, ke); From owner-p4-projects@FreeBSD.ORG Wed Sep 15 18:57:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD9EC16A4D0; Wed, 15 Sep 2004 18:57:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A7F6516A4CE for ; Wed, 15 Sep 2004 18:57:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 81A6043D54 for ; Wed, 15 Sep 2004 18:57:02 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8FIv2HV092911 for ; Wed, 15 Sep 2004 18:57:02 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8FIv2Uh092908 for perforce@freebsd.org; Wed, 15 Sep 2004 18:57:02 GMT (envelope-from julian@freebsd.org) Date: Wed, 15 Sep 2004 18:57:02 GMT Message-Id: <200409151857.i8FIv2Uh092908@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61549 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2004 18:57:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=61549 Change 61549 by julian@julian_ref on 2004/09/15 18:56:32 IFC@61548 Affected files ... .. //depot/projects/nsched/sys/alpha/isa/isa_dma.c#3 integrate .. //depot/projects/nsched/sys/amd64/isa/isa_dma.c#4 integrate .. //depot/projects/nsched/sys/amd64/isa/isa_dma.h#3 delete .. //depot/projects/nsched/sys/contrib/pf/net/if_pflog.c#6 integrate .. //depot/projects/nsched/sys/contrib/pf/net/if_pfsync.c#7 integrate .. //depot/projects/nsched/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/nsched/sys/contrib/pf/net/pf_ioctl.c#8 integrate .. //depot/projects/nsched/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/nsched/sys/dev/amr/amr.c#5 integrate .. //depot/projects/nsched/sys/dev/buslogic/bt_mca.c#2 integrate .. //depot/projects/nsched/sys/dev/fdc/fdc.c#8 integrate .. //depot/projects/nsched/sys/dev/fdc/fdc_isa.c#4 integrate .. //depot/projects/nsched/sys/dev/fdc/fdc_pccard.c#3 integrate .. //depot/projects/nsched/sys/dev/fdc/fdcvar.h#3 integrate .. //depot/projects/nsched/sys/dev/md/md.c#11 integrate .. //depot/projects/nsched/sys/dev/nge/if_nge.c#7 integrate .. //depot/projects/nsched/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/nsched/sys/dev/pst/pst-iop.h#2 integrate .. //depot/projects/nsched/sys/dev/pst/pst-pci.c#2 integrate .. //depot/projects/nsched/sys/dev/pst/pst-raid.c#2 integrate .. //depot/projects/nsched/sys/i386/isa/isa_dma.c#4 integrate .. //depot/projects/nsched/sys/i386/isa/isa_dma.h#3 delete .. //depot/projects/nsched/sys/ia64/isa/isa_dma.c#3 integrate .. //depot/projects/nsched/sys/isa/isavar.h#2 integrate .. //depot/projects/nsched/sys/kern/kern_event.c#9 integrate .. //depot/projects/nsched/sys/kern/kern_switch.c#31 integrate .. //depot/projects/nsched/sys/kern/kern_thread.c#36 integrate .. //depot/projects/nsched/sys/net/if_clone.c#3 integrate .. //depot/projects/nsched/sys/pc98/pc98/isa_dma.c#4 integrate .. //depot/projects/nsched/sys/vm/vm_page.c#9 integrate Differences ... ==== //depot/projects/nsched/sys/alpha/isa/isa_dma.c#3 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.11 2004/04/05 21:00:51 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.12 2004/09/15 12:09:49 phk Exp $"); #include #include @@ -93,10 +93,8 @@ /* * Setup a DMA channel's bounce buffer. */ -void -isa_dmainit(chan, bouncebufsize) - int chan; - u_int bouncebufsize; +int +isa_dma_init(int chan, u_int bouncebufsize, int flag __unused) { static int initted = 0; bus_addr_t boundary = chan >= 4 ? 0x20000 : 0x10000; @@ -114,10 +112,10 @@ #ifdef DIAGNOSTIC if (chan & ~VALID_DMA_MASK) - panic("isa_dmainit: channel out of range"); + panic("isa_dma_init: channel out of range"); if (dma_tag[chan] || dma_map[chan]) - panic("isa_dmainit: impossible request"); + panic("isa_dma_init: impossible request"); #endif if (bus_dma_tag_create(/*parent*/NULL, @@ -132,13 +130,13 @@ /*lockfunc*/busdma_lock_mutex, /*lockarg*/&Giant, &dma_tag[chan]) != 0) { - panic("isa_dmainit: unable to create dma tag\n"); + panic("isa_dma_init: unable to create dma tag\n"); } if (bus_dmamap_create(dma_tag[chan], 0, &dma_map[chan])) { - panic("isa_dmainit: unable to create dma map\n"); + panic("isa_dma_init: unable to create dma map\n"); } - + return (0); } /* @@ -349,7 +347,7 @@ #endif if (!dma_tag || !dma_map[chan]) - panic("isa_dmastart: called without isa_dmainit"); + panic("isa_dmastart: called without isa_dma_init"); dma_busy |= (1 << chan); ==== //depot/projects/nsched/sys/amd64/isa/isa_dma.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.19 2004/08/16 22:51:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.20 2004/09/15 12:09:49 phk Exp $"); /* * code to manage AT bus @@ -96,15 +96,13 @@ /* * Setup a DMA channel's bounce buffer. */ -void -isa_dmainit(chan, bouncebufsize) - int chan; - u_int bouncebufsize; +int +isa_dma_init(int chan, u_int bouncebufsize, int flag) { void *buf; /* - * If a DMA channel is shared, both drivers have to call isa_dmainit + * If a DMA channel is shared, both drivers have to call isa_dma_init * since they don't know that the other driver will do it. * Just return if we're already set up good. * XXX: this only works if they agree on the bouncebuf size. This @@ -112,30 +110,30 @@ * XXX: the same driver. */ if (dma_bouncebuf[chan] != NULL) - return; + return (0); #ifdef DIAGNOSTIC if (chan & ~VALID_DMA_MASK) - panic("isa_dmainit: channel out of range"); + panic("isa_dma_init: channel out of range"); #endif dma_bouncebufsize[chan] = bouncebufsize; /* Try malloc() first. It works better if it works. */ - buf = malloc(bouncebufsize, M_DEVBUF, M_NOWAIT); + buf = malloc(bouncebufsize, M_DEVBUF, flag); if (buf != NULL) { if (isa_dmarangecheck(buf, bouncebufsize, chan) == 0) { dma_bouncebuf[chan] = buf; - return; + return (0); } free(buf, M_DEVBUF); } - buf = contigmalloc(bouncebufsize, M_DEVBUF, M_NOWAIT, 0ul, 0xfffffful, + buf = contigmalloc(bouncebufsize, M_DEVBUF, flag, 0ul, 0xfffffful, 1ul, chan & 4 ? 0x20000ul : 0x10000ul); if (buf == NULL) - printf("isa_dmainit(%d, %d) failed\n", chan, bouncebufsize); - else - dma_bouncebuf[chan] = buf; + return (ENOMEM); + dma_bouncebuf[chan] = buf; + return (0); } /* ==== //depot/projects/nsched/sys/contrib/pf/net/if_pflog.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.9 2004/06/22 20:13:24 brooks Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.10 2004/09/14 03:12:01 mlaier Exp $ */ /* $OpenBSD: if_pflog.c,v 1.11 2003/12/31 11:18:25 cedric Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -377,6 +377,6 @@ #define PFLOG_MODVER 1 -DECLARE_MODULE(pflog, pflog_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); +DECLARE_MODULE(pflog, pflog_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); MODULE_VERSION(pflog, PFLOG_MODVER); #endif /* __FreeBSD__ */ ==== //depot/projects/nsched/sys/contrib/pf/net/if_pfsync.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.11 2004/08/14 15:32:40 dwmalone Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.12 2004/09/14 03:12:01 mlaier Exp $ */ /* $OpenBSD: if_pfsync.c,v 1.26 2004/03/28 18:14:20 mcbride Exp $ */ /* @@ -1662,6 +1662,6 @@ #define PFSYNC_MODVER 1 -DECLARE_MODULE(pfsync, pfsync_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); +DECLARE_MODULE(pfsync, pfsync_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); MODULE_VERSION(pfsync, PFSYNC_MODVER); #endif /* __FreeBSD__ */ ==== //depot/projects/nsched/sys/contrib/pf/net/pf_if.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.5 2004/08/16 17:58:12 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.6 2004/09/14 15:20:24 mlaier Exp $ */ /* $OpenBSD: pf_if.c,v 1.11 2004/03/15 11:38:23 cedric Exp $ */ /* add $OpenBSD: pf_if.c,v 1.19 2004/08/11 12:06:44 henning Exp $ */ @@ -638,8 +638,16 @@ af = ia->ifa_addr->sa_family; if (af != AF_INET && af != AF_INET6) continue; -#ifdef notyet - if (!(ia->ifa_flags & IFA_ROUTE)) +#ifdef __FreeBSD__ + /* + * XXX: For point-to-point interfaces, (ifname:0) and IPv4, + * jump over addresses without a proper route to work + * around a problem with ppp not fully removing the + * address used during IPCP. + */ + if ((ifp->if_flags & IFF_POINTOPOINT) && + !(ia->ifa_flags & IFA_ROUTE) && + (flags & PFI_AFLAG_NOALIAS) && (af == AF_INET)) continue; #endif if ((flags & PFI_AFLAG_BROADCAST) && af == AF_INET6) ==== //depot/projects/nsched/sys/contrib/pf/net/pf_ioctl.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.13 2004/08/22 15:23:48 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.14 2004/09/14 03:12:01 mlaier Exp $ */ /* $OpenBSD: pf_ioctl.c,v 1.112.2.2 2004/07/24 18:28:12 brad Exp $ */ /* @@ -3411,6 +3411,6 @@ 0 }; -DECLARE_MODULE(pf, pf_mod, SI_SUB_PSEUDO, SI_ORDER_FIRST); +DECLARE_MODULE(pf, pf_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_FIRST); MODULE_VERSION(pf, PF_MODVER); #endif /* __FreeBSD__ */ ==== //depot/projects/nsched/sys/dev/aha/aha_mca.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aha/aha_mca.c,v 1.11 2004/03/17 17:50:24 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aha/aha_mca.c,v 1.12 2004/09/15 11:58:34 phk Exp $"); #include #include @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include ==== //depot/projects/nsched/sys/dev/amr/amr.c#5 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.54 2004/08/16 17:23:09 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.55 2004/09/14 16:36:12 scottl Exp $"); /* * Driver for the AMI MegaRaid family of controllers. @@ -708,7 +708,7 @@ if ((result = malloc(bufsize, M_DEVBUF, M_NOWAIT)) == NULL) goto out; /* set command flags */ - ac->ac_flags |= AMR_CMD_PRIORITY | AMR_CMD_DATAOUT; + ac->ac_flags |= AMR_CMD_PRIORITY | AMR_CMD_DATAIN; /* point the command at our data */ ac->ac_data = result; ==== //depot/projects/nsched/sys/dev/buslogic/bt_mca.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_mca.c,v 1.9 2004/03/17 17:50:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_mca.c,v 1.10 2004/09/15 11:58:34 phk Exp $"); /* * Written using the bt_isa/bt_pci code as a reference. @@ -55,7 +55,7 @@ #include #include -#include +#include #include ==== //depot/projects/nsched/sys/dev/fdc/fdc.c#8 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.286 2004/08/27 17:08:24 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.288 2004/09/14 17:28:51 imp Exp $"); #include "opt_fdc.h" @@ -197,9 +197,18 @@ #define FDCTL 7 /* Control Register (W) */ /* - * this is the secret PIO data port (offset from base) + * The YE-DATA PC Card floppies use PIO to read in the data rather than + * DMA due to the wild variability of DMA for the PC Card devices. In + * addition, if we cannot setup the DMA resources for the ISA attachment, + * we'll use this same offset for data transfer. + * + * For this mode, offset 0 and 1 must be used to setup the transfer + * for this floppy. This means they are only available on those systems + * that map them to the floppy drive. Newer systems do not do this, and + * we should likely prohibit access to them (or disallow NODMA to be set). */ -#define FDC_YE_DATAPORT 6 +#define FDBCDR 0 /* And 1 */ +#define FD_YE_DATAPORT 6 /* Drive Data port */ #define FDI_DCHG 0x80 /* diskette has been changed */ /* requires drive and motor being selected */ @@ -337,6 +346,19 @@ return bus_space_read_1(fdc->ctlt, fdc->ctlh, fdc->ctl_off); } +/* + * Magic pseudo-DMA initialization for YE FDC. Sets count and + * direction. + */ +static void +fdbcdr_wr(struct fdc_data *fdc, int iswrite, uint16_t count) +{ + bus_space_write_1(fdc->portt, fdc->porth, fdc->port_off + FDBCDR, + (count - 1) & 0xff); + bus_space_write_1(fdc->portt, fdc->porth, fdc->port_off + FDBCDR + 1, + ((iswrite ? 0x80 : 0) | (((count - 1) >> 8) & 0x7f))); +} + static int fdc_err(struct fdc_data *fdc, const char *s) { @@ -634,18 +656,6 @@ } /* - * Magic pseudo-DMA initialization for YE FDC. Sets count and - * direction. - */ -#define SET_BCDR(fdc,wr,cnt,port) \ - do { \ - bus_space_write_1(fdc->portt, fdc->porth, fdc->port_off + port, \ - ((cnt)-1) & 0xff); \ - bus_space_write_1(fdc->portt, fdc->porth, fdc->port_off + port + 1, \ - ((wr ? 0x80 : 0) | ((((cnt)-1) >> 8) & 0x7f))); \ - } while (0) - -/* * fdc_pio(): perform programmed IO read/write for YE PCMCIA floppy. */ static void @@ -660,13 +670,13 @@ count = fdc->fd->fd_iosize; if (bp->bio_cmd == BIO_READ) { - SET_BCDR(fdc, 0, count, 0); + fdbcdr_wr(fdc, 0, count); bus_space_read_multi_1(fdc->portt, fdc->porth, fdc->port_off + - FDC_YE_DATAPORT, cptr, count); + FD_YE_DATAPORT, cptr, count); } else { bus_space_write_multi_1(fdc->portt, fdc->porth, fdc->port_off + - FDC_YE_DATAPORT, cptr, count); - SET_BCDR(fdc, 0, count, 0); + FD_YE_DATAPORT, cptr, count); + fdbcdr_wr(fdc, 0, count); /* needed? */ } } @@ -940,7 +950,7 @@ /* Do PIO if we have to */ if (fdc->flags & FDC_NODMA) { if (bp->bio_cmd & (BIO_READ|BIO_WRITE|BIO_FMT)) - SET_BCDR(fdc, 1, fd->fd_iosize, 0); + fdbcdr_wr(fdc, 1, fd->fd_iosize); if (bp->bio_cmd & (BIO_WRITE|BIO_FMT)) fdc_pio(fdc); } @@ -1484,39 +1494,30 @@ device_t dev; dev = fdc->fdc_dev; - if (fdc->fdc_intr) { + if (fdc->fdc_intr) BUS_TEARDOWN_INTR(device_get_parent(dev), dev, fdc->res_irq, fdc->fdc_intr); - fdc->fdc_intr = NULL; - } - if (fdc->res_irq != 0) { - bus_deactivate_resource(dev, SYS_RES_IRQ, fdc->rid_irq, - fdc->res_irq); + fdc->fdc_intr = NULL; + if (fdc->res_irq != NULL) bus_release_resource(dev, SYS_RES_IRQ, fdc->rid_irq, - fdc->res_irq); - fdc->res_irq = NULL; - } - if (fdc->res_ctl != 0) { - bus_deactivate_resource(dev, SYS_RES_IOPORT, fdc->rid_ctl, - fdc->res_ctl); + fdc->res_irq); + fdc->res_irq = NULL; + if (fdc->res_ctl != NULL) bus_release_resource(dev, SYS_RES_IOPORT, fdc->rid_ctl, - fdc->res_ctl); - fdc->res_ctl = NULL; - } - if (fdc->res_ioport != 0) { - bus_deactivate_resource(dev, SYS_RES_IOPORT, fdc->rid_ioport, - fdc->res_ioport); + fdc->res_ctl); + fdc->res_ctl = NULL; + if (fdc->res_sts != NULL) + bus_release_resource(dev, SYS_RES_IOPORT, fdc->rid_sts, + fdc->res_sts); + fdc->res_sts = NULL; + if (fdc->res_ioport != NULL) bus_release_resource(dev, SYS_RES_IOPORT, fdc->rid_ioport, - fdc->res_ioport); - fdc->res_ioport = NULL; - } - if (fdc->res_drq != 0) { - bus_deactivate_resource(dev, SYS_RES_DRQ, fdc->rid_drq, - fdc->res_drq); + fdc->res_ioport); + fdc->res_ioport = NULL; + if (fdc->res_drq != NULL) bus_release_resource(dev, SYS_RES_DRQ, fdc->rid_drq, - fdc->res_drq); - fdc->res_drq = NULL; - } + fdc->res_drq); + fdc->res_drq = NULL; } int @@ -1685,7 +1686,7 @@ device_printf(dev, "does not respond\n"); return (error); } - error = BUS_SETUP_INTR(device_get_parent(dev), dev, fdc->res_irq, + error = bus_setup_intr(dev, fdc->res_irq, INTR_TYPE_BIO | INTR_ENTROPY | INTR_FAST | INTR_MPSAFE, fdc_intr, fdc, &fdc->fdc_intr); if (error) { ==== //depot/projects/nsched/sys/dev/fdc/fdc_isa.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_isa.c,v 1.12 2004/08/31 20:37:10 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_isa.c,v 1.13 2004/09/14 07:06:49 imp Exp $"); #include #include @@ -57,9 +57,8 @@ int fdc_isa_alloc_resources(device_t dev, struct fdc_data *fdc) { - int ispnp, nports; + int nports = 6; - ispnp = (fdc->flags & FDC_ISPNP) != 0; fdc->fdc_dev = dev; fdc->rid_ioport = 0; fdc->rid_irq = 0; @@ -69,99 +68,89 @@ /* * On standard ISA, we don't just use an 8 port range * (e.g. 0x3f0-0x3f7) since that covers an IDE control - * register at 0x3f6. + * register at 0x3f6. So, on older hardware, we use + * 0x3f0-0x3f5 and 0x3f7. However, some BIOSs omit the + * control port, while others start at 0x3f2. Of the latter, + * sometimes we have two resources, other times we have one. + * We have to deal with the following cases: + * + * 1: 0x3f0-0x3f5 # very rare + * 2: 0x3f0 # hints -> 0x3f0-0x3f5,0x3f7 + * 3: 0x3f0-0x3f5,0x3f7 # Most common + * 4: 0x3f2-0x3f5,0x3f7 # Second most common + * 5: 0x3f2-0x3f5 # implies 0x3f7 too. + * 6: 0x3f2-0x3f3,0x3f4-0x3f5,0x3f7 # becoming common + * 7: 0x3f2-0x3f3,0x3f4-0x3f5 # rare * - * Isn't PC hardware wonderful. + * The following code is generic for any value of 0x3fx :-) */ - nports = ispnp ? 1 : 6; /* - * Some ACPI BIOSen have _CRS objects for the floppy device that - * split the I/O port resource into several resources. We detect - * this case by checking if there are more than 2 IOPORT resources. - * If so, we use the resource with the smallest start address as - * the port RID and the largest start address as the control RID. + * First, allocated the main range of ports. In the best of + * worlds, this is 4 or 6 ports. In others, well, that's + * why this function is so complicated. */ - if (bus_get_resource_count(dev, SYS_RES_IOPORT, 2) != 0) { - u_long min_start, max_start, tmp; - int i; - - /* Find the min/max start addresses and their RIDs. */ - max_start = 0ul; - min_start = ~0ul; - for (i = 0; bus_get_resource_count(dev, SYS_RES_IOPORT, i) > 0; - i++) { - tmp = bus_get_resource_start(dev, SYS_RES_IOPORT, i); - KASSERT(tmp != 0, ("bogus resource")); - if (tmp < min_start) { - min_start = tmp; - fdc->rid_ioport = i; - } - if (tmp > max_start) { - max_start = tmp; - fdc->rid_ctl = i; - } - } - } - fdc->res_ioport = bus_alloc_resource(dev, SYS_RES_IOPORT, &fdc->rid_ioport, 0ul, ~0ul, nports, RF_ACTIVE); if (fdc->res_ioport == 0) { - device_printf(dev, "cannot reserve I/O port range (%d ports)\n", - nports); - return ENXIO; + device_printf(dev, "cannot allocate I/O port (%d ports)\n", + nports); + return (ENXIO); } fdc->portt = rman_get_bustag(fdc->res_ioport); fdc->porth = rman_get_bushandle(fdc->res_ioport); /* - * Some BIOSen report the device at 0x3f2-0x3f5,0x3f7 - * and some at 0x3f0-0x3f5,0x3f7. We detect the former - * by checking the size and adjust the port address - * accordingly. + * Handle cases 4-7 above */ - if (bus_get_resource_count(dev, SYS_RES_IOPORT, 0) == 4) - fdc->port_off = -2; + fdc->port_off = -(fdc->porth & 0x7); /* - * Register the control port range as rid 1 if it - * isn't there already. Most PnP BIOSen will have - * already done this but non-PnP configurations don't. - * - * And some (!!) report 0x3f2-0x3f5 and completely - * leave out the control register! It seems that some - * non-antique controller chips have a different - * method of programming the transfer speed which - * doesn't require the control register, but it's - * mighty bogus as the chip still responds to the - * address for the control register. + * Deal with case 6 and 7: FDSTS and FDSATA are in rid 1. */ - if (bus_get_resource_count(dev, SYS_RES_IOPORT, 1) == 0) { - u_long ctlstart; - /* Find the control port, usually 0x3f7 */ - ctlstart = rman_get_start(fdc->res_ioport) + fdc->port_off + 7; - bus_set_resource(dev, SYS_RES_IOPORT, 1, ctlstart, 1); + if (rman_get_size(fdc->res_ioport) == 2) { + fdc->rid_sts = 1; + fdc->res_sts = bus_alloc_resource_any(dev, SYS_RES_IOPORT, + &fdc->rid_sts, RF_ACTIVE); + if (fdc->res_sts == NULL) { + device_printf(dev, "Can't alloc rid 1"); + fdc_release_resources(fdc); + return (ENXIO); + } + fdc->rid_ctl++; + fdc->sts_off = -4; + fdc->stst = rman_get_bustag(fdc->res_sts); + fdc->stsh = rman_get_bushandle(fdc->res_sts); + } else { + fdc->res_sts = NULL; + fdc->sts_off = fdc->port_off; + fdc->stst = fdc->portt; + fdc->stsh = fdc->porth; } /* - * Now (finally!) allocate the control port. + * allocate the control port. For cases 1, 2, 5 and 7, we + * fake it from the ioports resource. XXX IS THIS THE RIGHT THING + * TO DO, OR SHOULD WE CREATE A NEW RID? (I think we need a new rid) */ fdc->res_ctl = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &fdc->rid_ctl, RF_ACTIVE); - if (fdc->res_ctl == 0) { - device_printf(dev, - "cannot reserve control I/O port range (control port)\n"); - return ENXIO; + if (fdc->res_ctl == NULL) { + fdc->ctl_off = 7 + fdc->port_off; + fdc->res_ctl = NULL; + fdc->ctlt = fdc->portt; + fdc->ctlh = fdc->porth; + } else { + fdc->ctl_off = 0; + fdc->ctlt = rman_get_bustag(fdc->res_ctl); + fdc->ctlh = rman_get_bushandle(fdc->res_ctl); } - fdc->ctlt = rman_get_bustag(fdc->res_ctl); - fdc->ctlh = rman_get_bushandle(fdc->res_ctl); - fdc->ctl_off = 0; fdc->res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &fdc->rid_irq, - RF_ACTIVE | RF_SHAREABLE); + RF_ACTIVE | RF_SHAREABLE); if (fdc->res_irq == 0) { device_printf(dev, "cannot reserve interrupt line\n"); - return ENXIO; + return (ENXIO); } if ((fdc->flags & FDC_NODMA) == 0) { @@ -169,12 +158,13 @@ &fdc->rid_drq, RF_ACTIVE | RF_SHAREABLE); if (fdc->res_drq == 0) { device_printf(dev, "cannot reserve DMA request line\n"); + /* This is broken and doesn't work for ISA case */ fdc->flags |= FDC_NODMA; } else fdc->dmachan = rman_get_start(fdc->res_drq); } - return 0; + return (0); } static int ==== //depot/projects/nsched/sys/dev/fdc/fdc_pccard.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_pccard.c,v 1.9 2004/08/20 15:14:25 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_pccard.c,v 1.10 2004/09/14 07:06:49 imp Exp $"); #include #include @@ -65,6 +65,9 @@ } fdc->portt = rman_get_bustag(fdc->res_ioport); fdc->porth = rman_get_bushandle(fdc->res_ioport); + fdc->stst = fdc->portt; + fdc->stsh = fdc->porth; + fdc->sts_off = 0; fdc->ctlt = fdc->portt; fdc->ctlh = fdc->porth; fdc->ctl_off = 7; @@ -86,8 +89,7 @@ if ((pp = pccard_product_lookup(dev, fdc_pccard_products, sizeof(fdc_pccard_products[0]), NULL)) != NULL) { - if (pp->pp_name != NULL) - device_set_desc(dev, pp->pp_name); + device_set_desc(dev, "PC Card Floppy"); return (0); } return (ENXIO); @@ -98,8 +100,7 @@ { int error; struct fdc_data *fdc; - - return ENXIO; + device_t child; fdc = device_get_softc(dev); fdc->flags = FDC_NODMA; @@ -107,6 +108,11 @@ error = fdc_pccard_alloc_resources(dev, fdc); if (error == 0) error = fdc_attach(dev); + if (error == 0) { + child = fdc_add_child(dev, "fd", -1); + device_set_flags(child, 0x24); + error = bus_generic_attach(dev); + } if (error) fdc_release_resources(fdc); return (error); ==== //depot/projects/nsched/sys/dev/fdc/fdcvar.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fdc/fdcvar.h,v 1.4 2004/08/20 15:14:25 phk Exp $ + * $FreeBSD: src/sys/dev/fdc/fdcvar.h,v 1.5 2004/09/14 07:06:49 imp Exp $ */ /* XXX should audit this file to see if additional copyrights needed */ @@ -57,14 +57,17 @@ int fdc_errs; /* number of logged errors */ struct bio_queue_head head; struct bio *bp; /* active buffer */ - struct resource *res_ioport, *res_ctl, *res_irq, *res_drq; - int rid_ioport, rid_ctl, rid_irq, rid_drq; - int port_off; + struct resource *res_ioport, *res_sts, *res_ctl, *res_irq, *res_drq; + int rid_ioport, rid_sts, rid_ctl, rid_irq, rid_drq; bus_space_tag_t portt; bus_space_handle_t porth; + bus_space_tag_t stst; + bus_space_handle_t stsh; bus_space_tag_t ctlt; bus_space_handle_t ctlh; + int port_off; int ctl_off; + int sts_off; void *fdc_intr; struct device *fdc_dev; struct mtx fdc_mtx; ==== //depot/projects/nsched/sys/dev/md/md.c#11 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.130 2004/09/07 07:54:45 phk Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.134 2004/09/14 19:55:07 pjd Exp $ * */ @@ -828,6 +828,7 @@ } } if (error) { + uma_zdestroy(sc->uma); mddestroy(sc, NULL); return (error); } @@ -891,15 +892,16 @@ NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, mdio->md_file, td); error = vn_open(&nd, &flags, 0, -1); if (error) { + NDFREE(&nd, NDF_ONLY_PNBUF); if (error != EACCES && error != EPERM && error != EROFS) return (error); flags &= ~FWRITE; NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, mdio->md_file, td); error = vn_open(&nd, &flags, 0, -1); - if (error) - return (error); } NDFREE(&nd, NDF_ONLY_PNBUF); + if (error) + return (error); if (nd.ni_vp->v_type != VREG || (error = VOP_GETATTR(nd.ni_vp, &vattr, td->td_ucred, td))) { VOP_UNLOCK(nd.ni_vp, 0, td); @@ -938,11 +940,13 @@ else sc->nsect = vattr.va_size / sc->secsize; /* XXX: round up ? */ if (sc->nsect == 0) { + (void) vn_close(nd.ni_vp, flags, td->td_ucred, td); mddestroy(sc, td); return (EINVAL); } error = mdsetcred(sc, td->td_ucred); if (error) { + (void) vn_close(nd.ni_vp, flags, td->td_ucred, td); mddestroy(sc, td); return (error); } @@ -1053,6 +1057,8 @@ } error = mdsetcred(sc, td->td_ucred); if (error) { + vm_object_deallocate(sc->object); + sc->object = NULL; mddestroy(sc, td); return (error); } ==== //depot/projects/nsched/sys/dev/nge/if_nge.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.65 2004/08/13 23:22:53 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.68 2004/09/15 03:39:17 alc Exp $"); /* * National Semiconductor DP83820/DP83821 gigabit ethernet driver @@ -149,20 +149,21 @@ static int nge_attach(device_t); static int nge_detach(device_t); -static int nge_alloc_jumbo_mem(struct nge_softc *); -static void nge_free_jumbo_mem(struct nge_softc *); -static void *nge_jalloc(struct nge_softc *); -static void nge_jfree(void *, void *); - static int nge_newbuf(struct nge_softc *, struct nge_desc *, struct mbuf *); static int nge_encap(struct nge_softc *, struct mbuf *, u_int32_t *); +#ifdef NGE_FIXUP_RX +static __inline void nge_fixup_rx (struct mbuf *); +#endif static void nge_rxeof(struct nge_softc *); static void nge_txeof(struct nge_softc *); static void nge_intr(void *); static void nge_tick(void *); +static void nge_tick_locked(struct nge_softc *); static void nge_start(struct ifnet *); +static void nge_start_locked(struct ifnet *); static int nge_ioctl(struct ifnet *, u_long, caddr_t); static void nge_init(void *); +static void nge_init_locked(struct nge_softc *); static void nge_stop(struct nge_softc *); static void nge_watchdog(struct ifnet *); static void nge_shutdown(device_t); @@ -441,9 +442,7 @@ struct nge_mii_frame *frame; { - int i, ack, s; - - s = splimp(); + int i, ack; /* * Set up frame for RX. @@ -518,8 +517,6 @@ SIO_SET(NGE_MEAR_MII_CLK); DELAY(1); - splx(s); - if (ack) return(1); return(0); @@ -534,9 +531,7 @@ struct nge_mii_frame *frame; { - int s; - s = splimp(); /* * Set up frame for TX. */ @@ -570,8 +565,6 @@ */ SIO_CLR(NGE_MEAR_MII_DIR); - splx(s); - return(0); } @@ -680,6 +673,7 @@ u_int32_t h = 0, i, filtsave; int bit, index; + NGE_LOCK_ASSERT(sc); ifp = &sc->arpcom.ac_if; if (ifp->if_flags & IFF_ALLMULTI || ifp->if_flags & IFF_PROMISC) { @@ -791,21 +785,17 @@ nge_attach(dev) device_t dev; { - int s; u_char eaddr[ETHER_ADDR_LEN]; struct nge_softc *sc; struct ifnet *ifp; int unit, error = 0, rid; const char *sep = ""; - s = splimp(); - sc = device_get_softc(dev); unit = device_get_unit(dev); bzero(sc, sizeof(struct nge_softc)); - mtx_init(&sc->nge_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, - MTX_DEF | MTX_RECURSE); + NGE_LOCK_INIT(sc, device_get_nameunit(dev)); /* * Map control/status registers. */ @@ -835,16 +825,6 @@ goto fail; } - error = bus_setup_intr(dev, sc->nge_irq, INTR_TYPE_NET, - nge_intr, sc, &sc->nge_intrhand); - - if (error) { - bus_release_resource(dev, SYS_RES_IRQ, 0, sc->nge_irq); - bus_release_resource(dev, NGE_RES, NGE_RID, sc->nge_res); - printf("nge%d: couldn't set up irq\n", unit); - goto fail; - } - /* Reset the adapter. */ nge_reset(sc); @@ -863,7 +843,6 @@ if (sc->nge_ldata == NULL) { printf("nge%d: no memory for list buffers!\n", unit); - bus_teardown_intr(dev, sc->nge_irq, sc->nge_intrhand); bus_release_resource(dev, SYS_RES_IRQ, 0, sc->nge_irq); bus_release_resource(dev, NGE_RES, NGE_RID, sc->nge_res); error = ENXIO; @@ -871,25 +850,11 @@ } bzero(sc->nge_ldata, sizeof(struct nge_list_data)); - /* Try to allocate memory for jumbo buffers. */ - if (nge_alloc_jumbo_mem(sc)) { - printf("nge%d: jumbo buffer allocation failed\n", - sc->nge_unit); - contigfree(sc->nge_ldata, - sizeof(struct nge_list_data), M_DEVBUF); - bus_teardown_intr(dev, sc->nge_irq, sc->nge_intrhand); - bus_release_resource(dev, SYS_RES_IRQ, 0, sc->nge_irq); - bus_release_resource(dev, NGE_RES, NGE_RID, sc->nge_res); - error = ENXIO; - goto fail; - } - ifp = &sc->arpcom.ac_if; ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST | - IFF_NEEDSGIANT; + ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = nge_ioctl; ifp->if_start = nge_start; ifp->if_watchdog = nge_watchdog; @@ -941,8 +906,6 @@ } else { printf("nge%d: MII without any PHY!\n", sc->nge_unit); - nge_free_jumbo_mem(sc); - bus_teardown_intr(dev, sc->nge_irq, sc->nge_intrhand); bus_release_resource(dev, SYS_RES_IRQ, 0, sc->nge_irq); bus_release_resource(dev, NGE_RES, NGE_RID, sc->nge_res); @@ -955,12 +918,23 @@ * Call MI attach routine. */ ether_ifattach(ifp, eaddr); - callout_handle_init(&sc->nge_stat_ch); + callout_init(&sc->nge_stat_ch, CALLOUT_MPSAFE); + + /* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 15 19:53:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBD8116A4D0; Wed, 15 Sep 2004 19:53:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A747316A4CE for ; Wed, 15 Sep 2004 19:53:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BFD143D2F for ; Wed, 15 Sep 2004 19:53:57 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8FJrvnH098340 for ; Wed, 15 Sep 2004 19:53:57 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8FJrvwI098337 for perforce@freebsd.org; Wed, 15 Sep 2004 19:53:57 GMT (envelope-from jhb@freebsd.org) Date: Wed, 15 Sep 2004 19:53:57 GMT Message-Id: <200409151953.i8FJrvwI098337@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 61553 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2004 19:53:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=61553 Change 61553 by jhb@jhb_slimer on 2004/09/15 19:53:44 Argh, limit the userland trace to the overall frame count so that an infinite loop doesn't go on forever. Inspired by: 370k worth of user stack trace before I power cycled my machine Affected files ... .. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#18 edit Differences ... ==== //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#18 (text+ko) ==== @@ -96,7 +96,7 @@ * User stack trace (debugging aid). */ static void -db_utrace(struct thread *td, struct trapframe *tf) +db_utrace(struct thread *td, struct trapframe *tf, int count) { struct pcb *pcb; db_addr_t sp, rsp, o7, pc; @@ -108,7 +108,7 @@ FALSE); pc = db_get_value((db_addr_t)&tf->tf_tpc, sizeof(tf->tf_tpc), FALSE); db_printf("user trace: trap %%o7=%#lx\n", o7); - while (sp != 0) { + while (count-- && sp != 0) { db_printf("pc %#lx, sp %#lx\n", pc, sp); /* First, check whether the frame is in the pcb. */ found = 0; @@ -134,7 +134,7 @@ } static int -db_print_trap(struct thread *td, struct trapframe *tf) +db_print_trap(struct thread *td, struct trapframe *tf, int count) { struct proc *p; const char *symname; @@ -212,7 +212,7 @@ db_printf("userland() at "); db_printsym(tpc, DB_STGY_PROC); db_printf("\n"); - db_utrace(td, tf); + db_utrace(td, tf, count); } return (user); } @@ -260,7 +260,7 @@ tf = (struct trapframe *)(fp + 1); npc = db_get_value((db_addr_t)&tf->tf_tpc, sizeof(tf->tf_tpc), FALSE); - user = db_print_trap(td, tf); + user = db_print_trap(td, tf, count); trap = 1; } else { db_printf("%s() at ", name); From owner-p4-projects@FreeBSD.ORG Wed Sep 15 20:07:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE2FF16A4D0; Wed, 15 Sep 2004 20:07:14 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A075916A4CE for ; Wed, 15 Sep 2004 20:07:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 810E943D39 for ; Wed, 15 Sep 2004 20:07:14 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8FK7ELj098981 for ; Wed, 15 Sep 2004 20:07:14 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8FK7ENN098978 for perforce@freebsd.org; Wed, 15 Sep 2004 20:07:14 GMT (envelope-from jhb@freebsd.org) Date: Wed, 15 Sep 2004 20:07:14 GMT Message-Id: <200409152007.i8FK7ENN098978@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 61555 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2004 20:07:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=61555 Change 61555 by jhb@jhb_slimer on 2004/09/15 20:06:20 Remove unused macro. Affected files ... .. //depot/projects/smpng/sys/kern/kern_ktr.c#26 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_ktr.c#26 (text+ko) ==== @@ -266,8 +266,6 @@ static int db_ktr_verbose; static int db_mach_vtrace(void); -#define NUM_LINES_PER_PAGE 18 - DB_SHOW_COMMAND(ktr, db_ktr_all) { int quit; From owner-p4-projects@FreeBSD.ORG Wed Sep 15 20:09:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6E6416A4D1; Wed, 15 Sep 2004 20:09:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A2A4516A4CE for ; Wed, 15 Sep 2004 20:09:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D09043D5A for ; Wed, 15 Sep 2004 20:09:17 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8FK9HqX099019 for ; Wed, 15 Sep 2004 20:09:17 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8FK9HfO099015 for perforce@freebsd.org; Wed, 15 Sep 2004 20:09:17 GMT (envelope-from jhb@freebsd.org) Date: Wed, 15 Sep 2004 20:09:17 GMT Message-Id: <200409152009.i8FK9HfO099015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 61556 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2004 20:09:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=61556 Change 61556 by jhb@jhb_slimer on 2004/09/15 20:08:44 Add paging support to all the stack tracing functions. (i.e. you can make it go line at a time or page at a time or quit at any time). Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/db_trace.c#12 edit .. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#7 edit .. //depot/projects/smpng/sys/arm/arm/db_trace.c#4 edit .. //depot/projects/smpng/sys/i386/i386/db_trace.c#17 edit .. //depot/projects/smpng/sys/ia64/ia64/db_trace.c#16 edit .. //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#6 edit .. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#19 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/db_trace.c#12 (text+ko) ==== @@ -213,14 +213,16 @@ db_expr_t diff; db_addr_t symval; u_long last_ipl, tfps; - int i; + int i, quit; if (count == -1) count = 1024; last_ipl = ~0L; tf = NULL; - while (count--) { + quit = 0; + db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + while (count-- && !quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &diff); if (sym == DB_SYM_NULL) return (ENOENT); ==== //depot/projects/smpng/sys/amd64/amd64/db_trace.c#7 (text+ko) ==== @@ -373,14 +373,16 @@ long *argp; db_expr_t offset; c_db_sym_t sym; - int narg; + int narg, quit; boolean_t first; if (count == -1) count = 1024; first = TRUE; - while (count--) { + quit = 0; + db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + while (count-- && !quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &offset); db_symbol_values(sym, &name, NULL); ==== //depot/projects/smpng/sys/arm/arm/db_trace.c#4 (text+ko) ==== @@ -102,7 +102,7 @@ db_expr_t offset; boolean_t kernel_only = TRUE; boolean_t trace_thread = FALSE; - int scp_offset; + int scp_offset, quit; if (kdb_frame == NULL && !have_addr) return; @@ -142,7 +142,9 @@ lastframe = NULL; scp_offset = -(get_pc_str_offset() >> 2); - while (count-- && frame != NULL) { + quit = 0; + db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + while (count-- && frame != NULL && !quit) { db_addr_t scp; u_int32_t savecode; int r; ==== //depot/projects/smpng/sys/i386/i386/db_trace.c#17 (text+ko) ==== @@ -379,14 +379,16 @@ int *argp; db_expr_t offset; c_db_sym_t sym; - int narg; + int narg, quit; boolean_t first; if (count == -1) count = 1024; first = TRUE; - while (count--) { + quit = 0; + db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + while (count-- && !quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &offset); db_symbol_values(sym, &name, NULL); ==== //depot/projects/smpng/sys/ia64/ia64/db_trace.c#16 (text+ko) ==== @@ -57,10 +57,12 @@ db_expr_t offset; uint64_t bsp, cfm, ip, pfs, reg, sp; c_db_sym_t sym; - int args, error, i; + int args, error, i, quit; + quit = 0; + db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); error = unw_create_from_pcb(&rs, pcb); - while (!error && count--) { + while (!error && count-- && !quit) { error = unw_get_cfm(&rs, &cfm); if (!error) error = unw_get_bsp(&rs, &bsp); ==== //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#6 (text+ko) ==== @@ -129,6 +129,7 @@ const char *symname; boolean_t kernel_only = TRUE; boolean_t full = FALSE; + int quit; #if 0 { @@ -148,7 +149,9 @@ stackframe = fp; - for (;;) { + quit = 0; + db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + while (!quit) { if (stackframe < PAGE_SIZE) break; ==== //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#19 (text+ko) ==== @@ -96,7 +96,7 @@ * User stack trace (debugging aid). */ static void -db_utrace(struct thread *td, struct trapframe *tf, int count) +db_utrace(struct thread *td, struct trapframe *tf, int count, int *quitp) { struct pcb *pcb; db_addr_t sp, rsp, o7, pc; @@ -108,7 +108,7 @@ FALSE); pc = db_get_value((db_addr_t)&tf->tf_tpc, sizeof(tf->tf_tpc), FALSE); db_printf("user trace: trap %%o7=%#lx\n", o7); - while (count-- && sp != 0) { + while (count-- && sp != 0 && !*quitp) { db_printf("pc %#lx, sp %#lx\n", pc, sp); /* First, check whether the frame is in the pcb. */ found = 0; @@ -134,7 +134,7 @@ } static int -db_print_trap(struct thread *td, struct trapframe *tf, int count) +db_print_trap(struct thread *td, struct trapframe *tf, int count, int *quitp) { struct proc *p; const char *symname; @@ -212,7 +212,7 @@ db_printf("userland() at "); db_printsym(tpc, DB_STGY_PROC); db_printf("\n"); - db_utrace(td, tf, count); + db_utrace(td, tf, count, quitp); } return (user); } @@ -229,6 +229,7 @@ db_addr_t pc; int trap; int user; + int quit; if (count == -1) count = 1024; @@ -236,7 +237,9 @@ trap = 0; user = 0; npc = 0; - while (count-- && !user) { + quit = 0; + db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + while (count-- && !user && !quit) { pc = (db_addr_t)db_get_value((db_addr_t)&fp->fr_pc, sizeof(fp->fr_pc), FALSE); if (trap) { @@ -260,7 +263,7 @@ tf = (struct trapframe *)(fp + 1); npc = db_get_value((db_addr_t)&tf->tf_tpc, sizeof(tf->tf_tpc), FALSE); - user = db_print_trap(td, tf, count); + user = db_print_trap(td, tf, count, &quit); trap = 1; } else { db_printf("%s() at ", name); From owner-p4-projects@FreeBSD.ORG Wed Sep 15 20:16:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6975316A4D0; Wed, 15 Sep 2004 20:16:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 452FF16A4CE for ; Wed, 15 Sep 2004 20:16:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C4AA43D31 for ; Wed, 15 Sep 2004 20:16:27 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8FKGRcK099374 for ; Wed, 15 Sep 2004 20:16:27 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8FKGQHs099371 for perforce@freebsd.org; Wed, 15 Sep 2004 20:16:26 GMT (envelope-from jhb@freebsd.org) Date: Wed, 15 Sep 2004 20:16:26 GMT Message-Id: <200409152016.i8FKGQHs099371@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 61558 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2004 20:16:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=61558 Change 61558 by jhb@jhb_slimer on 2004/09/15 20:15:47 Don't spin forever as it does just spin forever it seems. We seem to have a problem on both i386 and sparc64 where we get into some sort of condition where we can't send an IPI under load. Affected files ... .. //depot/projects/smpng/sys/i386/i386/local_apic.c#12 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/local_apic.c#12 (text+ko) ==== @@ -725,15 +725,9 @@ destfield = dest; } -#ifdef DETECT_DEADLOCK /* Check for an earlier stuck IPI. */ if (!lapic_ipi_wait(BEFORE_SPIN)) panic("APIC: Previous IPI is stuck"); -#else - /* Wait for an earlier IPI to finish. */ - if (!lapic_ipi_wait(-1)) - panic("APIC: Previous IPI is stuck"); -#endif lapic_ipi_raw(icrlo, destfield); From owner-p4-projects@FreeBSD.ORG Wed Sep 15 20:25:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A87E516A4D8; Wed, 15 Sep 2004 20:25:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 63DB816A4CF for ; Wed, 15 Sep 2004 20:25:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B87943D55 for ; Wed, 15 Sep 2004 20:25:39 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8FKPd2a099734 for ; Wed, 15 Sep 2004 20:25:39 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8FKPcnc099731 for perforce@freebsd.org; Wed, 15 Sep 2004 20:25:38 GMT (envelope-from peter@freebsd.org) Date: Wed, 15 Sep 2004 20:25:38 GMT Message-Id: <200409152025.i8FKPcnc099731@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 61560 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2004 20:25:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=61560 Change 61560 by peter@peter_daintree on 2004/09/15 20:25:15 IFC @61557 Affected files ... .. //depot/projects/hammer/UPDATING#55 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#34 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#26 integrate .. //depot/projects/hammer/etc/rc.d/ntpdate#9 branch .. //depot/projects/hammer/etc/rc.d/rpcbind#6 integrate .. //depot/projects/hammer/release/Makefile#59 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#12 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#32 integrate .. //depot/projects/hammer/share/man/man9/vm_map.9#4 integrate .. //depot/projects/hammer/sys/alpha/isa/isa_dma.c#6 integrate .. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#14 integrate .. //depot/projects/hammer/sys/amd64/isa/isa_dma.h#7 delete .. //depot/projects/hammer/sys/dev/aha/aha_mca.c#8 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_mca.c#7 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#22 integrate .. //depot/projects/hammer/sys/dev/nge/if_ngereg.h#5 integrate .. //depot/projects/hammer/sys/dev/pst/pst-iop.h#5 integrate .. //depot/projects/hammer/sys/dev/pst/pst-pci.c#6 integrate .. //depot/projects/hammer/sys/dev/pst/pst-raid.c#10 integrate .. //depot/projects/hammer/sys/i386/isa/isa_dma.c#6 integrate .. //depot/projects/hammer/sys/i386/isa/isa_dma.h#3 delete .. //depot/projects/hammer/sys/ia64/isa/isa_dma.c#4 integrate .. //depot/projects/hammer/sys/isa/isavar.h#4 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#64 integrate .. //depot/projects/hammer/sys/net/if_clone.c#3 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#20 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#39 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#21 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#22 integrate .. //depot/projects/hammer/sys/pc98/pc98/isa_dma.c#4 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#30 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#34 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#25 integrate .. //depot/projects/hammer/usr.sbin/burncd/burncd.8#9 integrate .. //depot/projects/hammer/usr.sbin/burncd/burncd.c#8 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/disks.c#15 integrate Differences ... ==== //depot/projects/hammer/UPDATING#55 (text+ko) ==== @@ -24,16 +24,6 @@ to maximize performance. 20040914: - /etc/rc.d/ntpdate has been removed in favor of using the -g - flag to ntpd(1). By default, if ntpd is enabled, it will sync - with the time servers listed in /etc/ntp.conf regardless of the - time difference (slew). To prevent this, add - ntpd_sync_on_start="NO" to /etc/rc.conf. - - NOTE: Doing a sync (ntpd -g) is noticably slower than ntpdate(1), - but is also more accurate (hence ntpdate(1) being depreciated). - -20040914: The format of the pflogd(8) logfile "/var/log/pflog" has changed for architectures that have a 64 bit long type to make it compatible to the standard pcap format. In order to prevent corruption move away @@ -1869,4 +1859,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.358 2004/09/14 03:01:38 seanc Exp $ +$FreeBSD: src/UPDATING,v 1.359 2004/09/15 01:08:32 seanc Exp $ ==== //depot/projects/hammer/etc/defaults/rc.conf#34 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.213 2004/09/14 03:01:38 seanc Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.214 2004/09/15 01:08:32 seanc Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -219,9 +219,12 @@ ### Network Time Services options: ### timed_enable="NO" # Run the time daemon (or NO). timed_flags="" # Flags to timed (if enabled). +ntpdate_enable="NO" # Run ntpdate to sync time on boot (or NO). +ntpdate_program="/usr/sbin/ntpdate" # path to ntpdate, if you want a different one. +ntpdate_flags="-b" # Flags to ntpdate (if enabled). ntpd_enable="NO" # Run ntpd Network Time Protocol (or NO). ntpd_program="/usr/sbin/ntpd" # path to ntpd, if you want a different one. -ntpd_sync_on_start="YES" # Sync time on ntpd startup, even if offset is high +ntpd_sync_on_start="NO" # Sync time on ntpd startup, even if offset is high ntpd_flags="-p /var/run/ntpd.pid -f /var/db/ntpd.drift" # Flags to ntpd (if enabled). ==== //depot/projects/hammer/etc/rc.d/Makefile#26 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.42 2004/09/14 03:01:38 seanc Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.43 2004/09/15 01:08:33 seanc Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -23,7 +23,7 @@ mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ network_ipv6 nfsclient nfsd \ - nfslocking nfsserver nisdomain nsswitch ntpd \ + nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \ othermta \ pccard pcvt pf pflog preseedrandom \ power_profile ppp-user pppoed pwcheck \ ==== //depot/projects/hammer/etc/rc.d/rpcbind#6 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: rpcbind,v 1.6 2002/01/31 01:26:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/rpcbind,v 1.10 2004/09/14 03:01:38 seanc Exp $ +# $FreeBSD: src/etc/rc.d/rpcbind,v 1.11 2004/09/15 01:08:33 seanc Exp $ # # PROVIDE: rpcbind -# REQUIRE: NETWORKING ntpd syslogd named +# REQUIRE: NETWORKING ntpdate syslogd named # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/hammer/release/Makefile#59 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.860 2004/09/14 04:01:57 brooks Exp $ +# $FreeBSD: src/release/Makefile,v 1.861 2004/09/15 05:14:21 brooks Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -919,8 +919,7 @@ @echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DISC2}/boot/loader.conf .if exists(${HINTSFILE}) # Break the link to device.hints so we can modify it - @rm ${CD_DISC2}/boot/device.hints - @cp ${HINTSFILE} ${CD_DISC2}/boot/device.hints + @cp -f ${HINTSFILE} ${CD_DISC2}/boot/device.hints .if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64" @echo 'hint.atkbd.0.flags="0x1"' >> ${CD_DISC2}/boot/device.hints .endif ==== //depot/projects/hammer/sbin/atacontrol/atacontrol.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.31 2004/05/20 15:01:26 des Exp $ + * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.32 2004/09/15 11:22:05 sos Exp $ */ #include @@ -187,16 +187,18 @@ parm->enabled.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no"); if (parm->satacapabilities && parm->satacapabilities != 0xffff) { - printf("SATA NCQ %s %s %d/0x%02X\n", - parm->satacapabilities & ATA_SUPPORT_NCQ ? "yes" : "no", - " -", ATA_QUEUE_LEN(parm->queue), - ATA_QUEUE_LEN(parm->queue)); + printf("Native Command Queuing (NCQ) %s %s %d/0x%02X\n", + parm->satacapabilities & ATA_SUPPORT_NCQ ? + "yes" : "no", " -", + (parm->satacapabilities & ATA_SUPPORT_NCQ) ? + ATA_QUEUE_LEN(parm->queue) : 0, + (parm->satacapabilities & ATA_SUPPORT_NCQ) ? + ATA_QUEUE_LEN(parm->queue) : 0); } - else - printf("dma queued %s %s %d/0x%02X\n", - parm->support.command2 & ATA_SUPPORT_QUEUED ? "yes" : "no", - parm->enabled.command2 & ATA_SUPPORT_QUEUED ? "yes" : "no", - ATA_QUEUE_LEN(parm->queue), ATA_QUEUE_LEN(parm->queue)); + printf("Tagged Command Queuing (TCQ) %s %s %d/0x%02X\n", + parm->support.command2 & ATA_SUPPORT_QUEUED ? "yes" : "no", + parm->enabled.command2 & ATA_SUPPORT_QUEUED ? "yes" : "no", + ATA_QUEUE_LEN(parm->queue), ATA_QUEUE_LEN(parm->queue)); printf("SMART %s %s\n", parm->support.command1 & ATA_SUPPORT_SMART ? "yes" : "no", ==== //depot/projects/hammer/share/man/man5/rc.conf.5#32 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.221 2004/07/18 18:01:48 simon Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.222 2004/09/15 01:39:25 seanc Exp $ .\" .Dd April 25, 2004 .Dt RC.CONF 5 @@ -1604,6 +1604,25 @@ these are the flags to pass to the .Xr ntpd 8 daemon. +.It Va ntpd_sync_on_start +.Pq Vt bool +If set to +.Dq Li YES , +.Xr ntpd 8 +is run with the +.Op Fl g +flag, which syncs the system's clock on startup. +See +.Xr ntpd 8 +for more information regarding the +.Op Fl g +option. +This is a preferred alternative to using +.Xr ntpdate 1 +or specifying the +.Pa /etc/rc.conf +tunable +.Op Ar ntpdate_enable . .It Va nis_client_enable .Pq Vt bool If set to ==== //depot/projects/hammer/share/man/man9/vm_map.9#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vm_map.9,v 1.4 2004/07/06 07:02:31 ru Exp $ +.\" $FreeBSD: src/share/man/man9/vm_map.9,v 1.5 2004/09/15 18:41:10 alc Exp $ .\" .Dd July 19, 2003 .Dt VM_MAP 9 @@ -52,17 +52,18 @@ .Bd -literal -offset indent struct vm_map { struct vm_map_entry header; - struct lock lock; + struct sx lock; struct mtx system_mtx; int nentries; vm_size_t size; + u_int timestamp; u_char needs_wakeup; u_char system_map; - u_char infork; + vm_flags_t flags; vm_map_entry_t root; - unsigned int timestamp; - vm_map_entry_t first_free; pmap_t pmap; +#define min_offset header.start +#define max_offset header.end }; .Ed .Pp @@ -83,23 +84,38 @@ A count of the members in use within the circular map entry list. .It Va size Specifies the size of the virtual address space. -.It Va infork -Indicates if the map structure is currently undergoing fork processing. +.It Va timestamp +Used to determine if the map has changed since its last access. .It Va needs_wakeup Indicates if a thread is waiting for an allocation within the map. Used only by system maps. .It Va system_map Set to TRUE to indicate that map is a system map; otherwise, it belongs to a user process. +.It Va flags +Map flags. .It Va root Root node of a binary search tree used for fast lookup of map entries. -.It Va timestamp -Used to determine if the map has changed since its last access. -.It Va first_free -Provides a hint to the first free space within the map. .It Va pmap Pointer to the underlying physical map with which this virtual map is associated. +.It Va min_offset +The minimum +.Va vm_offset_t +in this map. +Programs should never use +.Va header.start +or +.Va header.end +directly, use +.Va min_offset +and +.Va max_offset +instead. +.It Va max_offset +The maximum +.Va vm_offset_t +in this map. .El .Pp The following flags can be passed to @@ -141,6 +157,8 @@ vm_offset_t start; vm_offset_t end; vm_offset_t avail_ssize; + vm_size_t adj_free; + vm_size_t max_free; union vm_map_object object; vm_ooffset_t offset; vm_eflags_t eflags; @@ -171,6 +189,11 @@ Upper address bound of this entry's region. .It Va avail_ssize If the entry is for a process stack, specifies how much the entry can grow. +.It Va adj_free +The amount of free, unmapped address space adjacent to and immediately +following this map entry. +.It Va max_free +The maximum amount of contiguous free space in this map entry's subtree. .It Va object Pointer to the .Vt struct vm_map_object ==== //depot/projects/hammer/sys/alpha/isa/isa_dma.c#6 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.11 2004/04/05 21:00:51 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.12 2004/09/15 12:09:49 phk Exp $"); #include #include @@ -93,10 +93,8 @@ /* * Setup a DMA channel's bounce buffer. */ -void -isa_dmainit(chan, bouncebufsize) - int chan; - u_int bouncebufsize; +int +isa_dma_init(int chan, u_int bouncebufsize, int flag __unused) { static int initted = 0; bus_addr_t boundary = chan >= 4 ? 0x20000 : 0x10000; @@ -114,10 +112,10 @@ #ifdef DIAGNOSTIC if (chan & ~VALID_DMA_MASK) - panic("isa_dmainit: channel out of range"); + panic("isa_dma_init: channel out of range"); if (dma_tag[chan] || dma_map[chan]) - panic("isa_dmainit: impossible request"); + panic("isa_dma_init: impossible request"); #endif if (bus_dma_tag_create(/*parent*/NULL, @@ -132,13 +130,13 @@ /*lockfunc*/busdma_lock_mutex, /*lockarg*/&Giant, &dma_tag[chan]) != 0) { - panic("isa_dmainit: unable to create dma tag\n"); + panic("isa_dma_init: unable to create dma tag\n"); } if (bus_dmamap_create(dma_tag[chan], 0, &dma_map[chan])) { - panic("isa_dmainit: unable to create dma map\n"); + panic("isa_dma_init: unable to create dma map\n"); } - + return (0); } /* @@ -349,7 +347,7 @@ #endif if (!dma_tag || !dma_map[chan]) - panic("isa_dmastart: called without isa_dmainit"); + panic("isa_dmastart: called without isa_dma_init"); dma_busy |= (1 << chan); ==== //depot/projects/hammer/sys/amd64/isa/isa_dma.c#14 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.19 2004/08/16 22:51:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.20 2004/09/15 12:09:49 phk Exp $"); /* * code to manage AT bus @@ -96,15 +96,13 @@ /* * Setup a DMA channel's bounce buffer. */ -void -isa_dmainit(chan, bouncebufsize) - int chan; - u_int bouncebufsize; +int +isa_dma_init(int chan, u_int bouncebufsize, int flag) { void *buf; /* - * If a DMA channel is shared, both drivers have to call isa_dmainit + * If a DMA channel is shared, both drivers have to call isa_dma_init * since they don't know that the other driver will do it. * Just return if we're already set up good. * XXX: this only works if they agree on the bouncebuf size. This @@ -112,30 +110,30 @@ * XXX: the same driver. */ if (dma_bouncebuf[chan] != NULL) - return; + return (0); #ifdef DIAGNOSTIC if (chan & ~VALID_DMA_MASK) - panic("isa_dmainit: channel out of range"); + panic("isa_dma_init: channel out of range"); #endif dma_bouncebufsize[chan] = bouncebufsize; /* Try malloc() first. It works better if it works. */ - buf = malloc(bouncebufsize, M_DEVBUF, M_NOWAIT); + buf = malloc(bouncebufsize, M_DEVBUF, flag); if (buf != NULL) { if (isa_dmarangecheck(buf, bouncebufsize, chan) == 0) { dma_bouncebuf[chan] = buf; - return; + return (0); } free(buf, M_DEVBUF); } - buf = contigmalloc(bouncebufsize, M_DEVBUF, M_NOWAIT, 0ul, 0xfffffful, + buf = contigmalloc(bouncebufsize, M_DEVBUF, flag, 0ul, 0xfffffful, 1ul, chan & 4 ? 0x20000ul : 0x10000ul); if (buf == NULL) - printf("isa_dmainit(%d, %d) failed\n", chan, bouncebufsize); - else - dma_bouncebuf[chan] = buf; + return (ENOMEM); + dma_bouncebuf[chan] = buf; + return (0); } /* ==== //depot/projects/hammer/sys/dev/aha/aha_mca.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aha/aha_mca.c,v 1.11 2004/03/17 17:50:24 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aha/aha_mca.c,v 1.12 2004/09/15 11:58:34 phk Exp $"); #include #include @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include ==== //depot/projects/hammer/sys/dev/buslogic/bt_mca.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_mca.c,v 1.9 2004/03/17 17:50:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_mca.c,v 1.10 2004/09/15 11:58:34 phk Exp $"); /* * Written using the bt_isa/bt_pci code as a reference. @@ -55,7 +55,7 @@ #include #include -#include +#include #include ==== //depot/projects/hammer/sys/dev/nge/if_nge.c#22 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.67 2004/09/14 22:32:58 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.68 2004/09/15 03:39:17 alc Exp $"); /* * National Semiconductor DP83820/DP83821 gigabit ethernet driver @@ -151,7 +151,7 @@ static int nge_newbuf(struct nge_softc *, struct nge_desc *, struct mbuf *); static int nge_encap(struct nge_softc *, struct mbuf *, u_int32_t *); -#ifdef VGE_FIXUP_RX +#ifdef NGE_FIXUP_RX static __inline void nge_fixup_rx (struct mbuf *); #endif static void nge_rxeof(struct nge_softc *); ==== //depot/projects/hammer/sys/dev/nge/if_ngereg.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/nge/if_ngereg.h,v 1.10 2004/09/14 22:06:25 wpaul Exp $ + * $FreeBSD: src/sys/dev/nge/if_ngereg.h,v 1.11 2004/09/15 03:39:18 alc Exp $ */ #define NGE_CSR 0x00 @@ -637,7 +637,7 @@ #define NGE_JUMBO_MTU (NGE_JUMBO_FRAMELEN-ETHER_HDR_LEN-ETHER_CRC_LEN) #if !defined(__i386__) -#define VGE_FIXUP_RX +#define NGE_FIXUP_RX #endif struct nge_ring_data { ==== //depot/projects/hammer/sys/dev/pst/pst-iop.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pst/pst-iop.h,v 1.4 2003/04/28 08:10:27 sos Exp $ + * $FreeBSD: src/sys/dev/pst/pst-iop.h,v 1.5 2004/09/15 15:39:28 sos Exp $ */ /* misc defines */ @@ -42,7 +42,6 @@ struct resource *r_mem; struct resource *r_irq; caddr_t ibase; - u_int32_t phys_ibase; caddr_t obase; u_int32_t phys_obase; struct i2o_registers *reg; ==== //depot/projects/hammer/sys/dev/pst/pst-pci.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pst/pst-pci.c,v 1.6 2004/03/17 17:50:39 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pst/pst-pci.c,v 1.7 2004/09/15 15:39:28 sos Exp $"); #include #include @@ -93,7 +93,6 @@ PCIM_CMD_MEMEN | PCIM_CMD_BUSMASTEREN, 1); sc->ibase = rman_get_virtual(sc->r_mem); - sc->phys_ibase = vtophys(sc->ibase); sc->reg = (struct i2o_registers *)sc->ibase; sc->dev = dev; mtx_init(&sc->mtx, "pst lock", MTX_DEF, 0); ==== //depot/projects/hammer/sys/dev/pst/pst-raid.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pst/pst-raid.c,v 1.13 2004/02/18 21:36:52 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pst/pst-raid.c,v 1.14 2004/09/15 15:39:28 sos Exp $"); #include #include @@ -123,11 +123,11 @@ if (!(psc->info = (struct i2o_bsa_device *) malloc(sizeof(struct i2o_bsa_device), M_PSTRAID, M_NOWAIT))) { - contigfree(reply, PAGE_SIZE, M_PSTRAID); + contigfree(reply, PAGE_SIZE, M_PSTIOP); return ENOMEM; } bcopy(reply->result, psc->info, sizeof(struct i2o_bsa_device)); - contigfree(reply, PAGE_SIZE, M_PSTRAID); + contigfree(reply, PAGE_SIZE, M_PSTIOP); if (!(reply = iop_get_util_params(psc->iop, psc->lct->local_tid, I2O_PARAMS_OPERATION_FIELD_GET, @@ -145,7 +145,7 @@ bpack(ident->vendor, ident->vendor, 16); bpack(ident->product, ident->product, 16); sprintf(name, "%s %s", ident->vendor, ident->product); - contigfree(reply, PAGE_SIZE, M_PSTRAID); + contigfree(reply, PAGE_SIZE, M_PSTIOP); bioq_init(&psc->queue); ==== //depot/projects/hammer/sys/i386/isa/isa_dma.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/isa_dma.c,v 1.16 2004/07/05 20:37:42 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/isa_dma.c,v 1.17 2004/09/15 12:09:50 phk Exp $"); /* * code to manage AT bus @@ -94,15 +94,13 @@ /* * Setup a DMA channel's bounce buffer. */ -void -isa_dmainit(chan, bouncebufsize) - int chan; - u_int bouncebufsize; +int +isa_dma_init(int chan, u_int bouncebufsize, int flag) { void *buf; /* - * If a DMA channel is shared, both drivers have to call isa_dmainit + * If a DMA channel is shared, both drivers have to call isa_dma_init * since they don't know that the other driver will do it. * Just return if we're already set up good. * XXX: this only works if they agree on the bouncebuf size. This @@ -110,30 +108,30 @@ * XXX: the same driver. */ if (dma_bouncebuf[chan] != NULL) - return; + return (0); #ifdef DIAGNOSTIC if (chan & ~VALID_DMA_MASK) - panic("isa_dmainit: channel out of range"); + panic("isa_dma_init: channel out of range"); #endif dma_bouncebufsize[chan] = bouncebufsize; /* Try malloc() first. It works better if it works. */ - buf = malloc(bouncebufsize, M_DEVBUF, M_NOWAIT); + buf = malloc(bouncebufsize, M_DEVBUF, flag); if (buf != NULL) { if (isa_dmarangecheck(buf, bouncebufsize, chan) == 0) { dma_bouncebuf[chan] = buf; - return; + return (0); } free(buf, M_DEVBUF); } - buf = contigmalloc(bouncebufsize, M_DEVBUF, M_NOWAIT, 0ul, 0xfffffful, + buf = contigmalloc(bouncebufsize, M_DEVBUF, flag, 0ul, 0xfffffful, 1ul, chan & 4 ? 0x20000ul : 0x10000ul); if (buf == NULL) - printf("isa_dmainit(%d, %d) failed\n", chan, bouncebufsize); - else - dma_bouncebuf[chan] = buf; + return (ENOMEM); + dma_bouncebuf[chan] = buf; + return (0); } /* ==== //depot/projects/hammer/sys/ia64/isa/isa_dma.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 * from: isa_dma.c,v 1.3 1999/05/09 23:56:00 peter Exp $ - * $FreeBSD: src/sys/ia64/isa/isa_dma.c,v 1.6 2004/04/07 20:46:08 imp Exp $ + * $FreeBSD: src/sys/ia64/isa/isa_dma.c,v 1.7 2004/09/15 12:09:50 phk Exp $ */ /* @@ -91,10 +91,8 @@ /* * Setup a DMA channel's bounce buffer. */ -void -isa_dmainit(chan, bouncebufsize) - int chan; - u_int bouncebufsize; +int +isa_dma_init(int chan, u_int bouncebufsize, int flag __unused) { static int initted = 0; bus_addr_t boundary = chan >= 4 ? 0x20000 : 0x10000; @@ -112,10 +110,10 @@ #ifdef DIAGNOSTIC if (chan & ~VALID_DMA_MASK) - panic("isa_dmainit: channel out of range"); + panic("isa_dma_init: channel out of range"); if (dma_tag[chan] || dma_map[chan]) - panic("isa_dmainit: impossible request"); + panic("isa_dma_init: impossible request"); #endif if (bus_dma_tag_create(/*parent*/NULL, @@ -130,13 +128,14 @@ /*lockfunc*/busdma_lock_mutex, /*lockarg*/&Giant, &dma_tag[chan]) != 0) { - panic("isa_dmainit: unable to create dma tag\n"); + panic("isa_dma_init: unable to create dma tag\n"); } if (bus_dmamap_create(dma_tag[chan], 0, &dma_map[chan])) { - panic("isa_dmainit: unable to create dma map\n"); + panic("isa_dma_init: unable to create dma map\n"); } + return (0); } /* @@ -351,7 +350,7 @@ #endif if (!dma_tag || !dma_map[chan]) - panic("isa_dmastart: called without isa_dmainit"); + panic("isa_dmastart: called without isa_dma_init"); dma_busy |= (1 << chan); ==== //depot/projects/hammer/sys/isa/isavar.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/isa/isavar.h,v 1.25 2003/07/08 18:56:58 jhb Exp $ + * $FreeBSD: src/sys/isa/isavar.h,v 1.26 2004/09/15 12:09:50 phk Exp $ */ #ifndef _ISA_ISAVAR_H_ @@ -160,13 +160,19 @@ extern void isa_dmacascade(int chan); extern void isa_dmadone(int flags, caddr_t addr, int nbytes, int chan); -extern void isa_dmainit(int chan, u_int bouncebufsize); +extern int isa_dma_init(int chan, u_int bouncebufsize, int flag); extern void isa_dmastart(int flags, caddr_t addr, u_int nbytes, int chan); extern int isa_dma_acquire(int chan); extern void isa_dma_release(int chan); extern int isa_dmastatus(int chan); extern int isa_dmastop(int chan); +#define isa_dmainit(chan, size) do { \ + if (isa_dma_init(chan, size, M_NOWAIT)) \ + printf("WARNING: isa_dma_init(%d, %ju) failed\n", \ + (int)(chan), (uintmax_t)(size)); \ + } while (0) + int isab_attach(device_t dev); #ifdef PC98 ==== //depot/projects/hammer/sys/kern/kern_switch.c#28 (text+ko) ==== @@ -86,7 +86,7 @@ ***/ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.91 2004/09/13 23:06:39 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.92 2004/09/15 03:51:51 julian Exp $"); #include "opt_sched.h" @@ -224,6 +224,7 @@ } } +#ifdef SCHED_4BSD /* * Remove a thread from its KSEGRP's run queue. * This in turn may remove it from a KSE if it was already assigned @@ -273,6 +274,7 @@ /* slot_fill(kg); */ /* will replace it with another */ } } +#endif /* * Change the priority of a thread that is on the run queue. ==== //depot/projects/hammer/sys/kern/kern_thread.c#64 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.196 2004/09/05 02:09:53 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.197 2004/09/15 18:39:09 julian Exp $"); #include #include @@ -829,12 +829,22 @@ remaining = p->p_numthreads - p->p_suspcount; } if (force_exit == SINGLE_EXIT) { + /* + * We have gotten rid of all the other threads and we + * are about to either exit or exec. In either case, + * we try our utmost to revert to being a non-threaded + * process. + */ upcall_remove(td); p->p_flag &= ~(P_SA|P_HADTHREADS); td->td_mailbox = NULL; - td->td_pflags &= ~TDP_SA; + td->td_pflags &= ~(TDP_SA | TDP_CAN_UNBIND); p->p_flag &= ~(P_STOPPED_SINGLE | P_SINGLE_EXIT); p->p_singlethread = NULL; + if (td->td_standin != NULL) { + thread_stash(td->td_standin); + td->td_standin = NULL; + } sched_set_concurrency(td->td_ksegrp, 1); mtx_unlock_spin(&sched_lock); } else { ==== //depot/projects/hammer/sys/net/if_clone.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if_clone.c,v 1.2 2004/07/20 21:44:28 mlaier Exp $ + * $FreeBSD: src/sys/net/if_clone.c,v 1.3 2004/09/15 04:41:56 brooks Exp $ */ #include @@ -235,9 +235,24 @@ int if_clone_list(struct if_clonereq *ifcr) { - char outbuf[IFNAMSIZ], *dst; + char *buf, *dst, *outbuf = NULL; struct if_clone *ifc; - int count, err = 0; + int buf_count, count, err = 0; + + IF_CLONERS_LOCK(); + /* + * Set our internal output buffer size. We could end up not + * reporting a cloner that is added between the unlock and lock + * below, but that's not a major problem. Not caping our + * allocation to the number of cloners actually in the system + * could be because that would let arbitrary users cause us to + * allocate abritrary amounts of kernel memory. + */ + buf_count = (if_cloners_count < ifcr->ifcr_count) ? + if_cloners_count : ifcr->ifcr_count; + IF_CLONERS_UNLOCK(); + + outbuf = malloc(IFNAMSIZ*buf_count, M_CLONE, M_WAITOK | M_ZERO); IF_CLONERS_LOCK(); @@ -252,19 +267,21 @@ goto done; } - count = (if_cloners_count < ifcr->ifcr_count) ? - if_cloners_count : ifcr->ifcr_count; + count = (if_cloners_count < buf_count) ? + if_cloners_count : buf_count; - for (ifc = LIST_FIRST(&if_cloners); ifc != NULL && count != 0; - ifc = LIST_NEXT(ifc, ifc_list), count--, dst += IFNAMSIZ) { - strlcpy(outbuf, ifc->ifc_name, IFNAMSIZ); - err = copyout(outbuf, dst, IFNAMSIZ); - if (err) - break; + for (ifc = LIST_FIRST(&if_cloners), buf = outbuf; + ifc != NULL && count != 0; + ifc = LIST_NEXT(ifc, ifc_list), count--, buf += IFNAMSIZ) { + strlcpy(buf, ifc->ifc_name, IFNAMSIZ); } done: IF_CLONERS_UNLOCK(); + if (err == 0) + err = copyout(outbuf, dst, buf_count*IFNAMSIZ); + if (outbuf != NULL) + free(outbuf, M_CLONE); return (err); } ==== //depot/projects/hammer/sys/netinet/ip_icmp.c#20 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.96 2004/08/16 18:32:07 rwatson Exp $ + * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.97 2004/09/15 20:13:26 andre Exp $ */ #include "opt_ipsec.h" @@ -711,7 +711,7 @@ * add on any record-route or timestamp options. */ cp = (u_char *) (ip + 1); - if ((opts = ip_srcroute()) == 0 && + if ((opts = ip_srcroute(m)) == 0 && (opts = m_gethdr(M_DONTWAIT, MT_HEADER))) { opts->m_len = sizeof(struct in_addr); mtod(opts, struct in_addr *)->s_addr = 0; ==== //depot/projects/hammer/sys/netinet/ip_input.c#39 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_input.c,v 1.286 2004/08/27 15:16:22 andre Exp $ + * $FreeBSD: src/sys/netinet/ip_input.c,v 1.287 2004/09/15 20:13:26 andre Exp $ */ #include "opt_bootp.h" @@ -213,28 +213,22 @@ int fw_one_pass = 1; /* - * XXX this is ugly -- the following two global variables are - * used to store packet state while it travels through the stack. - * Note that the code even makes assumptions on the size and - * alignment of fields inside struct ip_srcrt so e.g. adding some - * fields will break the code. This needs to be fixed. - * - * We need to save the IP options in case a protocol wants to respond - * to an incoming packet over the same route if the packet got here - * using IP source routing. This allows connection establishment and - * maintenance when the remote end is on a network that is not known - * to us. - * XXX: Broken on SMP and possibly preemption! + * XXX this is ugly. IP options source routing magic. */ -static int ip_nhops = 0; -static struct ip_srcrt { +struct ipoptrt { struct in_addr dst; /* final destination */ char nop; /* one NOP to align */ char srcopt[IPOPT_OFFSET + 1]; /* OPTVAL, OLEN and OFFSET */ struct in_addr route[MAX_IPOPTLEN/sizeof(struct in_addr)]; -} ip_srcrt; +}; + +struct ipopt_tag { + struct m_tag tag; + int ip_nhops; + struct ipoptrt ip_srcrt; +}; -static void save_rte(u_char *, struct in_addr); +static void save_rte(struct mbuf *, u_char *, struct in_addr); static int ip_dooptions(struct mbuf *m, int); static void ip_forward(struct mbuf *m, int srcrt); static void ip_freef(struct ipqhead *, struct ipq *); @@ -1244,7 +1238,7 @@ */ if (!ip_acceptsourceroute) goto nosourcerouting; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 15 20:28:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E24A16A4D0; Wed, 15 Sep 2004 20:28:44 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28EEA16A4CE for ; Wed, 15 Sep 2004 20:28:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B17843D2F for ; Wed, 15 Sep 2004 20:28:44 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8FKShL0099792 for ; Wed, 15 Sep 2004 20:28:43 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8FKShwB099789 for perforce@freebsd.org; Wed, 15 Sep 2004 20:28:43 GMT (envelope-from peter@freebsd.org) Date: Wed, 15 Sep 2004 20:28:43 GMT Message-Id: <200409152028.i8FKShwB099789@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 61562 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2004 20:28:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=61562 Change 61562 by peter@peter_daintree on 2004/09/15 20:27:49 integ -I -b i386_hammer (just a metadata sync) Affected files ... .. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#15 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/isa/isa_dma.c#15 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Sep 15 20:49:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BF1B16A4D0; Wed, 15 Sep 2004 20:49:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C9A816A4CE for ; Wed, 15 Sep 2004 20:49:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3A7343D31 for ; Wed, 15 Sep 2004 20:49:08 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8FKn8id000415 for ; Wed, 15 Sep 2004 20:49:08 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8FKn8AN000412 for perforce@freebsd.org; Wed, 15 Sep 2004 20:49:08 GMT (envelope-from peter@freebsd.org) Date: Wed, 15 Sep 2004 20:49:08 GMT Message-Id: <200409152049.i8FKn8AN000412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 61563 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2004 20:49:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=61563 Change 61563 by peter@peter_daintree on 2004/09/15 20:48:08 quiet a warning that has been annoying me for ages Affected files ... .. //depot/projects/hammer/contrib/binutils/ld/ldemul.h#4 edit Differences ... ==== //depot/projects/hammer/contrib/binutils/ld/ldemul.h#4 (text+ko) ==== @@ -17,6 +17,8 @@ #ifndef LDEMUL_H #define LDEMUL_H +struct option; + extern void ldemul_hll (char *); extern void ldemul_syslib From owner-p4-projects@FreeBSD.ORG Wed Sep 15 22:47:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C7CD16A4D0; Wed, 15 Sep 2004 22:47:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47DC116A4CE for ; Wed, 15 Sep 2004 22:47:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E66E43D53 for ; Wed, 15 Sep 2004 22:47:36 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8FMla7Z007964 for ; Wed, 15 Sep 2004 22:47:36 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8FMlZrp007961 for perforce@freebsd.org; Wed, 15 Sep 2004 22:47:35 GMT (envelope-from julian@freebsd.org) Date: Wed, 15 Sep 2004 22:47:35 GMT Message-Id: <200409152247.i8FMlZrp007961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2004 22:47:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=61573 Change 61573 by julian@julian_ref on 2004/09/15 22:46:43 fix backing out of runq addition for preempting threads. Affected files ... .. //depot/projects/nsched/sys/kern/kern_switch.c#32 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_switch.c#32 (text+ko) ==== @@ -591,8 +591,16 @@ /* * If this is a threaded process we actually ARE on the * ksegrp run queue so take it off that first. + * Also undo any damage done to the last_assigned pointer. + * XXX Fix setrunqueue so this isn't needed */ - remrunqueue(td); /* maybe use a simpler version */ + struct ksegrp *kg; + + kg = td->td_ksegrp; + if (kg->kg_last_assigned == td) + kg->kg_last_assigned = + TAILQ_PREV(td, threadqueue, td_runq); + TAILQ_REMOVE(&kg->kg_runq, td, td_runq); } TD_SET_RUNNING(td); From owner-p4-projects@FreeBSD.ORG Thu Sep 16 00:04:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67EF616A4D0; Thu, 16 Sep 2004 00:04:10 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2865916A4CF for ; Thu, 16 Sep 2004 00:04:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F19A043D4C for ; Thu, 16 Sep 2004 00:04:09 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8G0494G010219 for ; Thu, 16 Sep 2004 00:04:09 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8G049oY010216 for perforce@freebsd.org; Thu, 16 Sep 2004 00:04:09 GMT (envelope-from julian@freebsd.org) Date: Thu, 16 Sep 2004 00:04:09 GMT Message-Id: <200409160004.i8G049oY010216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61577 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2004 00:04:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=61577 Change 61577 by julian@julian_ref on 2004/09/16 00:03:24 IFC@61576 Affected files ... .. //depot/projects/nsched/sys/dev/sound/pci/fm801.c#3 integrate .. //depot/projects/nsched/sys/fs/nwfs/nwfs_io.c#4 integrate .. //depot/projects/nsched/sys/fs/smbfs/smbfs_io.c#4 integrate .. //depot/projects/nsched/sys/i386/i386/gdb_machdep.c#2 integrate .. //depot/projects/nsched/sys/i386/include/db_machdep.h#3 integrate .. //depot/projects/nsched/sys/kern/vfs_bio.c#9 integrate .. //depot/projects/nsched/sys/kern/vfs_init.c#5 integrate .. //depot/projects/nsched/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/nsched/sys/netinet/ip_icmp.c#7 integrate .. //depot/projects/nsched/sys/netinet/ip_input.c#9 integrate .. //depot/projects/nsched/sys/netinet/ip_var.h#6 integrate .. //depot/projects/nsched/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/nsched/sys/nfs4client/nfs4_vnops.c#5 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_bio.c#7 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/nsched/sys/sys/buf.h#4 integrate .. //depot/projects/nsched/sys/sys/mbuf.h#9 integrate Differences ... ==== //depot/projects/nsched/sys/dev/sound/pci/fm801.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.23 2004/07/16 03:59:27 tanimura Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.24 2004/09/15 23:47:17 sobomax Exp $"); #define PCI_VENDOR_FORTEMEDIA 0x1319 #define PCI_DEVICE_FORTEMEDIA1 0x08011319 @@ -700,49 +700,11 @@ static int fm801_pci_probe( device_t dev ) { - u_int32_t data; - int id, regtype, regid, result; - struct resource *reg; - bus_space_tag_t st; - bus_space_handle_t sh; + int id; - result = ENXIO; - if ((id = pci_get_devid(dev)) == PCI_DEVICE_FORTEMEDIA1 ) { - data = pci_read_config(dev, PCIR_COMMAND, 2); - data |= (PCIM_CMD_PORTEN|PCIM_CMD_BUSMASTEREN); - pci_write_config(dev, PCIR_COMMAND, data, 2); - data = pci_read_config(dev, PCIR_COMMAND, 2); - - regid = PCIR_BAR(0); - regtype = SYS_RES_IOPORT; - reg = bus_alloc_resource_any(dev, regtype, ®id, RF_ACTIVE); - - if (reg == NULL) - return ENXIO; - - st = rman_get_bustag(reg); - sh = rman_get_bushandle(reg); - /* - * XXX: quick check that device actually has sound capabilities. - * The problem is that some cards built around FM801 chip only - * have radio tuner onboard, but no sound capabilities. There - * is no "official" way to quickly check this, because all - * IDs are exactly the same. The only difference is 0x28 - * device control register, described in FM801 specification - * as "SRC/Mixer Test Control/DFC Status", but without - * any more detailed explanation. According to specs, and - * available sample cards (SF256-PCP-R and SF256-PCS-R) its - * power-on value should be `0', while on AC97-less tuner - * card (SF64-PCR) it was 0x80. - */ - if (bus_space_read_1(st, sh, 0x28) == 0) { - device_set_desc(dev, - "Forte Media FM801 Audio Controller"); - result = 0; - } - - bus_release_resource(dev, regtype, regid, reg); + device_set_desc(dev, "Forte Media FM801 Audio Controller"); + return 0; } /* if ((id = pci_get_devid(dev)) == PCI_DEVICE_FORTEMEDIA2 ) { @@ -750,7 +712,7 @@ return ENXIO; } */ - return (result); + return ENXIO; } static struct resource * ==== //depot/projects/nsched/sys/fs/nwfs/nwfs_io.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/nwfs/nwfs_io.c,v 1.35 2004/09/07 08:53:03 phk Exp $ + * $FreeBSD: src/sys/fs/nwfs/nwfs_io.c,v 1.36 2004/09/15 21:49:20 phk Exp $ * */ #include @@ -328,9 +328,7 @@ uiop->uio_offset = ((off_t)bp->b_blkno) * DEV_BSIZE + bp->b_dirtyoff; io.iov_base = (char *)bp->b_data + bp->b_dirtyoff; uiop->uio_rw = UIO_WRITE; - bp->b_flags |= B_WRITEINPROG; error = ncp_write(NWFSTOCONN(nmp), &np->n_fh, uiop, cr); - bp->b_flags &= ~B_WRITEINPROG; /* * For an interrupted write, the buffer is still valid ==== //depot/projects/nsched/sys/fs/smbfs/smbfs_io.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.28 2004/09/07 08:53:28 phk Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.29 2004/09/15 21:49:21 phk Exp $ * */ #include @@ -353,9 +353,7 @@ uiop->uio_offset = ((off_t)bp->b_blkno) * DEV_BSIZE + bp->b_dirtyoff; io.iov_base = (char *)bp->b_data + bp->b_dirtyoff; uiop->uio_rw = UIO_WRITE; - bp->b_flags |= B_WRITEINPROG; error = smb_write(smp->sm_share, np->n_fid, uiop, &scred); - bp->b_flags &= ~B_WRITEINPROG; /* * For an interrupted write, the buffer is still valid ==== //depot/projects/nsched/sys/i386/i386/gdb_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/gdb_machdep.c,v 1.1 2004/07/10 17:47:21 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/gdb_machdep.c,v 1.2 2004/09/15 23:26:49 julian Exp $"); #include #include @@ -37,6 +37,8 @@ #include #include #include +#include +#include #include @@ -45,6 +47,14 @@ { *regsz = gdb_cpu_regsz(regnum); + + if (kdb_thread == curthread) { + switch (regnum) { + case 0: return (&kdb_frame->tf_eax); + case 1: return (&kdb_frame->tf_ecx); + case 2: return (&kdb_frame->tf_edx); + } + } switch (regnum) { case 3: return (&kdb_thrctx->pcb_ebx); case 4: return (&kdb_thrctx->pcb_esp); @@ -60,8 +70,12 @@ gdb_cpu_setreg(int regnum, register_t val) { + val = __bswap32(val); switch (regnum) { - case GDB_REG_PC: kdb_thrctx->pcb_eip = val; break; + case GDB_REG_PC: + kdb_thrctx->pcb_eip = val; + if (kdb_thread == curthread) + kdb_frame->tf_eip = val; } } ==== //depot/projects/nsched/sys/i386/include/db_machdep.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. * - * $FreeBSD: src/sys/i386/include/db_machdep.h,v 1.18 2004/07/10 23:47:19 marcel Exp $ + * $FreeBSD: src/sys/i386/include/db_machdep.h,v 1.19 2004/09/15 23:26:49 julian Exp $ */ #ifndef _MACHINE_DB_MACHDEP_H_ @@ -41,9 +41,17 @@ #define BKPT_SIZE (1) /* size of breakpoint inst */ #define BKPT_SET(inst) (BKPT_INST) -#define BKPT_SKIP kdb_frame->tf_eip += 1 +#define BKPT_SKIP \ +do { \ + kdb_frame->tf_eip += 1; \ + kdb_thrctx->pcb_eip += 1; \ +} while(0) -#define FIXUP_PC_AFTER_BREAK kdb_frame->tf_eip -= 1; +#define FIXUP_PC_AFTER_BREAK \ +do { \ + kdb_frame->tf_eip -= 1; \ + kdb_thrctx->pcb_eip -= 1; \ +} while(0); #define db_clear_single_step kdb_cpu_clear_singlestep #define db_set_single_step kdb_cpu_set_singlestep ==== //depot/projects/nsched/sys/kern/vfs_bio.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.445 2004/09/13 06:50:41 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.448 2004/09/15 21:49:21 phk Exp $"); #include #include @@ -76,13 +76,13 @@ static struct proc *bufdaemonproc; -static void vm_hold_free_pages(struct buf * bp, vm_offset_t from, +static void vm_hold_free_pages(struct buf *bp, vm_offset_t from, vm_offset_t to); -static void vm_hold_load_pages(struct buf * bp, vm_offset_t from, +static void vm_hold_load_pages(struct buf *bp, vm_offset_t from, vm_offset_t to); static void vfs_page_set_valid(struct buf *bp, vm_ooffset_t off, int pageno, vm_page_t m); -static void vfs_clean_pages(struct buf * bp); +static void vfs_clean_pages(struct buf *bp); static void vfs_setdirty(struct buf *bp); static void vfs_vmio_release(struct buf *bp); static void vfs_backgroundwritedone(struct buf *bp); @@ -90,7 +90,7 @@ daddr_t lblkno, daddr_t blkno); static int flushbufqueues(int flushdeps); static void buf_daemon(void); -void bremfreel(struct buf * bp); +void bremfreel(struct buf *bp); int vmiodirenable = TRUE; SYSCTL_INT(_vfs, OID_AUTO, vmiodirenable, CTLFLAG_RW, &vmiodirenable, 0, @@ -266,6 +266,7 @@ static __inline void numdirtywakeup(int level) { + if (numdirtybuffers <= level) { mtx_lock(&nblock); if (needsbuffer & VFS_BIO_NEED_DIRTYFLUSH) { @@ -288,6 +289,7 @@ static __inline void bufspacewakeup(void) { + /* * If someone is waiting for BUF space, wake them up. Even * though we haven't freed the kva space yet, the waiting @@ -308,6 +310,7 @@ static __inline void runningbufwakeup(struct buf *bp) { + if (bp->b_runningbufspace) { atomic_subtract_int(&runningbufspace, bp->b_runningbufspace); bp->b_runningbufspace = 0; @@ -332,6 +335,7 @@ static __inline void bufcountwakeup(void) { + atomic_add_int(&numfreebuffers, 1); mtx_lock(&nblock); if (needsbuffer) { @@ -361,6 +365,7 @@ static __inline void waitrunningbufspace(void) { + mtx_lock(&rbreqlock); while (runningbufspace > hirunningspace) { ++runningbufreq; @@ -383,6 +388,7 @@ vm_ooffset_t foff, vm_offset_t off, vm_offset_t size, vm_page_t m) { + GIANT_REQUIRED; VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); @@ -398,6 +404,7 @@ void bd_wakeup(int dirtybuflevel) { + mtx_lock(&bdlock); if (bd_request == 0 && numdirtybuffers >= dirtybuflevel) { bd_request = 1; @@ -414,6 +421,7 @@ void bd_speedup(void) { + bd_wakeup(1); } @@ -426,6 +434,7 @@ caddr_t kern_vfs_bio_buffer_alloc(caddr_t v, long physmem_est) { + /* * physmem_est is in pages. Convert it to kilobytes (assumes * PAGE_SIZE is >= 1K) @@ -603,8 +612,9 @@ * Since this call frees up buffer space, we call bufspacewakeup(). */ static void -bfreekva(struct buf * bp) +bfreekva(struct buf *bp) { + GIANT_REQUIRED; if (bp->b_kvasize) { @@ -625,15 +635,16 @@ * Remove the buffer from the appropriate free list. */ void -bremfree(struct buf * bp) +bremfree(struct buf *bp) { + mtx_lock(&bqlock); bremfreel(bp); mtx_unlock(&bqlock); } void -bremfreel(struct buf * bp) +bremfreel(struct buf *bp) { int s = splbio(); int old_qindex = bp->b_qindex; @@ -678,7 +689,7 @@ */ int bread(struct vnode * vp, daddr_t blkno, int size, struct ucred * cred, - struct buf ** bpp) + struct buf **bpp) { return (breadn(vp, blkno, size, 0, 0, 0, cred, bpp)); @@ -693,7 +704,7 @@ int breadn(struct vnode * vp, daddr_t blkno, int size, daddr_t * rablkno, int *rabsize, - int cnt, struct ucred * cred, struct buf ** bpp) + int cnt, struct ucred * cred, struct buf **bpp) { struct buf *bp, *rabp; int i; @@ -763,7 +774,7 @@ * here. */ int -bwrite(struct buf * bp) +bwrite(struct buf *bp) { KASSERT(bp->b_op != NULL && bp->b_op->bop_write != NULL, @@ -772,7 +783,7 @@ } static int -ibwrite(struct buf * bp) +ibwrite(struct buf *bp) { int oldflags, s; struct buf *newbp; @@ -866,7 +877,7 @@ bp->b_flags &= ~B_DONE; bp->b_ioflags &= ~BIO_ERROR; - bp->b_flags |= B_WRITEINPROG | B_CACHE; + bp->b_flags |= B_CACHE; bp->b_iocmd = BIO_WRITE; VI_LOCK(bp->b_vp); @@ -918,8 +929,7 @@ * Complete a background write started from bwrite. */ static void -vfs_backgroundwritedone(bp) - struct buf *bp; +vfs_backgroundwritedone(struct buf *bp) { struct buf *origbp; @@ -974,7 +984,7 @@ * out synchronously. */ void -bdwrite(struct buf * bp) +bdwrite(struct buf *bp) { struct thread *td = curthread; struct vnode *vp; @@ -1099,9 +1109,9 @@ * The buffer must be on QUEUE_NONE. */ void -bdirty(bp) - struct buf *bp; +bdirty(struct buf *bp) { + KASSERT(bp->b_qindex == QUEUE_NONE, ("bdirty: buffer %p still on queue %d", bp, bp->b_qindex)); bp->b_flags &= ~(B_RELBUF); @@ -1128,9 +1138,9 @@ */ void -bundirty(bp) - struct buf *bp; +bundirty(struct buf *bp) { + KASSERT(bp->b_qindex == QUEUE_NONE, ("bundirty: buffer %p still on queue %d", bp, bp->b_qindex)); @@ -1156,8 +1166,9 @@ * B_INVAL buffers. Not us. */ void -bawrite(struct buf * bp) +bawrite(struct buf *bp) { + bp->b_flags |= B_ASYNC; (void) bwrite(bp); } @@ -1175,6 +1186,7 @@ void bwillwrite(void) { + if (numdirtybuffers >= hidirtybuffers) { int s; @@ -1199,6 +1211,7 @@ int buf_dirty_count_severe(void) { + return(numdirtybuffers >= hidirtybuffers); } @@ -1210,7 +1223,7 @@ * to be accessed later as a cache entity or reused for other purposes. */ void -brelse(struct buf * bp) +brelse(struct buf *bp) { int s; @@ -1357,11 +1370,13 @@ } if ((bp->b_flags & B_INVAL) == 0) { - pmap_qenter(trunc_page((vm_offset_t)bp->b_data), bp->b_pages, bp->b_npages); + pmap_qenter( + trunc_page((vm_offset_t)bp->b_data), bp->b_pages, bp->b_npages); } m = bp->b_pages[i]; } - if ((bp->b_flags & B_NOCACHE) || (bp->b_ioflags & BIO_ERROR)) { + if ((bp->b_flags & B_NOCACHE) || + (bp->b_ioflags & BIO_ERROR)) { int poffset = foff & PAGE_MASK; int presid = resid > (PAGE_SIZE - poffset) ? (PAGE_SIZE - poffset) : resid; @@ -1485,13 +1500,14 @@ * XXX we should be able to leave the B_RELBUF hint set on completion. */ void -bqrelse(struct buf * bp) +bqrelse(struct buf *bp) { int s; s = splbio(); - KASSERT(!(bp->b_flags & (B_CLUSTER|B_PAGING)), ("bqrelse: inappropriate B_PAGING or B_CLUSTER bp %p", bp)); + KASSERT(!(bp->b_flags & (B_CLUSTER|B_PAGING)), + ("bqrelse: inappropriate B_PAGING or B_CLUSTER bp %p", bp)); if (bp->b_qindex != QUEUE_NONE) panic("bqrelse: free buffer onto another queue???"); @@ -1552,8 +1568,7 @@ /* Give pages used by the bp back to the VM system (where possible) */ static void -vfs_vmio_release(bp) - struct buf *bp; +vfs_vmio_release(struct buf *bp) { int i; vm_page_t m; @@ -1657,7 +1672,7 @@ * correct order, so we search for the cluster in both directions. */ int -vfs_bio_awrite(struct buf * bp) +vfs_bio_awrite(struct buf *bp) { int i; int j; @@ -2139,6 +2154,7 @@ int flushwithdeps = 0; SYSCTL_INT(_vfs, OID_AUTO, flushwithdeps, CTLFLAG_RW, &flushwithdeps, 0, "Number of buffers flushed with dependecies that require rollbacks"); + static int flushbufqueues(int flushdeps) { @@ -2992,6 +3008,7 @@ void biodone(struct bio *bp) { + mtx_lock(&bdonelock); bp->bio_flags |= BIO_DONE; if (bp->bio_done == NULL) @@ -3043,7 +3060,7 @@ * error and cleared. */ int -bufwait(register struct buf * bp) +bufwait(struct buf *bp) { int s; @@ -3284,35 +3301,35 @@ * consistant. */ void -vfs_unbusy_pages(struct buf * bp) +vfs_unbusy_pages(struct buf *bp) { int i; + vm_object_t obj; + vm_page_t m; runningbufwakeup(bp); - if (bp->b_flags & B_VMIO) { - vm_object_t obj; + if (!(bp->b_flags & B_VMIO)) + return; - obj = bp->b_object; - VM_OBJECT_LOCK(obj); - vm_page_lock_queues(); - for (i = 0; i < bp->b_npages; i++) { - vm_page_t m = bp->b_pages[i]; - - if (m == bogus_page) { - m = vm_page_lookup(obj, OFF_TO_IDX(bp->b_offset) + i); - if (!m) { - panic("vfs_unbusy_pages: page missing\n"); - } - bp->b_pages[i] = m; - pmap_qenter(trunc_page((vm_offset_t)bp->b_data), bp->b_pages, bp->b_npages); + obj = bp->b_object; + VM_OBJECT_LOCK(obj); + vm_page_lock_queues(); + for (i = 0; i < bp->b_npages; i++) { + m = bp->b_pages[i]; + if (m == bogus_page) { + m = vm_page_lookup(obj, OFF_TO_IDX(bp->b_offset) + i); + if (!m) { + panic("vfs_unbusy_pages: page missing\n"); } - vm_object_pip_subtract(obj, 1); - vm_page_io_finish(m); + bp->b_pages[i] = m; + pmap_qenter(trunc_page((vm_offset_t)bp->b_data), bp->b_pages, bp->b_npages); } - vm_page_unlock_queues(); - vm_object_pip_wakeupn(obj, 0); - VM_OBJECT_UNLOCK(obj); + vm_object_pip_subtract(obj, 1); + vm_page_io_finish(m); } + vm_page_unlock_queues(); + vm_object_pip_wakeupn(obj, 0); + VM_OBJECT_UNLOCK(obj); } /* @@ -3366,66 +3383,68 @@ * and should be ignored. */ void -vfs_busy_pages(struct buf * bp, int clear_modify) +vfs_busy_pages(struct buf *bp, int clear_modify) { int i, bogus; + vm_object_t obj; + vm_ooffset_t foff; + vm_page_t m; - if (bp->b_flags & B_VMIO) { - vm_object_t obj; - vm_ooffset_t foff; + if (!(bp->b_flags & B_VMIO)) + return; - obj = bp->b_object; - foff = bp->b_offset; - KASSERT(bp->b_offset != NOOFFSET, - ("vfs_busy_pages: no buffer offset")); - vfs_setdirty(bp); - VM_OBJECT_LOCK(obj); + obj = bp->b_object; + foff = bp->b_offset; + KASSERT(bp->b_offset != NOOFFSET, + ("vfs_busy_pages: no buffer offset")); + vfs_setdirty(bp); + VM_OBJECT_LOCK(obj); retry: - vm_page_lock_queues(); - for (i = 0; i < bp->b_npages; i++) { - vm_page_t m = bp->b_pages[i]; + vm_page_lock_queues(); + for (i = 0; i < bp->b_npages; i++) { + m = bp->b_pages[i]; + + if (vm_page_sleep_if_busy(m, FALSE, "vbpage")) + goto retry; + } + bogus = 0; + for (i = 0; i < bp->b_npages; i++) { + m = bp->b_pages[i]; - if (vm_page_sleep_if_busy(m, FALSE, "vbpage")) - goto retry; + if ((bp->b_flags & B_CLUSTER) == 0) { + vm_object_pip_add(obj, 1); + vm_page_io_start(m); } - bogus = 0; - for (i = 0; i < bp->b_npages; i++) { - vm_page_t m = bp->b_pages[i]; - - if ((bp->b_flags & B_CLUSTER) == 0) { - vm_object_pip_add(obj, 1); - vm_page_io_start(m); - } - /* - * When readying a buffer for a read ( i.e - * clear_modify == 0 ), it is important to do - * bogus_page replacement for valid pages in - * partially instantiated buffers. Partially - * instantiated buffers can, in turn, occur when - * reconstituting a buffer from its VM backing store - * base. We only have to do this if B_CACHE is - * clear ( which causes the I/O to occur in the - * first place ). The replacement prevents the read - * I/O from overwriting potentially dirty VM-backed - * pages. XXX bogus page replacement is, uh, bogus. - * It may not work properly with small-block devices. - * We need to find a better way. - */ - pmap_remove_all(m); - if (clear_modify) - vfs_page_set_valid(bp, foff, i, m); - else if (m->valid == VM_PAGE_BITS_ALL && - (bp->b_flags & B_CACHE) == 0) { - bp->b_pages[i] = bogus_page; - bogus++; - } - foff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK; + /* + * When readying a buffer for a read ( i.e + * clear_modify == 0 ), it is important to do + * bogus_page replacement for valid pages in + * partially instantiated buffers. Partially + * instantiated buffers can, in turn, occur when + * reconstituting a buffer from its VM backing store + * base. We only have to do this if B_CACHE is + * clear ( which causes the I/O to occur in the + * first place ). The replacement prevents the read + * I/O from overwriting potentially dirty VM-backed + * pages. XXX bogus page replacement is, uh, bogus. + * It may not work properly with small-block devices. + * We need to find a better way. + */ + pmap_remove_all(m); + if (clear_modify) + vfs_page_set_valid(bp, foff, i, m); + else if (m->valid == VM_PAGE_BITS_ALL && + (bp->b_flags & B_CACHE) == 0) { + bp->b_pages[i] = bogus_page; + bogus++; } - vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(obj); - if (bogus) - pmap_qenter(trunc_page((vm_offset_t)bp->b_data), bp->b_pages, bp->b_npages); + foff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK; } + vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(obj); + if (bogus) + pmap_qenter(trunc_page((vm_offset_t)bp->b_data), + bp->b_pages, bp->b_npages); } /* @@ -3437,32 +3456,33 @@ * just go ahead and clean through to b_bufsize. */ static void -vfs_clean_pages(struct buf * bp) +vfs_clean_pages(struct buf *bp) { int i; + vm_ooffset_t foff, noff, eoff; + vm_page_t m; - if (bp->b_flags & B_VMIO) { - vm_ooffset_t foff; + if (!(bp->b_flags & B_VMIO)) + return; - foff = bp->b_offset; - KASSERT(bp->b_offset != NOOFFSET, - ("vfs_clean_pages: no buffer offset")); - VM_OBJECT_LOCK(bp->b_object); - vm_page_lock_queues(); - for (i = 0; i < bp->b_npages; i++) { - vm_page_t m = bp->b_pages[i]; - vm_ooffset_t noff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK; - vm_ooffset_t eoff = noff; + foff = bp->b_offset; + KASSERT(bp->b_offset != NOOFFSET, + ("vfs_clean_pages: no buffer offset")); + VM_OBJECT_LOCK(bp->b_object); + vm_page_lock_queues(); + for (i = 0; i < bp->b_npages; i++) { + m = bp->b_pages[i]; + noff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK; + eoff = noff; - if (eoff > bp->b_offset + bp->b_bufsize) - eoff = bp->b_offset + bp->b_bufsize; - vfs_page_set_valid(bp, foff, i, m); - /* vm_page_clear_dirty(m, foff & PAGE_MASK, eoff - foff); */ - foff = noff; - } - vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(bp->b_object); + if (eoff > bp->b_offset + bp->b_bufsize) + eoff = bp->b_offset + bp->b_bufsize; + vfs_page_set_valid(bp, foff, i, m); + /* vm_page_clear_dirty(m, foff & PAGE_MASK, eoff - foff); */ + foff = noff; } + vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(bp->b_object); } /* @@ -3477,35 +3497,36 @@ void vfs_bio_set_validclean(struct buf *bp, int base, int size) { - if (bp->b_flags & B_VMIO) { - int i; - int n; + int i, n; + vm_page_t m; + + if (!(bp->b_flags & B_VMIO)) + return; - /* - * Fixup base to be relative to beginning of first page. - * Set initial n to be the maximum number of bytes in the - * first page that can be validated. - */ + /* + * Fixup base to be relative to beginning of first page. + * Set initial n to be the maximum number of bytes in the + * first page that can be validated. + */ - base += (bp->b_offset & PAGE_MASK); - n = PAGE_SIZE - (base & PAGE_MASK); + base += (bp->b_offset & PAGE_MASK); + n = PAGE_SIZE - (base & PAGE_MASK); - VM_OBJECT_LOCK(bp->b_object); - vm_page_lock_queues(); - for (i = base / PAGE_SIZE; size > 0 && i < bp->b_npages; ++i) { - vm_page_t m = bp->b_pages[i]; + VM_OBJECT_LOCK(bp->b_object); + vm_page_lock_queues(); + for (i = base / PAGE_SIZE; size > 0 && i < bp->b_npages; ++i) { + m = bp->b_pages[i]; - if (n > size) - n = size; + if (n > size) + n = size; - vm_page_set_validclean(m, base & PAGE_MASK, n); - base += n; - size -= n; - n = PAGE_SIZE; - } - vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(bp->b_object); + vm_page_set_validclean(m, base & PAGE_MASK, n); + base += n; + size -= n; + n = PAGE_SIZE; } + vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(bp->b_object); } /* @@ -3526,57 +3547,56 @@ GIANT_REQUIRED; - if ((bp->b_flags & (B_VMIO | B_MALLOC)) == B_VMIO) { - bp->b_flags &= ~B_INVAL; - bp->b_ioflags &= ~BIO_ERROR; - VM_OBJECT_LOCK(bp->b_object); - if( (bp->b_npages == 1) && (bp->b_bufsize < PAGE_SIZE) && - (bp->b_offset & PAGE_MASK) == 0) { - if (bp->b_pages[0] == bogus_page) - goto unlock; - mask = (1 << (bp->b_bufsize / DEV_BSIZE)) - 1; - VM_OBJECT_LOCK_ASSERT(bp->b_pages[0]->object, MA_OWNED); - if ((bp->b_pages[0]->valid & mask) == mask) - goto unlock; - if (((bp->b_pages[0]->flags & PG_ZERO) == 0) && - ((bp->b_pages[0]->valid & mask) == 0)) { - bzero(bp->b_data, bp->b_bufsize); - bp->b_pages[0]->valid |= mask; - goto unlock; - } + if ((bp->b_flags & (B_VMIO | B_MALLOC)) != B_VMIO) { + clrbuf(bp); + return; + } + bp->b_flags &= ~B_INVAL; + bp->b_ioflags &= ~BIO_ERROR; + VM_OBJECT_LOCK(bp->b_object); + if( (bp->b_npages == 1) && (bp->b_bufsize < PAGE_SIZE) && + (bp->b_offset & PAGE_MASK) == 0) { + if (bp->b_pages[0] == bogus_page) + goto unlock; + mask = (1 << (bp->b_bufsize / DEV_BSIZE)) - 1; + VM_OBJECT_LOCK_ASSERT(bp->b_pages[0]->object, MA_OWNED); + if ((bp->b_pages[0]->valid & mask) == mask) + goto unlock; + if (((bp->b_pages[0]->flags & PG_ZERO) == 0) && + ((bp->b_pages[0]->valid & mask) == 0)) { + bzero(bp->b_data, bp->b_bufsize); + bp->b_pages[0]->valid |= mask; + goto unlock; } - ea = sa = bp->b_data; - for(i=0;ib_npages;i++,sa=ea) { - ea = (caddr_t)trunc_page((vm_offset_t)sa + PAGE_SIZE); - ea = (caddr_t)(vm_offset_t)ulmin( - (u_long)(vm_offset_t)ea, - (u_long)(vm_offset_t)bp->b_data + bp->b_bufsize); - if (bp->b_pages[i] == bogus_page) - continue; - j = ((vm_offset_t)sa & PAGE_MASK) / DEV_BSIZE; - mask = ((1 << ((ea - sa) / DEV_BSIZE)) - 1) << j; - VM_OBJECT_LOCK_ASSERT(bp->b_pages[i]->object, MA_OWNED); - if ((bp->b_pages[i]->valid & mask) == mask) - continue; - if ((bp->b_pages[i]->valid & mask) == 0) { - if ((bp->b_pages[i]->flags & PG_ZERO) == 0) { - bzero(sa, ea - sa); - } - } else { - for (; sa < ea; sa += DEV_BSIZE, j++) { - if (((bp->b_pages[i]->flags & PG_ZERO) == 0) && - (bp->b_pages[i]->valid & (1<b_data; + for(i = 0; i < bp->b_npages; i++, sa = ea) { + ea = (caddr_t)trunc_page((vm_offset_t)sa + PAGE_SIZE); + ea = (caddr_t)(vm_offset_t)ulmin( + (u_long)(vm_offset_t)ea, + (u_long)(vm_offset_t)bp->b_data + bp->b_bufsize); + if (bp->b_pages[i] == bogus_page) + continue; + j = ((vm_offset_t)sa & PAGE_MASK) / DEV_BSIZE; + mask = ((1 << ((ea - sa) / DEV_BSIZE)) - 1) << j; + VM_OBJECT_LOCK_ASSERT(bp->b_pages[i]->object, MA_OWNED); + if ((bp->b_pages[i]->valid & mask) == mask) + continue; + if ((bp->b_pages[i]->valid & mask) == 0) { + if ((bp->b_pages[i]->flags & PG_ZERO) == 0) + bzero(sa, ea - sa); + } else { + for (; sa < ea; sa += DEV_BSIZE, j++) { + if (((bp->b_pages[i]->flags & PG_ZERO) == 0) && + (bp->b_pages[i]->valid & (1<b_pages[i]->valid |= mask; } + bp->b_pages[i]->valid |= mask; + } unlock: - VM_OBJECT_UNLOCK(bp->b_object); - bp->b_resid = 0; - } else { - clrbuf(bp); - } + VM_OBJECT_UNLOCK(bp->b_object); + bp->b_resid = 0; } /* @@ -3585,7 +3605,7 @@ * not associated with a file object. */ static void -vm_hold_load_pages(struct buf * bp, vm_offset_t from, vm_offset_t to) +vm_hold_load_pages(struct buf *bp, vm_offset_t from, vm_offset_t to) { vm_offset_t pg; vm_page_t p; @@ -3627,7 +3647,7 @@ /* Return pages associated with this buf to the vm system */ static void -vm_hold_free_pages(struct buf * bp, vm_offset_t from, vm_offset_t to) +vm_hold_free_pages(struct buf *bp, vm_offset_t from, vm_offset_t to) { vm_offset_t pg; vm_page_t p; @@ -3685,8 +3705,9 @@ if (bp->b_bufsize < 0) return (-1); - prot = (bp->b_iocmd == BIO_READ) ? VM_PROT_READ | VM_PROT_WRITE : - VM_PROT_READ; + prot = VM_PROT_READ; + if (bp->b_iocmd == BIO_READ) + prot |= VM_PROT_WRITE; /* Less backwards than it looks */ for (addr = (caddr_t)trunc_page((vm_offset_t)bp->b_data), pidx = 0; addr < bp->b_data + bp->b_bufsize; addr += PAGE_SIZE, pidx++) { @@ -3736,8 +3757,7 @@ int npages; npages = bp->b_npages; - pmap_qremove(trunc_page((vm_offset_t)bp->b_data), - npages); + pmap_qremove(trunc_page((vm_offset_t)bp->b_data), npages); vm_page_lock_queues(); for (pidx = 0; pidx < npages; pidx++) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 16 01:15:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A958116A4D0; Thu, 16 Sep 2004 01:15:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 84CCA16A4CE for ; Thu, 16 Sep 2004 01:15:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D9B043D41 for ; Thu, 16 Sep 2004 01:15:36 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8G1Faw1012250 for ; Thu, 16 Sep 2004 01:15:36 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8G1FatP012247 for perforce@freebsd.org; Thu, 16 Sep 2004 01:15:36 GMT (envelope-from peter@freebsd.org) Date: Thu, 16 Sep 2004 01:15:36 GMT Message-Id: <200409160115.i8G1FatP012247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 61579 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2004 01:15:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=61579 Change 61579 by peter@peter_melody on 2004/09/16 01:14:41 make build32.sh work completely. fix up libgnuregex's -I overrides and remove build32.sh hack Affected files ... .. //depot/projects/hammer/gnu/lib/libregex/Makefile#5 edit .. //depot/projects/hammer/tools/lib32/build32.sh#3 edit Differences ... ==== //depot/projects/hammer/gnu/lib/libregex/Makefile#5 (text+ko) ==== @@ -5,10 +5,10 @@ LIB= gnuregex SHLIB_MAJOR= 2 -SRCS= regex.c +SRCS= gnuregex.c INCSGROUPS= INCS WRINCS PXINCS INCS= regex.h.patched -CLEANFILES+= regex.h.patched +CLEANFILES+= regex.h.patched gnuregex.c INCSNAME= regex.h INCSDIR= ${INCLUDEDIR}/gnu WRINCS= gnuregex.h @@ -22,4 +22,8 @@ sed 's===g' \ < ${.ALLSRC} > ${.TARGET} +gnuregex.c: regex.c + sed 's===g' \ + < ${.ALLSRC} > ${.TARGET} + .include ==== //depot/projects/hammer/tools/lib32/build32.sh#3 (text+ko) ==== @@ -25,7 +25,7 @@ mkdir -p $MAKEOBJDIRPREFIX CCARGS="-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" -CXXARGS="-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I/tmp/i386/root/usr/include/c++/3.3 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" +CXXARGS="-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I/tmp/i386/root/usr/include/c++/3.4 -I/tmp/i386/root/usr/include -L/usr/lib32 -B/usr/lib32" # and a place to put the alternate include tree into. mkdir -p $MAKEOBJDIRPREFIX/root @@ -44,6 +44,7 @@ # libncurses needs a build-tools pass first. I wish build-tools was a recursive target. (cd lib/libncurses; make -s build-tools) +(cd lib/libmagic; make -s build-tools) # Now the libraries. This doesn't work for gnuregex yet. hence -k. # libbind is just an internal target, ignore it. @@ -53,14 +54,8 @@ export CC="cc $CCARGS" export CXX="c++ $CXXARGS" export LD="ld -m elf_i386_fbsd -Y P,/usr/lib32" -make -s -DNO_BIND -DNOMAN -DNODOC -DNOINFO -k libraries - -# Hack to fix gnuregex which does hacks to the -I path based on $DESTDIR. But, we cannot -# use DESTDIR during the libraries target, because we're just using alternate includes, not -# an alternate install directory. -unset CC -export CC="cc -I/tmp/i386/root/usr/include/gnu $CCARGS" -(cd gnu/lib/libregex; make -k -DNOMAN -DNODOC -DNOINFOall install) +export AS="as --32" +make -s -DNO_BIND -DNOMAN -DNODOC -DNOINFO libraries # and now that we have enough libraries, build ld-elf32.so.1 cd libexec/rtld-elf From owner-p4-projects@FreeBSD.ORG Thu Sep 16 01:17:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A752216A4D0; Thu, 16 Sep 2004 01:17:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 80A2516A4CE for ; Thu, 16 Sep 2004 01:17:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B9DF43D2F for ; Thu, 16 Sep 2004 01:17:39 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8G1Hdu2012284 for ; Thu, 16 Sep 2004 01:17:39 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8G1Hd0x012281 for perforce@freebsd.org; Thu, 16 Sep 2004 01:17:39 GMT (envelope-from peter@freebsd.org) Date: Thu, 16 Sep 2004 01:17:39 GMT Message-Id: <200409160117.i8G1Hd0x012281@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 61580 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2004 01:17:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=61580 Change 61580 by peter@peter_daintree on 2004/09/16 01:16:45 IFC @61578 Affected files ... .. //depot/projects/hammer/sys/dev/sound/pci/fm801.c#9 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_io.c#10 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_io.c#12 integrate .. //depot/projects/hammer/sys/i386/i386/gdb_machdep.c#2 integrate .. //depot/projects/hammer/sys/i386/include/db_machdep.h#3 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#38 integrate .. //depot/projects/hammer/sys/kern/vfs_init.c#10 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#52 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#40 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#7 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#20 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#22 integrate .. //depot/projects/hammer/sys/sys/buf.h#13 integrate .. //depot/projects/hammer/tools/lib32/build32.sh#4 integrate .. //depot/projects/hammer/tools/tools/genericize/genericize.pl#2 integrate Differences ... ==== //depot/projects/hammer/sys/dev/sound/pci/fm801.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.23 2004/07/16 03:59:27 tanimura Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.24 2004/09/15 23:47:17 sobomax Exp $"); #define PCI_VENDOR_FORTEMEDIA 0x1319 #define PCI_DEVICE_FORTEMEDIA1 0x08011319 @@ -700,49 +700,11 @@ static int fm801_pci_probe( device_t dev ) { - u_int32_t data; - int id, regtype, regid, result; - struct resource *reg; - bus_space_tag_t st; - bus_space_handle_t sh; + int id; - result = ENXIO; - if ((id = pci_get_devid(dev)) == PCI_DEVICE_FORTEMEDIA1 ) { - data = pci_read_config(dev, PCIR_COMMAND, 2); - data |= (PCIM_CMD_PORTEN|PCIM_CMD_BUSMASTEREN); - pci_write_config(dev, PCIR_COMMAND, data, 2); - data = pci_read_config(dev, PCIR_COMMAND, 2); - - regid = PCIR_BAR(0); - regtype = SYS_RES_IOPORT; - reg = bus_alloc_resource_any(dev, regtype, ®id, RF_ACTIVE); - - if (reg == NULL) - return ENXIO; - - st = rman_get_bustag(reg); - sh = rman_get_bushandle(reg); - /* - * XXX: quick check that device actually has sound capabilities. - * The problem is that some cards built around FM801 chip only - * have radio tuner onboard, but no sound capabilities. There - * is no "official" way to quickly check this, because all - * IDs are exactly the same. The only difference is 0x28 - * device control register, described in FM801 specification - * as "SRC/Mixer Test Control/DFC Status", but without - * any more detailed explanation. According to specs, and - * available sample cards (SF256-PCP-R and SF256-PCS-R) its - * power-on value should be `0', while on AC97-less tuner - * card (SF64-PCR) it was 0x80. - */ - if (bus_space_read_1(st, sh, 0x28) == 0) { - device_set_desc(dev, - "Forte Media FM801 Audio Controller"); - result = 0; - } - - bus_release_resource(dev, regtype, regid, reg); + device_set_desc(dev, "Forte Media FM801 Audio Controller"); + return 0; } /* if ((id = pci_get_devid(dev)) == PCI_DEVICE_FORTEMEDIA2 ) { @@ -750,7 +712,7 @@ return ENXIO; } */ - return (result); + return ENXIO; } static struct resource * ==== //depot/projects/hammer/sys/fs/nwfs/nwfs_io.c#10 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/nwfs/nwfs_io.c,v 1.35 2004/09/07 08:53:03 phk Exp $ + * $FreeBSD: src/sys/fs/nwfs/nwfs_io.c,v 1.36 2004/09/15 21:49:20 phk Exp $ * */ #include @@ -328,9 +328,7 @@ uiop->uio_offset = ((off_t)bp->b_blkno) * DEV_BSIZE + bp->b_dirtyoff; io.iov_base = (char *)bp->b_data + bp->b_dirtyoff; uiop->uio_rw = UIO_WRITE; - bp->b_flags |= B_WRITEINPROG; error = ncp_write(NWFSTOCONN(nmp), &np->n_fh, uiop, cr); - bp->b_flags &= ~B_WRITEINPROG; /* * For an interrupted write, the buffer is still valid ==== //depot/projects/hammer/sys/fs/smbfs/smbfs_io.c#12 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.28 2004/09/07 08:53:28 phk Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.29 2004/09/15 21:49:21 phk Exp $ * */ #include @@ -353,9 +353,7 @@ uiop->uio_offset = ((off_t)bp->b_blkno) * DEV_BSIZE + bp->b_dirtyoff; io.iov_base = (char *)bp->b_data + bp->b_dirtyoff; uiop->uio_rw = UIO_WRITE; - bp->b_flags |= B_WRITEINPROG; error = smb_write(smp->sm_share, np->n_fid, uiop, &scred); - bp->b_flags &= ~B_WRITEINPROG; /* * For an interrupted write, the buffer is still valid ==== //depot/projects/hammer/sys/i386/i386/gdb_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/gdb_machdep.c,v 1.1 2004/07/10 17:47:21 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/gdb_machdep.c,v 1.2 2004/09/15 23:26:49 julian Exp $"); #include #include @@ -37,6 +37,8 @@ #include #include #include +#include +#include #include @@ -45,6 +47,14 @@ { *regsz = gdb_cpu_regsz(regnum); + + if (kdb_thread == curthread) { + switch (regnum) { + case 0: return (&kdb_frame->tf_eax); + case 1: return (&kdb_frame->tf_ecx); + case 2: return (&kdb_frame->tf_edx); + } + } switch (regnum) { case 3: return (&kdb_thrctx->pcb_ebx); case 4: return (&kdb_thrctx->pcb_esp); @@ -60,8 +70,12 @@ gdb_cpu_setreg(int regnum, register_t val) { + val = __bswap32(val); switch (regnum) { - case GDB_REG_PC: kdb_thrctx->pcb_eip = val; break; + case GDB_REG_PC: + kdb_thrctx->pcb_eip = val; + if (kdb_thread == curthread) + kdb_frame->tf_eip = val; } } ==== //depot/projects/hammer/sys/i386/include/db_machdep.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. * - * $FreeBSD: src/sys/i386/include/db_machdep.h,v 1.18 2004/07/10 23:47:19 marcel Exp $ + * $FreeBSD: src/sys/i386/include/db_machdep.h,v 1.19 2004/09/15 23:26:49 julian Exp $ */ #ifndef _MACHINE_DB_MACHDEP_H_ @@ -41,9 +41,17 @@ #define BKPT_SIZE (1) /* size of breakpoint inst */ #define BKPT_SET(inst) (BKPT_INST) -#define BKPT_SKIP kdb_frame->tf_eip += 1 +#define BKPT_SKIP \ +do { \ + kdb_frame->tf_eip += 1; \ + kdb_thrctx->pcb_eip += 1; \ +} while(0) -#define FIXUP_PC_AFTER_BREAK kdb_frame->tf_eip -= 1; +#define FIXUP_PC_AFTER_BREAK \ +do { \ + kdb_frame->tf_eip -= 1; \ + kdb_thrctx->pcb_eip -= 1; \ +} while(0); #define db_clear_single_step kdb_cpu_clear_singlestep #define db_set_single_step kdb_cpu_set_singlestep ==== //depot/projects/hammer/sys/kern/vfs_bio.c#38 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.445 2004/09/13 06:50:41 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.448 2004/09/15 21:49:21 phk Exp $"); #include #include @@ -76,13 +76,13 @@ static struct proc *bufdaemonproc; -static void vm_hold_free_pages(struct buf * bp, vm_offset_t from, +static void vm_hold_free_pages(struct buf *bp, vm_offset_t from, vm_offset_t to); -static void vm_hold_load_pages(struct buf * bp, vm_offset_t from, +static void vm_hold_load_pages(struct buf *bp, vm_offset_t from, vm_offset_t to); static void vfs_page_set_valid(struct buf *bp, vm_ooffset_t off, int pageno, vm_page_t m); -static void vfs_clean_pages(struct buf * bp); +static void vfs_clean_pages(struct buf *bp); static void vfs_setdirty(struct buf *bp); static void vfs_vmio_release(struct buf *bp); static void vfs_backgroundwritedone(struct buf *bp); @@ -90,7 +90,7 @@ daddr_t lblkno, daddr_t blkno); static int flushbufqueues(int flushdeps); static void buf_daemon(void); -void bremfreel(struct buf * bp); +void bremfreel(struct buf *bp); int vmiodirenable = TRUE; SYSCTL_INT(_vfs, OID_AUTO, vmiodirenable, CTLFLAG_RW, &vmiodirenable, 0, @@ -266,6 +266,7 @@ static __inline void numdirtywakeup(int level) { + if (numdirtybuffers <= level) { mtx_lock(&nblock); if (needsbuffer & VFS_BIO_NEED_DIRTYFLUSH) { @@ -288,6 +289,7 @@ static __inline void bufspacewakeup(void) { + /* * If someone is waiting for BUF space, wake them up. Even * though we haven't freed the kva space yet, the waiting @@ -308,6 +310,7 @@ static __inline void runningbufwakeup(struct buf *bp) { + if (bp->b_runningbufspace) { atomic_subtract_int(&runningbufspace, bp->b_runningbufspace); bp->b_runningbufspace = 0; @@ -332,6 +335,7 @@ static __inline void bufcountwakeup(void) { + atomic_add_int(&numfreebuffers, 1); mtx_lock(&nblock); if (needsbuffer) { @@ -361,6 +365,7 @@ static __inline void waitrunningbufspace(void) { + mtx_lock(&rbreqlock); while (runningbufspace > hirunningspace) { ++runningbufreq; @@ -383,6 +388,7 @@ vm_ooffset_t foff, vm_offset_t off, vm_offset_t size, vm_page_t m) { + GIANT_REQUIRED; VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); @@ -398,6 +404,7 @@ void bd_wakeup(int dirtybuflevel) { + mtx_lock(&bdlock); if (bd_request == 0 && numdirtybuffers >= dirtybuflevel) { bd_request = 1; @@ -414,6 +421,7 @@ void bd_speedup(void) { + bd_wakeup(1); } @@ -426,6 +434,7 @@ caddr_t kern_vfs_bio_buffer_alloc(caddr_t v, long physmem_est) { + /* * physmem_est is in pages. Convert it to kilobytes (assumes * PAGE_SIZE is >= 1K) @@ -603,8 +612,9 @@ * Since this call frees up buffer space, we call bufspacewakeup(). */ static void -bfreekva(struct buf * bp) +bfreekva(struct buf *bp) { + GIANT_REQUIRED; if (bp->b_kvasize) { @@ -625,15 +635,16 @@ * Remove the buffer from the appropriate free list. */ void -bremfree(struct buf * bp) +bremfree(struct buf *bp) { + mtx_lock(&bqlock); bremfreel(bp); mtx_unlock(&bqlock); } void -bremfreel(struct buf * bp) +bremfreel(struct buf *bp) { int s = splbio(); int old_qindex = bp->b_qindex; @@ -678,7 +689,7 @@ */ int bread(struct vnode * vp, daddr_t blkno, int size, struct ucred * cred, - struct buf ** bpp) + struct buf **bpp) { return (breadn(vp, blkno, size, 0, 0, 0, cred, bpp)); @@ -693,7 +704,7 @@ int breadn(struct vnode * vp, daddr_t blkno, int size, daddr_t * rablkno, int *rabsize, - int cnt, struct ucred * cred, struct buf ** bpp) + int cnt, struct ucred * cred, struct buf **bpp) { struct buf *bp, *rabp; int i; @@ -763,7 +774,7 @@ * here. */ int -bwrite(struct buf * bp) +bwrite(struct buf *bp) { KASSERT(bp->b_op != NULL && bp->b_op->bop_write != NULL, @@ -772,7 +783,7 @@ } static int -ibwrite(struct buf * bp) +ibwrite(struct buf *bp) { int oldflags, s; struct buf *newbp; @@ -866,7 +877,7 @@ bp->b_flags &= ~B_DONE; bp->b_ioflags &= ~BIO_ERROR; - bp->b_flags |= B_WRITEINPROG | B_CACHE; + bp->b_flags |= B_CACHE; bp->b_iocmd = BIO_WRITE; VI_LOCK(bp->b_vp); @@ -918,8 +929,7 @@ * Complete a background write started from bwrite. */ static void -vfs_backgroundwritedone(bp) - struct buf *bp; +vfs_backgroundwritedone(struct buf *bp) { struct buf *origbp; @@ -974,7 +984,7 @@ * out synchronously. */ void -bdwrite(struct buf * bp) +bdwrite(struct buf *bp) { struct thread *td = curthread; struct vnode *vp; @@ -1099,9 +1109,9 @@ * The buffer must be on QUEUE_NONE. */ void -bdirty(bp) - struct buf *bp; +bdirty(struct buf *bp) { + KASSERT(bp->b_qindex == QUEUE_NONE, ("bdirty: buffer %p still on queue %d", bp, bp->b_qindex)); bp->b_flags &= ~(B_RELBUF); @@ -1128,9 +1138,9 @@ */ void -bundirty(bp) - struct buf *bp; +bundirty(struct buf *bp) { + KASSERT(bp->b_qindex == QUEUE_NONE, ("bundirty: buffer %p still on queue %d", bp, bp->b_qindex)); @@ -1156,8 +1166,9 @@ * B_INVAL buffers. Not us. */ void -bawrite(struct buf * bp) +bawrite(struct buf *bp) { + bp->b_flags |= B_ASYNC; (void) bwrite(bp); } @@ -1175,6 +1186,7 @@ void bwillwrite(void) { + if (numdirtybuffers >= hidirtybuffers) { int s; @@ -1199,6 +1211,7 @@ int buf_dirty_count_severe(void) { + return(numdirtybuffers >= hidirtybuffers); } @@ -1210,7 +1223,7 @@ * to be accessed later as a cache entity or reused for other purposes. */ void -brelse(struct buf * bp) +brelse(struct buf *bp) { int s; @@ -1357,11 +1370,13 @@ } if ((bp->b_flags & B_INVAL) == 0) { - pmap_qenter(trunc_page((vm_offset_t)bp->b_data), bp->b_pages, bp->b_npages); + pmap_qenter( + trunc_page((vm_offset_t)bp->b_data), bp->b_pages, bp->b_npages); } m = bp->b_pages[i]; } - if ((bp->b_flags & B_NOCACHE) || (bp->b_ioflags & BIO_ERROR)) { + if ((bp->b_flags & B_NOCACHE) || + (bp->b_ioflags & BIO_ERROR)) { int poffset = foff & PAGE_MASK; int presid = resid > (PAGE_SIZE - poffset) ? (PAGE_SIZE - poffset) : resid; @@ -1485,13 +1500,14 @@ * XXX we should be able to leave the B_RELBUF hint set on completion. */ void -bqrelse(struct buf * bp) +bqrelse(struct buf *bp) { int s; s = splbio(); - KASSERT(!(bp->b_flags & (B_CLUSTER|B_PAGING)), ("bqrelse: inappropriate B_PAGING or B_CLUSTER bp %p", bp)); + KASSERT(!(bp->b_flags & (B_CLUSTER|B_PAGING)), + ("bqrelse: inappropriate B_PAGING or B_CLUSTER bp %p", bp)); if (bp->b_qindex != QUEUE_NONE) panic("bqrelse: free buffer onto another queue???"); @@ -1552,8 +1568,7 @@ /* Give pages used by the bp back to the VM system (where possible) */ static void -vfs_vmio_release(bp) - struct buf *bp; +vfs_vmio_release(struct buf *bp) { int i; vm_page_t m; @@ -1657,7 +1672,7 @@ * correct order, so we search for the cluster in both directions. */ int -vfs_bio_awrite(struct buf * bp) +vfs_bio_awrite(struct buf *bp) { int i; int j; @@ -2139,6 +2154,7 @@ int flushwithdeps = 0; SYSCTL_INT(_vfs, OID_AUTO, flushwithdeps, CTLFLAG_RW, &flushwithdeps, 0, "Number of buffers flushed with dependecies that require rollbacks"); + static int flushbufqueues(int flushdeps) { @@ -2992,6 +3008,7 @@ void biodone(struct bio *bp) { + mtx_lock(&bdonelock); bp->bio_flags |= BIO_DONE; if (bp->bio_done == NULL) @@ -3043,7 +3060,7 @@ * error and cleared. */ int -bufwait(register struct buf * bp) +bufwait(struct buf *bp) { int s; @@ -3284,35 +3301,35 @@ * consistant. */ void -vfs_unbusy_pages(struct buf * bp) +vfs_unbusy_pages(struct buf *bp) { int i; + vm_object_t obj; + vm_page_t m; runningbufwakeup(bp); - if (bp->b_flags & B_VMIO) { - vm_object_t obj; + if (!(bp->b_flags & B_VMIO)) + return; - obj = bp->b_object; - VM_OBJECT_LOCK(obj); - vm_page_lock_queues(); - for (i = 0; i < bp->b_npages; i++) { - vm_page_t m = bp->b_pages[i]; - - if (m == bogus_page) { - m = vm_page_lookup(obj, OFF_TO_IDX(bp->b_offset) + i); - if (!m) { - panic("vfs_unbusy_pages: page missing\n"); - } - bp->b_pages[i] = m; - pmap_qenter(trunc_page((vm_offset_t)bp->b_data), bp->b_pages, bp->b_npages); + obj = bp->b_object; + VM_OBJECT_LOCK(obj); + vm_page_lock_queues(); + for (i = 0; i < bp->b_npages; i++) { + m = bp->b_pages[i]; + if (m == bogus_page) { + m = vm_page_lookup(obj, OFF_TO_IDX(bp->b_offset) + i); + if (!m) { + panic("vfs_unbusy_pages: page missing\n"); } - vm_object_pip_subtract(obj, 1); - vm_page_io_finish(m); + bp->b_pages[i] = m; + pmap_qenter(trunc_page((vm_offset_t)bp->b_data), bp->b_pages, bp->b_npages); } - vm_page_unlock_queues(); - vm_object_pip_wakeupn(obj, 0); - VM_OBJECT_UNLOCK(obj); + vm_object_pip_subtract(obj, 1); + vm_page_io_finish(m); } + vm_page_unlock_queues(); + vm_object_pip_wakeupn(obj, 0); + VM_OBJECT_UNLOCK(obj); } /* @@ -3366,66 +3383,68 @@ * and should be ignored. */ void -vfs_busy_pages(struct buf * bp, int clear_modify) +vfs_busy_pages(struct buf *bp, int clear_modify) { int i, bogus; + vm_object_t obj; + vm_ooffset_t foff; + vm_page_t m; - if (bp->b_flags & B_VMIO) { - vm_object_t obj; - vm_ooffset_t foff; + if (!(bp->b_flags & B_VMIO)) + return; - obj = bp->b_object; - foff = bp->b_offset; - KASSERT(bp->b_offset != NOOFFSET, - ("vfs_busy_pages: no buffer offset")); - vfs_setdirty(bp); - VM_OBJECT_LOCK(obj); + obj = bp->b_object; + foff = bp->b_offset; + KASSERT(bp->b_offset != NOOFFSET, + ("vfs_busy_pages: no buffer offset")); + vfs_setdirty(bp); + VM_OBJECT_LOCK(obj); retry: - vm_page_lock_queues(); - for (i = 0; i < bp->b_npages; i++) { - vm_page_t m = bp->b_pages[i]; + vm_page_lock_queues(); + for (i = 0; i < bp->b_npages; i++) { + m = bp->b_pages[i]; + + if (vm_page_sleep_if_busy(m, FALSE, "vbpage")) + goto retry; + } + bogus = 0; + for (i = 0; i < bp->b_npages; i++) { + m = bp->b_pages[i]; - if (vm_page_sleep_if_busy(m, FALSE, "vbpage")) - goto retry; + if ((bp->b_flags & B_CLUSTER) == 0) { + vm_object_pip_add(obj, 1); + vm_page_io_start(m); } - bogus = 0; - for (i = 0; i < bp->b_npages; i++) { - vm_page_t m = bp->b_pages[i]; - - if ((bp->b_flags & B_CLUSTER) == 0) { - vm_object_pip_add(obj, 1); - vm_page_io_start(m); - } - /* - * When readying a buffer for a read ( i.e - * clear_modify == 0 ), it is important to do - * bogus_page replacement for valid pages in - * partially instantiated buffers. Partially - * instantiated buffers can, in turn, occur when - * reconstituting a buffer from its VM backing store - * base. We only have to do this if B_CACHE is - * clear ( which causes the I/O to occur in the - * first place ). The replacement prevents the read - * I/O from overwriting potentially dirty VM-backed - * pages. XXX bogus page replacement is, uh, bogus. - * It may not work properly with small-block devices. - * We need to find a better way. - */ - pmap_remove_all(m); - if (clear_modify) - vfs_page_set_valid(bp, foff, i, m); - else if (m->valid == VM_PAGE_BITS_ALL && - (bp->b_flags & B_CACHE) == 0) { - bp->b_pages[i] = bogus_page; - bogus++; - } - foff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK; + /* + * When readying a buffer for a read ( i.e + * clear_modify == 0 ), it is important to do + * bogus_page replacement for valid pages in + * partially instantiated buffers. Partially + * instantiated buffers can, in turn, occur when + * reconstituting a buffer from its VM backing store + * base. We only have to do this if B_CACHE is + * clear ( which causes the I/O to occur in the + * first place ). The replacement prevents the read + * I/O from overwriting potentially dirty VM-backed + * pages. XXX bogus page replacement is, uh, bogus. + * It may not work properly with small-block devices. + * We need to find a better way. + */ + pmap_remove_all(m); + if (clear_modify) + vfs_page_set_valid(bp, foff, i, m); + else if (m->valid == VM_PAGE_BITS_ALL && + (bp->b_flags & B_CACHE) == 0) { + bp->b_pages[i] = bogus_page; + bogus++; } - vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(obj); - if (bogus) - pmap_qenter(trunc_page((vm_offset_t)bp->b_data), bp->b_pages, bp->b_npages); + foff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK; } + vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(obj); + if (bogus) + pmap_qenter(trunc_page((vm_offset_t)bp->b_data), + bp->b_pages, bp->b_npages); } /* @@ -3437,32 +3456,33 @@ * just go ahead and clean through to b_bufsize. */ static void -vfs_clean_pages(struct buf * bp) +vfs_clean_pages(struct buf *bp) { int i; + vm_ooffset_t foff, noff, eoff; + vm_page_t m; - if (bp->b_flags & B_VMIO) { - vm_ooffset_t foff; + if (!(bp->b_flags & B_VMIO)) + return; - foff = bp->b_offset; - KASSERT(bp->b_offset != NOOFFSET, - ("vfs_clean_pages: no buffer offset")); - VM_OBJECT_LOCK(bp->b_object); - vm_page_lock_queues(); - for (i = 0; i < bp->b_npages; i++) { - vm_page_t m = bp->b_pages[i]; - vm_ooffset_t noff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK; - vm_ooffset_t eoff = noff; + foff = bp->b_offset; + KASSERT(bp->b_offset != NOOFFSET, + ("vfs_clean_pages: no buffer offset")); + VM_OBJECT_LOCK(bp->b_object); + vm_page_lock_queues(); + for (i = 0; i < bp->b_npages; i++) { + m = bp->b_pages[i]; + noff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK; + eoff = noff; - if (eoff > bp->b_offset + bp->b_bufsize) - eoff = bp->b_offset + bp->b_bufsize; - vfs_page_set_valid(bp, foff, i, m); - /* vm_page_clear_dirty(m, foff & PAGE_MASK, eoff - foff); */ - foff = noff; - } - vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(bp->b_object); + if (eoff > bp->b_offset + bp->b_bufsize) + eoff = bp->b_offset + bp->b_bufsize; + vfs_page_set_valid(bp, foff, i, m); + /* vm_page_clear_dirty(m, foff & PAGE_MASK, eoff - foff); */ + foff = noff; } + vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(bp->b_object); } /* @@ -3477,35 +3497,36 @@ void vfs_bio_set_validclean(struct buf *bp, int base, int size) { - if (bp->b_flags & B_VMIO) { - int i; - int n; + int i, n; + vm_page_t m; + + if (!(bp->b_flags & B_VMIO)) + return; - /* - * Fixup base to be relative to beginning of first page. - * Set initial n to be the maximum number of bytes in the - * first page that can be validated. - */ + /* + * Fixup base to be relative to beginning of first page. + * Set initial n to be the maximum number of bytes in the + * first page that can be validated. + */ - base += (bp->b_offset & PAGE_MASK); - n = PAGE_SIZE - (base & PAGE_MASK); + base += (bp->b_offset & PAGE_MASK); + n = PAGE_SIZE - (base & PAGE_MASK); - VM_OBJECT_LOCK(bp->b_object); - vm_page_lock_queues(); - for (i = base / PAGE_SIZE; size > 0 && i < bp->b_npages; ++i) { - vm_page_t m = bp->b_pages[i]; + VM_OBJECT_LOCK(bp->b_object); + vm_page_lock_queues(); + for (i = base / PAGE_SIZE; size > 0 && i < bp->b_npages; ++i) { + m = bp->b_pages[i]; - if (n > size) - n = size; + if (n > size) + n = size; - vm_page_set_validclean(m, base & PAGE_MASK, n); - base += n; - size -= n; - n = PAGE_SIZE; - } - vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(bp->b_object); + vm_page_set_validclean(m, base & PAGE_MASK, n); + base += n; + size -= n; + n = PAGE_SIZE; } + vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(bp->b_object); } /* @@ -3526,57 +3547,56 @@ GIANT_REQUIRED; - if ((bp->b_flags & (B_VMIO | B_MALLOC)) == B_VMIO) { - bp->b_flags &= ~B_INVAL; - bp->b_ioflags &= ~BIO_ERROR; - VM_OBJECT_LOCK(bp->b_object); - if( (bp->b_npages == 1) && (bp->b_bufsize < PAGE_SIZE) && - (bp->b_offset & PAGE_MASK) == 0) { - if (bp->b_pages[0] == bogus_page) - goto unlock; - mask = (1 << (bp->b_bufsize / DEV_BSIZE)) - 1; - VM_OBJECT_LOCK_ASSERT(bp->b_pages[0]->object, MA_OWNED); - if ((bp->b_pages[0]->valid & mask) == mask) - goto unlock; - if (((bp->b_pages[0]->flags & PG_ZERO) == 0) && - ((bp->b_pages[0]->valid & mask) == 0)) { - bzero(bp->b_data, bp->b_bufsize); - bp->b_pages[0]->valid |= mask; - goto unlock; - } + if ((bp->b_flags & (B_VMIO | B_MALLOC)) != B_VMIO) { + clrbuf(bp); + return; + } + bp->b_flags &= ~B_INVAL; + bp->b_ioflags &= ~BIO_ERROR; + VM_OBJECT_LOCK(bp->b_object); + if( (bp->b_npages == 1) && (bp->b_bufsize < PAGE_SIZE) && + (bp->b_offset & PAGE_MASK) == 0) { + if (bp->b_pages[0] == bogus_page) + goto unlock; + mask = (1 << (bp->b_bufsize / DEV_BSIZE)) - 1; + VM_OBJECT_LOCK_ASSERT(bp->b_pages[0]->object, MA_OWNED); + if ((bp->b_pages[0]->valid & mask) == mask) + goto unlock; + if (((bp->b_pages[0]->flags & PG_ZERO) == 0) && + ((bp->b_pages[0]->valid & mask) == 0)) { + bzero(bp->b_data, bp->b_bufsize); + bp->b_pages[0]->valid |= mask; + goto unlock; } - ea = sa = bp->b_data; - for(i=0;ib_npages;i++,sa=ea) { - ea = (caddr_t)trunc_page((vm_offset_t)sa + PAGE_SIZE); - ea = (caddr_t)(vm_offset_t)ulmin( - (u_long)(vm_offset_t)ea, - (u_long)(vm_offset_t)bp->b_data + bp->b_bufsize); - if (bp->b_pages[i] == bogus_page) - continue; - j = ((vm_offset_t)sa & PAGE_MASK) / DEV_BSIZE; - mask = ((1 << ((ea - sa) / DEV_BSIZE)) - 1) << j; - VM_OBJECT_LOCK_ASSERT(bp->b_pages[i]->object, MA_OWNED); - if ((bp->b_pages[i]->valid & mask) == mask) - continue; - if ((bp->b_pages[i]->valid & mask) == 0) { - if ((bp->b_pages[i]->flags & PG_ZERO) == 0) { - bzero(sa, ea - sa); - } - } else { - for (; sa < ea; sa += DEV_BSIZE, j++) { - if (((bp->b_pages[i]->flags & PG_ZERO) == 0) && - (bp->b_pages[i]->valid & (1<b_data; + for(i = 0; i < bp->b_npages; i++, sa = ea) { + ea = (caddr_t)trunc_page((vm_offset_t)sa + PAGE_SIZE); + ea = (caddr_t)(vm_offset_t)ulmin( + (u_long)(vm_offset_t)ea, + (u_long)(vm_offset_t)bp->b_data + bp->b_bufsize); + if (bp->b_pages[i] == bogus_page) + continue; + j = ((vm_offset_t)sa & PAGE_MASK) / DEV_BSIZE; + mask = ((1 << ((ea - sa) / DEV_BSIZE)) - 1) << j; + VM_OBJECT_LOCK_ASSERT(bp->b_pages[i]->object, MA_OWNED); + if ((bp->b_pages[i]->valid & mask) == mask) + continue; + if ((bp->b_pages[i]->valid & mask) == 0) { + if ((bp->b_pages[i]->flags & PG_ZERO) == 0) + bzero(sa, ea - sa); + } else { + for (; sa < ea; sa += DEV_BSIZE, j++) { + if (((bp->b_pages[i]->flags & PG_ZERO) == 0) && + (bp->b_pages[i]->valid & (1<b_pages[i]->valid |= mask; } + bp->b_pages[i]->valid |= mask; + } unlock: - VM_OBJECT_UNLOCK(bp->b_object); - bp->b_resid = 0; - } else { - clrbuf(bp); - } + VM_OBJECT_UNLOCK(bp->b_object); + bp->b_resid = 0; } /* @@ -3585,7 +3605,7 @@ * not associated with a file object. */ static void -vm_hold_load_pages(struct buf * bp, vm_offset_t from, vm_offset_t to) +vm_hold_load_pages(struct buf *bp, vm_offset_t from, vm_offset_t to) { vm_offset_t pg; vm_page_t p; @@ -3627,7 +3647,7 @@ /* Return pages associated with this buf to the vm system */ static void -vm_hold_free_pages(struct buf * bp, vm_offset_t from, vm_offset_t to) +vm_hold_free_pages(struct buf *bp, vm_offset_t from, vm_offset_t to) { vm_offset_t pg; vm_page_t p; @@ -3685,8 +3705,9 @@ if (bp->b_bufsize < 0) return (-1); - prot = (bp->b_iocmd == BIO_READ) ? VM_PROT_READ | VM_PROT_WRITE : - VM_PROT_READ; + prot = VM_PROT_READ; + if (bp->b_iocmd == BIO_READ) + prot |= VM_PROT_WRITE; /* Less backwards than it looks */ for (addr = (caddr_t)trunc_page((vm_offset_t)bp->b_data), pidx = 0; addr < bp->b_data + bp->b_bufsize; addr += PAGE_SIZE, pidx++) { @@ -3736,8 +3757,7 @@ int npages; npages = bp->b_npages; - pmap_qremove(trunc_page((vm_offset_t)bp->b_data), - npages); + pmap_qremove(trunc_page((vm_offset_t)bp->b_data), npages); vm_page_lock_queues(); for (pidx = 0; pidx < npages; pidx++) vm_page_unhold(bp->b_pages[pidx]); @@ -3749,6 +3769,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 16 01:19:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E3EA16A4D0; Thu, 16 Sep 2004 01:19:42 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 58FEE16A4CE for ; Thu, 16 Sep 2004 01:19:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 508CA43D2D for ; Thu, 16 Sep 2004 01:19:42 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8G1JgvH012315 for ; Thu, 16 Sep 2004 01:19:42 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8G1Jgsd012312 for perforce@freebsd.org; Thu, 16 Sep 2004 01:19:42 GMT (envelope-from peter@freebsd.org) Date: Thu, 16 Sep 2004 01:19:42 GMT Message-Id: <200409160119.i8G1Jgsd012312@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 61581 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2004 01:19:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=61581 Change 61581 by peter@peter_daintree on 2004/09/16 01:18:53 integ -I -b i386_hammer (pick up db_machdep trace fixes) Affected files ... .. //depot/projects/hammer/sys/amd64/include/db_machdep.h#10 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/include/db_machdep.h#10 (text+ko) ==== @@ -41,9 +41,17 @@ #define BKPT_SIZE (1) /* size of breakpoint inst */ #define BKPT_SET(inst) (BKPT_INST) -#define BKPT_SKIP kdb_frame->tf_rip += 1 +#define BKPT_SKIP \ +do { \ + kdb_frame->tf_rip += 1; \ + kdb_thrctx->pcb_rip += 1; \ +} while(0) -#define FIXUP_PC_AFTER_BREAK kdb_frame->tf_rip -= 1; +#define FIXUP_PC_AFTER_BREAK \ +do { \ + kdb_frame->tf_rip -= 1; \ + kdb_thrctx->pcb_rip -= 1; \ +} while(0); #define db_clear_single_step kdb_cpu_clear_singlestep #define db_set_single_step kdb_cpu_set_singlestep From owner-p4-projects@FreeBSD.ORG Thu Sep 16 01:53:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C847416A4D0; Thu, 16 Sep 2004 01:53:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6388916A4CE for ; Thu, 16 Sep 2004 01:53:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4811A43D46 for ; Thu, 16 Sep 2004 01:53:23 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8G1rN1k013297 for ; Thu, 16 Sep 2004 01:53:23 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8G1rMHo013294 for perforce@freebsd.org; Thu, 16 Sep 2004 01:53:22 GMT (envelope-from marcel@freebsd.org) Date: Thu, 16 Sep 2004 01:53:22 GMT Message-Id: <200409160153.i8G1rMHo013294@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 61582 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2004 01:53:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=61582 Change 61582 by marcel@marcel_nfs on 2004/09/16 01:52:24 Revert the SPARSE_PHYSICAL_MEMORY changes. Affected files ... .. //depot/projects/ia64/sys/vm/vm_page.c#64 edit .. //depot/projects/ia64/sys/vm/vm_page.h#31 edit Differences ... ==== //depot/projects/ia64/sys/vm/vm_page.c#64 (text+ko) ==== @@ -97,7 +97,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.290 2004/07/29 18:56:31 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.291 2004/09/15 12:09:50 phk Exp $"); #include #include @@ -148,30 +148,7 @@ panic("vm_set_page_size: page size not a power of two"); } -#ifdef SPARSE_PHYSICAL_MEMORY /* - * vm_page_from_phys - * - * Given a physical address, return a pointer to the vm_page in the - * vm_page array. This function deals with sparse memory addresses. - */ -vm_page_t -vm_page_from_phys(vm_offset_t pa) -{ - vm_page_t p = vm_page_array; - int i; - - for (i = 0; phys_avail[i + 1]; i += 2) { - if (pa >= phys_avail[i] && pa < phys_avail[i + 1]) - return (p + (atop(pa) - phys_avail[i] / PAGE_SIZE)); - p += (phys_avail[i + 1] - phys_avail[i]) / PAGE_SIZE; - } - panic("vm_page_from_phys: unmanaged physical address."); - return (0); -} -#endif - -/* * vm_page_startup: * * Initializes the resident memory module. @@ -211,7 +188,6 @@ phys_avail[i + 1] = trunc_page(phys_avail[i + 1]); } - /* XXX: Based on assumptions that aren't valid on all architectures.*/ for (i = 0; phys_avail[i + 1]; i += 2) { vm_paddr_t size = phys_avail[i + 1] - phys_avail[i]; @@ -246,8 +222,8 @@ bootpages = UMA_BOOT_PAGES * UMA_SLAB_SIZE; new_end = end - bootpages; new_end = trunc_page(new_end); - /* XXX: Bounds check! */ - mapped = pmap_map(&vaddr, new_end, end, VM_PROT_READ | VM_PROT_WRITE); + mapped = pmap_map(&vaddr, new_end, end, + VM_PROT_READ | VM_PROT_WRITE); bzero((caddr_t) mapped, end - new_end); uma_startup((caddr_t)mapped); @@ -257,16 +233,7 @@ * page). */ first_page = phys_avail[0] / PAGE_SIZE; -#ifdef SPARSE_PHYSICAL_MEMORY - /* - * Don't use the pysical address range for the actual page range. - * On architectures with sparse memory addressing this is wrong. - * Instead, use the total memory obtained above. - */ - page_range = total / PAGE_SIZE; -#else - page_range = phys_avail[(nblocks-1) * 2 + 1] / PAGE_SIZE - first_page; -#endif + page_range = phys_avail[(nblocks - 1) * 2 + 1] / PAGE_SIZE - first_page; npages = (total - (page_range * sizeof(struct vm_page)) - (end - new_end)) / PAGE_SIZE; end = new_end; @@ -281,8 +248,8 @@ * queue. */ new_end = trunc_page(end - page_range * sizeof(struct vm_page)); - /* XXX: Bounds check! */ - mapped = pmap_map(&vaddr, new_end, end, VM_PROT_READ | VM_PROT_WRITE); + mapped = pmap_map(&vaddr, new_end, end, + VM_PROT_READ | VM_PROT_WRITE); vm_page_array = (vm_page_t) mapped; phys_avail[biggestone + 1] = new_end; @@ -296,7 +263,7 @@ * Construct the free queue(s) in descending order (by physical * address) so that the first 16MB of physical memory is allocated * last rather than first. On large-memory machines, this avoids - * the exhaustion of low physical memory before isa_dmainit has run. + * the exhaustion of low physical memory before isa_dma_init has run. */ cnt.v_page_count = 0; cnt.v_free_count = 0; ==== //depot/projects/ia64/sys/vm/vm_page.h#31 (text+ko) ==== @@ -290,11 +290,8 @@ #define VM_PAGE_TO_PHYS(entry) ((entry)->phys_addr) -#ifdef SPARSE_PHYSICAL_MEMORY -#define PHYS_TO_VM_PAGE(pa) vm_page_from_phys(pa) -#else -#define PHYS_TO_VM_PAGE(pa) (&vm_page_array[atop(pa) - first_page ]) -#endif +#define PHYS_TO_VM_PAGE(pa) \ + (&vm_page_array[atop(pa) - first_page ]) extern struct mtx vm_page_queue_mtx; #define vm_page_lock_queues() mtx_lock(&vm_page_queue_mtx) @@ -360,7 +357,6 @@ void vm_page_rename (vm_page_t, vm_object_t, vm_pindex_t); vm_page_t vm_page_select_cache(int); vm_page_t vm_page_splay(vm_pindex_t, vm_page_t); -vm_page_t vm_page_from_phys(vm_offset_t); vm_offset_t vm_page_startup(vm_offset_t vaddr); void vm_page_unmanage (vm_page_t); void vm_page_unwire (vm_page_t, int); From owner-p4-projects@FreeBSD.ORG Thu Sep 16 01:59:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2C2416A4D0; Thu, 16 Sep 2004 01:59:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B79B16A4CE for ; Thu, 16 Sep 2004 01:59:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24A7343D53 for ; Thu, 16 Sep 2004 01:59:32 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8G1xVxC013466 for ; Thu, 16 Sep 2004 01:59:31 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8G1xVKt013463 for perforce@freebsd.org; Thu, 16 Sep 2004 01:59:31 GMT (envelope-from marcel@freebsd.org) Date: Thu, 16 Sep 2004 01:59:31 GMT Message-Id: <200409160159.i8G1xVKt013463@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 61584 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2004 01:59:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=61584 Change 61584 by marcel@marcel_nfs on 2004/09/16 01:58:33 IFC @61583 Affected files ... .. //depot/projects/ia64/UPDATING#67 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#52 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#29 integrate .. //depot/projects/ia64/etc/rc.d/ntpdate#9 branch .. //depot/projects/ia64/etc/rc.d/rpcbind#9 integrate .. //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.sh#7 integrate .. //depot/projects/ia64/release/Makefile#81 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.c#17 integrate .. //depot/projects/ia64/share/man/man4/divert.4#6 integrate .. //depot/projects/ia64/share/man/man4/ng_ubt.4#8 integrate .. //depot/projects/ia64/share/man/man4/vge.4#2 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#53 integrate .. //depot/projects/ia64/share/man/man9/vm_map.9#4 integrate .. //depot/projects/ia64/sys/alpha/isa/isa_dma.c#7 integrate .. //depot/projects/ia64/sys/amd64/isa/isa_dma.c#7 integrate .. //depot/projects/ia64/sys/amd64/isa/isa_dma.h#3 delete .. //depot/projects/ia64/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/ia64/sys/dev/aha/aha_mca.c#8 integrate .. //depot/projects/ia64/sys/dev/amr/amr.c#23 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_mca.c#7 integrate .. //depot/projects/ia64/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/ia64/sys/dev/fdc/fdc_acpi.c#3 integrate .. //depot/projects/ia64/sys/dev/fdc/fdc_isa.c#3 integrate .. //depot/projects/ia64/sys/dev/fdc/fdc_pccard.c#3 integrate .. //depot/projects/ia64/sys/dev/fdc/fdcvar.h#3 integrate .. //depot/projects/ia64/sys/dev/md/md.c#44 integrate .. //depot/projects/ia64/sys/dev/nge/if_nge.c#30 integrate .. //depot/projects/ia64/sys/dev/nge/if_ngereg.h#6 integrate .. //depot/projects/ia64/sys/dev/pst/pst-iop.h#5 integrate .. //depot/projects/ia64/sys/dev/pst/pst-pci.c#7 integrate .. //depot/projects/ia64/sys/dev/pst/pst-raid.c#13 integrate .. //depot/projects/ia64/sys/dev/sound/pci/fm801.c#12 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_io.c#14 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_io.c#17 integrate .. //depot/projects/ia64/sys/i386/i386/gdb_machdep.c#2 integrate .. //depot/projects/ia64/sys/i386/include/db_machdep.h#3 integrate .. //depot/projects/ia64/sys/i386/isa/isa_dma.c#8 integrate .. //depot/projects/ia64/sys/i386/isa/isa_dma.h#4 delete .. //depot/projects/ia64/sys/ia64/isa/isa_dma.c#7 integrate .. //depot/projects/ia64/sys/isa/isavar.h#5 integrate .. //depot/projects/ia64/sys/kern/kern_event.c#26 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#33 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#79 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#70 integrate .. //depot/projects/ia64/sys/kern/vfs_init.c#15 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#66 integrate .. //depot/projects/ia64/sys/net/if_clone.c#2 integrate .. //depot/projects/ia64/sys/netinet/ip_icmp.c#23 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#44 integrate .. //depot/projects/ia64/sys/netinet/ip_var.h#23 integrate .. //depot/projects/ia64/sys/netinet/tcp_syncache.c#31 integrate .. //depot/projects/ia64/sys/nfs4client/nfs4_vnops.c#7 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_bio.c#26 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#34 integrate .. //depot/projects/ia64/sys/pc98/pc98/isa_dma.c#6 integrate .. //depot/projects/ia64/sys/sys/buf.h#32 integrate .. //depot/projects/ia64/sys/sys/mbuf.h#32 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#65 integrate .. //depot/projects/ia64/tools/lib32/build32.sh#3 integrate .. //depot/projects/ia64/tools/tools/genericize/genericize.pl#2 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#46 integrate .. //depot/projects/ia64/usr.bin/uniq/uniq.c#11 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/hcsecd/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/hcsecd/parser.y#4 integrate .. //depot/projects/ia64/usr.sbin/boot0cfg/boot0cfg.8#10 integrate .. //depot/projects/ia64/usr.sbin/boot0cfg/boot0cfg.c#8 integrate .. //depot/projects/ia64/usr.sbin/burncd/burncd.8#17 integrate .. //depot/projects/ia64/usr.sbin/burncd/burncd.c#17 integrate .. //depot/projects/ia64/usr.sbin/cron/crontab/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/cron/crontab/crontab.c#4 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/disks.c#20 integrate Differences ... ==== //depot/projects/ia64/UPDATING#67 (text+ko) ==== @@ -24,16 +24,6 @@ to maximize performance. 20040914: - /etc/rc.d/ntpdate has been removed in favor of using the -g - flag to ntpd(1). By default, if ntpd is enabled, it will sync - with the time servers listed in /etc/ntp.conf regardless of the - time difference (slew). To prevent this, add - ntpd_sync_on_start="NO" to /etc/rc.conf. - - NOTE: Doing a sync (ntpd -g) is noticably slower than ntpdate(1), - but is also more accurate (hence ntpdate(1) being depreciated). - -20040914: The format of the pflogd(8) logfile "/var/log/pflog" has changed for architectures that have a 64 bit long type to make it compatible to the standard pcap format. In order to prevent corruption move away @@ -1869,4 +1859,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.358 2004/09/14 03:01:38 seanc Exp $ +$FreeBSD: src/UPDATING,v 1.359 2004/09/15 01:08:32 seanc Exp $ ==== //depot/projects/ia64/etc/defaults/rc.conf#52 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.213 2004/09/14 03:01:38 seanc Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.214 2004/09/15 01:08:32 seanc Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -219,9 +219,12 @@ ### Network Time Services options: ### timed_enable="NO" # Run the time daemon (or NO). timed_flags="" # Flags to timed (if enabled). +ntpdate_enable="NO" # Run ntpdate to sync time on boot (or NO). +ntpdate_program="/usr/sbin/ntpdate" # path to ntpdate, if you want a different one. +ntpdate_flags="-b" # Flags to ntpdate (if enabled). ntpd_enable="NO" # Run ntpd Network Time Protocol (or NO). ntpd_program="/usr/sbin/ntpd" # path to ntpd, if you want a different one. -ntpd_sync_on_start="YES" # Sync time on ntpd startup, even if offset is high +ntpd_sync_on_start="NO" # Sync time on ntpd startup, even if offset is high ntpd_flags="-p /var/run/ntpd.pid -f /var/db/ntpd.drift" # Flags to ntpd (if enabled). ==== //depot/projects/ia64/etc/rc.d/Makefile#29 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.42 2004/09/14 03:01:38 seanc Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.43 2004/09/15 01:08:33 seanc Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -23,7 +23,7 @@ mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ network_ipv6 nfsclient nfsd \ - nfslocking nfsserver nisdomain nsswitch ntpd \ + nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \ othermta \ pccard pcvt pf pflog preseedrandom \ power_profile ppp-user pppoed pwcheck \ ==== //depot/projects/ia64/etc/rc.d/rpcbind#9 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: rpcbind,v 1.6 2002/01/31 01:26:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/rpcbind,v 1.10 2004/09/14 03:01:38 seanc Exp $ +# $FreeBSD: src/etc/rc.d/rpcbind,v 1.11 2004/09/15 01:08:33 seanc Exp $ # # PROVIDE: rpcbind -# REQUIRE: NETWORKING ntpd syslogd named +# REQUIRE: NETWORKING ntpdate syslogd named # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.sh#7 (text+ko) ==== @@ -20,7 +20,7 @@ # along with GNU GNATS; see the file COPYING. If not, write to # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. # -# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.35 2003/11/12 23:08:23 ceri Exp $ +# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.36 2004/09/14 20:30:35 ceri Exp $ # The version of this send-pr. VERSION=3.113 @@ -262,7 +262,7 @@ # Catch some signals. ($xs kludge needed by Sun /bin/sh) xs=0 trap 'rm -f $REF $TEMP; exit $xs' 0 -trap 'echo "$COMMAND: Aborting ... saving unfinished PR into /tmp/pr.$$"; rm -f $REF ; mv $TEMP /tmp/pr.$$; xs=1; exit' 1 2 3 13 15 +trap 'SAV=`mktemp -t pr`;echo "$COMMAND: Aborting ... saving unfinished PR into $SAV"; rm -f $REF ; mv $TEMP $SAV; xs=1; exit' 1 2 3 13 15 # If they told us to use a specific file, then do so. if [ -n "$IN_FILE" ]; then ==== //depot/projects/ia64/release/Makefile#81 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.860 2004/09/14 04:01:57 brooks Exp $ +# $FreeBSD: src/release/Makefile,v 1.861 2004/09/15 05:14:21 brooks Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -919,8 +919,7 @@ @echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DISC2}/boot/loader.conf .if exists(${HINTSFILE}) # Break the link to device.hints so we can modify it - @rm ${CD_DISC2}/boot/device.hints - @cp ${HINTSFILE} ${CD_DISC2}/boot/device.hints + @cp -f ${HINTSFILE} ${CD_DISC2}/boot/device.hints .if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64" @echo 'hint.atkbd.0.flags="0x1"' >> ${CD_DISC2}/boot/device.hints .endif ==== //depot/projects/ia64/sbin/atacontrol/atacontrol.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.31 2004/05/20 15:01:26 des Exp $ + * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.32 2004/09/15 11:22:05 sos Exp $ */ #include @@ -187,16 +187,18 @@ parm->enabled.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no"); if (parm->satacapabilities && parm->satacapabilities != 0xffff) { - printf("SATA NCQ %s %s %d/0x%02X\n", - parm->satacapabilities & ATA_SUPPORT_NCQ ? "yes" : "no", - " -", ATA_QUEUE_LEN(parm->queue), - ATA_QUEUE_LEN(parm->queue)); + printf("Native Command Queuing (NCQ) %s %s %d/0x%02X\n", + parm->satacapabilities & ATA_SUPPORT_NCQ ? + "yes" : "no", " -", + (parm->satacapabilities & ATA_SUPPORT_NCQ) ? + ATA_QUEUE_LEN(parm->queue) : 0, + (parm->satacapabilities & ATA_SUPPORT_NCQ) ? + ATA_QUEUE_LEN(parm->queue) : 0); } - else - printf("dma queued %s %s %d/0x%02X\n", - parm->support.command2 & ATA_SUPPORT_QUEUED ? "yes" : "no", - parm->enabled.command2 & ATA_SUPPORT_QUEUED ? "yes" : "no", - ATA_QUEUE_LEN(parm->queue), ATA_QUEUE_LEN(parm->queue)); + printf("Tagged Command Queuing (TCQ) %s %s %d/0x%02X\n", + parm->support.command2 & ATA_SUPPORT_QUEUED ? "yes" : "no", + parm->enabled.command2 & ATA_SUPPORT_QUEUED ? "yes" : "no", + ATA_QUEUE_LEN(parm->queue), ATA_QUEUE_LEN(parm->queue)); printf("SMART %s %s\n", parm->support.command1 & ATA_SUPPORT_SMART ? "yes" : "no", ==== //depot/projects/ia64/share/man/man4/divert.4#6 (text+ko) ==== @@ -1,6 +1,6 @@ -.\" $FreeBSD: src/share/man/man4/divert.4,v 1.29 2004/07/03 18:29:20 ru Exp $ +.\" $FreeBSD: src/share/man/man4/divert.4,v 1.30 2004/09/14 09:35:10 andre Exp $ .\" -.Dd June 18, 1996 +.Dd September 14, 2004 .Dt DIVERT 4 .Os .Sh NAME @@ -128,6 +128,12 @@ If different fragments divert to different ports, then which port ultimately gets chosen is unpredictable. .Pp +Note that packets arriving on the divert socket by the +.Xr ipfw 8 +.Cm tee +action are delivered as-is and packet fragments do not get reassembled +in this case. +.Pp Packets are received and sent unchanged, except that packets read as outgoing have invalid IP header checksums, and packets written as outgoing have their IP header checksums overwritten ==== //depot/projects/ia64/share/man/man4/ng_ubt.4#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $Id: ng_ubt.4,v 1.3 2003/05/21 19:37:35 max Exp $ -.\" $FreeBSD: src/share/man/man4/ng_ubt.4,v 1.7 2004/09/13 10:36:44 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/ng_ubt.4,v 1.8 2004/09/14 16:46:16 brueffer Exp $ .\" .Dd September 13, 2004 .Dt NG_UBT 4 @@ -57,7 +57,8 @@ .Sh HARDWARE The .Nm -driver supports the following Bluetooth USB devices: +driver supports all Bluetooth USB devices that conform with +the Bluetooth specification v1.1 including: .Pp .Bl -bullet -compact .It ==== //depot/projects/ia64/share/man/man4/vge.4#2 (text+ko) ==== @@ -1,6 +1,5 @@ -.\" Copyright (c) 2001 Wind River Systems -.\" Copyright (c) 1997, 1998, 1999, 2000, 2001 -.\" Bill Paul . All rights reserved. +.\" Copyright (c) 2004 +.\" Bill Paul . All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -29,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/vge.4,v 1.4 2004/09/13 17:05:07 wpaul Exp $ +.\" $FreeBSD: src/share/man/man4/vge.4,v 1.5 2004/09/14 16:08:13 wpaul Exp $ .\" .Dd September 10, 2004 .Dt VGE 4 ==== //depot/projects/ia64/share/man/man5/rc.conf.5#53 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.221 2004/07/18 18:01:48 simon Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.222 2004/09/15 01:39:25 seanc Exp $ .\" .Dd April 25, 2004 .Dt RC.CONF 5 @@ -1604,6 +1604,25 @@ these are the flags to pass to the .Xr ntpd 8 daemon. +.It Va ntpd_sync_on_start +.Pq Vt bool +If set to +.Dq Li YES , +.Xr ntpd 8 +is run with the +.Op Fl g +flag, which syncs the system's clock on startup. +See +.Xr ntpd 8 +for more information regarding the +.Op Fl g +option. +This is a preferred alternative to using +.Xr ntpdate 1 +or specifying the +.Pa /etc/rc.conf +tunable +.Op Ar ntpdate_enable . .It Va nis_client_enable .Pq Vt bool If set to ==== //depot/projects/ia64/share/man/man9/vm_map.9#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vm_map.9,v 1.4 2004/07/06 07:02:31 ru Exp $ +.\" $FreeBSD: src/share/man/man9/vm_map.9,v 1.5 2004/09/15 18:41:10 alc Exp $ .\" .Dd July 19, 2003 .Dt VM_MAP 9 @@ -52,17 +52,18 @@ .Bd -literal -offset indent struct vm_map { struct vm_map_entry header; - struct lock lock; + struct sx lock; struct mtx system_mtx; int nentries; vm_size_t size; + u_int timestamp; u_char needs_wakeup; u_char system_map; - u_char infork; + vm_flags_t flags; vm_map_entry_t root; - unsigned int timestamp; - vm_map_entry_t first_free; pmap_t pmap; +#define min_offset header.start +#define max_offset header.end }; .Ed .Pp @@ -83,23 +84,38 @@ A count of the members in use within the circular map entry list. .It Va size Specifies the size of the virtual address space. -.It Va infork -Indicates if the map structure is currently undergoing fork processing. +.It Va timestamp +Used to determine if the map has changed since its last access. .It Va needs_wakeup Indicates if a thread is waiting for an allocation within the map. Used only by system maps. .It Va system_map Set to TRUE to indicate that map is a system map; otherwise, it belongs to a user process. +.It Va flags +Map flags. .It Va root Root node of a binary search tree used for fast lookup of map entries. -.It Va timestamp -Used to determine if the map has changed since its last access. -.It Va first_free -Provides a hint to the first free space within the map. .It Va pmap Pointer to the underlying physical map with which this virtual map is associated. +.It Va min_offset +The minimum +.Va vm_offset_t +in this map. +Programs should never use +.Va header.start +or +.Va header.end +directly, use +.Va min_offset +and +.Va max_offset +instead. +.It Va max_offset +The maximum +.Va vm_offset_t +in this map. .El .Pp The following flags can be passed to @@ -141,6 +157,8 @@ vm_offset_t start; vm_offset_t end; vm_offset_t avail_ssize; + vm_size_t adj_free; + vm_size_t max_free; union vm_map_object object; vm_ooffset_t offset; vm_eflags_t eflags; @@ -171,6 +189,11 @@ Upper address bound of this entry's region. .It Va avail_ssize If the entry is for a process stack, specifies how much the entry can grow. +.It Va adj_free +The amount of free, unmapped address space adjacent to and immediately +following this map entry. +.It Va max_free +The maximum amount of contiguous free space in this map entry's subtree. .It Va object Pointer to the .Vt struct vm_map_object ==== //depot/projects/ia64/sys/alpha/isa/isa_dma.c#7 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.11 2004/04/05 21:00:51 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.12 2004/09/15 12:09:49 phk Exp $"); #include #include @@ -93,10 +93,8 @@ /* * Setup a DMA channel's bounce buffer. */ -void -isa_dmainit(chan, bouncebufsize) - int chan; - u_int bouncebufsize; +int +isa_dma_init(int chan, u_int bouncebufsize, int flag __unused) { static int initted = 0; bus_addr_t boundary = chan >= 4 ? 0x20000 : 0x10000; @@ -114,10 +112,10 @@ #ifdef DIAGNOSTIC if (chan & ~VALID_DMA_MASK) - panic("isa_dmainit: channel out of range"); + panic("isa_dma_init: channel out of range"); if (dma_tag[chan] || dma_map[chan]) - panic("isa_dmainit: impossible request"); + panic("isa_dma_init: impossible request"); #endif if (bus_dma_tag_create(/*parent*/NULL, @@ -132,13 +130,13 @@ /*lockfunc*/busdma_lock_mutex, /*lockarg*/&Giant, &dma_tag[chan]) != 0) { - panic("isa_dmainit: unable to create dma tag\n"); + panic("isa_dma_init: unable to create dma tag\n"); } if (bus_dmamap_create(dma_tag[chan], 0, &dma_map[chan])) { - panic("isa_dmainit: unable to create dma map\n"); + panic("isa_dma_init: unable to create dma map\n"); } - + return (0); } /* @@ -349,7 +347,7 @@ #endif if (!dma_tag || !dma_map[chan]) - panic("isa_dmastart: called without isa_dmainit"); + panic("isa_dmastart: called without isa_dma_init"); dma_busy |= (1 << chan); ==== //depot/projects/ia64/sys/amd64/isa/isa_dma.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.19 2004/08/16 22:51:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.20 2004/09/15 12:09:49 phk Exp $"); /* * code to manage AT bus @@ -96,15 +96,13 @@ /* * Setup a DMA channel's bounce buffer. */ -void -isa_dmainit(chan, bouncebufsize) - int chan; - u_int bouncebufsize; +int +isa_dma_init(int chan, u_int bouncebufsize, int flag) { void *buf; /* - * If a DMA channel is shared, both drivers have to call isa_dmainit + * If a DMA channel is shared, both drivers have to call isa_dma_init * since they don't know that the other driver will do it. * Just return if we're already set up good. * XXX: this only works if they agree on the bouncebuf size. This @@ -112,30 +110,30 @@ * XXX: the same driver. */ if (dma_bouncebuf[chan] != NULL) - return; + return (0); #ifdef DIAGNOSTIC if (chan & ~VALID_DMA_MASK) - panic("isa_dmainit: channel out of range"); + panic("isa_dma_init: channel out of range"); #endif dma_bouncebufsize[chan] = bouncebufsize; /* Try malloc() first. It works better if it works. */ - buf = malloc(bouncebufsize, M_DEVBUF, M_NOWAIT); + buf = malloc(bouncebufsize, M_DEVBUF, flag); if (buf != NULL) { if (isa_dmarangecheck(buf, bouncebufsize, chan) == 0) { dma_bouncebuf[chan] = buf; - return; + return (0); } free(buf, M_DEVBUF); } - buf = contigmalloc(bouncebufsize, M_DEVBUF, M_NOWAIT, 0ul, 0xfffffful, + buf = contigmalloc(bouncebufsize, M_DEVBUF, flag, 0ul, 0xfffffful, 1ul, chan & 4 ? 0x20000ul : 0x10000ul); if (buf == NULL) - printf("isa_dmainit(%d, %d) failed\n", chan, bouncebufsize); - else - dma_bouncebuf[chan] = buf; + return (ENOMEM); + dma_bouncebuf[chan] = buf; + return (0); } /* ==== //depot/projects/ia64/sys/contrib/pf/net/pf_if.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.5 2004/08/16 17:58:12 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.6 2004/09/14 15:20:24 mlaier Exp $ */ /* $OpenBSD: pf_if.c,v 1.11 2004/03/15 11:38:23 cedric Exp $ */ /* add $OpenBSD: pf_if.c,v 1.19 2004/08/11 12:06:44 henning Exp $ */ @@ -638,8 +638,16 @@ af = ia->ifa_addr->sa_family; if (af != AF_INET && af != AF_INET6) continue; -#ifdef notyet - if (!(ia->ifa_flags & IFA_ROUTE)) +#ifdef __FreeBSD__ + /* + * XXX: For point-to-point interfaces, (ifname:0) and IPv4, + * jump over addresses without a proper route to work + * around a problem with ppp not fully removing the + * address used during IPCP. + */ + if ((ifp->if_flags & IFF_POINTOPOINT) && + !(ia->ifa_flags & IFA_ROUTE) && + (flags & PFI_AFLAG_NOALIAS) && (af == AF_INET)) continue; #endif if ((flags & PFI_AFLAG_BROADCAST) && af == AF_INET6) ==== //depot/projects/ia64/sys/dev/aha/aha_mca.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aha/aha_mca.c,v 1.11 2004/03/17 17:50:24 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aha/aha_mca.c,v 1.12 2004/09/15 11:58:34 phk Exp $"); #include #include @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include ==== //depot/projects/ia64/sys/dev/amr/amr.c#23 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.54 2004/08/16 17:23:09 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.55 2004/09/14 16:36:12 scottl Exp $"); /* * Driver for the AMI MegaRaid family of controllers. @@ -708,7 +708,7 @@ if ((result = malloc(bufsize, M_DEVBUF, M_NOWAIT)) == NULL) goto out; /* set command flags */ - ac->ac_flags |= AMR_CMD_PRIORITY | AMR_CMD_DATAOUT; + ac->ac_flags |= AMR_CMD_PRIORITY | AMR_CMD_DATAIN; /* point the command at our data */ ac->ac_data = result; ==== //depot/projects/ia64/sys/dev/buslogic/bt_mca.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_mca.c,v 1.9 2004/03/17 17:50:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_mca.c,v 1.10 2004/09/15 11:58:34 phk Exp $"); /* * Written using the bt_isa/bt_pci code as a reference. @@ -55,7 +55,7 @@ #include #include -#include +#include #include ==== //depot/projects/ia64/sys/dev/fdc/fdc.c#4 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.286 2004/08/27 17:08:24 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.288 2004/09/14 17:28:51 imp Exp $"); #include "opt_fdc.h" @@ -197,9 +197,18 @@ #define FDCTL 7 /* Control Register (W) */ /* - * this is the secret PIO data port (offset from base) + * The YE-DATA PC Card floppies use PIO to read in the data rather than + * DMA due to the wild variability of DMA for the PC Card devices. In + * addition, if we cannot setup the DMA resources for the ISA attachment, + * we'll use this same offset for data transfer. + * + * For this mode, offset 0 and 1 must be used to setup the transfer + * for this floppy. This means they are only available on those systems + * that map them to the floppy drive. Newer systems do not do this, and + * we should likely prohibit access to them (or disallow NODMA to be set). */ -#define FDC_YE_DATAPORT 6 +#define FDBCDR 0 /* And 1 */ +#define FD_YE_DATAPORT 6 /* Drive Data port */ #define FDI_DCHG 0x80 /* diskette has been changed */ /* requires drive and motor being selected */ @@ -337,6 +346,19 @@ return bus_space_read_1(fdc->ctlt, fdc->ctlh, fdc->ctl_off); } +/* + * Magic pseudo-DMA initialization for YE FDC. Sets count and + * direction. + */ +static void +fdbcdr_wr(struct fdc_data *fdc, int iswrite, uint16_t count) +{ + bus_space_write_1(fdc->portt, fdc->porth, fdc->port_off + FDBCDR, + (count - 1) & 0xff); + bus_space_write_1(fdc->portt, fdc->porth, fdc->port_off + FDBCDR + 1, + ((iswrite ? 0x80 : 0) | (((count - 1) >> 8) & 0x7f))); +} + static int fdc_err(struct fdc_data *fdc, const char *s) { @@ -634,18 +656,6 @@ } /* - * Magic pseudo-DMA initialization for YE FDC. Sets count and - * direction. - */ -#define SET_BCDR(fdc,wr,cnt,port) \ - do { \ - bus_space_write_1(fdc->portt, fdc->porth, fdc->port_off + port, \ - ((cnt)-1) & 0xff); \ - bus_space_write_1(fdc->portt, fdc->porth, fdc->port_off + port + 1, \ - ((wr ? 0x80 : 0) | ((((cnt)-1) >> 8) & 0x7f))); \ - } while (0) - -/* * fdc_pio(): perform programmed IO read/write for YE PCMCIA floppy. */ static void @@ -660,13 +670,13 @@ count = fdc->fd->fd_iosize; if (bp->bio_cmd == BIO_READ) { - SET_BCDR(fdc, 0, count, 0); + fdbcdr_wr(fdc, 0, count); bus_space_read_multi_1(fdc->portt, fdc->porth, fdc->port_off + - FDC_YE_DATAPORT, cptr, count); + FD_YE_DATAPORT, cptr, count); } else { bus_space_write_multi_1(fdc->portt, fdc->porth, fdc->port_off + - FDC_YE_DATAPORT, cptr, count); - SET_BCDR(fdc, 0, count, 0); + FD_YE_DATAPORT, cptr, count); + fdbcdr_wr(fdc, 0, count); /* needed? */ } } @@ -940,7 +950,7 @@ /* Do PIO if we have to */ if (fdc->flags & FDC_NODMA) { if (bp->bio_cmd & (BIO_READ|BIO_WRITE|BIO_FMT)) - SET_BCDR(fdc, 1, fd->fd_iosize, 0); + fdbcdr_wr(fdc, 1, fd->fd_iosize); if (bp->bio_cmd & (BIO_WRITE|BIO_FMT)) fdc_pio(fdc); } @@ -1484,39 +1494,30 @@ device_t dev; dev = fdc->fdc_dev; - if (fdc->fdc_intr) { + if (fdc->fdc_intr) BUS_TEARDOWN_INTR(device_get_parent(dev), dev, fdc->res_irq, fdc->fdc_intr); - fdc->fdc_intr = NULL; - } - if (fdc->res_irq != 0) { - bus_deactivate_resource(dev, SYS_RES_IRQ, fdc->rid_irq, - fdc->res_irq); + fdc->fdc_intr = NULL; + if (fdc->res_irq != NULL) bus_release_resource(dev, SYS_RES_IRQ, fdc->rid_irq, - fdc->res_irq); - fdc->res_irq = NULL; - } - if (fdc->res_ctl != 0) { - bus_deactivate_resource(dev, SYS_RES_IOPORT, fdc->rid_ctl, - fdc->res_ctl); + fdc->res_irq); + fdc->res_irq = NULL; + if (fdc->res_ctl != NULL) bus_release_resource(dev, SYS_RES_IOPORT, fdc->rid_ctl, - fdc->res_ctl); - fdc->res_ctl = NULL; - } - if (fdc->res_ioport != 0) { - bus_deactivate_resource(dev, SYS_RES_IOPORT, fdc->rid_ioport, - fdc->res_ioport); + fdc->res_ctl); + fdc->res_ctl = NULL; + if (fdc->res_sts != NULL) + bus_release_resource(dev, SYS_RES_IOPORT, fdc->rid_sts, + fdc->res_sts); + fdc->res_sts = NULL; + if (fdc->res_ioport != NULL) bus_release_resource(dev, SYS_RES_IOPORT, fdc->rid_ioport, - fdc->res_ioport); - fdc->res_ioport = NULL; - } - if (fdc->res_drq != 0) { - bus_deactivate_resource(dev, SYS_RES_DRQ, fdc->rid_drq, - fdc->res_drq); + fdc->res_ioport); + fdc->res_ioport = NULL; + if (fdc->res_drq != NULL) bus_release_resource(dev, SYS_RES_DRQ, fdc->rid_drq, - fdc->res_drq); - fdc->res_drq = NULL; - } + fdc->res_drq); + fdc->res_drq = NULL; } int @@ -1685,7 +1686,7 @@ device_printf(dev, "does not respond\n"); return (error); } - error = BUS_SETUP_INTR(device_get_parent(dev), dev, fdc->res_irq, + error = bus_setup_intr(dev, fdc->res_irq, INTR_TYPE_BIO | INTR_ENTROPY | INTR_FAST | INTR_MPSAFE, fdc_intr, fdc, &fdc->fdc_intr); if (error) { ==== //depot/projects/ia64/sys/dev/fdc/fdc_acpi.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_acpi.c,v 1.5 2004/08/30 21:35:34 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_acpi.c,v 1.6 2004/09/16 01:51:21 imp Exp $"); #include #include @@ -137,7 +137,6 @@ fde = (uint32_t *)obj->Buffer.Pointer; if (obj->Buffer.Length < 20) { device_printf(dev, "_FDE too small\n"); - error = ENXIO; goto out; } break; @@ -150,7 +149,6 @@ fde = malloc(pkg->Package.Count * sizeof(uint32_t), M_TEMP, M_NOWAIT | M_ZERO); if (fde == NULL) { - error = ENOMEM; goto out; } for (i = 0; i < pkg->Package.Count; i++) { ==== //depot/projects/ia64/sys/dev/fdc/fdc_isa.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_isa.c,v 1.12 2004/08/31 20:37:10 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_isa.c,v 1.13 2004/09/14 07:06:49 imp Exp $"); #include #include @@ -57,9 +57,8 @@ int fdc_isa_alloc_resources(device_t dev, struct fdc_data *fdc) { - int ispnp, nports; + int nports = 6; - ispnp = (fdc->flags & FDC_ISPNP) != 0; fdc->fdc_dev = dev; fdc->rid_ioport = 0; fdc->rid_irq = 0; @@ -69,99 +68,89 @@ /* * On standard ISA, we don't just use an 8 port range * (e.g. 0x3f0-0x3f7) since that covers an IDE control - * register at 0x3f6. + * register at 0x3f6. So, on older hardware, we use + * 0x3f0-0x3f5 and 0x3f7. However, some BIOSs omit the + * control port, while others start at 0x3f2. Of the latter, + * sometimes we have two resources, other times we have one. + * We have to deal with the following cases: + * + * 1: 0x3f0-0x3f5 # very rare + * 2: 0x3f0 # hints -> 0x3f0-0x3f5,0x3f7 + * 3: 0x3f0-0x3f5,0x3f7 # Most common + * 4: 0x3f2-0x3f5,0x3f7 # Second most common + * 5: 0x3f2-0x3f5 # implies 0x3f7 too. + * 6: 0x3f2-0x3f3,0x3f4-0x3f5,0x3f7 # becoming common + * 7: 0x3f2-0x3f3,0x3f4-0x3f5 # rare * - * Isn't PC hardware wonderful. + * The following code is generic for any value of 0x3fx :-) */ - nports = ispnp ? 1 : 6; /* - * Some ACPI BIOSen have _CRS objects for the floppy device that - * split the I/O port resource into several resources. We detect - * this case by checking if there are more than 2 IOPORT resources. - * If so, we use the resource with the smallest start address as - * the port RID and the largest start address as the control RID. + * First, allocated the main range of ports. In the best of + * worlds, this is 4 or 6 ports. In others, well, that's + * why this function is so complicated. */ - if (bus_get_resource_count(dev, SYS_RES_IOPORT, 2) != 0) { - u_long min_start, max_start, tmp; - int i; - - /* Find the min/max start addresses and their RIDs. */ - max_start = 0ul; - min_start = ~0ul; - for (i = 0; bus_get_resource_count(dev, SYS_RES_IOPORT, i) > 0; - i++) { - tmp = bus_get_resource_start(dev, SYS_RES_IOPORT, i); - KASSERT(tmp != 0, ("bogus resource")); - if (tmp < min_start) { - min_start = tmp; - fdc->rid_ioport = i; - } - if (tmp > max_start) { - max_start = tmp; - fdc->rid_ctl = i; - } - } - } - fdc->res_ioport = bus_alloc_resource(dev, SYS_RES_IOPORT, &fdc->rid_ioport, 0ul, ~0ul, nports, RF_ACTIVE); if (fdc->res_ioport == 0) { - device_printf(dev, "cannot reserve I/O port range (%d ports)\n", - nports); - return ENXIO; + device_printf(dev, "cannot allocate I/O port (%d ports)\n", + nports); + return (ENXIO); } fdc->portt = rman_get_bustag(fdc->res_ioport); fdc->porth = rman_get_bushandle(fdc->res_ioport); /* - * Some BIOSen report the device at 0x3f2-0x3f5,0x3f7 - * and some at 0x3f0-0x3f5,0x3f7. We detect the former - * by checking the size and adjust the port address - * accordingly. + * Handle cases 4-7 above */ - if (bus_get_resource_count(dev, SYS_RES_IOPORT, 0) == 4) - fdc->port_off = -2; + fdc->port_off = -(fdc->porth & 0x7); /* - * Register the control port range as rid 1 if it - * isn't there already. Most PnP BIOSen will have - * already done this but non-PnP configurations don't. - * - * And some (!!) report 0x3f2-0x3f5 and completely - * leave out the control register! It seems that some - * non-antique controller chips have a different - * method of programming the transfer speed which - * doesn't require the control register, but it's - * mighty bogus as the chip still responds to the - * address for the control register. + * Deal with case 6 and 7: FDSTS and FDSATA are in rid 1. */ - if (bus_get_resource_count(dev, SYS_RES_IOPORT, 1) == 0) { - u_long ctlstart; - /* Find the control port, usually 0x3f7 */ - ctlstart = rman_get_start(fdc->res_ioport) + fdc->port_off + 7; - bus_set_resource(dev, SYS_RES_IOPORT, 1, ctlstart, 1); + if (rman_get_size(fdc->res_ioport) == 2) { + fdc->rid_sts = 1; + fdc->res_sts = bus_alloc_resource_any(dev, SYS_RES_IOPORT, + &fdc->rid_sts, RF_ACTIVE); + if (fdc->res_sts == NULL) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 16 05:39:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAAD316A4D0; Thu, 16 Sep 2004 05:39:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BD2316A4CE for ; Thu, 16 Sep 2004 05:39:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60B9E43D1F for ; Thu, 16 Sep 2004 05:39:07 +0000 (GMT) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8G5d7eO019598 for ; Thu, 16 Sep 2004 05:39:07 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8G5d6uL019594 for perforce@freebsd.org; Thu, 16 Sep 2004 05:39:06 GMT (envelope-from brooks@freebsd.org) Date: Thu, 16 Sep 2004 05:39:06 GMT Message-Id: <200409160539.i8G5d6uL019594@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Subject: PERFORCE change 61589 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2004 05:39:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=61589 Change 61589 by brooks@brooks_minya on 2004/09/16 05:35:44 Initial branch of CURRENT for EmuLab.net changes. Affected files ... .. //depot/projects/emulab/current/COPYRIGHT#1 branch .. //depot/projects/emulab/current/MAINTAINERS#1 branch .. //depot/projects/emulab/current/Makefile#1 branch .. //depot/projects/emulab/current/Makefile.inc1#1 branch .. //depot/projects/emulab/current/README#1 branch .. //depot/projects/emulab/current/UPDATING#1 branch .. //depot/projects/emulab/current/UPDATING.64BTT#1 branch .. //depot/projects/emulab/current/bin/Makefile#1 branch .. //depot/projects/emulab/current/bin/Makefile.inc#1 branch .. //depot/projects/emulab/current/bin/cat/Makefile#1 branch .. //depot/projects/emulab/current/bin/cat/cat.1#1 branch .. //depot/projects/emulab/current/bin/cat/cat.c#1 branch .. //depot/projects/emulab/current/bin/chflags/Makefile#1 branch .. //depot/projects/emulab/current/bin/chflags/chflags.1#1 branch .. //depot/projects/emulab/current/bin/chflags/chflags.c#1 branch .. //depot/projects/emulab/current/bin/chio/Makefile#1 branch .. //depot/projects/emulab/current/bin/chio/chio.1#1 branch .. //depot/projects/emulab/current/bin/chio/chio.c#1 branch .. //depot/projects/emulab/current/bin/chio/defs.h#1 branch .. //depot/projects/emulab/current/bin/chio/pathnames.h#1 branch .. //depot/projects/emulab/current/bin/chmod/Makefile#1 branch .. //depot/projects/emulab/current/bin/chmod/chmod.1#1 branch .. //depot/projects/emulab/current/bin/chmod/chmod.c#1 branch .. //depot/projects/emulab/current/bin/cp/Makefile#1 branch .. //depot/projects/emulab/current/bin/cp/cp.1#1 branch .. //depot/projects/emulab/current/bin/cp/cp.c#1 branch .. //depot/projects/emulab/current/bin/cp/extern.h#1 branch .. //depot/projects/emulab/current/bin/cp/utils.c#1 branch .. //depot/projects/emulab/current/bin/csh/Makefile#1 branch .. //depot/projects/emulab/current/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/emulab/current/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/emulab/current/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/emulab/current/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/emulab/current/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/emulab/current/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/emulab/current/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/emulab/current/bin/csh/config.h#1 branch .. //depot/projects/emulab/current/bin/csh/host.defs#1 branch .. //depot/projects/emulab/current/bin/date/Makefile#1 branch .. //depot/projects/emulab/current/bin/date/date.1#1 branch .. //depot/projects/emulab/current/bin/date/date.c#1 branch .. //depot/projects/emulab/current/bin/date/extern.h#1 branch .. //depot/projects/emulab/current/bin/date/netdate.c#1 branch .. //depot/projects/emulab/current/bin/date/vary.c#1 branch .. //depot/projects/emulab/current/bin/date/vary.h#1 branch .. //depot/projects/emulab/current/bin/dd/Makefile#1 branch .. //depot/projects/emulab/current/bin/dd/args.c#1 branch .. //depot/projects/emulab/current/bin/dd/conv.c#1 branch .. //depot/projects/emulab/current/bin/dd/conv_tab.c#1 branch .. //depot/projects/emulab/current/bin/dd/dd.1#1 branch .. //depot/projects/emulab/current/bin/dd/dd.c#1 branch .. //depot/projects/emulab/current/bin/dd/dd.h#1 branch .. //depot/projects/emulab/current/bin/dd/extern.h#1 branch .. //depot/projects/emulab/current/bin/dd/gen.c#1 branch .. //depot/projects/emulab/current/bin/dd/misc.c#1 branch .. //depot/projects/emulab/current/bin/dd/position.c#1 branch .. //depot/projects/emulab/current/bin/dd/ref.ascii#1 branch .. //depot/projects/emulab/current/bin/dd/ref.ebcdic#1 branch .. //depot/projects/emulab/current/bin/dd/ref.ibm#1 branch .. //depot/projects/emulab/current/bin/dd/ref.lcase#1 branch .. //depot/projects/emulab/current/bin/dd/ref.oldascii#1 branch .. //depot/projects/emulab/current/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/emulab/current/bin/dd/ref.oldibm#1 branch .. //depot/projects/emulab/current/bin/dd/ref.pareven#1 branch .. //depot/projects/emulab/current/bin/dd/ref.parnone#1 branch .. //depot/projects/emulab/current/bin/dd/ref.parodd#1 branch .. //depot/projects/emulab/current/bin/dd/ref.parset#1 branch .. //depot/projects/emulab/current/bin/dd/ref.swab#1 branch .. //depot/projects/emulab/current/bin/dd/ref.ucase#1 branch .. //depot/projects/emulab/current/bin/df/Makefile#1 branch .. //depot/projects/emulab/current/bin/df/df.1#1 branch .. //depot/projects/emulab/current/bin/df/df.c#1 branch .. //depot/projects/emulab/current/bin/domainname/Makefile#1 branch .. //depot/projects/emulab/current/bin/domainname/domainname.1#1 branch .. //depot/projects/emulab/current/bin/domainname/domainname.c#1 branch .. //depot/projects/emulab/current/bin/echo/Makefile#1 branch .. //depot/projects/emulab/current/bin/echo/echo.1#1 branch .. //depot/projects/emulab/current/bin/echo/echo.c#1 branch .. //depot/projects/emulab/current/bin/ed/Makefile#1 branch .. //depot/projects/emulab/current/bin/ed/POSIX#1 branch .. //depot/projects/emulab/current/bin/ed/README#1 branch .. //depot/projects/emulab/current/bin/ed/buf.c#1 branch .. //depot/projects/emulab/current/bin/ed/cbc.c#1 branch .. //depot/projects/emulab/current/bin/ed/ed.1#1 branch .. //depot/projects/emulab/current/bin/ed/ed.h#1 branch .. //depot/projects/emulab/current/bin/ed/glbl.c#1 branch .. //depot/projects/emulab/current/bin/ed/io.c#1 branch .. //depot/projects/emulab/current/bin/ed/main.c#1 branch .. //depot/projects/emulab/current/bin/ed/re.c#1 branch .. //depot/projects/emulab/current/bin/ed/sub.c#1 branch .. //depot/projects/emulab/current/bin/ed/test/=.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/Makefile#1 branch .. //depot/projects/emulab/current/bin/ed/test/README#1 branch .. //depot/projects/emulab/current/bin/ed/test/TODO#1 branch .. //depot/projects/emulab/current/bin/ed/test/a.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/a.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/a.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/a1.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/a2.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/addr.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/addr.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/addr.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/addr1.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/addr2.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/emulab/current/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/emulab/current/bin/ed/test/ascii.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/bang1.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/bang1.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/bang1.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/bang1.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/bang2.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/c.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/c.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/c.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/c1.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/c2.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/emulab/current/bin/ed/test/d.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/d.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/d.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/d.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/e1.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/e1.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/e1.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/e1.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/e2.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/e2.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/e2.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/e2.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/e3.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/e3.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/e3.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/e3.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/e4.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/e4.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/e4.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/f1.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/f2.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/g1.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/g1.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/g1.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/g1.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/g2.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/g2.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/g2.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/g2.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/g3.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/g3.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/g3.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/g3.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/g4.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/g4.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/g4.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/g5.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/g5.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/g5.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/h.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/i.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/i.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/i.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/i1.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/i2.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/i3.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/j.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/j.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/j.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/k.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/k.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/k.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/k1.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/k2.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/k3.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/k4.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/l.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/l.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/l.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/m.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/m.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/m.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/m.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/emulab/current/bin/ed/test/n.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/n.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/n.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/nl.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/nl1.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/nl1.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/nl1.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/nl2.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/nl2.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/nl2.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/p.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/p.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/p.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/q.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/q.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/q.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/q1.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/r1.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/r1.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/r1.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/r1.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/r2.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/r2.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/r2.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/r2.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/r3.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/r3.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/r3.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/s1.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/s1.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/s1.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/s1.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/s10.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/s2.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/s2.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/s2.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/s2.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/s3.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/s3.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/s3.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/s3.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/s4.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/s5.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/s6.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/s7.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/s8.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/s9.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/t.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/t.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/t1.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/t1.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/t1.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/t1.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/t2.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/t2.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/t2.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/t2.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/u.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/u.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/u.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/u.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/v.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/v.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/v.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/w.d#1 branch .. //depot/projects/emulab/current/bin/ed/test/w.r#1 branch .. //depot/projects/emulab/current/bin/ed/test/w.t#1 branch .. //depot/projects/emulab/current/bin/ed/test/w1.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/w2.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/w3.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/x.err#1 branch .. //depot/projects/emulab/current/bin/ed/test/z.err#1 branch .. //depot/projects/emulab/current/bin/ed/undo.c#1 branch .. //depot/projects/emulab/current/bin/expr/Makefile#1 branch .. //depot/projects/emulab/current/bin/expr/expr.1#1 branch .. //depot/projects/emulab/current/bin/expr/expr.y#1 branch .. //depot/projects/emulab/current/bin/getfacl/Makefile#1 branch .. //depot/projects/emulab/current/bin/getfacl/getfacl.1#1 branch .. //depot/projects/emulab/current/bin/getfacl/getfacl.c#1 branch .. //depot/projects/emulab/current/bin/hostname/Makefile#1 branch .. //depot/projects/emulab/current/bin/hostname/hostname.1#1 branch .. //depot/projects/emulab/current/bin/hostname/hostname.c#1 branch .. //depot/projects/emulab/current/bin/kenv/Makefile#1 branch .. //depot/projects/emulab/current/bin/kenv/kenv.1#1 branch .. //depot/projects/emulab/current/bin/kenv/kenv.c#1 branch .. //depot/projects/emulab/current/bin/kill/Makefile#1 branch .. //depot/projects/emulab/current/bin/kill/kill.1#1 branch .. //depot/projects/emulab/current/bin/kill/kill.c#1 branch .. //depot/projects/emulab/current/bin/ln/Makefile#1 branch .. //depot/projects/emulab/current/bin/ln/ln.1#1 branch .. //depot/projects/emulab/current/bin/ln/ln.c#1 branch .. //depot/projects/emulab/current/bin/ln/symlink.7#1 branch .. //depot/projects/emulab/current/bin/ls/Makefile#1 branch .. //depot/projects/emulab/current/bin/ls/cmp.c#1 branch .. //depot/projects/emulab/current/bin/ls/extern.h#1 branch .. //depot/projects/emulab/current/bin/ls/ls.1#1 branch .. //depot/projects/emulab/current/bin/ls/ls.c#1 branch .. //depot/projects/emulab/current/bin/ls/ls.h#1 branch .. //depot/projects/emulab/current/bin/ls/print.c#1 branch .. //depot/projects/emulab/current/bin/ls/util.c#1 branch .. //depot/projects/emulab/current/bin/mkdir/Makefile#1 branch .. //depot/projects/emulab/current/bin/mkdir/mkdir.1#1 branch .. //depot/projects/emulab/current/bin/mkdir/mkdir.c#1 branch .. //depot/projects/emulab/current/bin/mv/Makefile#1 branch .. //depot/projects/emulab/current/bin/mv/mv.1#1 branch .. //depot/projects/emulab/current/bin/mv/mv.c#1 branch .. //depot/projects/emulab/current/bin/pax/Makefile#1 branch .. //depot/projects/emulab/current/bin/pax/ar_io.c#1 branch .. //depot/projects/emulab/current/bin/pax/ar_subs.c#1 branch .. //depot/projects/emulab/current/bin/pax/buf_subs.c#1 branch .. //depot/projects/emulab/current/bin/pax/cache.c#1 branch .. //depot/projects/emulab/current/bin/pax/cache.h#1 branch .. //depot/projects/emulab/current/bin/pax/cpio.1#1 branch .. //depot/projects/emulab/current/bin/pax/cpio.c#1 branch .. //depot/projects/emulab/current/bin/pax/cpio.h#1 branch .. //depot/projects/emulab/current/bin/pax/extern.h#1 branch .. //depot/projects/emulab/current/bin/pax/file_subs.c#1 branch .. //depot/projects/emulab/current/bin/pax/ftree.c#1 branch .. //depot/projects/emulab/current/bin/pax/ftree.h#1 branch .. //depot/projects/emulab/current/bin/pax/gen_subs.c#1 branch .. //depot/projects/emulab/current/bin/pax/getoldopt.c#1 branch .. //depot/projects/emulab/current/bin/pax/options.c#1 branch .. //depot/projects/emulab/current/bin/pax/options.h#1 branch .. //depot/projects/emulab/current/bin/pax/pat_rep.c#1 branch .. //depot/projects/emulab/current/bin/pax/pat_rep.h#1 branch .. //depot/projects/emulab/current/bin/pax/pax.1#1 branch .. //depot/projects/emulab/current/bin/pax/pax.c#1 branch .. //depot/projects/emulab/current/bin/pax/pax.h#1 branch .. //depot/projects/emulab/current/bin/pax/sel_subs.c#1 branch .. //depot/projects/emulab/current/bin/pax/sel_subs.h#1 branch .. //depot/projects/emulab/current/bin/pax/tables.c#1 branch .. //depot/projects/emulab/current/bin/pax/tables.h#1 branch .. //depot/projects/emulab/current/bin/pax/tar.1#1 branch .. //depot/projects/emulab/current/bin/pax/tar.c#1 branch .. //depot/projects/emulab/current/bin/pax/tar.h#1 branch .. //depot/projects/emulab/current/bin/pax/tty_subs.c#1 branch .. //depot/projects/emulab/current/bin/ps/Makefile#1 branch .. //depot/projects/emulab/current/bin/ps/extern.h#1 branch .. //depot/projects/emulab/current/bin/ps/fmt.c#1 branch .. //depot/projects/emulab/current/bin/ps/keyword.c#1 branch .. //depot/projects/emulab/current/bin/ps/nlist.c#1 branch .. //depot/projects/emulab/current/bin/ps/print.c#1 branch .. //depot/projects/emulab/current/bin/ps/ps.1#1 branch .. //depot/projects/emulab/current/bin/ps/ps.c#1 branch .. //depot/projects/emulab/current/bin/ps/ps.h#1 branch .. //depot/projects/emulab/current/bin/pwd/Makefile#1 branch .. //depot/projects/emulab/current/bin/pwd/pwd.1#1 branch .. //depot/projects/emulab/current/bin/pwd/pwd.c#1 branch .. //depot/projects/emulab/current/bin/rcp/Makefile#1 branch .. //depot/projects/emulab/current/bin/rcp/extern.h#1 branch .. //depot/projects/emulab/current/bin/rcp/rcp.1#1 branch .. //depot/projects/emulab/current/bin/rcp/rcp.c#1 branch .. //depot/projects/emulab/current/bin/rcp/util.c#1 branch .. //depot/projects/emulab/current/bin/realpath/Makefile#1 branch .. //depot/projects/emulab/current/bin/realpath/realpath.1#1 branch .. //depot/projects/emulab/current/bin/realpath/realpath.c#1 branch .. //depot/projects/emulab/current/bin/rm/Makefile#1 branch .. //depot/projects/emulab/current/bin/rm/rm.1#1 branch .. //depot/projects/emulab/current/bin/rm/rm.c#1 branch .. //depot/projects/emulab/current/bin/rmail/Makefile#1 branch .. //depot/projects/emulab/current/bin/rmdir/Makefile#1 branch .. //depot/projects/emulab/current/bin/rmdir/rmdir.1#1 branch .. //depot/projects/emulab/current/bin/rmdir/rmdir.c#1 branch .. //depot/projects/emulab/current/bin/setfacl/Makefile#1 branch .. //depot/projects/emulab/current/bin/setfacl/file.c#1 branch .. //depot/projects/emulab/current/bin/setfacl/mask.c#1 branch .. //depot/projects/emulab/current/bin/setfacl/merge.c#1 branch .. //depot/projects/emulab/current/bin/setfacl/remove.c#1 branch .. //depot/projects/emulab/current/bin/setfacl/setfacl.1#1 branch .. //depot/projects/emulab/current/bin/setfacl/setfacl.c#1 branch .. //depot/projects/emulab/current/bin/setfacl/setfacl.h#1 branch .. //depot/projects/emulab/current/bin/setfacl/util.c#1 branch .. //depot/projects/emulab/current/bin/sh/Makefile#1 branch .. //depot/projects/emulab/current/bin/sh/TOUR#1 branch .. //depot/projects/emulab/current/bin/sh/alias.c#1 branch .. //depot/projects/emulab/current/bin/sh/alias.h#1 branch .. //depot/projects/emulab/current/bin/sh/arith.h#1 branch .. //depot/projects/emulab/current/bin/sh/arith.y#1 branch .. //depot/projects/emulab/current/bin/sh/arith_lex.l#1 branch .. //depot/projects/emulab/current/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/emulab/current/bin/sh/bltin/echo.1#1 branch .. //depot/projects/emulab/current/bin/sh/bltin/echo.c#1 branch .. //depot/projects/emulab/current/bin/sh/builtins.def#1 branch .. //depot/projects/emulab/current/bin/sh/cd.c#1 branch .. //depot/projects/emulab/current/bin/sh/cd.h#1 branch .. //depot/projects/emulab/current/bin/sh/error.c#1 branch .. //depot/projects/emulab/current/bin/sh/error.h#1 branch .. //depot/projects/emulab/current/bin/sh/eval.c#1 branch .. //depot/projects/emulab/current/bin/sh/eval.h#1 branch .. //depot/projects/emulab/current/bin/sh/exec.c#1 branch .. //depot/projects/emulab/current/bin/sh/exec.h#1 branch .. //depot/projects/emulab/current/bin/sh/expand.c#1 branch .. //depot/projects/emulab/current/bin/sh/expand.h#1 branch .. //depot/projects/emulab/current/bin/sh/funcs/cmv#1 branch .. //depot/projects/emulab/current/bin/sh/funcs/dirs#1 branch .. //depot/projects/emulab/current/bin/sh/funcs/kill#1 branch .. //depot/projects/emulab/current/bin/sh/funcs/login#1 branch .. //depot/projects/emulab/current/bin/sh/funcs/newgrp#1 branch .. //depot/projects/emulab/current/bin/sh/funcs/popd#1 branch .. //depot/projects/emulab/current/bin/sh/funcs/pushd#1 branch .. //depot/projects/emulab/current/bin/sh/funcs/suspend#1 branch .. //depot/projects/emulab/current/bin/sh/histedit.c#1 branch .. //depot/projects/emulab/current/bin/sh/init.h#1 branch .. //depot/projects/emulab/current/bin/sh/input.c#1 branch .. //depot/projects/emulab/current/bin/sh/input.h#1 branch .. //depot/projects/emulab/current/bin/sh/jobs.c#1 branch .. //depot/projects/emulab/current/bin/sh/jobs.h#1 branch .. //depot/projects/emulab/current/bin/sh/mail.c#1 branch .. //depot/projects/emulab/current/bin/sh/mail.h#1 branch .. //depot/projects/emulab/current/bin/sh/main.c#1 branch .. //depot/projects/emulab/current/bin/sh/main.h#1 branch .. //depot/projects/emulab/current/bin/sh/memalloc.c#1 branch .. //depot/projects/emulab/current/bin/sh/memalloc.h#1 branch .. //depot/projects/emulab/current/bin/sh/miscbltin.c#1 branch .. //depot/projects/emulab/current/bin/sh/mkbuiltins#1 branch .. //depot/projects/emulab/current/bin/sh/mkinit.c#1 branch .. //depot/projects/emulab/current/bin/sh/mknodes.c#1 branch .. //depot/projects/emulab/current/bin/sh/mksyntax.c#1 branch .. //depot/projects/emulab/current/bin/sh/mktokens#1 branch .. //depot/projects/emulab/current/bin/sh/myhistedit.h#1 branch .. //depot/projects/emulab/current/bin/sh/mystring.c#1 branch .. //depot/projects/emulab/current/bin/sh/mystring.h#1 branch .. //depot/projects/emulab/current/bin/sh/nodes.c.pat#1 branch .. //depot/projects/emulab/current/bin/sh/nodetypes#1 branch .. //depot/projects/emulab/current/bin/sh/options.c#1 branch .. //depot/projects/emulab/current/bin/sh/options.h#1 branch .. //depot/projects/emulab/current/bin/sh/output.c#1 branch .. //depot/projects/emulab/current/bin/sh/output.h#1 branch .. //depot/projects/emulab/current/bin/sh/parser.c#1 branch .. //depot/projects/emulab/current/bin/sh/parser.h#1 branch .. //depot/projects/emulab/current/bin/sh/redir.c#1 branch .. //depot/projects/emulab/current/bin/sh/redir.h#1 branch .. //depot/projects/emulab/current/bin/sh/sh.1#1 branch .. //depot/projects/emulab/current/bin/sh/shell.h#1 branch .. //depot/projects/emulab/current/bin/sh/show.c#1 branch .. //depot/projects/emulab/current/bin/sh/show.h#1 branch .. //depot/projects/emulab/current/bin/sh/trap.c#1 branch .. //depot/projects/emulab/current/bin/sh/trap.h#1 branch .. //depot/projects/emulab/current/bin/sh/var.c#1 branch .. //depot/projects/emulab/current/bin/sh/var.h#1 branch .. //depot/projects/emulab/current/bin/sleep/Makefile#1 branch .. //depot/projects/emulab/current/bin/sleep/sleep.1#1 branch .. //depot/projects/emulab/current/bin/sleep/sleep.c#1 branch .. //depot/projects/emulab/current/bin/stty/Makefile#1 branch .. //depot/projects/emulab/current/bin/stty/cchar.c#1 branch .. //depot/projects/emulab/current/bin/stty/extern.h#1 branch .. //depot/projects/emulab/current/bin/stty/gfmt.c#1 branch .. //depot/projects/emulab/current/bin/stty/key.c#1 branch .. //depot/projects/emulab/current/bin/stty/modes.c#1 branch .. //depot/projects/emulab/current/bin/stty/print.c#1 branch .. //depot/projects/emulab/current/bin/stty/stty.1#1 branch .. //depot/projects/emulab/current/bin/stty/stty.c#1 branch .. //depot/projects/emulab/current/bin/stty/stty.h#1 branch .. //depot/projects/emulab/current/bin/stty/util.c#1 branch .. //depot/projects/emulab/current/bin/sync/Makefile#1 branch .. //depot/projects/emulab/current/bin/sync/sync.8#1 branch .. //depot/projects/emulab/current/bin/sync/sync.c#1 branch .. //depot/projects/emulab/current/bin/test/Makefile#1 branch .. //depot/projects/emulab/current/bin/test/TEST.README#1 branch .. //depot/projects/emulab/current/bin/test/TEST.csh#1 branch .. //depot/projects/emulab/current/bin/test/TEST.sh#1 branch .. //depot/projects/emulab/current/bin/test/test.1#1 branch .. //depot/projects/emulab/current/bin/test/test.c#1 branch .. //depot/projects/emulab/current/contrib/amd/AUTHORS#1 branch .. //depot/projects/emulab/current/contrib/amd/BUGS#1 branch .. //depot/projects/emulab/current/contrib/amd/COPYING#1 branch .. //depot/projects/emulab/current/contrib/amd/ChangeLog#1 branch .. //depot/projects/emulab/current/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/emulab/current/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/emulab/current/contrib/amd/INSTALL#1 branch .. //depot/projects/emulab/current/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/emulab/current/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/emulab/current/contrib/amd/NEWS#1 branch .. //depot/projects/emulab/current/contrib/amd/README#1 branch .. //depot/projects/emulab/current/contrib/amd/README.ldap#1 branch .. //depot/projects/emulab/current/contrib/amd/README.y2k#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amd.8#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amd.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amd.h#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/autil.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/clock.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/conf.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/map.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/opts.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/restart.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/sched.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amq/amq.8#1 branch .. //depot/projects/emulab/current/contrib/amd/amq/amq.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amq/amq.h#1 branch .. //depot/projects/emulab/current/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/emulab/current/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/emulab/current/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/emulab/current/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/emulab/current/contrib/amd/bootstrap#1 branch .. //depot/projects/emulab/current/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/emulab/current/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/emulab/current/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/emulab/current/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/emulab/current/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/emulab/current/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/emulab/current/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/emulab/current/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/emulab/current/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/emulab/current/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/emulab/current/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/emulab/current/contrib/amd/doc/version.texi#1 branch .. //depot/projects/emulab/current/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/emulab/current/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/emulab/current/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/emulab/current/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/emulab/current/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/emulab/current/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/emulab/current/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/emulab/current/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/emulab/current/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/emulab/current/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/emulab/current/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/emulab/current/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/emulab/current/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/emulab/current/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/emulab/current/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/emulab/current/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/emulab/current/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/emulab/current/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/emulab/current/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/emulab/current/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/emulab/current/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/emulab/current/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/emulab/current/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/emulab/current/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/emulab/current/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/emulab/current/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/emulab/current/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/emulab/current/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/emulab/current/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/emulab/current/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/emulab/current/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/emulab/current/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/emulab/current/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/emulab/current/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/emulab/current/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/emulab/current/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/emulab/current/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/emulab/current/contrib/amd/libamu/util.c#1 branch .. //depot/projects/emulab/current/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/emulab/current/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/emulab/current/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/emulab/current/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/emulab/current/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/emulab/current/contrib/amd/m4/amindent#1 branch .. //depot/projects/emulab/current/contrib/amd/m4/autopat#1 branch .. //depot/projects/emulab/current/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/emulab/current/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/emulab/current/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/emulab/current/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/emulab/current/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/emulab/current/contrib/amd/m4/mkconf#1 branch .. //depot/projects/emulab/current/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/emulab/current/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/emulab/current/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/emulab/current/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/emulab/current/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/emulab/current/contrib/amd/tasks#1 branch .. //depot/projects/emulab/current/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/emulab/current/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/emulab/current/contrib/bc/AUTHORS#1 branch .. //depot/projects/emulab/current/contrib/bc/ChangeLog#1 branch .. //depot/projects/emulab/current/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/emulab/current/contrib/bc/FAQ#1 branch .. //depot/projects/emulab/current/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/emulab/current/contrib/bc/INSTALL#1 branch .. //depot/projects/emulab/current/contrib/bc/Makefile.am#1 branch .. //depot/projects/emulab/current/contrib/bc/Makefile.in#1 branch .. //depot/projects/emulab/current/contrib/bc/NEWS#1 branch .. //depot/projects/emulab/current/contrib/bc/README#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/array.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/atan.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/div.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/exp.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/fact.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/jn.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/ln.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/mul.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/raise.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/signum#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/sine.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/emulab/current/contrib/bc/Test/timetest#1 branch .. //depot/projects/emulab/current/contrib/bc/acconfig.h#1 branch .. //depot/projects/emulab/current/contrib/bc/aclocal.m4#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/bc.y#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/const.h#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/execute.c#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/global.c#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/global.h#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/load.c#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/main.c#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/proto.h#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/scan.l#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/storage.c#1 branch .. //depot/projects/emulab/current/contrib/bc/bc/util.c#1 branch .. //depot/projects/emulab/current/contrib/bc/config.h.in#1 branch .. //depot/projects/emulab/current/contrib/bc/configure#1 branch .. //depot/projects/emulab/current/contrib/bc/configure.in#1 branch .. //depot/projects/emulab/current/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/emulab/current/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/emulab/current/contrib/bc/dc/array.c#1 branch .. //depot/projects/emulab/current/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/emulab/current/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/emulab/current/contrib/bc/dc/dc.c#1 branch .. //depot/projects/emulab/current/contrib/bc/dc/dc.h#1 branch .. //depot/projects/emulab/current/contrib/bc/dc/eval.c#1 branch .. //depot/projects/emulab/current/contrib/bc/dc/misc.c#1 branch .. //depot/projects/emulab/current/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/emulab/current/contrib/bc/dc/stack.c#1 branch .. //depot/projects/emulab/current/contrib/bc/dc/string.c#1 branch .. //depot/projects/emulab/current/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/emulab/current/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/emulab/current/contrib/bc/doc/bc.1#1 branch .. //depot/projects/emulab/current/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/emulab/current/contrib/bc/doc/dc.1#1 branch .. //depot/projects/emulab/current/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/emulab/current/contrib/bc/h/number.h#1 branch .. //depot/projects/emulab/current/contrib/bc/install-sh#1 branch .. //depot/projects/emulab/current/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/emulab/current/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/emulab/current/contrib/bc/lib/number.c#1 branch .. //depot/projects/emulab/current/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/emulab/current/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/emulab/current/contrib/bc/missing#1 branch .. //depot/projects/emulab/current/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/emulab/current/contrib/bc/stamp-h.in#1 branch .. //depot/projects/emulab/current/contrib/bind/CHANGES#1 branch .. //depot/projects/emulab/current/contrib/bind/DNSSEC#1 branch .. //depot/projects/emulab/current/contrib/bind/FREEBSD-Upgrade#1 branch .. //depot/projects/emulab/current/contrib/bind/FREEBSD-Xlist#1 branch .. //depot/projects/emulab/current/contrib/bind/INSTALL#1 branch .. //depot/projects/emulab/current/contrib/bind/LICENSE#1 branch .. //depot/projects/emulab/current/contrib/bind/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/README#1 branch .. //depot/projects/emulab/current/contrib/bind/SUPPORT#1 branch .. //depot/projects/emulab/current/contrib/bind/TODO#1 branch .. //depot/projects/emulab/current/contrib/bind/Version#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/addr/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/addr/addr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/dig/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/dig/dig.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/dnskeygen/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/dnskeygen/dnskeygen.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/dnsquery/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/dnsquery/dnsquery.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/host/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/host/host.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/irpd/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/irpd/irpd.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/irpd/irs-irpd.conf#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/irpd/version.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/mkservdb/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/mkservdb/mkservdb.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named-bootconf/Grot/named-bootconf.pl#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named-bootconf/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named-bootconf/named-bootconf.sh#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named-bootconf/test.boot#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named-xfer/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named-xfer/named-xfer.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/db_defs.h#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/db_dump.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/db_func.h#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/db_glob.h#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/db_glue.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/db_ixfr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/db_load.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/db_lookup.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/db_save.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/db_sec.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/db_tsig.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/db_update.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/named.conf#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/named.h#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_config.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_ctl.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_defs.h#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_forw.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_func.h#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_glob.h#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_glue.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_init.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_ixfr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_lexer.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_lexer.h#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_main.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_maint.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_ncache.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_notify.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_parser.y#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_parseutil.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_parseutil.h#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_req.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_resp.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_signal.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_sort.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_stats.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_udp.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_update.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/ns_xfr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/pathtemplate.h#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/test/127.0.0.zone#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/test/localhost.zone#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/test/named.conf#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/test/root.hint#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/named/version.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/ndc/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/ndc/ndc.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/nslookup/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/nslookup/commands.l#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/nslookup/debug.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/nslookup/getinfo.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/nslookup/list.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/nslookup/main.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/nslookup/nslookup.help#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/nslookup/pathnames.h#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/nslookup/res.h#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/nslookup/send.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/nslookup/skip.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/nslookup/subr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/nsupdate/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/html/acl.html#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/html/address_list.html#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/html/comments.html#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/html/config.html#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/html/controls.html#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/html/docdef.html#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/html/example.html#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/html/include.html#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/html/index.html#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/html/key.html#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/html/logging.html#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/html/master.html#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/html/options.html#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/html/server.html#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/html/trusted-keys.html#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/html/zone.html#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/dig.1#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/dnskeygen.1#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/dnsquery.1#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/getaddrinfo.3#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/gethostbyname.3#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/getipnodebyname.3#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/getnameinfo.3#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/getnetent.3#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/hesiod.3#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/host.1#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/hostname.7#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/inet_cidr.3#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/irs.conf.5#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/mailaddr.7#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/mkdep.1#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/named-bootconf.8#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/named-xfer.8#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/named.8#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/named.conf.5#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/ndc.8#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/nslookup.8#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/nsupdate.8#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/resolver.3#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/resolver.5#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/man/tsig.3#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/misc/DynamicUpdate#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/misc/FAQ.1of2#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/misc/FAQ.2of2#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/misc/rfc2317-notes.txt#1 branch .. //depot/projects/emulab/current/contrib/bind/doc/misc/style.txt#1 branch .. //depot/projects/emulab/current/contrib/bind/include/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/include/arpa/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/include/arpa/inet.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/arpa/nameser.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/arpa/nameser_compat.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/fd_setsize.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/hesiod.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/irp.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/irs.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/isc/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/include/isc/assertions.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/isc/ctl.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/isc/dst.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/isc/eventlib.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/isc/heap.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/isc/irpmarshall.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/isc/list.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/isc/logging.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/isc/memcluster.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/isc/misc.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/isc/tree.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/netdb.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/netgroup.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/res_update.h#1 branch .. //depot/projects/emulab/current/contrib/bind/include/resolv.h#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/dst/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/dst/README#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/dst/bsafe_link.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/dst/cylink_link.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/dst/dst_api.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/dst/dst_internal.h#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/dst/eay_dss_link.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/dst/hmac_link.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/dst/md5.h#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/dst/md5_dgst.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/dst/md5_locl.h#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/dst/prandom.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/dst/rsaref_link.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/dst/support.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/inet/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/inet/inet_addr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/inet/inet_cidr_ntop.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/inet/inet_cidr_pton.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/inet/inet_data.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/inet/inet_lnaof.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/inet/inet_makeaddr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/inet/inet_net_ntop.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/inet/inet_net_pton.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/inet/inet_neta.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/inet/inet_netof.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/inet/inet_network.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/inet/inet_ntoa.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/inet/inet_ntop.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/inet/inet_pton.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/inet/nsap_addr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/Makefile.BSD#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/README#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/dns.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/dns_gr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/dns_ho.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/dns_nw.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/dns_p.h#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/dns_pr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/dns_pw.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/dns_sv.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/gai_strerror.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/gen.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/gen_gr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/gen_ho.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/gen_ng.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/gen_nw.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/gen_p.h#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/gen_pr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/gen_pw.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/gen_sv.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/getaddrinfo.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/getgrent.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/getgrent_r.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/gethostent.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/gethostent_r.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/getnameinfo.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/getnetent.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/getnetent_r.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/getnetgrent.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/getnetgrent_r.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/getprotoent.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/getprotoent_r.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/getpwent.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/getpwent_r.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/getservent.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/getservent_r.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/hesiod.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/hesiod_p.h#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/irp.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/irp_gr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/irp_ho.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/irp_ng.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/irp_nw.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/irp_p.h#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/irp_pr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/irp_pw.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/irp_sv.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/irpmarshall.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/irs_data.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/irs_data.h#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/irs_p.h#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/lcl.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/lcl_gr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/lcl_ho.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/lcl_ng.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/lcl_nw.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/lcl_p.h#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/lcl_pr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/lcl_pw.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/lcl_sv.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/nis.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/nis_gr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/nis_ho.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/nis_ng.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/nis_nw.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/nis_p.h#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/nis_pr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/nis_pw.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/nis_sv.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/nul_ng.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/pathnames.h#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/irs/util.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/Makefile#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/assertions.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/assertions.mdoc#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/base64.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/bitncmp.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/bitncmp.mdoc#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/ctl_clnt.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/ctl_p.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/ctl_p.h#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/ctl_srvr.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/ev_connects.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/ev_files.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/ev_streams.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/ev_timers.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/ev_waits.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/eventlib.c#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/eventlib.mdoc#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/eventlib_p.h#1 branch .. //depot/projects/emulab/current/contrib/bind/lib/isc/heap.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 16 06:46:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A725616A4D0; Thu, 16 Sep 2004 06:46:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 81BFC16A4CE for ; Thu, 16 Sep 2004 06:46:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6643243D39 for ; Thu, 16 Sep 2004 06:46:32 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8G6kW10021585 for ; Thu, 16 Sep 2004 06:46:32 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8G6kVJI021582 for perforce@freebsd.org; Thu, 16 Sep 2004 06:46:31 GMT (envelope-from julian@freebsd.org) Date: Thu, 16 Sep 2004 06:46:31 GMT Message-Id: <200409160646.i8G6kVJI021582@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61597 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2004 06:46:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=61597 Change 61597 by julian@julian_ref on 2004/09/16 06:46:15 IFC@61596 Affected files ... .. //depot/projects/nsched/sys/dev/aac/aac.c#7 integrate .. //depot/projects/nsched/sys/dev/aac/aacreg.h#3 integrate .. //depot/projects/nsched/sys/dev/fdc/fdc.c#9 integrate .. //depot/projects/nsched/sys/dev/fdc/fdc_acpi.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_switch.c#33 integrate .. //depot/projects/nsched/sys/sys/ttydefaults.h#3 integrate Differences ... ==== //depot/projects/nsched/sys/dev/aac/aac.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.102 2004/09/12 03:19:32 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.103 2004/09/16 02:37:40 scottl Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -1992,11 +1992,13 @@ { struct aac_command *cm; time_t deadline; + int timedout, code; /* * Traverse the busy command list, bitch about late commands once * only. */ + timedout = 0; deadline = time_second - AAC_CMD_TIMEOUT; TAILQ_FOREACH(cm, &sc->aac_busy, cm_link) { if ((cm->cm_timestamp < deadline) @@ -2006,9 +2008,17 @@ "COMMAND %p TIMEOUT AFTER %d SECONDS\n", cm, (int)(time_second-cm->cm_timestamp)); AAC_PRINT_FIB(sc, cm->cm_fib); + timedout++; } } + if (timedout) { + code = AAC_GET_FWSTATUS(sc); + if (code != AAC_UP_AND_RUNNING) { + device_printf(sc->aac_dev, "WARNING! Controller is no " + "longer running! code= 0x%x\n", code); + } + } return; } ==== //depot/projects/nsched/sys/dev/aac/aacreg.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aacreg.h,v 1.18 2004/08/13 01:44:09 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aacreg.h,v 1.19 2004/09/16 02:37:40 scottl Exp $ */ /* @@ -551,6 +551,7 @@ * state of the adapter. */ #define AAC_SELF_TEST_FAILED 0x00000004 +#define AAC_MONITOR_PANIC 0x00000020 #define AAC_UP_AND_RUNNING 0x00000080 #define AAC_KERNEL_PANIC 0x00000100 ==== //depot/projects/nsched/sys/dev/fdc/fdc.c#9 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.288 2004/09/14 17:28:51 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.289 2004/09/16 06:34:00 imp Exp $"); #include "opt_fdc.h" @@ -1323,11 +1323,6 @@ if (ar == 0 && aw == 0 && ae == 0) { device_unbusy(fd->dev); - if (!(fdc->flags & FDC_NODMA) && --fdc->dmacnt == 0) { - mtx_lock(&Giant); - isa_dma_release(fdc->dmachan); - mtx_unlock(&Giant); - } return (0); } @@ -1341,12 +1336,6 @@ fd->flags &= ~FD_NEWDISK; } device_busy(fd->dev); - if (!(fdc->flags & FDC_NODMA) && fdc->dmacnt++ == 0) { - mtx_lock(&Giant); - isa_dma_acquire(fdc->dmachan); - isa_dmainit(fdc->dmachan, MAX_BYTES_PER_CYL); - mtx_unlock(&Giant); - } } #ifdef notyet @@ -1495,8 +1484,7 @@ dev = fdc->fdc_dev; if (fdc->fdc_intr) - BUS_TEARDOWN_INTR(device_get_parent(dev), dev, fdc->res_irq, - fdc->fdc_intr); + bus_teardown_intr(dev, fdc->res_irq, fdc->fdc_intr); fdc->fdc_intr = NULL; if (fdc->res_irq != NULL) bus_release_resource(dev, SYS_RES_IRQ, fdc->rid_irq, @@ -1640,6 +1628,8 @@ /* reset controller, turn motor off */ fdout_wr(fdc, 0); + if (!(fdc->flags & FDC_NODMA)) + isa_dma_release(fdc->dmachan); fdc_release_resources(fdc); mtx_destroy(&fdc->fdc_mtx); return (0); @@ -1687,12 +1677,19 @@ return (error); } error = bus_setup_intr(dev, fdc->res_irq, - INTR_TYPE_BIO | INTR_ENTROPY | INTR_FAST | INTR_MPSAFE, - fdc_intr, fdc, &fdc->fdc_intr); + INTR_TYPE_BIO | INTR_ENTROPY | INTR_FAST | INTR_MPSAFE, + fdc_intr, fdc, &fdc->fdc_intr); if (error) { device_printf(dev, "cannot setup interrupt\n"); return (error); } + if (!(fdc->flags & FDC_NODMA)) { + error = isa_dma_acquire(fdc->dmachan); + if (error) + return (error); + /* XXX no error return */ + isa_dmainit(fdc->dmachan, MAX_BYTES_PER_CYL); + } fdc->fdcu = device_get_unit(dev); fdc->flags |= FDC_NEEDS_RESET; ==== //depot/projects/nsched/sys/dev/fdc/fdc_acpi.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_acpi.c,v 1.5 2004/08/30 21:35:34 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_acpi.c,v 1.7 2004/09/16 06:37:05 imp Exp $"); #include #include @@ -137,7 +137,6 @@ fde = (uint32_t *)obj->Buffer.Pointer; if (obj->Buffer.Length < 20) { device_printf(dev, "_FDE too small\n"); - error = ENXIO; goto out; } break; @@ -150,7 +149,6 @@ fde = malloc(pkg->Package.Count * sizeof(uint32_t), M_TEMP, M_NOWAIT | M_ZERO); if (fde == NULL) { - error = ENOMEM; goto out; } for (i = 0; i < pkg->Package.Count; i++) { @@ -161,7 +159,6 @@ break; default: device_printf(dev, "invalid _FDE type %d\n", obj->Type); - error = ENXIO; goto out; } error = fdc_acpi_probe_children(bus, dev, fde); ==== //depot/projects/nsched/sys/kern/kern_switch.c#33 (text+ko) ==== @@ -86,7 +86,7 @@ ***/ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.92 2004/09/15 03:51:51 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.93 2004/09/16 05:37:40 julian Exp $"); #include "opt_sched.h" @@ -597,9 +597,9 @@ struct ksegrp *kg; kg = td->td_ksegrp; - if (kg->kg_last_assigned == td) + if (kg->kg_last_assigned == td) kg->kg_last_assigned = - TAILQ_PREV(td, threadqueue, td_runq); + TAILQ_PREV(td, threadqueue, td_runq); TAILQ_REMOVE(&kg->kg_runq, td, td_runq); } ==== //depot/projects/nsched/sys/sys/ttydefaults.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)ttydefaults.h 8.4 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/sys/ttydefaults.h,v 1.15 2004/04/07 04:19:50 imp Exp $ + * $FreeBSD: src/sys/sys/ttydefaults.h,v 1.16 2004/09/16 06:00:52 phk Exp $ */ /* @@ -45,15 +45,15 @@ * Defaults on "first" open. */ #define TTYDEF_IFLAG (BRKINT | ICRNL | IMAXBEL | IXON | IXANY) -#define TTYDEF_OFLAG (OPOST | ONLCR) -#define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL) +#define TTYDEF_OFLAG (OPOST | ONLCR) +#define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL) #define TTYDEF_CFLAG (CREAD | CS8 | HUPCL) -#define TTYDEF_SPEED (B9600) +#define TTYDEF_SPEED (B9600) /* * Control Character Defaults */ -#define CTRL(x) (x&037) +#define CTRL(x) (x&037) #define CEOF CTRL('d') #define CEOL 0xff /* XXX avoid _POSIX_VDISABLE */ #define CERASE 0177 @@ -75,7 +75,7 @@ #define CEOT CEOF /* compat */ #define CBRK CEOL -#define CRPRNT CREPRINT +#define CRPRNT CREPRINT #define CFLUSH CDISCARD /* PROTECTED INCLUSION ENDS HERE */ From owner-p4-projects@FreeBSD.ORG Thu Sep 16 07:19:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DECB916A4D0; Thu, 16 Sep 2004 07:19:12 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B9DCC16A4CE for ; Thu, 16 Sep 2004 07:19:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABCD843D5E for ; Thu, 16 Sep 2004 07:19:12 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8G7JCvG022538 for ; Thu, 16 Sep 2004 07:19:12 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8G7JCVb022535 for perforce@freebsd.org; Thu, 16 Sep 2004 07:19:12 GMT (envelope-from julian@freebsd.org) Date: Thu, 16 Sep 2004 07:19:12 GMT Message-Id: <200409160719.i8G7JCVb022535@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61599 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2004 07:19:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=61599 Change 61599 by julian@julian_ref on 2004/09/16 07:18:28 IFC@61598... loop back changes. Affected files ... .. //depot/projects/nsched/sys/kern/kern_switch.c#34 integrate .. //depot/projects/nsched/sys/kern/kern_synch.c#15 integrate .. //depot/projects/nsched/sys/kern/sched_4bsd.c#56 integrate .. //depot/projects/nsched/sys/kern/sched_ule.c#35 integrate Differences ... ==== //depot/projects/nsched/sys/kern/kern_switch.c#34 (text+ko) ==== @@ -86,7 +86,7 @@ ***/ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.93 2004/09/16 05:37:40 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.94 2004/09/16 07:12:59 julian Exp $"); #include "opt_sched.h" @@ -599,7 +599,7 @@ kg = td->td_ksegrp; if (kg->kg_last_assigned == td) kg->kg_last_assigned = - TAILQ_PREV(td, threadqueue, td_runq); + TAILQ_PREV(td, threadqueue, td_runq); TAILQ_REMOVE(&kg->kg_runq, td, td_runq); } ==== //depot/projects/nsched/sys/kern/kern_synch.c#15 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.260 2004/09/10 21:04:38 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.261 2004/09/16 07:12:59 julian Exp $"); #include "opt_ktrace.h" ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#56 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.64 2004/09/13 23:02:52 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.65 2004/09/16 07:12:59 julian Exp $"); #define kse td_sched ==== //depot/projects/nsched/sys/kern/sched_ule.c#35 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.129 2004/09/11 10:07:22 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.130 2004/09/16 07:12:59 julian Exp $"); #include From owner-p4-projects@FreeBSD.ORG Thu Sep 16 07:52:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D979A16A4D1; Thu, 16 Sep 2004 07:52:58 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD13A16A4CE for ; Thu, 16 Sep 2004 07:52:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B61A43D4C for ; Thu, 16 Sep 2004 07:52:58 +0000 (GMT) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8G7qwnx023486 for ; Thu, 16 Sep 2004 07:52:58 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8G7qwOS023483 for perforce@freebsd.org; Thu, 16 Sep 2004 07:52:58 GMT (envelope-from brooks@freebsd.org) Date: Thu, 16 Sep 2004 07:52:58 GMT Message-Id: <200409160752.i8G7qwOS023483@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Subject: PERFORCE change 61600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2004 07:52:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=61600 Change 61600 by brooks@brooks_minya on 2004/09/16 07:52:22 Add the kernel part of Emulab ICMP Ping of Death support. Affected files ... .. //depot/projects/emulab/current/sys/conf/NOTES#2 edit .. //depot/projects/emulab/current/sys/conf/options#2 edit .. //depot/projects/emulab/current/sys/i386/conf/GENERIC#2 edit .. //depot/projects/emulab/current/sys/netinet/ip_icmp.c#2 edit Differences ... ==== //depot/projects/emulab/current/sys/conf/NOTES#2 (text+ko) ==== @@ -504,6 +504,11 @@ options NGATM_UNI options NGATM_CCATM +# +# The Emulab system uses special ICMP packets to allow remote reboots +# of machines without power cycles in many situations. +options ICMP_PINGOFDEATH=6 + device mn # Munich32x/Falc54 Nx64kbit/sec cards. device musycc # LMC/SBE LMC1504 quad T1/E1 ==== //depot/projects/emulab/current/sys/conf/options#2 (text+ko) ==== @@ -682,6 +682,9 @@ DCONS_FORCE_CONSOLE opt_dcons.h DCONS_FORCE_GDB opt_dcons.h +# Emulab Ping of Death +ICMP_PINGOFDEATH opt_icmp_pingofdeath.h + # Static unit counts NI4BTRC opt_i4b.h NI4BRBCH opt_i4b.h ==== //depot/projects/emulab/current/sys/i386/conf/GENERIC#2 (text+ko) ==== @@ -61,6 +61,7 @@ options AHD_REG_PRETTY_PRINT # Print register bitfields in debug # output. Adds ~215k to driver. options ADAPTIVE_GIANT # Giant mutex is adaptive. +options ICMP_PINGOFDEATH=6 # Enable ICMP Ping Of Death # Debugging for use in -current options KDB # Enable kernel debugger support. ==== //depot/projects/emulab/current/sys/netinet/ip_icmp.c#2 (text+ko) ==== @@ -127,6 +127,11 @@ static void icmp_send(struct mbuf *, struct mbuf *); static int ip_next_mtu(int, int); +#include "opt_icmp_pingofdeath.h" +#ifdef ICMP_PINGOFDEATH +static void icmp_pingofdeath(struct icmp *, struct ip *, int); +#endif + extern struct protosw inetsw[]; /* @@ -595,6 +600,12 @@ #endif break; +#ifdef ICMP_PINGOFDEATH + case ICMP_PINGOFDEATH: + icmp_pingofdeath(icp, ip, hlen); + break; +#endif + /* * No kernel processing for the following; * just fall through to send to raw listener. @@ -921,3 +932,100 @@ return 0; /* okay to send packet */ #undef N } + +#ifdef ICMP_PINGOFDEATH +#include +#include + +SYSCTL_NODE(_net_inet_icmp, OID_AUTO, ipod, CTLFLAG_RW, 0, + "ICMP Ping of Death"); + +static int ipod_version = 2; +SYSCTL_INT(_net_inet_icmp_ipod, OID_AUTO, version, CTLFLAG_RD, + &ipod_version, 0, ""); + +static int ipod_enabled = 0; +SYSCTL_INT(_net_inet_icmp_ipod, OID_AUTO, enabled, CTLFLAG_RW, + &ipod_enabled, 0, ""); + +static unsigned long ipod_host = 0xffffffff; +SYSCTL_ULONG(_net_inet_icmp_ipod, OID_AUTO, host, CTLFLAG_RW, + &ipod_host, 0, ""); +static unsigned long ipod_mask = 0xffffffff; +SYSCTL_ULONG(_net_inet_icmp_ipod, OID_AUTO, mask, CTLFLAG_RW, + &ipod_mask, 0, ""); + +static char ipod_key[32+1] = { "SETMETOSOMETHINGTHIRTYTWOBYTES!!" }; +#define IPOD_CHECK_KEY \ + (ipod_key[0] != 0) +#define IPOD_VALID_KEY(d) \ + (strncmp(ipod_key, (char *)(d), strlen(ipod_key)) == 0) + +static int +ipod_getkey(SYSCTL_HANDLER_ARGS) +{ + int error; + + /* XXX fake up a result */ + error = SYSCTL_OUT(req, "XXXX", 4+1); + if (error || !req->newptr) + return (error); + + if ((req->newlen - req->newidx) >= sizeof(ipod_key)) + return (EINVAL); + + arg2 = (req->newlen - req->newidx); + error = SYSCTL_IN(req, ipod_key, arg2); + memset(&ipod_key[arg2], 0, sizeof(ipod_key) - arg2); + + return (error); +} + +SYSCTL_PROC(_net_inet_icmp_ipod, OID_AUTO, key, CTLTYPE_STRING | CTLFLAG_RW, + NULL, 0, ipod_getkey, "A", ""); + +static void +icmp_pingofdeath(icp, ip, hlen) + struct icmp *icp; + struct ip *ip; + int hlen; +{ + int doit = 0; + + /* + * If IPOD not enabled or wrong ICMP code, ignore. + */ + if (!ipod_enabled || icp->icmp_code != ICMP_PINGOFDEATH) + return; + + /* + * First check the source address info. + * If host not set, ignore. + */ + if (ipod_host != 0xffffffff && + (ntohl(ip->ip_src.s_addr) & ipod_mask) == ipod_host) { + /* + * Now check the key if enabled. + * If packet doesn't contain enough data or key + * is otherwise invalid, ignore. + */ + if (IPOD_CHECK_KEY) { + if (ip->ip_len >= strlen(ipod_key) && + IPOD_VALID_KEY(icp->icmp_data)) + doit = 1; + } else { + doit = 1; + } + } + + if (doit) { + ipod_enabled = 0; + printf("IPOD: reboot forced by %x...\n", + ntohl(ip->ip_src.s_addr)); + cpu_reset(); + } else { + log(LOG_ERR, "IPOD: from %x rejected\n", + ntohl(ip->ip_src.s_addr)); + } +} +#endif From owner-p4-projects@FreeBSD.ORG Thu Sep 16 15:13:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BFCD16A4D0; Thu, 16 Sep 2004 15:13:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 258E116A4CE for ; Thu, 16 Sep 2004 15:13:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AE4743D2D for ; Thu, 16 Sep 2004 15:13:57 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8GFDuLg037788 for ; Thu, 16 Sep 2004 15:13:56 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8GFDueq037785 for perforce@freebsd.org; Thu, 16 Sep 2004 15:13:56 GMT (envelope-from jhb@freebsd.org) Date: Thu, 16 Sep 2004 15:13:56 GMT Message-Id: <200409161513.i8GFDueq037785@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 61618 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2004 15:13:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=61618 Change 61618 by jhb@jhb_slimer on 2004/09/16 15:13:54 Revert change on amd64 as well and fix a compile tweak on i386. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#8 edit .. //depot/projects/smpng/sys/i386/i386/local_apic.c#13 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#8 (text+ko) ==== @@ -725,15 +725,9 @@ destfield = dest; } -#ifdef DETECT_DEADLOCK /* Check for an earlier stuck IPI. */ if (!lapic_ipi_wait(BEFORE_SPIN)) panic("APIC: Previous IPI is stuck"); -#else - /* Wait for an earlier IPI to finish. */ - if (!lapic_ipi_wait(-1)) - panic("APIC: Previous IPI is stuck"); -#endif lapic_ipi_raw(icrlo, destfield); ==== //depot/projects/smpng/sys/i386/i386/local_apic.c#13 (text+ko) ==== @@ -693,8 +693,8 @@ intr_restore(eflags); } +#define BEFORE_SPIN 1000000 #ifdef DETECT_DEADLOCK -#define BEFORE_SPIN 1000000 #define AFTER_SPIN 1000 #endif From owner-p4-projects@FreeBSD.ORG Thu Sep 16 16:58:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BBB116A4D4; Thu, 16 Sep 2004 16:58:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 18FFD16A4EF for ; Thu, 16 Sep 2004 16:58:38 +0000 (GMT) Received: from mail5.speakeasy.net (mail5.speakeasy.net [216.254.0.205]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC16B43D54 for ; Thu, 16 Sep 2004 16:58:37 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 8547 invoked from network); 16 Sep 2004 16:58:37 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 16 Sep 2004 16:58:37 -0000 Received: from [10.50.40.210] (gw1.twc.weather.com [216.133.140.1]) (authenticated bits=0) by server.baldwin.cx (8.12.11/8.12.11) with ESMTP id i8GGwOuc066233; Thu, 16 Sep 2004 12:58:32 -0400 (EDT) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: Brooks Davis Date: Thu, 16 Sep 2004 12:48:13 -0400 User-Agent: KMail/1.6.2 References: <200409160752.i8G7qwOS023483@repoman.freebsd.org> In-Reply-To: <200409160752.i8G7qwOS023483@repoman.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200409161248.13144.jhb@FreeBSD.org> X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 61600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2004 16:58:38 -0000 On Thursday 16 September 2004 03:52 am, Brooks Davis wrote: > http://perforce.freebsd.org/chv.cgi?CH=61600 > > Change 61600 by brooks@brooks_minya on 2004/09/16 07:52:22 > > Add the kernel part of Emulab ICMP Ping of Death support. Does "Mr. IP" know about this? According to him all firewalls on the internet squash "Ping of Death" packets with giant hammers into tiny little bits. (If you didn't go to the Boston Science Museum at Usenix then this probably makes no sense.) -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Thu Sep 16 17:35:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 469C416A4D0; Thu, 16 Sep 2004 17:35:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0842C16A4CE; Thu, 16 Sep 2004 17:35:26 +0000 (GMT) Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2C0843D5D; Thu, 16 Sep 2004 17:35:25 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (localhost.localdomain [127.0.0.1]) by odin.ac.hmc.edu (8.13.0/8.13.0) with ESMTP id i8GHagOn027157; Thu, 16 Sep 2004 10:36:42 -0700 Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.13.0/8.13.0/Submit) id i8GHagUr027156; Thu, 16 Sep 2004 10:36:42 -0700 Date: Thu, 16 Sep 2004 10:36:42 -0700 From: Brooks Davis To: John Baldwin Message-ID: <20040916173642.GA26970@odin.ac.hmc.edu> References: <200409160752.i8G7qwOS023483@repoman.freebsd.org> <200409161248.13144.jhb@FreeBSD.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Qxx1br4bt0+wmkIi" Content-Disposition: inline In-Reply-To: <200409161248.13144.jhb@FreeBSD.org> User-Agent: Mutt/1.4.1i X-Virus-Scanned: by amavisd-new X-Spam-Status: No, hits=0.0 required=8.0 tests=none autolearn=no version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on odin.ac.hmc.edu cc: Perforce Change Reviews cc: Brooks Davis Subject: Re: PERFORCE change 61600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2004 17:35:26 -0000 --Qxx1br4bt0+wmkIi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Sep 16, 2004 at 12:48:13PM -0400, John Baldwin wrote: > On Thursday 16 September 2004 03:52 am, Brooks Davis wrote: > > http://perforce.freebsd.org/chv.cgi?CH=3D61600 > > > > Change 61600 by brooks@brooks_minya on 2004/09/16 07:52:22 > > > > Add the kernel part of Emulab ICMP Ping of Death support. >=20 > Does "Mr. IP" know about this? According to him all firewalls on the > internet squash "Ping of Death" packets with giant hammers into tiny > little bits. (If you didn't go to the Boston Science Museum at Usenix > then this probably makes no sense.) This is a special ping of death that should bypass firewalls. :-) -- Brooks -- Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --Qxx1br4bt0+wmkIi Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFBSc8pXY6L6fI4GtQRAgOMAJ42LY9gKabcehz+1cVp/ffktigKjQCdGGl6 zreUOmOZk4Axijs9JrOxB3k= =aW7I -----END PGP SIGNATURE----- --Qxx1br4bt0+wmkIi-- From owner-p4-projects@FreeBSD.ORG Fri Sep 17 05:41:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3271816A4D0; Fri, 17 Sep 2004 05:41:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB5D316A4CF for ; Fri, 17 Sep 2004 05:41:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C2A0543D41 for ; Fri, 17 Sep 2004 05:41:55 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8H5ftYa065807 for ; Fri, 17 Sep 2004 05:41:55 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8H5ft84065804 for perforce@freebsd.org; Fri, 17 Sep 2004 05:41:55 GMT (envelope-from julian@freebsd.org) Date: Fri, 17 Sep 2004 05:41:55 GMT Message-Id: <200409170541.i8H5ft84065804@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61663 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Sep 2004 05:41:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=61663 Change 61663 by julian@julian_ref on 2004/09/17 05:41:18 create a separate thread_unthread() that we can call from places where we are turning off threading so that we canbe sure we are doing it properly. Affected files ... .. //depot/projects/nsched/sys/kern/kern_kse.c#28 edit .. //depot/projects/nsched/sys/kern/kern_thr.c#18 edit .. //depot/projects/nsched/sys/kern/kern_thread.c#37 edit .. //depot/projects/nsched/sys/sys/proc.h#33 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_kse.c#28 (text+ko) ==== @@ -346,8 +346,7 @@ * One possibility is to return to the user. It may not cope well. * The other possibility would be to let the process exit. */ - p->p_flag &= ~(P_SA|P_HADTHREADS); - sched_set_concurrency(td->td_ksegrp, 1); + thread_unthread(td); mtx_unlock_spin(&sched_lock); PROC_UNLOCK(p); #if 1 ==== //depot/projects/nsched/sys/kern/kern_thr.c#18 (text+ko) ==== ==== //depot/projects/nsched/sys/kern/kern_thread.c#37 (text+ko) ==== @@ -709,6 +709,31 @@ } /* + * Convert a process with one thread to an unthreaded process. + * Called from: + * thread_single(exit) (called from execve and exit) + * kse_exit() XXX may need cleaning up wrt KSE stuff + */ +void +thread_unthread(struct thread *td) +{ + struct proc *p = td->td_proc; + + KASSERT((p->p_numthreads == 1), ("Unthreading with >1 threads")); + upcall_remove(td); + p->p_flag &= ~(P_SA|P_HADTHREADS); + td->td_mailbox = NULL; + td->td_pflags &= ~(TDP_SA | TDP_CAN_UNBIND); + p->p_flag &= ~(P_STOPPED_SINGLE | P_SINGLE_EXIT); /* maybe not */ + p->p_singlethread = NULL; + if (td->td_standin != NULL) { + thread_stash(td->td_standin); + td->td_standin = NULL; + } + sched_set_concurrency(td->td_ksegrp, 1); +} + +/* * Called from: * thread_exit() */ @@ -835,21 +860,10 @@ * we try our utmost to revert to being a non-threaded * process. */ - upcall_remove(td); - p->p_flag &= ~(P_SA|P_HADTHREADS); - td->td_mailbox = NULL; - td->td_pflags &= ~(TDP_SA | TDP_CAN_UNBIND); + thread_unthread(td); p->p_flag &= ~(P_STOPPED_SINGLE | P_SINGLE_EXIT); - p->p_singlethread = NULL; - if (td->td_standin != NULL) { - thread_stash(td->td_standin); - td->td_standin = NULL; - } - sched_set_concurrency(td->td_ksegrp, 1); - mtx_unlock_spin(&sched_lock); - } else { - mtx_unlock_spin(&sched_lock); } + mtx_unlock_spin(&sched_lock); return (0); } ==== //depot/projects/nsched/sys/sys/proc.h#33 (text+ko) ==== @@ -892,6 +892,7 @@ void thread_unlink(struct thread *td); void thread_unsuspend(struct proc *p); void thread_unsuspend_one(struct thread *td); +void thread_unthread(struct thread *td); int thread_userret(struct thread *td, struct trapframe *frame); int thread_upcall_check(struct thread *td); void thread_user_enter(struct thread *td); From owner-p4-projects@FreeBSD.ORG Fri Sep 17 05:48:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9622316A4D0; Fri, 17 Sep 2004 05:48:04 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 71F6A16A4CE for ; Fri, 17 Sep 2004 05:48:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 524BA43D1D for ; Fri, 17 Sep 2004 05:48:04 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8H5m4HH066050 for ; Fri, 17 Sep 2004 05:48:04 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8H5m45m066047 for perforce@freebsd.org; Fri, 17 Sep 2004 05:48:04 GMT (envelope-from julian@freebsd.org) Date: Fri, 17 Sep 2004 05:48:04 GMT Message-Id: <200409170548.i8H5m45m066047@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61665 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Sep 2004 05:48:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=61665 Change 61665 by julian@julian_ref on 2004/09/17 05:47:04 Catch an instance of using numthreads for libthr instead of the flag. Affected files ... .. //depot/projects/nsched/sys/kern/kern_thread.c#38 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_thread.c#38 (text+ko) ==== @@ -1057,7 +1057,7 @@ p = td->td_proc; mtx_assert(&sched_lock, MA_OWNED); - if (p->p_flag & P_SA || p->p_numthreads > 1) { + if (p->p_flag & P_HADTHREADS) { if ((p->p_flag & P_SINGLE_EXIT) && p->p_singlethread != td) return (EINTR); if (td->td_flags & TDF_INTERRUPT) From owner-p4-projects@FreeBSD.ORG Fri Sep 17 14:53:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2C9C16A4D3; Fri, 17 Sep 2004 14:53:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7131B16A4CE for ; Fri, 17 Sep 2004 14:53:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 664C143D31 for ; Fri, 17 Sep 2004 14:53:09 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8HEr9Q3084147 for ; Fri, 17 Sep 2004 14:53:09 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8HEr9B1084144 for perforce@freebsd.org; Fri, 17 Sep 2004 14:53:09 GMT (envelope-from jhb@freebsd.org) Date: Fri, 17 Sep 2004 14:53:09 GMT Message-Id: <200409171453.i8HEr9B1084144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 61697 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Sep 2004 14:53:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=61697 Change 61697 by jhb@jhb_slimer on 2004/09/17 14:52:30 Try to fix traces from kdb_backtrace() (i.e. nto in ddb) so that they won't try to pause. Affected files ... .. //depot/projects/smpng/sys/i386/i386/db_trace.c#18 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/db_trace.c#18 (text+ko) ==== @@ -387,7 +387,8 @@ first = TRUE; quit = 0; - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + if (kdb_active) + db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); while (count-- && !quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &offset); db_symbol_values(sym, &name, NULL); From owner-p4-projects@FreeBSD.ORG Fri Sep 17 15:00:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A09B916A4D0; Fri, 17 Sep 2004 15:00:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D26516A4CE for ; Fri, 17 Sep 2004 15:00:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7240143D46 for ; Fri, 17 Sep 2004 15:00:18 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8HF0IFC084344 for ; Fri, 17 Sep 2004 15:00:18 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8HF0ISs084341 for perforce@freebsd.org; Fri, 17 Sep 2004 15:00:18 GMT (envelope-from jhb@freebsd.org) Date: Fri, 17 Sep 2004 15:00:18 GMT Message-Id: <200409171500.i8HF0ISs084341@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 61698 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Sep 2004 15:00:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=61698 Change 61698 by jhb@jhb_slimer on 2004/09/17 15:00:11 Add a stracktrace test. Affected files ... .. //depot/projects/smpng/sys/modules/crash/crash.c#14 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash/crash.c#14 (text+ko) ==== @@ -54,7 +54,7 @@ #include #include -#define MAX_EVENT 20 +#define MAX_EVENT 21 static struct sx foo, bar, bar2; static struct cv event_cv; @@ -83,6 +83,7 @@ "try lock tests including recursion test", "test witness_defineorder and witness_checkorder", "blow the kernel stack on purpose", + "test deep stack backtraces", }; static int mod_event(struct module *module, int cmd, void *arg); @@ -124,6 +125,17 @@ } static void +recurse_deep(int depth) +{ + + if (depth == 20) { + kdb_backtrace(); + kdb_enter(__func__); + } else + recurse_deep(depth + 1); +} + +static void crash_thread(void *arg) { int ev, status; @@ -306,6 +318,9 @@ case 20: (void)blow_stack(); break; + case 21: + recurse_deep(0); + break; default: panic("event %d is bogus\n", event); } From owner-p4-projects@FreeBSD.ORG Fri Sep 17 15:54:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89A8516A585; Fri, 17 Sep 2004 15:54:25 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 63E4D16A56F for ; Fri, 17 Sep 2004 15:54:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42CD843D45 for ; Fri, 17 Sep 2004 15:54:25 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8HFsPiW085821 for ; Fri, 17 Sep 2004 15:54:25 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8HFsONr085818 for perforce@freebsd.org; Fri, 17 Sep 2004 15:54:24 GMT (envelope-from jhb@freebsd.org) Date: Fri, 17 Sep 2004 15:54:24 GMT Message-Id: <200409171554.i8HFsONr085818@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 61702 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Sep 2004 15:54:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=61702 Change 61702 by jhb@jhb_twclab on 2004/09/17 15:54:06 This is actually not needed as DDB already has enough intelligence for this. Affected files ... .. //depot/projects/smpng/sys/i386/i386/db_trace.c#19 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/db_trace.c#19 (text+ko) ==== @@ -387,8 +387,7 @@ first = TRUE; quit = 0; - if (kdb_active) - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); while (count-- && !quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &offset); db_symbol_values(sym, &name, NULL); From owner-p4-projects@FreeBSD.ORG Fri Sep 17 21:49:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA4CD16A4D0; Fri, 17 Sep 2004 21:49:10 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 69A8716A4CE for ; Fri, 17 Sep 2004 21:49:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 428C543D41 for ; Fri, 17 Sep 2004 21:49:10 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8HLleHZ000174 for ; Fri, 17 Sep 2004 21:47:40 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8HLldO6000171 for perforce@freebsd.org; Fri, 17 Sep 2004 21:47:39 GMT (envelope-from peter@freebsd.org) Date: Fri, 17 Sep 2004 21:47:39 GMT Message-Id: <200409172147.i8HLldO6000171@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 61725 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Sep 2004 21:49:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=61725 Change 61725 by peter@peter_melody on 2004/09/17 21:47:33 IFC @61724 Affected files ... .. //depot/projects/hammer/etc/mtree/BSD.include.dist#25 integrate .. //depot/projects/hammer/etc/rc.d/ike#3 integrate .. //depot/projects/hammer/etc/rc.d/nsswitch#3 integrate .. //depot/projects/hammer/etc/rc.d/pf#4 integrate .. //depot/projects/hammer/etc/rc.d/pflog#3 integrate .. //depot/projects/hammer/etc/rc.d/swap1#5 integrate .. //depot/projects/hammer/gnu/lib/libregex/Makefile#6 integrate .. //depot/projects/hammer/include/Makefile#30 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#12 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#20 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#7 integrate .. //depot/projects/hammer/lib/libutil/humanize_number.3#3 integrate .. //depot/projects/hammer/lib/msun/src/math.h#22 integrate .. //depot/projects/hammer/release/Makefile#60 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/Makefile#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#61 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/readme/article.sgml#13 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#78 integrate .. //depot/projects/hammer/release/doc/share/examples/Makefile.relnotesng#6 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#11 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/geom_mirror.c#3 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#6 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#4 integrate .. //depot/projects/hammer/sbin/mdconfig/Makefile#2 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#15 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#12 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.c#14 integrate .. //depot/projects/hammer/share/man/man4/Makefile#49 integrate .. //depot/projects/hammer/share/man/man4/de.4#5 integrate .. //depot/projects/hammer/share/man/man4/ed.4#4 integrate .. //depot/projects/hammer/share/man/man4/fwohci.4#6 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ndis.4#6 integrate .. //depot/projects/hammer/share/man/man4/ng_netflow.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_ubt.4#9 integrate .. //depot/projects/hammer/share/man/man9/Makefile#38 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#15 integrate .. //depot/projects/hammer/share/man/man9/microtime.9#2 integrate .. //depot/projects/hammer/share/man/man9/microuptime.9#2 integrate .. //depot/projects/hammer/share/man/man9/time.9#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/promcons.c#11 integrate .. //depot/projects/hammer/sys/alpha/tlsb/zs_tlsb.c#12 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#19 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#19 integrate .. //depot/projects/hammer/sys/conf/NOTES#67 integrate .. //depot/projects/hammer/sys/conf/files#83 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#24 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#13 integrate .. //depot/projects/hammer/sys/conf/options#59 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#13 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#26 integrate .. //depot/projects/hammer/sys/dev/aac/aacreg.h#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#20 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#36 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#34 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#16 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_acpi.c#5 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#9 integrate .. //depot/projects/hammer/sys/dev/fdc/fdcvar.h#6 integrate .. //depot/projects/hammer/sys/dev/md/md.c#39 integrate .. //depot/projects/hammer/sys/dev/rp/rp.c#15 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#20 integrate .. //depot/projects/hammer/sys/dev/si/si.c#15 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#41 integrate .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/ubser.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/ucom.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/ucomvar.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/umodem.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/uplcom.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/uvscom.c#11 integrate .. //depot/projects/hammer/sys/dev/zs/zs.c#14 integrate .. //depot/projects/hammer/sys/geom/nop/g_nop.c#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/locore.S#5 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#41 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#30 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#49 integrate .. //depot/projects/hammer/sys/kern/tty.c#24 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#20 integrate .. //depot/projects/hammer/sys/modules/netgraph/Makefile#11 integrate .. //depot/projects/hammer/sys/modules/netgraph/netflow/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_tap.c#17 integrate .. //depot/projects/hammer/sys/netgraph/netflow/netflow.c#1 branch .. //depot/projects/hammer/sys/netgraph/netflow/netflow.h#1 branch .. //depot/projects/hammer/sys/netgraph/netflow/ng_netflow.c#1 branch .. //depot/projects/hammer/sys/netgraph/netflow/ng_netflow.h#1 branch .. //depot/projects/hammer/sys/netinet/ip_input.c#41 integrate .. //depot/projects/hammer/sys/pc98/pc98/ppc.c#7 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#30 integrate .. //depot/projects/hammer/sys/sys/conf.h#17 integrate .. //depot/projects/hammer/sys/sys/mdioctl.h#7 integrate .. //depot/projects/hammer/sys/sys/tty.h#15 integrate .. //depot/projects/hammer/sys/sys/ttydefaults.h#4 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#25 integrate .. //depot/projects/hammer/tools/lib32/build32.sh#5 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#26 integrate .. //depot/projects/hammer/usr.sbin/Makefile#53 integrate .. //depot/projects/hammer/usr.sbin/flowctl/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/flowctl/flowctl.c#1 branch Differences ... ==== //depot/projects/hammer/etc/mtree/BSD.include.dist#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.89 2004/09/02 20:44:55 alfred Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.91 2004/09/16 21:33:56 glebius Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -140,6 +140,8 @@ include .. .. + netflow + .. .. netinet .. ==== //depot/projects/hammer/etc/rc.d/ike#3 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ike,v 1.2 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/ike,v 1.3 2004/09/16 17:04:20 keramida Exp $ # # PROVIDE: ike -# REQUIRE: root beforenetlkm mountcritlocal +# REQUIRE: root mountcritlocal # BEFORE: DAEMON # KEYWORD: FreeBSD nojail ==== //depot/projects/hammer/etc/rc.d/nsswitch#3 (text+ko) ==== @@ -23,12 +23,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/nsswitch,v 1.3 2004/06/21 19:38:58 des Exp $ +# $FreeBSD: src/etc/rc.d/nsswitch,v 1.4 2004/09/16 17:03:12 keramida Exp $ # # PROVIDE: nsswitch # REQUIRE: root -# BEFORE: network +# BEFORE: NETWORK # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/pf#4 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pf,v 1.3 2004/06/23 01:42:06 mlaier Exp $ +# $FreeBSD: src/etc/rc.d/pf,v 1.4 2004/09/16 17:04:20 keramida Exp $ # # PROVIDE: pf -# REQUIRE: root beforenetlkm mountcritlocal netif pflog +# REQUIRE: root mountcritlocal netif pflog # BEFORE: DAEMON LOGIN # KEYWORD: FreeBSD nojail ==== //depot/projects/hammer/etc/rc.d/pflog#3 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pflog,v 1.2 2004/08/31 14:23:51 mlaier Exp $ +# $FreeBSD: src/etc/rc.d/pflog,v 1.3 2004/09/16 17:04:20 keramida Exp $ # # PROVIDE: pflog -# REQUIRE: root beforenetlkm mountcritlocal netif +# REQUIRE: root mountcritlocal netif # BEFORE: DAEMON LOGIN # KEYWORD: FreeBSD nojail ==== //depot/projects/hammer/etc/rc.d/swap1#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: swap1,v 1.8 2002/03/24 15:52:41 lukem Exp $ -# $FreeBSD: src/etc/rc.d/swap1,v 1.6 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/swap1,v 1.7 2004/09/17 17:58:19 pjd Exp $ # # PROVIDE: localswap @@ -12,27 +12,7 @@ name="swap1" start_cmd='swapon -a' -stop_cmd=':' - -# Add all block-type swap devices; these might be necessary -# during disk checks. -# -swap1_start() -{ - if ! checkyesno no_swap; then - swapctl -A -t blk - fi -} - -# Remove all block-type swap devices -# -swap1_stop() -{ - if checkyesno swapoff || [ -n "$rc_force" ]; then - echo "Removing block-type swap devices" - swapctl -U -t blk - fi -} +stop_cmd='swapoff -a' load_rc_config swap run_rc_command "$1" ==== //depot/projects/hammer/gnu/lib/libregex/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.28 2004/03/22 14:44:00 ache Exp $ +# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.29 2004/09/16 01:39:13 peter Exp $ SUBDIR+= doc @@ -16,7 +16,7 @@ PXINCSDIR= ${INCLUDEDIR}/gnu/posix NOMAN= noman -CFLAGS+=-D_REGEX_RE_COMP -DSTDC_HEADERS -I${DESTDIR}/usr/include/gnu +CFLAGS+=-D_REGEX_RE_COMP -DSTDC_HEADERS regex.h.patched: regex.h sed 's===g' \ ==== //depot/projects/hammer/include/Makefile#30 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.223 2004/09/02 20:44:55 alfred Exp $ +# $FreeBSD: src/include/Makefile,v 1.225 2004/09/17 09:17:33 ru Exp $ # # Doing a "make install" builds /usr/include. @@ -41,8 +41,9 @@ geom/concat geom/gate geom/label geom/mirror geom/nop geom/raid3 \ geom/stripe \ isofs/cd9660 netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ - netgraph/atm security/mac_biba security/mac_bsdextended \ - security/mac_lomac security/mac_mls security/mac_partition \ + netgraph/atm netgraph/netflow \ + security/mac_biba security/mac_bsdextended security/mac_lomac \ + security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs fs/autofs .if !defined(NO_BLUETOOTH) @@ -63,7 +64,7 @@ ${.CURDIR}/Makefile @${ECHO} creating osreldate.h from newvers.sh @setvar PARAMFILE ${.CURDIR}/../sys/sys/param.h; \ - . ${.CURDIR}/../sys/conf/newvers.sh; \ + MAKE=${MAKE} . ${.CURDIR}/../sys/conf/newvers.sh; \ echo "$$COPYRIGHT" > osreldate.h; \ echo "#ifdef _KERNEL" >> osreldate.h; \ echo '#error " cannot be used in the kernel, use "' >> osreldate.h; \ ==== //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.17 2004/08/08 02:22:48 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.18 2004/09/17 04:39:07 kientzle Exp $"); #include #include @@ -414,7 +414,7 @@ } /* If numeric GID is too large, add 'gid' to pax extended attrs. */ - if (st_main->st_gid >= (1 << 20)) { + if (st_main->st_gid >= (1 << 18)) { add_pax_attr_int(&(pax->pax_header), "gid", st_main->st_gid); need_extension = 1; } @@ -429,7 +429,7 @@ } /* If numeric UID is too large, add 'uid' to pax extended attrs. */ - if (st_main->st_uid >= (1 << 20)) { + if (st_main->st_uid >= (1 << 18)) { add_pax_attr_int(&(pax->pax_header), "uid", st_main->st_uid); need_extension = 1; } @@ -636,7 +636,11 @@ archive_entry_set_pathname(pax_attr_entry, pax_attr_name); st.st_size = archive_strlen(&(pax->pax_header)); st.st_uid = st_main->st_uid; + if (st.st_uid >= 1 << 18) + st.st_uid = (1 << 18) - 1; st.st_gid = st_main->st_gid; + if (st.st_gid >= 1 << 18) + st.st_gid = (1 << 18) - 1; st.st_mode = st_main->st_mode; archive_entry_copy_stat(pax_attr_entry, &st); ==== //depot/projects/hammer/lib/libthr/thread/thr_private.h#20 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.40 2004/08/19 23:49:04 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.41 2004/09/16 13:55:46 mtm Exp $ */ #ifndef _THR_PRIVATE_H @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -833,6 +834,12 @@ int __sys_ioctl(int, unsigned long, ...); #endif +/* #include */ +#ifdef _SYS_MSG_H_ +int __sys_msgrcv(int, void *, size_t, long, int); +int __sys_msgsnd(int, const void *, size_t, int); +#endif + /* #include */ #ifdef _SYS_MMAN_H_ int __sys_msync(void *, size_t, int); @@ -852,6 +859,7 @@ int __sys_getsockname(int, struct sockaddr *, socklen_t *); int __sys_getsockopt(int, int, int, void *, socklen_t *); int __sys_listen(int, int); +ssize_t __sys_recv(int, void *, size_t, int); ssize_t __sys_recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *); ssize_t __sys_recvmsg(int, struct msghdr *, int); int __sys_sendfile(int, int, off_t, size_t, struct sf_hdtr *, off_t *, int); @@ -898,12 +906,23 @@ int __sys_poll(struct pollfd *, unsigned, int); #endif +/* #include */ +#ifdef _SEMAPHORE_H_ +int __sem_timedwait(sem_t * __restrict, const struct timespec * __restrict); +int __sem_wait(sem_t *); +#endif + /* #include */ #ifdef _SIGNAL_H_ int __sys_sigaction(int, const struct sigaction *, struct sigaction *); int __sys_sigaltstack(const struct sigaltstack *, struct sigaltstack *); int __sys_sigprocmask(int, const sigset_t *, sigset_t *); int __sys_sigreturn(ucontext_t *); +int __sys_sigsuspend(const sigset_t *); +int __sys_sigtimedwait(const sigset_t * __restrict, siginfo_t * __restrict, + const struct timespec * __restrict); +int __sys_sigwait(const sigset_t * __restrict, int * __restrict); +int __sys_sigwaitinfo(const sigset_t * __restrict, siginfo_t * __restrict); #endif /* #include */ @@ -918,6 +937,8 @@ long __sys_fpathconf(int, int); int __sys_fsync(int); int __sys_pipe(int *); +ssize_t __sys_pread(int, void *, size_t, off_t); +ssize_t __sys_pwrite(int, const void *, size_t, off_t); ssize_t __sys_read(int, void *, size_t); ssize_t __sys_write(int, const void *, size_t); #endif ==== //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.7 2004/06/27 10:01:35 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.8 2004/09/16 13:55:46 mtm Exp $ */ /* @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #include @@ -80,6 +81,7 @@ #include #include #include +#include #include #include #include @@ -103,6 +105,19 @@ extern pid_t __sys_wait4(pid_t, int *, int, struct rusage *); extern pid_t __waitpid(pid_t, int *, int); +__weak_reference(_accept, accept); + +int +_accept(int s, struct sockaddr *addr, socklen_t *addrlen) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_accept(s, addr, addrlen); + _thread_leave_cancellation_point(); + return (ret); +} + __weak_reference(_aio_suspend, aio_suspend); int @@ -131,6 +146,20 @@ return ret; } + +__weak_reference(_connect, connect); + +int +_connect(int s, const struct sockaddr *n, socklen_t l) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_connect(s, n, l); + _thread_leave_cancellation_point(); + return ret; +} + __weak_reference(_creat, creat); int @@ -246,6 +275,32 @@ return ret; } +__weak_reference(_msgrcv, msgrcv); + +int +_msgrcv(int id, void *p, size_t sz, long t, int f) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_msgrcv(id, p, sz, t, f); + _thread_leave_cancellation_point(); + return ret; +} + +__weak_reference(_msgsnd, msgsnd); + +int +_msgsnd(int id, const void *p, size_t sz, int f) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_msgsnd(id, p, sz, f); + _thread_leave_cancellation_point(); + return ret; +} + __weak_reference(_msync, msync); int @@ -300,6 +355,22 @@ return ret; } +/* + * The implementation in libc calls sigpause(), which is also + * a cancellation point. + */ +#if 0 +__weak_reference(_pause, pause); + +int +_pause(void) +{ + _thread_enter_cancellation_point(); + __pause(); + _thread_leave_cancellation_point(); +} +#endif + __weak_reference(_poll, poll); int @@ -314,6 +385,24 @@ return ret; } +/* XXXFix */ +#if 0 +__weak_reference(_pread, pread); + +ssize_t +_pread(int d, void *b, size_t n, off_t o) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_pread(d, b, n, o); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + +/* The libc version calls select(), which is also a cancellation point. */ +#if 0 extern int __pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds, const struct timespec *timo, const sigset_t *mask); @@ -329,7 +418,24 @@ return (ret); } +#endif +/* XXXFix */ +#if 0 +__weak_reference(_pwrite, pwrite); + +ssize_t +_pwrite(int d, const void *b, size_t n, off_t o) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_pwrite(d, b, n, o); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + __weak_reference(_raise, raise); int @@ -373,6 +479,52 @@ return ret; } +/* + * The libc implementation of recv() calls recvfrom, which + * is also a cancellation point. + */ +#if 0 +__weak_reference(_recv, recv); + +ssize_t +_recv(int s, void *b, size_t l, int f) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_recv(s, b, l, f); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + +__weak_reference(_recvfrom, recvfrom); + +ssize_t +_recvfrom(int s, void *b, size_t l, int f, struct sockaddr *from, + socklen_t *fl) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_recvfrom(s, b, l, f, from, fl); + _thread_leave_cancellation_point(); + return (ret); +} + +__weak_reference(_recvmsg, recvmsg); + +ssize_t +_recvmsg(int s, struct msghdr *m, int f) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_recvmsg(s, m, f); + _thread_leave_cancellation_point(); + return (ret); +} + __weak_reference(_select, select); int @@ -388,6 +540,123 @@ return ret; } +/* + * Libc implements this by calling _sendto(), which is also a + * cancellation point. + */ +#if 0 +__weak_reference(_send, send); + +ssize_t +_send(int s, const void *m, size_t l, int f) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = _sendto(s, m, l, f, NULL, 0); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + +__weak_reference(_sendmsg, sendmsg); + +ssize_t +_sendmsg(int s, const struct msghdr *m, int f) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_sendmsg(s, m, f); + _thread_leave_cancellation_point(); + return (ret); +} + +__weak_reference(_sendto, sendto); + +ssize_t +_sendto(int s, const void *m, size_t l, int f, const struct sockaddr *t, + socklen_t tl) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_sendto(s, m, l, f, t, tl); + _thread_leave_cancellation_point(); + return (ret); +} + +/* + * The implementation in libc calls sigsuspend(), which is also + * a cancellation point. + */ +#if 0 +__weak_reference(_sigpause, sigpause); + +int +_sigpause(int m) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_sigpause(m); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + +__weak_reference(_sigsuspend, sigsuspend); + +int +_sigsuspend(const sigset_t *m) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_sigsuspend(m); + _thread_leave_cancellation_point(); + return (ret); +} + +__weak_reference(_sigtimedwait, sigtimedwait); + +int +_sigtimedwait(const sigset_t *s, siginfo_t *i, const struct timespec *t) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_sigtimedwait(s, i, t); + _thread_leave_cancellation_point(); + return (ret); +} + +__weak_reference(_sigwait, sigwait); + +int +_sigwait(const sigset_t *s, int *i) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_sigwait(s, i); + _thread_leave_cancellation_point(); + return (ret); +} + +__weak_reference(_sigwaitinfo, sigwaitinfo); + +int +_sigwaitinfo(const sigset_t *s, siginfo_t *i) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_sigwaitinfo(s, i); + _thread_leave_cancellation_point(); + return (ret); +} + __weak_reference(_sleep, sleep); unsigned int @@ -431,6 +700,25 @@ return ret; } +/* + * The usleep() implementation calls nanosleep(), which is also + * a cancellation point. + */ +#if 0 +__weak_reference(_usleep, usleep); + +int +_usleep(useconds_t u) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_usleep(u); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + __weak_reference(_wait, wait); pid_t @@ -459,6 +747,10 @@ return ret; } +/* + * The libc implementation of waitpid calls wait4(). + */ +#if 0 __weak_reference(_waitpid, waitpid); pid_t @@ -472,6 +764,7 @@ return ret; } +#endif __weak_reference(_write, write); ==== //depot/projects/hammer/lib/libutil/humanize_number.3#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $NetBSD: humanize_number.3,v 1.4 2003/04/16 13:34:37 wiz Exp $ -.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.4 2004/07/07 20:25:54 ru Exp $ +.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.5 2004/09/16 18:32:58 pjd Exp $ .\" .\" Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -141,8 +141,6 @@ If .Dv HN_GETSCALE is specified, the prefix index number will be returned instead. -.Sh SEE ALSO -.Xr humanize_number 9 .Sh HISTORY The .Fn humanize_number ==== //depot/projects/hammer/lib/msun/src/math.h#22 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.43 2004/07/19 08:16:10 das Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.44 2004/09/17 05:15:33 das Exp $ */ #ifndef _MATH_H_ @@ -34,11 +34,11 @@ float __uf; } __nan; -#if (defined(__GNUC__) && ((__GNUC__ >= 3 && __GNUC_MINOR__ >= 3) || __GNUC__ >= 4)) || defined(__INTEL_COMPILER) +#if __GNUC_PREREQ__(3, 3) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 800) #define __MATH_BUILTIN_CONSTANTS #endif -#if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER)) +#if __GNUC_PREREQ__(3, 0) && !defined(__INTEL_COMPILER) #define __MATH_BUILTIN_RELOPS #endif ==== //depot/projects/hammer/release/Makefile#60 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.861 2004/09/15 05:14:21 brooks Exp $ +# $FreeBSD: src/release/Makefile,v 1.862 2004/09/17 19:28:46 keramida Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -160,7 +160,7 @@ AUTO_KEYBOARD_DETECT?= 0 .if !defined(NODOC) -DIST_DOCS_ARCH_INDEP= readme errata early-adopter +DIST_DOCS_ARCH_INDEP= readme errata DIST_DOCS_ARCH_DEP= installation relnotes hardware .endif ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/Makefile,v 1.5 2004/08/06 08:41:22 simon Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/Makefile,v 1.6 2004/09/16 16:46:37 hrs Exp $ RELN_ROOT?= ${.CURDIR}/.. @@ -7,7 +7,7 @@ SUBDIR+= readme SUBDIR+= errata SUBDIR+= installation -SUBDIR+= early-adopter +#SUBDIR+= early-adopter COMPAT_SYMLINK = en ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#61 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.256 2004/09/14 01:46:27 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.257 2004/09/16 20:38:28 brueffer Exp $ Supported Devices @@ -261,236 +261,7 @@ SMC 83c17x (EPIC)-based Ethernet NICs (&man.tx.4; driver) - National Semiconductor DS8390-based Ethernet NICs, including - Novell NE2000 and clones - (&man.ed.4; driver) - - In kernel configuration, you need to set flag for non-PCI - device. - - - - 3C503 Etherlink II (&man.ed.4; driver) - - - DEC Etherworks DE305 - - - Hewlett-Packard PC Lan+ 27247B and 27252A - - - NetVin 5000 - - - Novell NE1000, NE2000, and NE2100 - - - RealTek 8029 - - - SMC Elite 16 WD8013 Ethernet interface - - - SMC Elite Ultra - - - SMC WD8003E, WD8003EBT, WD8003W, WD8013W, WD8003S, - WD8003SBT and WD8013EBT and clones - - - Surecom NE-34 - - - VIA VT86C926 - - - Winbond W89C940 - - - I-O DATA ET2/T-PCI - - - MELCO LGY-PCI-TR - - - PLANEX ENW-8300-T - - - Allied Telesis LA-98 (flags 0x000000) - - - Corega Ether98-T (flags 0x000000) - - - SMC EtherEZ98 (flags 0x000000) - - - ELECOM LD-BDN, LD-NW801G (flags 0x200000) - - - PLANEX EN-2298-C (flags 0x200000) - - - MELCO EGY-98 (flags 0x300000) - - - Contec C-NET(98)E-A, C-NET(98)L-A, C-NET(98)P (flags - 0x300000) - - - MELCO LGY-98, LGH-98, IND-SP, IND-SS, LGY-98-N - (110pin) (flags 0x400000) - - - MACNICA NE2098 (flags 0x400000) - - - ICM IF-2766ET, IF-2771ET, AD-ET2-T, DT-ET-25, DT-ET-T5, - NB-ET-T (110pin) (flags 0x500000) - - - D-Link DE-298, DE-298P (flags 0x500000) - - - ELECOM LD-98P (flags 0x500000) - - - PLANEX EN-2298-T, EN-2298P-T (flags 0x500000) - - - Allied Telesis SIC-98, SIU-98, SIC-98NOTE (110pin) (flags - 0x600000) - - - Allied Telesis SIU-98-D (flags 0x610000) - - - NEC PC-9801-107, 108 (flags 0x800000) - - - I-O DATA LA/T-98, LA/T-98SB, LA2/T-98, ET/T-98 (flags - 0x900000) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 17 23:09:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67C0F16A4EC; Fri, 17 Sep 2004 23:09:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 216E416A4D2 for ; Fri, 17 Sep 2004 23:09:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F01A143D46 for ; Fri, 17 Sep 2004 23:09:21 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8HN9L2f003637 for ; Fri, 17 Sep 2004 23:09:21 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8HN9Lau003634 for perforce@freebsd.org; Fri, 17 Sep 2004 23:09:21 GMT (envelope-from marcel@freebsd.org) Date: Fri, 17 Sep 2004 23:09:21 GMT Message-Id: <200409172309.i8HN9Lau003634@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 61731 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Sep 2004 23:09:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=61731 Change 61731 by marcel@marcel_nfs on 2004/09/17 23:08:58 Flush some local diffs. I don't have enough time to work on this right now... Affected files ... .. //depot/projects/tty/sys/conf/files#15 edit .. //depot/projects/tty/sys/conf/files.ia64#11 edit .. //depot/projects/tty/sys/dev/vga/vga_cons.c#4 edit .. //depot/projects/tty/sys/dev/vga/vga_cpu_ia64.c#1 add .. //depot/projects/tty/sys/dev/vga/vga_pci.c#2 edit .. //depot/projects/tty/sys/dev/vtc/vtc_core.c#1 add .. //depot/projects/tty/sys/ia64/ia64/vga_machdep.c#2 delete Differences ... ==== //depot/projects/tty/sys/conf/files#15 (text+ko) ==== @@ -872,6 +872,10 @@ dev/usb/usbdi.c optional usb dev/usb/usbdi_util.c optional usb dev/utopia/utopia.c optional utopia +dev/vga/vga.c optional vga +dev/vga/vga_cons.c optional vga +dev/vga/vga_isa.c optional vga +dev/vga/vga_pci.c optional vga dev/vinum/vinum.c optional vinum dev/vinum/vinumconfig.c optional vinum dev/vinum/vinumdaemon.c optional vinum @@ -886,6 +890,7 @@ dev/vinum/vinumrevive.c optional vinum dev/vinum/vinumstate.c optional vinum dev/vinum/vinumutil.c optional vinum +dev/vtc/vtc_core.c optional vtc dev/vx/if_vx.c optional vx dev/vx/if_vx_eisa.c optional vx eisa dev/vx/if_vx_pci.c optional vx pci ==== //depot/projects/tty/sys/conf/files.ia64#11 (text+ko) ==== @@ -50,6 +50,7 @@ dev/kbd/kbd.c optional ukbd dev/ppc/ppc.c optional ppc isa dev/uart/uart_cpu_ia64.c optional uart +dev/vga/vga_cpu_ia64.c optional vga geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_gpt.c standard ==== //depot/projects/tty/sys/dev/vga/vga_cons.c#4 (text+ko) ==== @@ -58,7 +58,6 @@ bzero(&vga_console, sizeof(vga_console)); - cp->cn_dev = NULL; /* How do we know. */ cp->cn_pri = CN_DEAD; if (vga_get_console(&cd) != 0) ==== //depot/projects/tty/sys/dev/vga/vga_pci.c#2 (text+ko) ==== @@ -35,8 +35,8 @@ #include #include -#include -#include +#include +#include #include From owner-p4-projects@FreeBSD.ORG Sat Sep 18 01:57:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F14A16A4D0; Sat, 18 Sep 2004 01:57:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3071016A4CE for ; Sat, 18 Sep 2004 01:57:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0677A43D31 for ; Sat, 18 Sep 2004 01:57:54 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8I1vrZE009769 for ; Sat, 18 Sep 2004 01:57:53 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8I1ugCD009751 for perforce@freebsd.org; Sat, 18 Sep 2004 01:56:42 GMT (envelope-from marcel@freebsd.org) Date: Sat, 18 Sep 2004 01:56:42 GMT Message-Id: <200409180156.i8I1ugCD009751@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 61735 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Sep 2004 01:57:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=61735 Change 61735 by marcel@marcel_nfs on 2004/09/18 01:55:15 IFC @61729 Affected files ... .. //depot/projects/tty/MAINTAINERS#7 integrate .. //depot/projects/tty/Makefile#9 integrate .. //depot/projects/tty/Makefile.inc1#13 integrate .. //depot/projects/tty/UPDATING#11 integrate .. //depot/projects/tty/bin/Makefile.inc#5 integrate .. //depot/projects/tty/bin/cat/cat.c#4 integrate .. //depot/projects/tty/bin/chio/chio.1#3 integrate .. //depot/projects/tty/bin/cp/cp.1#5 integrate .. //depot/projects/tty/bin/csh/config.h#2 integrate .. //depot/projects/tty/bin/date/date.1#4 integrate .. //depot/projects/tty/bin/date/vary.c#2 integrate .. //depot/projects/tty/bin/dd/args.c#5 integrate .. //depot/projects/tty/bin/dd/dd.1#3 integrate .. //depot/projects/tty/bin/dd/dd.c#6 integrate .. //depot/projects/tty/bin/dd/dd.h#4 integrate .. //depot/projects/tty/bin/dd/extern.h#4 integrate .. //depot/projects/tty/bin/df/df.1#5 integrate .. //depot/projects/tty/bin/df/df.c#6 integrate .. //depot/projects/tty/bin/domainname/domainname.1#3 integrate .. //depot/projects/tty/bin/echo/echo.1#5 integrate .. //depot/projects/tty/bin/ed/Makefile#4 integrate .. //depot/projects/tty/bin/ed/ed.1#3 integrate .. //depot/projects/tty/bin/expr/expr.1#2 integrate .. //depot/projects/tty/bin/hostname/hostname.1#3 integrate .. //depot/projects/tty/bin/kill/kill.1#3 integrate .. //depot/projects/tty/bin/ln/ln.1#3 integrate .. //depot/projects/tty/bin/ln/symlink.7#3 integrate .. //depot/projects/tty/bin/ls/cmp.c#4 integrate .. //depot/projects/tty/bin/ls/ls.1#7 integrate .. //depot/projects/tty/bin/ls/ls.c#6 integrate .. //depot/projects/tty/bin/ls/print.c#6 integrate .. //depot/projects/tty/bin/mkdir/mkdir.1#3 integrate .. //depot/projects/tty/bin/pax/ar_io.c#4 integrate .. //depot/projects/tty/bin/pax/pax.1#3 integrate .. //depot/projects/tty/bin/ps/extern.h#4 integrate .. //depot/projects/tty/bin/ps/fmt.c#5 integrate .. //depot/projects/tty/bin/ps/keyword.c#6 integrate .. //depot/projects/tty/bin/ps/print.c#6 integrate .. //depot/projects/tty/bin/ps/ps.1#5 integrate .. //depot/projects/tty/bin/ps/ps.c#5 integrate .. //depot/projects/tty/bin/ps/ps.h#4 integrate .. //depot/projects/tty/bin/pwd/pwd.1#5 integrate .. //depot/projects/tty/bin/rcp/rcp.1#3 integrate .. //depot/projects/tty/bin/rm/rm.1#4 integrate .. //depot/projects/tty/bin/setfacl/Makefile#2 integrate .. //depot/projects/tty/bin/setfacl/setfacl.1#3 integrate .. //depot/projects/tty/bin/sh/bltin/echo.1#3 integrate .. //depot/projects/tty/bin/sh/sh.1#7 integrate .. //depot/projects/tty/bin/stty/stty.1#3 integrate .. //depot/projects/tty/bin/test/TEST.README#2 integrate .. //depot/projects/tty/bin/test/test.1#3 integrate .. //depot/projects/tty/contrib/amd/AUTHORS#3 integrate .. //depot/projects/tty/contrib/amd/BUGS#3 integrate .. //depot/projects/tty/contrib/amd/COPYING#3 integrate .. //depot/projects/tty/contrib/amd/ChangeLog#3 integrate .. //depot/projects/tty/contrib/amd/FREEBSD-Xlist#3 integrate .. //depot/projects/tty/contrib/amd/INSTALL#3 integrate .. //depot/projects/tty/contrib/amd/MIRRORS#3 delete .. //depot/projects/tty/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/tty/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/tty/contrib/amd/NEWS#3 integrate .. //depot/projects/tty/contrib/amd/README#3 integrate .. //depot/projects/tty/contrib/amd/README.y2k#2 integrate .. //depot/projects/tty/contrib/amd/amd/am_ops.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/amd.8#3 integrate .. //depot/projects/tty/contrib/amd/amd/amd.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/amd.h#3 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_auto.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_direct.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_error.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_host.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_inherit.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_link.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_linkx.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_nfsl.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_nfsx.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_program.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_root.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_toplvl.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_union.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/amq_subr.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/amq_svc.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/autil.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/clock.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/conf.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/conf_parse.y#3 integrate .. //depot/projects/tty/contrib/amd/amd/conf_tok.l#3 integrate .. //depot/projects/tty/contrib/amd/amd/get_args.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/info_file.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/info_hesiod.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/info_ldap.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/info_ndbm.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/info_nis.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/info_nisplus.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/info_passwd.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/info_union.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/map.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/mapc.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/mntfs.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/nfs_prot_svc.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/nfs_start.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/nfs_subr.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/ops_TEMPLATE.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/ops_cachefs.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/ops_cdfs.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/ops_efs.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/ops_lofs.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/ops_mfs.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/ops_nfs.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/ops_nfs3.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/ops_nullfs.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/ops_pcfs.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/ops_tfs.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/ops_tmpfs.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/ops_ufs.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/ops_umapfs.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/ops_unionfs.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/ops_xfs.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/opts.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/restart.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/rpc_fwd.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/sched.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/srvr_amfs_auto.c#3 integrate .. //depot/projects/tty/contrib/amd/amd/srvr_nfs.c#3 integrate .. //depot/projects/tty/contrib/amd/amq/amq.8#3 integrate .. //depot/projects/tty/contrib/amd/amq/amq.c#3 integrate .. //depot/projects/tty/contrib/amd/amq/amq.h#3 integrate .. //depot/projects/tty/contrib/amd/amq/amq_clnt.c#3 integrate .. //depot/projects/tty/contrib/amd/amq/amq_xdr.c#3 integrate .. //depot/projects/tty/contrib/amd/amq/pawd.1#3 integrate .. //depot/projects/tty/contrib/amd/amq/pawd.c#3 integrate .. //depot/projects/tty/contrib/amd/bootstrap#2 integrate .. //depot/projects/tty/contrib/amd/commit#2 delete .. //depot/projects/tty/contrib/amd/conf/checkmount/checkmount_bsd44.c#3 integrate .. //depot/projects/tty/contrib/amd/conf/hn_dref/hn_dref_default.h#2 delete .. //depot/projects/tty/contrib/amd/conf/mount/mount_default.c#2 delete .. //depot/projects/tty/contrib/amd/conf/mtab/mtab_bsd.c#3 integrate .. //depot/projects/tty/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#3 integrate .. //depot/projects/tty/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#3 integrate .. //depot/projects/tty/contrib/amd/conf/transp/transp_sockets.c#4 integrate .. //depot/projects/tty/contrib/amd/conf/umount/umount_bsd44.c#3 integrate .. //depot/projects/tty/contrib/amd/config.guess#2 delete .. //depot/projects/tty/contrib/amd/config.guess.long#2 delete .. //depot/projects/tty/contrib/amd/config.sub#2 delete .. //depot/projects/tty/contrib/amd/configure.in#2 delete .. //depot/projects/tty/contrib/amd/cvs-server.txt#2 delete .. //depot/projects/tty/contrib/amd/depcomp#2 delete .. //depot/projects/tty/contrib/amd/doc/am-utils.texi#3 integrate .. //depot/projects/tty/contrib/amd/doc/mdate-sh#2 delete .. //depot/projects/tty/contrib/amd/fixmount/fixmount.8#3 integrate .. //depot/projects/tty/contrib/amd/fixmount/fixmount.c#3 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsi_analyze.c#3 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsi_data.h#3 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsi_dict.c#3 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsi_gram.y#3 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsi_lex.l#3 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsi_util.c#3 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsinfo.8#4 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsinfo.c#3 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsinfo.h#3 integrate .. //depot/projects/tty/contrib/amd/fsinfo/wr_atab.c#3 integrate .. //depot/projects/tty/contrib/amd/fsinfo/wr_bparam.c#3 integrate .. //depot/projects/tty/contrib/amd/fsinfo/wr_dumpset.c#3 integrate .. //depot/projects/tty/contrib/amd/fsinfo/wr_exportfs.c#3 integrate .. //depot/projects/tty/contrib/amd/fsinfo/wr_fstab.c#3 integrate .. //depot/projects/tty/contrib/amd/hlfsd/hlfsd.8#3 integrate .. //depot/projects/tty/contrib/amd/hlfsd/hlfsd.c#3 integrate .. //depot/projects/tty/contrib/amd/hlfsd/hlfsd.h#3 integrate .. //depot/projects/tty/contrib/amd/hlfsd/homedir.c#3 integrate .. //depot/projects/tty/contrib/amd/hlfsd/nfs_prot_svc.c#3 integrate .. //depot/projects/tty/contrib/amd/hlfsd/stubs.c#3 integrate .. //depot/projects/tty/contrib/amd/include/am_defs.h#3 integrate .. //depot/projects/tty/contrib/amd/include/am_utils.h#3 integrate .. //depot/projects/tty/contrib/amd/include/am_xdr_func.h#3 integrate .. //depot/projects/tty/contrib/amd/include/amq_defs.h#3 integrate .. //depot/projects/tty/contrib/amd/install-sh#2 delete .. //depot/projects/tty/contrib/amd/libamu/amu.h#3 integrate .. //depot/projects/tty/contrib/amd/libamu/hasmntopt.c#3 integrate .. //depot/projects/tty/contrib/amd/libamu/misc_rpc.c#3 integrate .. //depot/projects/tty/contrib/amd/libamu/mount_fs.c#3 integrate .. //depot/projects/tty/contrib/amd/libamu/mtab.c#3 integrate .. //depot/projects/tty/contrib/amd/libamu/nfs_prot_xdr.c#3 integrate .. //depot/projects/tty/contrib/amd/libamu/strerror.c#2 integrate .. //depot/projects/tty/contrib/amd/libamu/util.c#3 integrate .. //depot/projects/tty/contrib/amd/libamu/wire.c#3 integrate .. //depot/projects/tty/contrib/amd/libamu/xdr_func.c#3 integrate .. //depot/projects/tty/contrib/amd/libamu/xutil.c#3 integrate .. //depot/projects/tty/contrib/amd/ltmain.sh#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/c_void_p.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/cache_check_dynamic.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_amu_fs.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_checkmount_style.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_extern.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_fhandle.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_field.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_fs_headers.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_fs_mntent.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_gnu_getopt.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_hide_mount_type.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_lib2.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_map_funcs.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_mnt2_gen_opt.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_mnttab_file_name.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_mnttab_location.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_mnttab_opt.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_mnttab_style.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_mnttab_type.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_mount_style.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_mount_trap.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_mount_type.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_mtype_printf_type.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_mtype_type.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_network_transport_type.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_nfs_fh_dref.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_nfs_hn_dref.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_nfs_prot_headers.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_nfs_sa_dref.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_nfs_socket_connection.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_os_libs.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_restartable_signal_handler.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_umount_style.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_unmount_args.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/check_unmount_call.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/expand_cpp_hex.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/expand_cpp_int.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/expand_cpp_string.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/expand_run_string.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/extern_optarg.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/extern_sys_errlist.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/func_bad_memcmp.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/func_bad_yp_all.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/header_templates.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/host_macros.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/linux_headers.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/localconfig.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/mount_headers.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/name_package.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/name_version.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/opt_amu_cflags.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/opt_cppflags.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/opt_debug.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/opt_ldflags.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/opt_libs.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/os_cflags.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/os_cppflags.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/os_ldflags.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/package_bugreport.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/package_name.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/package_version.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/save_state.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/struct_field_nfs_fh.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/struct_mntent.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/struct_mnttab.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/struct_nfs_args.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/struct_nfs_fh.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/struct_nfs_fh3.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/try_compile_anyfs.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/try_compile_nfs.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/try_compile_rpc.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/type_auth_create_gidlist.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/type_cachefs_args.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/type_cdfs_args.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/type_efs_args.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/type_lofs_args.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/type_mfs_args.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/type_pcfs_args.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/type_recvfrom_fromlen.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/type_rfs_args.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/type_svc_in_arg.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/type_time_t.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/type_tmpfs_args.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/type_ufs_args.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/type_xdrproc_t.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/type_xfs_args.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/type_yp_order_outorder.m4#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/with_addon.m4#2 delete .. //depot/projects/tty/contrib/amd/missing#2 delete .. //depot/projects/tty/contrib/amd/mk-amd-map/mk-amd-map.8#3 integrate .. //depot/projects/tty/contrib/amd/mk-amd-map/mk-amd-map.c#3 integrate .. //depot/projects/tty/contrib/amd/mkinstalldirs#2 delete .. //depot/projects/tty/contrib/amd/scripts/amd.conf-sample#3 integrate .. //depot/projects/tty/contrib/amd/scripts/amd.conf.5#4 integrate .. //depot/projects/tty/contrib/amd/scripts/automount2amd.8#3 integrate .. //depot/projects/tty/contrib/amd/scripts/expn.1#3 integrate .. //depot/projects/tty/contrib/amd/scripts/expn.in#3 integrate .. //depot/projects/tty/contrib/amd/scripts/lostaltmail.conf-sample#2 delete .. //depot/projects/tty/contrib/amd/scripts/lostaltmail.in#3 delete .. //depot/projects/tty/contrib/amd/tasks#3 integrate .. //depot/projects/tty/contrib/amd/wire-test/wire-test.8#3 integrate .. //depot/projects/tty/contrib/amd/wire-test/wire-test.c#3 integrate .. //depot/projects/tty/contrib/binutils/ChangeLog#2 integrate .. //depot/projects/tty/contrib/binutils/MAINTAINERS#2 integrate .. //depot/projects/tty/contrib/binutils/Makefile.def#1 branch .. //depot/projects/tty/contrib/binutils/Makefile.in#2 integrate .. //depot/projects/tty/contrib/binutils/Makefile.tpl#1 branch .. //depot/projects/tty/contrib/binutils/README-maintainer-mode#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/ChangeLog#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/ChangeLog-0001#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/ChangeLog-0203#1 branch .. //depot/projects/tty/contrib/binutils/bfd/Makefile.am#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/Makefile.in#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/acinclude.m4#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/aclocal.m4#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/aout-arm.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/aout-encap.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/aout-target.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/aoutf1.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/aoutx.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/archive.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/archive64.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/archures.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/bfd-in.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/bfd-in2.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/bfd.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/bfdio.c#1 branch .. //depot/projects/tty/contrib/binutils/bfd/bfdwin.c#1 branch .. //depot/projects/tty/contrib/binutils/bfd/binary.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/bout.c#1 branch .. //depot/projects/tty/contrib/binutils/bfd/cache.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/coff-alpha.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/coff-arm.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/coff-aux.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/coff-i386.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/coff-ia64.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/coff-ppc.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/coff-rs6000.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/coff-sparc.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/coff64-rs6000.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/coffcode.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/coffgen.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/cofflink.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/coffswap.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/config.bfd#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/config.in#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/configure#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/configure.host#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/configure.in#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/corefile.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/cpu-alpha.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/cpu-arc.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/cpu-arm.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/cpu-i386.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/cpu-ia64-opc.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/cpu-ia64.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/cpu-powerpc.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/cpu-rs6000.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/cpu-s390.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/cpu-sparc.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/dep-in.sed#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/ChangeLog#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/ChangeLog-9103#1 branch .. //depot/projects/tty/contrib/binutils/bfd/doc/Makefile.am#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/Makefile.in#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/aoutx.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/archive.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/archures.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/bfd.texinfo#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/bfdint.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/bfdio.texi#1 branch .. //depot/projects/tty/contrib/binutils/bfd/doc/bfdt.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/bfdwin.texi#1 branch .. //depot/projects/tty/contrib/binutils/bfd/doc/cache.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/chew.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/coffcode.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/core.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/fdl.texi#1 branch .. //depot/projects/tty/contrib/binutils/bfd/doc/format.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/hash.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/init.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/libbfd.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/linker.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/mmo.texi#1 branch .. //depot/projects/tty/contrib/binutils/bfd/doc/opncls.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/reloc.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/section.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/syms.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/doc/targets.texi#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/dwarf1.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/dwarf2.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/ecoff.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/ecofflink.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/ecoffswap.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/efi-app-ia32.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/efi-app-ia64.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf-bfd.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf-eh-frame.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf-strtab.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf32-arc.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf32-arm.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf32-gen.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf32-i386.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf32-ppc.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf32-ppc.h#1 branch .. //depot/projects/tty/contrib/binutils/bfd/elf32-s390.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf32-sparc.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf64-alpha.c#3 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf64-gen.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf64-ppc.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf64-ppc.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf64-s390.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf64-sparc.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elf64-x86-64.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elfarm-nabi.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elfarm-oabi.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elfcode.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elfcore.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elflink.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elfxx-ia64.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/elfxx-target.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/format.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/freebsd.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/gen-aout.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/genlink.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/hash.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/i386aout.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/i386linux.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/ieee.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/ihex.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/init.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/libaout.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/libbfd-in.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/libbfd.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/libbfd.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/libcoff-in.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/libcoff.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/libecoff.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/libieee.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/libpei.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/libxcoff.h#1 branch .. //depot/projects/tty/contrib/binutils/bfd/linker.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/merge.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/netbsd-core.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/netbsd.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/opncls.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/osf-core.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/pe-arm.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/pe-i386.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/peXXigen.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/peicode.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/po/BLD-POTFILES.in#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/po/Make-in#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/po/SRC-POTFILES.in#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/po/bfd.pot#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/ppcboot.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/ptrace-core.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/reloc.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/reloc16.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/rs6000-core.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/sco5-core.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/section.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/simple.c#1 branch .. //depot/projects/tty/contrib/binutils/bfd/sparclinux.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/sparcnetbsd.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/srec.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/stabs.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/sunos.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/syms.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/sysdep.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/targets.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/tekhex.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/trad-core.c#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/version.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/xcoff-target.h#2 integrate .. //depot/projects/tty/contrib/binutils/bfd/xcofflink.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/ChangeLog#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/ChangeLog-0001#1 branch .. //depot/projects/tty/contrib/binutils/binutils/ChangeLog-0203#1 branch .. //depot/projects/tty/contrib/binutils/binutils/ChangeLog-9197#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/ChangeLog-9899#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/MAINTAINERS#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/Makefile.am#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/Makefile.in#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/NEWS#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/README#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/acinclude.m4#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/aclocal.m4#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/addr2line.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/ar.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/arlex.l#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/arparse.y#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/arsup.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/arsup.h#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/binemul.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/binemul.h#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/bucomm.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/bucomm.h#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/budbg.h#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/budemang.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/budemang.h#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/coffdump.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/coffgrok.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/coffgrok.h#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/config.in#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/configure#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/configure.in#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/cxxfilt.c#1 branch .. //depot/projects/tty/contrib/binutils/binutils/debug.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/debug.h#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/deflex.l#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/dep-in.sed#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/dlltool.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/dlltool.h#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/dllwrap.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/doc/Makefile.am#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/doc/Makefile.in#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/doc/addr2line.1#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/doc/ar.1#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/doc/binutils.texi#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/doc/cxxfilt.man#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/doc/dlltool.1#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/doc/fdl.texi#1 branch .. //depot/projects/tty/contrib/binutils/binutils/doc/nm.1#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/doc/objcopy.1#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/doc/objdump.1#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/doc/ranlib.1#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/doc/readelf.1#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/doc/size.1#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/doc/strings.1#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/doc/strip.1#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/filemode.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/ieee.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/nm.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/objcopy.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/objdump.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/po/Make-in#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/po/POTFILES.in#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/po/binutils.pot#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/prdbg.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/rclex.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/rclex.l#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/rdcoff.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/rddbg.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/readelf.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/rename.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/resbin.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/rescoff.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/resrc.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/size.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/srconv.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/stabs.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/strings.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/sysdump.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/unwind-ia64.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/unwind-ia64.h#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/version.c#2 integrate .. //depot/projects/tty/contrib/binutils/binutils/wrstabs.c#2 integrate .. //depot/projects/tty/contrib/binutils/config-ml.in#2 integrate .. //depot/projects/tty/contrib/binutils/config.guess#2 integrate .. //depot/projects/tty/contrib/binutils/config.if#2 integrate .. //depot/projects/tty/contrib/binutils/config.sub#2 integrate .. //depot/projects/tty/contrib/binutils/configure#2 integrate .. //depot/projects/tty/contrib/binutils/configure.in#2 integrate .. //depot/projects/tty/contrib/binutils/gas/CONTRIBUTORS#2 integrate .. //depot/projects/tty/contrib/binutils/gas/ChangeLog#2 integrate .. //depot/projects/tty/contrib/binutils/gas/ChangeLog-0203#1 branch .. //depot/projects/tty/contrib/binutils/gas/ChangeLog-9295#2 integrate .. //depot/projects/tty/contrib/binutils/gas/Makefile.am#2 integrate .. //depot/projects/tty/contrib/binutils/gas/Makefile.in#2 integrate .. //depot/projects/tty/contrib/binutils/gas/NEWS#2 integrate .. //depot/projects/tty/contrib/binutils/gas/README#2 integrate .. //depot/projects/tty/contrib/binutils/gas/acinclude.m4#2 integrate .. //depot/projects/tty/contrib/binutils/gas/aclocal.m4#2 integrate .. //depot/projects/tty/contrib/binutils/gas/app.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/as.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/as.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/atof-generic.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/bignum-copy.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/bignum.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/bit_fix.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/cgen.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/cgen.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/cond.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config.in#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/obj-aout.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/obj-aout.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/obj-coff.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/obj-coff.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/obj-ecoff.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/obj-ecoff.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/obj-elf.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/obj-elf.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/obj-ieee.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/obj-ieee.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/obj-multi.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/tc-alpha.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/tc-alpha.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/tc-arc.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/tc-arc.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/tc-arm.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/tc-arm.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/tc-i386.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/tc-i386.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/tc-ia64.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/tc-ia64.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/tc-ppc.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/tc-ppc.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/tc-s390.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/tc-s390.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/tc-sparc.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/tc-sparc.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/te-generic.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/te-pe.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/config/te-ppcnw.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/configure#2 integrate .. //depot/projects/tty/contrib/binutils/gas/configure.in#2 integrate .. //depot/projects/tty/contrib/binutils/gas/dep-in.sed#2 integrate .. //depot/projects/tty/contrib/binutils/gas/depend.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/doc/Makefile.am#2 integrate .. //depot/projects/tty/contrib/binutils/gas/doc/Makefile.in#2 integrate .. //depot/projects/tty/contrib/binutils/gas/doc/all.texi#2 integrate .. //depot/projects/tty/contrib/binutils/gas/doc/as.1#2 integrate .. //depot/projects/tty/contrib/binutils/gas/doc/as.texinfo#2 integrate .. //depot/projects/tty/contrib/binutils/gas/doc/c-alpha.texi#2 integrate .. //depot/projects/tty/contrib/binutils/gas/doc/c-arm.texi#2 integrate .. //depot/projects/tty/contrib/binutils/gas/doc/c-i386.texi#2 integrate .. //depot/projects/tty/contrib/binutils/gas/doc/c-ia64.texi#2 integrate .. //depot/projects/tty/contrib/binutils/gas/doc/c-ppc.texi#2 integrate .. //depot/projects/tty/contrib/binutils/gas/doc/c-sh.texi#2 integrate .. //depot/projects/tty/contrib/binutils/gas/doc/c-sparc.texi#2 integrate .. //depot/projects/tty/contrib/binutils/gas/doc/gasver.texi#1 branch .. //depot/projects/tty/contrib/binutils/gas/doc/h8.texi#2 integrate .. //depot/projects/tty/contrib/binutils/gas/doc/internals.texi#2 integrate .. //depot/projects/tty/contrib/binutils/gas/dw2gencfi.c#1 branch .. //depot/projects/tty/contrib/binutils/gas/dw2gencfi.h#1 branch .. //depot/projects/tty/contrib/binutils/gas/dwarf2dbg.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/dwarf2dbg.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/ecoff.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/ecoff.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/ehopt.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/emul.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/expr.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/expr.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/flonum-copy.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/flonum-mult.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/flonum.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/frags.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/frags.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/hash.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/hash.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/input-file.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/input-file.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/input-scrub.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/itbl-ops.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/itbl-ops.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/listing.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/listing.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/macro.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/macro.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/messages.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/obj.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/output-file.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/output-file.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/po/Make-in#2 integrate .. //depot/projects/tty/contrib/binutils/gas/po/POTFILES.in#2 integrate .. //depot/projects/tty/contrib/binutils/gas/po/gas.pot#2 integrate .. //depot/projects/tty/contrib/binutils/gas/read.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/read.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/sb.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/sb.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/stabs.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/subsegs.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/subsegs.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/symbols.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/symbols.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/tc.h#2 integrate .. //depot/projects/tty/contrib/binutils/gas/write.c#2 integrate .. //depot/projects/tty/contrib/binutils/gas/write.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/ChangeLog#2 integrate .. //depot/projects/tty/contrib/binutils/include/ansidecl.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/aout/ChangeLog#2 integrate .. //depot/projects/tty/contrib/binutils/include/aout/aout64.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/aout/stab.def#2 integrate .. //depot/projects/tty/contrib/binutils/include/bfdlink.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/coff/ChangeLog#2 integrate .. //depot/projects/tty/contrib/binutils/include/coff/arm.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/coff/ecoff.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/coff/internal.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/coff/pe.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/coff/sh.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/coff/ti.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/coff/xcoff.h#1 branch .. //depot/projects/tty/contrib/binutils/include/demangle.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/dis-asm.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/ChangeLog#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/ChangeLog-9103#1 branch .. //depot/projects/tty/contrib/binutils/include/elf/arm.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/common.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/dwarf2.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/external.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/frv.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/h8.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/i370.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/ia64.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/internal.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/ip2k.h#1 branch .. //depot/projects/tty/contrib/binutils/include/elf/iq2000.h#1 branch .. //depot/projects/tty/contrib/binutils/include/elf/m32r.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/m68hc11.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/mips.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/mmix.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/mn10300.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/msp430.h#1 branch .. //depot/projects/tty/contrib/binutils/include/elf/ppc.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/ppc64.h#1 branch .. //depot/projects/tty/contrib/binutils/include/elf/reloc-macros.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/s390.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/sh.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/sparc.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/v850.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/x86-64.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/xstormy16.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/elf/xtensa.h#1 branch .. //depot/projects/tty/contrib/binutils/include/fibheap.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/floatformat.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/hashtab.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/libiberty.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/obstack.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/opcode/ChangeLog#2 integrate .. //depot/projects/tty/contrib/binutils/include/opcode/ChangeLog-9103#1 branch .. //depot/projects/tty/contrib/binutils/include/opcode/alpha.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/opcode/arc.h#3 branch .. //depot/projects/tty/contrib/binutils/include/opcode/cgen.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/opcode/convex.h#3 branch .. //depot/projects/tty/contrib/binutils/include/opcode/i386.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/opcode/ia64.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/opcode/np1.h#3 branch .. //depot/projects/tty/contrib/binutils/include/opcode/pn.h#3 branch .. //depot/projects/tty/contrib/binutils/include/opcode/ppc.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/opcode/s390.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/opcode/sparc.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/partition.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/safe-ctype.h#2 integrate .. //depot/projects/tty/contrib/binutils/include/splay-tree.h#2 integrate .. //depot/projects/tty/contrib/binutils/install-sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ChangeLog#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ChangeLog-0001#1 branch .. //depot/projects/tty/contrib/binutils/ld/ChangeLog-0203#1 branch .. //depot/projects/tty/contrib/binutils/ld/ChangeLog-9197#2 integrate .. //depot/projects/tty/contrib/binutils/ld/Makefile.am#2 integrate .. //depot/projects/tty/contrib/binutils/ld/Makefile.in#2 integrate .. //depot/projects/tty/contrib/binutils/ld/NEWS#2 integrate .. //depot/projects/tty/contrib/binutils/ld/README#2 integrate .. //depot/projects/tty/contrib/binutils/ld/aclocal.m4#2 integrate .. //depot/projects/tty/contrib/binutils/ld/config.in#2 integrate .. //depot/projects/tty/contrib/binutils/ld/configure#2 integrate .. //depot/projects/tty/contrib/binutils/ld/configure.host#2 integrate .. //depot/projects/tty/contrib/binutils/ld/configure.in#2 integrate .. //depot/projects/tty/contrib/binutils/ld/configure.tgt#2 integrate .. //depot/projects/tty/contrib/binutils/ld/deffile.h#2 integrate .. //depot/projects/tty/contrib/binutils/ld/deffilep.y#2 integrate .. //depot/projects/tty/contrib/binutils/ld/dep-in.sed#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emulparams/arcelf.sh#3 branch .. //depot/projects/tty/contrib/binutils/ld/emulparams/armelf.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emulparams/armelf_linux.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emulparams/armelf_oabi.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emulparams/armpe.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf32_sparc.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf32b4300.sh#3 branch .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf32bmip.sh#3 branch .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf32bmipn32.sh#3 branch .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf32bsmip.sh#3 branch .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf32ebmip.sh#3 branch .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf32elmip.sh#3 branch .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf32l4300.sh#3 branch .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf32lmip.sh#3 branch .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf32lsmip.sh#3 branch .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf32ppc.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf64_ia64.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf64_ia64_fbsd.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf64_s390.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf64_sparc.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf64alpha.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf64bmip.sh#3 branch .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf64ppc.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf_i386.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf_s390.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emulparams/elf_x86_64.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emulparams/sh.sh#3 branch .. //depot/projects/tty/contrib/binutils/ld/emulparams/shl.sh#3 branch .. //depot/projects/tty/contrib/binutils/ld/emulparams/shlelf.sh#3 branch .. //depot/projects/tty/contrib/binutils/ld/emulparams/vanilla.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emulparams/vsta.sh#3 branch .. //depot/projects/tty/contrib/binutils/ld/emultempl/alphaelf.em#1 branch .. //depot/projects/tty/contrib/binutils/ld/emultempl/armcoff.em#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emultempl/armelf.em#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emultempl/armelf_oabi.em#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emultempl/elf32.em#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emultempl/generic.em#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emultempl/ia64elf.em#1 branch .. //depot/projects/tty/contrib/binutils/ld/emultempl/linux.em#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emultempl/needrelax.em#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emultempl/netbsd.em#1 branch .. //depot/projects/tty/contrib/binutils/ld/emultempl/pe.em#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emultempl/ppc32elf.em#1 branch .. //depot/projects/tty/contrib/binutils/ld/emultempl/ppc64elf.em#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emultempl/sunos.em#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emultempl/ticoff.em#2 integrate .. //depot/projects/tty/contrib/binutils/ld/emultempl/vanilla.em#2 integrate .. //depot/projects/tty/contrib/binutils/ld/fdl.texi#1 branch .. //depot/projects/tty/contrib/binutils/ld/gen-doc.texi#2 integrate .. //depot/projects/tty/contrib/binutils/ld/genscripts.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ld/h8-doc.texi#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ld.1#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ld.h#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ld.texinfo#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldcref.c#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldctor.c#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldctor.h#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldemul.c#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldemul.h#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldexp.c#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldexp.h#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldfile.c#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldfile.h#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldgram.y#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldint.texinfo#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldlang.c#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldlang.h#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldlex.h#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldlex.l#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldmain.c#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldmain.h#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldmisc.c#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldmisc.h#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldver.c#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldver.h#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldver.texi#1 branch .. //depot/projects/tty/contrib/binutils/ld/ldwrite.c#2 integrate .. //depot/projects/tty/contrib/binutils/ld/ldwrite.h#2 integrate .. //depot/projects/tty/contrib/binutils/ld/lexsup.c#2 integrate .. //depot/projects/tty/contrib/binutils/ld/mri.c#2 integrate .. //depot/projects/tty/contrib/binutils/ld/mri.h#2 integrate .. //depot/projects/tty/contrib/binutils/ld/pe-dll.c#2 integrate .. //depot/projects/tty/contrib/binutils/ld/pe-dll.h#2 integrate .. //depot/projects/tty/contrib/binutils/ld/scripttempl/armcoff.sc#2 integrate .. //depot/projects/tty/contrib/binutils/ld/scripttempl/elf.sc#2 integrate .. //depot/projects/tty/contrib/binutils/ld/scripttempl/pe.sc#2 integrate .. //depot/projects/tty/contrib/binutils/ld/sysdep.h#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/ChangeLog#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/Makefile.in#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/README#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/aclocal.m4#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/argv.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/asprintf.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/calloc.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/config.in#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/config.table#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/configure#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/copysign.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/cp-demangle.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/cp-demangle.h#1 branch .. //depot/projects/tty/contrib/binutils/libiberty/cp-demint.c#1 branch .. //depot/projects/tty/contrib/binutils/libiberty/cplus-dem.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/fibheap.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/floatformat.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/functions.texi#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/getcwd.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/getpwd.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/hashtab.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/hex.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/lbasename.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/libiberty.texi#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/lrealpath.c#1 branch .. //depot/projects/tty/contrib/binutils/libiberty/maint-tool#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/make-relative-prefix.c#1 branch .. //depot/projects/tty/contrib/binutils/libiberty/md5.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/memchr.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/memcmp.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/memcpy.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/memmove.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/memset.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/physmem.c#1 branch .. //depot/projects/tty/contrib/binutils/libiberty/regex.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/rename.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/safe-ctype.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/sigsetmask.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/splay-tree.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/strcasecmp.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/strdup.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/strerror.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/strncasecmp.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/strncmp.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/strsignal.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/strstr.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/vasprintf.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/vfprintf.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/vprintf.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/vsprintf.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/xatexit.c#2 integrate .. //depot/projects/tty/contrib/binutils/libiberty/xmalloc.c#2 integrate .. //depot/projects/tty/contrib/binutils/libtool.m4#2 integrate .. //depot/projects/tty/contrib/binutils/ltcf-c.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ltcf-cxx.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ltcf-gcj.sh#2 integrate .. //depot/projects/tty/contrib/binutils/ltconfig#2 integrate .. //depot/projects/tty/contrib/binutils/missing#2 integrate .. //depot/projects/tty/contrib/binutils/mkinstalldirs#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ChangeLog#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ChangeLog-0001#1 branch .. //depot/projects/tty/contrib/binutils/opcodes/ChangeLog-0203#1 branch .. //depot/projects/tty/contrib/binutils/opcodes/Makefile.am#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/Makefile.in#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/aclocal.m4#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/alpha-opc.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/arc-opc.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/arm-dis.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/arm-opc.h#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/cgen-asm.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/cgen-asm.in#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/cgen-dis.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/cgen-dis.in#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/cgen-ibld.in#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/cgen-opc.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/cgen.sh#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/config.in#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/configure#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/configure.in#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/dep-in.sed#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/dis-buf.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/dis-init.c#1 branch .. //depot/projects/tty/contrib/binutils/opcodes/disassemble.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/i386-dis.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ia64-asmtab.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ia64-dis.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ia64-gen.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ia64-ic.tbl#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ia64-opc-a.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ia64-opc-b.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ia64-opc-d.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ia64-opc-f.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ia64-opc-i.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ia64-opc-m.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ia64-opc-x.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ia64-opc.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ia64-opc.h#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ia64-raw.tbl#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ia64-waw.tbl#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/po/Make-in#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/po/POTFILES.in#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/po/opcodes.pot#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ppc-dis.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ppc-opc.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/s390-dis.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/s390-mkopc.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/s390-opc.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/s390-opc.txt#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/sh-dis.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/sh-opc.h#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/sparc-dis.c#2 integrate .. //depot/projects/tty/contrib/binutils/opcodes/sparc-opc.c#2 integrate .. //depot/projects/tty/contrib/binutils/symlink-tree#2 integrate .. //depot/projects/tty/contrib/bsnmp/FREEBSD-Xlist#2 integrate .. //depot/projects/tty/contrib/bsnmp/NEWS#3 integrate .. //depot/projects/tty/contrib/bsnmp/VERSION#3 integrate .. //depot/projects/tty/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/tty/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/gensnmptree/gensnmptree.1#3 integrate .. //depot/projects/tty/contrib/bsnmp/gensnmptree/gensnmptree.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/lib/asn1.3#3 integrate .. //depot/projects/tty/contrib/bsnmp/lib/asn1.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/lib/asn1.h#3 integrate .. //depot/projects/tty/contrib/bsnmp/lib/bsnmpagent.3#3 integrate .. //depot/projects/tty/contrib/bsnmp/lib/bsnmpclient.3#3 integrate .. //depot/projects/tty/contrib/bsnmp/lib/bsnmplib.3#3 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmp.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmp.h#3 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmpagent.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmpagent.h#3 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmpclient.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmpclient.h#3 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmppriv.h#3 integrate .. //depot/projects/tty/contrib/bsnmp/lib/support.c#1 branch .. //depot/projects/tty/contrib/bsnmp/lib/support.h#1 branch .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII.h#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_ifmib.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_ifstack.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_ip.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_route.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_tcp.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_tree.def#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_udp.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/snmp_mibII.3#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/snmp_mibII.h#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 18 22:16:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6552316A4D0; Sat, 18 Sep 2004 22:16:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E4C616A4CE for ; Sat, 18 Sep 2004 22:16:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A1FB43D1F for ; Sat, 18 Sep 2004 22:16:34 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8IMGYj8051127 for ; Sat, 18 Sep 2004 22:16:34 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8IMGXft051124 for perforce@freebsd.org; Sat, 18 Sep 2004 22:16:33 GMT (envelope-from marcel@freebsd.org) Date: Sat, 18 Sep 2004 22:16:33 GMT Message-Id: <200409182216.i8IMGXft051124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 61774 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Sep 2004 22:16:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=61774 Change 61774 by marcel@marcel_nfs on 2004/09/18 22:16:26 IFC @61772 Affected files ... .. //depot/projects/tty/contrib/amd/conf/trap/trap_default.h#2 integrate .. //depot/projects/tty/etc/rc.d/ntpdate#3 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 integrate .. //depot/projects/tty/sbin/geom/class/mirror/gmirror.8#2 integrate .. //depot/projects/tty/share/man/man4/polling.4#6 integrate .. //depot/projects/tty/share/man/man9/Makefile#9 integrate .. //depot/projects/tty/sys/boot/i386/boot2/boot2.c#8 integrate .. //depot/projects/tty/sys/boot/ia64/skiload/start.S#2 integrate .. //depot/projects/tty/sys/boot/pc98/boot2/Makefile#5 integrate .. //depot/projects/tty/sys/dev/fxp/if_fxp.c#12 integrate .. //depot/projects/tty/sys/dev/md/md.c#12 integrate .. //depot/projects/tty/sys/dev/re/if_re.c#7 integrate .. //depot/projects/tty/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/tty/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/tty/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/tty/sys/dev/zs/zs.c#10 integrate .. //depot/projects/tty/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/tty/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/tty/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/tty/sys/geom/vinum/geom_vinum_raid5.c#2 integrate .. //depot/projects/tty/sys/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/tty/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/tty/sys/geom/vinum/geom_vinum_state.c#2 integrate .. //depot/projects/tty/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/tty/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/tty/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/tty/sys/kern/tty.c#11 integrate .. //depot/projects/tty/sys/net/if.c#10 integrate .. //depot/projects/tty/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#2 integrate .. //depot/projects/tty/usr.sbin/flowctl/Makefile#2 integrate .. //depot/projects/tty/usr.sbin/flowctl/flowctl.8#1 branch .. //depot/projects/tty/usr.sbin/sysinstall/menus.c#12 integrate Differences ... ==== //depot/projects/tty/contrib/amd/conf/trap/trap_default.h#2 (text+ko) ==== ==== //depot/projects/tty/etc/rc.d/ntpdate#3 (text+ko) ==== ==== //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.776 2004/09/16 17:18:55 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.778 2004/09/18 18:42:33 bmah Exp $ 2000 @@ -229,37 +229,6 @@ has been added. This improves the performance of SMP machines and is enabled by default on the i386. - The &man.acpi.asus.4; driver has been added - to use ACPI-controlled hardware features, such as hot keys and - LEDs on ASUSTek laptops. - - The &man.acpi.panasonic.4; driver has been added - to support hot keys of Panasonic laptops. It now supports - Let's note (or Toughbook, outside Japan) CF-R1N, CF-R2A, and - CF-R3. - - The &man.acpi.toshiba.4; driver has been added - to use Toshiba's Hardware Control Interface to manipulate - certain hardware features on Toshiba laptops, such as - video output switching. - - The &man.acpi.video.4; driver has been added to provide - control display switching and backlight brightness using the - ACPI Video Extensions. - - The &man.acpi.4; driver now supports - per-device sysctls (dev.root0.nexus0.acpi0.acpi_lid0.wake, - for instance) to allow users to set whether or not a given - device can wake the system. - - The &man.acpi.4; driver will now - be disabled automatically when the machine has a well-known broken BIOS. - This behavior can be overridden by setting the loader tunable - hint.acpi.0.disabled to 0. - - The &man.agp.4; driver now supports the AMD64 graphics - aperture relocation table (GART). - The &man.bus.dma.9; interface now supports transparently honoring the alignment and boundary constraints in the DMA tag when loading buffers, and bus_dmamap_load() @@ -273,43 +242,11 @@ by setting a sysctl vm.old_contigmalloc. More details can be found in the &man.contigmalloc.9; manual page. - The &man.ctau.4; driver has been added for Cronyx Tau - synchronous serial adapters. This driver was known for a long time as - ct in its previous life outside the &os; source tree. &merged; - - - The driver name has changed, but the network interface still - has the ct name. - - - - The &man.cp.4; driver has been added for Cronyx Tau-PCI - synchronous serial adapters. - - The &man.devfs.5; path rules now work correctly on directories. - The dgb - (DigiBoard intelligent serial card) driver has been - removed due to breakage. Its replacement is the &man.digi.4; driver, - which supports all the hardware of the dgb - driver. - The &man.getvfsent.3; API has been removed. - The &man.hme.4; driver now natively supports - long frames, so it can be used for &man.vlan.4; with full Ethernet - MTU size. - - The &man.hme.4; driver now supports - TCP/UDP Transmit/Receive checksum offload. - Since &man.hme.4; does not compensate the checksum - for UDP datagram which can yield to 0x0, - UDP transmit checksum offload is disabled by default. - This can be reactivated by setting the special link - option with &man.ifconfig.8;. - The hw.pci.allow_unsupported_io_range loader tunable has been removed. @@ -399,10 +336,6 @@ Linux binaries on amd64 has been added. This feature is enabled with the COMPAT_LINUX32 kernel option. - The loran - (Loran-C receiver) driver has been removed due to - breakage and lack of maintainership. - A new kernel option MAC_STATIC which disables internal MAC Framework synchronization protecting against dynamic load and unload of MAC policies, has been added. @@ -472,58 +405,43 @@ A loader tunable debug.mpsafevm has been enabled by default. - The &man.nmdm.4; driver has been rewritten to improve its reliability. - - The raid(4) driver - (RAIDframe disk driver from NetBSD) has been removed. - It is currently non-functional, and would require some amount of work - to make it work under the &man.geom.4; API in 5-CURRENT. - - An entry of the &man.pcic.4; driver has been removed from a - kernel configuration file for GENERIC kernel because - this is no longer maintained. The entry had actually - been commented out for a long time. - A new kernel option PREEMPTION has been added. This allows the threads that are in the kernel to be preempted by higher priority threads. It helps with interactivity and allows interrupt threads to run sooner rather than waiting. - The &man.psm.4; driver and &man.moused.8; - now support the Synaptics TouchPad. - - The &man.sab.4; driver now supports the - BREAK_TO_DEBUGGER kernel option. - - The sx driver, - which supports Specialix I/O8+ and I/O4+ - intelligent multiport serial controllers, has been added. - A devclass level has been added to the dev sysctl tree, in order to support per-class variables in addition to per-device variables. This means that dev.foo0.bar is now called dev.foo.0.bar, and it is possible to to have dev.foo.bar as well. + A new sysctl, kern.always_console_output, + has been added. It makes output from the kernel go to the console despite + the use of TIOCCONS. + A sysctl kern.sched.name which has the name of the scheduler currently in use, has been added, and the kern.quantum sysctl has been moved to kern.sched.quantum for consistency. - For the &man.uart.4; device, - the hw.uart.console and - hw.uart.dbgport kernel environment variables - have been added. They can be used to select a serial console and - debug port respectively, as well as the attributes. + The &man.pci.4; bus resource and power management have + been updated. - The &man.ubser.4; device driver has been added to support - BWCT console management serial adapters. + + Although the &man.pci.4; bus power state management + has been enabled by default, it may cause problems on some systems. + This can be disabled by setting the tunable + hw.pci.do_powerstate to + 0. + + The ULE scheduler has been added as an additional scheduler. Note that the conventional one, which is called 4BSD, is still used - as the default schedular in GENERIC kernel. + as the default scheduler in GENERIC kernel. For the average user, interactivity is reported to be better in many cases. This means less skipping and jerking in @@ -536,13 +454,6 @@ kernel locking continues, the scheduler will be able to make more efficient use of the available parallel resources. - &man.ucycom.4; driver has been added for - the Cypress CY7C637xx and CY7C640/1xx families of USB to RS232 bridges, - such as the one found in the DeLorme Earthmate USB GPS - receiver (which is the only device currently supported by this driver). - This driver is not complete because there is no support yet for flow - control and output. - A linear search algorithm used in &man.vm.map.findspace.9; has been replaced with an O(log n) algorithm built into the map entry splay tree. @@ -555,25 +466,6 @@ - The device driver infrastructure (as well as many drivers) - have been updated. Among the changes: Many more drivers now use - automatically-assigned major numbers (instead of the old static - major numbers). Enhanced functions to support cloning of - pseudo-devices. Several changes to the driver API, including a - new d_version field in struct - cdevsw. Note that third-party device drivers will - require recompiling after this change. - - The pseudo-interface cloning has been updated and - the match function to allow creation of &man.stf.4; - interfaces named stf0, - stf, or 6to4. - Note that this breaks backward compatibility; for example, - ifconfig stf now creates - the interface named stf, - not stf0, and does not print - stf0 to stdout. - The &os; dynamic and static linker now support Thread Local Storage (TLS), a GCC feature which supports a __thread modifier @@ -604,13 +496,118 @@ kernel with the Intel C/C++ Compiler (as in the lang/icc port). + + Boot Loader Changes + + A serial console-capable version of + boot0 has been added. It can be written + to a disk using &man.boot0cfg.8; and specifying + /boot/boot0sio as the argument to the + option. + + cdboot now works around a + BIOS problem observed on some systems when booting from USB + CDROM drives. + + + + + - Platform-Specific Hardware Support + Hardware Support + + The &man.acpi.asus.4; driver has been added + to use ACPI-controlled hardware features, such as hot keys and + LEDs on ASUSTek laptops. + + The &man.acpi.panasonic.4; driver has been added + to support hot keys of Panasonic laptops. It now supports + Let's note (or Toughbook, outside Japan) CF-R1N, CF-R2A, and + CF-R3. + + The &man.acpi.toshiba.4; driver has been added + to use Toshiba's Hardware Control Interface to manipulate + certain hardware features on Toshiba laptops, such as + video output switching. + + The &man.acpi.video.4; driver has been added to provide + control display switching and backlight brightness using the + ACPI Video Extensions. + + The &man.acpi.4; driver now supports + per-device sysctls (dev.root0.nexus0.acpi0.acpi_lid0.wake, + for instance) to allow users to set whether or not a given + device can wake the system. + + The &man.acpi.4; driver will now + be disabled automatically when the machine has a well-known broken BIOS. + This behavior can be overridden by setting the loader tunable + hint.acpi.0.disabled to 0. + + The &man.agp.4; driver now supports the AMD64 graphics + aperture relocation table (GART). + + The &man.ctau.4; driver has been added for Cronyx Tau + synchronous serial adapters. This driver was known for a long time as + ct in its previous life outside the &os; source tree. &merged; + + + The driver name has changed, but the network interface still + has the ct name. + + + + The &man.cp.4; driver has been added for Cronyx Tau-PCI + synchronous serial adapters. + + The dgb + (DigiBoard intelligent serial card) driver has been + removed due to breakage. Its replacement is the &man.digi.4; driver, + which supports all the hardware of the dgb + driver. + + The &man.nmdm.4; driver has been rewritten to improve its reliability. + + The raid(4) driver + (RAIDframe disk driver from NetBSD) has been removed. + It is currently non-functional, and would require some amount of work + to make it work under the &man.geom.4; API in 5-CURRENT. + + An entry of the &man.pcic.4; driver has been removed from a + kernel configuration file for GENERIC kernel because + this is no longer maintained. The entry had actually + been commented out for a long time. + + The &man.psm.4; driver and &man.moused.8; + now support the Synaptics TouchPad. The entropy device &man.random.4; now supports a hardware random number generator (RNG) in the VIA C3 Nehemiah (Stepping 3 and above) CPU. + The &man.sab.4; driver now supports the + BREAK_TO_DEBUGGER kernel option. + + The sx driver, + which supports Specialix I/O8+ and I/O4+ + intelligent multiport serial controllers, has been added. + + For the &man.uart.4; device, + the hw.uart.console and + hw.uart.dbgport kernel environment variables + have been added. They can be used to select a serial console and + debug port respectively, as well as the attributes. + + The &man.ubser.4; device driver has been added to support + BWCT console management serial adapters. + + &man.ucycom.4; driver has been added for + the Cypress CY7C637xx and CY7C640/1xx families of USB to RS232 bridges, + such as the one found in the DeLorme Earthmate USB GPS + receiver (which is the only device currently supported by this driver). + This driver is not complete because there is no support yet for flow + control and output. + Several old drivers for ISA cards have been removed, including the asc driver for GI1904-based hand scanners, @@ -629,150 +626,152 @@ sasc and sgsc has also been removed. - A new sysctl, kern.always_console_output, - has been added. It makes output from the kernel go to the console despite - the use of TIOCCONS. - + The device driver infrastructure (as well as many drivers) + have been updated. Among the changes: Many more drivers now use + automatically-assigned major numbers (instead of the old static + major numbers). Enhanced functions to support cloning of + pseudo-devices. Several changes to the driver API, including a + new d_version field in struct + cdevsw. Note that third-party device drivers will + require recompiling after this change. - - Boot Loader Changes + + Multimedia Support - A serial console-capable version of - boot0 has been added. It can be written - to a disk using &man.boot0cfg.8; and specifying - /boot/boot0sio as the argument to the - option. + The meteor (video capture) + driver has been removed due to + breakage and lack of maintainership. - cdboot now works around a - BIOS problem observed on some systems when booting from USB - CDROM drives. + The Direct Rendering Manager (DRM) code has been updated + from the DRI Project CVS tree as of 26 May, 2004. This update + includes new PCI IDs and a new packet for Radeon. - + The drivers for various sound cards has been reorganized; + device sound is the generic sound driver, + and device snd_* are device-specific sound drivers now. + The midi driver, which supports serial port + and several sound cards, has been removed. + More details can be found in related manual pages: + &man.sound.4;, &man.snd.ad1816.4;, &man.snd.als4000.4;, &man.snd.cmi.4;, + &man.snd.cs4281.4;, &man.snd.csa.4;, &man.snd.ds1.4;, &man.snd.emu10k1.4;, + &man.snd.es137x.4;, &man.snd.gusc.4;, &man.snd.maestro3.4;, + &man.snd.sbc.4;, &man.snd.solo.4;, and &man.snd.uaudio.4;. - + The &man.sound.4; (formerly &man.pcm.4;) driver has been modified to read + /boot/device.hints on startup, to allow setting + of default values for mixer channels. + Note that currently the device driver's name used in + /boot/device.hints is still pcm. + More detailed information and examples can be found in the &man.sound.4; + manual page. + - - Network Interface Support + + Network Interface Support - The &man.arl.4; driver, which supports - Aironet Arlan 655 wireless adapters has been added. &merged; + The &man.arl.4; driver, which supports + Aironet Arlan 655 wireless adapters has been added. &merged; - The &man.dc.4; driver now supports sparc64 - Davicom cards that store their MAC address in - Open Firmware. + The &man.dc.4; driver now supports sparc64 + Davicom cards that store their MAC address in + Open Firmware. - A short hiccup in the &man.em.4; driver during parameter - reconfiguration, has been fixed. &merged; + A short hiccup in the &man.em.4; driver during parameter + reconfiguration, has been fixed. &merged; - The &man.fwip.4; driver, which supports IP over FireWire has been added. - Note that currently the broadcast channel number is hardwired and - MCAP for multicast channel allocation is not supported. - This driver is intended to conform to the RFC 2734 and RFC 3146 - standard for IP over FireWire and eventually replace - the &man.fwe.4; driver. + The &man.fwip.4; driver, which supports IP over FireWire has been added. + Note that currently the broadcast channel number is hardwired and + MCAP for multicast channel allocation is not supported. + This driver is intended to conform to the RFC 2734 and RFC 3146 + standard for IP over FireWire and eventually replace + the &man.fwe.4; driver. - &man.fxp.4; now uses the device sysctl tree such as - dev.fxp0, and those sysctls can be set - on a per-device basis. + &man.fxp.4; now uses the device sysctl tree such as + dev.fxp0, and those sysctls can be set + on a per-device basis. - &man.fxp.4; now provides actual control over its capability - to receive extended Ethernet frames, indicated by the VLAN_MTU interface capability. - It can be toggled from userland with the aid of the - and options - to &man.ifconfig.8;. + &man.fxp.4; now provides actual control over its capability + to receive extended Ethernet frames, indicated by the + VLAN_MTU interface capability. + It can be toggled from userland with the aid of the + and options + to &man.ifconfig.8;. - The hea - (Efficient Networks, Inc. ENI-155p ATM adapter) - driver has been removed due to breakage. Its functionality - has been subsumed into the &man.en.4; driver. + The hea + (Efficient Networks, Inc. ENI-155p ATM adapter) + driver has been removed due to breakage. Its functionality + has been subsumed into the &man.en.4; driver. - The &man.ixgb.4; driver, which supports - Intel PRO/10GBE 10 Gigabit Ethernet cards, has been - added. &merged; + The &man.hme.4; driver now natively supports + long frames, so it can be used for &man.vlan.4; with full Ethernet + MTU size. - The lmc - (LAN Media Corp. PCI WAN adapter) driver has been - removed due to breakage and lack of maintainership. + The &man.hme.4; driver now supports + TCP/UDP Transmit/Receive checksum offload. + Since &man.hme.4; does not compensate the checksum + for UDP datagram which can yield to 0x0, + UDP transmit checksum offload is disabled by default. + This can be reactivated by setting the special link + option with &man.ifconfig.8;. - &os; now provides a binary compatibility layer - for using µsoft.windows; NDIS drivers for network - adapters under &os;/i386. It includes a relocator/linker for - &windows; .SYS files to interface with - the &os; kernel and emulates various parts of the NDIS API - using native &os; kernel functions. This system supports PCI - (&man.pci.4;) and CardBus (&man.cardbus.4;) network devices, - and is designed principally for - Ethernet and wireless network interfaces. - For more information, see the &man.ndis.4; and - &man.ndiscvt.8; manual pages. + The &man.ixgb.4; driver, which supports + Intel PRO/10GBE 10 Gigabit Ethernet cards, has been + added. &merged; - The &man.ng.atmllc.4; Netgraph node type, which handles - RFC 1483 ATM LLC encapsulation, has been added. + The lmc + (LAN Media Corp. PCI WAN adapter) driver has been + removed due to breakage and lack of maintainership. - The &man.ng.hub.4; Netgraph node type, which supports - a simple packet distribution that acts like an Ethernet hub, - has been added. &merged; + The loran + (Loran-C receiver) driver has been removed due to + breakage and lack of maintainership. - The &man.ng.rfc1490.4; Netgraph node type now supports - Cisco style encapsulation, which is often used alongside - RFC 1490 in frame relay links. + &os; now provides a binary compatibility layer + for using µsoft.windows; NDIS drivers for network + adapters under &os;/i386. It includes a relocator/linker for + &windows; .SYS files to interface with + the &os; kernel and emulates various parts of the NDIS API + using native &os; kernel functions. This system supports PCI + (&man.pci.4;) and CardBus (&man.cardbus.4;) network devices, + and is designed principally for + Ethernet and wireless network interfaces. + For more information, see the &man.ndis.4; and + &man.ndiscvt.8; manual pages. - The &man.ng.sppp.4; Netgraph node type, which is a &man.netgraph.4 - interface to the original &man.sppp.4 network module for synchronous - lines, has been added. + A bug that prevents VLAN support in the &man.nge.4; driver + from working has been fixed. &merged; - A new Netgraph method has been added to restore some - behavior lost in the change from 4.X style &man.ng.tee.4; - Netgraph nodes. + Several bugs related to &man.polling.4; support + in the &man.rl.4; driver have been fixed. &merged; - The &man.ng.vlan.4; Netgraph node type, which supports - IEEE 802.1Q VLAN tagging, has been added. &merged; + Several bugs related to multicast and promiscuous mode + handling in the &man.sk.4; driver have been fixed. - A bug that prevents VLAN support in the &man.nge.4; driver - from working has been fixed. &merged; + The &man.ste.4; driver now supports &man.polling.4;. + &merged; - The &man.pci.4; bus resource and power management have - been updated. + The &man.udav.4; driver has been added. It provides + support for USB Ethernet adapters based on the Davicom DM9601 + chipset. - - Although the &man.pci.4; bus power state management - has been enabled by default, it may cause problems on some systems. - This can be disabled by setting the tunable - hw.pci.do_powerstate to - 0. - - + &man.vge.4; driver, which supports + the VIA Networking Technologies + VT6122 Gigabit Ethernet chip and integrated 10/100/1000 copper PHY, + has been added. - Several bugs related to &man.polling.4; support - in the &man.rl.4; driver have been fixed. &merged; + The &man.vr.4; driver now supports &man.polling.4;. &merged; - Several bugs related to multicast and promiscuous mode - handling in the &man.sk.4; driver have been fixed. + The hardware TX checksum support in the &man.xl.4; driver + has been disabled as it does not work correctly and slows down + the transmission rate. &merged; - The &man.ste.4; driver now supports &man.polling.4;. - &merged; - - The &man.udav.4; driver has been added. It provides - support for USB Ethernet adapters based on the Davicom DM9601 - chipset. - - &man.vge.4; driver, which supports - the VIA Networking Technologies - VT6122 Gigabit Ethernet chip and integrated 10/100/1000 copper PHY, - has been added. - - The &man.vr.4; driver now supports &man.polling.4;. &merged; - - The hardware TX checksum support in the &man.xl.4; driver - has been disabled as it does not work correctly and slows down - the transmission rate. &merged; - - Interface &man.polling.4; support - can now be enabled on a per-interface basis. All of the network drivers that support &man.polling.4; - (&man.dc.4;, &man.fxp.4;, &man.em.4;, &man.nge.4;, &man.re.4;, - &man.rl.4;, &man.sis.4;, &man.ste.4;, and &man.vr.4;) - now also support this capability and it can be controlled - via &man.ifconfig.8;. &merged; + Interface &man.polling.4; support + can now be enabled on a per-interface basis. All of the network drivers that support &man.polling.4; + (&man.dc.4;, &man.fxp.4;, &man.em.4;, &man.nge.4;, &man.re.4;, + &man.rl.4;, &man.sis.4;, &man.ste.4;, and &man.vr.4;) + now also support this capability and it can be controlled + via &man.ifconfig.8;. &merged; + @@ -841,6 +840,28 @@ This allows &man.natd.8; to be bound to different network interfaces and sharing of load. + The &man.ng.atmllc.4; Netgraph node type, which handles + RFC 1483 ATM LLC encapsulation, has been added. + + The &man.ng.hub.4; Netgraph node type, which supports + a simple packet distribution that acts like an Ethernet hub, + has been added. &merged; + + The &man.ng.rfc1490.4; Netgraph node type now supports + Cisco style encapsulation, which is often used alongside + RFC 1490 in frame relay links. + + The &man.ng.sppp.4; Netgraph node type, which is a &man.netgraph.4 + interface to the original &man.sppp.4 network module for synchronous + lines, has been added. + + A new Netgraph method has been added to restore some + behavior lost in the change from 4.X style &man.ng.tee.4; + Netgraph nodes. + + The &man.ng.vlan.4; Netgraph node type, which supports + IEEE 802.1Q VLAN tagging, has been added. &merged; + PFIL_HOOKS support is now always compiled into the kernel, and the associated kernel compile options have been removed. All of the packet filter subsystems @@ -855,6 +876,16 @@ in RFC 1989, allows PPP to keep track of the quality of a running connection. &merged; + The pseudo-interface cloning has been updated and + the match function to allow creation of &man.stf.4; + interfaces named stf0, + stf, or 6to4. + Note that this breaks backward compatibility; for example, + ifconfig stf now creates + the interface named stf, + not stf0, and does not print + stf0 to stdout. + The following TCP features are now enabled by default: RFC 3042 (Limited Retransmit), RFC 3390 (increased initial congestion window sizes), TCP bandwidth-delay product @@ -901,7 +932,6 @@ 2018 have been added. This improves TCP performance over connections with heavy packet loss. SACK can be enabled with the sysctl net.inet.tcp.sack.enable. - @@ -934,45 +964,6 @@ A bug of the automatic density selection code in the &man.fd.4; driver has been fixed. - The &man.ips.4; driver now supports the recent - Adaptec ServeRAID series SCSI controller cards. - - A bug in the &man.isp.4; driver - which prevents the cards on SBus from working correctly, - has been fixed. - - The &man.twa.4; driver, which supports - 3ware's 9000 series PATA/SATA RAID controllers has been added. &merged; - - The &man.umass.4; driver now supports the missing - ATAPI MMC commands and handles the timeout properly. &merged; - - The &man.vinum.4; volume manager, has been updated to use - &man.geom.4;, the 5.x disk I/O request transformation framework. - A gvinum userland utility has been added. - - The &man.esp.4; device driver has been - ported from NetBSD to support the SBus SCSI card in Sun Ultra - 1e and 2 machines. - - Support for LSI-type software RAID has been added. - - - - - File Systems - - The autofs(9) file system and the userland library - &man.libautofs.3; have been added. - - The EXT2FS file system code now includes partial support - for large (> 4GB) files. This support is partial in that - it will refuse to create large files on file systems that have - not been upgraded to EXT2_DYN_REV or that - do not have the - EXT2_FEATURE_RO_COMPAT_LARGE_FILE flag set - in the superblock. - A bug in &man.geom.4; that could result in I/O hangs in some rare cases has been fixed. @@ -1036,20 +1027,51 @@ cooperation between &man.vinum.4; and &man.geom.4; has been added. + The &man.ips.4; driver now supports the recent + Adaptec ServeRAID series SCSI controller cards. + + A bug in the &man.isp.4; driver + which prevents the cards on SBus from working correctly, + has been fixed. + + The &man.twa.4; driver, which supports + 3ware's 9000 series PATA/SATA RAID controllers has been added. &merged; + + The &man.umass.4; driver now supports the missing + ATAPI MMC commands and handles the timeout properly. &merged; + + The &man.vinum.4; volume manager, has been updated to use + &man.geom.4;, the 5.x disk I/O request transformation framework. + A gvinum userland utility has been added. + + The &man.esp.4; device driver has been + ported from NetBSD to support the SBus SCSI card in Sun Ultra + 1e and 2 machines. + + Support for LSI-type software RAID has been added. + + + + + File Systems + + The autofs(9) file system and the userland library + &man.libautofs.3; have been added. + + The EXT2FS file system code now includes partial support + for large (> 4GB) files. This support is partial in that + it will refuse to create large files on file systems that have + not been upgraded to EXT2_DYN_REV or that + do not have the + EXT2_FEATURE_RO_COMPAT_LARGE_FILE flag set + in the superblock. + A panic in the NFSv4 client has been fixed; this occurred when attempting operations against an NFSv3/NFSv2-only server. - The SMBFS client now has support for SMB request signing, - which prevents man in the middle attacks and is - required in order to connect to Windows 2003 servers in their - default configuration. As signing each message imposes a - significant performance penalty, this feature is only enabled - if the server requires it; this may eventually become an - option to &man.mount.smbfs.8;. - The MSDOSFS_LARGE kernel option - has been added to support for FAT32 file systems bigger + has been added to support FAT32 file systems bigger than 128GB. This option is disabled by default. It uses at least 32 bytes of kernel memory for each file on disk; furthermore it is only safe to use in certain @@ -1057,37 +1079,14 @@ with less than 1 million files and so on. Exporting these large file systems over NFS is not supported. - - - Multimedia Support - - The meteor (video capture) - driver has been removed due to - breakage and lack of maintainership. - - The Direct Rendering Manager (DRM) code has been updated - from the DRI Project CVS tree as of 26 May, 2004. This update - includes new PCI IDs and a new packet for Radeon. - - The drivers for various sound cards has been reorganized; - device sound is the generic sound driver, - and device snd_* are device-specific sound drivers now. - The midi driver, which supports serial port - and several sound cards, has been removed. - More details can be found in related manual pages: - &man.sound.4;, &man.snd.ad1816.4;, &man.snd.als4000.4;, &man.snd.cmi.4;, - &man.snd.cs4281.4;, &man.snd.csa.4;, &man.snd.ds1.4;, &man.snd.emu10k1.4;, - &man.snd.es137x.4;, &man.snd.gusc.4;, &man.snd.maestro3.4;, - &man.snd.sbc.4;, &man.snd.solo.4;, and &man.snd.uaudio.4;. - - The &man.sound.4; (formerly &man.pcm.4;) driver has been modified to read - /boot/device.hints on startup, to allow setting - of default values for mixer channels. - Note that currently the device driver's name used in - /boot/device.hints is still pcm. - More detailed information and examples can be found in the &man.sound.4; - manual page. + The SMBFS client now has support for SMB request signing, + which prevents man in the middle attacks and is + required in order to connect to Windows 2003 servers in their + default configuration. As signing each message imposes a + significant performance penalty, this feature is only enabled + if the server requires it; this may eventually become an + option to &man.mount.smbfs.8;. ==== //depot/projects/tty/sbin/geom/class/mirror/gmirror.8#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/mirror/gmirror.8,v 1.4 2004/08/18 16:37:04 pjd Exp $ +.\" $FreeBSD: src/sbin/geom/class/mirror/gmirror.8,v 1.5 2004/09/18 19:02:10 pjd Exp $ .\" .Dd Jul 9, 2004 .Dt GMIRROR 8 @@ -58,7 +58,8 @@ .Op Ar prov Op Ar ... .Nm .Cm insert -.Op Fl hipv +.Op Fl hiv +.Op Fl p Ar priority .Ar name .Ar prov .Op Ar prov Op Ar ... @@ -182,12 +183,12 @@ Add the given component(s) to the existing mirror. .Pp Additional options include: -.Bl -tag -width ".Fl h" +.Bl -tag -width ".Fl p Ar priority" .It Fl h Hardcode providers' names in metadata. .It Fl i Mark component(s) as inacitve immediatelly after insertion. -.It Fl p +.It Fl p Ar priority Specifies priority of the given component(s). .El .It Cm remove ==== //depot/projects/tty/share/man/man4/polling.4#6 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/polling.4,v 1.12 2004/09/05 14:47:10 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/polling.4,v 1.13 2004/09/18 12:33:01 brueffer Exp $ .\" .Dd April 5, 2004 .Dt POLLING 4 @@ -36,10 +36,9 @@ .Sh DESCRIPTION Device polling .Nm ( -for brevity) refers to a technique to -handle devices that does not rely on the latter to generate -interrupts when they need attention, but rather lets the CPU poll -devices to service their needs. +for brevity) refers to a technique that +lets the operating system periodically poll devices, instead of +relying on the devices to generate interrupts when they need attention. This might seem inefficient and counterintuitive, but when done properly, .Nm ==== //depot/projects/tty/share/man/man9/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.240 2004/09/17 07:24:18 brooks Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.241 2004/09/18 19:04:24 jmg Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -590,6 +590,49 @@ mbpool.9 mbp_get.9 \ mbpool.9 mbp_get_keep.9 \ mbpool.9 mbp_sync.9 +MLINKS+=mbuf.9 MCHTYPE.9 \ + mbuf.9 MCLGET.9 \ + mbuf.9 MEXTADD.9 \ + mbuf.9 MEXTFREE.9 \ + mbuf.9 MEXT_ADD_REF.9 \ + mbuf.9 MEXT_IS_REF.9 \ + mbuf.9 MEXT_REM_REF.9 \ + mbuf.9 MFREE.9 \ + mbuf.9 MGET.9 \ + mbuf.9 MGETHDR.9 \ + mbuf.9 MH_ALIGN.9 \ + mbuf.9 M_ALIGN.9 \ + mbuf.9 M_LEADINGSPACE.9 \ + mbuf.9 M_MOVE_PKTHDR.9 \ + mbuf.9 M_PREPEND.9 \ + mbuf.9 M_TRAILINGSPACE.9 \ + mbuf.9 M_WRITABLE.9 \ + mbuf.9 m_adj.9 \ + mbuf.9 m_apply.9 \ + mbuf.9 m_cat.9 \ + mbuf.9 m_copyback.9 \ + mbuf.9 m_copydata.9 \ + mbuf.9 m_copym.9 \ + mbuf.9 m_copypacket.9 \ + mbuf.9 m_defrag.9 \ + mbuf.9 m_devget.9 \ + mbuf.9 m_dup.9 \ + mbuf.9 m_dup_pkthdr.9 \ + mbuf.9 m_fixhdr.9 \ + mbuf.9 m_free.9 \ + mbuf.9 m_freem.9 \ + mbuf.9 m_get.9 \ + mbuf.9 m_getcl.9 \ + mbuf.9 m_getclr.9 \ + mbuf.9 m_gethdr.9 \ + mbuf.9 m_getm.9 \ + mbuf.9 m_getptr.9 \ + mbuf.9 m_length.9 \ + mbuf.9 m_move_pkthdr.9 \ + mbuf.9 m_prepend.9 \ + mbuf.9 m_pullup.9 \ + mbuf.9 m_split.9 \ + mbuf.9 mtod.9 MLINKS+=MD5.9 MD5Init.9 \ MD5.9 MD5Transform.9 MLINKS+=mdchain.9 md_append_record.9 \ ==== //depot/projects/tty/sys/boot/i386/boot2/boot2.c#8 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.70 2004/07/30 00:33:09 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.71 2004/09/18 02:07:00 jhb Exp $"); #include #include @@ -321,7 +321,7 @@ return; } if (fmt == 0) { - addr = hdr.ex.a_entry & 0xffffff; + addr = hdr.ex.a_entry; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 18 22:19:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75D0A16A4D0; Sat, 18 Sep 2004 22:19:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 508BF16A4CE for ; Sat, 18 Sep 2004 22:19:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3069643D2F for ; Sat, 18 Sep 2004 22:19:38 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8IMJcNx051220 for ; Sat, 18 Sep 2004 22:19:38 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8IMJb1i051217 for perforce@freebsd.org; Sat, 18 Sep 2004 22:19:37 GMT (envelope-from marcel@freebsd.org) Date: Sat, 18 Sep 2004 22:19:37 GMT Message-Id: <200409182219.i8IMJb1i051217@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 61775 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Sep 2004 22:19:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=61775 Change 61775 by marcel@marcel_nfs on 2004/09/18 22:18:58 Diff reduction. Affected files ... .. //depot/projects/tty/contrib/amd/conf/trap/trap_default.h#3 edit Differences ... ==== //depot/projects/tty/contrib/amd/conf/trap/trap_default.h#3 (text+ko) ==== @@ -1,2 +1,3 @@ +/* $FreeBSD: src/contrib/amd/conf/trap/trap_default.h,v 1.3 2004/07/06 14:14:26 mbr Exp $ */ /* $srcdir/conf/trap/trap_default.h */ #define MOUNT_TRAP(type, mnt, flags, mnt_data) mount(type, mnt->mnt_dir, flags, mnt_data) From owner-p4-projects@FreeBSD.ORG Sat Sep 18 22:20:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FAF516A4D0; Sat, 18 Sep 2004 22:20:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0DC0316A4CE for ; Sat, 18 Sep 2004 22:20:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E32C743D31 for ; Sat, 18 Sep 2004 22:20:39 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8IMKdo8051290 for ; Sat, 18 Sep 2004 22:20:39 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8IMKdPs051287 for perforce@freebsd.org; Sat, 18 Sep 2004 22:20:39 GMT (envelope-from marcel@freebsd.org) Date: Sat, 18 Sep 2004 22:20:39 GMT Message-Id: <200409182220.i8IMKdPs051287@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 61776 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Sep 2004 22:20:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=61776 Change 61776 by marcel@marcel_nfs on 2004/09/18 22:20:34 More diff reduction. Affected files ... .. //depot/projects/tty/etc/rc.d/ntpdate#4 edit Differences ... ==== //depot/projects/tty/etc/rc.d/ntpdate#4 (text+ko) ==== @@ -1,9 +1,10 @@ #!/bin/sh # # $NetBSD: ntpdate,v 1.8 2002/03/22 04:16:39 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ntpdate,v 1.9 2004/03/29 20:00:54 des Exp $ +# $FreeBSD: src/etc/rc.d/ntpdate,v 1.11 2004/09/15 01:08:33 seanc Exp $ # +# BEFORE: ntpd # PROVIDE: ntpdate # REQUIRE: NETWORKING syslogd # KEYWORD: FreeBSD nojail From owner-p4-projects@FreeBSD.ORG Sat Sep 18 22:30:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F030416A4D1; Sat, 18 Sep 2004 22:30:52 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CB7F116A4CF for ; Sat, 18 Sep 2004 22:30:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8690B43D39 for ; Sat, 18 Sep 2004 22:30:52 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8IMUq6s051642 for ; Sat, 18 Sep 2004 22:30:52 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8IMUqmo051639 for perforce@freebsd.org; Sat, 18 Sep 2004 22:30:52 GMT (envelope-from marcel@freebsd.org) Date: Sat, 18 Sep 2004 22:30:52 GMT Message-Id: <200409182230.i8IMUqmo051639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 61777 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Sep 2004 22:30:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=61777 Change 61777 by marcel@marcel_nfs on 2004/09/18 22:30:19 Move the VGA MD files under dev/vga. I did that for ia64 already. This now has the same look-n-feel as uart(4). Affected files ... .. //depot/projects/tty/sys/alpha/alpha/vga_machdep.c#2 delete .. //depot/projects/tty/sys/dev/vga/vga_cpu_alpha.c#1 add .. //depot/projects/tty/sys/dev/vga/vga_cpu_i386.c#1 add .. //depot/projects/tty/sys/i386/i386/vga_machdep.c#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Sep 18 22:45:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 912C716A4DA; Sat, 18 Sep 2004 22:45:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 51F4E16A4D2 for ; Sat, 18 Sep 2004 22:45:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54BBA43D54 for ; Sat, 18 Sep 2004 22:45:11 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8IMjBCr051961 for ; Sat, 18 Sep 2004 22:45:11 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8IMjBjS051958 for perforce@freebsd.org; Sat, 18 Sep 2004 22:45:11 GMT (envelope-from marcel@freebsd.org) Date: Sat, 18 Sep 2004 22:45:11 GMT Message-Id: <200409182245.i8IMjBjS051958@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 61780 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Sep 2004 22:45:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=61780 Change 61780 by marcel@marcel_nfs on 2004/09/18 22:44:59 Remove KGI files for now. I'll be working on a graphical console first. When I have the time for it of course... Affected files ... .. //depot/projects/tty/sys/conf/files#17 edit .. //depot/projects/tty/sys/conf/files.alpha#10 edit .. //depot/projects/tty/sys/conf/files.i386#14 edit Differences ... ==== //depot/projects/tty/sys/conf/files#17 (text+ko) ==== @@ -403,25 +403,6 @@ dev/digi/Xe.c optional digi_Xe dev/digi/Xem.c optional digi_Xem dev/digi/Xr.c optional digi_Xr -# -dev/display/chipset/IBM/VGA-bind.c optional kgi -dev/display/chipset/IBM/VGA-meta.c optional kgi -dev/display/monitor/crt/DDC.c optional kgi -dev/display/monitor/crt/I2C.c optional kgi -dev/display/monitor/crt/crt-bind.c optional kgi -dev/display/monitor/crt/crt-meta.c optional kgi -dev/display/monitor/crt/fixed.c optional kgi -dev/display/monitor/crt/gtf.c optional kgi -dev/display/ramdac/IBM/VGA-bind.c optional kgi -dev/display/ramdac/IBM/VGA-meta.c optional kgi -dev/display/system/FreeBSD/board-bind.c optional kgi -dev/display/system/FreeBSD/monitor-crt.c optional kgi -dev/display/chipset/IBM/VGA-text-meta.c optional kgi -dev/display/clock/fixed-bind.c optional kgi -dev/display/clock/fixed-meta.c optional kgi -dev/display/clock/pll-meta.c optional kgi -dev/display/system/FreeBSD/kgim.c optional kgi -# #dev/dpt/dpt_control.c optional dpt dev/dpt/dpt_eisa.c optional dpt eisa dev/dpt/dpt_pci.c optional dpt pci @@ -550,14 +531,6 @@ dev/joy/joy.c optional joy dev/joy/joy_isa.c optional joy isa dev/joy/joy_pccard.c optional joy pccard -dev/kgi/dpy-null.c optional kgi -dev/kgi/graphic.c optional kgi -dev/kgi/kgi.c optional kgi -dev/kgi/system.c optional kgi -dev/kii/kiievt.c optional kgi -dev/kii/kiidflt.c optional kgi -dev/kii/kiisyms.c optional kgi -dev/kii/kii.c optional kgi dev/led/led.c standard dev/lge/if_lge.c optional lge dev/lnc/if_lnc.c optional lnc @@ -1743,7 +1716,6 @@ ufs/ufs/ufs_vnops.c optional ffs vm/default_pager.c standard vm/device_pager.c standard -vm/kgi_pager.c optional kgi vm/phys_pager.c standard vm/swap_pager.c standard vm/vm_fault.c standard ==== //depot/projects/tty/sys/conf/files.alpha#10 (text+ko) ==== @@ -176,6 +176,7 @@ dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa dev/uart/uart_cpu_alpha.c optional uart +dev/vga/vga_cpu_alpha.c optional vga geom/geom_bsd.c standard geom/geom_bsd_enc.c standard isa/atkbd_isa.c optional atkbd ==== //depot/projects/tty/sys/conf/files.i386#14 (text+ko) ==== @@ -154,6 +154,7 @@ dev/sio/sio_isa.c optional sio isa dev/sr/if_sr_isa.c optional sr isa dev/uart/uart_cpu_i386.c optional uart +dev/vga/vga_cpu_i386.c optional vga geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_mbr.c standard From owner-p4-projects@FreeBSD.ORG Sat Sep 18 22:56:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D9B616A4D0; Sat, 18 Sep 2004 22:56:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D3D4716A4CE for ; Sat, 18 Sep 2004 22:56:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB0C843D31 for ; Sat, 18 Sep 2004 22:56:25 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8IMuPi9052351 for ; Sat, 18 Sep 2004 22:56:25 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8IMuOP6052348 for perforce@freebsd.org; Sat, 18 Sep 2004 22:56:24 GMT (envelope-from marcel@freebsd.org) Date: Sat, 18 Sep 2004 22:56:24 GMT Message-Id: <200409182256.i8IMuOP6052348@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 61781 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Sep 2004 22:56:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=61781 Change 61781 by marcel@marcel_nfs on 2004/09/18 22:55:56 IFC @61772 Affected files ... .. //depot/projects/ia64/etc/mtree/BSD.include.dist#27 integrate .. //depot/projects/ia64/etc/rc.d/ike#3 integrate .. //depot/projects/ia64/etc/rc.d/nsswitch#3 integrate .. //depot/projects/ia64/etc/rc.d/pf#3 integrate .. //depot/projects/ia64/etc/rc.d/pflog#3 integrate .. //depot/projects/ia64/etc/rc.d/swap1#6 integrate .. //depot/projects/ia64/gnu/lib/libregex/Makefile#6 integrate .. //depot/projects/ia64/include/Makefile#40 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_pax.c#5 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_private.h#17 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_syscalls.c#7 integrate .. //depot/projects/ia64/lib/libutil/humanize_number.3#3 integrate .. //depot/projects/ia64/lib/msun/src/math.h#20 integrate .. //depot/projects/ia64/release/Makefile#82 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/Makefile#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#82 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/readme/article.sgml#17 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#143 integrate .. //depot/projects/ia64/release/doc/share/examples/Makefile.relnotesng#8 integrate .. //depot/projects/ia64/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/ia64/sbin/geom/class/mirror/geom_mirror.c#2 integrate .. //depot/projects/ia64/sbin/geom/class/mirror/gmirror.8#2 integrate .. //depot/projects/ia64/sbin/geom/class/raid3/geom_raid3.c#3 integrate .. //depot/projects/ia64/sbin/geom/core/geom.c#4 integrate .. //depot/projects/ia64/sbin/mdconfig/Makefile#3 integrate .. //depot/projects/ia64/sbin/mdconfig/mdconfig.8#15 integrate .. //depot/projects/ia64/sbin/mdconfig/mdconfig.c#16 integrate .. //depot/projects/ia64/sbin/sysctl/sysctl.c#18 integrate .. //depot/projects/ia64/share/man/man4/Makefile#73 integrate .. //depot/projects/ia64/share/man/man4/de.4#5 integrate .. //depot/projects/ia64/share/man/man4/ed.4#8 integrate .. //depot/projects/ia64/share/man/man4/fwohci.4#9 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/ndis.4#4 integrate .. //depot/projects/ia64/share/man/man4/ng_netflow.4#1 branch .. //depot/projects/ia64/share/man/man4/ng_ubt.4#9 integrate .. //depot/projects/ia64/share/man/man4/polling.4#11 integrate .. //depot/projects/ia64/share/man/man9/Makefile#43 integrate .. //depot/projects/ia64/share/man/man9/ifnet.9#13 integrate .. //depot/projects/ia64/share/man/man9/microtime.9#3 integrate .. //depot/projects/ia64/share/man/man9/microuptime.9#2 integrate .. //depot/projects/ia64/share/man/man9/time.9#5 integrate .. //depot/projects/ia64/sys/alpha/alpha/promcons.c#13 integrate .. //depot/projects/ia64/sys/alpha/tlsb/zs_tlsb.c#13 integrate .. //depot/projects/ia64/sys/boot/i386/boot2/boot2.c#21 integrate .. //depot/projects/ia64/sys/boot/ia64/skiload/start.S#2 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/Makefile#13 integrate .. //depot/projects/ia64/sys/compat/ndis/subr_ndis.c#8 integrate .. //depot/projects/ia64/sys/compat/ndis/subr_ntoskrnl.c#7 integrate .. //depot/projects/ia64/sys/conf/NOTES#80 integrate .. //depot/projects/ia64/sys/conf/files#117 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#45 integrate .. //depot/projects/ia64/sys/conf/newvers.sh#13 integrate .. //depot/projects/ia64/sys/conf/options#77 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf_ioctl.c#7 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#41 integrate .. //depot/projects/ia64/sys/dev/aac/aacreg.h#12 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci_link.c#16 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#54 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#51 integrate .. //depot/projects/ia64/sys/dev/fdc/fdc.c#5 integrate .. //depot/projects/ia64/sys/dev/fdc/fdc_acpi.c#4 integrate .. //depot/projects/ia64/sys/dev/fdc/fdc_isa.c#4 integrate .. //depot/projects/ia64/sys/dev/fdc/fdcvar.h#4 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#52 integrate .. //depot/projects/ia64/sys/dev/md/md.c#45 integrate .. //depot/projects/ia64/sys/dev/re/if_re.c#15 integrate .. //depot/projects/ia64/sys/dev/rp/rp.c#14 integrate .. //depot/projects/ia64/sys/dev/sab/sab.c#21 integrate .. //depot/projects/ia64/sys/dev/si/si.c#12 integrate .. //depot/projects/ia64/sys/dev/sio/sio.c#63 integrate .. //depot/projects/ia64/sys/dev/uart/uart_tty.c#8 integrate .. //depot/projects/ia64/sys/dev/usb/if_axe.c#12 integrate .. //depot/projects/ia64/sys/dev/usb/ubser.c#4 integrate .. //depot/projects/ia64/sys/dev/usb/ucom.c#18 integrate .. //depot/projects/ia64/sys/dev/usb/ucomvar.h#4 integrate .. //depot/projects/ia64/sys/dev/usb/umodem.c#14 integrate .. //depot/projects/ia64/sys/dev/usb/uplcom.c#14 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#58 integrate .. //depot/projects/ia64/sys/dev/usb/uvscom.c#17 integrate .. //depot/projects/ia64/sys/dev/zs/zs.c#19 integrate .. //depot/projects/ia64/sys/geom/nop/g_nop.c#3 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum.h#3 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_plex.c#3 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_raid5.c#3 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_rm.c#3 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_state.c#3 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_var.h#3 integrate .. //depot/projects/ia64/sys/geom/vinum/geom_vinum_volume.c#3 integrate .. //depot/projects/ia64/sys/ia64/ia64/locore.S#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#74 integrate .. //depot/projects/ia64/sys/ia64/include/fpu.h#2 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#34 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#54 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#24 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#37 integrate .. //depot/projects/ia64/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/ia64/sys/kern/tty.c#36 integrate .. //depot/projects/ia64/sys/kern/tty_pty.c#21 integrate .. //depot/projects/ia64/sys/modules/netgraph/Makefile#11 integrate .. //depot/projects/ia64/sys/modules/netgraph/netflow/Makefile#1 branch .. //depot/projects/ia64/sys/net/if.c#35 integrate .. //depot/projects/ia64/sys/net/if_tap.c#24 integrate .. //depot/projects/ia64/sys/netgraph/netflow/netflow.c#1 branch .. //depot/projects/ia64/sys/netgraph/netflow/netflow.h#1 branch .. //depot/projects/ia64/sys/netgraph/netflow/ng_netflow.c#1 branch .. //depot/projects/ia64/sys/netgraph/netflow/ng_netflow.h#1 branch .. //depot/projects/ia64/sys/netgraph/ng_tty.c#10 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#45 integrate .. //depot/projects/ia64/sys/pc98/pc98/ppc.c#8 integrate .. //depot/projects/ia64/sys/pc98/pc98/sio.c#36 integrate .. //depot/projects/ia64/sys/sys/conf.h#32 integrate .. //depot/projects/ia64/sys/sys/mdioctl.h#9 integrate .. //depot/projects/ia64/sys/sys/tty.h#11 integrate .. //depot/projects/ia64/sys/sys/ttydefaults.h#3 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#36 integrate .. //depot/projects/ia64/tools/lib32/build32.sh#4 integrate .. //depot/projects/ia64/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#3 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#47 integrate .. //depot/projects/ia64/usr.sbin/Makefile#61 integrate .. //depot/projects/ia64/usr.sbin/flowctl/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/flowctl/flowctl.8#1 branch .. //depot/projects/ia64/usr.sbin/flowctl/flowctl.c#1 branch .. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#46 integrate Differences ... ==== //depot/projects/ia64/etc/mtree/BSD.include.dist#27 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.89 2004/09/02 20:44:55 alfred Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.91 2004/09/16 21:33:56 glebius Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -140,6 +140,8 @@ include .. .. + netflow + .. .. netinet .. ==== //depot/projects/ia64/etc/rc.d/ike#3 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ike,v 1.2 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/ike,v 1.3 2004/09/16 17:04:20 keramida Exp $ # # PROVIDE: ike -# REQUIRE: root beforenetlkm mountcritlocal +# REQUIRE: root mountcritlocal # BEFORE: DAEMON # KEYWORD: FreeBSD nojail ==== //depot/projects/ia64/etc/rc.d/nsswitch#3 (text+ko) ==== @@ -23,12 +23,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/nsswitch,v 1.3 2004/06/21 19:38:58 des Exp $ +# $FreeBSD: src/etc/rc.d/nsswitch,v 1.4 2004/09/16 17:03:12 keramida Exp $ # # PROVIDE: nsswitch # REQUIRE: root -# BEFORE: network +# BEFORE: NETWORK # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/pf#3 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pf,v 1.3 2004/06/23 01:42:06 mlaier Exp $ +# $FreeBSD: src/etc/rc.d/pf,v 1.4 2004/09/16 17:04:20 keramida Exp $ # # PROVIDE: pf -# REQUIRE: root beforenetlkm mountcritlocal netif pflog +# REQUIRE: root mountcritlocal netif pflog # BEFORE: DAEMON LOGIN # KEYWORD: FreeBSD nojail ==== //depot/projects/ia64/etc/rc.d/pflog#3 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pflog,v 1.2 2004/08/31 14:23:51 mlaier Exp $ +# $FreeBSD: src/etc/rc.d/pflog,v 1.3 2004/09/16 17:04:20 keramida Exp $ # # PROVIDE: pflog -# REQUIRE: root beforenetlkm mountcritlocal netif +# REQUIRE: root mountcritlocal netif # BEFORE: DAEMON LOGIN # KEYWORD: FreeBSD nojail ==== //depot/projects/ia64/etc/rc.d/swap1#6 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: swap1,v 1.8 2002/03/24 15:52:41 lukem Exp $ -# $FreeBSD: src/etc/rc.d/swap1,v 1.6 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/swap1,v 1.7 2004/09/17 17:58:19 pjd Exp $ # # PROVIDE: localswap @@ -12,27 +12,7 @@ name="swap1" start_cmd='swapon -a' -stop_cmd=':' - -# Add all block-type swap devices; these might be necessary -# during disk checks. -# -swap1_start() -{ - if ! checkyesno no_swap; then - swapctl -A -t blk - fi -} - -# Remove all block-type swap devices -# -swap1_stop() -{ - if checkyesno swapoff || [ -n "$rc_force" ]; then - echo "Removing block-type swap devices" - swapctl -U -t blk - fi -} +stop_cmd='swapoff -a' load_rc_config swap run_rc_command "$1" ==== //depot/projects/ia64/gnu/lib/libregex/Makefile#6 (text+ko) ==== @@ -1,14 +1,14 @@ -# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.28 2004/03/22 14:44:00 ache Exp $ +# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.29 2004/09/16 01:39:13 peter Exp $ SUBDIR+= doc LIB= gnuregex SHLIB_MAJOR= 2 -SRCS= regex.c +SRCS= gnuregex.c INCSGROUPS= INCS WRINCS PXINCS INCS= regex.h.patched -CLEANFILES+= regex.h.patched +CLEANFILES+= regex.h.patched gnuregex.c INCSNAME= regex.h INCSDIR= ${INCLUDEDIR}/gnu WRINCS= gnuregex.h @@ -16,10 +16,14 @@ PXINCSDIR= ${INCLUDEDIR}/gnu/posix NOMAN= noman -CFLAGS+=-D_REGEX_RE_COMP -DSTDC_HEADERS -I${DESTDIR}/usr/include/gnu +CFLAGS+=-D_REGEX_RE_COMP -DSTDC_HEADERS regex.h.patched: regex.h sed 's===g' \ < ${.ALLSRC} > ${.TARGET} +gnuregex.c: regex.c + sed 's===g' \ + < ${.ALLSRC} > ${.TARGET} + .include ==== //depot/projects/ia64/include/Makefile#40 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.223 2004/09/02 20:44:55 alfred Exp $ +# $FreeBSD: src/include/Makefile,v 1.225 2004/09/17 09:17:33 ru Exp $ # # Doing a "make install" builds /usr/include. @@ -41,8 +41,9 @@ geom/concat geom/gate geom/label geom/mirror geom/nop geom/raid3 \ geom/stripe \ isofs/cd9660 netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ - netgraph/atm security/mac_biba security/mac_bsdextended \ - security/mac_lomac security/mac_mls security/mac_partition \ + netgraph/atm netgraph/netflow \ + security/mac_biba security/mac_bsdextended security/mac_lomac \ + security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs fs/autofs .if !defined(NO_BLUETOOTH) @@ -63,7 +64,7 @@ ${.CURDIR}/Makefile @${ECHO} creating osreldate.h from newvers.sh @setvar PARAMFILE ${.CURDIR}/../sys/sys/param.h; \ - . ${.CURDIR}/../sys/conf/newvers.sh; \ + MAKE=${MAKE} . ${.CURDIR}/../sys/conf/newvers.sh; \ echo "$$COPYRIGHT" > osreldate.h; \ echo "#ifdef _KERNEL" >> osreldate.h; \ echo '#error " cannot be used in the kernel, use "' >> osreldate.h; \ ==== //depot/projects/ia64/lib/libarchive/archive_write_set_format_pax.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.17 2004/08/08 02:22:48 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.18 2004/09/17 04:39:07 kientzle Exp $"); #include #include @@ -414,7 +414,7 @@ } /* If numeric GID is too large, add 'gid' to pax extended attrs. */ - if (st_main->st_gid >= (1 << 20)) { + if (st_main->st_gid >= (1 << 18)) { add_pax_attr_int(&(pax->pax_header), "gid", st_main->st_gid); need_extension = 1; } @@ -429,7 +429,7 @@ } /* If numeric UID is too large, add 'uid' to pax extended attrs. */ - if (st_main->st_uid >= (1 << 20)) { + if (st_main->st_uid >= (1 << 18)) { add_pax_attr_int(&(pax->pax_header), "uid", st_main->st_uid); need_extension = 1; } @@ -636,7 +636,11 @@ archive_entry_set_pathname(pax_attr_entry, pax_attr_name); st.st_size = archive_strlen(&(pax->pax_header)); st.st_uid = st_main->st_uid; + if (st.st_uid >= 1 << 18) + st.st_uid = (1 << 18) - 1; st.st_gid = st_main->st_gid; + if (st.st_gid >= 1 << 18) + st.st_gid = (1 << 18) - 1; st.st_mode = st_main->st_mode; archive_entry_copy_stat(pax_attr_entry, &st); ==== //depot/projects/ia64/lib/libthr/thread/thr_private.h#17 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.40 2004/08/19 23:49:04 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.41 2004/09/16 13:55:46 mtm Exp $ */ #ifndef _THR_PRIVATE_H @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -833,6 +834,12 @@ int __sys_ioctl(int, unsigned long, ...); #endif +/* #include */ +#ifdef _SYS_MSG_H_ +int __sys_msgrcv(int, void *, size_t, long, int); +int __sys_msgsnd(int, const void *, size_t, int); +#endif + /* #include */ #ifdef _SYS_MMAN_H_ int __sys_msync(void *, size_t, int); @@ -852,6 +859,7 @@ int __sys_getsockname(int, struct sockaddr *, socklen_t *); int __sys_getsockopt(int, int, int, void *, socklen_t *); int __sys_listen(int, int); +ssize_t __sys_recv(int, void *, size_t, int); ssize_t __sys_recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *); ssize_t __sys_recvmsg(int, struct msghdr *, int); int __sys_sendfile(int, int, off_t, size_t, struct sf_hdtr *, off_t *, int); @@ -898,12 +906,23 @@ int __sys_poll(struct pollfd *, unsigned, int); #endif +/* #include */ +#ifdef _SEMAPHORE_H_ +int __sem_timedwait(sem_t * __restrict, const struct timespec * __restrict); +int __sem_wait(sem_t *); +#endif + /* #include */ #ifdef _SIGNAL_H_ int __sys_sigaction(int, const struct sigaction *, struct sigaction *); int __sys_sigaltstack(const struct sigaltstack *, struct sigaltstack *); int __sys_sigprocmask(int, const sigset_t *, sigset_t *); int __sys_sigreturn(ucontext_t *); +int __sys_sigsuspend(const sigset_t *); +int __sys_sigtimedwait(const sigset_t * __restrict, siginfo_t * __restrict, + const struct timespec * __restrict); +int __sys_sigwait(const sigset_t * __restrict, int * __restrict); +int __sys_sigwaitinfo(const sigset_t * __restrict, siginfo_t * __restrict); #endif /* #include */ @@ -918,6 +937,8 @@ long __sys_fpathconf(int, int); int __sys_fsync(int); int __sys_pipe(int *); +ssize_t __sys_pread(int, void *, size_t, off_t); +ssize_t __sys_pwrite(int, const void *, size_t, off_t); ssize_t __sys_read(int, void *, size_t); ssize_t __sys_write(int, const void *, size_t); #endif ==== //depot/projects/ia64/lib/libthr/thread/thr_syscalls.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.7 2004/06/27 10:01:35 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.8 2004/09/16 13:55:46 mtm Exp $ */ /* @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #include @@ -80,6 +81,7 @@ #include #include #include +#include #include #include #include @@ -103,6 +105,19 @@ extern pid_t __sys_wait4(pid_t, int *, int, struct rusage *); extern pid_t __waitpid(pid_t, int *, int); +__weak_reference(_accept, accept); + +int +_accept(int s, struct sockaddr *addr, socklen_t *addrlen) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_accept(s, addr, addrlen); + _thread_leave_cancellation_point(); + return (ret); +} + __weak_reference(_aio_suspend, aio_suspend); int @@ -131,6 +146,20 @@ return ret; } + +__weak_reference(_connect, connect); + +int +_connect(int s, const struct sockaddr *n, socklen_t l) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_connect(s, n, l); + _thread_leave_cancellation_point(); + return ret; +} + __weak_reference(_creat, creat); int @@ -246,6 +275,32 @@ return ret; } +__weak_reference(_msgrcv, msgrcv); + +int +_msgrcv(int id, void *p, size_t sz, long t, int f) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_msgrcv(id, p, sz, t, f); + _thread_leave_cancellation_point(); + return ret; +} + +__weak_reference(_msgsnd, msgsnd); + +int +_msgsnd(int id, const void *p, size_t sz, int f) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_msgsnd(id, p, sz, f); + _thread_leave_cancellation_point(); + return ret; +} + __weak_reference(_msync, msync); int @@ -300,6 +355,22 @@ return ret; } +/* + * The implementation in libc calls sigpause(), which is also + * a cancellation point. + */ +#if 0 +__weak_reference(_pause, pause); + +int +_pause(void) +{ + _thread_enter_cancellation_point(); + __pause(); + _thread_leave_cancellation_point(); +} +#endif + __weak_reference(_poll, poll); int @@ -314,6 +385,24 @@ return ret; } +/* XXXFix */ +#if 0 +__weak_reference(_pread, pread); + +ssize_t +_pread(int d, void *b, size_t n, off_t o) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_pread(d, b, n, o); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + +/* The libc version calls select(), which is also a cancellation point. */ +#if 0 extern int __pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds, const struct timespec *timo, const sigset_t *mask); @@ -329,7 +418,24 @@ return (ret); } +#endif +/* XXXFix */ +#if 0 +__weak_reference(_pwrite, pwrite); + +ssize_t +_pwrite(int d, const void *b, size_t n, off_t o) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_pwrite(d, b, n, o); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + __weak_reference(_raise, raise); int @@ -373,6 +479,52 @@ return ret; } +/* + * The libc implementation of recv() calls recvfrom, which + * is also a cancellation point. + */ +#if 0 +__weak_reference(_recv, recv); + +ssize_t +_recv(int s, void *b, size_t l, int f) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_recv(s, b, l, f); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + +__weak_reference(_recvfrom, recvfrom); + +ssize_t +_recvfrom(int s, void *b, size_t l, int f, struct sockaddr *from, + socklen_t *fl) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_recvfrom(s, b, l, f, from, fl); + _thread_leave_cancellation_point(); + return (ret); +} + +__weak_reference(_recvmsg, recvmsg); + +ssize_t +_recvmsg(int s, struct msghdr *m, int f) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_recvmsg(s, m, f); + _thread_leave_cancellation_point(); + return (ret); +} + __weak_reference(_select, select); int @@ -388,6 +540,123 @@ return ret; } +/* + * Libc implements this by calling _sendto(), which is also a + * cancellation point. + */ +#if 0 +__weak_reference(_send, send); + +ssize_t +_send(int s, const void *m, size_t l, int f) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = _sendto(s, m, l, f, NULL, 0); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + +__weak_reference(_sendmsg, sendmsg); + +ssize_t +_sendmsg(int s, const struct msghdr *m, int f) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_sendmsg(s, m, f); + _thread_leave_cancellation_point(); + return (ret); +} + +__weak_reference(_sendto, sendto); + +ssize_t +_sendto(int s, const void *m, size_t l, int f, const struct sockaddr *t, + socklen_t tl) +{ + ssize_t ret; + + _thread_enter_cancellation_point(); + ret = __sys_sendto(s, m, l, f, t, tl); + _thread_leave_cancellation_point(); + return (ret); +} + +/* + * The implementation in libc calls sigsuspend(), which is also + * a cancellation point. + */ +#if 0 +__weak_reference(_sigpause, sigpause); + +int +_sigpause(int m) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_sigpause(m); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + +__weak_reference(_sigsuspend, sigsuspend); + +int +_sigsuspend(const sigset_t *m) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_sigsuspend(m); + _thread_leave_cancellation_point(); + return (ret); +} + +__weak_reference(_sigtimedwait, sigtimedwait); + +int +_sigtimedwait(const sigset_t *s, siginfo_t *i, const struct timespec *t) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_sigtimedwait(s, i, t); + _thread_leave_cancellation_point(); + return (ret); +} + +__weak_reference(_sigwait, sigwait); + +int +_sigwait(const sigset_t *s, int *i) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_sigwait(s, i); + _thread_leave_cancellation_point(); + return (ret); +} + +__weak_reference(_sigwaitinfo, sigwaitinfo); + +int +_sigwaitinfo(const sigset_t *s, siginfo_t *i) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_sigwaitinfo(s, i); + _thread_leave_cancellation_point(); + return (ret); +} + __weak_reference(_sleep, sleep); unsigned int @@ -431,6 +700,25 @@ return ret; } +/* + * The usleep() implementation calls nanosleep(), which is also + * a cancellation point. + */ +#if 0 +__weak_reference(_usleep, usleep); + +int +_usleep(useconds_t u) +{ + int ret; + + _thread_enter_cancellation_point(); + ret = __sys_usleep(u); + _thread_leave_cancellation_point(); + return (ret); +} +#endif + __weak_reference(_wait, wait); pid_t @@ -459,6 +747,10 @@ return ret; } +/* + * The libc implementation of waitpid calls wait4(). + */ +#if 0 __weak_reference(_waitpid, waitpid); pid_t @@ -472,6 +764,7 @@ return ret; } +#endif __weak_reference(_write, write); ==== //depot/projects/ia64/lib/libutil/humanize_number.3#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $NetBSD: humanize_number.3,v 1.4 2003/04/16 13:34:37 wiz Exp $ -.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.4 2004/07/07 20:25:54 ru Exp $ +.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.5 2004/09/16 18:32:58 pjd Exp $ .\" .\" Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -141,8 +141,6 @@ If .Dv HN_GETSCALE is specified, the prefix index number will be returned instead. -.Sh SEE ALSO -.Xr humanize_number 9 .Sh HISTORY The .Fn humanize_number ==== //depot/projects/ia64/lib/msun/src/math.h#20 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.43 2004/07/19 08:16:10 das Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.44 2004/09/17 05:15:33 das Exp $ */ #ifndef _MATH_H_ @@ -34,11 +34,11 @@ float __uf; } __nan; -#if (defined(__GNUC__) && ((__GNUC__ >= 3 && __GNUC_MINOR__ >= 3) || __GNUC__ >= 4)) || defined(__INTEL_COMPILER) +#if __GNUC_PREREQ__(3, 3) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 800) #define __MATH_BUILTIN_CONSTANTS #endif -#if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER)) +#if __GNUC_PREREQ__(3, 0) && !defined(__INTEL_COMPILER) #define __MATH_BUILTIN_RELOPS #endif ==== //depot/projects/ia64/release/Makefile#82 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.861 2004/09/15 05:14:21 brooks Exp $ +# $FreeBSD: src/release/Makefile,v 1.863 2004/09/17 21:46:17 bmah Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -160,7 +160,7 @@ AUTO_KEYBOARD_DETECT?= 0 .if !defined(NODOC) -DIST_DOCS_ARCH_INDEP= readme errata early-adopter +DIST_DOCS_ARCH_INDEP= readme errata DIST_DOCS_ARCH_DEP= installation relnotes hardware .endif @@ -717,8 +717,6 @@ done @mv ${RD}/mfsfd/stand/help/INSTALLATION.TXT \ ${RD}/mfsfd/stand/help/INSTALL.TXT - @mv ${RD}/mfsfd/stand/help/EARLY-ADOPTER.TXT \ - ${RD}/mfsfd/stand/help/EARLY.TXT .endif -test -f ${.CURDIR}/install.cfg \ && cp ${.CURDIR}/install.cfg ${RD}/mfsfd @@ -862,8 +860,6 @@ @cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${FD} @mv ${FD}/INSTALLATION.TXT ${FD}/INSTALL.TXT @mv ${FD}/INSTALLATION.HTM ${FD}/INSTALL.HTM - @mv ${FD}/EARLY-ADOPTER.TXT ${FD}/EARLY.TXT - @mv ${FD}/EARLY-ADOPTER.HTM ${FD}/EARLY.HTM .endif @echo "CD_VERSION = ${BUILDNAME}" > ${FD}/cdrom.inf touch ${.TARGET} @@ -907,8 +903,6 @@ @cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${CD_DISC1} @mv ${CD_DISC1}/INSTALLATION.TXT ${CD_DISC1}/INSTALL.TXT @mv ${CD_DISC1}/INSTALLATION.HTM ${CD_DISC1}/INSTALL.HTM - @mv ${CD_DISC1}/EARLY-ADOPTER.TXT ${CD_DISC1}/EARLY.TXT - @mv ${CD_DISC1}/EARLY-ADOPTER.HTM ${CD_DISC1}/EARLY.HTM .endif .if ${TARGET} != "pc98" @echo "Setting up boot area" ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/Makefile,v 1.5 2004/08/06 08:41:22 simon Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/Makefile,v 1.6 2004/09/16 16:46:37 hrs Exp $ RELN_ROOT?= ${.CURDIR}/.. @@ -7,7 +7,7 @@ SUBDIR+= readme SUBDIR+= errata SUBDIR+= installation -SUBDIR+= early-adopter +#SUBDIR+= early-adopter COMPAT_SYMLINK = en ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#82 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.256 2004/09/14 01:46:27 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.257 2004/09/16 20:38:28 brueffer Exp $ Supported Devices @@ -261,236 +261,7 @@ SMC 83c17x (EPIC)-based Ethernet NICs (&man.tx.4; driver) - National Semiconductor DS8390-based Ethernet NICs, including - Novell NE2000 and clones - (&man.ed.4; driver) - - In kernel configuration, you need to set flag for non-PCI - device. - - - - 3C503 Etherlink II (&man.ed.4; driver) - - - DEC Etherworks DE305 - - - Hewlett-Packard PC Lan+ 27247B and 27252A - - - NetVin 5000 - - - Novell NE1000, NE2000, and NE2100 - - - RealTek 8029 - - - SMC Elite 16 WD8013 Ethernet interface - - - SMC Elite Ultra - - - SMC WD8003E, WD8003EBT, WD8003W, WD8013W, WD8003S, - WD8003SBT and WD8013EBT and clones - >>> TRUNCATED FOR MAIL (1000 lines) <<<