From owner-p4-projects@FreeBSD.ORG Sun Oct 23 19:45:25 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D973616A421; Sun, 23 Oct 2005 19:45:24 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 B36AE16A41F for ; Sun, 23 Oct 2005 19:45:24 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 866A743D45 for ; Sun, 23 Oct 2005 19:45:24 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9NJjO07029794 for ; Sun, 23 Oct 2005 19:45:24 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9NJjOad029791 for perforce@freebsd.org; Sun, 23 Oct 2005 19:45:24 GMT (envelope-from alc@freebsd.org) Date: Sun, 23 Oct 2005 19:45:24 GMT Message-Id: <200510231945.j9NJjOad029791@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 85751 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Oct 2005 19:45:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=85751 Change 85751 by alc@alc_home on 2005/10/23 19:44:24 Assert that the object containing the page and reservation is locked in preempt_destroy(). Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_reserve.c#3 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#3 (text+ko) ==== @@ -564,6 +564,7 @@ reservation_t res; KASSERT(m->reserv,("preempt_destroy: unexistant reservation")); + VM_OBJECT_LOCK_ASSERT(m->reserv->object, MA_OWNED); if ((res = reserve_lazy_update(m)) != NULL) preempt(res, 0, m); KASSERT(!m->reserv,("preempt_destroy: reservation has not been destroyed properly")); From owner-p4-projects@FreeBSD.ORG Sun Oct 23 21:33:36 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F042316A421; Sun, 23 Oct 2005 21:33:35 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 CAFC516A41F for ; Sun, 23 Oct 2005 21:33:35 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C3B043D53 for ; Sun, 23 Oct 2005 21:33:35 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9NLXZWX040617 for ; Sun, 23 Oct 2005 21:33:35 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9NLXYnH040614 for perforce@freebsd.org; Sun, 23 Oct 2005 21:33:34 GMT (envelope-from alc@freebsd.org) Date: Sun, 23 Oct 2005 21:33:34 GMT Message-Id: <200510232133.j9NLXYnH040614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 85753 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Oct 2005 21:33:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=85753 Change 85753 by alc@alc_home on 2005/10/23 21:32:57 Assert that the superpage reservation is not broken in vm_page_alloc(). Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_page.c#6 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_page.c#6 (text+ko) ==== @@ -816,6 +816,8 @@ loop: mtx_lock_spin(&vm_page_queue_free_mtx); if (top != NULL) { + KASSERT(!top->broken, + ("vm_page_alloc: reservation %p is broken", top)); m = &top->first_page[SP_POS(object, pindex, top->level)]; KASSERT(m->queue == PQ_NONE, ("vm_page_alloc: page %p has unexpected queue %d", From owner-p4-projects@FreeBSD.ORG Sun Oct 23 22:14:25 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62DFF16A421; Sun, 23 Oct 2005 22:14:25 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 2319016A41F for ; Sun, 23 Oct 2005 22:14:25 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E070343D48 for ; Sun, 23 Oct 2005 22:14:24 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9NMEOqe042189 for ; Sun, 23 Oct 2005 22:14:24 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9NMEOrQ042186 for perforce@freebsd.org; Sun, 23 Oct 2005 22:14:24 GMT (envelope-from alc@freebsd.org) Date: Sun, 23 Oct 2005 22:14:24 GMT Message-Id: <200510232214.j9NMEOrQ042186@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 85754 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Oct 2005 22:14:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=85754 Change 85754 by alc@alc_home on 2005/10/23 22:13:32 Rename buddy_free() to buddy_free_locked(). Introduce buddy_free(); it acquires and releases the free page queues lock. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_buddy.c#3 edit .. //depot/projects/superpages/src/sys/vm/vm_buddy.h#3 edit .. //depot/projects/superpages/src/sys/vm/vm_page.c#7 edit .. //depot/projects/superpages/src/sys/vm/vm_pageq.c#3 edit .. //depot/projects/superpages/src/sys/vm/vm_reserve.c#4 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_buddy.c#3 (text+ko) ==== @@ -210,6 +210,18 @@ void buddy_free(vm_page_t m, int q) { + + mtx_lock_spin(&vm_page_queue_free_mtx); + buddy_free_locked(m, q); + mtx_unlock_spin(&vm_page_queue_free_mtx); +} + +/* + * Free a contiguous, power of two-sized set of physical pages. + */ +void +buddy_free_locked(vm_page_t m, int q) +{ vm_paddr_t pa, pa_buddy; vm_page_t buddy; @@ -333,7 +345,7 @@ KASSERT(m->queue == PQ_NONE, ("vm_page_alloc_contig: page %p has unexpected queue %d", m, m->queue)); - buddy_free(m, 0); + buddy_free_locked(m, 0); } mtx_unlock_spin(&vm_page_queue_free_mtx); return (m_ret); ==== //depot/projects/superpages/src/sys/vm/vm_buddy.h#3 (text+ko) ==== @@ -5,3 +5,4 @@ vm_page_t buddy_alloc(int magn, boolean_t prefer_zero); vm_page_t buddy_alloc_locked(int magn, boolean_t prefer_zero); void buddy_free(vm_page_t m, int magn); +void buddy_free_locked(vm_page_t m, int magn); ==== //depot/projects/superpages/src/sys/vm/vm_page.c#7 (text+ko) ==== @@ -1097,7 +1097,7 @@ mtx_lock_spin(&vm_page_queue_free_mtx); if (m->flags & PG_ZERO) ++vm_page_zero_count; - buddy_free(m, 0); + buddy_free_locked(m, 0); mtx_unlock_spin(&vm_page_queue_free_mtx); vm_page_free_wakeup(); } ==== //depot/projects/superpages/src/sys/vm/vm_pageq.c#3 (text+ko) ==== @@ -144,9 +144,7 @@ m->phys_addr = pa; m->flags = 0; pmap_page_init(m); - mtx_lock_spin(&vm_page_queue_free_mtx); buddy_free(m, 0); - mtx_unlock_spin(&vm_page_queue_free_mtx); return (m); } ==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#4 (text+ko) ==== @@ -439,9 +439,7 @@ if (p->reserv != NULL) reserve_lazy_update(p); /* to perform dealloc */ else { - mtx_lock_spin(&vm_page_queue_free_mtx); buddy_free(p, 0); - mtx_unlock_spin(&vm_page_queue_free_mtx); if (recovered < 1) recovered = 1; } @@ -456,9 +454,7 @@ if (ch == NULL) { magn = 1 << (sp->order - SP_FACTOR_SHIFT); p = &sp->first_page[i * magn]; - mtx_lock_spin(&vm_page_queue_free_mtx); buddy_free(p, sp->order - SP_FACTOR_SHIFT); - mtx_unlock_spin(&vm_page_queue_free_mtx); if (recovered < magn) recovered = magn; } else { @@ -586,9 +582,7 @@ ; else if (sp->refcnt == 0) { /* empty: free */ KASSERT(sp->maxavail == 1 << sp->order, ("preempt_move maxavail=%d\n", sp->maxavail)); - mtx_lock_spin(&vm_page_queue_free_mtx); buddy_free(sp->first_page, sp->order); - mtx_unlock_spin(&vm_page_queue_free_mtx); uma_zfree(sp_zone, sp); } else { KASSERT(sp->popto != sp->popfrom,("preempt_move: popto = popfrom")); From owner-p4-projects@FreeBSD.ORG Sun Oct 23 22:35:52 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0539B16A421; Sun, 23 Oct 2005 22:35:52 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 D3D6716A41F for ; Sun, 23 Oct 2005 22:35:51 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F67543D46 for ; Sun, 23 Oct 2005 22:35:51 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9NMZp4r042969 for ; Sun, 23 Oct 2005 22:35:51 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9NMZpot042966 for perforce@freebsd.org; Sun, 23 Oct 2005 22:35:51 GMT (envelope-from alc@freebsd.org) Date: Sun, 23 Oct 2005 22:35:51 GMT Message-Id: <200510232235.j9NMZpot042966@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 85756 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Oct 2005 22:35:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=85756 Change 85756 by alc@alc_home on 2005/10/23 22:35:04 Assert that the object containing the reservation is locked in several functions. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_reserve.c#5 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#5 (text+ko) ==== @@ -300,6 +300,7 @@ { int pos; + VM_OBJECT_LOCK_ASSERT(res->object, MA_OWNED); KASSERT(!res->broken,("reserve_populate: reservation is broken")); m->reserv = res; for (;;) { @@ -344,6 +345,7 @@ res = m->reserv; KASSERT(res != NULL && !res->broken, ("reserve_unpopulate: no reservation or broken reservation")); + VM_OBJECT_LOCK_ASSERT(res->object, MA_OWNED); for (sp = res;;) { KASSERT(sp->popfrom != sp->popto && sp->refcnt > 0, ("reserve_unpopulate: sp not valid")); @@ -570,6 +572,7 @@ preempt_move(reservation_t sp, boolean_t to_tail) { + VM_OBJECT_LOCK_ASSERT(sp->object, MA_OWNED); if (sp->rql != NO_RESQ) { KASSERT(sp->rql >= -1 && sp->rql <= SP_LEVELS - 2 && sp->rql < sp->level, ("preempt_move: sp->rql invalid")); From owner-p4-projects@FreeBSD.ORG Mon Oct 24 11:37:46 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C74F16A422; Mon, 24 Oct 2005 11:37:46 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 39FBA16A420 for ; Mon, 24 Oct 2005 11:37:46 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0687A43D46 for ; Mon, 24 Oct 2005 11:37:46 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9OBbj0X095237 for ; Mon, 24 Oct 2005 11:37:45 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9OBbjKe095234 for perforce@freebsd.org; Mon, 24 Oct 2005 11:37:45 GMT (envelope-from soc-bushman@freebsd.org) Date: Mon, 24 Oct 2005 11:37:45 GMT Message-Id: <200510241137.j9OBbjKe095234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 85775 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2005 11:37:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=85775 Change 85775 by soc-bushman@soc-bushman_stinger on 2005/10/24 11:37:23 Makefile bug fixed Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/include/Makefile#3 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/include/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.244 2005/06/09 19:45:05 jkoshy Exp $ +# $FreeBSD: src/include/Makefile,v 1.249 2005/10/03 07:09:40 scottl Exp $ # # Doing a "make install" builds /usr/include. @@ -37,7 +37,7 @@ LSUBDIRS= cam/scsi \ dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \ - dev/ic dev/iicbus ${_dev_ieee488} dev/ofw \ + dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \ dev/pbio dev/ppbus dev/smbus dev/usb dev/wi dev/utopia \ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ fs/nwfs fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ From owner-p4-projects@FreeBSD.ORG Mon Oct 24 12:15:32 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38D4716A421; Mon, 24 Oct 2005 12:15:32 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0E24A16A41F for ; Mon, 24 Oct 2005 12:15:32 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDB8443D46 for ; Mon, 24 Oct 2005 12:15:31 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9OCFVDO096977 for ; Mon, 24 Oct 2005 12:15:31 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9OCFV1g096974 for perforce@freebsd.org; Mon, 24 Oct 2005 12:15:31 GMT (envelope-from soc-bushman@freebsd.org) Date: Mon, 24 Oct 2005 12:15:31 GMT Message-Id: <200510241215.j9OCFV1g096974@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 85776 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2005 12:15:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=85776 Change 85776 by soc-bushman@soc-bushman_stinger on 2005/10/24 12:14:33 syncrhonized to the main source tree Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/Makefile#4 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.337 2005/09/28 07:20:46 ru Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.340 2005/10/17 20:47:44 phk Exp $ # XXX MISSING: mkproto SUBDIR= ac \ @@ -60,6 +60,7 @@ inetd \ iostat \ ip6addrctl \ + ipfwpcap \ IPXrouted \ jail \ jexec \ @@ -73,6 +74,7 @@ lastlogin \ ${_lpr} \ ${_lptcontrol} \ + lmcconfig \ ${_mailstats} \ mailwrapper \ ${_makemap} \ @@ -148,7 +150,6 @@ sa \ ${_sendmail} \ setfmac \ - setkey \ setpmac \ ${_sicontrol} \ sliplogin \ @@ -215,8 +216,8 @@ _bluetooth= bluetooth .endif -.if !defined(NO_NS_CACHING) -_cached= cached +if !defined(NO_NS_CACHING) +_cached= cached .endif .if !defined(NO_CRYPT) && !defined(NO_OPENSSL) From owner-p4-projects@FreeBSD.ORG Mon Oct 24 13:05:47 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 704CD16A421; Mon, 24 Oct 2005 13:05:46 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 4140C16A41F for ; Mon, 24 Oct 2005 13:05:46 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4EC843D76 for ; Mon, 24 Oct 2005 13:05:32 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9OD5WZ5008755 for ; Mon, 24 Oct 2005 13:05:32 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9OD5WAB008752 for perforce@freebsd.org; Mon, 24 Oct 2005 13:05:32 GMT (envelope-from soc-bushman@freebsd.org) Date: Mon, 24 Oct 2005 13:05:32 GMT Message-Id: <200510241305.j9OD5WAB008752@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 85777 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2005 13:05:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=85777 Change 85777 by soc-bushman@soc-bushman_stinger on 2005/10/24 13:04:31 release patch preparation stage Affected files ... .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#4 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.h#2 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/Makefile.inc#5 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.h#2 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.c#5 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.h#5 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.c#5 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.h#5 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.c#5 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.h#5 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.8#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.c#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf.5#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.c#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.h#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.c#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.h#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.c#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.h#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.c#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.h#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/hashtable.h#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.c#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.h#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.c#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.h#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.c#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.h#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.c#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.h#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.c#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.h#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.c#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.h#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.c#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.h#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/startup/cached#4 edit .. //depot/projects/soc2005/nsswitch_cached/src/include/pthread.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/include/pthread_np.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/include/signal.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/bsnmpd/Makefile#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/gensnmptree/Makefile#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/Makefile.inc#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/Makefile#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/Makefile#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agent.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agent.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/Makefile.inc#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/group.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/group.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/hosts.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/hosts.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/passwd.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/passwd.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/services.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/services.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.8#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.conf#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.conf.5#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachelib.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachelib.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cacheplcs.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cacheplcs.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/config.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/config.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/hashtable.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/log.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/log.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_rs_query.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_rs_query.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_ws_query.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_ws_query.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/parser.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/parser.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/protocol.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/protocol.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/query.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/query.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/singletons.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/singletons.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/startup/cached#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cdcontrol/cdcontrol.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ipfwpcap/Makefile#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ipfwpcap/ipfwpcap.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lmcconfig/Makefile#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lmcconfig/lmcconfig.8#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lmcconfig/lmcconfig.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/lpc/lpc.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ndp/ndp.8#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ndp/ndp.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pccard/Makefile.inc#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/delete/main.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/info/main.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/version/perform.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/version/test-pkg_version.sh#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pmcstat/pmcstat.8#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pmcstat/pmcstat.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pmcstat/pmcstat_log.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/powerd/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/powerd/powerd.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/rtadvd/config.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/rtadvd/rtadvd.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/Makefile#2 delete .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/parse.y#2 delete .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/sample.cf#2 delete .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/scriptdump.pl#2 delete .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/setkey.8#2 delete .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/setkey.c#2 delete .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/test-pfkey.c#2 delete .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/test-policy.c#2 delete .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/token.l#2 delete .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/setkey/vchar.h#2 delete .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/devices.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/syslogd/syslogd.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/vipw/vipw.8#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/watchdogd/watchdogd.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/Makefile#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/ndis_events/Makefile#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/ndis_events/ndis_events.8#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/ndis_events/ndis_events.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/Packet32.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/Packet32.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/ntddndis.h#1 branch Differences ... ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.c#2 (text+ko) ==== @@ -77,6 +77,7 @@ new_agents_num = at->agents_num + 1; new_agents = (struct agent **)malloc(sizeof(struct agent *) * new_agents_num); + assert(new_agents != NULL); memcpy(new_agents, at->agents, at->agents_num * sizeof(struct agent *)); new_agents[new_agents_num - 1] = a; qsort(new_agents, new_agents_num, sizeof(struct agent *), ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/Makefile.inc#5 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.c#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.c#5 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.h#5 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.c#5 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.h#5 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.c#5 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.h#5 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.8#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.c#9 (text+ko) ==== @@ -130,8 +130,11 @@ FILE *pidfile; pidfile = fopen(filename, "w"); - if (pidfile == NULL) + if (pidfile == NULL) { + LOG_ERR_2("write_pid_file", "can't write to pidfile %s", + filename); return (-1); + } asprintf(&pid_string,"%u",getpid()); assert(pid_string != NULL); @@ -187,6 +190,7 @@ &config_entry->negative_cache_params); } + LOG_MSG_2("cache", "cache was successfully initialized"); TRACE_OUT(init_cache_); return (retval); } @@ -232,9 +236,13 @@ close(retval->sockfd); free(retval); + LOG_ERR_2("runtime environment", "can't bind socket to path: " + "%s", config->socket_path); TRACE_OUT(init_runtime_env); return (NULL); } + LOG_MSG_2("runtime environment", "using socket %s", + config->socket_path); /* * Here we're marking socket as non-blocking and setting its backlog @@ -252,6 +260,7 @@ memset(&timeout, 0, sizeof(struct timespec)); kevent(retval->queue, &eventlist, 1, NULL, 0, &timeout); + LOG_MSG_2("runtime environment", "successfully initialized"); TRACE_OUT(init_runtime_env); return (retval); } @@ -343,6 +352,8 @@ return; } else { /* some other error happened */ + LOG_ERR_2("process_socket_event", "kevent error, errno" + " is %d", errno); TRACE_OUT(process_socket_event); return; } @@ -488,6 +499,8 @@ struct query_state *qstate; TRACE_IN(process_timer_event); + LOG_MSG_2("processing_timer_event", "timer event received - " + "abandoning request"); qstate = (struct query_state *)event_data->udata; destroy_query_state(qstate); close(event_data->ident); @@ -650,6 +663,7 @@ register_agent(s_agent_table, init_group_mp_agent()); register_agent(s_agent_table, init_services_agent()); register_agent(s_agent_table, init_services_mp_agent()); + LOG_MSG_1("main", "request agents registered successfully"); /* * Hosts agent can't work properly until we have access to the ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf.5#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.c#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.h#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.c#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.h#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.c#9 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include "config.h" #include "debug.h" +#include "log.h" #define INITIAL_ENTRIES_CAPACITY 8 #define DEFAULT_SOCKET_PATH "/var/run/cached" @@ -106,6 +107,8 @@ if (res != 0) { free(retval); pthread_mutexattr_destroy(&attr); + LOG_ERR_2("create_configuration_entry", + "can't create positive cache lock"); TRACE_OUT(create_configuration_entry); return (NULL); } @@ -115,6 +118,8 @@ pthread_mutex_destroy(&retval->positive_cache_lock); free(retval); pthread_mutexattr_destroy(&attr); + LOG_ERR_2("create_configuration_entry", + "can't create negative cache lock"); TRACE_OUT(create_configuration_entry); return (NULL); } @@ -125,6 +130,8 @@ pthread_mutex_destroy(&retval->negative_cache_lock); free(retval); pthread_mutexattr_destroy(&attr); + LOG_ERR_2("create_configuration_entry", + "can't create negative cache lock"); TRACE_OUT(create_configuration_entry); return (NULL); } ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.h#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.c#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.h#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/hashtable.h#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.c#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.h#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.c#9 (text+ko) ==== @@ -124,6 +124,8 @@ c_mp_rs_request->entry_length); if (result != qstate->kevent_watermark) { + LOG_ERR_3("on_mp_read_session_request_read2", + "read failed"); TRACE_OUT(on_mp_read_session_request_read2); return (-1); } @@ -302,6 +304,8 @@ result = qstate->write_func(qstate, &c_mp_rs_response->error_code, sizeof(int)); if (result != sizeof(int)) { + LOG_ERR_3("on_mp_read_session_response_write1", + "write failed"); TRACE_OUT(on_mp_read_session_response_write1); return (-1); } @@ -330,6 +334,8 @@ } else { result = qstate->read_func(qstate, &elem_type, sizeof(int)); if (result != sizeof(int)) { + LOG_ERR_3("on_mp_read_session_mapper", + "read failed"); TRACE_OUT(on_mp_read_session_mapper); return (-1); } @@ -348,6 +354,8 @@ default: qstate->kevent_watermark = 0; qstate->process_func = NULL; + LOG_ERR_3("on_mp_read_session_mapper", + "unknown element type"); TRACE_OUT(on_mp_read_session_mapper); return (-1); } @@ -409,6 +417,8 @@ sizeof(size_t)); if (result != qstate->kevent_watermark) { TRACE_OUT(on_mp_read_session_read_response_write1); + LOG_ERR_3("on_mp_read_session_read_response_write1", + "write failed"); return (-1); } @@ -416,6 +426,8 @@ qstate->process_func = on_mp_read_session_read_response_write2; } else { if (result != qstate->kevent_watermark) { + LOG_ERR_3("on_mp_read_session_read_response_write1", + "write failed"); TRACE_OUT(on_mp_read_session_read_response_write1); return (-1); } @@ -440,6 +452,8 @@ result = qstate->write_func(qstate, read_response->data, read_response->data_size); if (result != qstate->kevent_watermark) { + LOG_ERR_3("on_mp_read_session_read_response_write2", + "write failed"); TRACE_OUT(on_mp_read_session_read_response_write2); return (-1); } ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.h#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.c#9 (text+ko) ==== @@ -90,11 +90,15 @@ &c_mp_ws_request->entry_length, sizeof(size_t)); if (result != sizeof(size_t)) { + LOG_ERR_3("on_mp_write_session_request_read1", + "read failed"); TRACE_OUT(on_mp_write_session_request_read1); return (-1); } if (BUFSIZE_INVALID(c_mp_ws_request->entry_length)) { + LOG_ERR_3("on_mp_write_session_request_read1", + "invalid entry_length value"); TRACE_OUT(on_mp_write_session_request_read1); return (-1); } @@ -125,6 +129,8 @@ c_mp_ws_request->entry_length); if (result != qstate->kevent_watermark) { + LOG_ERR_3("on_mp_write_session_request_read2", + "read failed"); TRACE_OUT(on_mp_write_session_request_read2); return (-1); } @@ -228,6 +234,8 @@ result = qstate->write_func(qstate, &c_mp_ws_response->error_code, sizeof(int)); if (result != sizeof(int)) { + LOG_ERR_3("on_mp_write_session_response_write1", + "write failed"); TRACE_OUT(on_mp_write_session_response_write1); return (-1); } @@ -256,6 +264,8 @@ } else { result = qstate->read_func(qstate, &elem_type, sizeof(int)); if (result != sizeof(int)) { + LOG_ERR_3("on_mp_write_session_mapper", + "read failed"); TRACE_OUT(on_mp_write_session_mapper); return (-1); } @@ -279,6 +289,8 @@ default: qstate->kevent_watermark = 0; qstate->process_func = NULL; + LOG_ERR_2("on_mp_write_session_mapper", + "unknown element type"); TRACE_OUT(on_mp_write_session_mapper); return (-1); } @@ -303,11 +315,15 @@ sizeof(size_t)); if (result != sizeof(size_t)) { + LOG_ERR_3("on_mp_write_session_write_request_read1", + "read failed"); TRACE_OUT(on_mp_write_session_write_request_read1); return (-1); } if (BUFSIZE_INVALID(write_request->data_size)) { + LOG_ERR_3("on_mp_write_session_write_request_read1", + "invalid data_size value"); TRACE_OUT(on_mp_write_session_write_request_read1); return (-1); } @@ -336,6 +352,8 @@ write_request->data_size); if (result != qstate->kevent_watermark) { + LOG_ERR_3("on_mp_write_session_write_request_read2", + "read failed"); TRACE_OUT(on_mp_write_session_write_request_read2); return (-1); } @@ -387,6 +405,8 @@ result = qstate->write_func(qstate, &write_response->error_code, sizeof(int)); if (result != sizeof(int)) { + LOG_ERR_3("on_mp_write_session_write_response_write1", + "write failed"); TRACE_OUT(on_mp_write_session_write_response_write1); return (-1); } ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.h#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.c#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.h#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.c#9 (text+ko) ==== @@ -82,6 +82,7 @@ &element->c_mp_rs_read_response); break; default: + LOG_ERR_2("init_comm_element", "invalid communication element"); TRACE_OUT(init_comm_element); return; } ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.h#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.c#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.h#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.c#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.h#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/startup/cached#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/include/pthread.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread.h,v 1.39 2005/09/01 15:33:22 stefanf Exp $ + * $FreeBSD: src/include/pthread.h,v 1.40 2005/10/24 05:53:54 davidxu Exp $ */ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ @@ -163,12 +163,12 @@ void pthread_cleanup_pop(int); void pthread_cleanup_push(void (*) (void *), void *); int pthread_condattr_destroy(pthread_condattr_t *); +int pthread_condattr_getclock(const pthread_condattr_t *, + clockid_t *); +int pthread_condattr_getpshared(const pthread_condattr_t *, int *); int pthread_condattr_init(pthread_condattr_t *); -int pthread_condattr_getclock(const pthread_condattr_t *, - clockid_t *); -int pthread_condattr_setclock(pthread_condattr_t *, - clockid_t); - +int pthread_condattr_setclock(pthread_condattr_t *, clockid_t); +int pthread_condattr_setpshared(pthread_condattr_t *, int); int pthread_cond_broadcast(pthread_cond_t *); int pthread_cond_destroy(pthread_cond_t *); int pthread_cond_init(pthread_cond_t *, @@ -190,8 +190,11 @@ int pthread_kill(pthread_t, int); int pthread_mutexattr_init(pthread_mutexattr_t *); int pthread_mutexattr_destroy(pthread_mutexattr_t *); +int pthread_mutexattr_getpshared(const pthread_mutexattr_t *, + int *); int pthread_mutexattr_gettype(pthread_mutexattr_t *, int *); int pthread_mutexattr_settype(pthread_mutexattr_t *, int); +int pthread_mutexattr_setpshared(pthread_mutexattr_t *, int); int pthread_mutex_destroy(pthread_mutex_t *); int pthread_mutex_init(pthread_mutex_t *, const pthread_mutexattr_t *); ==== //depot/projects/soc2005/nsswitch_cached/src/include/pthread_np.h#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/include/pthread_np.h,v 1.15 2003/01/07 21:43:30 fjoe Exp $ + * $FreeBSD: src/include/pthread_np.h,v 1.16 2005/10/04 07:23:56 davidxu Exp $ */ #ifndef _PTHREAD_NP_H_ #define _PTHREAD_NP_H_ @@ -57,6 +57,7 @@ int pthread_suspend_np(pthread_t); int pthread_switch_add_np(pthread_switch_routine_t); int pthread_switch_delete_np(pthread_switch_routine_t); +int pthread_timedjoin_np(pthread_t, void **, const struct timespec *); __END_DECLS #endif ==== //depot/projects/soc2005/nsswitch_cached/src/include/signal.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signal.h 8.3 (Berkeley) 3/30/94 - * $FreeBSD: src/include/signal.h,v 1.24 2003/03/31 23:30:41 jeff Exp $ + * $FreeBSD: src/include/signal.h,v 1.26 2005/10/16 22:23:03 davidxu Exp $ */ #ifndef _SIGNAL_H_ @@ -77,15 +77,8 @@ #endif #if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 600 -#if 0 -/* - * PR: 35924 - * XXX we don't actually have these. We set _POSIX_REALTIME_SIGNALS to - * -1 to show that we don't have them, but this symbol is not necessarily - * in scope (in the current implementation), so we can't use it here. - */ int sigqueue(__pid_t, int, const union sigval); -#endif + struct timespec; int sigtimedwait(const sigset_t * __restrict, siginfo_t * __restrict, const struct timespec * __restrict); ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/bsnmpd/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/usr.sbin/bsnmpd/bsnmpd/Makefile,v 1.11 2005/04/26 16:49:15 harti Exp $ +# $FreeBSD: src/usr.sbin/bsnmpd/bsnmpd/Makefile,v 1.12 2005/10/04 15:03:39 harti Exp $ # # Author: Harti Brandt @@ -24,7 +24,8 @@ DEFSDIR= ${SHAREDIR}/snmp/defs CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT -CFLAGS+= -DUSE_TCPWRAPPERS +CFLAGS+= -DUSE_TCPWRAPPERS -DQUADFMT='"llu"' -DQUADXFMT='"llx"' +CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H DPADD= ${LIBBEGEMOT} ${LIBBSNMP} LDADD= -lbegemot -lbsnmp -lwrap ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/gensnmptree/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/usr.sbin/bsnmpd/gensnmptree/Makefile,v 1.3 2005/01/28 16:08:09 ru Exp $ +# $FreeBSD: src/usr.sbin/bsnmpd/gensnmptree/Makefile,v 1.4 2005/10/04 15:03:39 harti Exp $ # # Author: Harti Brandt @@ -7,5 +7,7 @@ PROG= gensnmptree CFLAGS+= -I${CONTRIB}/lib +CFLAGS+= -DQUADFMT='"llu"' -DQUADXFMT='"llx"' -DHAVE_STDINT_H +CFLAGS+= -DHAVE_INTTYPES_H .include ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/usr.sbin/bsnmpd/modules/Makefile.inc,v 1.10 2005/07/22 17:18:57 kensmith Exp $ +# $FreeBSD: src/usr.sbin/bsnmpd/modules/Makefile.inc,v 1.11 2005/10/04 15:03:39 harti Exp $ SHLIB_MAJOR= 4 WARNS?= 6 @@ -8,6 +8,8 @@ SRCS+= ${MOD}_oid.h ${MOD}_tree.c ${MOD}_tree.h CLEANFILES+= ${MOD}_oid.h ${MOD}_tree.c ${MOD}_tree.h CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. +CFLAGS+= -DQUADFMT='"llu"' -DQUADXFMT='"llx"' -DHAVE_STDINT_H +CFLAGS+= -DHAVE_INTTYPES_H ${MOD}_oid.h: ${MOD}_tree.def ${EXTRAMIBDEFS} cat ${.ALLSRC} | gensnmptree -e ${XSYM} > ${.TARGET} ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cdcontrol/cdcontrol.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.c,v 1.48 2004/04/01 16:37:46 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.c,v 1.49 2005/10/19 15:37:43 stefanf Exp $"); #include #include @@ -1130,7 +1130,7 @@ el = el_init("cdcontrol", stdin, stdout, stderr); hist = history_init(); - history(hist, &he, H_EVENT, 100); + history(hist, &he, H_SETSIZE, 100); el_set(el, EL_HIST, history, hist); el_set(el, EL_EDITOR, "emacs"); el_set(el, EL_PROMPT, cdcontrol_prompt); ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/lpc/lpc.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #endif #include "lp.cdefs.h" /* A cross-platform version of */ -__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpc/lpc.c,v 1.30 2005/02/22 02:56:42 delphij Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpc/lpc.c,v 1.31 2005/10/19 16:37:52 stefanf Exp $"); #include @@ -167,7 +167,7 @@ if (!el) { el = el_init("lpc", stdin, stdout, stderr); hist = history_init(); - history(hist, &he, H_EVENT, 100); + history(hist, &he, H_SETSIZE, 100); el_set(el, EL_HIST, history, hist); el_set(el, EL_EDITOR, "emacs"); el_set(el, EL_PROMPT, lpc_prompt); ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ndp/ndp.8#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.sbin/ndp/ndp.8,v 1.16 2005/02/09 18:04:41 ru Exp $ +.\" $FreeBSD: src/usr.sbin/ndp/ndp.8,v 1.18 2005/10/19 16:20:18 suz Exp $ .\" .Dd May 17, 1998 .Dt NDP 8 @@ -63,7 +63,7 @@ .Op Fl nt .Fl i .Ar interface -.Op Ar flags ... +.Op Ar expressions ... .Nm .Op Fl nt .Fl I Op Ar interface | Li delete @@ -153,19 +153,20 @@ will be used as the default. .It Fl I Li delete The current default interface will be deleted from the kernel. -.It Fl i Ar interface Op Ar flags ... +.It Fl i Ar interface Op Ar expressions ... View ND information for the specified interface. If additional arguments -.Ar flags +.Ar expressions are given, .Nm -sets or clears the specified flags for the interface. -Each flag should be separated by white spaces or tab characters. -Possible flags are as follows. -All of the flags can begin with the +sets or clears the flags or variables for the interface as specified in +the expression. +Each expression should be separated by white spaces or tab characters. +Possible expressions are as follows. +Some of the expressions can begin with the special character .Ql - , -which means the flag should be cleared. +which means the flag specified in the expression should be cleared. Note that you need .Fl - before @@ -196,6 +197,31 @@ selection, see the .Pa IMPLEMENTATION file supplied with the KAME kit. +.It Xo +.Ic disabled +.Xc +Disable IPv6 operation on the interface. +When disabled, the interface discards any IPv6 packets +received on or being sent to the interface. +In the sending case, an error of ENETDOWN will be returned to the +application. +This flag is typically set automatically in the kernel as a result of +a certain failure of Duplicate Address Detection. +While the flag can be set or cleared by hand with the +.Nm +command, it is not generally advisable to modify this flag manually. +.It Xo +.Ic basereachable=(number) +.Xc +Specify the BaseReachbleTimer on the interface in millisecond. +.It Xo +.Ic retrans=(number) +.Xc +Specify the RetransTimer on the interface in millisecond. +.It Xo +.Ic curhlim=(number) +.Xc +Specify the Cur Hop Limit on the interface. .El .It Fl n Do not try to resolve numeric addresses to hostnames. ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ndp/ndp.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/usr.sbin/ndp/ndp.c,v 1.16 2004/08/07 04:27:51 imp Exp $ */ +/* $FreeBSD: src/usr.sbin/ndp/ndp.c,v 1.20 2005/10/19 16:20:18 suz Exp $ */ /* $KAME: ndp.c,v 1.104 2003/06/27 07:48:39 itojun Exp $ */ /* @@ -142,7 +142,6 @@ void rtrlist __P((void)); void plist __P((void)); void pfx_flush __P((void)); -void rtrlist __P((void)); void rtr_flush __P((void)); void harmonize_rtr __P((void)); #ifdef SIOCSDEFIFACE_IN6 /* XXX: check SIOCGDEFIFACE_IN6 as well? */ @@ -885,22 +884,26 @@ rtm->rtm_inits = RTV_EXPIRE; } rtm->rtm_flags |= (RTF_HOST | RTF_STATIC); +#if 0 /* we don't support ipv6addr/128 type proxying */ if (rtm->rtm_flags & RTF_ANNOUNCE) { rtm->rtm_flags &= ~RTF_HOST; rtm->rtm_addrs |= RTA_NETMASK; } +#endif /* FALLTHROUGH */ case RTM_GET: rtm->rtm_addrs |= RTA_DST; } #define NEXTADDR(w, s) \ if (rtm->rtm_addrs & (w)) { \ - bcopy((char *)&s, cp, sizeof(s)); cp += sizeof(s);} + bcopy((char *)&s, cp, sizeof(s)); cp += SA_SIZE(&s);} NEXTADDR(RTA_DST, sin_m); NEXTADDR(RTA_GATEWAY, sdl_m); +#if 0 /* we don't support ipv6addr/128 type proxying */ memset(&so_mask.sin6_addr, 0xff, sizeof(so_mask.sin6_addr)); NEXTADDR(RTA_NETMASK, so_mask); +#endif rtm->rtm_msglen = cp - (char *)&m_rtmsg; doit: @@ -965,6 +968,28 @@ newflags |= (f);\ }\ } while (0) +/* + * XXX: this macro is not 100% correct, in that it matches "nud" against + * "nudbogus". But we just let it go since this is minor. + */ +#define SETVALUE(f, v) \ + do { \ + char *valptr; \ + unsigned long newval; \ + v = 0; /* unspecified */ \ + if (strncmp(cp, f, strlen(f)) == 0) { \ + valptr = strchr(cp, '='); \ + if (valptr == NULL) \ + err(1, "syntax error in %s field", (f)); \ + errno = 0; \ + newval = strtoul(++valptr, NULL, 0); \ + if (errno) \ + err(1, "syntax error in %s's value", (f)); \ + v = newval; \ + } \ + } while (0) + + SETFLAG("disabled", ND6_IFF_IFDISABLED); SETFLAG("nud", ND6_IFF_PERFORMNUD); #ifdef ND6_IFF_ACCEPT_RTADV SETFLAG("accept_rtadv", ND6_IFF_ACCEPT_RTADV); @@ -972,13 +997,17 @@ #ifdef ND6_IFF_PREFER_SOURCE SETFLAG("prefer_source", ND6_IFF_PREFER_SOURCE); #endif + SETVALUE("basereachable", ND.basereachable); + SETVALUE("retrans", ND.retrans); + SETVALUE("curhlim", ND.chlim); ND.flags = newflags; - if (ioctl(s, SIOCSIFINFO_FLAGS, (caddr_t)&nd) < 0) { - err(1, "ioctl(SIOCSIFINFO_FLAGS)"); + if (ioctl(s, SIOCSIFINFO_IN6, (caddr_t)&nd) < 0) { + err(1, "ioctl(SIOCSIFINFO_IN6)"); /* NOTREACHED */ } #undef SETFLAG +#undef SETVALUE } if (!ND.initialized) { @@ -986,6 +1015,10 @@ /* NOTREACHED */ } + if (ioctl(s, SIOCGIFINFO_IN6, (caddr_t)&nd) < 0) { + err(1, "ioctl(SIOCGIFINFO_IN6)"); + /* NOTREACHED */ + } printf("linkmtu=%d", ND.linkmtu); printf(", maxmtu=%d", ND.maxmtu); printf(", curhlim=%d", ND.chlim); @@ -1013,6 +1046,8 @@ printf("\nRandom ID: "); rbuf = ND.randomid; break; + default: + errx(1, "impossible case for tempaddr display"); } for (j = 0; j < 8; j++) printf("%02x", rbuf[j]); @@ -1021,6 +1056,10 @@ #endif if (ND.flags) { printf("\nFlags: "); +#ifdef ND6_IFF_IFDISABLED + if ((ND.flags & ND6_IFF_IFDISABLED)) + printf("disabled "); +#endif if ((ND.flags & ND6_IFF_PERFORMNUD)) printf("nud "); #ifdef ND6_IFF_ACCEPT_RTADV @@ -1056,6 +1095,8 @@ err(1, "sysctl(ICMPV6CTL_ND6_DRLIST)"); /*NOTREACHED*/ } + if (l == 0) + return; buf = malloc(l); if (!buf) { err(1, "malloc"); ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pccard/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,3 @@ -# $FreeBSD: src/usr.sbin/pccard/Makefile.inc,v 1.9 2004/12/21 09:59:45 ru Exp $ - -NO_SHARED?= YES +# $FreeBSD: src/usr.sbin/pccard/Makefile.inc,v 1.10 2005/10/17 15:28:25 ru Exp $ .include "../Makefile.inc" ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/delete/main.c#2 (text+ko) ==== @@ -20,7 +20,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/delete/main.c,v 1.26 2004/06/29 18:54:47 eik Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/delete/main.c,v 1.27 2005/10/10 08:38:20 krion Exp $"); #include #include @@ -121,7 +121,7 @@ * package name. Otherwise we've come across a trailing '/' and * need to continue our quest. */ - if (isalpha(*pkgs_split) || ((MatchType == MATCH_GLOB) && \ + if (isalnum(*pkgs_split) || ((MatchType == MATCH_GLOB) && \ strpbrk(pkgs_split, "*?[]") != NULL)) { *argv = pkgs_split; break; ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/info/main.c#2 (text+ko) ==== @@ -20,7 +20,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/info/main.c,v 1.47 2004/10/18 05:34:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/info/main.c,v 1.48 2005/10/10 08:38:21 krion Exp $"); #include "lib.h" #include "info.h" @@ -240,7 +240,7 @@ * we've come across a trailing '/' and need to continue our * quest. */ - if (isalpha(*pkgs_split) || ((MatchType == MATCH_GLOB) && \ + if (isalnum(*pkgs_split) || ((MatchType == MATCH_GLOB) && \ strpbrk(pkgs_split, "*?[]") != NULL)) { *argv = pkgs_split; break; ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/version/perform.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/version/perform.c,v 1.13 2005/07/27 07:55:12 krion Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/version/perform.c,v 1.14 2005/10/10 12:35:30 krion Exp $"); #include "lib.h" #include "version.h" @@ -165,6 +165,10 @@ } } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 24 13:28:01 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 921D316A422; Mon, 24 Oct 2005 13:28:00 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 51C9C16A41F for ; Mon, 24 Oct 2005 13:28:00 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0825543D58 for ; Mon, 24 Oct 2005 13:28:00 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9ODRxMx010034 for ; Mon, 24 Oct 2005 13:27:59 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9ODRxh9010031 for perforce@freebsd.org; Mon, 24 Oct 2005 13:27:59 GMT (envelope-from soc-bushman@freebsd.org) Date: Mon, 24 Oct 2005 13:27:59 GMT Message-Id: <200510241327.j9ODRxh9010031@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 85778 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2005 13:28:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=85778 Change 85778 by soc-bushman@soc-bushman_stinger on 2005/10/24 13:27:57 stupid mistake fixed Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/Makefile#5 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/Makefile#5 (text+ko) ==== @@ -216,7 +216,7 @@ _bluetooth= bluetooth .endif -if !defined(NO_NS_CACHING) +.if !defined(NO_NS_CACHING) _cached= cached .endif From owner-p4-projects@FreeBSD.ORG Mon Oct 24 15:49:53 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33E2916A421; Mon, 24 Oct 2005 15:49:53 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0A20D16A41F for ; Mon, 24 Oct 2005 15:49:53 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C10643D5D for ; Mon, 24 Oct 2005 15:49:52 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9OFnqEv016591 for ; Mon, 24 Oct 2005 15:49:52 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9OFnqGq016588 for perforce@freebsd.org; Mon, 24 Oct 2005 15:49:52 GMT (envelope-from jhb@freebsd.org) Date: Mon, 24 Oct 2005 15:49:52 GMT Message-Id: <200510241549.j9OFnqGq016588@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 Cc: Subject: PERFORCE change 85783 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2005 15:49:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=85783 Change 85783 by jhb@jhb_slimer on 2005/10/24 15:49:43 Don't panic if a spin lock is added that is not in the static order list. Just warn about it instead. Affected files ... .. //depot/projects/smpng/sys/kern/subr_witness.c#140 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#140 (text+ko) ==== @@ -450,6 +450,12 @@ static int witness_cold = 1; /* + * This global is set to 1 once the static lock orders have been enrolled + * so that a warning can be issued for any spin locks enrolled later. + */ +static int witness_spin_warn = 0; + +/* * Global variables for book keeping. */ static int lock_cur_cnt; @@ -500,6 +506,7 @@ w = w1; } } + witness_spin_warn = 1; /* Iterate through all locks and add them to witness. */ mtx_lock(&all_mtx); @@ -513,7 +520,7 @@ mtx_unlock(&all_mtx); /* Mark the witness code as being ready for use. */ - atomic_store_rel_int(&witness_cold, 0); + witness_cold = 0; mtx_lock(&Giant); } @@ -1403,13 +1410,15 @@ } } /* - * This isn't quite right, as witness_cold is still 0 while we - * enroll all the locks initialized before witness_initialize(). + * We issue a warning for any spin locks not defined in the static + * order list as a way to discourage their use (folks should really + * be using non-spin mutexes most of the time). However, several + * 3rd part device drivers use spin locks because that is all they + * have available on Windows and Linux and they think that normal + * mutexes are insufficient. */ - if ((lock_class->lc_flags & LC_SPINLOCK) && !witness_cold) { - mtx_unlock_spin(&w_mtx); - panic("spin lock %s not in order list", description); - } + if ((lock_class->lc_flags & LC_SPINLOCK) && witness_spin_warn) + printf("WITNESS: spin lock %s not in order list", description); if ((w = witness_get()) == NULL) return (NULL); w->w_name = description; From owner-p4-projects@FreeBSD.ORG Mon Oct 24 17:49:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE62C16A421; Mon, 24 Oct 2005 17:49:16 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 A19F816A41F for ; Mon, 24 Oct 2005 17:49:16 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58E4543D46 for ; Mon, 24 Oct 2005 17:49:16 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9OHnGae029704 for ; Mon, 24 Oct 2005 17:49:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9OHnGbZ029701 for perforce@freebsd.org; Mon, 24 Oct 2005 17:49:16 GMT (envelope-from jhb@freebsd.org) Date: Mon, 24 Oct 2005 17:49:16 GMT Message-Id: <200510241749.j9OHnGbZ029701@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 Cc: Subject: PERFORCE change 85785 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2005 17:49:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=85785 Change 85785 by jhb@jhb_slimer on 2005/10/24 17:48:34 Add a test for init'ing a spin lock not in the static order list. Affected files ... .. //depot/projects/smpng/sys/modules/crash/crash.c#21 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash/crash.c#21 (text+ko) ==== @@ -83,6 +83,18 @@ /* Events. */ +#ifdef WITNESS +static void +spinlock_test(void) +{ + + bzero(&test1_mtx, sizeof(test1_mtx)); + mtx_init(&test1_mtx, "test1", NULL, MTX_SPIN); + mtx_destroy(&test1_mtx); +} +CRASH_EVENT("spinlock init", spinlock_test); +#endif + static void refcount_test(void) { From owner-p4-projects@FreeBSD.ORG Mon Oct 24 19:28:18 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08A9C16A421; Mon, 24 Oct 2005 19:28:18 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 B91E216A41F for ; Mon, 24 Oct 2005 19:28:17 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6ECB743D48 for ; Mon, 24 Oct 2005 19:28:17 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9OJSHxa033550 for ; Mon, 24 Oct 2005 19:28:17 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9OJSHpW033547 for perforce@freebsd.org; Mon, 24 Oct 2005 19:28:17 GMT (envelope-from millert@freebsd.org) Date: Mon, 24 Oct 2005 19:28:17 GMT Message-Id: <200510241928.j9OJSHpW033547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 85790 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2005 19:28:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=85790 Change 85790 by millert@millert_ibook on 2005/10/24 19:27:16 In ipc_kmsg_alloc(), kmsg->ikm_sender is already zerod out by ikm_init() so there's no need to do it manually. Also fixes a NULL deref on kalloc() failure. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#5 (text+ko) ==== @@ -212,10 +212,6 @@ ikm_init(kmsg, msg_and_trailer_size); } -#ifdef MAC - kmsg->ikm_sender = (ipc_labelh_t)IO_NULL; -#endif - return(kmsg); } From owner-p4-projects@FreeBSD.ORG Mon Oct 24 20:40:48 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A9EA16A421; Mon, 24 Oct 2005 20:40:48 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 025F116A41F for ; Mon, 24 Oct 2005 20:40:48 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E41E43D45 for ; Mon, 24 Oct 2005 20:40:47 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9OKelJs037023 for ; Mon, 24 Oct 2005 20:40:47 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9OKekrJ037020 for perforce@freebsd.org; Mon, 24 Oct 2005 20:40:46 GMT (envelope-from jhb@freebsd.org) Date: Mon, 24 Oct 2005 20:40:46 GMT Message-Id: <200510242040.j9OKekrJ037020@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 Cc: Subject: PERFORCE change 85794 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2005 20:40:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=85794 Change 85794 by jhb@jhb_slimer on 2005/10/24 20:39:54 IFC @85792. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#71 integrate .. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#15 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#14 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#45 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#46 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#23 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_reg.c#3 integrate .. //depot/projects/smpng/sys/arm/arm/bcopyinout.S#8 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#21 integrate .. //depot/projects/smpng/sys/arm/arm/support.S#10 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_space.c#4 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/smbios.c#3 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/elf_freebsd.c#10 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/libofw.h#9 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_console.c#6 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_memory.c#7 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.c#11 integrate .. //depot/projects/smpng/sys/compat/freebsd32/Makefile#2 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#26 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#22 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#22 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#22 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#22 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#22 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#31 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#23 integrate .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#19 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#18 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#31 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#32 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#43 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_siginfo.h#3 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#12 integrate .. //depot/projects/smpng/sys/conf/files#154 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#49 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdisasm.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpi.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpiosxf.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpixf.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbfileio.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbhistry.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbinput.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbstats.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbutils.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbxface.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmbuffer.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmnames.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmobject.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmopcode.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrc.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcl.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcs.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmutils.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmwalk.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsfield.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsinit.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsobject.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsutils.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswexec.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswscope.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswstate.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evevent.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpeblk.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evregion.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evrgnini.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evsci.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxface.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfevnt.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfregn.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconvrt.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/excreate.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfield.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmisc.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmutex.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exnames.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg2.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg3.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg6.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exprep.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exregion.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresnte.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresolv.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresop.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#23 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstoren.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstorob.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exsystem.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwacpi.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwgpe.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwtimer.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdump.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdumpdv.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nseval.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsinit.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsload.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsnames.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsobject.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsparse.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nswalk.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfeval.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfname.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfobj.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psargs.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psopcode.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psscope.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pstree.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psutils.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pswalk.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psxface.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsaddr.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscalc.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscreate.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsdump.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsio.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsirq.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rslist.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmemory.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmisc.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsutils.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsxface.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbgetall.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbrsdt.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbutils.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxface.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxfroot.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utalloc.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utclib.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcopy.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdebug.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdelete.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utinit.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmath.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utobject.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utxface.c#15 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#25 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#87 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#25 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_smbat.c#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpi_smbus.h#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpiio.h#11 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#19 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#61 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#31 integrate .. //depot/projects/smpng/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/smpng/sys/dev/dc/pnphy.c#2 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_isa.c#14 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_rtl80x9.c#2 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#55 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#28 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.h#15 integrate .. //depot/projects/smpng/sys/dev/exca/exca.c#18 integrate .. //depot/projects/smpng/sys/dev/ic/i8259.h#2 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#34 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#16 integrate .. //depot/projects/smpng/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#31 integrate .. //depot/projects/smpng/sys/dev/mii/dcphy.c#16 delete .. //depot/projects/smpng/sys/dev/mii/pnphy.c#13 delete .. //depot/projects/smpng/sys/dev/nge/if_nge.c#45 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_isa.c#5 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#32 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_rate.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/vchan.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#39 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/if_rue.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/if_udav.c#11 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#12 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#52 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_namei.c#2 integrate .. //depot/projects/smpng/sys/i386/cpufreq/p4tcc.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#38 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#86 integrate .. //depot/projects/smpng/sys/i386/svr4/svr4_machdep.c#18 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#73 integrate .. //depot/projects/smpng/sys/isofs/cd9660/iso.h#11 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#61 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#45 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#90 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#101 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#107 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#78 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#110 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#81 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#36 integrate .. //depot/projects/smpng/sys/kern/link_elf.c#28 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#25 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#141 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#61 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#63 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#20 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#16 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#41 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#9 integrate .. //depot/projects/smpng/sys/modules/dc/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/if_gif/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/mii/Makefile#9 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#14 integrate .. //depot/projects/smpng/sys/net/if_mib.c#7 integrate .. //depot/projects/smpng/sys/netinet/icmp6.h#11 integrate .. //depot/projects/smpng/sys/netinet/in.c#30 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#13 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#76 integrate .. //depot/projects/smpng/sys/netinet6/README#2 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#32 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#29 integrate .. //depot/projects/smpng/sys/netinet6/in6.h#18 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#16 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.h#4 integrate .. //depot/projects/smpng/sys/netinet6/in6_src.c#23 integrate .. //depot/projects/smpng/sys/netinet6/in6_var.h#15 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#41 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#43 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#18 integrate .. //depot/projects/smpng/sys/netinet6/mld6.c#15 integrate .. //depot/projects/smpng/sys/netinet6/mld6_var.h#5 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#29 integrate .. //depot/projects/smpng/sys/netinet6/nd6.h#10 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#20 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#15 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#37 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#73 delete .. //depot/projects/smpng/sys/pci/if_dcreg.h#26 delete .. //depot/projects/smpng/sys/pci/if_rl.c#62 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#41 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#57 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#52 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#42 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#31 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#40 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#35 integrate .. //depot/projects/smpng/sys/posix4/_semaphore.h#5 integrate .. //depot/projects/smpng/sys/sys/mount.h#43 integrate .. //depot/projects/smpng/sys/sys/proc.h#153 integrate .. //depot/projects/smpng/sys/sys/signal.h#18 integrate .. //depot/projects/smpng/sys/sys/signalvar.h#25 integrate .. //depot/projects/smpng/sys/sys/syscall.h#60 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#60 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#62 integrate .. //depot/projects/smpng/sys/sys/timers.h#3 integrate .. //depot/projects/smpng/sys/sys/timespec.h#5 integrate .. //depot/projects/smpng/sys/sys/unistd.h#12 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#77 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#60 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#72 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#71 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.179 2005/09/03 18:20:18 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.180 2005/10/21 19:42:42 ade Exp $"); #include #include @@ -1367,6 +1367,8 @@ pv_entry_t pv; pv = get_pv_entry(); + if (pv == NULL) + panic("no pv entries: increase vm.pmap.shpgperproc"); pv->pv_va = va; pv->pv_pmap = pmap; pv->pv_ptem = mpte; ==== //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#15 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.153 2005/09/27 21:10:10 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.154 2005/10/17 23:10:31 davidxu Exp $ */ #include @@ -109,22 +109,7 @@ movl %es,PCB_ES(%r8) movl %fs,PCB_FS(%r8) movl %gs,PCB_GS(%r8) - jmp 2f 1: - - /* Save userland %fs */ - movl $MSR_FSBASE,%ecx - rdmsr - movl %eax,PCB_FSBASE(%r8) - movl %edx,PCB_FSBASE+4(%r8) - - /* Save userland %gs */ - movl $MSR_KGSBASE,%ecx - rdmsr - movl %eax,PCB_GSBASE(%r8) - movl %edx,PCB_GSBASE+4(%r8) -2: - /* Test if debug registers should be saved. */ testl $PCB_DBREGS,PCB_FLAGS(%r8) jz 1f /* no, skip over */ ==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#14 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.139 2005/10/17 15:51:27 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.140 2005/10/17 23:23:20 jkim Exp $"); #include "opt_cpu.h" @@ -358,9 +358,10 @@ cmp = ((regs[0] & 0xfc000000) >> 26) + 1; } if (cmp > 1) - printf("\n Physical cores: %d", cmp); - if (htt > 1) - printf("\n Logical cores: %d", htt); + printf("\n Cores per package: %d", cmp); + if ((htt / cmp) > 1) + printf("\n Logical CPUs per core: %d", + htt / cmp); } } /* Avoid ugly blank lines: only print newline when we have to. */ ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#45 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.641 2005/10/14 12:43:43 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.642 2005/10/17 23:10:31 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -560,10 +560,12 @@ struct trapframe *regs = td->td_frame; struct pcb *pcb = td->td_pcb; + critical_enter(); wrmsr(MSR_FSBASE, 0); wrmsr(MSR_KGSBASE, 0); /* User value while we're in the kernel */ pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; + critical_exit(); load_ds(_udatasel); load_es(_udatasel); load_fs(_udatasel); ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#46 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.528 2005/09/04 19:06:26 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.529 2005/10/21 19:42:42 ade Exp $"); /* * Manages physical address maps. @@ -1508,6 +1508,8 @@ pv_entry_t pv; pv = get_pv_entry(); + if (pv == NULL) + panic("no pv entries: increase vm.pmap.shpgperproc"); pv->pv_va = va; pv->pv_pmap = pmap; ==== //depot/projects/smpng/sys/amd64/conf/NOTES#23 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.44 2005/10/14 17:22:28 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.45 2005/10/17 18:35:57 jhb Exp $ # # @@ -325,9 +325,6 @@ hint.pbio.0.port="0x360" device smbios device vpd -# sx device is i386 and pc98 only at the moment. -device sx -options SX_DEBUG # HOT1 Xilinx 6200 card (http://www.vcc.com/) device xrpu ==== //depot/projects/smpng/sys/amd64/ia32/ia32_reg.c#3 (text+ko) ==== @@ -23,11 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.2 2005/10/04 23:26:00 peter Exp $ + * $FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.3 2005/10/24 00:00:00 ps Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.2 2005/10/04 23:26:00 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.3 2005/10/24 00:00:00 ps Exp $"); + +#include "opt_compat.h" #include #include ==== //depot/projects/smpng/sys/arm/arm/bcopyinout.S#8 (text+ko) ==== @@ -45,7 +45,7 @@ .L_min_memcpy_size: .word _C_LABEL(_min_memcpy_size) -__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout.S,v 1.7 2005/10/03 14:12:10 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout.S,v 1.8 2005/10/23 23:09:14 cognet Exp $"); #ifdef __XSCALE__ #include #else @@ -108,6 +108,7 @@ moveq r0, #0 RETeq +.Lnormal: SAVE_REGS #ifdef MULTIPROCESSOR /* XXX Probably not appropriate for non-Hydra SMPs */ @@ -353,6 +354,7 @@ moveq r0, #0 RETeq +.Lnormale: SAVE_REGS #ifdef MULTIPROCESSOR /* XXX Probably not appropriate for non-Hydra SMPs */ ==== //depot/projects/smpng/sys/arm/arm/pmap.c#21 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.38 2005/10/03 14:13:50 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.39 2005/10/23 23:09:14 cognet Exp $"); #include #include #include @@ -4248,7 +4248,9 @@ void pmap_copy_page_generic(vm_paddr_t src, vm_paddr_t dst) { +#if 0 struct vm_page *src_pg = PHYS_TO_VM_PAGE(src); +#endif #ifdef DEBUG struct vm_page *dst_pg = PHYS_TO_VM_PAGE(dst); ==== //depot/projects/smpng/sys/arm/arm/support.S#10 (text+ko) ==== @@ -26,7 +26,7 @@ #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.10 2005/10/03 14:12:10 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.11 2005/10/23 23:09:14 cognet Exp $"); #include "assym.s" @@ -888,6 +888,7 @@ ldmfd sp!, {r0-r2, r4, lr} RETeq +.Lnormal: stmdb sp!, {r0, lr} /* memcpy() returns dest addr */ subs r2, r2, #4 ==== //depot/projects/smpng/sys/arm/xscale/i80321/i80321_space.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_space.c,v 1.3 2005/02/13 18:20:39 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_space.c,v 1.4 2005/10/20 20:30:51 cognet Exp $"); #include #include @@ -257,23 +257,11 @@ i80321_mem_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags, bus_space_handle_t *bshp) { - - vm_offset_t va; - uint32_t busbase; - vm_paddr_t pa, endpa, physbase; + vm_paddr_t pa, endpa; - /* - * Found the window -- PCI MEM space is not mapped by allocating - * some kernel VA space and mapping the pages with pmap_enter(). - * pmap_enter() will map unmanaged pages as non-cacheable. - */ - pa = trunc_page((bpa - busbase) + physbase); - endpa = round_page(((bpa - busbase) + physbase) + size); pa = trunc_page(bpa); endpa = round_page(bpa + size); - *bshp = va + (bpa & PAGE_MASK); - *bshp = pa; *bshp = (vm_offset_t)pmap_mapdev(pa, endpa - pa); return (0); ==== //depot/projects/smpng/sys/boot/i386/libi386/smbios.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.2 2005/07/27 19:11:10 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.3 2005/10/18 20:03:31 jkim Exp $"); #include #include @@ -54,6 +54,9 @@ #define SMBIOS_SIG "_SM_" #define SMBIOS_DMI_SIG "_DMI_" +static u_int8_t smbios_enabled_sockets = 0; +static u_int8_t smbios_populated_sockets = 0; + static u_int8_t *smbios_parse_table(const u_int8_t *dmi); static void smbios_setenv(const char *env, const u_int8_t *dmi, const int offset); @@ -66,6 +69,7 @@ u_int8_t *smbios, *dmi, *addr; u_int16_t i, length, count; u_int32_t paddr; + char buf[4]; /* locate and validate the SMBIOS */ smbios = smbios_sigsearch(PTOV(SMBIOS_START), SMBIOS_LENGTH); @@ -79,6 +83,10 @@ for (dmi = addr = PTOV(paddr), i = 0; dmi - addr < length && i < count; i++) dmi = smbios_parse_table(dmi); + sprintf(buf, "%d", smbios_enabled_sockets); + setenv("smbios.socket.enabled", buf, 1); + sprintf(buf, "%d", smbios_populated_sockets); + setenv("smbios.socket.populated", buf, 1); } static u_int8_t * @@ -110,6 +118,30 @@ smbios_setenv("smbios.chassis.version", dmi, 0x06); break; + case 4: /* Type 4: Processor Information */ + /* + * Offset 18h: Processor Status + * + * Bit 7 Reserved, must be 0 + * Bit 6 CPU Socket Populated + * 1 - CPU Socket Populated + * 0 - CPU Socket Unpopulated + * Bit 5:3 Reserved, must be zero + * Bit 2:0 CPU Status + * 0h - Unknown + * 1h - CPU Enabled + * 2h - CPU Disabled by User via BIOS Setup + * 3h - CPU Disabled by BIOS (POST Error) + * 4h - CPU is Idle, waiting to be enabled + * 5-6h - Reserved + * 7h - Other + */ + if ((dmi[0x18] & 0x07) == 1) + smbios_enabled_sockets++; + if (dmi[0x18] & 0x40) + smbios_populated_sockets++; + break; + default: /* skip other types */ break; } ==== //depot/projects/smpng/sys/boot/ofw/libofw/elf_freebsd.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/elf_freebsd.c,v 1.9 2005/05/24 21:43:49 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/elf_freebsd.c,v 1.10 2005/10/20 10:39:09 marius Exp $"); #include #include @@ -47,7 +47,6 @@ struct preloaded_file **result) { int r; - void *addr; r = __elfN(loadfile)(filename, dest, result); if (r != 0) ==== //depot/projects/smpng/sys/boot/ofw/libofw/libofw.h#9 (text+ko) ==== @@ -22,7 +22,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/boot/ofw/libofw/libofw.h,v 1.10 2005/01/05 22:16:58 imp Exp $ + * $FreeBSD: src/sys/boot/ofw/libofw/libofw.h,v 1.11 2005/10/20 11:14:34 marius Exp $ */ #include "openfirm.h" @@ -31,7 +31,7 @@ struct ofw_devdesc { struct devsw *d_dev; int d_type; - phandle_t d_handle; + ihandle_t d_handle; char d_path[256]; }; ==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_console.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.10 2005/01/05 22:16:58 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.11 2005/10/20 10:39:09 marius Exp $"); #include @@ -112,7 +112,6 @@ ofw_cons_poll() { unsigned char ch; - int l; if (saved_char != -1) return 1; ==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_memory.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_memory.c,v 1.6 2005/01/05 22:16:58 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_memory.c,v 1.7 2005/10/20 10:39:09 marius Exp $"); #include #include @@ -120,7 +120,6 @@ { phandle_t memoryp; struct ofw_reg available; - void *base; memoryp = OF_instance_to_package(memory); OF_getprop(memoryp, "available", &available, sizeof(available)); ==== //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.c#11 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/openfirm.c,v 1.11 2005/01/05 22:16:58 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/openfirm.c,v 1.12 2005/10/20 10:39:09 marius Exp $"); #include @@ -66,9 +66,6 @@ int (*openfirmware)(void *); -static ihandle_t stdin; -static ihandle_t stdout; - ihandle_t mmu; ihandle_t memory; @@ -396,7 +393,6 @@ phandle_t OF_finddevice(const char *device) { - int i; static struct { cell_t name; cell_t nargs; ==== //depot/projects/smpng/sys/compat/freebsd32/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ # Makefile for syscall tables # -# $FreeBSD: src/sys/compat/freebsd32/Makefile,v 1.3 2003/08/22 22:51:48 peter Exp $ +# $FreeBSD: src/sys/compat/freebsd32/Makefile,v 1.4 2005/10/23 23:58:23 obrien Exp $ all: @echo "make sysent only" @@ -14,3 +14,6 @@ -mv -f freebsd32_syscall.h freebsd32_syscall.h.bak -mv -f freebsd32_proto.h freebsd32_proto.h.bak sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf + +clean: + rm -f freebsd32_sysent.c freebsd32_syscalls.c freebsd32_syscall.h freebsd32_proto.h ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#26 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.43 2005/10/15 05:57:06 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.44 2005/10/23 10:43:14 ps Exp $"); #include "opt_compat.h" @@ -77,6 +77,8 @@ #include #include +#include + #include #include #include @@ -1394,6 +1396,205 @@ } #endif +#ifdef COMPAT_43 +struct freebsd3_sigaction32 { + u_int32_t sa_u; + osigset_t sa_mask; + int sa_flags; +}; + +#define ONSIG 32 + +int +freebsd3_freebsd32_sigaction(struct thread *td, + struct freebsd3_freebsd32_sigaction_args *uap) +{ + struct freebsd3_sigaction32 s32; + struct sigaction sa, osa, *sap; + int error; + + if (uap->signum <= 0 || uap->signum >= ONSIG) + return (EINVAL); + + if (uap->nsa) { + error = copyin(uap->nsa, &s32, sizeof(s32)); + if (error) + return (error); + sa.sa_handler = PTRIN(s32.sa_u); + CP(s32, sa, sa_flags); + OSIG2SIG(s32.sa_mask, sa.sa_mask); + sap = &sa; + } else + sap = NULL; + error = kern_sigaction(td, uap->signum, sap, &osa, KSA_OSIGSET); + if (error == 0 && uap->osa != NULL) { + s32.sa_u = PTROUT(osa.sa_handler); + CP(osa, s32, sa_flags); + SIG2OSIG(osa.sa_mask, s32.sa_mask); + error = copyout(&s32, uap->osa, sizeof(s32)); + } + return (error); +} + +int +freebsd3_freebsd32_sigprocmask(struct thread *td, + struct freebsd3_freebsd32_sigprocmask_args *uap) +{ + sigset_t set, oset; + int error; + + OSIG2SIG(uap->mask, set); + error = kern_sigprocmask(td, uap->how, &set, &oset, 1); + SIG2OSIG(oset, td->td_retval[0]); + return (error); +} + +int +freebsd3_freebsd32_sigpending(struct thread *td, + struct freebsd3_freebsd32_sigpending_args *uap) +{ + struct proc *p = td->td_proc; + sigset_t siglist; + + PROC_LOCK(p); + siglist = p->p_siglist; + SIGSETOR(siglist, td->td_siglist); + PROC_UNLOCK(p); + SIG2OSIG(siglist, td->td_retval[0]); + return (0); +} + +struct sigvec32 { + u_int32_t sv_handler; + int sv_mask; + int sv_flags; +}; + +int +freebsd3_freebsd32_sigvec(struct thread *td, + struct freebsd3_freebsd32_sigvec_args *uap) +{ + struct sigvec32 vec; + struct sigaction sa, osa, *sap; + int error; + + if (uap->signum <= 0 || uap->signum >= ONSIG) + return (EINVAL); + + if (uap->nsv) { + error = copyin(uap->nsv, &vec, sizeof(vec)); + if (error) + return (error); + sa.sa_handler = PTRIN(vec.sv_handler); + OSIG2SIG(vec.sv_mask, sa.sa_mask); + sa.sa_flags = vec.sv_flags; + sa.sa_flags ^= SA_RESTART; + sap = &sa; + } else + sap = NULL; + error = kern_sigaction(td, uap->signum, sap, &osa, KSA_OSIGSET); + if (error == 0 && uap->osv != NULL) { + vec.sv_handler = PTROUT(osa.sa_handler); + SIG2OSIG(osa.sa_mask, vec.sv_mask); + vec.sv_flags = osa.sa_flags; + vec.sv_flags &= ~SA_NOCLDWAIT; + vec.sv_flags ^= SA_RESTART; + error = copyout(&vec, uap->osv, sizeof(vec)); + } + return (error); +} + +int +freebsd3_freebsd32_sigblock(struct thread *td, + struct freebsd3_freebsd32_sigblock_args *uap) +{ + struct proc *p = td->td_proc; + sigset_t set; + + OSIG2SIG(uap->mask, set); + SIG_CANTMASK(set); + PROC_LOCK(p); + SIG2OSIG(td->td_sigmask, td->td_retval[0]); + SIGSETOR(td->td_sigmask, set); + PROC_UNLOCK(p); + return (0); +} + +int +freebsd3_freebsd32_sigsetmask(struct thread *td, + struct freebsd3_freebsd32_sigsetmask_args *uap) +{ + struct proc *p = td->td_proc; + sigset_t set; + + OSIG2SIG(uap->mask, set); + SIG_CANTMASK(set); + PROC_LOCK(p); + SIG2OSIG(td->td_sigmask, td->td_retval[0]); + SIGSETLO(td->td_sigmask, set); + signotify(td); + PROC_UNLOCK(p); + return (0); +} + +int +freebsd3_freebsd32_sigsuspend(struct thread *td, + struct freebsd3_freebsd32_sigsuspend_args *uap) +{ + struct proc *p = td->td_proc; + sigset_t mask; + + PROC_LOCK(p); + td->td_oldsigmask = td->td_sigmask; + td->td_pflags |= TDP_OLDMASK; + OSIG2SIG(uap->mask, mask); + SIG_CANTMASK(mask); + SIGSETLO(td->td_sigmask, mask); + signotify(td); + while (msleep(&p->p_sigacts, &p->p_mtx, PPAUSE|PCATCH, "opause", 0) == 0) + /* void */; + PROC_UNLOCK(p); + /* always return EINTR rather than ERESTART... */ + return (EINTR); +} + +struct sigstack32 { + u_int32_t ss_sp; + int ss_onstack; +}; + +int +freebsd3_freebsd32_sigstack(struct thread *td, + struct freebsd3_freebsd32_sigstack_args *uap) +{ + struct sigstack32 s32; + struct sigstack nss, oss; + int error = 0; + + if (uap->nss != NULL) { + error = copyin(uap->nss, &s32, sizeof(s32)); + if (error) + return (error); + nss.ss_sp = PTRIN(s32.ss_sp); + CP(s32, nss, ss_onstack); + } + oss.ss_sp = td->td_sigstk.ss_sp; + oss.ss_onstack = sigonstack(cpu_getstack(td)); + if (uap->nss != NULL) { + td->td_sigstk.ss_sp = nss.ss_sp; + td->td_sigstk.ss_size = 0; + td->td_sigstk.ss_flags |= nss.ss_onstack & SS_ONSTACK; + td->td_pflags |= TDP_ALTSTACK; + } + if (uap->oss != NULL) { + s32.ss_sp = PTROUT(oss.ss_sp); + CP(oss, s32, ss_onstack); + error = copyout(&s32, uap->oss, sizeof(s32)); + } + return (error); +} +#endif + int freebsd32_nanosleep(struct thread *td, struct freebsd32_nanosleep_args *uap) { ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#22 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 24 20:44:53 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3200016A421; Mon, 24 Oct 2005 20:44:53 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0C52516A41F for ; Mon, 24 Oct 2005 20:44:53 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C97E743D45 for ; Mon, 24 Oct 2005 20:44:52 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9OKiqcr037156 for ; Mon, 24 Oct 2005 20:44:52 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9OKiq51037153 for perforce@freebsd.org; Mon, 24 Oct 2005 20:44:52 GMT (envelope-from jhb@freebsd.org) Date: Mon, 24 Oct 2005 20:44:52 GMT Message-Id: <200510242044.j9OKiq51037153@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 Cc: Subject: PERFORCE change 85795 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2005 20:44:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=85795 Change 85795 by jhb@jhb_slimer on 2005/10/24 20:44:44 IFC @85793. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#27 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#10 branch .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#92 integrate .. //depot/projects/smpng/sys/kern/subr_kdb.c#13 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#27 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.262 2005/08/19 22:10:19 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.263 2005/10/24 20:31:04 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -916,7 +916,6 @@ } } - void ipi_bitmap_handler(struct clockframe frame) { ==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#92 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.254 2005/09/28 18:04:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.255 2005/10/24 20:31:04 jhb Exp $"); #include "opt_apic.h" #include "opt_cpu.h" ==== //depot/projects/smpng/sys/kern/subr_kdb.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_kdb.c,v 1.13 2005/09/27 21:12:05 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_kdb.c,v 1.14 2005/10/24 20:31:04 jhb Exp $"); #include "opt_kdb.h" @@ -324,16 +324,16 @@ #endif if (thr == curthread) - return &kdb_pcb; + return (&kdb_pcb); #ifdef HAVE_STOPPEDPCBS SLIST_FOREACH(pc, &cpuhead, pc_allcpu) { cpuid = pc->pc_cpuid; if (pc->pc_curthread == thr && (stopped_cpus & (1 << cpuid))) - return &stoppcbs[cpuid]; + return (&stoppcbs[cpuid]); } #endif - return thr->td_pcb; + return (thr->td_pcb); } struct thread * From owner-p4-projects@FreeBSD.ORG Mon Oct 24 20:52:02 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73B9F16A421; Mon, 24 Oct 2005 20:52:02 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 4B41916A41F for ; Mon, 24 Oct 2005 20:52:02 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 05ED143D45 for ; Mon, 24 Oct 2005 20:52:02 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9OKq1Va044724 for ; Mon, 24 Oct 2005 20:52:01 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9OKq1fe044721 for perforce@freebsd.org; Mon, 24 Oct 2005 20:52:01 GMT (envelope-from alc@freebsd.org) Date: Mon, 24 Oct 2005 20:52:01 GMT Message-Id: <200510242052.j9OKq1fe044721@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 85796 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2005 20:52:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=85796 Change 85796 by alc@alc_sp01 on 2005/10/24 20:51:17 Assert that the containing object is locked in preempt(). Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_reserve.c#6 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#6 (text+ko) ==== @@ -414,6 +414,7 @@ vm_page_t p; KASSERT(sp,("preempt: reservation is NULL")); + VM_OBJECT_LOCK_ASSERT(sp->object, MA_OWNED); if (m) { if (m->reserv->broken) reserve_lazy_update(m); From owner-p4-projects@FreeBSD.ORG Mon Oct 24 21:12:29 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B40316A422; Mon, 24 Oct 2005 21:12:29 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 EA6F716A41F for ; Mon, 24 Oct 2005 21:12:28 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40DB843D49 for ; Mon, 24 Oct 2005 21:12:28 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9OLCSuP046568 for ; Mon, 24 Oct 2005 21:12:28 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9OLCRo0046564 for perforce@freebsd.org; Mon, 24 Oct 2005 21:12:27 GMT (envelope-from jhb@freebsd.org) Date: Mon, 24 Oct 2005 21:12:27 GMT Message-Id: <200510242112.j9OLCRo0046564@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 Cc: Subject: PERFORCE change 85799 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2005 21:12:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=85799 Change 85799 by jhb@jhb_slimer on 2005/10/24 21:11:37 IFC @85798 - Loop back STOP_NMI changes. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#28 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#37 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#31 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#24 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#10 integrate .. //depot/projects/smpng/sys/conf/options.amd64#15 integrate .. //depot/projects/smpng/sys/conf/options.i386#51 integrate .. //depot/projects/smpng/sys/conf/options.pc98#50 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#109 integrate .. //depot/projects/smpng/sys/i386/i386/apic_vector.s#18 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#93 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#87 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#74 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#18 integrate .. //depot/projects/smpng/sys/kern/subr_kdb.c#14 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#43 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#46 integrate .. //depot/projects/smpng/sys/sys/smp.h#16 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#9 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.103 2005/06/30 05:33:26 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.104 2005/10/24 20:52:26 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#28 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.263 2005/10/24 20:31:04 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.264 2005/10/24 21:04:17 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#37 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.295 2005/10/14 12:43:43 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.296 2005/10/24 21:04:17 jhb Exp $"); /* * AMD64 Trap and System call handling ==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#31 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.249 2005/09/27 21:10:10 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.250 2005/10/24 20:53:51 jhb Exp $"); #include "opt_isa.h" #include "opt_cpu.h" ==== //depot/projects/smpng/sys/amd64/conf/NOTES#24 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.45 2005/10/17 18:35:57 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.46 2005/10/24 21:04:17 jhb Exp $ # # ==== //depot/projects/smpng/sys/amd64/include/smp.h#10 (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/amd64/include/smp.h,v 1.84 2005/04/30 20:00:58 dwhite Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.85 2005/10/24 21:04:17 jhb Exp $ * */ ==== //depot/projects/smpng/sys/conf/options.amd64#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.amd64,v 1.21 2005/06/29 23:23:16 peter Exp $ +# $FreeBSD: src/sys/conf/options.amd64,v 1.22 2005/10/24 21:04:18 jhb Exp $ # Options specific to AMD64 platform kernels AUTO_EOI_1 opt_auto_eoi.h ==== //depot/projects/smpng/sys/conf/options.i386#51 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.225 2005/07/02 20:06:42 delphij Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.226 2005/10/24 21:04:18 jhb Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h ==== //depot/projects/smpng/sys/conf/options.pc98#50 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.189 2005/07/02 20:06:42 delphij Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.190 2005/10/24 21:04:18 jhb Exp $ # Options specific to the pc98 platform kernels AUTO_EOI_1 opt_auto_eoi.h ==== //depot/projects/smpng/sys/i386/conf/NOTES#109 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1208 2005/10/14 18:24:58 jhb Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1209 2005/10/24 21:04:18 jhb Exp $ # # ==== //depot/projects/smpng/sys/i386/i386/apic_vector.s#18 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.104 2005/09/28 18:04:11 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.105 2005/10/24 20:52:26 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#93 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.255 2005/10/24 20:31:04 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.256 2005/10/24 21:04:18 jhb Exp $"); #include "opt_apic.h" #include "opt_cpu.h" ==== //depot/projects/smpng/sys/i386/i386/trap.c#87 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.282 2005/10/14 12:43:45 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.283 2005/10/24 21:04:18 jhb Exp $"); /* * 386 Trap and System call handling ==== //depot/projects/smpng/sys/i386/i386/vm_machdep.c#74 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.263 2005/10/13 23:42:12 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.264 2005/10/24 20:53:52 jhb Exp $"); #include "opt_isa.h" #include "opt_npx.h" ==== //depot/projects/smpng/sys/i386/include/smp.h#18 (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/i386/include/smp.h,v 1.82 2005/04/30 20:00:59 dwhite Exp $ + * $FreeBSD: src/sys/i386/include/smp.h,v 1.83 2005/10/24 21:04:19 jhb Exp $ * */ ==== //depot/projects/smpng/sys/kern/subr_kdb.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_kdb.c,v 1.14 2005/10/24 20:31:04 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_kdb.c,v 1.15 2005/10/24 21:04:17 jhb Exp $"); #include "opt_kdb.h" ==== //depot/projects/smpng/sys/kern/subr_smp.c#43 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_smp.c,v 1.196 2005/06/30 03:38:10 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_smp.c,v 1.197 2005/10/24 21:04:17 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/pc98/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. # -# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.64 2005/10/14 18:24:58 jhb Exp $ +# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.65 2005/10/24 21:04:19 jhb Exp $ # # ==== //depot/projects/smpng/sys/sys/smp.h#16 (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/sys/smp.h,v 1.84 2005/04/30 20:01:00 dwhite Exp $ + * $FreeBSD: src/sys/sys/smp.h,v 1.85 2005/10/24 21:04:19 jhb Exp $ */ #ifndef _SYS_SMP_H_ From owner-p4-projects@FreeBSD.ORG Mon Oct 24 21:12:30 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8535616A43E; Mon, 24 Oct 2005 21:12:29 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 1335A16A420 for ; Mon, 24 Oct 2005 21:12:29 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A862543D4C for ; Mon, 24 Oct 2005 21:12:28 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9OLCSY0046575 for ; Mon, 24 Oct 2005 21:12:28 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9OLCShK046571 for perforce@freebsd.org; Mon, 24 Oct 2005 21:12:28 GMT (envelope-from jhb@freebsd.org) Date: Mon, 24 Oct 2005 21:12:28 GMT Message-Id: <200510242112.j9OLCShK046571@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 Cc: Subject: PERFORCE change 85800 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2005 21:12:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=85800 Change 85800 by jhb@jhb_slimer on 2005/10/24 21:12:26 Update. Affected files ... .. //depot/projects/smpng/sys/notes#63 edit Differences ... ==== //depot/projects/smpng/sys/notes#63 (text+ko) ==== @@ -67,12 +67,6 @@ do this. That really needs to only be done in spinlock_*() (and maybe some frobbing in intr_execute_handlers()) and needs to happen after the spinlock_*() changes happen. -- Change KDB_STOP_NMI to STOP_NMI and make it non-kdb specific - - i386 - + compiles - - amd64 - - use stoppcbs[] on i386 and amd64 always - - untested - KTR change: include __func__ along with __FILE__ and __LINE__ and display it after cpu number by default - Cheapen global stats counters via PCPU_LAZY_INC From owner-p4-projects@FreeBSD.ORG Tue Oct 25 08:08:08 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2958C16A422; Tue, 25 Oct 2005 08:08:08 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 E3BBC16A41F for ; Tue, 25 Oct 2005 08:08:07 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0F5043D45 for ; Tue, 25 Oct 2005 08:08:07 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9P887gj092954 for ; Tue, 25 Oct 2005 08:08:07 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9P887xo092951 for perforce@freebsd.org; Tue, 25 Oct 2005 08:08:07 GMT (envelope-from soc-bushman@freebsd.org) Date: Tue, 25 Oct 2005 08:08:07 GMT Message-Id: <200510250808.j9P887xo092951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 85818 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2005 08:08:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=85818 Change 85818 by soc-bushman@soc-bushman_stinger on 2005/10/25 08:07:07 small Makefile fix Affected files ... .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#5 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#10 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#5 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#10 (text+ko) ==== @@ -22,7 +22,7 @@ CONFMODE=${SHAREMODE} CONF+=${.CURDIR}/cached.conf -.PATH: ./agents +.PATH: ${.CURDIR}/agents .include "agents/Makefile.inc" .include From owner-p4-projects@FreeBSD.ORG Tue Oct 25 09:09:26 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2231216A421; Tue, 25 Oct 2005 09:09:26 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 BE56116A41F for ; Tue, 25 Oct 2005 09:09:25 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A8B343D46 for ; Tue, 25 Oct 2005 09:09:25 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9P99Pxc002931 for ; Tue, 25 Oct 2005 09:09:25 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9P99P3Y002928 for perforce@freebsd.org; Tue, 25 Oct 2005 09:09:25 GMT (envelope-from soc-bushman@freebsd.org) Date: Tue, 25 Oct 2005 09:09:25 GMT Message-Id: <200510250909.j9P99P3Y002928@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 85820 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2005 09:09:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=85820 Change 85820 by soc-bushman@soc-bushman_stinger on 2005/10/25 09:09:22 release fixes Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/Makefile#2 edit .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/Makefile#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agent.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agent.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/Makefile.inc#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/group.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/group.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/hosts.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/hosts.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/passwd.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/passwd.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/services.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/services.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.8#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.conf#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.conf.5#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachelib.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachelib.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cacheplcs.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cacheplcs.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/config.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/config.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/hashtable.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/log.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/log.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_rs_query.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_rs_query.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_ws_query.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_ws_query.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/parser.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/parser.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/protocol.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/protocol.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/query.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/query.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/singletons.c#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/singletons.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/startup/cached#2 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/Makefile#2 (text+ko) ==== @@ -1,4 +1,6 @@ # $FreeBSD$ SUBDIR+="cached" +.include "../Makefile.inc" .include + ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/Makefile#2 (text+ko) ==== @@ -22,7 +22,7 @@ CONFMODE=${SHAREMODE} CONF+=${.CURDIR}/cached.conf -.PATH: ./agents +.PATH: ${.CURDIR}/agents .include "agents/Makefile.inc" .include ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agent.c#2 (text+ko) ==== @@ -77,6 +77,7 @@ new_agents_num = at->agents_num + 1; new_agents = (struct agent **)malloc(sizeof(struct agent *) * new_agents_num); + assert(new_agents != NULL); memcpy(new_agents, at->agents, at->agents_num * sizeof(struct agent *)); new_agents[new_agents_num - 1] = a; qsort(new_agents, new_agents_num, sizeof(struct agent *), ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agent.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/Makefile.inc#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/group.c#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/group.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/hosts.c#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/hosts.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/passwd.c#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/passwd.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/services.c#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/services.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.8#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.c#2 (text+ko) ==== @@ -130,8 +130,11 @@ FILE *pidfile; pidfile = fopen(filename, "w"); - if (pidfile == NULL) + if (pidfile == NULL) { + LOG_ERR_2("write_pid_file", "can't write to pidfile %s", + filename); return (-1); + } asprintf(&pid_string,"%u",getpid()); assert(pid_string != NULL); @@ -187,6 +190,7 @@ &config_entry->negative_cache_params); } + LOG_MSG_2("cache", "cache was successfully initialized"); TRACE_OUT(init_cache_); return (retval); } @@ -232,9 +236,13 @@ close(retval->sockfd); free(retval); + LOG_ERR_2("runtime environment", "can't bind socket to path: " + "%s", config->socket_path); TRACE_OUT(init_runtime_env); return (NULL); } + LOG_MSG_2("runtime environment", "using socket %s", + config->socket_path); /* * Here we're marking socket as non-blocking and setting its backlog @@ -252,6 +260,7 @@ memset(&timeout, 0, sizeof(struct timespec)); kevent(retval->queue, &eventlist, 1, NULL, 0, &timeout); + LOG_MSG_2("runtime environment", "successfully initialized"); TRACE_OUT(init_runtime_env); return (retval); } @@ -343,6 +352,8 @@ return; } else { /* some other error happened */ + LOG_ERR_2("process_socket_event", "kevent error, errno" + " is %d", errno); TRACE_OUT(process_socket_event); return; } @@ -488,6 +499,8 @@ struct query_state *qstate; TRACE_IN(process_timer_event); + LOG_MSG_2("processing_timer_event", "timer event received - " + "abandoning request"); qstate = (struct query_state *)event_data->udata; destroy_query_state(qstate); close(event_data->ident); @@ -650,6 +663,7 @@ register_agent(s_agent_table, init_group_mp_agent()); register_agent(s_agent_table, init_services_agent()); register_agent(s_agent_table, init_services_mp_agent()); + LOG_MSG_1("main", "request agents registered successfully"); /* * Hosts agent can't work properly until we have access to the ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.conf#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.conf.5#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachelib.c#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachelib.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cacheplcs.c#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cacheplcs.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/config.c#2 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include "config.h" #include "debug.h" +#include "log.h" #define INITIAL_ENTRIES_CAPACITY 8 #define DEFAULT_SOCKET_PATH "/var/run/cached" @@ -106,6 +107,8 @@ if (res != 0) { free(retval); pthread_mutexattr_destroy(&attr); + LOG_ERR_2("create_configuration_entry", + "can't create positive cache lock"); TRACE_OUT(create_configuration_entry); return (NULL); } @@ -115,6 +118,8 @@ pthread_mutex_destroy(&retval->positive_cache_lock); free(retval); pthread_mutexattr_destroy(&attr); + LOG_ERR_2("create_configuration_entry", + "can't create negative cache lock"); TRACE_OUT(create_configuration_entry); return (NULL); } @@ -125,6 +130,8 @@ pthread_mutex_destroy(&retval->negative_cache_lock); free(retval); pthread_mutexattr_destroy(&attr); + LOG_ERR_2("create_configuration_entry", + "can't create negative cache lock"); TRACE_OUT(create_configuration_entry); return (NULL); } ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/config.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.c#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/hashtable.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/log.c#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/log.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_rs_query.c#2 (text+ko) ==== @@ -124,6 +124,8 @@ c_mp_rs_request->entry_length); if (result != qstate->kevent_watermark) { + LOG_ERR_3("on_mp_read_session_request_read2", + "read failed"); TRACE_OUT(on_mp_read_session_request_read2); return (-1); } @@ -302,6 +304,8 @@ result = qstate->write_func(qstate, &c_mp_rs_response->error_code, sizeof(int)); if (result != sizeof(int)) { + LOG_ERR_3("on_mp_read_session_response_write1", + "write failed"); TRACE_OUT(on_mp_read_session_response_write1); return (-1); } @@ -330,6 +334,8 @@ } else { result = qstate->read_func(qstate, &elem_type, sizeof(int)); if (result != sizeof(int)) { + LOG_ERR_3("on_mp_read_session_mapper", + "read failed"); TRACE_OUT(on_mp_read_session_mapper); return (-1); } @@ -348,6 +354,8 @@ default: qstate->kevent_watermark = 0; qstate->process_func = NULL; + LOG_ERR_3("on_mp_read_session_mapper", + "unknown element type"); TRACE_OUT(on_mp_read_session_mapper); return (-1); } @@ -409,6 +417,8 @@ sizeof(size_t)); if (result != qstate->kevent_watermark) { TRACE_OUT(on_mp_read_session_read_response_write1); + LOG_ERR_3("on_mp_read_session_read_response_write1", + "write failed"); return (-1); } @@ -416,6 +426,8 @@ qstate->process_func = on_mp_read_session_read_response_write2; } else { if (result != qstate->kevent_watermark) { + LOG_ERR_3("on_mp_read_session_read_response_write1", + "write failed"); TRACE_OUT(on_mp_read_session_read_response_write1); return (-1); } @@ -440,6 +452,8 @@ result = qstate->write_func(qstate, read_response->data, read_response->data_size); if (result != qstate->kevent_watermark) { + LOG_ERR_3("on_mp_read_session_read_response_write2", + "write failed"); TRACE_OUT(on_mp_read_session_read_response_write2); return (-1); } ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_rs_query.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_ws_query.c#2 (text+ko) ==== @@ -90,11 +90,15 @@ &c_mp_ws_request->entry_length, sizeof(size_t)); if (result != sizeof(size_t)) { + LOG_ERR_3("on_mp_write_session_request_read1", + "read failed"); TRACE_OUT(on_mp_write_session_request_read1); return (-1); } if (BUFSIZE_INVALID(c_mp_ws_request->entry_length)) { + LOG_ERR_3("on_mp_write_session_request_read1", + "invalid entry_length value"); TRACE_OUT(on_mp_write_session_request_read1); return (-1); } @@ -125,6 +129,8 @@ c_mp_ws_request->entry_length); if (result != qstate->kevent_watermark) { + LOG_ERR_3("on_mp_write_session_request_read2", + "read failed"); TRACE_OUT(on_mp_write_session_request_read2); return (-1); } @@ -228,6 +234,8 @@ result = qstate->write_func(qstate, &c_mp_ws_response->error_code, sizeof(int)); if (result != sizeof(int)) { + LOG_ERR_3("on_mp_write_session_response_write1", + "write failed"); TRACE_OUT(on_mp_write_session_response_write1); return (-1); } @@ -256,6 +264,8 @@ } else { result = qstate->read_func(qstate, &elem_type, sizeof(int)); if (result != sizeof(int)) { + LOG_ERR_3("on_mp_write_session_mapper", + "read failed"); TRACE_OUT(on_mp_write_session_mapper); return (-1); } @@ -279,6 +289,8 @@ default: qstate->kevent_watermark = 0; qstate->process_func = NULL; + LOG_ERR_2("on_mp_write_session_mapper", + "unknown element type"); TRACE_OUT(on_mp_write_session_mapper); return (-1); } @@ -303,11 +315,15 @@ sizeof(size_t)); if (result != sizeof(size_t)) { + LOG_ERR_3("on_mp_write_session_write_request_read1", + "read failed"); TRACE_OUT(on_mp_write_session_write_request_read1); return (-1); } if (BUFSIZE_INVALID(write_request->data_size)) { + LOG_ERR_3("on_mp_write_session_write_request_read1", + "invalid data_size value"); TRACE_OUT(on_mp_write_session_write_request_read1); return (-1); } @@ -336,6 +352,8 @@ write_request->data_size); if (result != qstate->kevent_watermark) { + LOG_ERR_3("on_mp_write_session_write_request_read2", + "read failed"); TRACE_OUT(on_mp_write_session_write_request_read2); return (-1); } @@ -387,6 +405,8 @@ result = qstate->write_func(qstate, &write_response->error_code, sizeof(int)); if (result != sizeof(int)) { + LOG_ERR_3("on_mp_write_session_write_response_write1", + "write failed"); TRACE_OUT(on_mp_write_session_write_response_write1); return (-1); } ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_ws_query.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/parser.c#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/parser.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/protocol.c#2 (text+ko) ==== @@ -82,6 +82,7 @@ &element->c_mp_rs_read_response); break; default: + LOG_ERR_2("init_comm_element", "invalid communication element"); TRACE_OUT(init_comm_element); return; } ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/protocol.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/query.c#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/query.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/singletons.c#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/singletons.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/startup/cached#2 (text+ko) ==== @@ -21,7 +21,7 @@ name=cached rcvar=`set_rcvar` -command=#cached_bindir#/cached +command=/usr/sbin/cached cached_enable=${cached_enable:-"NO"} cached_pidfile=${cached_pidfile:-"/var/run/cached.pid"} @@ -29,3 +29,4 @@ load_rc_config $name run_rc_command "$1" + From owner-p4-projects@FreeBSD.ORG Tue Oct 25 09:12:51 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BEAF16A424; Tue, 25 Oct 2005 09:12:51 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 BDB2716A41F for ; Tue, 25 Oct 2005 09:12:50 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51B4043D4C for ; Tue, 25 Oct 2005 09:12:50 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9P9Co79003077 for ; Tue, 25 Oct 2005 09:12:50 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9P9CnYU003074 for perforce@freebsd.org; Tue, 25 Oct 2005 09:12:49 GMT (envelope-from soc-bushman@freebsd.org) Date: Tue, 25 Oct 2005 09:12:49 GMT Message-Id: <200510250912.j9P9CnYU003074@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 85821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2005 09:12:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=85821 Change 85821 by soc-bushman@soc-bushman_stinger on 2005/10/25 09:11:49 changes integrated Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/powerd/powerd.c#5 integrate Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/powerd/powerd.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/powerd/powerd.c,v 1.15 2005/10/23 00:55:56 njl Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/powerd/powerd.c,v 1.16 2005/10/24 18:34:54 njl Exp $"); #include #include @@ -488,9 +488,6 @@ signal(SIGTERM, handle_sigs); signal(SIGPIPE, SIG_IGN); - /* Decide whether to use ACPI or APM to read the AC line status. */ - acline_init(); - /* Run in the background unless in verbose mode. */ if (!vflag) { pid_t otherpid; @@ -512,6 +509,9 @@ pidfile_write(pfh); } + /* Decide whether to use ACPI or APM to read the AC line status. */ + acline_init(); + /* Main loop. */ for (;;) { /* Check status every few milliseconds. */ From owner-p4-projects@FreeBSD.ORG Tue Oct 25 10:25:30 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 933C916A421; Tue, 25 Oct 2005 10:25:29 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 4E47A16A41F for ; Tue, 25 Oct 2005 10:25:29 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19BEF43D45 for ; Tue, 25 Oct 2005 10:25:29 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9PAPSmX006337 for ; Tue, 25 Oct 2005 10:25:28 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9PAPSCc006334 for perforce@freebsd.org; Tue, 25 Oct 2005 10:25:28 GMT (envelope-from soc-bushman@freebsd.org) Date: Tue, 25 Oct 2005 10:25:28 GMT Message-Id: <200510251025.j9PAPSCc006334@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 85824 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2005 10:25:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=85824 Change 85824 by soc-bushman@soc-bushman_stinger on 2005/10/25 10:24:33 another release makefile fix Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/Makefile#3 edit .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/Makefile#3 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/Makefile#3 (text+ko) ==== @@ -1,6 +1,5 @@ # $FreeBSD$ SUBDIR+="cached" -.include "../Makefile.inc" .include ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/Makefile#3 (text+ko) ==== @@ -25,4 +25,5 @@ .PATH: ${.CURDIR}/agents .include "agents/Makefile.inc" +.include "../../Makefile.inc" .include From owner-p4-projects@FreeBSD.ORG Tue Oct 25 15:54:31 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAD9016A421; Tue, 25 Oct 2005 15:54:30 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 6936116A41F for ; Tue, 25 Oct 2005 15:54:30 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 232A943D46 for ; Tue, 25 Oct 2005 15:54:30 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9PFsU6f025322 for ; Tue, 25 Oct 2005 15:54:30 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9PFsTUH025319 for perforce@freebsd.org; Tue, 25 Oct 2005 15:54:29 GMT (envelope-from jhb@freebsd.org) Date: Tue, 25 Oct 2005 15:54:29 GMT Message-Id: <200510251554.j9PFsTUH025319@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 Cc: Subject: PERFORCE change 85831 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2005 15:54:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=85831 Change 85831 by jhb@jhb_slimer on 2005/10/25 15:53:35 New todo. Affected files ... .. //depot/projects/smpng/sys/notes#64 edit Differences ... ==== //depot/projects/smpng/sys/notes#64 (text+ko) ==== @@ -75,6 +75,9 @@ - arm, powerpc? - fork counts? - Add a cache-line padded mtx_aligned union and use it for the mutex pools. +- Add stoppedpcbs[] support to other archs + - alpha + - sparc64 Active child branches: - jhb_intr - intr_event stuff From owner-p4-projects@FreeBSD.ORG Tue Oct 25 16:10:56 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03A7016A421; Tue, 25 Oct 2005 16:10:56 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 7163916A420 for ; Tue, 25 Oct 2005 16:10:55 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 577AF43D64 for ; Tue, 25 Oct 2005 16:10:50 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9PGAoK2025937 for ; Tue, 25 Oct 2005 16:10:50 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9PGAoj6025934 for perforce@freebsd.org; Tue, 25 Oct 2005 16:10:50 GMT (envelope-from peter@freebsd.org) Date: Tue, 25 Oct 2005 16:10:50 GMT Message-Id: <200510251610.j9PGAoj6025934@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 Cc: Subject: PERFORCE change 85832 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2005 16:10:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=85832 Change 85832 by peter@peter_overcee on 2005/10/25 16:09:50 Increase physmap array to match phys_avail. Some dells need it. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#143 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#143 (text+ko) ==== @@ -830,7 +830,7 @@ } #endif -#define PHYSMAP_SIZE (2 * 8) +#define PHYSMAP_SIZE (2 * 20) u_int basemem; From owner-p4-projects@FreeBSD.ORG Tue Oct 25 16:18:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A71916A421; Tue, 25 Oct 2005 16:18:13 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 D1DBB16A41F for ; Tue, 25 Oct 2005 16:18:12 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2826943D53 for ; Tue, 25 Oct 2005 16:18:12 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9PGICRB026312 for ; Tue, 25 Oct 2005 16:18:12 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9PGHxwT026292 for perforce@freebsd.org; Tue, 25 Oct 2005 16:17:59 GMT (envelope-from peter@freebsd.org) Date: Tue, 25 Oct 2005 16:17:59 GMT Message-Id: <200510251617.j9PGHxwT026292@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 Cc: Subject: PERFORCE change 85834 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2005 16:18:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=85834 Change 85834 by peter@peter_overcee on 2005/10/25 16:17:14 IFC @85829 Affected files ... .. //depot/projects/hammer/MAINTAINERS#37 integrate .. //depot/projects/hammer/Makefile.inc1#104 integrate .. //depot/projects/hammer/contrib/groff/COPYING#2 integrate .. //depot/projects/hammer/contrib/groff/ChangeLog#4 integrate .. //depot/projects/hammer/contrib/groff/ChangeLog.115#1 branch .. //depot/projects/hammer/contrib/groff/ChangeLog.116#1 branch .. //depot/projects/hammer/contrib/groff/ChangeLog.117#1 branch .. //depot/projects/hammer/contrib/groff/ChangeLog.118#1 branch .. //depot/projects/hammer/contrib/groff/FDL#2 integrate .. //depot/projects/hammer/contrib/groff/FREEBSD-upgrade#3 integrate .. //depot/projects/hammer/contrib/groff/INSTALL#4 integrate .. //depot/projects/hammer/contrib/groff/INSTALL.gen#3 integrate .. //depot/projects/hammer/contrib/groff/LICENSE#1 branch .. //depot/projects/hammer/contrib/groff/MANIFEST#3 integrate .. //depot/projects/hammer/contrib/groff/MORE.STUFF#3 integrate .. //depot/projects/hammer/contrib/groff/Makefile#2 integrate .. //depot/projects/hammer/contrib/groff/Makefile.ccpg#4 integrate .. //depot/projects/hammer/contrib/groff/Makefile.comm#4 integrate .. //depot/projects/hammer/contrib/groff/Makefile.cpg#3 integrate .. //depot/projects/hammer/contrib/groff/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/groff/Makefile.init#2 integrate .. //depot/projects/hammer/contrib/groff/Makefile.sub#4 integrate .. //depot/projects/hammer/contrib/groff/NEWS#4 integrate .. //depot/projects/hammer/contrib/groff/PROBLEMS#4 integrate .. //depot/projects/hammer/contrib/groff/PROJECTS#2 integrate .. //depot/projects/hammer/contrib/groff/README#3 integrate .. //depot/projects/hammer/contrib/groff/README.MinGW#1 branch .. //depot/projects/hammer/contrib/groff/README.WIN32#2 delete .. //depot/projects/hammer/contrib/groff/REVISION#4 integrate .. //depot/projects/hammer/contrib/groff/TODO#2 integrate .. //depot/projects/hammer/contrib/groff/aclocal.m4#4 integrate .. //depot/projects/hammer/contrib/groff/configure#4 integrate .. //depot/projects/hammer/contrib/groff/configure.ac#4 integrate .. //depot/projects/hammer/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch .. //depot/projects/hammer/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch .. //depot/projects/hammer/contrib/groff/contrib/gdiffmk/README#1 branch .. //depot/projects/hammer/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch .. //depot/projects/hammer/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch .. //depot/projects/hammer/contrib/groff/contrib/gdiffmk/tests/file1#1 branch .. //depot/projects/hammer/contrib/groff/contrib/gdiffmk/tests/file2#1 branch .. //depot/projects/hammer/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch .. //depot/projects/hammer/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch .. //depot/projects/hammer/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch .. //depot/projects/hammer/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch .. //depot/projects/hammer/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch .. //depot/projects/hammer/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch .. //depot/projects/hammer/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch .. //depot/projects/hammer/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch .. //depot/projects/hammer/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch .. //depot/projects/hammer/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch .. //depot/projects/hammer/contrib/groff/contrib/groffer/ChangeLog#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/groffer/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/groffer/README#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/groffer/README_SH#1 branch .. //depot/projects/hammer/contrib/groff/contrib/groffer/TODO#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/groffer/groffer.man#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/groffer/groffer.sh#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/groffer/groffer2.sh#1 branch .. //depot/projects/hammer/contrib/groff/contrib/mm/ChangeLog#4 integrate .. //depot/projects/hammer/contrib/groff/contrib/mm/groff_mm.man#4 integrate .. //depot/projects/hammer/contrib/groff/contrib/mm/m.tmac#4 integrate .. //depot/projects/hammer/contrib/groff/contrib/mm/mmroff.pl#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/BUGS#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/ChangeLog#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/NEWS#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/TODO#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/copyright#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/examples/README.mom#2 delete .. //depot/projects/hammer/contrib/groff/contrib/mom/examples/README.txt#1 branch .. //depot/projects/hammer/contrib/groff/contrib/mom/examples/elvis_syntax#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch .. //depot/projects/hammer/contrib/groff/contrib/mom/examples/macros.mom#2 delete .. //depot/projects/hammer/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch .. //depot/projects/hammer/contrib/groff/contrib/mom/examples/typeset.mom#3 delete .. //depot/projects/hammer/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch .. //depot/projects/hammer/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete .. //depot/projects/hammer/contrib/groff/contrib/mom/groff_mom.man#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/color.html#1 branch .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/docelement.html#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/docprocessing.html#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/goodies.html#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/inlines.html#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/intro.html#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/refer.html#1 branch .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/reserved.html#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/toc.html#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/typesetting.html#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/using.html#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/om.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/pdfmark/ChangeLog#1 branch .. //depot/projects/hammer/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch .. //depot/projects/hammer/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch .. //depot/projects/hammer/contrib/groff/contrib/pdfmark/README#1 branch .. //depot/projects/hammer/contrib/groff/contrib/pdfmark/TODO#1 branch .. //depot/projects/hammer/contrib/groff/contrib/pdfmark/cover.ms#1 branch .. //depot/projects/hammer/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch .. //depot/projects/hammer/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch .. //depot/projects/hammer/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch .. //depot/projects/hammer/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch .. //depot/projects/hammer/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch .. //depot/projects/hammer/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/pic2graph/pic2graph.sh#3 integrate .. //depot/projects/hammer/contrib/groff/doc/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/groff/doc/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/doc/fdl.texi#2 integrate .. //depot/projects/hammer/contrib/groff/doc/fixinfo.sh#1 branch .. //depot/projects/hammer/contrib/groff/doc/groff#3 integrate .. //depot/projects/hammer/contrib/groff/doc/groff-1#3 integrate .. //depot/projects/hammer/contrib/groff/doc/groff-10#3 delete .. //depot/projects/hammer/contrib/groff/doc/groff-11#3 delete .. //depot/projects/hammer/contrib/groff/doc/groff-2#3 integrate .. //depot/projects/hammer/contrib/groff/doc/groff-3#3 integrate .. //depot/projects/hammer/contrib/groff/doc/groff-4#3 delete .. //depot/projects/hammer/contrib/groff/doc/groff-5#3 delete .. //depot/projects/hammer/contrib/groff/doc/groff-6#3 delete .. //depot/projects/hammer/contrib/groff/doc/groff-7#3 delete .. //depot/projects/hammer/contrib/groff/doc/groff-8#3 delete .. //depot/projects/hammer/contrib/groff/doc/groff-9#3 delete .. //depot/projects/hammer/contrib/groff/doc/groff.css#1 branch .. //depot/projects/hammer/contrib/groff/doc/groff.texinfo#4 integrate .. //depot/projects/hammer/contrib/groff/doc/meref.me#3 integrate .. //depot/projects/hammer/contrib/groff/doc/pic.ms#4 integrate .. //depot/projects/hammer/contrib/groff/doc/texinfo.tex#4 integrate .. //depot/projects/hammer/contrib/groff/doc/webpage.ms#3 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/generate/Makefile#4 integrate .. //depot/projects/hammer/contrib/groff/font/devhtml/DESC.proto#4 integrate .. //depot/projects/hammer/contrib/groff/font/devhtml/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/font/devhtml/R.proto#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/AB#1 branch .. //depot/projects/hammer/contrib/groff/font/devlj4/ABI#1 branch .. //depot/projects/hammer/contrib/groff/font/devlj4/AI#1 branch .. //depot/projects/hammer/contrib/groff/font/devlj4/ALBB#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/ALBR#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/AOB#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/AOI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/AOR#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/AR#1 branch .. //depot/projects/hammer/contrib/groff/font/devlj4/CB#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/CBI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/CI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/CLARENDON#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/CORONET#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/CR#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/GB#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/GBI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/GI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/GR#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/LGB#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/LGI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/LGR#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/MARIGOLD#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/Makefile.sub#2 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/OB#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/OBI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/OI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/OR#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/S#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/SYMBOL#1 branch .. //depot/projects/hammer/contrib/groff/font/devlj4/TB#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/TBI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/TI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/TNRB#1 branch .. //depot/projects/hammer/contrib/groff/font/devlj4/TNRBI#1 branch .. //depot/projects/hammer/contrib/groff/font/devlj4/TNRI#1 branch .. //depot/projects/hammer/contrib/groff/font/devlj4/TNRR#1 branch .. //depot/projects/hammer/contrib/groff/font/devlj4/TR#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/UB#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/UBI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/UCB#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/UCBI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/UCI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/UCR#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/UI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/UR#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/WINGDINGS#1 branch .. //depot/projects/hammer/contrib/groff/font/devlj4/generate/Makefile#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/generate/special.awk#1 branch .. //depot/projects/hammer/contrib/groff/font/devlj4/generate/special.map#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/generate/symbol.map#1 branch .. //depot/projects/hammer/contrib/groff/font/devlj4/generate/text.map#4 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/generate/wingdings.map#1 branch .. //depot/projects/hammer/contrib/groff/font/devps/AB#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/ABI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/AI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/AR#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/HB#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/HBI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/HI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/HNB#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/HNBI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/HNI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/HNR#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/HR#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/NB#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/NBI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/NI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/NR#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/PB#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/PBI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/PI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/PR#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/S#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/SS#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/TB#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/TBI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/TI#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/TR#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/generate/Makefile#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/generate/afmname#2 integrate .. //depot/projects/hammer/contrib/groff/font/devps/generate/textmap#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/prologue.ps#4 integrate .. //depot/projects/hammer/contrib/groff/font/devps/symbolmap#4 integrate .. //depot/projects/hammer/contrib/groff/font/devutf8/NOTES#4 integrate .. //depot/projects/hammer/contrib/groff/font/devutf8/R.proto#4 integrate .. //depot/projects/hammer/contrib/groff/install-sh#2 integrate .. //depot/projects/hammer/contrib/groff/man/ditroff.man#2 integrate .. //depot/projects/hammer/contrib/groff/man/groff.man#4 integrate .. //depot/projects/hammer/contrib/groff/man/groff_char.man#4 integrate .. //depot/projects/hammer/contrib/groff/man/groff_diff.man#3 integrate .. //depot/projects/hammer/contrib/groff/man/groff_font.man#4 integrate .. //depot/projects/hammer/contrib/groff/man/groff_out.man#5 integrate .. //depot/projects/hammer/contrib/groff/man/groff_tmac.man#3 integrate .. //depot/projects/hammer/contrib/groff/man/roff.man#4 integrate .. //depot/projects/hammer/contrib/groff/mkinstalldirs#2 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grodvi/dvi.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grodvi/grodvi.man#4 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/grohtml.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/html-table.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/html-table.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/html-text.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/html-text.h#4 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/html.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/output.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/post-html.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grolbp/lbp.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grolbp/lbp.h#4 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grolj4/Makefile.sub#4 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grolj4/grolj4.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grolj4/lj4.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grolj4/lj4_font.man#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/grops/grops.man#4 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grops/ps.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grops/ps.h#4 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grops/psrm.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grotty/grotty.man#4 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grotty/tty.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/devices/xditview/ChangeLog#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/DESC.in#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/Dvi.c#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/Dvi.h#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/DviP.h#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/FontMap#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/GXditview.ad#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/Makefile.sub#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/Menu.h#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/README#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/TODO#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/ad2c#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/device.c#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/device.h#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/draw.c#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/font.c#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/gray1.bm#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/gray2.bm#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/gray3.bm#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/gray4.bm#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/gray5.bm#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/gray6.bm#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/gray7.bm#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/gray8.bm#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/gxditview.man#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/lex.c#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/page.c#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/parse.c#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/xdit.bm#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/xdit_mask.bm#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/xditview/xditview.c#1 branch .. //depot/projects/hammer/contrib/groff/src/include/DviChar.h#1 branch .. //depot/projects/hammer/contrib/groff/src/include/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/include/XFontName.h#1 branch .. //depot/projects/hammer/contrib/groff/src/include/assert.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/include/cmap.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/include/color.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/include/config.hin#3 integrate .. //depot/projects/hammer/contrib/groff/src/include/cset.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/include/device.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/include/driver.h#4 integrate .. //depot/projects/hammer/contrib/groff/src/include/errarg.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/include/error.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/include/font.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/include/geometry.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/include/getopt_int.h#1 branch .. //depot/projects/hammer/contrib/groff/src/include/gettext.h#1 branch .. //depot/projects/hammer/contrib/groff/src/include/groff-getopt.h#2 delete .. //depot/projects/hammer/contrib/groff/src/include/html-strings.h#4 integrate .. //depot/projects/hammer/contrib/groff/src/include/htmlhint.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/include/index.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/include/lib.h#4 integrate .. //depot/projects/hammer/contrib/groff/src/include/macropath.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/include/nonposix.h#4 integrate .. //depot/projects/hammer/contrib/groff/src/include/paper.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/include/posix.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/include/printer.h#4 integrate .. //depot/projects/hammer/contrib/groff/src/include/ptable.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/include/refid.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/include/relocate.h#1 branch .. //depot/projects/hammer/contrib/groff/src/include/search.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/include/searchpath.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/include/stringclass.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/include/symbol.h#1 branch .. //depot/projects/hammer/contrib/groff/src/include/unicode.h#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libbib/common.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libbib/index.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libbib/linear.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libbib/map.c#3 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libbib/search.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libdriver/input.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libdriver/printer.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/Makefile.sub#4 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/assert.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/change_lf.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/cmap.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/color.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/cset.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/device.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/errarg.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/error.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/fatal.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/fmod.c#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/font.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/fontfile.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/geometry.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/getcwd.c#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/glyphuni.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/htmlhint.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/hypot.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/iftoa.c#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/invalid.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/itoa.c#3 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/lf.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/macropath.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/matherr.c#3 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/maxfilename.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/maxpathname.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/mksdir.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/mkstemp.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/nametoindex.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/new.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/paper.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/progname.c#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/progname.cpp#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/ptable.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/quotearg.c#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/relocate.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/searchpath.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/spawnvp.c#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/strcasecmp.c#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/strerror.c#3 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/string.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/strsave.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/strtol.c#3 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/symbol.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/tmpfile.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/tmpname.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/unicode.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/uniglyph.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/uniuni.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libxutil/DviChar.c#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libxutil/Makefile.sub#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libxutil/XFontName.c#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libxutil/xmalloc.c#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/Makefile.sub#4 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/box.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/box.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/delim.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/eqn.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/eqn.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/eqn.y#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/lex.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/limit.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/list.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/main.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/mark.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/neqn.sh#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/other.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/over.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/pbox.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/pile.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/script.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/special.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/sqrt.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/text.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/grn/gprint.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/grn/grn.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/grn/hdb.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/grn/hgraph.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/grn/hpoint.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/grn/main.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/html/Makefile.sub#4 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/html/pre-html.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/html/pre-html.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/html/pushback.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/html/pushback.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/TODO#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/common.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/common.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/lex.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/main.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/object.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/object.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/output.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/pic.h#4 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/pic.man#4 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/pic.y#4 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/position.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/tex.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/troff.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/refer/command.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/refer/command.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/refer/label.y#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/refer/ref.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/refer/ref.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/refer/refer.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/refer/refer.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/refer/refer.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/refer/token.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/refer/token.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/soelim/Makefile.sub#4 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/soelim/soelim.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/soelim/soelim.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/tbl/Makefile.sub#4 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/tbl/main.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/tbl/table.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/tbl/table.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/tbl/tbl.man#4 integrate .. //depot/projects/hammer/contrib/groff/src/roff/groff/groff.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/roff/groff/groff.man#4 integrate .. //depot/projects/hammer/contrib/groff/src/roff/groff/pipeline.c#4 integrate .. //depot/projects/hammer/contrib/groff/src/roff/groff/pipeline.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/grog/grog.pl#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/grog/grog.sh#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/nroff/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/nroff/nroff.man#5 integrate .. //depot/projects/hammer/contrib/groff/src/roff/nroff/nroff.sh#6 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/Makefile.sub#4 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/charinfo.h#4 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/column.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/dictionary.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/dictionary.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/div.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/div.h#4 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/env.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/env.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/glyphuni.cpp#2 delete .. //depot/projects/hammer/contrib/groff/src/roff/troff/hvunits.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/input.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/input.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/mtsm.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/roff/troff/mtsm.h#1 branch .. //depot/projects/hammer/contrib/groff/src/roff/troff/node.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/node.h#4 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/number.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/reg.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/reg.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/request.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/symbol.cpp#2 delete .. //depot/projects/hammer/contrib/groff/src/roff/troff/symbol.h#3 delete .. //depot/projects/hammer/contrib/groff/src/roff/troff/token.h#4 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/troff.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/troff.man#4 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/unicode.cpp#2 delete .. //depot/projects/hammer/contrib/groff/src/roff/troff/unicode.h#2 delete .. //depot/projects/hammer/contrib/groff/src/roff/troff/uniglyph.cpp#2 delete .. //depot/projects/hammer/contrib/groff/src/roff/troff/uniuni.cpp#2 delete .. //depot/projects/hammer/contrib/groff/src/utils/addftinfo/addftinfo.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/utils/addftinfo/guess.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/utils/addftinfo/guess.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/utils/afmtodit/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/utils/afmtodit/afmtodit.man#4 integrate .. //depot/projects/hammer/contrib/groff/src/utils/afmtodit/afmtodit.pl#4 integrate .. //depot/projects/hammer/contrib/groff/src/utils/hpftodit/Makefile.sub#4 integrate .. //depot/projects/hammer/contrib/groff/src/utils/hpftodit/hpftodit.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/utils/hpftodit/hpftodit.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/utils/hpftodit/hpuni.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/utils/indxbib/Makefile.sub#4 integrate .. //depot/projects/hammer/contrib/groff/src/utils/indxbib/indxbib.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/utils/indxbib/signal.c#3 integrate .. //depot/projects/hammer/contrib/groff/src/utils/lkbib/lkbib.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/utils/lkbib/lkbib.man#2 integrate .. //depot/projects/hammer/contrib/groff/src/utils/lookbib/lookbib.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/utils/lookbib/lookbib.man#2 integrate .. //depot/projects/hammer/contrib/groff/src/utils/pfbtops/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/utils/pfbtops/pfbtops.c#4 integrate .. //depot/projects/hammer/contrib/groff/src/utils/pfbtops/pfbtops.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/utils/tfmtodit/tfmtodit.cpp#2 integrate .. //depot/projects/hammer/contrib/groff/src/utils/xtotroff/Makefile.in#1 branch .. //depot/projects/hammer/contrib/groff/src/utils/xtotroff/Makefile.sub#1 branch .. //depot/projects/hammer/contrib/groff/src/utils/xtotroff/xtotroff.c#1 branch .. //depot/projects/hammer/contrib/groff/src/utils/xtotroff/xtotroff.man#1 branch .. //depot/projects/hammer/contrib/groff/src/xditview/ChangeLog#4 delete .. //depot/projects/hammer/contrib/groff/src/xditview/DESC#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/Dvi.c#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/Dvi.h#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/DviChar.c#4 delete .. //depot/projects/hammer/contrib/groff/src/xditview/DviChar.h#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/DviP.h#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/FontMap#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/GXditview-ad.h#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/GXditview.ad#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/INSTALL#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/Imakefile.in#4 delete .. //depot/projects/hammer/contrib/groff/src/xditview/Menu.h#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/README#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/TODO#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/XFontName.c#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/XFontName.h#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/ad2c#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/device.c#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/device.h#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/draw.c#3 delete .. //depot/projects/hammer/contrib/groff/src/xditview/font.c#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/gray1.bm#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/gray2.bm#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/gray3.bm#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/gray4.bm#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/gray5.bm#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/gray6.bm#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/gray7.bm#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/gray8.bm#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/gxditview.man#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/lex.c#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/page.c#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/parse.c#3 delete .. //depot/projects/hammer/contrib/groff/src/xditview/xdit.bm#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/xdit_mask.bm#2 delete .. //depot/projects/hammer/contrib/groff/src/xditview/xditview.c#3 delete .. //depot/projects/hammer/contrib/groff/src/xditview/xtotroff.c#2 delete .. //depot/projects/hammer/contrib/groff/test-groff#3 delete .. //depot/projects/hammer/contrib/groff/test-groff.in#1 branch .. //depot/projects/hammer/contrib/groff/tmac/Makefile.sub#4 integrate .. //depot/projects/hammer/contrib/groff/tmac/TODO#2 integrate .. //depot/projects/hammer/contrib/groff/tmac/X.tmac#5 integrate .. //depot/projects/hammer/contrib/groff/tmac/Xps.tmac#4 integrate .. //depot/projects/hammer/contrib/groff/tmac/an-old.tmac#4 integrate .. //depot/projects/hammer/contrib/groff/tmac/composite.tmac#2 integrate .. //depot/projects/hammer/contrib/groff/tmac/devtag.tmac#1 branch .. //depot/projects/hammer/contrib/groff/tmac/doc-common#12 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-ditroff#7 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-nroff#6 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-old.tmac#2 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-syms#7 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc.tmac#11 integrate .. //depot/projects/hammer/contrib/groff/tmac/dvi.tmac#4 integrate .. //depot/projects/hammer/contrib/groff/tmac/e.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/groff_man.man#4 integrate .. //depot/projects/hammer/contrib/groff/tmac/groff_mdoc.man#10 integrate .. //depot/projects/hammer/contrib/groff/tmac/groff_ms.man#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/groff_trace.man#2 integrate .. //depot/projects/hammer/contrib/groff/tmac/groff_www.man#2 integrate .. //depot/projects/hammer/contrib/groff/tmac/html.tmac#4 integrate .. //depot/projects/hammer/contrib/groff/tmac/latin5.tmac#1 branch .. //depot/projects/hammer/contrib/groff/tmac/lbp.tmac#4 integrate .. //depot/projects/hammer/contrib/groff/tmac/papersize.tmac#2 integrate .. //depot/projects/hammer/contrib/groff/tmac/ps.tmac#4 integrate .. //depot/projects/hammer/contrib/groff/tmac/s.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/trace.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/troffrc#6 integrate .. //depot/projects/hammer/contrib/groff/tmac/troffrc-end#4 integrate .. //depot/projects/hammer/contrib/groff/tmac/tty-char.tmac#6 integrate .. //depot/projects/hammer/contrib/groff/tmac/tty.tmac#5 integrate .. //depot/projects/hammer/contrib/groff/tmac/unicode.tmac#1 branch .. //depot/projects/hammer/contrib/groff/tmac/www.tmac#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/driver_ndis.c#2 integrate .. //depot/projects/hammer/etc/rc.d/ike#5 integrate .. //depot/projects/hammer/etc/rc.d/named#14 integrate .. //depot/projects/hammer/etc/rc.d/ppp-user#8 integrate .. //depot/projects/hammer/etc/rc.d/sshd#7 integrate .. //depot/projects/hammer/etc/rc.d/wpa_supplicant#2 integrate .. //depot/projects/hammer/etc/rc.subr#27 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/grep.1#8 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/grep.c#8 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/search.c#8 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/Makefile.inc#6 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/font/Makefile.tty#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/font/devhtml/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/font/devlj4/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/devices/grolj4/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/devices/xditview/Makefile#1 branch .. //depot/projects/hammer/gnu/usr.bin/groff/src/include/config.h#4 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/libs/libgroff/Makefile#7 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/roff/troff/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/utils/hpftodit/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/Makefile#7 integrate .. //depot/projects/hammer/gnu/usr.bin/send-pr/send-pr.sh#7 integrate .. //depot/projects/hammer/include/pthread.h#12 integrate .. //depot/projects/hammer/lib/libedit/editline.3#8 integrate .. //depot/projects/hammer/lib/libkvm/kvm_amd64.c#19 integrate .. //depot/projects/hammer/lib/libkvm/kvm_i386.c#12 integrate .. //depot/projects/hammer/lib/libpthread/pthread.map#14 integrate .. //depot/projects/hammer/lib/libpthread/thread/Makefile.inc#13 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_condattr_pshared.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_mattr_pshared.c#1 branch .. //depot/projects/hammer/lib/libthr/pthread.map#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutexattr.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#3 integrate .. //depot/projects/hammer/lib/msun/src/k_cos.c#3 integrate .. //depot/projects/hammer/lib/msun/src/k_cosf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/k_sin.c#3 integrate .. //depot/projects/hammer/lib/msun/src/k_sinf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_cos.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_cosf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_sin.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_sinf.c#2 integrate .. //depot/projects/hammer/release/Makefile#77 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#32 integrate .. //depot/projects/hammer/sbin/devd/Makefile#7 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#16 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/geom_mirror.c#8 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/gmirror.8#12 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#47 integrate .. //depot/projects/hammer/sbin/restore/restore.8#12 integrate .. //depot/projects/hammer/share/doc/IPv6/IMPLEMENTATION#6 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#42 integrate .. //depot/projects/hammer/share/man/man4/polling.4#17 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#40 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#44 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#30 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#108 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#126 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#78 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#82 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#83 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_reg.c#10 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#26 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#21 integrate .. //depot/projects/hammer/sys/arm/arm/bcopyinout.S#8 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#26 integrate .. //depot/projects/hammer/sys/arm/arm/support.S#9 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_space.c#4 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/devicename.c#7 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/elf_freebsd.c#8 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/libofw.h#6 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_console.c#5 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_disk.c#7 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_memory.c#5 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/openfirm.c#6 integrate .. //depot/projects/hammer/sys/compat/freebsd32/Makefile#2 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#34 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#34 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#32 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#32 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#32 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#36 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#22 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#16 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#35 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#35 integrate .. //depot/projects/hammer/sys/conf/files#128 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#34 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#41 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#52 integrate .. //depot/projects/hammer/sys/conf/options.amd64#38 integrate .. //depot/projects/hammer/sys/conf/options.i386#40 integrate .. //depot/projects/hammer/sys/conf/options.pc98#36 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acdisasm.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acenv.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#14 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpi.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpica_prep.sh#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpiosxf.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpixf.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbcmds.c#14 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbdisply.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbexec.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbfileio.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbhistry.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbinput.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbstats.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbutils.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbxface.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmbuffer.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmnames.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmobject.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmopcode.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmresrc.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmresrcl.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmresrcs.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmutils.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmwalk.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsfield.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsinit.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsmethod.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsmthdat.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsobject.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsopcode.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsutils.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswexec.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswload.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswscope.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswstate.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evevent.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpe.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpeblk.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evmisc.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evregion.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evrgnini.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evsci.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxface.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxfevnt.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxfregn.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exconfig.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exconvrt.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/excreate.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exdump.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exfield.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exfldio.c#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exmisc.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exmutex.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exnames.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg1.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg2.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg3.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg6.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exprep.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exregion.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresnte.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresolv.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresop.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstore.c#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstoren.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstorob.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exsystem.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exutils.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwacpi.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwgpe.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwregs.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwsleep.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwtimer.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsaccess.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsalloc.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsdump.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsdumpdv.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nseval.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsinit.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsload.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsnames.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsobject.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsparse.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nssearch.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsutils.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nswalk.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfeval.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfname.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfobj.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/osunixxf.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psargs.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psopcode.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psparse.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psscope.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/pstree.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psutils.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/pswalk.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psxface.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsaddr.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rscalc.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rscreate.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsdump.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsio.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsirq.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rslist.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsmemory.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsmisc.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsutils.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsxface.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbconvrt.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbget.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbgetall.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbinstal.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbrsdt.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbutils.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbxface.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbxfroot.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utalloc.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utclib.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utcopy.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utdebug.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utdelete.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/uteval.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utglobal.c#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utinit.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utmath.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utmisc.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utobject.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utxface.c#7 integrate .. //depot/projects/hammer/sys/ddb/db_command.c#16 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#64 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#20 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_battery.c#14 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_smbat.c#1 branch .. //depot/projects/hammer/sys/dev/acpica/acpi_smbus.h#1 branch .. //depot/projects/hammer/sys/dev/acpica/acpiio.h#10 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#21 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#54 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#26 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_isa.c#13 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_rtl80x9.c#3 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#49 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#24 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.h#14 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_pccard.c#16 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme.c#24 integrate .. //depot/projects/hammer/sys/dev/hme/if_hmereg.h#5 integrate .. //depot/projects/hammer/sys/dev/hme/if_hmevar.h#6 integrate .. //depot/projects/hammer/sys/dev/ic/i8259.h#2 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#43 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#28 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#35 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#48 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#35 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#26 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#19 integrate .. //depot/projects/hammer/sys/dev/usb/if_udav.c#14 integrate .. //depot/projects/hammer/sys/dev/vge/if_vge.c#13 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_namei.c#2 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#77 integrate .. //depot/projects/hammer/sys/i386/cpufreq/p4tcc.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/apic_vector.s#14 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#50 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#73 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#42 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#49 integrate .. //depot/projects/hammer/sys/i386/include/smp.h#11 integrate .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#22 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#47 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#49 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#56 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#50 integrate .. //depot/projects/hammer/sys/kern/kern_linker.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#27 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#48 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#61 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#81 integrate .. //depot/projects/hammer/sys/kern/kern_time.c#19 integrate .. //depot/projects/hammer/sys/kern/subr_kdb.c#14 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#27 integrate .. //depot/projects/hammer/sys/kern/subr_taskqueue.c#13 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#49 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#47 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#47 integrate .. //depot/projects/hammer/sys/kern/uipc_cow.c#17 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#29 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi/Makefile#10 integrate .. //depot/projects/hammer/sys/modules/sound/driver/Makefile#4 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#15 integrate .. //depot/projects/hammer/sys/net/if_mib.c#5 integrate .. //depot/projects/hammer/sys/netinet/icmp6.h#10 integrate .. //depot/projects/hammer/sys/netinet/in.c#20 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#14 integrate .. //depot/projects/hammer/sys/netinet6/README#2 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#24 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#20 integrate .. //depot/projects/hammer/sys/netinet6/in6.h#13 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#15 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.h#5 integrate .. //depot/projects/hammer/sys/netinet6/in6_var.h#14 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#37 integrate .. //depot/projects/hammer/sys/netinet6/ip6_var.h#16 integrate .. //depot/projects/hammer/sys/netinet6/mld6.c#15 integrate .. //depot/projects/hammer/sys/netinet6/mld6_var.h#5 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#23 integrate .. //depot/projects/hammer/sys/netinet6/nd6.h#8 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#18 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#13 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#52 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#51 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#38 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#44 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#44 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#42 integrate .. //depot/projects/hammer/sys/pci/if_tl.c#27 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#38 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#32 integrate .. //depot/projects/hammer/sys/sparc64/conf/NOTES#17 integrate .. //depot/projects/hammer/sys/sys/mount.h#37 integrate .. //depot/projects/hammer/sys/sys/proc.h#88 integrate .. //depot/projects/hammer/sys/sys/signal.h#11 integrate .. //depot/projects/hammer/sys/sys/signalvar.h#15 integrate .. //depot/projects/hammer/sys/sys/smp.h#13 integrate .. //depot/projects/hammer/sys/sys/syscall.h#46 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#46 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#46 integrate .. //depot/projects/hammer/sys/sys/timers.h#3 integrate .. //depot/projects/hammer/sys/sys/timespec.h#5 integrate .. //depot/projects/hammer/sys/sys/unistd.h#8 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#54 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#45 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#56 integrate .. //depot/projects/hammer/usr.bin/alias/generic.sh#2 integrate .. //depot/projects/hammer/usr.bin/ncal/ncal.1#6 integrate .. //depot/projects/hammer/usr.bin/netstat/main.c#18 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.c#9 integrate .. //depot/projects/hammer/usr.sbin/powerd/powerd.c#8 integrate .. //depot/projects/hammer/usr.sbin/vipw/vipw.8#5 integrate .. //depot/projects/hammer/usr.sbin/wpa/ndis_events/ndis_events.8#2 integrate .. //depot/projects/hammer/usr.sbin/wpa/ndis_events/ndis_events.c#3 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Packet32.c#2 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Packet32.h#2 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/ntddndis.h#2 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#37 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.125 2005/08/25 17:14:39 emax Exp $ +$FreeBSD: src/MAINTAINERS,v 1.126 2005/10/24 08:15:58 ceri Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -134,6 +134,7 @@ lib/libsdp emax Pre-commit review preferred. usr.bin/bluetooth emax Pre-commit review preferred. usr.sbin/bluetooth emax Pre-commit review preferred. +gnu/usr.bin/send-pr bugmaster Pre-commit review requested. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/hammer/Makefile.inc1#104 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.512 2005/08/23 07:58:55 brian Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.513 2005/10/20 11:22:30 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -789,7 +789,7 @@ .if !defined(NO_CXX) _gperf= gnu/usr.bin/gperf -.if ${BOOTSTRAPPING} < 500113 +.if ${BOOTSTRAPPING} < 700004 _groff= gnu/usr.bin/groff .else _groff= gnu/usr.bin/groff/tmac ==== //depot/projects/hammer/contrib/groff/COPYING#2 (text+ko) ==== @@ -1,8 +1,8 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -279,7 +279,7 @@ END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -291,7 +291,7 @@ the "copyright" line and a pointer to where the full notice is found. - Copyright (C) 19yy + Copyright (C) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -305,14 +305,15 @@ You should have received a copy of the GNU General Public License >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 25 17:49:03 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2441716A41F; Tue, 25 Oct 2005 17:49:02 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 8667716A41F for ; Tue, 25 Oct 2005 17:49:02 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C64843D46 for ; Tue, 25 Oct 2005 17:49:02 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9PHn2Md036701 for ; Tue, 25 Oct 2005 17:49:02 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9PHn1R7036698 for perforce@freebsd.org; Tue, 25 Oct 2005 17:49:01 GMT (envelope-from alc@freebsd.org) Date: Tue, 25 Oct 2005 17:49:01 GMT Message-Id: <200510251749.j9PHn1R7036698@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 85836 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2005 17:49:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=85836 Change 85836 by alc@alc_home on 2005/10/25 17:48:31 Make reserve_lookup() responsible for the creation of a reservation if an existing one is not found. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_page.c#8 edit .. //depot/projects/superpages/src/sys/vm/vm_reserve.c#7 edit .. //depot/projects/superpages/src/sys/vm/vm_reserve.h#2 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_page.c#8 (text+ko) ==== @@ -782,7 +782,7 @@ { reservation_t top; vm_page_t m = NULL; - int flags, level, page_req; + int flags, page_req; page_req = req & VM_ALLOC_CLASS_MASK; KASSERT(curthread->td_intr_nesting_level == 0 || @@ -793,16 +793,7 @@ KASSERT(object != NULL, ("vm_page_alloc: NULL object.")); VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); - top = reserve_lookup(&level, object, pindex); - if (top == NULL && level > -1) { - m = preempt_contig_alloc(&level, TRUE); - if (m != NULL) { - top = new_reserve(level, object); - top->first_page = m; - top->first_pindex = pindex - SP_POS(object, - pindex, level); - } - } + top = reserve_lookup(object, pindex); } else top = NULL; ==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#7 (text+ko) ==== @@ -55,8 +55,10 @@ #define NO_RESQ SP_LEVELS /*reserv->rql==NO_RESQ -> reservation is in no reservation queue */ +static vm_page_t preempt_contig_alloc(int *level, int free_pool); static void preempt_move(reservation_t sp, boolean_t to_tail); +static reservation_t new_reserve(int level, vm_object_t object); static void reserve_procreate(reservation_t, vm_page_t); static uma_zone_t sp_zone; @@ -151,18 +153,16 @@ /* Look for an existing reservation for the given virtual address */ reservation_t -reserve_lookup(int *level /*OUT*/, vm_object_t object, - vm_pindex_t pindex) +reserve_lookup(vm_object_t object, vm_pindex_t pindex) { - int l; - vm_page_t p, s = NULL; /* predecessor, successor */ + int l, level; + reservation_t res; + vm_page_t m, p, s = NULL; /* predecessor, successor */ vm_pindex_t first, leftcap, rightcap; VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); - if ((object->flags & OBJ_SUPERPAGES) == 0 || pindex >= object->size) { - *level = -1; + if ((object->flags & OBJ_SUPERPAGES) == 0 || pindex >= object->size) return (NULL); - } if ((p = TAILQ_FIRST(&object->memq)) != NULL) { if (p->pindex < pindex) p = object->root = vm_page_splay(pindex, object->root); @@ -204,7 +204,17 @@ } l--; KASSERT(l >= -1 && l < SP_LEVELS, ("reserve_lookup: level not valid")); - *level = policy(object, pindex, l); + level = policy(object, pindex, l); + if (level > -1) { + m = preempt_contig_alloc(&level, TRUE); + if (m != NULL) { + res = new_reserve(level, object); + res->first_page = m; + res->first_pindex = pindex - SP_POS(object, pindex, + level); + return (res); + } + } return NULL; } @@ -223,7 +233,7 @@ return (res); } -reservation_t +static reservation_t new_reserve(int level, vm_object_t object) { reservation_t sp = uma_zalloc(sp_zone, M_NOWAIT | M_ZERO); @@ -498,7 +508,7 @@ * The free_pool parameter is a boolean value indicating * if we try to allocate from the free pool or not */ -vm_page_t +static vm_page_t preempt_contig_alloc(int *level, int free_pool) { int l, lev = level ? *level : -1; ==== //depot/projects/superpages/src/sys/vm/vm_reserve.h#2 (text+ko) ==== @@ -72,12 +72,10 @@ reservation_t child[SP_FACTOR]; }; -reservation_t new_reserve(int level, vm_object_t object); reservation_t reserve_lazy_update(vm_page_t m); -reservation_t reserve_lookup(int *, vm_object_t, vm_pindex_t); +reservation_t reserve_lookup(vm_object_t, vm_pindex_t); void reserve_populate(vm_page_t, reservation_t); void reserve_unpopulate(vm_page_t); -vm_page_t preempt_contig_alloc(int *level, int free_pool); void preempt_init(void) ; void preempt_destroy(vm_page_t m); From owner-p4-projects@FreeBSD.ORG Tue Oct 25 18:42:15 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA3BD16A421; Tue, 25 Oct 2005 18:42:14 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 99DA916A41F for ; Tue, 25 Oct 2005 18:42:14 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58C4D43D46 for ; Tue, 25 Oct 2005 18:42:14 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9PIgEvd039329 for ; Tue, 25 Oct 2005 18:42:14 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9PIgEBP039326 for perforce@freebsd.org; Tue, 25 Oct 2005 18:42:14 GMT (envelope-from jhb@freebsd.org) Date: Tue, 25 Oct 2005 18:42:14 GMT Message-Id: <200510251842.j9PIgEBP039326@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 Cc: Subject: PERFORCE change 85840 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2005 18:42:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=85840 Change 85840 by jhb@jhb_slimer on 2005/10/25 18:41:21 Save this patch here so I don't lose it. The original problem reporter on current@ never got back to me. :( Affected files ... .. //depot/projects/smpng/sys/kern/link_elf.c#29 edit Differences ... ==== //depot/projects/smpng/sys/kern/link_elf.c#29 (text+ko) ==== @@ -1022,6 +1022,12 @@ unsigned long hash; int i; + /* If we don't have a hash, bail. */ + if (ef->buckets == NULL || ef->nbuckets == 0) { + printf("link_elf_lookup_symbol: missing symbol hash table\n"); + return ENOENT; + } + /* First, search hashed global symbols */ hash = elf_hash(name); symnum = ef->buckets[hash % ef->nbuckets]; From owner-p4-projects@FreeBSD.ORG Tue Oct 25 20:20:16 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6EB616A422; Tue, 25 Oct 2005 20:20:15 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 84C0716A420 for ; Tue, 25 Oct 2005 20:20:15 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 250CB43D48 for ; Tue, 25 Oct 2005 20:20:15 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9PKKFnC045664 for ; Tue, 25 Oct 2005 20:20:15 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9PKKE3B045657 for perforce@freebsd.org; Tue, 25 Oct 2005 20:20:14 GMT (envelope-from jhb@freebsd.org) Date: Tue, 25 Oct 2005 20:20:14 GMT Message-Id: <200510252020.j9PKKE3B045657@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 Cc: Subject: PERFORCE change 85846 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2005 20:20:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=85846 Change 85846 by jhb@jhb_slimer on 2005/10/25 20:19:31 IFC @85845 - loop back intr_event stuff. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#36 integrate .. //depot/projects/smpng/sys/alpha/isa/isa.c#15 integrate .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#13 integrate .. //depot/projects/smpng/sys/amd64/include/intr_machdep.h#5 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic.c#10 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_cfgreg.c#8 integrate .. //depot/projects/smpng/sys/arm/arm/intr.c#11 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/devicename.c#9 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_disk.c#11 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#48 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#51 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe_pccard.c#17 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#27 integrate .. //depot/projects/smpng/sys/dev/hme/if_hmereg.h#7 integrate .. //depot/projects/smpng/sys/dev/hme/if_hmevar.h#9 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#35 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#17 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#62 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#57 integrate .. //depot/projects/smpng/sys/dev/uart/uart_kbd_sun.c#6 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#15 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#15 integrate .. //depot/projects/smpng/sys/i386/include/intr_machdep.h#7 integrate .. //depot/projects/smpng/sys/i386/isa/atpic.c#13 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#29 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#72 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#26 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#142 integrate .. //depot/projects/smpng/sys/modules/sound/driver/Makefile#6 integrate .. //depot/projects/smpng/sys/powerpc/include/intr_machdep.h#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#7 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#18 integrate .. //depot/projects/smpng/sys/sparc64/include/intr_machdep.h#12 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#24 integrate .. //depot/projects/smpng/sys/sys/interrupt.h#17 integrate .. //depot/projects/smpng/sys/sys/proc.h#154 integrate .. //depot/projects/smpng/sys/sys/unistd.h#13 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_bmap.c#15 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#36 (text+ko) ==== @@ -33,7 +33,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.87 2005/09/29 19:12:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.88 2005/10/25 19:48:45 jhb Exp $"); #include #include @@ -325,8 +325,9 @@ struct alpha_intr { LIST_ENTRY(alpha_intr) list; /* chain handlers in this hash bucket */ uintptr_t vector; /* vector to match */ - struct ithd *ithd; /* interrupt thread */ + struct intr_event *ie; /* interrupt event structure */ volatile long *cntp; /* interrupt counter */ + void (*disable)(uintptr_t); }; static struct mtx alpha_intr_hash_lock; @@ -338,7 +339,7 @@ ithds_init(void *dummy) { - mtx_init(&alpha_intr_hash_lock, "ithread table lock", NULL, MTX_SPIN); + mtx_init(&alpha_intr_hash_lock, "intr table", NULL, MTX_SPIN); } SYSINIT(ithds_init, SI_SUB_INTR, SI_ORDER_SECOND, ithds_init, NULL); @@ -371,8 +372,9 @@ return ENOMEM; i->vector = vector; i->cntp = cntp; - errcode = ithread_create(&i->ithd, vector, 0, disable, enable, - "intr:"); + i->disable = disable; + errcode = intr_event_create(&i->ie, (void *)vector, 0, + (void (*)(void *))enable, "intr:"); if (errcode) { free(i, M_DEVBUF); return errcode; @@ -384,44 +386,49 @@ } /* Second, add this handler. */ - return (ithread_add_handler(i->ithd, name, handler, arg, - ithread_priority(flags), flags, cookiep)); + return (intr_event_add_handler(i->ie, name, handler, arg, + intr_priority(flags), flags, cookiep)); } int alpha_teardown_intr(void *cookie) { - return (ithread_remove_handler(cookie)); + return (intr_event_remove_handler(cookie)); } +/* + * XXX: Alpha doesn't count stray interrupts like some of the other archs. + */ void alpha_dispatch_intr(void *frame, unsigned long vector) { int h = HASHVEC(vector); struct alpha_intr *i; - struct ithd *ithd; /* our interrupt thread */ - struct intrhand *ih; - int error; + struct intr_event *ie; + struct intr_handler *ih; + int error, thread; /* * Walk the hash bucket for this vector looking for this vector's - * interrupt thread. + * interrupt structure. */ for (i = LIST_FIRST(&alpha_intr_hash[h]); i && i->vector != vector; i = LIST_NEXT(i, list)) ; /* nothing */ + + /* No interrupt structure for this vector. */ if (i == NULL) - return; /* no ithread for this vector */ + return; - ithd = i->ithd; - KASSERT(ithd != NULL, ("interrupt vector without a thread")); + ie = i->ie; + KASSERT(ie != NULL, ("interrupt structure without an event")); /* - * As an optimization, if an ithread has no handlers, don't + * As an optimization, if an event has no handlers, don't * schedule it to run. */ - if (TAILQ_EMPTY(&ithd->it_handlers)) + if (TAILQ_EMPTY(&ie->ie_handlers)) return; atomic_add_long(i->cntp, 1); @@ -433,25 +440,32 @@ */ sched_pin(); + /* Execute all fast interrupt handlers directly. */ + thread = 0; + critical_enter(); + TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { + if (!(ih->ih_flags & IH_FAST)) { + thread = 1; + continue; + } + CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, + ih->ih_handler, ih->ih_argument, ih->ih_name); + ih->ih_handler(ih->ih_argument); + } + critical_exit(); + /* - * Handle a fast interrupt if there is no actual thread for this - * interrupt by calling the handler directly without Giant. Note - * that this means that any fast interrupt handler must be MP safe. + * If the ithread needs to run, disable the source and schedule the + * thread. */ - ih = TAILQ_FIRST(&ithd->it_handlers); - if ((ih->ih_flags & IH_FAST) != 0) { - critical_enter(); - ih->ih_handler(ih->ih_argument); - critical_exit(); - } else { - if (ithd->it_disable) { + if (thread) { + if (i->disable) { CTR1(KTR_INTR, "alpha_dispatch_intr: disabling vector 0x%x", i->vector); - ithd->it_disable(ithd->it_vector); + i->disable(i->vector); } - - error = ithread_schedule(ithd); + error = intr_event_schedule_thread(ie); KASSERT(error == 0, ("got an impossible stray interrupt")); } sched_unpin(); ==== //depot/projects/smpng/sys/alpha/isa/isa.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.37 2005/09/25 19:34:54 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.38 2005/10/25 19:48:45 jhb Exp $"); #include #include @@ -389,14 +389,14 @@ struct resource *irq, void *cookie) { struct isa_intr *ii = cookie; - struct intrhand *ih, *handler = (struct intrhand *)ii->ih; - struct ithd *ithread = handler->ih_ithread; + struct intr_handler *ih, *handler = (struct intr_handler *)ii->ih; + struct intr_event *ie = handler->ih_event; int num_handlers = 0; - mtx_lock(&ithread->it_lock); - TAILQ_FOREACH(ih, &ithread->it_handlers, ih_next) + mtx_lock(&ie->ie_lock); + TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) num_handlers++; - mtx_unlock(&ithread->it_lock); + mtx_unlock(&ie->ie_lock); /* * Only disable the interrupt in hardware if there are no ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#13 (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/amd64/amd64/intr_machdep.c,v 1.15 2005/06/24 00:45:01 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.16 2005/10/25 19:48:45 jhb Exp $ */ /* @@ -57,7 +57,7 @@ #define MAX_STRAY_LOG 5 -typedef void (*mask_fn)(uintptr_t vector); +typedef void (*mask_fn)(void *); static int intrcnt_index; static struct intsrc *interrupt_sources[NUM_IO_INTS]; @@ -81,15 +81,14 @@ vector = isrc->is_pic->pic_vector(isrc); if (interrupt_sources[vector] != NULL) return (EEXIST); - error = ithread_create(&isrc->is_ithread, (uintptr_t)isrc, 0, - (mask_fn)isrc->is_pic->pic_disable_source, + error = intr_event_create(&isrc->is_event, isrc, 0, (mask_fn)isrc->is_pic->pic_enable_source, "irq%d:", vector); if (error) return (error); mtx_lock_spin(&intr_table_lock); if (interrupt_sources[vector] != NULL) { mtx_unlock_spin(&intr_table_lock); - ithread_destroy(isrc->is_ithread); + intr_event_destroy(isrc->is_event); return (EEXIST); } intrcnt_register(isrc); @@ -115,8 +114,8 @@ isrc = intr_lookup_source(vector); if (isrc == NULL) return (EINVAL); - error = ithread_add_handler(isrc->is_ithread, name, handler, arg, - ithread_priority(flags), flags, cookiep); + error = intr_event_add_handler(isrc->is_event, name, handler, arg, + intr_priority(flags), flags, cookiep); if (error == 0) { intrcnt_updatename(isrc); isrc->is_pic->pic_enable_intr(isrc); @@ -130,7 +129,7 @@ { int error; - error = ithread_remove_handler(cookie); + error = intr_event_remove_handler(cookie); #ifdef XXX if (error == 0) intrcnt_updatename(/* XXX */); @@ -153,12 +152,11 @@ intr_execute_handlers(struct intsrc *isrc, struct intrframe *iframe) { struct thread *td; - struct ithd *it; - struct intrhand *ih; - int error, vector; + struct intr_event *ie; + struct intr_handler *ih; + int error, vector, thread; td = curthread; - td->td_intr_nesting_level++; /* * We count software interrupts when we process them. The @@ -169,11 +167,7 @@ (*isrc->is_count)++; PCPU_LAZY_INC(cnt.v_intr); - it = isrc->is_ithread; - if (it == NULL) - ih = NULL; - else - ih = TAILQ_FIRST(&it->it_handlers); + ie = isrc->is_event; /* * XXX: We assume that IRQ 0 is only used for the ISA timer @@ -183,40 +177,12 @@ if (vector == 0) clkintr_pending = 1; - if (ih != NULL && ih->ih_flags & IH_FAST) { - /* - * Execute fast interrupt handlers directly. - * To support clock handlers, if a handler registers - * with a NULL argument, then we pass it a pointer to - * a trapframe as its argument. - */ - critical_enter(); - TAILQ_FOREACH(ih, &it->it_handlers, ih_next) { - MPASS(ih->ih_flags & IH_FAST); - CTR3(KTR_INTR, "%s: executing handler %p(%p)", - __func__, ih->ih_handler, - ih->ih_argument == NULL ? iframe : - ih->ih_argument); - if (ih->ih_argument == NULL) - ih->ih_handler(iframe); - else - ih->ih_handler(ih->ih_argument); - } - isrc->is_pic->pic_eoi_source(isrc); - error = 0; - critical_exit(); - } else { - /* - * For stray and threaded interrupts, we mask and EOI the - * source. - */ + /* + * For stray interrupts, mask and EOI the source, bump the + * stray count, and log the condition. + */ + if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers)) { isrc->is_pic->pic_disable_source(isrc, PIC_EOI); - if (ih == NULL) - error = EINVAL; - else - error = ithread_schedule(it); - } - if (error == EINVAL) { (*isrc->is_straycount)++; if (*isrc->is_straycount < MAX_STRAY_LOG) log(LOG_ERR, "stray irq%d\n", vector); @@ -225,6 +191,46 @@ "too many stray irq %d's: not logging anymore\n", vector); } + + /* + * Execute fast interrupt handlers directly. + * To support clock handlers, if a handler registers + * with a NULL argument, then we pass it a pointer to + * an intrframe as its argument. + */ + td->td_intr_nesting_level++; + thread = 0; + critical_enter(); + TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { + if (!(ih->ih_flags & IH_FAST)) { + thread = 1; + continue; + } + CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, + ih->ih_handler, ih->ih_argument == NULL ? iframe : + ih->ih_argument, ih->ih_name); + if (ih->ih_argument == NULL) + ih->ih_handler(iframe); + else + ih->ih_handler(ih->ih_argument); + } + + /* + * If there are any threaded handlers that need to run, + * mask the source as well as sending it an EOI. Otherwise, + * just send it an EOI but leave it unmasked. + */ + if (thread) + isrc->is_pic->pic_disable_source(isrc, PIC_EOI); + else + isrc->is_pic->pic_eoi_source(isrc); + critical_exit(); + + /* Schedule the ithread if needed. */ + if (thread) { + error = intr_event_schedule_thread(ie); + KASSERT(error == 0, ("bad stray interrupt")); + } td->td_intr_nesting_level--; } @@ -266,7 +272,7 @@ intrcnt_updatename(struct intsrc *is) { - intrcnt_setname(is->is_ithread->it_td->td_proc->p_comm, is->is_index); + intrcnt_setname(is->is_event->ie_fullname, is->is_index); } static void @@ -275,7 +281,7 @@ char straystr[MAXCOMLEN + 1]; /* mtx_assert(&intr_table_lock, MA_OWNED); */ - KASSERT(is->is_ithread != NULL, ("%s: isrc with no ithread", __func__)); + KASSERT(is->is_event != NULL, ("%s: isrc with no event", __func__)); is->is_index = intrcnt_index; intrcnt_index += 2; snprintf(straystr, MAXCOMLEN + 1, "stray irq%d", @@ -325,6 +331,6 @@ db_setup_paging(db_simple_pager, &quit, db_lines_per_page); for (i = 0; i < NUM_IO_INTS && !quit; i++, isrc++) if (*isrc != NULL) - db_dump_ithread((*isrc)->is_ithread, verbose); + db_dump_intr_event((*isrc)->is_event, verbose); } #endif ==== //depot/projects/smpng/sys/amd64/include/intr_machdep.h#5 (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/amd64/include/intr_machdep.h,v 1.5 2005/01/21 06:01:20 peter Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.6 2005/10/25 19:48:46 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -75,7 +75,7 @@ */ struct intsrc { struct pic *is_pic; - struct ithd *is_ithread; + struct intr_event *is_event; u_long *is_count; u_long *is_straycount; u_int is_index; ==== //depot/projects/smpng/sys/amd64/isa/atpic.c#10 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.15 2005/01/21 06:01:20 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.16 2005/10/25 19:48:46 jhb Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -472,10 +472,10 @@ isrc = &atintrs[vec].at_intsrc; /* - * If we don't have an ithread, see if this is a spurious + * If we don't have an event, see if this is a spurious * interrupt. */ - if (isrc->is_ithread == NULL && (vec == 7 || vec == 15)) { + if (isrc->is_event == NULL && (vec == 7 || vec == 15)) { int port, isr; /* ==== //depot/projects/smpng/sys/amd64/pci/pci_cfgreg.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.108 2005/01/21 05:56:41 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.109 2005/10/25 04:53:29 wpaul Exp $"); #include #include @@ -139,11 +139,15 @@ { switch (cfgmech) { case 1: - outl(CONF1_ADDR_PORT, 0); + /* + * Do nothing for the config mechanism 1 case. + * Writing a 0 to the address port can apparently + * confuse some bridges and cause spurious + * access failures. + */ break; case 2: outb(CONF2_ENABLE_PORT, 0); - outb(CONF2_FORWARD_PORT, 0); break; } } ==== //depot/projects/smpng/sys/arm/arm/intr.c#11 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.10 2005/10/03 14:17:16 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.11 2005/10/25 19:48:46 jhb Exp $"); #include #include #include @@ -50,7 +50,7 @@ #include #include -static struct ithd *ithreads[NIRQ]; +static struct intr_event *intr_events[NIRQ]; static int intrcnt_tab[NIRQ]; static int intrcnt_index = 0; static int last_printed = 0; @@ -61,18 +61,18 @@ arm_setup_irqhandler(const char *name, void (*hand)(void*), void *arg, int irq, int flags, void **cookiep) { - struct ithd *cur_ith; + struct intr_event *event; int error; if (irq < 0 || irq >= NIRQ) return; - cur_ith = ithreads[irq]; - if (cur_ith == NULL) { - error = ithread_create(&cur_ith, irq, 0, arm_mask_irq, - arm_unmask_irq, "intr%d:", irq); + event = intr_events[irq]; + if (event == NULL) { + error = intr_event_create(&event, (void *)irq, 0, + (void (*)(void *))arm_unmask_irq, "intr%d:", irq); if (error) return; - ithreads[irq] = cur_ith; + intr_events[irq] = event; last_printed += snprintf(intrnames + last_printed, MAXCOMLEN + 1, @@ -82,14 +82,14 @@ intrcnt_index++; } - ithread_add_handler(cur_ith, name, hand, arg, - ithread_priority(flags), flags, cookiep); + intr_event_add_handler(event, name, hand, arg, + intr_priority(flags), flags, cookiep); } int arm_remove_irqhandler(void *cookie) { - return (ithread_remove_handler(cookie)); + return (intr_event_remove_handler(cookie)); } void dosoftints(void); @@ -101,28 +101,34 @@ void arm_handler_execute(void *frame, int irqnb) { - struct ithd *ithd; - int i; - struct intrhand *ih; + struct intr_event *event; + struct intr_handler *ih; struct thread *td = curthread; + int i, thread; td->td_intr_nesting_level++; while ((i = arm_get_next_irq()) != -1) { arm_mask_irq(i); intrcnt[intrcnt_tab[i]]++; - ithd = ithreads[i]; - if (!ithd) + event = intr_events[i]; + if (!event || TAILQ_EMPTY(&event->ie_handlers)) continue; - ih = TAILQ_FIRST(&ithd->it_handlers); - if (ih && ih->ih_flags & IH_FAST) { - TAILQ_FOREACH(ih, &ithd->it_handlers, - ih_next) { + + /* Execute fast handlers. */ + thread = 0; + TAILQ_FOREACH(ih, &event->ie_handlers, ih_next) { + if (!(ih->ih_flags & IH_FAST)) + thread = 1; + else ih->ih_handler(ih->ih_argument ? ih->ih_argument : frame); - } + } + + /* Schedule thread if needed. */ + if (thread) + intr_event_schedule_thread(event); + else arm_unmask_irq(i); - } else if (ih) - ithread_schedule(ithd); } td->td_intr_nesting_level--; } ==== //depot/projects/smpng/sys/boot/ofw/libofw/devicename.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/devicename.c,v 1.15 2004/01/04 23:27:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/devicename.c,v 1.16 2005/10/25 12:49:56 marius Exp $"); #include #include "libofw.h" @@ -99,9 +99,13 @@ return(ENOENT); found: - if (*s != '\0') + if (path != NULL && *s != '\0') *path = s; idev = malloc(sizeof(struct ofw_devdesc)); + if (idev == NULL) { + printf("ofw_parsedev: malloc failed\n"); + return ENOMEM; + } strcpy(idev->d_path, name); idev->d_dev = dv; idev->d_type = dv->dv_type; ==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_disk.c#11 (text+ko) ==== @@ -24,13 +24,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_disk.c,v 1.12 2005/01/05 22:16:58 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_disk.c,v 1.13 2005/10/25 12:51:49 marius Exp $"); /* * Disk I/O routines using Open Firmware */ #include +#include #include @@ -60,9 +61,18 @@ ofwd_print }; +struct opened_dev { + ihandle_t handle; + u_int count; + SLIST_ENTRY(opened_dev) link; +}; + +SLIST_HEAD(, opened_dev) opened_devs = SLIST_HEAD_INITIALIZER(opened_dev); + static int ofwd_init(void) { + return 0; } @@ -73,7 +83,6 @@ struct ofw_devdesc *dp = (struct ofw_devdesc *)devdata; daddr_t pos; int n; - int i, j; pos = dblk * 512; do { @@ -90,18 +99,47 @@ static int ofwd_open(struct open_file *f, ...) { + char path[256]; struct ofw_devdesc *dp; - phandle_t handle; + struct opened_dev *odp; va_list vl; va_start(vl, f); dp = va_arg(vl, struct ofw_devdesc *); va_end(vl); - if ((handle = OF_open(dp->d_path)) == -1) { + /* + * We're not guaranteed to be able to open a device more than once + * simultaneously and there is no OFW standard method to determine + * whether a device is already opened. Opening a device more than + * once happens to work with most OFW block device drivers but + * triggers a trap with at least the driver for the on-board SCSI + * controller in Sun Ultra 1. Upper layers and MI code expect to + * be able to open a device more than once however. As a workaround + * keep track of the opened devices and reuse the instance handle + * when asked to open an already opened device. + */ + SLIST_FOREACH(odp, &opened_devs, link) { + if (OF_instance_to_path(odp->handle, path, sizeof(path)) == -1) + continue; + if (strcmp(path, dp->d_path) == 0) { + odp->count++; + dp->d_handle = odp->handle; + return 0; + } + } + odp = malloc(sizeof(struct opened_dev)); + if (odp == NULL) { + printf("ofwd_open: malloc failed\n"); + return ENOMEM; + } + if ((odp->handle = OF_open(dp->d_path)) == -1) { printf("ofwd_open: Could not open %s\n", dp->d_path); - return 1; + free(odp); + return ENOENT; } - dp->d_handle = handle; + odp->count = 1; + SLIST_INSERT_HEAD(&opened_devs, odp, link); + dp->d_handle = odp->handle; return 0; } @@ -109,8 +147,20 @@ ofwd_close(struct open_file *f) { struct ofw_devdesc *dev = f->f_devdata; + struct opened_dev *odp; - OF_close(dev->d_handle); + SLIST_FOREACH(odp, &opened_devs, link) { + if (odp->handle == dev->d_handle) { + odp->count--; + if (odp->count == 0) { + SLIST_REMOVE(&opened_devs, odp, opened_dev, + link); + OF_close(odp->handle); + free(odp); + } + break; + } + } return 0; } @@ -124,4 +174,5 @@ static void ofwd_print(int verbose) { + } ==== //depot/projects/smpng/sys/conf/kern.post.mk#48 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.84 2005/09/11 00:22:21 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.86 2005/10/25 09:05:07 ru Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -63,9 +63,14 @@ .endif .endif -.if defined(DEBUG) +.if !defined(DEBUG) +FULLKERNEL= ${KERNEL_KO} +.else +FULLKERNEL= ${KERNEL_KO}.debug +${KERNEL_KO}: ${FULLKERNEL} + ${OBJCOPY} --strip-debug ${FULLKERNEL} ${KERNEL_KO} install.debug reinstall.debug: gdbinit - cd ${.CURDIR}; ${MAKE} -DINSTALL_DEBUG ${.TARGET:R} + cd ${.CURDIR}; ${MAKE} ${.TARGET:R} # Install gdbinit files for kernel debugging. gdbinit: @@ -78,7 +83,7 @@ .endif .endif -${KERNEL_KO}: ${SYSTEM_DEP} vers.o +${FULLKERNEL}: ${SYSTEM_DEP} vers.o @rm -f ${.TARGET} @echo linking ${.TARGET} ${SYSTEM_LD} @@ -104,7 +109,7 @@ kernel-clean: rm -f *.o *.so *.So *.ko *.s eddep errs \ - ${KERNEL_KO} linterrs makelinks tags vers.c \ + ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks tags vers.c \ vnode_if.c vnode_if.h vnode_if_newproto.h vnode_if_typedef.h \ ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ ${CLEAN} @@ -181,7 +186,7 @@ .endif kernel-install: - @if [ ! -f ${KERNEL_KO} ] ; then \ + @if [ ! -f ${FULLKERNEL} ] ; then \ echo "You must build a kernel first." ; \ exit 1 ; \ fi @@ -200,11 +205,19 @@ fi .endif mkdir -p ${DESTDIR}${KODIR} +.if defined(DEBUG) && !defined(INSTALL_NODEBUG) + ${INSTALL} -p -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR}/${KERNEL_KO} +.else ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} +.endif kernel-reinstall: @-chflags -R noschg ${DESTDIR}${KODIR} +.if defined(DEBUG) && !defined(INSTALL_NODEBUG) + ${INSTALL} -p -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR}/${KERNEL_KO} +.else ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} +.endif config.o env.o hints.o vers.o vnode_if.o: ${NORMAL_C} ==== //depot/projects/smpng/sys/conf/kmod.mk#51 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.196 2005/10/14 15:13:36 ru Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.197 2005/10/25 09:05:07 ru Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -236,21 +236,17 @@ _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} .endfor -.if !target(install.debug) && defined(DEBUG_FLAGS) -install.debug: - cd ${.CURDIR}; ${MAKE} -DINSTALL_DEBUG install -.endif - .if !target(realinstall) realinstall: _kmodinstall .ORDER: beforeinstall _kmodinstall _kmodinstall: -.if defined(DEBUG_FLAGS) && defined(INSTALL_DEBUG) +.if defined(DEBUG_FLAGS) && !defined(INSTALL_NODEBUG) ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ - ${_INSTALLFLAGS} ${FULLPROG} ${DESTDIR}${KMODDIR} + ${_INSTALLFLAGS} ${FULLPROG} ${DESTDIR}${KMODDIR}/${PROG} .else ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR} +.endif .include @@ -264,7 +260,6 @@ kldxref ${DESTDIR}${KMODDIR}; \ fi .endif -.endif .endif # !target(realinstall) .endif # !target(install) ==== //depot/projects/smpng/sys/dev/fe/if_fe_pccard.c#17 (text+ko) ==== @@ -22,7 +22,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe_pccard.c,v 1.30 2005/09/22 05:52:54 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe_pccard.c,v 1.31 2005/10/25 03:49:24 imp Exp $"); #include #include @@ -64,6 +64,7 @@ struct pccard_product mpp_product; int mpp_flags; #define MPP_MBH10302 1 +#define MPP_ANYFUNC 2 } fe_pccard_products[] = { /* These need to be first */ { PCMCIA_CARD(FUJITSU2, FMV_J181), MPP_MBH10302 }, @@ -81,31 +82,32 @@ { PCMCIA_CARD(FUJITSU, LA10S), 0 }, { PCMCIA_CARD(FUJITSU, NE200T), MPP_MBH10302 },/* Sold by Eagle */ { PCMCIA_CARD(RATOC, REX_R280), 0 }, + { PCMCIA_CARD(XIRCOM, CE), MPP_ANYFUNC }, { { NULL } } }; static int fe_pccard_probe(device_t dev) { - const struct pccard_product *pp; int error; uint32_t fcn = PCCARD_FUNCTION_UNSPEC; + const struct fe_pccard_product *pp; - /* Make sure we're a network function */ - error = pccard_get_function(dev, &fcn); - if (error != 0) - return (error); - if (fcn != PCCARD_FUNCTION_NETWORK) - return (ENXIO); - - if ((pp = pccard_product_lookup(dev, + if ((pp = (const struct fe_pccard_product *)pccard_product_lookup(dev, (const struct pccard_product *)fe_pccard_products, sizeof(fe_pccard_products[0]), NULL)) != NULL) { - if (pp->pp_name != NULL) - device_set_desc(dev, pp->pp_name); - return 0; + if (pp->mpp_product.pp_name != NULL) + device_set_desc(dev, pp->mpp_product.pp_name); + if (pp->mpp_flags & MPP_ANYFUNC) + return (0); + /* Make sure we're a network function */ + error = pccard_get_function(dev, &fcn); + if (error != 0) + return (error); + if (fcn != PCCARD_FUNCTION_NETWORK) + return (ENXIO); } - return EIO; + return (ENXIO); } static device_method_t fe_pccard_methods[] = { @@ -248,6 +250,40 @@ return 0; } +static int +sn_pccard_xircom_mac(const struct pccard_tuple *tuple, void *argp) +{ + uint8_t *enaddr = argp; + int i; + +#if 1 + /* + * We fail to map the CIS twice, for reasons unknown. We + * may fix this in the future by loading the CIS with a sane + * CIS from userland. + */ + static uint8_t defaultmac[ETHER_ADDR_LEN] = { + 0x00, 0x80, 0xc7, 0xed, 0x16, 0x7b}; + + /* Copy the MAC ADDR and return success */ + for (i = 0; i < ETHER_ADDR_LEN; i++) + enaddr[i] = defaultmac[i]; +#else + /* FUNCE is not after FUNCID, so we gotta go find it */ + if (tuple->code != 0x22) + return (0); + + /* Make sure this is a sane node */ + if (tuple->length < ETHER_ADDR_LEN + 3) + return (0); + + /* Copy the MAC ADDR and return success */ + for (i = 0; i < ETHER_ADDR_LEN; i++) + enaddr[i] = pccard_tuple_read_1(tuple, i + 3); +#endif + return (1); +} + /* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 25 20:21:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 536E616A422; Tue, 25 Oct 2005 20:21:17 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 2D6E916A420 for ; Tue, 25 Oct 2005 20:21:17 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBDAA43D48 for ; Tue, 25 Oct 2005 20:21:16 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9PKLGBA045728 for ; Tue, 25 Oct 2005 20:21:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9PKLGVu045725 for perforce@freebsd.org; Tue, 25 Oct 2005 20:21:16 GMT (envelope-from jhb@freebsd.org) Date: Tue, 25 Oct 2005 20:21:16 GMT Message-Id: <200510252021.j9PKLGVu045725@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 Cc: Subject: PERFORCE change 85847 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2005 20:21:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=85847 Change 85847 by jhb@jhb_slimer on 2005/10/25 20:20:54 Update. Affected files ... .. //depot/projects/smpng/sys/notes#65 edit Differences ... ==== //depot/projects/smpng/sys/notes#65 (text+ko) ==== @@ -80,7 +80,7 @@ - sparc64 Active child branches: -- jhb_intr - intr_event stuff +- jhb_intr - fast ithreads and MSI? (perhaps do MSI in jhb_acpipci) - jhb_ktrace - kernel debugging stuff, possibly per-thread ktrace - jhb_lock - rwlocks - jhb_needresched - scheduler fun From owner-p4-projects@FreeBSD.ORG Wed Oct 26 02:24:40 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 122AF16A421; Wed, 26 Oct 2005 02:24:40 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 AE4DA16A41F for ; Wed, 26 Oct 2005 02:24:39 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63A0343D49 for ; Wed, 26 Oct 2005 02:24:39 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9Q2Odee040193 for ; Wed, 26 Oct 2005 02:24:39 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9Q2Odds040190 for perforce@freebsd.org; Wed, 26 Oct 2005 02:24:39 GMT (envelope-from alc@freebsd.org) Date: Wed, 26 Oct 2005 02:24:39 GMT Message-Id: <200510260224.j9Q2Odds040190@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 85860 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2005 02:24:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=85860 Change 85860 by alc@alc_sp01 on 2005/10/26 02:24:09 Properly synchronize the preemption of reservations. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_reserve.c#8 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#8 (text+ko) ==== @@ -512,8 +512,10 @@ preempt_contig_alloc(int *level, int free_pool) { int l, lev = level ? *level : -1; + vm_object_t object; vm_page_t m = NULL; - reservation_t sp; + reservation_t sp, sp_next; + boolean_t was_trylocked; retry: if (free_pool) { @@ -531,13 +533,26 @@ /* 3. try rres at level lev or higher */ for (l = lev; l <= SP_LEVELS - 2; l++) { - while ( (sp = TAILQ_FIRST(&rres[l])) ) { + mtx_lock(&rres_mtx); + TAILQ_FOREACH_SAFE(sp, &rres[l], next, sp_next) { KASSERT(sp->rql==l && sp->rqllevel,("preempt_contig_alloc: rql invalid")); - preempt(sp, lev, NULL); - m = buddy_alloc(SP_ORDER(lev), FALSE); - if (m != NULL) - goto done; + object = sp->object; + was_trylocked = VM_OBJECT_TRYLOCK(object); + if (was_trylocked || VM_OBJECT_LOCKED(object)) { + TAILQ_REMOVE(&rres[l], sp, next); + mtx_unlock(&rres_mtx); + sp->rql = NO_RESQ; + preempt(sp, lev, NULL); + if (was_trylocked) + VM_OBJECT_UNLOCK(object); + m = buddy_alloc(SP_ORDER(lev), FALSE); + if (m != NULL) + goto done; + mtx_lock(&rres_mtx); + sp_next = TAILQ_FIRST(&rres[l]); + } } + mtx_unlock(&rres_mtx); } /* Downgrade level, retry free, rres... */ @@ -552,13 +567,26 @@ } /* 5, 7, 9... */ - while ( (sp = TAILQ_FIRST(&rres[lev])) ) { + mtx_lock(&rres_mtx); + TAILQ_FOREACH_SAFE(sp, &rres[lev], next, sp_next) { KASSERT(sp->rql==lev && sp->rqllevel,("preempt_alloc_contig")); - preempt(sp, lev, NULL); - m = buddy_alloc(SP_ORDER(lev), FALSE); - if (m != NULL) - goto done; + object = sp->object; + was_trylocked = VM_OBJECT_TRYLOCK(object); + if (was_trylocked || VM_OBJECT_LOCKED(object)) { + TAILQ_REMOVE(&rres[lev], sp, next); + mtx_unlock(&rres_mtx); + sp->rql = NO_RESQ; + preempt(sp, lev, NULL); + if (was_trylocked) + VM_OBJECT_UNLOCK(object); + m = buddy_alloc(SP_ORDER(lev), FALSE); + if (m != NULL) + goto done; + mtx_lock(&rres_mtx); + sp_next = TAILQ_FIRST(&rres[lev]); + } } + mtx_unlock(&rres_mtx); } done: KASSERT(*level>= -1,("preempt_alloc_contig")); From owner-p4-projects@FreeBSD.ORG Wed Oct 26 04:44:32 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 055A516A421; Wed, 26 Oct 2005 04:44:32 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 BB16816A41F for ; Wed, 26 Oct 2005 04:44:31 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7274D43D45 for ; Wed, 26 Oct 2005 04:44:31 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9Q4iVWJ058326 for ; Wed, 26 Oct 2005 04:44:31 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9Q4iVJE058323 for perforce@freebsd.org; Wed, 26 Oct 2005 04:44:31 GMT (envelope-from peter@freebsd.org) Date: Wed, 26 Oct 2005 04:44:31 GMT Message-Id: <200510260444.j9Q4iVJE058323@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 Cc: Subject: PERFORCE change 85867 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2005 04:44:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=85867 Change 85867 by peter@peter_overcee on 2005/10/26 04:44:24 Properly fix the osigset_t stuff. The correct spelling of the 'freebsd3_' prefix is 'o'. We used MCOMPAT4 with freebsd4_ to avoid overloading the 'o' prefix. Affected files ... .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#35 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#35 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#33 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#33 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#33 edit .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#37 edit Differences ... ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#35 (text+ko) ==== @@ -1397,7 +1397,7 @@ #endif #ifdef COMPAT_43 -struct freebsd3_sigaction32 { +struct osigaction32 { u_int32_t sa_u; osigset_t sa_mask; int sa_flags; @@ -1406,10 +1406,10 @@ #define ONSIG 32 int -freebsd3_freebsd32_sigaction(struct thread *td, - struct freebsd3_freebsd32_sigaction_args *uap) +ofreebsd32_sigaction(struct thread *td, + struct ofreebsd32_sigaction_args *uap) { - struct freebsd3_sigaction32 s32; + struct osigaction32 s32; struct sigaction sa, osa, *sap; int error; @@ -1437,8 +1437,8 @@ } int -freebsd3_freebsd32_sigprocmask(struct thread *td, - struct freebsd3_freebsd32_sigprocmask_args *uap) +ofreebsd32_sigprocmask(struct thread *td, + struct ofreebsd32_sigprocmask_args *uap) { sigset_t set, oset; int error; @@ -1450,8 +1450,8 @@ } int -freebsd3_freebsd32_sigpending(struct thread *td, - struct freebsd3_freebsd32_sigpending_args *uap) +ofreebsd32_sigpending(struct thread *td, + struct ofreebsd32_sigpending_args *uap) { struct proc *p = td->td_proc; sigset_t siglist; @@ -1471,8 +1471,8 @@ }; int -freebsd3_freebsd32_sigvec(struct thread *td, - struct freebsd3_freebsd32_sigvec_args *uap) +ofreebsd32_sigvec(struct thread *td, + struct ofreebsd32_sigvec_args *uap) { struct sigvec32 vec; struct sigaction sa, osa, *sap; @@ -1505,8 +1505,8 @@ } int -freebsd3_freebsd32_sigblock(struct thread *td, - struct freebsd3_freebsd32_sigblock_args *uap) +ofreebsd32_sigblock(struct thread *td, + struct ofreebsd32_sigblock_args *uap) { struct proc *p = td->td_proc; sigset_t set; @@ -1521,8 +1521,8 @@ } int -freebsd3_freebsd32_sigsetmask(struct thread *td, - struct freebsd3_freebsd32_sigsetmask_args *uap) +ofreebsd32_sigsetmask(struct thread *td, + struct ofreebsd32_sigsetmask_args *uap) { struct proc *p = td->td_proc; sigset_t set; @@ -1538,8 +1538,8 @@ } int -freebsd3_freebsd32_sigsuspend(struct thread *td, - struct freebsd3_freebsd32_sigsuspend_args *uap) +ofreebsd32_sigsuspend(struct thread *td, + struct ofreebsd32_sigsuspend_args *uap) { struct proc *p = td->td_proc; sigset_t mask; @@ -1564,8 +1564,8 @@ }; int -freebsd3_freebsd32_sigstack(struct thread *td, - struct freebsd3_freebsd32_sigstack_args *uap) +ofreebsd32_sigstack(struct thread *td, + struct ofreebsd32_sigstack_args *uap) { struct sigstack32 s32; struct sigstack nss, oss; ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#35 (text+ko) ==== @@ -56,16 +56,7 @@ char from_l_[PADL_(u_int32_t)]; u_int32_t from; char from_r_[PADR_(u_int32_t)]; char fromlenaddr_l_[PADL_(u_int32_t)]; u_int32_t fromlenaddr; char fromlenaddr_r_[PADR_(u_int32_t)]; }; -struct freebsd3_freebsd32_sigaction_args { - char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)]; - char nsa_l_[PADL_(struct freebsd3_sigaction32 *)]; struct freebsd3_sigaction32 * nsa; char nsa_r_[PADR_(struct freebsd3_sigaction32 *)]; - char osa_l_[PADL_(struct freebsd3_sigaction32 *)]; struct freebsd3_sigaction32 * osa; char osa_r_[PADR_(struct freebsd3_sigaction32 *)]; -}; -struct freebsd3_freebsd32_sigprocmask_args { - char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)]; - char mask_l_[PADL_(osigset_t)]; osigset_t mask; char mask_r_[PADR_(osigset_t)]; -}; -struct freebsd3_freebsd32_sigpending_args { +struct ofreebsd32_sigpending_args { register_t dummy; }; struct freebsd32_sigaltstack_args { @@ -93,24 +84,6 @@ char ex_l_[PADL_(fd_set *)]; fd_set * ex; char ex_r_[PADR_(fd_set *)]; char tv_l_[PADL_(struct timeval32 *)]; struct timeval32 * tv; char tv_r_[PADR_(struct timeval32 *)]; }; -struct freebsd3_freebsd32_sigvec_args { - char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)]; - char nsv_l_[PADL_(struct sigvec32 *)]; struct sigvec32 * nsv; char nsv_r_[PADR_(struct sigvec32 *)]; - char osv_l_[PADL_(struct sigvec32 *)]; struct sigvec32 * osv; char osv_r_[PADR_(struct sigvec32 *)]; -}; -struct freebsd3_freebsd32_sigblock_args { - char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)]; -}; -struct freebsd3_freebsd32_sigsetmask_args { - char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)]; -}; -struct freebsd3_freebsd32_sigsuspend_args { - char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)]; -}; -struct freebsd3_freebsd32_sigstack_args { - char nss_l_[PADL_(struct sigstack32 *)]; struct sigstack32 * nss; char nss_r_[PADR_(struct sigstack32 *)]; - char oss_l_[PADL_(struct sigstack32 *)]; struct sigstack32 * oss; char oss_r_[PADR_(struct sigstack32 *)]; -}; struct freebsd32_gettimeofday_args { char tp_l_[PADL_(struct timeval32 *)]; struct timeval32 * tp; char tp_r_[PADR_(struct timeval32 *)]; char tzp_l_[PADL_(struct timezone *)]; struct timezone * tzp; char tzp_r_[PADR_(struct timezone *)]; @@ -299,19 +272,11 @@ int freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *); int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); int freebsd32_recvfrom(struct thread *, struct freebsd32_recvfrom_args *); -int freebsd3_freebsd32_sigaction(struct thread *, struct freebsd3_freebsd32_sigaction_args *); -int freebsd3_freebsd32_sigprocmask(struct thread *, struct freebsd3_freebsd32_sigprocmask_args *); -int freebsd3_freebsd32_sigpending(struct thread *, struct freebsd3_freebsd32_sigpending_args *); int freebsd32_sigaltstack(struct thread *, struct freebsd32_sigaltstack_args *); int freebsd32_execve(struct thread *, struct freebsd32_execve_args *); int freebsd32_setitimer(struct thread *, struct freebsd32_setitimer_args *); int freebsd32_getitimer(struct thread *, struct freebsd32_getitimer_args *); int freebsd32_select(struct thread *, struct freebsd32_select_args *); -int freebsd3_freebsd32_sigvec(struct thread *, struct freebsd3_freebsd32_sigvec_args *); -int freebsd3_freebsd32_sigblock(struct thread *, struct freebsd3_freebsd32_sigblock_args *); -int freebsd3_freebsd32_sigsetmask(struct thread *, struct freebsd3_freebsd32_sigsetmask_args *); -int freebsd3_freebsd32_sigsuspend(struct thread *, struct freebsd3_freebsd32_sigsuspend_args *); -int freebsd3_freebsd32_sigstack(struct thread *, struct freebsd3_freebsd32_sigstack_args *); int freebsd32_gettimeofday(struct thread *, struct freebsd32_gettimeofday_args *); int freebsd32_getrusage(struct thread *, struct freebsd32_getrusage_args *); int freebsd32_readv(struct thread *, struct freebsd32_readv_args *); @@ -349,6 +314,41 @@ #ifdef COMPAT_43 +struct ofreebsd32_sigaction_args { + char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)]; + char nsa_l_[PADL_(struct osigaction32 *)]; struct osigaction32 * nsa; char nsa_r_[PADR_(struct osigaction32 *)]; + char osa_l_[PADL_(struct osigaction32 *)]; struct osigaction32 * osa; char osa_r_[PADR_(struct osigaction32 *)]; +}; +struct ofreebsd32_sigprocmask_args { + char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)]; + char mask_l_[PADL_(osigset_t)]; osigset_t mask; char mask_r_[PADR_(osigset_t)]; +}; +struct ofreebsd32_sigvec_args { + char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)]; + char nsv_l_[PADL_(struct sigvec32 *)]; struct sigvec32 * nsv; char nsv_r_[PADR_(struct sigvec32 *)]; + char osv_l_[PADL_(struct sigvec32 *)]; struct sigvec32 * osv; char osv_r_[PADR_(struct sigvec32 *)]; +}; +struct ofreebsd32_sigblock_args { + char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)]; +}; +struct ofreebsd32_sigsetmask_args { + char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)]; +}; +struct ofreebsd32_sigsuspend_args { + char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)]; +}; +struct ofreebsd32_sigstack_args { + char nss_l_[PADL_(struct sigstack32 *)]; struct sigstack32 * nss; char nss_r_[PADR_(struct sigstack32 *)]; + char oss_l_[PADL_(struct sigstack32 *)]; struct sigstack32 * oss; char oss_r_[PADR_(struct sigstack32 *)]; +}; +int ofreebsd32_sigaction(struct thread *, struct ofreebsd32_sigaction_args *); +int ofreebsd32_sigprocmask(struct thread *, struct ofreebsd32_sigprocmask_args *); +int ofreebsd32_sigpending(struct thread *, struct ofreebsd32_sigpending_args *); +int ofreebsd32_sigvec(struct thread *, struct ofreebsd32_sigvec_args *); +int ofreebsd32_sigblock(struct thread *, struct ofreebsd32_sigblock_args *); +int ofreebsd32_sigsetmask(struct thread *, struct ofreebsd32_sigsetmask_args *); +int ofreebsd32_sigsuspend(struct thread *, struct ofreebsd32_sigsuspend_args *); +int ofreebsd32_sigstack(struct thread *, struct ofreebsd32_sigstack_args *); #endif /* COMPAT_43 */ ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#33 (text+ko) ==== @@ -50,13 +50,13 @@ #define FREEBSD32_SYS_getegid 43 #define FREEBSD32_SYS_profil 44 #define FREEBSD32_SYS_ktrace 45 -#define FREEBSD32_SYS_freebsd3_freebsd32_sigaction 46 + /* 46 is old freebsd32_sigaction */ #define FREEBSD32_SYS_getgid 47 -#define FREEBSD32_SYS_freebsd3_freebsd32_sigprocmask 48 + /* 48 is old freebsd32_sigprocmask */ #define FREEBSD32_SYS_getlogin 49 #define FREEBSD32_SYS_setlogin 50 #define FREEBSD32_SYS_acct 51 -#define FREEBSD32_SYS_freebsd3_freebsd32_sigpending 52 + /* 52 is old freebsd32_sigpending */ #define FREEBSD32_SYS_freebsd32_sigaltstack 53 #define FREEBSD32_SYS_ioctl 54 #define FREEBSD32_SYS_reboot 55 @@ -110,11 +110,11 @@ #define FREEBSD32_SYS_setsockopt 105 #define FREEBSD32_SYS_listen 106 /* 107 is obsolete vtimes */ -#define FREEBSD32_SYS_freebsd3_freebsd32_sigvec 108 -#define FREEBSD32_SYS_freebsd3_freebsd32_sigblock 109 -#define FREEBSD32_SYS_freebsd3_freebsd32_sigsetmask 110 -#define FREEBSD32_SYS_freebsd3_freebsd32_sigsuspend 111 -#define FREEBSD32_SYS_freebsd3_freebsd32_sigstack 112 + /* 108 is old freebsd32_sigvec */ + /* 109 is old freebsd32_sigblock */ + /* 110 is old freebsd32_sigsetmask */ + /* 111 is old freebsd32_sigsuspend */ + /* 112 is old freebsd32_sigstack */ /* 113 is obsolete orecvmsg */ /* 114 is obsolete osendmsg */ /* 115 is obsolete vtrace */ ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#33 (text+ko) ==== @@ -53,13 +53,13 @@ "getegid", /* 43 = getegid */ "profil", /* 44 = profil */ "ktrace", /* 45 = ktrace */ - "freebsd3_freebsd32_sigaction", /* 46 = freebsd3_freebsd32_sigaction */ + "old.freebsd32_sigaction", /* 46 = old freebsd32_sigaction */ "getgid", /* 47 = getgid */ - "freebsd3_freebsd32_sigprocmask", /* 48 = freebsd3_freebsd32_sigprocmask */ + "old.freebsd32_sigprocmask", /* 48 = old freebsd32_sigprocmask */ "getlogin", /* 49 = getlogin */ "setlogin", /* 50 = setlogin */ "acct", /* 51 = acct */ - "freebsd3_freebsd32_sigpending", /* 52 = freebsd3_freebsd32_sigpending */ + "old.freebsd32_sigpending", /* 52 = old freebsd32_sigpending */ "freebsd32_sigaltstack", /* 53 = freebsd32_sigaltstack */ "ioctl", /* 54 = ioctl */ "reboot", /* 55 = reboot */ @@ -115,11 +115,11 @@ "setsockopt", /* 105 = setsockopt */ "listen", /* 106 = listen */ "obs_vtimes", /* 107 = obsolete vtimes */ - "freebsd3_freebsd32_sigvec", /* 108 = freebsd3_freebsd32_sigvec */ - "freebsd3_freebsd32_sigblock", /* 109 = freebsd3_freebsd32_sigblock */ - "freebsd3_freebsd32_sigsetmask", /* 110 = freebsd3_freebsd32_sigsetmask */ - "freebsd3_freebsd32_sigsuspend", /* 111 = freebsd3_freebsd32_sigsuspend */ - "freebsd3_freebsd32_sigstack", /* 112 = freebsd3_freebsd32_sigstack */ + "old.freebsd32_sigvec", /* 108 = old freebsd32_sigvec */ + "old.freebsd32_sigblock", /* 109 = old freebsd32_sigblock */ + "old.freebsd32_sigsetmask", /* 110 = old freebsd32_sigsetmask */ + "old.freebsd32_sigsuspend", /* 111 = old freebsd32_sigsuspend */ + "old.freebsd32_sigstack", /* 112 = old freebsd32_sigstack */ "obs_orecvmsg", /* 113 = obsolete orecvmsg */ "obs_osendmsg", /* 114 = obsolete osendmsg */ "obs_vtrace", /* 115 = obsolete vtrace */ ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#33 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.45 2005/10/23 10:43:39 ps Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.56 2005/10/23 10:43:14 ps Exp */ @@ -18,6 +18,12 @@ #define AS(name) (sizeof(struct name) / sizeof(register_t)) +#ifdef COMPAT_43 +#define compat(n, name) n, (sy_call_t *)__CONCAT(o,name) +#else +#define compat(n, name) 0, (sy_call_t *)nosys +#endif + #ifdef COMPAT_FREEBSD4 #define compat4(n, name) n, (sy_call_t *)__CONCAT(freebsd4_,name) #else @@ -72,13 +78,13 @@ { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_NULL }, /* 43 = getegid */ { SYF_MPSAFE | AS(profil_args), (sy_call_t *)profil, AUE_NULL }, /* 44 = profil */ { SYF_MPSAFE | AS(ktrace_args), (sy_call_t *)ktrace, AUE_NULL }, /* 45 = ktrace */ - { SYF_MPSAFE | AS(freebsd3_freebsd32_sigaction_args), (sy_call_t *)freebsd3_freebsd32_sigaction, AUE_NULL }, /* 46 = freebsd3_freebsd32_sigaction */ + { compat(SYF_MPSAFE | AS(ofreebsd32_sigaction_args),freebsd32_sigaction), AUE_NULL }, /* 46 = old freebsd32_sigaction */ { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_NULL }, /* 47 = getgid */ - { SYF_MPSAFE | AS(freebsd3_freebsd32_sigprocmask_args), (sy_call_t *)freebsd3_freebsd32_sigprocmask, AUE_NULL }, /* 48 = freebsd3_freebsd32_sigprocmask */ + { compat(SYF_MPSAFE | AS(ofreebsd32_sigprocmask_args),freebsd32_sigprocmask), AUE_NULL }, /* 48 = old freebsd32_sigprocmask */ { SYF_MPSAFE | AS(getlogin_args), (sy_call_t *)getlogin, AUE_NULL }, /* 49 = getlogin */ { SYF_MPSAFE | AS(setlogin_args), (sy_call_t *)setlogin, AUE_NULL }, /* 50 = setlogin */ { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_NULL }, /* 51 = acct */ - { SYF_MPSAFE | 0, (sy_call_t *)freebsd3_freebsd32_sigpending, AUE_NULL }, /* 52 = freebsd3_freebsd32_sigpending */ + { compat(SYF_MPSAFE | 0,freebsd32_sigpending), AUE_NULL }, /* 52 = old freebsd32_sigpending */ { SYF_MPSAFE | AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_NULL }, /* 53 = freebsd32_sigaltstack */ { SYF_MPSAFE | AS(ioctl_args), (sy_call_t *)ioctl, AUE_NULL }, /* 54 = ioctl */ { SYF_MPSAFE | AS(reboot_args), (sy_call_t *)reboot, AUE_NULL }, /* 55 = reboot */ @@ -134,11 +140,11 @@ { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_NULL }, /* 105 = setsockopt */ { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_NULL }, /* 106 = listen */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 107 = obsolete vtimes */ - { SYF_MPSAFE | AS(freebsd3_freebsd32_sigvec_args), (sy_call_t *)freebsd3_freebsd32_sigvec, AUE_NULL }, /* 108 = freebsd3_freebsd32_sigvec */ - { SYF_MPSAFE | AS(freebsd3_freebsd32_sigblock_args), (sy_call_t *)freebsd3_freebsd32_sigblock, AUE_NULL }, /* 109 = freebsd3_freebsd32_sigblock */ - { SYF_MPSAFE | AS(freebsd3_freebsd32_sigsetmask_args), (sy_call_t *)freebsd3_freebsd32_sigsetmask, AUE_NULL }, /* 110 = freebsd3_freebsd32_sigsetmask */ - { SYF_MPSAFE | AS(freebsd3_freebsd32_sigsuspend_args), (sy_call_t *)freebsd3_freebsd32_sigsuspend, AUE_NULL }, /* 111 = freebsd3_freebsd32_sigsuspend */ - { SYF_MPSAFE | AS(freebsd3_freebsd32_sigstack_args), (sy_call_t *)freebsd3_freebsd32_sigstack, AUE_NULL }, /* 112 = freebsd3_freebsd32_sigstack */ + { compat(SYF_MPSAFE | AS(ofreebsd32_sigvec_args),freebsd32_sigvec), AUE_NULL }, /* 108 = old freebsd32_sigvec */ + { compat(SYF_MPSAFE | AS(ofreebsd32_sigblock_args),freebsd32_sigblock), AUE_NULL }, /* 109 = old freebsd32_sigblock */ + { compat(SYF_MPSAFE | AS(ofreebsd32_sigsetmask_args),freebsd32_sigsetmask), AUE_NULL }, /* 110 = old freebsd32_sigsetmask */ + { compat(SYF_MPSAFE | AS(ofreebsd32_sigsuspend_args),freebsd32_sigsuspend), AUE_NULL }, /* 111 = old freebsd32_sigsuspend */ + { compat(SYF_MPSAFE | AS(ofreebsd32_sigstack_args),freebsd32_sigstack), AUE_NULL }, /* 112 = old freebsd32_sigstack */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 113 = obsolete orecvmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 114 = obsolete osendmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = obsolete vtrace */ ==== //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#37 (text+ko) ==== @@ -116,18 +116,17 @@ size_t offset, u_int scale); } 45 AUE_NULL MNOPROTO { int ktrace(const char *fname, int ops, \ int facs, int pid); } -46 AUE_NULL MSTD { int freebsd3_freebsd32_sigaction( \ - int signum, \ - struct freebsd3_sigaction32 *nsa, \ - struct freebsd3_sigaction32 *osa); } +46 AUE_NULL MCOMPAT { int freebsd32_sigaction( int signum, \ + struct osigaction32 *nsa, \ + struct osigaction32 *osa); } 47 AUE_NULL MNOPROTO { gid_t getgid(void); } -48 AUE_NULL MSTD { int freebsd3_freebsd32_sigprocmask(int how, \ +48 AUE_NULL MCOMPAT { int freebsd32_sigprocmask(int how, \ osigset_t mask); } 49 AUE_NULL MNOPROTO { int getlogin(char *namebuf, \ u_int namelen); } 50 AUE_NULL MNOPROTO { int setlogin(char *namebuf); } 51 AUE_NULL MNOPROTO { int acct(char *path); } -52 AUE_NULL MSTD { int freebsd3_freebsd32_sigpending(void); } +52 AUE_NULL MCOMPAT { int freebsd32_sigpending(void); } 53 AUE_NULL MSTD { int freebsd32_sigaltstack( \ struct sigaltstack32 *ss, \ struct sigaltstack32 *oss); } @@ -209,15 +208,13 @@ int name, caddr_t val, int valsize); } 106 AUE_NULL MNOPROTO { int listen(int s, int backlog); } 107 AUE_NULL OBSOL vtimes -108 AUE_NULL MSTD { int freebsd3_freebsd32_sigvec(int signum, \ +108 AUE_NULL MCOMPAT { int freebsd32_sigvec(int signum, \ struct sigvec32 *nsv, \ struct sigvec32 *osv); } -109 AUE_NULL MSTD { int freebsd3_freebsd32_sigblock(int mask); } -110 AUE_NULL MSTD { int freebsd3_freebsd32_sigsetmask( \ - int mask); } -111 AUE_NULL MSTD { int freebsd3_freebsd32_sigsuspend( \ - int mask); } -112 AUE_NULL MSTD { int freebsd3_freebsd32_sigstack( \ +109 AUE_NULL MCOMPAT { int freebsd32_sigblock(int mask); } +110 AUE_NULL MCOMPAT { int freebsd32_sigsetmask( int mask); } +111 AUE_NULL MCOMPAT { int freebsd32_sigsuspend( int mask); } +112 AUE_NULL MCOMPAT { int freebsd32_sigstack( \ struct sigstack32 *nss, \ struct sigstack32 *oss); } 113 AUE_NULL OBSOL orecvmsg From owner-p4-projects@FreeBSD.ORG Wed Oct 26 04:53:44 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93D3916A421; Wed, 26 Oct 2005 04:53:43 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 6136C16A41F for ; Wed, 26 Oct 2005 04:53:43 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 15B1243D49 for ; Wed, 26 Oct 2005 04:53:43 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9Q4rgDS066119 for ; Wed, 26 Oct 2005 04:53:42 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9Q4rgCj066116 for perforce@freebsd.org; Wed, 26 Oct 2005 04:53:42 GMT (envelope-from alc@freebsd.org) Date: Wed, 26 Oct 2005 04:53:42 GMT Message-Id: <200510260453.j9Q4rgCj066116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 85868 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2005 04:53:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=85868 Change 85868 by alc@alc_home on 2005/10/26 04:52:56 Correct an assertion. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_reserve.c#9 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#9 (text+ko) ==== @@ -589,7 +589,7 @@ mtx_unlock(&rres_mtx); } done: - KASSERT(*level>= -1,("preempt_alloc_contig")); + KASSERT(lev >= -1, ("preempt_contig_alloc: invalid level")); if (level != NULL) *level = lev; return (m); From owner-p4-projects@FreeBSD.ORG Wed Oct 26 06:37:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F02D516A421; Wed, 26 Oct 2005 06:37:16 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 A613616A420 for ; Wed, 26 Oct 2005 06:37:16 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F08DE43D53 for ; Wed, 26 Oct 2005 06:37:15 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9Q6bFeU087033 for ; Wed, 26 Oct 2005 06:37:15 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9Q6bF6R087024 for perforce@freebsd.org; Wed, 26 Oct 2005 06:37:15 GMT (envelope-from alc@freebsd.org) Date: Wed, 26 Oct 2005 06:37:15 GMT Message-Id: <200510260637.j9Q6bF6R087024@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 85875 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2005 06:37:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=85875 Change 85875 by alc@alc_home on 2005/10/26 06:36:46 Fix white space. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_reserve.c#10 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#10 (text+ko) ==== @@ -535,10 +535,11 @@ for (l = lev; l <= SP_LEVELS - 2; l++) { mtx_lock(&rres_mtx); TAILQ_FOREACH_SAFE(sp, &rres[l], next, sp_next) { - KASSERT(sp->rql==l && sp->rqllevel,("preempt_contig_alloc: rql invalid")); - object = sp->object; - was_trylocked = VM_OBJECT_TRYLOCK(object); - if (was_trylocked || VM_OBJECT_LOCKED(object)) { + KASSERT(sp->rql == l && sp->rql < sp->level, + ("preempt_contig_alloc: rql invalid")); + object = sp->object; + was_trylocked = VM_OBJECT_TRYLOCK(object); + if (was_trylocked || VM_OBJECT_LOCKED(object)) { TAILQ_REMOVE(&rres[l], sp, next); mtx_unlock(&rres_mtx); sp->rql = NO_RESQ; @@ -556,7 +557,7 @@ } /* Downgrade level, retry free, rres... */ - while (lev>=0) { + while (lev >= 0) { lev--; if (free_pool) { @@ -569,10 +570,11 @@ /* 5, 7, 9... */ mtx_lock(&rres_mtx); TAILQ_FOREACH_SAFE(sp, &rres[lev], next, sp_next) { - KASSERT(sp->rql==lev && sp->rqllevel,("preempt_alloc_contig")); - object = sp->object; - was_trylocked = VM_OBJECT_TRYLOCK(object); - if (was_trylocked || VM_OBJECT_LOCKED(object)) { + KASSERT(sp->rql == lev && sp->rql < sp->level, + ("preempt_contig_alloc")); + object = sp->object; + was_trylocked = VM_OBJECT_TRYLOCK(object); + if (was_trylocked || VM_OBJECT_LOCKED(object)) { TAILQ_REMOVE(&rres[lev], sp, next); mtx_unlock(&rres_mtx); sp->rql = NO_RESQ; From owner-p4-projects@FreeBSD.ORG Wed Oct 26 07:48:59 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B3D616A421; Wed, 26 Oct 2005 07:48:59 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 1EF9816A41F for ; Wed, 26 Oct 2005 07:48:59 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3DFA43D48 for ; Wed, 26 Oct 2005 07:48:58 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9Q7mwcS096383 for ; Wed, 26 Oct 2005 07:48:58 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9Q7mwP9096380 for perforce@freebsd.org; Wed, 26 Oct 2005 07:48:58 GMT (envelope-from alc@freebsd.org) Date: Wed, 26 Oct 2005 07:48:58 GMT Message-Id: <200510260748.j9Q7mwP9096380@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 85882 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2005 07:49:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=85882 Change 85882 by alc@alc_home on 2005/10/26 07:47:58 Move an assertion to its proper place. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_reserve.c#11 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#11 (text+ko) ==== @@ -315,7 +315,7 @@ m->reserv = res; for (;;) { pos = m - res->first_page; - KASSERT(res && pos >=0 && pos < (1 << res->order) && + KASSERT(pos >= 0 && pos < (1 << res->order) && res->popfrom >= 0 && res->refcnt >= 0, ("reserve_populate: res invalid")); res->refcnt++; @@ -341,6 +341,7 @@ reserve_procreate(res, m); } res = follow_child(res, IDX(m, res)); + KASSERT(res != NULL, ("reserve_populate: missing reservation")); } update_maxavail(res); preempt_move(m->reserv, TRUE); From owner-p4-projects@FreeBSD.ORG Wed Oct 26 08:19:38 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6DD516A421; Wed, 26 Oct 2005 08:19:37 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 778A116A41F for ; Wed, 26 Oct 2005 08:19:37 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4468743D45 for ; Wed, 26 Oct 2005 08:19:37 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9Q8JbSA099902 for ; Wed, 26 Oct 2005 08:19:37 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9Q8JbPn099899 for perforce@freebsd.org; Wed, 26 Oct 2005 08:19:37 GMT (envelope-from peter@freebsd.org) Date: Wed, 26 Oct 2005 08:19:37 GMT Message-Id: <200510260819.j9Q8JbPn099899@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 Cc: Subject: PERFORCE change 85885 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2005 08:19:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=85885 Change 85885 by peter@peter_overcee on 2005/10/26 08:18:45 Fix fdcontrol to actually work. can't set params in readonly mode. fdread can't set params either, so it has to O_RDWR. Affected files ... .. //depot/projects/hammer/usr.sbin/fdcontrol/fdcontrol.c#6 edit .. //depot/projects/hammer/usr.sbin/fdread/fdread.c#3 edit Differences ... ==== //depot/projects/hammer/usr.sbin/fdcontrol/fdcontrol.c#6 (text+ko) ==== @@ -120,7 +120,6 @@ mode = O_RDONLY | O_NONBLOCK; else mode = O_RDWR; -mode = O_RDONLY | O_NONBLOCK; if((fd = open(argv[0], mode)) < 0) err(EX_UNAVAILABLE, "open(%s)", argv[0]); ==== //depot/projects/hammer/usr.sbin/fdread/fdread.c#3 (text+ko) ==== @@ -149,7 +149,7 @@ err(EX_OSERR, "cannot create output file %s", fname); } - if ((fd = open(_devname, O_RDONLY)) == -1) + if ((fd = open(_devname, O_RDWR)) == -1) err(EX_OSERR, "cannot open device %s", _devname); return (numids? doreadid(fd, numids, trackno): doread(fd, of, _devname)); From owner-p4-projects@FreeBSD.ORG Wed Oct 26 08:19:39 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AFA716A423; Wed, 26 Oct 2005 08:19:38 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 DB5D516A41F for ; Wed, 26 Oct 2005 08:19:37 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A930443D45 for ; Wed, 26 Oct 2005 08:19:37 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9Q8Jbh4099908 for ; Wed, 26 Oct 2005 08:19:37 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9Q8Jb4W099905 for perforce@freebsd.org; Wed, 26 Oct 2005 08:19:37 GMT (envelope-from peter@freebsd.org) Date: Wed, 26 Oct 2005 08:19:37 GMT Message-Id: <200510260819.j9Q8Jb4W099905@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 Cc: Subject: PERFORCE change 85886 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2005 08:19:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=85886 Change 85886 by peter@peter_overcee on 2005/10/26 08:19:24 Fix the clocks for my SIIG Cyperserial 4S (JJ-P45012) card. Affected files ... .. //depot/projects/hammer/sys/dev/puc/pucdata.c#21 edit Differences ... ==== //depot/projects/hammer/sys/dev/puc/pucdata.c#21 (text+ko) ==== @@ -860,10 +860,10 @@ { 0x1415, 0x9501, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 10}, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 10}, + { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 10}, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 10}, }, }, From owner-p4-projects@FreeBSD.ORG Wed Oct 26 14:44:35 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3F5B16A422; Wed, 26 Oct 2005 14:44:34 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 ABDA816A41F for ; Wed, 26 Oct 2005 14:44:34 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2980543D68 for ; Wed, 26 Oct 2005 14:44:22 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9QEiMR0061047 for ; Wed, 26 Oct 2005 14:44:22 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9QEiM6g061044 for perforce@freebsd.org; Wed, 26 Oct 2005 14:44:22 GMT (envelope-from jhb@freebsd.org) Date: Wed, 26 Oct 2005 14:44:22 GMT Message-Id: <200510261444.j9QEiM6g061044@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 Cc: Subject: PERFORCE change 85891 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2005 14:44:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=85891 Change 85891 by jhb@jhb_slimer on 2005/10/26 14:43:53 IFC @85890. Affected files ... .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#32 integrate .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#20 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#32 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#33 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#35 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#23 integrate .. //depot/projects/smpng/sys/dev/cy/cy.c#8 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#27 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#17 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#27 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/zs/zs.c#21 integrate .. //depot/projects/smpng/sys/geom/label/g_label_ntfs.c#3 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#102 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#21 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#12 integrate .. //depot/projects/smpng/sys/netgraph/ng_split.h#5 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#14 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#30 integrate .. //depot/projects/smpng/sys/nfsclient/nlminfo.h#3 integrate .. //depot/projects/smpng/sys/pc98/cbus/sio.c#5 integrate .. //depot/projects/smpng/sys/sys/lockf.h#6 integrate .. //depot/projects/smpng/sys/sys/umtx.h#13 integrate Differences ... ==== //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#32 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.88 2005/10/18 19:52:15 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.89 2005/10/26 06:52:57 wpaul Exp $"); #include #include @@ -1108,8 +1108,6 @@ return(0); } -#undef NDIS_REAP_TIMERS - int ndis_halt_nic(arg) void *arg; @@ -1117,9 +1115,6 @@ struct ndis_softc *sc; ndis_handle adapter; ndis_halt_handler haltfunc; -#ifdef NDIS_REAP_TIMERS - ndis_miniport_timer *t, *n; -#endif ndis_miniport_block *block; int empty = 0; uint8_t irql; @@ -1127,24 +1122,6 @@ sc = arg; block = sc->ndis_block; -#ifdef NDIS_REAP_TIMERS - /* - * Drivers are sometimes very lax about cancelling all - * their timers. Cancel them all ourselves, just to be - * safe. We must do this before invoking MiniportHalt(), - * since if we wait until after, the memory in which - * the timers reside will no longer be valid. - */ - - t = sc->ndis_block->nmb_timerlist; - while (t != NULL) { - KeCancelTimer(&t->nmt_ktimer); - n = t; - t = t->nmt_nexttimer; - n->nmt_nexttimer = NULL; - } - sc->ndis_block->nmb_timerlist = NULL; -#endif if (!cold) KeFlushQueuedDpcs(); ==== //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#20 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.40 2005/10/21 05:23:20 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.41 2005/10/26 06:52:57 wpaul Exp $ */ #ifndef _NTOSKRNL_VAR_H_ @@ -1362,6 +1362,8 @@ extern uint32_t IoConnectInterrupt(kinterrupt **, void *, void *, kspin_lock *, uint32_t, uint8_t, uint8_t, uint8_t, uint8_t, uint32_t, uint8_t); +extern void *MmMapIoSpace(uint64_t, uint32_t, uint32_t); +extern void MmUnmapIoSpace(void *, size_t); extern void MmBuildMdlForNonPagedPool(mdl *); extern void IoDisconnectInterrupt(kinterrupt *); extern uint32_t IoAllocateDriverObjectExtension(driver_object *, ==== //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#32 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.97 2005/10/24 05:05:09 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.98 2005/10/26 06:52:57 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -1257,8 +1257,6 @@ ndis_timer_function func; void *ctx; { - uint8_t irql; - /* Save the driver's funcptr and context */ timer->nmt_timerfunc = func; @@ -1276,13 +1274,6 @@ ndis_findwrap((funcptr)ndis_timercall), timer); timer->nmt_ktimer.k_dpc = &timer->nmt_kdpc; - KeAcquireSpinLock(&timer->nmt_block->nmb_lock, &irql); - - timer->nmt_nexttimer = timer->nmt_block->nmb_timerlist; - timer->nmt_block->nmb_timerlist = timer; - - KeReleaseSpinLock(&timer->nmt_block->nmb_lock, irql); - return; } @@ -1750,25 +1741,12 @@ ndis_physaddr paddr; uint32_t len; { - ndis_miniport_block *block; - struct ndis_softc *sc; - if (adapter == NULL) return(NDIS_STATUS_FAILURE); - block = (ndis_miniport_block *)adapter; - sc = device_get_softc(block->nmb_physdeviceobj->do_devext); + *vaddr = MmMapIoSpace(paddr.np_quad, len, 0); - if (sc->ndis_res_mem != NULL && - paddr.np_quad == rman_get_start(sc->ndis_res_mem)) - *vaddr = (void *)rman_get_virtual(sc->ndis_res_mem); - else if (sc->ndis_res_altmem != NULL && - paddr.np_quad == rman_get_start(sc->ndis_res_altmem)) - *vaddr = (void *)rman_get_virtual(sc->ndis_res_altmem); - else if (sc->ndis_res_am != NULL && - paddr.np_quad == rman_get_start(sc->ndis_res_am)) - *vaddr = (void *)rman_get_virtual(sc->ndis_res_am); - else + if (*vaddr == NULL) return(NDIS_STATUS_FAILURE); return(NDIS_STATUS_SUCCESS); @@ -1780,6 +1758,7 @@ void *vaddr; uint32_t len; { + MmUnmapIoSpace(vaddr, len); return; } ==== //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#33 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.77 2005/10/22 05:15:20 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.78 2005/10/26 06:52:57 wpaul Exp $"); #include #include @@ -204,6 +204,7 @@ uint8_t, uint32_t, void *, uint32_t, uint32_t); static void MmUnmapLockedPages(void *, mdl *); static uint8_t MmIsAddressValid(void *); +static device_t ntoskrnl_finddev(device_t, uint64_t, struct resource **); static size_t RtlCompareMemory(const void *, const void *, size_t); static ndis_status RtlUnicodeStringToInteger(unicode_string *, uint32_t, uint32_t *); @@ -2541,6 +2542,116 @@ return(FALSE); } +void * +MmMapIoSpace(paddr, len, cachetype) + uint64_t paddr; + uint32_t len; + uint32_t cachetype; +{ + devclass_t nexus_class; + device_t *nexus_devs, devp; + int nexus_count = 0; + device_t matching_dev = NULL; + struct resource *res; + int i; + vm_offset_t v; + + nexus_class = devclass_find("nexus"); + devclass_get_devices(nexus_class, &nexus_devs, &nexus_count); + + for (i = 0; i < nexus_count; i++) { + devp = nexus_devs[i]; + matching_dev = ntoskrnl_finddev(devp, paddr, &res); + if (matching_dev) + break; + } + + free(nexus_devs, M_TEMP); + + if (matching_dev == NULL) + return(NULL); + + v = (vm_offset_t)rman_get_virtual(res); + if (paddr > rman_get_start(res)) + v += paddr - rman_get_start(res); + + return((void *)v); +} + +void +MmUnmapIoSpace(vaddr, len) + void *vaddr; + size_t len; +{ + return; +} + + +static device_t +ntoskrnl_finddev(dev, paddr, res) + device_t dev; + uint64_t paddr; + struct resource **res; +{ + device_t *children; + device_t matching_dev; + int childcnt; + struct resource *r; + struct resource_list *rl; + struct resource_list_entry *rle; + uint32_t flags; + int i; + + /* We only want devices that have been successfully probed. */ + + if (device_is_alive(dev) == FALSE) + return(NULL); + + rl = BUS_GET_RESOURCE_LIST(device_get_parent(dev), dev); + if (rl != NULL) { +#if __FreeBSD_version < 600022 + SLIST_FOREACH(rle, rl, link) { +#else + STAILQ_FOREACH(rle, rl, link) { +#endif + r = rle->res; + + if (r == NULL) + continue; + + flags = rman_get_flags(r); + + if (rle->type == SYS_RES_MEMORY && + paddr >= rman_get_start(r) && + paddr <= rman_get_end(r)) { + if (!(flags & RF_ACTIVE)) + bus_activate_resource(dev, + SYS_RES_MEMORY, 0, r); + *res = r; + return(dev); + } + } + } + + /* + * If this device has children, do another + * level of recursion to inspect them. + */ + + device_get_children(dev, &children, &childcnt); + + for (i = 0; i < childcnt; i++) { + matching_dev = ntoskrnl_finddev(children[i], paddr, res); + if (matching_dev != NULL) { + free(children, M_TEMP); + return(matching_dev); + } + } + + free(children, M_TEMP); + return(NULL); +} + /* * Workitems are unlike DPCs, in that they run in a user-mode thread * context rather than at DISPATCH_LEVEL in kernel context. In our @@ -4053,6 +4164,8 @@ IMPORT_SFUNC(MmUnmapLockedPages, 2), IMPORT_SFUNC(MmBuildMdlForNonPagedPool, 1), IMPORT_SFUNC(MmIsAddressValid, 1), + IMPORT_SFUNC(MmMapIoSpace, 3 + 1), + IMPORT_SFUNC(MmUnmapIoSpace, 2), IMPORT_SFUNC(KeInitializeSpinLock, 1), IMPORT_SFUNC(IoIsWdmVersionAvailable, 2), IMPORT_SFUNC(IoGetDeviceProperty, 5), ==== //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#35 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.58 2005/09/11 18:39:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.59 2005/10/25 21:15:47 njl Exp $"); #include "opt_acpi.h" #include @@ -116,6 +116,7 @@ /* Runtime state. */ static int cpu_cx_count; /* Number of valid states */ static int cpu_non_c3; /* Index of lowest non-C3 state. */ +static int cpu_short_slp; /* Count of < 1us sleeps. */ static u_int cpu_cx_stats[MAX_CX_STATES];/* Cx usage history. */ /* Values for sysctl. */ @@ -599,7 +600,7 @@ acpi_PkgInt32(pkg, 2, &cx_ptr->trans_lat) != 0 || acpi_PkgInt32(pkg, 3, &cx_ptr->power) != 0) { - device_printf(sc->cpu_dev, "Skipping invalid Cx state package\n"); + device_printf(sc->cpu_dev, "skipping invalid Cx state package\n"); continue; } @@ -779,12 +780,32 @@ * the length of our last sleep. */ cx_next_idx = cpu_cx_lowest; - if (sc->cpu_prev_sleep < 100) + if (sc->cpu_prev_sleep < 100) { + /* + * If we sleep too short all the time, this system may not implement + * C2/3 correctly (i.e. reads return immediately). In this case, + * back off and use the next higher level. + */ + if (sc->cpu_prev_sleep <= 1) { + cpu_short_slp++; + if (cpu_short_slp == 1000 && cpu_cx_lowest != 0) { + if (cpu_non_c3 == cpu_cx_lowest && cpu_non_c3 != 0) + cpu_non_c3--; + cpu_cx_lowest--; + cpu_short_slp = 0; + device_printf(sc->cpu_dev, + "too many short sleeps, backing off to C%d\n", + cpu_cx_lowest + 1); + } + } else + cpu_short_slp = 0; + for (i = cpu_cx_lowest; i >= 0; i--) if (sc->cpu_cx_states[i].trans_lat <= sc->cpu_prev_sleep) { cx_next_idx = i; break; } + } /* * Check for bus master activity. If there was activity, clear @@ -855,11 +876,11 @@ AcpiSetRegister(ACPI_BITREG_ARB_DISABLE, 0, ACPI_MTX_DO_NOT_LOCK); AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 0, ACPI_MTX_DO_NOT_LOCK); } + ACPI_ENABLE_IRQS(); /* Find the actual time asleep in microseconds, minus overhead. */ end_time = acpi_TimerDelta(end_time, start_time); sc->cpu_prev_sleep = PM_USEC(end_time) - cx_next->trans_lat; - ACPI_ENABLE_IRQS(); } /* ==== //depot/projects/smpng/sys/dev/cx/if_cx.c#23 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.49 2005/10/16 20:22:54 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.50 2005/10/26 06:44:58 ru Exp $"); #include @@ -2547,7 +2547,7 @@ callout_init (&timeout_handle, cx_mpsafenet?CALLOUT_MPSAFE:0); callout_reset (&timeout_handle, hz*5, cx_timeout, 0); /* Software interrupt. */ - swi_add(&tty_ithd, "cx", cx_softintr, NULL, SWI_TTY, + swi_add(&tty_intr_event, "cx", cx_softintr, NULL, SWI_TTY, (cx_mpsafenet?INTR_MPSAFE:0), &cx_fast_ih); break; case MOD_UNLOAD: @@ -2560,7 +2560,7 @@ /* If we were wait it than it reasserted now, just stop it. */ if (!callout_drain (&timeout_handle)) callout_stop (&timeout_handle); - ithread_remove_handler (cx_fast_ih); + intr_event_remove_handler (cx_fast_ih); --load_count; break; case MOD_SHUTDOWN: ==== //depot/projects/smpng/sys/dev/cy/cy.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.161 2005/10/16 20:22:54 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.162 2005/10/26 06:40:21 ru Exp $"); #include "opt_compat.h" @@ -428,9 +428,9 @@ splx(s); if (cy_fast_ih == NULL) { - swi_add(&tty_ithd, "cy", cypoll, NULL, SWI_TTY, 0, + swi_add(&tty_intr_event, "cy", cypoll, NULL, SWI_TTY, 0, &cy_fast_ih); - swi_add(&clk_ithd, "cy", cypoll, NULL, SWI_CLOCK, 0, + swi_add(&clk_intr_event, "cy", cypoll, NULL, SWI_CLOCK, 0, &cy_slow_ih); } ttycreate(tp, TS_CALLOUT, "c%r%r", ==== //depot/projects/smpng/sys/dev/mii/brgphy.c#27 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.36 2005/10/16 05:29:14 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.37 2005/10/26 00:55:22 grehan Exp $"); /* * Driver for the Broadcom BCR5400 1000baseTX PHY. Speed is always ==== //depot/projects/smpng/sys/dev/rc/rc.c#17 (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/rc/rc.c,v 1.100 2005/10/16 20:22:54 phk Exp $ + * $FreeBSD: src/sys/dev/rc/rc.c,v 1.101 2005/10/26 06:40:22 ru Exp $ */ /* @@ -311,7 +311,7 @@ goto fail; } - swi_add(&tty_ithd, "tty:rc", rc_pollcard, sc, SWI_TTY, 0, + swi_add(&tty_intr_event, "tty:rc", rc_pollcard, sc, SWI_TTY, 0, &sc->sc_swicookie); return (0); @@ -336,7 +336,7 @@ error = bus_teardown_intr(dev, sc->sc_irq, sc->sc_hwicookie); if (error) device_printf(dev, "failed to deregister interrupt handler\n"); - ithread_remove_handler(sc->sc_swicookie); + intr_event_remove_handler(sc->sc_swicookie); rc_release_resources(dev); return (0); ==== //depot/projects/smpng/sys/dev/sab/sab.c#27 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sab/sab.c,v 1.40 2005/10/16 20:22:55 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sab/sab.c,v 1.41 2005/10/26 06:44:58 ru Exp $"); /* * SAB82532 Dual UART driver @@ -321,7 +321,7 @@ for (i = 0; i < SAB_NCHAN; i++) sc->sc_child[i] = device_get_softc(child[i]); - swi_add(&tty_ithd, "tty:sab", sab_softintr, sc, SWI_TTY, + swi_add(&tty_intr_event, "tty:sab", sab_softintr, sc, SWI_TTY, INTR_TYPE_TTY, &sc->sc_softih); if (sabtty_cons != NULL) { ==== //depot/projects/smpng/sys/dev/uart/uart_bus_pci.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_pci.c,v 1.5 2005/01/06 01:43:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_pci.c,v 1.6 2005/10/26 01:49:11 marcel Exp $"); #include #include @@ -63,16 +63,11 @@ }; static struct pci_id pci_ns8250_ids[] = { - { 0x100812b9, "3COM PCI FaxModem", 0x10 }, - { 0x2000131f, "CyberSerial (1-port) 16550", 0x10 }, - { 0x01101407, "Koutech IOFLEX-2S PCI Dual Port Serial", 0x10 }, - { 0x01111407, "Koutech IOFLEX-2S PCI Dual Port Serial", 0x10 }, - { 0x048011c1, "Lucent kermit based PCI Modem", 0x14 }, - { 0x95211415, "Oxford Semiconductor PCI Dual Port Serial", 0x10 }, - { 0x7101135e, "SeaLevel Ultra 530.PCI Single Port Serial", 0x18 }, - { 0x0000151f, "SmartLink 5634PCV SurfRider", 0x10 }, - { 0x0103115d, "Xircom Cardbus modem", 0x10 }, - { 0x98459710, "Netmos Nm9845 PCI Bridge with Dual UART", 0x10 }, + { 0x048011c1, "Actiontec 56K PCI Master", 0x14 }, + { 0x01101407, "Lava Computers serial port", 0x10 }, + { 0x01111407, "Lava Computers serial port", 0x10 }, + { 0x9051deaf, "Middle Digital, Inc. Weasel serial port", 0x10 }, + { 0x950b1415, "Oxford Semiconductor OXCB950 UART", 0x10 }, { 0x01c0135c, "Quatech SSCLP-200/300", 0x18 /* * NB: You must mount the "SPAD" jumper to correctly detect @@ -80,6 +75,16 @@ * we do not support the extra registers on the Quatech. */ }, + { 0x7101135e, "SeaLevel Ultra 530.PCI Single Port Serial", 0x18 }, + { 0x1000131f, "SIIG Cyber Serial PCI 16C550 (10x family)", 0x18 }, + { 0x1001131f, "SIIG Cyber Serial PCI 16C650 (10x family)", 0x18 }, + { 0x1002131f, "SIIG Cyber Serial PCI 16C850 (10x family)", 0x18 }, + { 0x2000131f, "SIIG Cyber Serial PCI 16C550 (20x family)", 0x10 }, + { 0x2001131f, "SIIG Cyber Serial PCI 16C650 (20x family)", 0x10 }, + { 0x2002131f, "SIIG Cyber Serial PCI 16C850 (20x family)", 0x10 }, + { 0x0000151f, "SmartLink 5634PCV SurfRider", 0x10 }, + { 0x100812b9, "US Robotics (3Com) 3CP5609 PCI 16550 Modem", 0x10 }, + { 0x0103115d, "Xircom Cardbus modem", 0x10 }, { 0x00000000, NULL, 0 } }; ==== //depot/projects/smpng/sys/dev/zs/zs.c#21 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/zs/zs.c,v 1.31 2005/10/16 20:58:22 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/zs/zs.c,v 1.32 2005/10/25 21:31:22 grehan Exp $"); /*- * Copyright (c) 2003 Jake Burkholder. * All rights reserved. @@ -183,7 +183,7 @@ for (i = 0; i < ZS_NCHAN; i++) sc->sc_child[i] = device_get_softc(child[i]); - swi_add(&tty_ithd, "tty:zs", zs_softintr, sc, SWI_TTY, + swi_add(&tty_intr_event, "tty:zs", zs_softintr, sc, SWI_TTY, INTR_TYPE_TTY, &sc->sc_softih); ZS_WRITE_REG(sc->sc_child[0], 2, sc->sc_child[0]->sc_creg[2]); ==== //depot/projects/smpng/sys/geom/label/g_label_ntfs.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/label/g_label_ntfs.c,v 1.2 2005/08/28 00:14:21 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/label/g_label_ntfs.c,v 1.3 2005/10/26 03:24:28 takawata Exp $"); #include #include @@ -75,6 +75,12 @@ filerecp = g_read_data(cp, voloff, recsize, &error); fr = (struct filerec *)filerecp; + + if(fr->fr_fixup.fh_magic != NTFS_FILEMAGIC){ + label[0] = 0; + goto done; + } + for (ap = filerecp + fr->fr_attroff; atr = (struct attr *)ap, atr->a_hdr.a_type != -1; ap += atr->a_hdr.reclen) { if (atr->a_hdr.a_type == NTFS_A_VOLUMENAME) { if(atr->a_r.a_datalen >= size *2){ ==== //depot/projects/smpng/sys/kern/kern_exit.c#102 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.268 2005/10/23 12:19:08 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.269 2005/10/26 07:18:36 glebius Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -82,6 +82,9 @@ /* Required to be non-static for SysVR4 emulator */ MALLOC_DEFINE(M_ZOMBIE, "zombie", "zombie proc status"); +/* Hook for NFS teardown procedure. */ +void (*nlminfo_release_p)(struct proc *p); + /* * exit -- * Death of process. @@ -234,6 +237,12 @@ funsetownlst(&p->p_sigiolst); /* + * If this process has an nlminfo data area (for lockd), release it + */ + if (nlminfo_release_p != NULL && p->p_nlminfo != NULL) + (*nlminfo_release_p)(p); + + /* * Close open files and release open-file table. * This may block! */ ==== //depot/projects/smpng/sys/kern/kern_thr.c#28 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thr.c,v 1.35 2005/10/14 12:43:46 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thr.c,v 1.36 2005/10/26 06:55:46 davidxu Exp $"); #include #include @@ -42,6 +42,8 @@ #include #include #include +#include +#include #include @@ -275,8 +277,10 @@ p = td->td_proc; /* Signal userland that it can free the stack. */ - if ((void *)uap->state != NULL) + if ((void *)uap->state != NULL) { suword((void *)uap->state, 1); + kern_umtx_wake(td, uap->state, INT_MAX); + } PROC_LOCK(p); sigqueue_flush(&td->td_sigqueue); ==== //depot/projects/smpng/sys/kern/kern_umtx.c#21 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_umtx.c,v 1.33 2005/03/05 09:15:03 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_umtx.c,v 1.34 2005/10/26 06:55:46 davidxu Exp $"); #include #include @@ -687,8 +687,8 @@ return (error); } -static int -do_wake(struct thread *td, void *uaddr, int n_wake) +int +kern_umtx_wake(struct thread *td, void *uaddr, int n_wake) { struct umtx_key key; int ret; @@ -762,7 +762,7 @@ error = do_wait(td, uap->umtx, uap->id, ts); break; case UMTX_OP_WAKE: - error = do_wake(td, uap->umtx, uap->id); + error = kern_umtx_wake(td, uap->umtx, uap->id); break; default: error = EINVAL; ==== //depot/projects/smpng/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#12 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_bt3c_pccard.c,v 1.5 2003/04/01 18:15:21 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c,v 1.15 2005/09/22 19:15:33 emax Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c,v 1.16 2005/10/26 06:17:27 ru Exp $ * * XXX XXX XX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX * @@ -645,7 +645,7 @@ /* Attach handler to TTY SWI thread */ sc->ith = NULL; - if (swi_add(&tty_ithd, device_get_nameunit(dev), + if (swi_add(&tty_intr_event, device_get_nameunit(dev), bt3c_swi_intr, sc, SWI_TTY, 0, &sc->ith) < 0) { device_printf(dev, "Could not setup SWI ISR\n"); goto bad; @@ -682,7 +682,7 @@ return (0); bad: if (sc->ith != NULL) { - ithread_remove_handler(sc->ith); + intr_event_remove_handler(sc->ith); sc->ith = NULL; } @@ -724,7 +724,7 @@ device_set_softc(dev, NULL); - ithread_remove_handler(sc->ith); + intr_event_remove_handler(sc->ith); sc->ith = NULL; bus_teardown_intr(dev, sc->irq, sc->irq_cookie); ==== //depot/projects/smpng/sys/netgraph/ng_split.h#5 (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_split.h,v 1.4 2005/01/07 01:45:39 imp Exp $ + * $FreeBSD: src/sys/netgraph/ng_split.h,v 1.5 2005/10/25 20:56:12 ru Exp $ * */ @@ -35,7 +35,7 @@ /* Node type name and magic cookie */ #define NG_SPLIT_NODE_TYPE "split" -#define NGM_NG_SPLIT_COOKIE 949409402 +#define NGM_SPLIT_COOKIE 949409402 /* My hook names */ #define NG_SPLIT_HOOK_MIXED "mixed" /* Mixed stream (in/out) */ ==== //depot/projects/smpng/sys/netinet/ip_carp.c#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet/ip_carp.c,v 1.33 2005/10/22 14:54:02 mlaier Exp $ */ +/* $FreeBSD: src/sys/netinet/ip_carp.c,v 1.34 2005/10/26 05:57:35 yar Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -380,7 +380,7 @@ ifp->if_softc = sc; if_initname(ifp, CARP_IFNAME, unit); ifp->if_mtu = ETHERMTU; - ifp->if_flags = 0; + ifp->if_flags = IFF_LOOPBACK; ifp->if_ioctl = carp_ioctl; ifp->if_output = carp_looutput; ifp->if_start = carp_start; ==== //depot/projects/smpng/sys/nfsclient/nfs_lock.c#30 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_lock.c,v 1.40 2004/12/06 08:31:32 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_lock.c,v 1.41 2005/10/26 07:18:36 glebius Exp $"); #include #include @@ -62,9 +62,13 @@ #include #include +extern void (*nlminfo_release_p)(struct proc *p); + MALLOC_DEFINE(M_NFSLOCK, "NFS lock", "NFS lock request"); +MALLOC_DEFINE(M_NLMINFO, "nlminfo", "NFS lock process structure"); static int nfslockdans(struct thread *td, struct lockd_ans *ansp); +static void nlminfo_release(struct proc *p); /* * -------------------------------------------------------------------- * A miniature device driver which the userland uses to talk to us. @@ -194,6 +198,7 @@ printf("nfslock: pseudo-device\n"); mtx_init(&nfslock_mtx, "nfslock", NULL, MTX_DEF); TAILQ_INIT(&nfslock_list); + nlminfo_release_p = nlminfo_release; nfslock_dev = make_dev(&nfslock_cdevsw, 0, UID_ROOT, GID_KMEM, 0600, _PATH_NFSLCKDEV); return (0); @@ -259,7 +264,7 @@ */ if (p->p_nlminfo == NULL) { MALLOC(p->p_nlminfo, struct nlminfo *, - sizeof(struct nlminfo), M_LOCKF, M_WAITOK | M_ZERO); + sizeof(struct nlminfo), M_NLMINFO, M_WAITOK | M_ZERO); p->p_nlminfo->pid_start = p->p_stats->p_start; timevaladd(&p->p_nlminfo->pid_start, &boottime); } @@ -381,3 +386,12 @@ return (0); } +/* + * Free nlminfo attached to process. + */ +void +nlminfo_release(struct proc *p) +{ + free(p->p_nlminfo, M_NLMINFO); + p->p_nlminfo = NULL; +} ==== //depot/projects/smpng/sys/nfsclient/nlminfo.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * from BSDI nlminfo.h,v 2.1 1998/03/18 01:30:38 don Exp - * $FreeBSD: src/sys/nfsclient/nlminfo.h,v 1.2 2001/09/18 23:31:53 peter Exp $ + * $FreeBSD: src/sys/nfsclient/nlminfo.h,v 1.3 2005/10/26 07:18:36 glebius Exp $ */ /* @@ -40,5 +40,3 @@ int getlk_pid; struct timeval pid_start; /* process starting time */ }; - -extern void nlminfo_release(struct proc *p); ==== //depot/projects/smpng/sys/pc98/cbus/sio.c#5 (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/pc98/cbus/sio.c,v 1.237 2005/10/16 20:22:56 phk Exp $ + * $FreeBSD: src/sys/pc98/cbus/sio.c,v 1.238 2005/10/26 06:44:59 ru Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -1718,9 +1718,9 @@ printf("\n"); if (sio_fast_ih == NULL) { - swi_add(&tty_ithd, "sio", siopoll, NULL, SWI_TTY, 0, + swi_add(&tty_intr_event, "sio", siopoll, NULL, SWI_TTY, 0, &sio_fast_ih); - swi_add(&clk_ithd, "sio", siopoll, NULL, SWI_CLOCK, 0, + swi_add(&clk_intr_event, "sio", siopoll, NULL, SWI_CLOCK, 0, &sio_slow_ih); } ==== //depot/projects/smpng/sys/sys/lockf.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)lockf.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/sys/lockf.h,v 1.18 2005/01/25 10:15:25 jeff Exp $ + * $FreeBSD: src/sys/sys/lockf.h,v 1.19 2005/10/26 07:18:37 glebius Exp $ */ #ifndef _SYS_LOCKF_H_ @@ -40,10 +40,6 @@ struct vop_advlock_args; -#ifdef MALLOC_DECLARE -MALLOC_DECLARE(M_LOCKF); -#endif - /* * The lockf structure is a kernel structure which contains the information * associated with a byte range lock. The lockf structures are linked into ==== //depot/projects/smpng/sys/sys/umtx.h#13 (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/umtx.h,v 1.16 2005/03/05 09:15:03 davidxu Exp $ + * $FreeBSD: src/sys/sys/umtx.h,v 1.17 2005/10/26 06:55:46 davidxu Exp $ * */ @@ -135,6 +135,8 @@ struct umtx_q *umtxq_alloc(void); void umtxq_free(struct umtx_q *); +struct thread; +int kern_umtx_wake(struct thread *td, void *uaddr, int n_wake); #endif /* !_KERNEL */ #endif /* !_SYS_UMTX_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Oct 26 16:48:30 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36BF116A422; Wed, 26 Oct 2005 16:48:30 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 D47B416A41F; Wed, 26 Oct 2005 16:48:29 +0000 (GMT) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (arm132.internetdsl.tpnet.pl [83.17.198.132]) by mx1.FreeBSD.org (Postfix) with ESMTP id C1AD143D49; Wed, 26 Oct 2005 16:48:28 +0000 (GMT) (envelope-from pjd@garage.freebsd.pl) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id 4415E50F94; Wed, 26 Oct 2005 18:48:27 +0200 (CEST) Received: from localhost (dlp203.neoplus.adsl.tpnet.pl [83.24.45.203]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 0713550F92; Wed, 26 Oct 2005 18:48:21 +0200 (CEST) Date: Wed, 26 Oct 2005 18:48:18 +0200 From: Pawel Jakub Dawidek To: Florent Thoumie Message-ID: <20051026164818.GB57339@garage.freebsd.pl> References: <200510202233.j9KMXJve039592@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="/NkBOFFp2J2Af1nK" Content-Disposition: inline In-Reply-To: <200510202233.j9KMXJve039592@repoman.freebsd.org> X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 7.0-CURRENT i386 User-Agent: mutt-ng/devel-r535 (FreeBSD) X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-0.5 required=3.0 tests=BAYES_00,RCVD_IN_NJABL_DUL, RCVD_IN_SORBS_DUL autolearn=no version=3.0.4 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 85626 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2005 16:48:31 -0000 --/NkBOFFp2J2Af1nK Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Oct 20, 2005 at 10:33:19PM +0000, Florent Thoumie wrote: +> http://perforce.freebsd.org/chv.cgi?CH=3D85626 +>=20 +> Change 85626 by flz@flz_freefall on 2005/10/20 22:33:03 +>=20 +> Remove part of my workspace. Save your time and ignore this file, noone remember about this file. My entry is there for ages. One of the problems is that obliterate command has to lock entire tree IIRC, which will block access for many hours. --=20 Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --/NkBOFFp2J2Af1nK Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFDX7NSForvXbEpPzQRAmDEAKDQl63s73JCe++MB5SpPWIHrj+SOQCfdQsJ dqHA0RgKJRPOAXEmHHWn9zw= =tLbR -----END PGP SIGNATURE----- --/NkBOFFp2J2Af1nK-- From owner-p4-projects@FreeBSD.ORG Wed Oct 26 23:44:44 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA25216A421; Wed, 26 Oct 2005 23:44:43 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 BDF1F16A41F for ; Wed, 26 Oct 2005 23:44:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 80EF943D46 for ; Wed, 26 Oct 2005 23:44:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9QNihXN013999 for ; Wed, 26 Oct 2005 23:44:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9QNih8h013996 for perforce@freebsd.org; Wed, 26 Oct 2005 23:44:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 26 Oct 2005 23:44:43 GMT Message-Id: <200510262344.j9QNih8h013996@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 85916 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2005 23:44:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=85916 Change 85916 by rwatson@rwatson_zoo on 2005/10/26 23:43:58 In zero-copy case, make sure to release mutex. Bug introduced when new socket buffer assertions were added but did not consider the zero-copy case. Foot by: kris Affected files ... .. //depot/projects/netsmp/src/sys/kern/uipc_socket.c#12 edit Differences ... ==== //depot/projects/netsmp/src/sys/kern/uipc_socket.c#12 (text+ko) ==== @@ -1246,6 +1246,7 @@ error = uiomoveco(mtod(m, char *) + moff, (int)len, uio, disposable); + SOCKBUF_LOCK(&so->so_rcv); } else #endif /* ZERO_COPY_SOCKETS */ { From owner-p4-projects@FreeBSD.ORG Wed Oct 26 23:44:45 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 098A716A420; Wed, 26 Oct 2005 23:44:45 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 B23DE16A432 for ; Wed, 26 Oct 2005 23:44:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D086943D45 for ; Wed, 26 Oct 2005 23:44:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9QNihj6014005 for ; Wed, 26 Oct 2005 23:44:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9QNihLa014002 for perforce@freebsd.org; Wed, 26 Oct 2005 23:44:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 26 Oct 2005 23:44:43 GMT Message-Id: <200510262344.j9QNihLa014002@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 85917 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2005 23:44:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=85917 Change 85917 by rwatson@rwatson_zoo on 2005/10/26 23:44:16 One more assertion. Affected files ... .. //depot/projects/netsmp/src/sys/kern/uipc_socket2.c#5 edit Differences ... ==== //depot/projects/netsmp/src/sys/kern/uipc_socket2.c#5 (text+ko) ==== @@ -372,6 +372,8 @@ if (error) return (error); } + KASSERT(sb->sb_lock_owner == NULL, ("sb_lock: sb_lock_owner %p", + sb->sb_lock_owner)); sb->sb_flags |= SB_LOCK; sb->sb_lock_owner = curthread; return (0); From owner-p4-projects@FreeBSD.ORG Thu Oct 27 00:05:30 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69E8B16A425; Thu, 27 Oct 2005 00:05:29 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 136CA16A420 for ; Thu, 27 Oct 2005 00:05:29 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5F8B43D46 for ; Thu, 27 Oct 2005 00:05:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9R05RmO014754 for ; Thu, 27 Oct 2005 00:05:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9R05L74014747 for perforce@freebsd.org; Thu, 27 Oct 2005 00:05:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 27 Oct 2005 00:05:21 GMT Message-Id: <200510270005.j9R05L74014747@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 85918 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2005 00:05:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=85918 Change 85918 by rwatson@rwatson_zoo on 2005/10/27 00:04:52 Integrate netsmp branch to CVS head. Affected files ... .. //depot/projects/netsmp/src/sys/alpha/alpha/busdma_machdep.c#3 integrate .. //depot/projects/netsmp/src/sys/alpha/alpha/interrupt.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/alpha/pmap.c#3 integrate .. //depot/projects/netsmp/src/sys/alpha/alpha/promcons.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/alpha/trap.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/conf/GENERIC#2 integrate .. //depot/projects/netsmp/src/sys/alpha/include/atomic.h#3 integrate .. //depot/projects/netsmp/src/sys/alpha/include/chipset.h#2 integrate .. //depot/projects/netsmp/src/sys/alpha/include/pmap.h#2 integrate .. //depot/projects/netsmp/src/sys/alpha/isa/isa.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/linux/linux_sysvec.c#3 integrate .. //depot/projects/netsmp/src/sys/alpha/mcbus/mcpcia.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/osf1/osf1_ioctl.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/osf1/osf1_misc.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/osf1/osf1_signal.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/osf1/osf1_signal.h#2 integrate .. //depot/projects/netsmp/src/sys/alpha/pci/apecs.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/pci/cia.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/pci/irongate.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/pci/lca.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/pci/pcibus.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/pci/t2.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/pci/tsunami.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/pci/tsunami_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/tlsb/dwlpx.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/tlsb/zs_tlsb.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/netsmp/src/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/include/atomic.h#5 integrate .. //depot/projects/netsmp/src/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/netsmp/src/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/netsmp/src/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/netsmp/src/sys/amd64/include/smp.h#2 integrate .. //depot/projects/netsmp/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/netsmp/src/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/netsmp/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/netsmp/src/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/inckern.S#1 branch .. //depot/projects/netsmp/src/sys/arm/arm/intr.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/locore.S#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/mem.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/netsmp/src/sys/arm/arm/support.S#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/netsmp/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/netsmp/src/sys/arm/include/atomic.h#3 integrate .. //depot/projects/netsmp/src/sys/arm/include/in_cksum.h#2 integrate .. //depot/projects/netsmp/src/sys/arm/include/md_var.h#2 integrate .. //depot/projects/netsmp/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/netsmp/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/sa11x0/sa11x0_var.h#2 integrate .. //depot/projects/netsmp/src/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/netsmp/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/netsmp/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/netsmp/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/netsmp/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/xscale/i80321/obiovar.h#2 integrate .. //depot/projects/netsmp/src/sys/boot/common/help.common#3 integrate .. //depot/projects/netsmp/src/sys/boot/common/loader.8#3 integrate .. //depot/projects/netsmp/src/sys/boot/efi/libefi/bootinfo.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/netsmp/src/sys/boot/i386/boot2/boot2.c#4 integrate .. //depot/projects/netsmp/src/sys/boot/i386/libi386/bootinfo.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/netsmp/src/sys/boot/i386/libi386/smbios.c#3 integrate .. //depot/projects/netsmp/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/ia64/ski/bootinfo.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/ofw/libofw/devicename.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/ofw/libofw/elf_freebsd.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/ofw/libofw/libofw.h#2 integrate .. //depot/projects/netsmp/src/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/ofw/libofw/ofw_memory.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/sparc64/loader/metadata.c#3 integrate .. //depot/projects/netsmp/src/sys/compat/freebsd32/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/netsmp/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/netsmp/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/netsmp/src/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/netsmp/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/netsmp/src/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/netsmp/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/netsmp/src/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/netsmp/src/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/netsmp/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/svr4/svr4_ipc.c#3 integrate .. //depot/projects/netsmp/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/svr4/svr4_siginfo.h#2 integrate .. //depot/projects/netsmp/src/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/svr4/svr4_signal.h#2 integrate .. //depot/projects/netsmp/src/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/svr4/svr4_termios.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/svr4/svr4_ttold.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/netsmp/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/netsmp/src/sys/conf/NOTES#4 integrate .. //depot/projects/netsmp/src/sys/conf/files#10 integrate .. //depot/projects/netsmp/src/sys/conf/files.arm#2 integrate .. //depot/projects/netsmp/src/sys/conf/files.pc98#2 integrate .. //depot/projects/netsmp/src/sys/conf/kern.post.mk#3 integrate .. //depot/projects/netsmp/src/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/netsmp/src/sys/conf/kmod.mk#3 integrate .. //depot/projects/netsmp/src/sys/conf/options#3 integrate .. //depot/projects/netsmp/src/sys/conf/options.amd64#2 integrate .. //depot/projects/netsmp/src/sys/conf/options.i386#2 integrate .. //depot/projects/netsmp/src/sys/conf/options.pc98#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/tbconvrt.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/tbget.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/tbgetall.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/tbrsdt.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/oltr/if_oltr_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/pf/net/if_pflog.c#5 integrate .. //depot/projects/netsmp/src/sys/contrib/pf/net/if_pfsync.c#6 integrate .. //depot/projects/netsmp/src/sys/ddb/db_command.c#3 integrate .. //depot/projects/netsmp/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/aac/aac_debug.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/aac/aac_tables.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_acad.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_battery.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_smbat.c#1 branch .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_smbus.h#1 branch .. //depot/projects/netsmp/src/sys/dev/acpica/acpiio.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/an/if_an.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/arl/if_arl_isa.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/bfe/if_bfe.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/netsmp/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/cm/if_cm_isa.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/cnw/if_cnw.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/cp/if_cp.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/cs/if_cs.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/cy/cy.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/dc/dcphy.c#1 branch .. //depot/projects/netsmp/src/sys/dev/dc/if_dc.c#1 branch .. //depot/projects/netsmp/src/sys/dev/dc/if_dcreg.h#1 branch .. //depot/projects/netsmp/src/sys/dev/dc/pnphy.c#1 branch .. //depot/projects/netsmp/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/digi/digi.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ed/ax88x90reg.h#1 branch .. //depot/projects/netsmp/src/sys/dev/ed/dl100xxreg.h#1 branch .. //depot/projects/netsmp/src/sys/dev/ed/if_ed.c#9 integrate .. //depot/projects/netsmp/src/sys/dev/ed/if_ed_isa.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ed/if_ed_pccard.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/ed/if_ed_pci.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/ed/if_ed_rtl80x9.c#1 branch .. //depot/projects/netsmp/src/sys/dev/ed/if_edreg.h#4 integrate .. //depot/projects/netsmp/src/sys/dev/ed/if_edvar.h#5 integrate .. //depot/projects/netsmp/src/sys/dev/ed/rtl80x9reg.h#1 branch .. //depot/projects/netsmp/src/sys/dev/ed/tc5299jreg.h#1 branch .. //depot/projects/netsmp/src/sys/dev/em/if_em.c#8 integrate .. //depot/projects/netsmp/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/en/if_en_pci.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/ep/if_ep.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/exca/exca.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/fatm/if_fatm.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/fb/creator.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/fb/gfb.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/fb/tga.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/fe/if_fe.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/firewire/00README#2 integrate .. //depot/projects/netsmp/src/sys/dev/firewire/if_fwe.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/firewire/if_fwip.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/fxp/if_fxp.c#9 integrate .. //depot/projects/netsmp/src/sys/dev/fxp/if_fxpvar.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/hatm/if_hatm_intr.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/hme/if_hme.c#10 integrate .. //depot/projects/netsmp/src/sys/dev/hme/if_hmereg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/hme/if_hmevar.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ic/i8259.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/ieee488/pcii.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ieee488/tnt4882.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ieee488/upd7210.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ieee488/upd7210.h#4 integrate .. //depot/projects/netsmp/src/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/ips/ips.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ips/ips.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/ips/ips_commands.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ips/ips_disk.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ips/ips_ioctl.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ipw/if_ipw.c#8 integrate .. //depot/projects/netsmp/src/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/iwi/if_iwireg.h#4 integrate .. //depot/projects/netsmp/src/sys/dev/iwi/if_iwivar.h#4 integrate .. //depot/projects/netsmp/src/sys/dev/ixgb/README#2 integrate .. //depot/projects/netsmp/src/sys/dev/ixgb/if_ixgb.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/joy/joy_pccard.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/lge/if_lge.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/lmc/if_lmc.c#1 branch .. //depot/projects/netsmp/src/sys/dev/lmc/if_lmc.h#1 branch .. //depot/projects/netsmp/src/sys/dev/md/md.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mii/dcphy.c#2 delete .. //depot/projects/netsmp/src/sys/dev/mii/exphy.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mii/miivar.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mii/pnphy.c#2 delete .. //depot/projects/netsmp/src/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/nge/if_nge.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/nsp/nsp_pccard.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/nve/if_nve.c#8 integrate .. //depot/projects/netsmp/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/patm/if_patm_rx.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/pccard/card_if.m#3 integrate .. //depot/projects/netsmp/src/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/pccard/pccard_cis.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/pccard/pccard_device.c#1 branch .. //depot/projects/netsmp/src/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/netsmp/src/sys/dev/pccard/pccardvar.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/pccard/pccardvarp.h#1 branch .. //depot/projects/netsmp/src/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/pccbb/pccbb_isa.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/pccbb/pccbbdevid.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/pci/isa_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/pci/pci.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/puc/puc.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ral/if_ral.c#8 integrate .. //depot/projects/netsmp/src/sys/dev/ral/if_ral_pccard.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ray/if_ray.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/rc/rc.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/re/if_re.c#9 integrate .. //depot/projects/netsmp/src/sys/dev/rp/rp.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/sab/sab.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/sbsh/if_sbsh.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/si/si.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/sio/sio.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/sn/if_sn.c#8 integrate .. //depot/projects/netsmp/src/sys/dev/sn/if_snreg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/snc/if_snc_pccard.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/snp/snp.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pci/als4000.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pci/via82c686.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/ac97.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/dsp.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/feeder_rate.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/feeder_volume.c#1 branch .. //depot/projects/netsmp/src/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/sound.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/vchan.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/stg/tmc18c30_pccard.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/sx/cd1865.h#2 delete .. //depot/projects/netsmp/src/sys/dev/sx/sx.c#2 delete .. //depot/projects/netsmp/src/sys/dev/sx/sx.h#2 delete .. //depot/projects/netsmp/src/sys/dev/sx/sx_pci.c#2 delete .. //depot/projects/netsmp/src/sys/dev/sx/sx_util.c#2 delete .. //depot/projects/netsmp/src/sys/dev/sx/sx_util.h#2 delete .. //depot/projects/netsmp/src/sys/dev/sx/sxvar.h#2 delete .. //depot/projects/netsmp/src/sys/dev/syscons/scgfbrndr.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/syscons/scmouse.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/syscons/scvidctl.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/tx/if_tx.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/txp/if_txp.c#8 integrate .. //depot/projects/netsmp/src/sys/dev/txp/if_txpreg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/uart/uart_bus_pccard.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/ehcivar.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_aue.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_axe.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_cdce.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_cdcereg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_rue.c#9 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_udav.c#8 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_ural.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/usb/slhci_pccard.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/ucycom.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/netsmp/src/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/vge/if_vge.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/vx/if_vx.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/vx/if_vxvar.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/wi/if_wi.c#11 integrate .. //depot/projects/netsmp/src/sys/dev/wi/if_wi_pccard.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/wl/if_wl.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/xe/if_xe_pccard.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/xe/if_xereg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/zs/zs.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/devfs/devfs.h#4 integrate .. //depot/projects/netsmp/src/sys/fs/devfs/devfs_devs.c#4 integrate .. //depot/projects/netsmp/src/sys/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/netsmp/src/sys/fs/devfs/devfs_rule.c#4 integrate .. //depot/projects/netsmp/src/sys/fs/devfs/devfs_vfsops.c#4 integrate .. //depot/projects/netsmp/src/sys/fs/devfs/devfs_vnops.c#8 integrate .. //depot/projects/netsmp/src/sys/fs/fifofs/fifo_vnops.c#18 integrate .. //depot/projects/netsmp/src/sys/fs/msdosfs/bootsect.h#2 integrate .. //depot/projects/netsmp/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/netsmp/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/netsmp/src/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/geom_ctl.c#3 integrate .. //depot/projects/netsmp/src/sys/geom/geom_disk.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/geom_gpt.c#3 integrate .. //depot/projects/netsmp/src/sys/geom/label/g_label_ntfs.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/ext2fs/ext2_alloc.c#2 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/reiserfs/reiserfs_namei.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/conf/NOTES#5 integrate .. //depot/projects/netsmp/src/sys/i386/cpufreq/p4tcc.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/netsmp/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/netsmp/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/netsmp/src/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/netsmp/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/i386/vm86.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/netsmp/src/sys/i386/include/atomic.h#3 integrate .. //depot/projects/netsmp/src/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/netsmp/src/sys/i386/include/md_var.h#2 integrate .. //depot/projects/netsmp/src/sys/i386/include/smp.h#2 integrate .. //depot/projects/netsmp/src/sys/i386/include/smptests.h#2 integrate .. //depot/projects/netsmp/src/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/netsmp/src/sys/i386/include/trap.h#2 integrate .. //depot/projects/netsmp/src/sys/i386/isa/atpic.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/isa/isa.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/netsmp/src/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/ia64/ia32/ia32_signal.c#3 integrate .. //depot/projects/netsmp/src/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/trap.c#4 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/unaligned.c#2 integrate .. //depot/projects/netsmp/src/sys/ia64/include/atomic.h#2 integrate .. //depot/projects/netsmp/src/sys/isa/pnp.c#2 integrate .. //depot/projects/netsmp/src/sys/isofs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/netsmp/src/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/netsmp/src/sys/isofs/cd9660/iso.h#2 integrate .. //depot/projects/netsmp/src/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/init_main.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_conf.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/kern_cpu.c#6 integrate .. //depot/projects/netsmp/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/kern_environment.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/kern_event.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/kern_exec.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_exit.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/kern_intr.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/kern_jail.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_kse.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/kern_linker.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_lock.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/kern_mac.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/kern_poll.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/kern_proc.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_tc.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/kern_thr.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_time.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/link_elf.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/sched_ule.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/subr_bus.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/subr_param.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/subr_prf.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/subr_smp.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/subr_trap.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/subr_witness.c#10 integrate .. //depot/projects/netsmp/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/netsmp/src/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/tty.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/tty_compat.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_socket.c#13 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_cluster.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_export.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_subr.c#11 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/netsmp/src/sys/modules/3dfx/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/Makefile#5 integrate .. //depot/projects/netsmp/src/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/agp/Makefile#3 integrate .. //depot/projects/netsmp/src/sys/modules/aha/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ahb/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/an/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ar/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/arcnet/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/arl/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ath/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ath_rate_amrr/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/aue/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/awi/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/axe/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/bfe/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/bge/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/bktr/bktr/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/bridge/Makefile#2 delete .. //depot/projects/netsmp/src/sys/modules/cam/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/cdce/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/coda5/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/cp/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ctau/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/cue/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/cx/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/dc/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/dcons/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/de/Makefile#4 integrate .. //depot/projects/netsmp/src/sys/modules/digi/digi/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/dummynet/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ed/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/em/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/en/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/firewire/fwip/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/fxp/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/geom/geom_bsd/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/geom/geom_uzip/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/if_bridge/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/if_disc/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/if_faith/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/if_gif/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/if_gre/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/if_ndis/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/if_ppp/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/if_sl/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/if_stf/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/if_tap/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/if_tun/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/if_vlan/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ip_mroute_mod/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ipfilter/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ipw/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/iwi/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ixgb/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/kbdmux/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/kue/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/lge/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/linux/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/lmc/Makefile#1 branch .. //depot/projects/netsmp/src/sys/modules/mii/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ncv/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ndis/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/netgraph/gif/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/netgraph/iface/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/netgraph/mppc/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/netgraph/sync_ar/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/netgraph/sync_sr/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/nfs4client/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/nfsserver/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/nge/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/nmdm/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/nsp/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/nwfs/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/osf1/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/patm/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/pccard/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/pcn/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/pf/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ral/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/rc/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/re/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/rl/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/rp/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/rue/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/safe/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/sf/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/sio/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/sis/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/sk/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/smbfs/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/snc/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/snp/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/sppp/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/sr/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ste/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/stg/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ti/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/tl/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/trm/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/tx/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/txp/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/udav/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ukbd/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ural/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/vge/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/vkbd/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/vr/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/vx/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/wb/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/wi/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/xl/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/net/bpf.c#7 integrate .. //depot/projects/netsmp/src/sys/net/bridge.c#4 delete .. //depot/projects/netsmp/src/sys/net/bridge.h#2 delete .. //depot/projects/netsmp/src/sys/net/bridgestp.c#5 integrate .. //depot/projects/netsmp/src/sys/net/if.c#17 integrate .. //depot/projects/netsmp/src/sys/net/if.h#6 integrate .. //depot/projects/netsmp/src/sys/net/if_bridge.c#10 integrate .. //depot/projects/netsmp/src/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/netsmp/src/sys/net/if_clone.c#2 integrate .. //depot/projects/netsmp/src/sys/net/if_disc.c#2 integrate .. //depot/projects/netsmp/src/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/netsmp/src/sys/net/if_faith.c#4 integrate .. //depot/projects/netsmp/src/sys/net/if_fwsubr.c#5 integrate .. //depot/projects/netsmp/src/sys/net/if_gif.c#5 integrate .. //depot/projects/netsmp/src/sys/net/if_gre.c#5 integrate .. //depot/projects/netsmp/src/sys/net/if_mib.c#2 integrate .. //depot/projects/netsmp/src/sys/net/if_ppp.c#5 integrate .. //depot/projects/netsmp/src/sys/net/if_sl.c#2 integrate .. //depot/projects/netsmp/src/sys/net/if_spppsubr.c#5 integrate .. //depot/projects/netsmp/src/sys/net/if_stf.c#2 integrate .. //depot/projects/netsmp/src/sys/net/if_var.h#12 integrate .. //depot/projects/netsmp/src/sys/net/if_vlan.c#11 integrate .. //depot/projects/netsmp/src/sys/net/netisr.c#2 integrate .. //depot/projects/netsmp/src/sys/net/ppp_tty.c#5 integrate .. //depot/projects/netsmp/src/sys/net/route.c#4 integrate .. //depot/projects/netsmp/src/sys/net/rtsock.c#9 integrate .. //depot/projects/netsmp/src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_iface.c#4 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_mppc.c#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_split.h#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet/icmp6.h#4 integrate .. //depot/projects/netsmp/src/sys/netinet/if_ether.c#6 integrate .. //depot/projects/netsmp/src/sys/netinet/in.c#9 integrate .. //depot/projects/netsmp/src/sys/netinet/in.h#4 integrate .. //depot/projects/netsmp/src/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/netsmp/src/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_carp.c#6 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_fastfwd.c#6 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_output.c#9 integrate .. //depot/projects/netsmp/src/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/netsmp/src/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/netsmp/src/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/netsmp/src/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/netsmp/src/sys/netinet6/README#2 integrate .. //depot/projects/netsmp/src/sys/netinet6/esp_aesctr.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/netsmp/src/sys/netinet6/in6.c#6 integrate .. //depot/projects/netsmp/src/sys/netinet6/in6.h#5 integrate .. //depot/projects/netsmp/src/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/netsmp/src/sys/netinet6/in6_ifattach.h#2 integrate .. //depot/projects/netsmp/src/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet6/in6_src.c#5 integrate .. //depot/projects/netsmp/src/sys/netinet6/in6_var.h#9 integrate .. //depot/projects/netsmp/src/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/netsmp/src/sys/netinet6/ip6_mroute.c#5 integrate .. //depot/projects/netsmp/src/sys/netinet6/ip6_output.c#7 integrate .. //depot/projects/netsmp/src/sys/netinet6/ip6_var.h#5 integrate .. //depot/projects/netsmp/src/sys/netinet6/mld6.c#7 integrate .. //depot/projects/netsmp/src/sys/netinet6/mld6_var.h#2 integrate .. //depot/projects/netsmp/src/sys/netinet6/nd6.c#7 integrate .. //depot/projects/netsmp/src/sys/netinet6/nd6.h#2 integrate .. //depot/projects/netsmp/src/sys/netinet6/nd6_nbr.c#8 integrate .. //depot/projects/netsmp/src/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/netsmp/src/sys/netinet6/raw_ip6.c#5 integrate .. //depot/projects/netsmp/src/sys/netipsec/ipsec_mbuf.c#2 integrate .. //depot/projects/netsmp/src/sys/netsmb/netbios.h#2 integrate .. //depot/projects/netsmp/src/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/netsmp/src/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/netsmp/src/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/netsmp/src/sys/nfsclient/nlminfo.h#2 integrate .. //depot/projects/netsmp/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/netsmp/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/netsmp/src/sys/pc98/cbus/sio.c#3 integrate .. //depot/projects/netsmp/src/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/netsmp/src/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/netsmp/src/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/netsmp/src/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/netsmp/src/sys/pccard/mecia.c#2 delete .. //depot/projects/netsmp/src/sys/pccard/pccard.c#2 delete .. //depot/projects/netsmp/src/sys/pccard/pccard_beep.c#2 delete .. //depot/projects/netsmp/src/sys/pccard/pccard_nbk.c#2 delete .. //depot/projects/netsmp/src/sys/pccard/pcic.c#2 delete .. //depot/projects/netsmp/src/sys/pccard/pcic_isa.c#2 delete .. //depot/projects/netsmp/src/sys/pccard/pcic_pci.c#2 delete .. //depot/projects/netsmp/src/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/netsmp/src/sys/pci/agpreg.h#3 integrate .. //depot/projects/netsmp/src/sys/pci/if_dc.c#10 delete .. //depot/projects/netsmp/src/sys/pci/if_dcreg.h#3 delete .. //depot/projects/netsmp/src/sys/pci/if_pcn.c#11 integrate .. //depot/projects/netsmp/src/sys/pci/if_rl.c#7 integrate .. //depot/projects/netsmp/src/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/netsmp/src/sys/pci/if_sf.c#9 integrate .. //depot/projects/netsmp/src/sys/pci/if_sis.c#8 integrate .. //depot/projects/netsmp/src/sys/pci/if_sisreg.h#2 integrate .. //depot/projects/netsmp/src/sys/pci/if_sk.c#8 integrate .. //depot/projects/netsmp/src/sys/pci/if_skreg.h#2 integrate .. //depot/projects/netsmp/src/sys/pci/if_ste.c#9 integrate .. //depot/projects/netsmp/src/sys/pci/if_ti.c#7 integrate .. //depot/projects/netsmp/src/sys/pci/if_tireg.h#2 integrate .. //depot/projects/netsmp/src/sys/pci/if_tl.c#7 integrate .. //depot/projects/netsmp/src/sys/pci/if_vr.c#7 integrate .. //depot/projects/netsmp/src/sys/pci/if_wb.c#8 integrate .. //depot/projects/netsmp/src/sys/pci/if_xl.c#9 integrate .. //depot/projects/netsmp/src/sys/posix4/_semaphore.h#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/include/atomic.h#3 integrate .. //depot/projects/netsmp/src/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/ofw/ofw_syscons.c#3 integrate .. //depot/projects/netsmp/src/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/netsmp/src/sys/powerpc/powerpc/trap.c#3 integrate .. //depot/projects/netsmp/src/sys/rpc/rpcclnt.c#2 integrate .. //depot/projects/netsmp/src/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/netsmp/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/netsmp/src/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/netsmp/src/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/netsmp/src/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/netsmp/src/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/netsmp/src/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/netsmp/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/netsmp/src/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/netsmp/src/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/include/atomic.h#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/include/param.h#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/netsmp/src/sys/sys/buf.h#4 integrate .. //depot/projects/netsmp/src/sys/sys/bus.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/cdefs.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/conf.h#5 integrate .. //depot/projects/netsmp/src/sys/sys/event.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/interrupt.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/kerneldump.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/libkern.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/lockf.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/mac.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/mac_policy.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/mchain.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/mount.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/param.h#5 integrate .. //depot/projects/netsmp/src/sys/sys/proc.h#4 integrate .. //depot/projects/netsmp/src/sys/sys/refcount.h#1 branch .. //depot/projects/netsmp/src/sys/sys/resourcevar.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/rman.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/signal.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/signalvar.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/smp.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/snoop.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/socket.h#5 integrate .. //depot/projects/netsmp/src/sys/sys/syscall.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/syscall.mk#2 integrate .. //depot/projects/netsmp/src/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/sysent.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/sysproto.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/timers.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/timespec.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/tty.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/types.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/ucred.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/umtx.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/unistd.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/uuid.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/vnode.h#5 integrate .. //depot/projects/netsmp/src/sys/tools/bus_macro.sh#1 branch .. //depot/projects/netsmp/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/netsmp/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/netsmp/src/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/netsmp/src/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/netsmp/src/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/netsmp/src/sys/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/projects/netsmp/src/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/netsmp/src/sys/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/netsmp/src/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/netsmp/src/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/netsmp/src/sys/vm/swap_pager.c#3 integrate .. //depot/projects/netsmp/src/sys/vm/uma.h#3 integrate .. //depot/projects/netsmp/src/sys/vm/uma_core.c#5 integrate .. //depot/projects/netsmp/src/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/netsmp/src/sys/vm/vm_object.c#3 integrate .. //depot/projects/netsmp/src/sys/vm/vm_page.c#3 integrate .. //depot/projects/netsmp/src/sys/vm/vm_zeroidle.c#2 integrate Differences ... ==== //depot/projects/netsmp/src/sys/alpha/alpha/busdma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 27 16:53:06 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB55016A421; Thu, 27 Oct 2005 16:53:05 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 8B40216A41F for ; Thu, 27 Oct 2005 16:53:05 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4336743D49 for ; Thu, 27 Oct 2005 16:53:05 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9RGr5Jx009858 for ; Thu, 27 Oct 2005 16:53:05 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9RGr5YL009855 for perforce@freebsd.org; Thu, 27 Oct 2005 16:53:05 GMT (envelope-from millert@freebsd.org) Date: Thu, 27 Oct 2005 16:53:05 GMT Message-Id: <200510271653.j9RGr5YL009855@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 85931 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2005 16:53:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=85931 Change 85931 by millert@millert_ibook on 2005/10/27 16:52:21 sebsd_free() should no longer be static Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#13 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#13 (text+ko) ==== @@ -91,7 +91,7 @@ return (vs); } -static void +void sebsd_free(void *v) { size_t *vs = v; From owner-p4-projects@FreeBSD.ORG Thu Oct 27 17:03:19 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9097816A421; Thu, 27 Oct 2005 17:03:18 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 4DD1F16A41F for ; Thu, 27 Oct 2005 17:03:18 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F35F843D45 for ; Thu, 27 Oct 2005 17:03:17 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9RH3HAv010404 for ; Thu, 27 Oct 2005 17:03:17 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9RH3Hwt010401 for perforce@freebsd.org; Thu, 27 Oct 2005 17:03:17 GMT (envelope-from millert@freebsd.org) Date: Thu, 27 Oct 2005 17:03:17 GMT Message-Id: <200510271703.j9RH3Hwt010401@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 85932 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2005 17:03:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=85932 Change 85932 by millert@millert_ibook on 2005/10/27 17:03:01 Fix the most egregious style nits. Other, more minor, ones remain. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#14 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#14 (text+ko) ==== @@ -480,29 +480,29 @@ static void sebsd_destroy_cred_label(struct label *label) { - sebsd_free (SLOT(label)); - SLOT(label) = NULL; + sebsd_free (SLOT(label)); + SLOT(label) = NULL; } static void sebsd_destroy_vnode_label(struct label *label) { - sebsd_free (SLOT(label)); - SLOT(label) = NULL; + sebsd_free (SLOT(label)); + SLOT(label) = NULL; } static void sebsd_destroy_mount_label(struct label *label) { - sebsd_free (SLOT(label)); - SLOT(label) = NULL; + sebsd_free (SLOT(label)); + SLOT(label) = NULL; } static void sebsd_destroy_mount_fs_label(struct label *label) { - sebsd_free (SLOT(label)); - SLOT(label) = NULL; + sebsd_free (SLOT(label)); + SLOT(label) = NULL; } #if 0 @@ -573,6 +573,7 @@ * currently uses a backing file pre-allocated with fixed-size * attributes. */ + struct vattr va; char context[256]; u_int32_t context_len; struct proc *p = current_proc(); @@ -614,13 +615,13 @@ } #endif - if (p == NULL || vp == NULL || vp->v_op == NULL || vp->v_tag != VT_HFS || vp->v_data == NULL) - goto dosclass; + if (p == NULL || vp == NULL || vp->v_op == NULL || + vp->v_tag != VT_HFS || vp->v_data == NULL) + goto dosclass; - struct vattr va; error = VOP_GETATTR (vp, &va, p->p_ucred, p); if (error) - goto dosclass; + goto dosclass; error = security_context_to_sid(context, strlen(context), &vsec->sid); if (error) { @@ -632,16 +633,15 @@ dosclass: /* TBD: */ vsec->sclass = vnode_type_to_security_class(vp->v_type); - if (vsec->sclass == 0) { + if (vsec->sclass == 0) printf("sebsd_update_vnode_from_extattr:: sclass is 0\n"); - } return (0); } static void sebsd_associate_vnode_singlelabel(struct mount *mp, struct label *fslabel, - struct vnode *vp, struct label *vlabel) + struct vnode *vp, struct label *vlabel) { struct mount_fs_security_struct *sbsec; struct vnode_security_struct *vsec; @@ -650,14 +650,12 @@ vsec = SLOT(vlabel); vsec->sclass = vnode_type_to_security_class(vp->v_type); - if (sbsec == NULL) - { - if (vp->v_mount != NULL) - printf ("create_vnode: no mount label for mnt=%s\n", - vp->v_mount->mnt_stat.f_mntonname); - } - else - vsec->sid = sbsec->sid; + if (sbsec == NULL) { + if (vp->v_mount != NULL) + printf ("create_vnode: no mount label for mnt=%s\n", + vp->v_mount->mnt_stat.f_mntonname); + } else + vsec->sid = sbsec->sid; } static void @@ -676,16 +674,14 @@ /* Default to using the attributes from the parent process */ task->osid = parent->osid; task->sid = parent->sid; - - return; } static void -sebsd_create_task (struct task *parent, struct task *child, struct label *pl, - struct label *chl, struct label *chpl) +sebsd_create_task(struct task *parent, struct task *child, struct label *pl, + struct label *chl, struct label *chpl) { - sebsd_create_credlabels (pl, chl); - sebsd_create_credlabels (pl, chpl); + sebsd_create_credlabels(pl, chl); + sebsd_create_credlabels(pl, chpl); } static void @@ -702,15 +698,15 @@ } static void -sebsd_copy_cred_to_task (struct label *cred, struct label *task) +sebsd_copy_cred_to_task(struct label *cred, struct label *task) { - struct task_security_struct *cl, *tl; + struct task_security_struct *cl, *tl; - cl = SLOT(cred); - tl = SLOT(task); + cl = SLOT(cred); + tl = SLOT(task); - tl->osid = cl->osid; - tl->sid = cl->sid; + tl->osid = cl->osid; + tl->sid = cl->sid; } @@ -728,13 +724,11 @@ task = SLOT(cred_child->cr_label); if (parent == task) - panic ("parent child equal"); + panic ("parent child equal"); /* Default to using the attributes from the parent process */ task->osid = parent->osid; task->sid = parent->sid; - - return; } static void @@ -752,19 +746,22 @@ static void sebsd_create_port (struct label *it, struct label *st, struct label *port) { - struct task_security_struct *its, *sts, *psec; - int rc; + struct task_security_struct *its, *sts, *psec; + int error; - its = SLOT (it); - sts = SLOT (st); - psec = SLOT (port); + its = SLOT(it); + sts = SLOT(st); + psec = SLOT(port); - rc = security_change_sid (its->sid, sts->sid, SECCLASS_MACH_PORT, &psec->sid); + error = security_change_sid(its->sid, sts->sid, SECCLASS_MACH_PORT, + &psec->sid); - /* default - label ports the same as owner process. - This is consistent with other IPC objects. */ - if (rc) - psec->sid = sts->sid; + /* + * On error label ports the same as owner process. + * This is consistent with other IPC objects. + */ + if (error) + psec->sid = sts->sid; } static void @@ -772,7 +769,7 @@ { struct task_security_struct *psec; - psec = SLOT (port); + psec = SLOT(port); psec->sid = SECINITSID_KERNEL; } @@ -820,16 +817,13 @@ /* Default to the filesystem SID. */ dirent->sid = SECINITSID_DEVFS; dirent->task_sid = SECINITSID_KERNEL; - dirent->sclass = - devfs_type_to_security_class(devfs_dirent->dn_type); + dirent->sclass = devfs_type_to_security_class(devfs_dirent->dn_type); /* Obtain a SID based on the fstype, path, and class. */ path = sebsd_malloc(strlen(fullpath) + 2, M_ZERO | M_WAITOK); path[0] = '/'; strcpy(&path[1], fullpath); - rc = security_genfs_sid("devfs", path, dirent->sclass, - &newsid); - + rc = security_genfs_sid("devfs", path, dirent->sclass, &newsid); if (rc == 0) dirent->sid = newsid; @@ -838,11 +832,11 @@ if (cr != NULL) { struct task_security_struct *task = SLOT(cr->cr_label); - /* XXX: uses the type specified by genfs instead of the parent directory - like it should! */ - int error = security_transition_sid(task->sid, dirent->sid, dirent->sclass, - &newsid); - if (error == 0) + /* XXX: uses the type specified by genfs instead of the parent + directory like it should! */ + rc = security_transition_sid(task->sid, dirent->sid, + dirent->sclass, &newsid); + if (rc == 0) dirent->sid = newsid; } @@ -853,7 +847,7 @@ "dirent=%d\n", path, rc, dirent->sclass, newsid, dirent->sid); } - sebsd_free (path); + sebsd_free(path); } #if 0 @@ -997,7 +991,7 @@ * which the filesystem will use if not a "multilabel" type. */ rc = security_fs_use(mp->mnt_vfc->vfc_name, &behavior, &sbsec->sid); - if (rc) { + if (rc != 0) { printf("sebsd_create_mount: security_fs_use(%s) returned %d\n", mp->mnt_vfc->vfc_name, rc); behavior = SECURITY_FS_USE_NONE; @@ -1121,8 +1115,7 @@ vsec->sclass = tclass; /* store label in vnode */ - error = security_sid_to_context(vsec->sid, &context, - &context_len); + error = security_sid_to_context(vsec->sid, &context, &context_len); if (error) return (error); @@ -1137,10 +1130,10 @@ #ifdef CAPABILITIES static int -sebsd_check_cap (struct ucred *cred, cap_value_t capv) +sebsd_check_cap(struct ucred *cred, cap_value_t capv) { - return cred_has_capability (cred, capv); + return cred_has_capability(cred, capv); } #endif @@ -1158,17 +1151,17 @@ tsec = SLOT(cred->cr_label); if (nsec == NULL) - return 0; + return 0; rc = avc_has_perm_ref_audit(tsec->sid, tsec->sid, SECCLASS_PROCESS, FILE__RELABELFROM, NULL, NULL); if (rc) - return (rc); + return (rc); rc = avc_has_perm_audit(tsec->sid, nsec->sid, SECCLASS_PROCESS, FILE__RELABELTO, NULL); if (rc) - return (rc); + return (rc); /* if (nsec != NULL && nsec->sid != tsec->sid) @@ -1178,35 +1171,37 @@ } static int -sebsd_check_port_relabel(struct label *task, struct label *oldlabel, struct label *newlabel) +sebsd_check_port_relabel(struct label *task, struct label *oldlabel, + struct label *newlabel) { - struct task_security_struct *tsec, *olds, *news; - int rc; + struct task_security_struct *tsec, *olds, *news; + int rc; - news = SLOT(newlabel); - olds = SLOT(oldlabel); - tsec = SLOT(task); + news = SLOT(newlabel); + olds = SLOT(oldlabel); + tsec = SLOT(task); - rc = avc_has_perm_ref_audit (tsec->sid, olds->sid, SECCLASS_MACH_PORT, - MACH_PORT__RELABELFROM, NULL, NULL); - if (rc) - return (rc); + rc = avc_has_perm_ref_audit(tsec->sid, olds->sid, SECCLASS_MACH_PORT, + MACH_PORT__RELABELFROM, NULL, NULL); + if (rc) + return (rc); - rc = avc_has_perm_audit(tsec->sid, news->sid, SECCLASS_MACH_PORT, - MACH_PORT__RELABELTO, NULL); - if (rc) - return (rc); + rc = avc_has_perm_audit(tsec->sid, news->sid, SECCLASS_MACH_PORT, + MACH_PORT__RELABELTO, NULL); + if (rc) + return (rc); - return 0; + return 0; } #define CHECK_SIMPLE_PERM(func,class,perm) \ -static int sebsd_check_##func (struct label *task, struct label *port) \ +static int sebsd_check_##func(struct label *task, struct label *port) \ { \ - struct task_security_struct *tsec, *psec; \ - psec = SLOT(port); \ - tsec = SLOT(task); \ - return avc_has_perm_ref_audit (tsec->sid, psec->sid, class, perm, NULL, NULL); \ + struct task_security_struct *tsec, *psec; \ + psec = SLOT(port); \ + tsec = SLOT(task); \ + return avc_has_perm_ref_audit (tsec->sid, psec->sid, class, \ + perm, NULL, NULL); \ } CHECK_SIMPLE_PERM(msg_send,SECCLASS_MACH_PORT,MACH_PORT__SEND); @@ -1217,47 +1212,48 @@ extern struct policydb policydb; static int -sebsd_check_service_access (struct label *subj, struct label *obj, - const char *s, const char * pn) +sebsd_check_service_access(struct label *subj, struct label *obj, + const char *s, const char * pn) { - struct task_security_struct *tsec, *psec; - struct class_datum *cld; - struct perm_datum *p; + struct task_security_struct *tsec, *psec; + struct class_datum *cld; + struct perm_datum *p; + + psec = SLOT(obj); + tsec = SLOT(subj); - psec = SLOT(obj); - tsec = SLOT(subj); + cld = hashtab_search (policydb.p_classes.table, s); + if (cld == NULL) + return EINVAL; - cld = hashtab_search (policydb.p_classes.table, s); - if (cld == NULL) - return EINVAL; - - p = hashtab_search (cld->permissions.table, pn); - if (p == NULL && cld->comdatum) - p = hashtab_search (cld->comdatum->permissions.table, pn); - if (p == NULL) - return EINVAL; + p = hashtab_search (cld->permissions.table, pn); + if (p == NULL && cld->comdatum) + p = hashtab_search (cld->comdatum->permissions.table, pn); + if (p == NULL) + return EINVAL; - return avc_has_perm_ref_audit (tsec->sid, psec->sid, cld->value, 1 << (p->value-1), - NULL, NULL); + return avc_has_perm_ref_audit(tsec->sid, psec->sid, cld->value, + 1 << (p->value-1), NULL, NULL); } static int sebsd_request_label (struct label *subj, struct label *obj, const char *s, struct label *out) { - struct task_security_struct *tsec, *psec, *osec; - struct class_datum *cld; - struct perm_datum *p; + struct task_security_struct *tsec, *psec, *osec; + struct class_datum *cld; + struct perm_datum *p; - psec = SLOT(obj); - tsec = SLOT(subj); - osec = SLOT(out); + psec = SLOT(obj); + tsec = SLOT(subj); + osec = SLOT(out); - cld = hashtab_search (policydb.p_classes.table, s); - if (cld == NULL) - return EINVAL; + cld = hashtab_search (policydb.p_classes.table, s); + if (cld == NULL) + return EINVAL; - return security_change_sid (tsec->sid, psec->sid, cld->value, &osec->sid); + return security_change_sid(tsec->sid, psec->sid, cld->value, + &osec->sid); } extern int selinux_enforcing; @@ -1271,7 +1267,7 @@ psec = SLOT(obj); tsec = SLOT(subj); - return sebsd_check_ipc_method1 (tsec->sid,psec->sid, msgid); + return sebsd_check_ipc_method1(tsec->sid,psec->sid, msgid); } static int @@ -1322,8 +1318,8 @@ } static int -sebsd_check_remount(struct ucred *cred, struct mount *mp, struct label *mntlabel, - struct label *mount_arg_label) +sebsd_check_remount(struct ucred *cred, struct mount *mp, + struct label *mntlabel, struct label *mount_arg_label) { /* cannot change labels on filesystems */ @@ -1391,7 +1387,7 @@ FIFO_FILE__RELABELTO, NULL, NULL); /* - * TBD: SELinux also check filesystem associate permission: + * TBD: SELinux also checks filesystem associate permission: return avc_has_perm_audit(newsid, sbsec->sid, SECCLASS_FILESYSTEM, @@ -1728,13 +1724,12 @@ if (dvp->v_mount) { /* XXX: mpo_check_vnode_create should probably pass the mntlabel */ - sbsec = SLOT (dvp->v_mount->mnt_mntlabel); - if (sbsec == NULL) - { - printf ("create_vnode: no mount label for mnt=%s\n", + sbsec = SLOT(dvp->v_mount->mnt_mntlabel); + if (sbsec == NULL) { + printf ("create_vnode: no mount label for mnt=%s\n", dvp->v_mount->mnt_stat.f_mntonname); - return 0; - } + return 0; + } rc = avc_has_perm_audit(newsid, sbsec->sid, SECCLASS_FILESYSTEM, FILESYSTEM__ASSOCIATE, &ad); if (rc) @@ -1815,7 +1810,7 @@ file = SLOT(label); if (execlabel == NULL) { rc = security_transition_sid(task->sid, file->sid, - SECCLASS_PROCESS, &newsid); + SECCLASS_PROCESS, &newsid); if (rc) return EACCES; } else { @@ -1923,8 +1918,8 @@ sebsd_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { - if (dvp->v_type != VDIR) - return ENOTDIR; + if (dvp->v_type != VDIR) + return ENOTDIR; /* TBD: DIR__READ as well? */ return (vnode_has_perm(cred, dvp, DIR__SEARCH, NULL)); @@ -1935,18 +1930,19 @@ struct label *filelabel, int fmode) { int acc_mode = 0; + if (fmode & O_TRUNC) - acc_mode |= VWRITE; + acc_mode |= VWRITE; if (fmode & FWRITE) - acc_mode |= VWRITE; + acc_mode |= VWRITE; if (fmode & FREAD) - acc_mode |= VREAD; + acc_mode |= VREAD; if (!acc_mode) return 0; return (vnode_has_perm(cred, vp, file_mask_to_av(vp->v_type, acc_mode), - NULL)); + NULL)); } static int @@ -2016,7 +2012,7 @@ if (vp->v_mount) { /* XXX: mpo_check_vnode_relabel should probably pass the mntlabel */ - sbsec = SLOT (vp->v_mount->mnt_mntlabel); + sbsec = SLOT(vp->v_mount->mnt_mntlabel); rc = avc_has_perm_audit (new->sid, sbsec->sid, SECCLASS_FILESYSTEM, FILESYSTEM__ASSOCIATE, &ad); if (rc) @@ -2202,7 +2198,6 @@ return vnode_has_perm(cred, vp, FILE__GETATTR, NULL); } - /* * TBD: LSM/SELinux doesn't have a nfsd hook */ @@ -2213,7 +2208,6 @@ return (0); } - static int sebsd_check_system_swapon(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) @@ -2239,7 +2233,7 @@ size_t newlen) { - return (0); + return (0); } static int @@ -2587,118 +2581,118 @@ extern int sebsd_syscall(struct proc *p, int call, void *args); static struct mac_policy_ops sebsd_ops = { - .mpo_init = sebsd_init, - .mpo_init_bsd = sebsd_init_bsd, - .mpo_init_cred_label = sebsd_init_cred_label, - .mpo_init_task_label = sebsd_init_cred_label, - .mpo_init_port_label = sebsd_init_cred_label, - .mpo_init_vnode_label = sebsd_init_vnode_label, - .mpo_init_devfsdirent_label = sebsd_init_devfs_label, + .mpo_init = sebsd_init, + .mpo_init_bsd = sebsd_init_bsd, + .mpo_init_cred_label = sebsd_init_cred_label, + .mpo_init_task_label = sebsd_init_cred_label, + .mpo_init_port_label = sebsd_init_cred_label, + .mpo_init_vnode_label = sebsd_init_vnode_label, + .mpo_init_devfsdirent_label = sebsd_init_devfs_label, - .mpo_destroy = sebsd_destroy, - .mpo_destroy_cred_label = sebsd_destroy_cred_label, - .mpo_destroy_task_label = sebsd_destroy_cred_label, - .mpo_destroy_port_label = sebsd_destroy_cred_label, - .mpo_destroy_vnode_label = sebsd_destroy_vnode_label, - .mpo_destroy_devfsdirent_label = sebsd_destroy_vnode_label, + .mpo_destroy = sebsd_destroy, + .mpo_destroy_cred_label = sebsd_destroy_cred_label, + .mpo_destroy_task_label = sebsd_destroy_cred_label, + .mpo_destroy_port_label = sebsd_destroy_cred_label, + .mpo_destroy_vnode_label = sebsd_destroy_vnode_label, + .mpo_destroy_devfsdirent_label = sebsd_destroy_vnode_label, - .mpo_copy_cred_to_task = sebsd_copy_cred_to_task, - .mpo_copy_vnode_label = sebsd_copy_vnode_label, - .mpo_copy_devfs_label = sebsd_copy_vnode_label, - .mpo_copy_port_label = sebsd_copy_port_label, - .mpo_update_port_from_cred_label = sebsd_update_port_from_cred_label, + .mpo_copy_cred_to_task = sebsd_copy_cred_to_task, + .mpo_copy_vnode_label = sebsd_copy_vnode_label, + .mpo_copy_devfs_label = sebsd_copy_vnode_label, + .mpo_copy_port_label = sebsd_copy_port_label, + .mpo_update_port_from_cred_label = sebsd_update_port_from_cred_label, - .mpo_internalize_cred_label = sebsd_internalize_cred_label, - .mpo_externalize_cred_label = sebsd_externalize_cred_label, - .mpo_externalize_cred_audit_label = sebsd_externalize_cred_label, + .mpo_internalize_cred_label = sebsd_internalize_cred_label, + .mpo_externalize_cred_label = sebsd_externalize_cred_label, + .mpo_externalize_cred_audit_label = sebsd_externalize_cred_label, - .mpo_internalize_vnode_label = sebsd_internalize_vnode_label, - .mpo_externalize_vnode_label = sebsd_externalize_vnode_label, - .mpo_externalize_vnode_audit_label = sebsd_externalize_vnode_label, + .mpo_internalize_vnode_label = sebsd_internalize_vnode_label, + .mpo_externalize_vnode_label = sebsd_externalize_vnode_label, + .mpo_externalize_vnode_audit_label = sebsd_externalize_vnode_label, - .mpo_relabel_cred = sebsd_relabel_cred, - .mpo_relabel_vnode = sebsd_relabel_vnode, + .mpo_relabel_cred = sebsd_relabel_cred, + .mpo_relabel_vnode = sebsd_relabel_vnode, - /* Create Labels */ + /* Create Labels */ - .mpo_create_cred = sebsd_create_cred, - .mpo_create_task = sebsd_create_task, - .mpo_create_kernel_task = sebsd_create_kernel_task, - .mpo_create_devfs_device = sebsd_create_devfs_device, - .mpo_create_proc0 = sebsd_create_proc0, - .mpo_create_proc1 = sebsd_create_proc1, - .mpo_create_vnode_extattr = sebsd_create_vnode_extattr, - .mpo_create_port = sebsd_create_port, + .mpo_create_cred = sebsd_create_cred, + .mpo_create_task = sebsd_create_task, + .mpo_create_kernel_task = sebsd_create_kernel_task, + .mpo_create_devfs_device = sebsd_create_devfs_device, + .mpo_create_proc0 = sebsd_create_proc0, + .mpo_create_proc1 = sebsd_create_proc1, + .mpo_create_vnode_extattr = sebsd_create_vnode_extattr, + .mpo_create_port = sebsd_create_port, - .mpo_associate_vnode_singlelabel = sebsd_associate_vnode_singlelabel, - .mpo_associate_vnode_extattr = sebsd_associate_vnode_extattr, - .mpo_associate_vnode_devfs = sebsd_associate_vnode_devfs, + .mpo_associate_vnode_singlelabel = sebsd_associate_vnode_singlelabel, + .mpo_associate_vnode_extattr = sebsd_associate_vnode_extattr, + .mpo_associate_vnode_devfs = sebsd_associate_vnode_devfs, - .mpo_request_object_label = sebsd_request_label, + .mpo_request_object_label = sebsd_request_label, - /* Transition */ - .mpo_execve_will_transition = sebsd_execve_will_transition, - .mpo_execve_transition = sebsd_execve_transition, + /* Transition */ + .mpo_execve_will_transition = sebsd_execve_will_transition, + .mpo_execve_transition = sebsd_execve_transition, - /* Checks */ - .mpo_check_service_access = sebsd_check_service_access, - .mpo_check_cred_relabel = sebsd_check_cred_relabel, - .mpo_check_port_relabel = sebsd_check_port_relabel, + /* Checks */ + .mpo_check_service_access = sebsd_check_service_access, + .mpo_check_cred_relabel = sebsd_check_cred_relabel, + .mpo_check_port_relabel = sebsd_check_port_relabel, /* * The sebsd_check_msg_send is known to be broken */ -/* .mpo_check_port_send = sebsd_check_msg_send, */ +/* .mpo_check_port_send = sebsd_check_msg_send, */ - .mpo_check_port_make_send = sebsd_check_port_make_send, - .mpo_check_port_copy_send = sebsd_check_port_copy_send, - .mpo_check_port_move_receive = sebsd_check_port_move_recv, - .mpo_check_proc_signal = sebsd_check_proc_signal, - .mpo_check_vnode_access = sebsd_check_vnode_access, - .mpo_check_vnode_chdir = sebsd_check_vnode_chdir, - .mpo_check_vnode_chroot = sebsd_check_vnode_chroot, - .mpo_check_vnode_create = sebsd_check_vnode_create, - .mpo_check_vnode_delete = sebsd_check_vnode_delete, - .mpo_check_vnode_exchangedata = sebsd_check_vnode_exchangedata, - .mpo_check_vnode_exec = sebsd_check_vnode_exec, + .mpo_check_port_make_send = sebsd_check_port_make_send, + .mpo_check_port_copy_send = sebsd_check_port_copy_send, + .mpo_check_port_move_receive = sebsd_check_port_move_recv, + .mpo_check_proc_signal = sebsd_check_proc_signal, + .mpo_check_vnode_access = sebsd_check_vnode_access, + .mpo_check_vnode_chdir = sebsd_check_vnode_chdir, + .mpo_check_vnode_chroot = sebsd_check_vnode_chroot, + .mpo_check_vnode_create = sebsd_check_vnode_create, + .mpo_check_vnode_delete = sebsd_check_vnode_delete, + .mpo_check_vnode_exchangedata = sebsd_check_vnode_exchangedata, + .mpo_check_vnode_exec = sebsd_check_vnode_exec, #ifdef EXTATTR .mpo_check_vnode_getextattr = sebsd_check_vnode_getextattr, .mpo_check_vnode_listextattr = NOT_IMPLEMENTED, .mpo_check_vnode_deleteextattr = NOT_IMPLEMENTED, #endif - .mpo_check_vnode_getattrlist = sebsd_check_vnode_getattrlist, - .mpo_check_vnode_link = sebsd_check_vnode_link, - .mpo_check_vnode_lookup = sebsd_check_vnode_lookup, - .mpo_check_vnode_mmap = sebsd_check_vnode_mmap, - .mpo_check_vnode_open = sebsd_check_vnode_open, - .mpo_check_vnode_poll = sebsd_check_vnode_poll, - .mpo_check_vnode_read = sebsd_check_vnode_read, - .mpo_check_vnode_readdir = sebsd_check_vnode_readdir, - .mpo_check_vnode_readlink = sebsd_check_vnode_readlink, - .mpo_check_vnode_relabel = sebsd_check_vnode_relabel, - .mpo_check_vnode_rename_from = sebsd_check_vnode_rename_from, - .mpo_check_vnode_rename_to = sebsd_check_vnode_rename_to, - .mpo_check_vnode_revoke = sebsd_check_vnode_revoke, - .mpo_check_vnode_setattrlist = sebsd_check_vnode_setattrlist, + .mpo_check_vnode_getattrlist = sebsd_check_vnode_getattrlist, + .mpo_check_vnode_link = sebsd_check_vnode_link, + .mpo_check_vnode_lookup = sebsd_check_vnode_lookup, + .mpo_check_vnode_mmap = sebsd_check_vnode_mmap, + .mpo_check_vnode_open = sebsd_check_vnode_open, + .mpo_check_vnode_poll = sebsd_check_vnode_poll, + .mpo_check_vnode_read = sebsd_check_vnode_read, + .mpo_check_vnode_readdir = sebsd_check_vnode_readdir, + .mpo_check_vnode_readlink = sebsd_check_vnode_readlink, + .mpo_check_vnode_relabel = sebsd_check_vnode_relabel, + .mpo_check_vnode_rename_from = sebsd_check_vnode_rename_from, + .mpo_check_vnode_rename_to = sebsd_check_vnode_rename_to, + .mpo_check_vnode_revoke = sebsd_check_vnode_revoke, + .mpo_check_vnode_setattrlist = sebsd_check_vnode_setattrlist, #ifdef HAS_EXTATTRS .mpo_check_vnode_setextattr = sebsd_check_vnode_setextattr, #endif - .mpo_check_vnode_setflags = sebsd_check_vnode_setflags, - .mpo_check_vnode_setmode = sebsd_check_vnode_setmode, - .mpo_check_vnode_setowner = sebsd_check_vnode_setowner, - .mpo_check_vnode_setutimes = sebsd_check_vnode_setutimes, - .mpo_check_vnode_stat = sebsd_check_vnode_stat, - .mpo_check_vnode_write = sebsd_check_vnode_write, + .mpo_check_vnode_setflags = sebsd_check_vnode_setflags, + .mpo_check_vnode_setmode = sebsd_check_vnode_setmode, + .mpo_check_vnode_setowner = sebsd_check_vnode_setowner, + .mpo_check_vnode_setutimes = sebsd_check_vnode_setutimes, + .mpo_check_vnode_stat = sebsd_check_vnode_stat, + .mpo_check_vnode_write = sebsd_check_vnode_write, - /* Mount Points */ - .mpo_init_mount_label = sebsd_init_mount_label, - .mpo_init_mount_fs_label = sebsd_init_mount_fs_label, - .mpo_create_mount = sebsd_create_mount, - .mpo_destroy_mount_label = sebsd_destroy_mount_label, - .mpo_destroy_mount_fs_label = sebsd_destroy_mount_fs_label, + /* Mount Points */ + .mpo_init_mount_label = sebsd_init_mount_label, + .mpo_init_mount_fs_label = sebsd_init_mount_fs_label, + .mpo_create_mount = sebsd_create_mount, + .mpo_destroy_mount_label = sebsd_destroy_mount_label, + .mpo_destroy_mount_fs_label = sebsd_destroy_mount_fs_label, - .mpo_setlabel_vnode_extattr = sebsd_setlabel_vnode_extattr, + .mpo_setlabel_vnode_extattr = sebsd_setlabel_vnode_extattr, /* System V IPC Entry Points */ .mpo_init_sysv_sem_label = sebsd_init_sysv_label, @@ -2719,9 +2713,9 @@ // .mpo_check_sysv_shmdt = sebsd_check_sysv_shmdt, .mpo_check_sysv_shmget = sebsd_check_sysv_shmget, - .mpo_check_ipc_method = sebsd_check_ipc_method, + .mpo_check_ipc_method = sebsd_check_ipc_method, - .mpo_syscall = sebsd_syscall + .mpo_syscall = sebsd_syscall }; @@ -2970,14 +2964,16 @@ }; #ifdef KEXT -static kern_return_t kmod_start (kmod_info_t *ki, void *xd) +static kern_return_t +kmod_start (kmod_info_t *ki, void *xd) { - return mac_policy_register (&sebsd_mac_policy_conf); + return mac_policy_register(&sebsd_mac_policy_conf); } -static kern_return_t kmod_stop (kmod_info_t *ki, void *xd) +static kern_return_t +kmod_stop (kmod_info_t *ki, void *xd) { - return mac_policy_unregister (&sebsd_mac_policy_conf); + return mac_policy_unregister(&sebsd_mac_policy_conf); } extern kern_return_t _start(kmod_info_t *ki, void *data); From owner-p4-projects@FreeBSD.ORG Thu Oct 27 19:39:35 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A82F916A421; Thu, 27 Oct 2005 19:39:34 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 54A7C16A41F for ; Thu, 27 Oct 2005 19:39:34 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA48243D58 for ; Thu, 27 Oct 2005 19:39:31 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9RJdVvj022993 for ; Thu, 27 Oct 2005 19:39:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9RJdV9u022990 for perforce@freebsd.org; Thu, 27 Oct 2005 19:39:31 GMT (envelope-from millert@freebsd.org) Date: Thu, 27 Oct 2005 19:39:31 GMT Message-Id: <200510271939.j9RJdV9u022990@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 85945 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2005 19:39:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=85945 Change 85945 by millert@millert_ibook on 2005/10/27 19:38:52 In sebsd_malloc only bzero allocated region if M_ZERO set in flags Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#15 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#15 (text+ko) ==== @@ -79,14 +79,15 @@ void * sebsd_malloc(size_t size, int flags) { - size_t *vs; + size_t *vs, nsize; - size += sizeof(size_t); + nsize = size + sizeof(size_t); vs = (flags & M_NOWAIT) ? - (size_t *)kalloc_noblock(size) : (size_t *)kalloc(size); + (size_t *)kalloc_noblock(nsize) : (size_t *)kalloc(nsize); if (vs != NULL) { - bzero(vs, size); - *vs++ = size; + *vs++ = nsize; + if (flags & M_ZERO) + bzero(vs, size); } return (vs); } From owner-p4-projects@FreeBSD.ORG Thu Oct 27 19:42:36 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C59116A465; Thu, 27 Oct 2005 19:42:36 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 1C45F16A462 for ; Thu, 27 Oct 2005 19:42:36 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBDD643D53 for ; Thu, 27 Oct 2005 19:42:35 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9RJgZ9l023364 for ; Thu, 27 Oct 2005 19:42:35 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9RJgZaM023359 for perforce@freebsd.org; Thu, 27 Oct 2005 19:42:35 GMT (envelope-from millert@freebsd.org) Date: Thu, 27 Oct 2005 19:42:35 GMT Message-Id: <200510271942.j9RJgZaM023359@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 85946 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2005 19:42:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=85946 Change 85946 by millert@millert_ibook on 2005/10/27 19:41:45 Add sebsd_malloc_init() to populate the free list with a large number of small allocations (512). This prevents a panic due to free list exhaustion caused by non-blocking allocation early on in avc_init(). Not very nice but a workaround until we have a better solution. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#16 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#16 (text+ko) ==== @@ -76,6 +76,27 @@ #include #include +/* + * XXX + * Hack to populate the free list with lots of small allocations. + * Needed to make non-blocking allocations work early on in the + * boot sequence. Otherwise we crash in avc_init(). + * XXX + * +void +sebsd_malloc_init(void) +{ + int i; + void *prealloc[512]; + + for (i = 0; i < 512; i++) { + if ((prealloc[i] = kalloc(64)) == NULL) + break; + } + while (i--) + kfree(prealloc[i], 64); +} + void * sebsd_malloc(size_t size, int flags) { @@ -132,6 +153,7 @@ { printf("sebsd:: init\n"); + sebsd_malloc_init(); avc_init(); //sebsd_register_sysctls(); if (security_init()) { From owner-p4-projects@FreeBSD.ORG Thu Oct 27 19:46:44 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CCC016A421; Thu, 27 Oct 2005 19:46:43 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 614B316A41F for ; Thu, 27 Oct 2005 19:46:43 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1801943D48 for ; Thu, 27 Oct 2005 19:46:43 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9RJkg9R023677 for ; Thu, 27 Oct 2005 19:46:42 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9RJkgHt023674 for perforce@freebsd.org; Thu, 27 Oct 2005 19:46:42 GMT (envelope-from millert@freebsd.org) Date: Thu, 27 Oct 2005 19:46:42 GMT Message-Id: <200510271946.j9RJkgHt023674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 85948 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2005 19:46:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=85948 Change 85948 by millert@millert_ibook on 2005/10/27 19:45:43 fix typo in last change Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#17 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#17 (text+ko) ==== @@ -82,7 +82,7 @@ * Needed to make non-blocking allocations work early on in the * boot sequence. Otherwise we crash in avc_init(). * XXX - * + */ void sebsd_malloc_init(void) { From owner-p4-projects@FreeBSD.ORG Thu Oct 27 19:52:52 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AADC416A436; Thu, 27 Oct 2005 19:52:51 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 7CEF416A434 for ; Thu, 27 Oct 2005 19:52:51 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 138B543D48 for ; Thu, 27 Oct 2005 19:52:51 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9RJqo1b023881 for ; Thu, 27 Oct 2005 19:52:51 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9RJqoC6023878 for perforce@freebsd.org; Thu, 27 Oct 2005 19:52:50 GMT (envelope-from jhb@freebsd.org) Date: Thu, 27 Oct 2005 19:52:50 GMT Message-Id: <200510271952.j9RJqoC6023878@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 Cc: Subject: PERFORCE change 85949 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2005 19:52:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=85949 Change 85949 by jhb@jhb_slimer on 2005/10/27 19:51:50 IFC @85944. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/io_apic.c#8 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#46 integrate .. //depot/projects/smpng/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/smpng/sys/amd64/conf/GENERIC#37 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#27 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#23 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#23 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#23 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#23 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#23 integrate .. //depot/projects/smpng/sys/compat/ndis/pe_var.h#10 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#34 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_pe.c#7 integrate .. //depot/projects/smpng/sys/conf/Makefile.alpha#25 integrate .. //depot/projects/smpng/sys/conf/Makefile.amd64#12 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#13 integrate .. //depot/projects/smpng/sys/conf/Makefile.i386#23 integrate .. //depot/projects/smpng/sys/conf/Makefile.ia64#30 integrate .. //depot/projects/smpng/sys/conf/Makefile.pc98#22 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#31 integrate .. //depot/projects/smpng/sys/conf/Makefile.sparc64#26 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#49 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#52 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#74 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#24 integrate .. //depot/projects/smpng/sys/dev/nve/if_nve.c#7 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#18 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#28 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#16 integrate .. //depot/projects/smpng/sys/dev/zs/zs.c#22 integrate .. //depot/projects/smpng/sys/i386/conf/DEFAULTS#1 branch .. //depot/projects/smpng/sys/i386/conf/GENERIC#66 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#73 integrate .. //depot/projects/smpng/sys/kern/subr_kdb.c#15 integrate .. //depot/projects/smpng/sys/kern/tty.c#62 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#75 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#13 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#42 integrate .. //depot/projects/smpng/sys/sys/interrupt.h#18 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/io_apic.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.15 2005/04/15 18:44:53 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.16 2005/10/26 22:32:30 peter Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -130,6 +131,12 @@ static int bsp_id, current_cluster, logical_clusters, next_ioapic_base; static u_int next_id, program_logical_dest; +SYSCTL_NODE(_hw, OID_AUTO, apic, CTLFLAG_RD, 0, "APIC options"); +static int enable_extint; +SYSCTL_INT(_hw_apic, OID_AUTO, enable_extint, CTLFLAG_RDTUN, &enable_extint, 0, + "Enable the ExtINT pin in the first I/O APIC"); +TUNABLE_INT("hw.apic.enable_extint", &enable_extint); + static __inline void _ioapic_eoi_source(struct intsrc *isrc) { @@ -287,7 +294,7 @@ switch (intpin->io_vector) { case VECTOR_EXTINT: KASSERT(intpin->io_edgetrigger, - ("EXTINT not edge triggered")); + ("ExtINT not edge triggered")); low |= IOART_DELEXINT; break; case VECTOR_NMI: @@ -681,7 +688,10 @@ return (EINVAL); io->io_pins[pin].io_bus = APIC_BUS_UNKNOWN; io->io_pins[pin].io_vector = VECTOR_EXTINT; - io->io_pins[pin].io_masked = 1; + if (enable_extint) + io->io_pins[pin].io_masked = 0; + else + io->io_pins[pin].io_masked = 1; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; if (bootverbose) ==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#16 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.17 2005/06/24 00:45:01 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.18 2005/10/26 22:32:30 peter Exp $"); #include "opt_hwpmc_hooks.h" @@ -312,7 +312,7 @@ /* Program timer LVT and setup handler. */ lapic->lvt_timer = lvt_mode(la, LVT_TIMER, lapic->lvt_timer); - snprintf(buf, sizeof(buf), "lapic%d: timer", lapic_id()); + snprintf(buf, sizeof(buf), "cpu%d: timer", PCPU_GET(cpuid)); intrcnt_add(buf, &la->la_timer_count); if (PCPU_GET(cpuid) != 0) { KASSERT(lapic_timer_period != 0, ("lapic%u: zero divisor", @@ -322,7 +322,7 @@ lapic_timer_enable_intr(); } - /* XXX: Performance counter, error, and thermal LVTs */ + /* XXX: Error and thermal LVTs */ intr_restore(eflags); } @@ -927,8 +927,12 @@ } /* Wait for an earlier IPI to finish. */ - if (!lapic_ipi_wait(BEFORE_SPIN)) - panic("APIC: Previous IPI is stuck"); + if (!lapic_ipi_wait(BEFORE_SPIN)) { + if (panicstr != NULL) + return; + else + panic("APIC: Previous IPI is stuck"); + } lapic_ipi_raw(icrlo, destfield); ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#46 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.642 2005/10/17 23:10:31 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.643 2005/10/26 22:16:52 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -830,7 +830,7 @@ } #endif -#define PHYSMAP_SIZE (2 * 8) +#define PHYSMAP_SIZE (2 * 20) u_int basemem; ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#37 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.442 2005/09/08 03:29:18 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.444 2005/10/27 18:54:43 peter Exp $ machine amd64 cpu HAMMER @@ -76,15 +76,11 @@ # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -# Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150) -device atpic # 8259A compatability - # Linux 32-bit ABI support options LINPROCFS # Cannot be a module yet. -# Bus support. Do not remove isa, even if you have no isa slots +# Bus support. device acpi -device isa device pci # Floppy drives @@ -234,8 +230,6 @@ # Pseudo devices. device loop # Network loopback -device mem # Memory and kernel memory devices -device io # I/O device device random # Entropy device device ether # Ethernet support device sl # Kernel SLIP ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#27 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.44 2005/10/23 10:43:14 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.45 2005/10/26 22:19:51 peter Exp $"); #include "opt_compat.h" @@ -1397,7 +1397,7 @@ #endif #ifdef COMPAT_43 -struct freebsd3_sigaction32 { +struct osigaction32 { u_int32_t sa_u; osigset_t sa_mask; int sa_flags; @@ -1406,10 +1406,10 @@ #define ONSIG 32 int -freebsd3_freebsd32_sigaction(struct thread *td, - struct freebsd3_freebsd32_sigaction_args *uap) +ofreebsd32_sigaction(struct thread *td, + struct ofreebsd32_sigaction_args *uap) { - struct freebsd3_sigaction32 s32; + struct osigaction32 s32; struct sigaction sa, osa, *sap; int error; @@ -1437,8 +1437,8 @@ } int -freebsd3_freebsd32_sigprocmask(struct thread *td, - struct freebsd3_freebsd32_sigprocmask_args *uap) +ofreebsd32_sigprocmask(struct thread *td, + struct ofreebsd32_sigprocmask_args *uap) { sigset_t set, oset; int error; @@ -1450,8 +1450,8 @@ } int -freebsd3_freebsd32_sigpending(struct thread *td, - struct freebsd3_freebsd32_sigpending_args *uap) +ofreebsd32_sigpending(struct thread *td, + struct ofreebsd32_sigpending_args *uap) { struct proc *p = td->td_proc; sigset_t siglist; @@ -1471,8 +1471,8 @@ }; int -freebsd3_freebsd32_sigvec(struct thread *td, - struct freebsd3_freebsd32_sigvec_args *uap) +ofreebsd32_sigvec(struct thread *td, + struct ofreebsd32_sigvec_args *uap) { struct sigvec32 vec; struct sigaction sa, osa, *sap; @@ -1505,8 +1505,8 @@ } int -freebsd3_freebsd32_sigblock(struct thread *td, - struct freebsd3_freebsd32_sigblock_args *uap) +ofreebsd32_sigblock(struct thread *td, + struct ofreebsd32_sigblock_args *uap) { struct proc *p = td->td_proc; sigset_t set; @@ -1521,8 +1521,8 @@ } int -freebsd3_freebsd32_sigsetmask(struct thread *td, - struct freebsd3_freebsd32_sigsetmask_args *uap) +ofreebsd32_sigsetmask(struct thread *td, + struct ofreebsd32_sigsetmask_args *uap) { struct proc *p = td->td_proc; sigset_t set; @@ -1538,8 +1538,8 @@ } int -freebsd3_freebsd32_sigsuspend(struct thread *td, - struct freebsd3_freebsd32_sigsuspend_args *uap) +ofreebsd32_sigsuspend(struct thread *td, + struct ofreebsd32_sigsuspend_args *uap) { struct proc *p = td->td_proc; sigset_t mask; @@ -1564,8 +1564,8 @@ }; int -freebsd3_freebsd32_sigstack(struct thread *td, - struct freebsd3_freebsd32_sigstack_args *uap) +ofreebsd32_sigstack(struct thread *td, + struct ofreebsd32_sigstack_args *uap) { struct sigstack32 s32; struct sigstack nss, oss; ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#23 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.44 2005/10/23 10:43:38 ps Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.56 2005/10/23 10:43:14 ps Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.45 2005/10/26 22:21:03 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.57 2005/10/26 22:19:51 peter Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -56,16 +56,7 @@ char from_l_[PADL_(u_int32_t)]; u_int32_t from; char from_r_[PADR_(u_int32_t)]; char fromlenaddr_l_[PADL_(u_int32_t)]; u_int32_t fromlenaddr; char fromlenaddr_r_[PADR_(u_int32_t)]; }; -struct freebsd3_freebsd32_sigaction_args { - char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)]; - char nsa_l_[PADL_(struct freebsd3_sigaction32 *)]; struct freebsd3_sigaction32 * nsa; char nsa_r_[PADR_(struct freebsd3_sigaction32 *)]; - char osa_l_[PADL_(struct freebsd3_sigaction32 *)]; struct freebsd3_sigaction32 * osa; char osa_r_[PADR_(struct freebsd3_sigaction32 *)]; -}; -struct freebsd3_freebsd32_sigprocmask_args { - char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)]; - char mask_l_[PADL_(osigset_t)]; osigset_t mask; char mask_r_[PADR_(osigset_t)]; -}; -struct freebsd3_freebsd32_sigpending_args { +struct ofreebsd32_sigpending_args { register_t dummy; }; struct freebsd32_sigaltstack_args { @@ -93,24 +84,6 @@ char ex_l_[PADL_(fd_set *)]; fd_set * ex; char ex_r_[PADR_(fd_set *)]; char tv_l_[PADL_(struct timeval32 *)]; struct timeval32 * tv; char tv_r_[PADR_(struct timeval32 *)]; }; -struct freebsd3_freebsd32_sigvec_args { - char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)]; - char nsv_l_[PADL_(struct sigvec32 *)]; struct sigvec32 * nsv; char nsv_r_[PADR_(struct sigvec32 *)]; - char osv_l_[PADL_(struct sigvec32 *)]; struct sigvec32 * osv; char osv_r_[PADR_(struct sigvec32 *)]; -}; -struct freebsd3_freebsd32_sigblock_args { - char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)]; -}; -struct freebsd3_freebsd32_sigsetmask_args { - char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)]; -}; -struct freebsd3_freebsd32_sigsuspend_args { - char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)]; -}; -struct freebsd3_freebsd32_sigstack_args { - char nss_l_[PADL_(struct sigstack32 *)]; struct sigstack32 * nss; char nss_r_[PADR_(struct sigstack32 *)]; - char oss_l_[PADL_(struct sigstack32 *)]; struct sigstack32 * oss; char oss_r_[PADR_(struct sigstack32 *)]; -}; struct freebsd32_gettimeofday_args { char tp_l_[PADL_(struct timeval32 *)]; struct timeval32 * tp; char tp_r_[PADR_(struct timeval32 *)]; char tzp_l_[PADL_(struct timezone *)]; struct timezone * tzp; char tzp_r_[PADR_(struct timezone *)]; @@ -299,19 +272,11 @@ int freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *); int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); int freebsd32_recvfrom(struct thread *, struct freebsd32_recvfrom_args *); -int freebsd3_freebsd32_sigaction(struct thread *, struct freebsd3_freebsd32_sigaction_args *); -int freebsd3_freebsd32_sigprocmask(struct thread *, struct freebsd3_freebsd32_sigprocmask_args *); -int freebsd3_freebsd32_sigpending(struct thread *, struct freebsd3_freebsd32_sigpending_args *); int freebsd32_sigaltstack(struct thread *, struct freebsd32_sigaltstack_args *); int freebsd32_execve(struct thread *, struct freebsd32_execve_args *); int freebsd32_setitimer(struct thread *, struct freebsd32_setitimer_args *); int freebsd32_getitimer(struct thread *, struct freebsd32_getitimer_args *); int freebsd32_select(struct thread *, struct freebsd32_select_args *); -int freebsd3_freebsd32_sigvec(struct thread *, struct freebsd3_freebsd32_sigvec_args *); -int freebsd3_freebsd32_sigblock(struct thread *, struct freebsd3_freebsd32_sigblock_args *); -int freebsd3_freebsd32_sigsetmask(struct thread *, struct freebsd3_freebsd32_sigsetmask_args *); -int freebsd3_freebsd32_sigsuspend(struct thread *, struct freebsd3_freebsd32_sigsuspend_args *); -int freebsd3_freebsd32_sigstack(struct thread *, struct freebsd3_freebsd32_sigstack_args *); int freebsd32_gettimeofday(struct thread *, struct freebsd32_gettimeofday_args *); int freebsd32_getrusage(struct thread *, struct freebsd32_getrusage_args *); int freebsd32_readv(struct thread *, struct freebsd32_readv_args *); @@ -349,6 +314,41 @@ #ifdef COMPAT_43 +struct ofreebsd32_sigaction_args { + char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)]; + char nsa_l_[PADL_(struct osigaction32 *)]; struct osigaction32 * nsa; char nsa_r_[PADR_(struct osigaction32 *)]; + char osa_l_[PADL_(struct osigaction32 *)]; struct osigaction32 * osa; char osa_r_[PADR_(struct osigaction32 *)]; +}; +struct ofreebsd32_sigprocmask_args { + char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)]; + char mask_l_[PADL_(osigset_t)]; osigset_t mask; char mask_r_[PADR_(osigset_t)]; +}; +struct ofreebsd32_sigvec_args { + char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)]; + char nsv_l_[PADL_(struct sigvec32 *)]; struct sigvec32 * nsv; char nsv_r_[PADR_(struct sigvec32 *)]; + char osv_l_[PADL_(struct sigvec32 *)]; struct sigvec32 * osv; char osv_r_[PADR_(struct sigvec32 *)]; +}; +struct ofreebsd32_sigblock_args { + char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)]; +}; +struct ofreebsd32_sigsetmask_args { + char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)]; +}; +struct ofreebsd32_sigsuspend_args { + char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)]; +}; +struct ofreebsd32_sigstack_args { + char nss_l_[PADL_(struct sigstack32 *)]; struct sigstack32 * nss; char nss_r_[PADR_(struct sigstack32 *)]; + char oss_l_[PADL_(struct sigstack32 *)]; struct sigstack32 * oss; char oss_r_[PADR_(struct sigstack32 *)]; +}; +int ofreebsd32_sigaction(struct thread *, struct ofreebsd32_sigaction_args *); +int ofreebsd32_sigprocmask(struct thread *, struct ofreebsd32_sigprocmask_args *); +int ofreebsd32_sigpending(struct thread *, struct ofreebsd32_sigpending_args *); +int ofreebsd32_sigvec(struct thread *, struct ofreebsd32_sigvec_args *); +int ofreebsd32_sigblock(struct thread *, struct ofreebsd32_sigblock_args *); +int ofreebsd32_sigsetmask(struct thread *, struct ofreebsd32_sigsetmask_args *); +int ofreebsd32_sigsuspend(struct thread *, struct ofreebsd32_sigsuspend_args *); +int ofreebsd32_sigstack(struct thread *, struct ofreebsd32_sigstack_args *); #endif /* COMPAT_43 */ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#23 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.44 2005/10/23 10:43:39 ps Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.56 2005/10/23 10:43:14 ps Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.45 2005/10/26 22:21:03 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.57 2005/10/26 22:19:51 peter Exp */ #define FREEBSD32_SYS_syscall 0 @@ -50,13 +50,13 @@ #define FREEBSD32_SYS_getegid 43 #define FREEBSD32_SYS_profil 44 #define FREEBSD32_SYS_ktrace 45 -#define FREEBSD32_SYS_freebsd3_freebsd32_sigaction 46 + /* 46 is old freebsd32_sigaction */ #define FREEBSD32_SYS_getgid 47 -#define FREEBSD32_SYS_freebsd3_freebsd32_sigprocmask 48 + /* 48 is old freebsd32_sigprocmask */ #define FREEBSD32_SYS_getlogin 49 #define FREEBSD32_SYS_setlogin 50 #define FREEBSD32_SYS_acct 51 -#define FREEBSD32_SYS_freebsd3_freebsd32_sigpending 52 + /* 52 is old freebsd32_sigpending */ #define FREEBSD32_SYS_freebsd32_sigaltstack 53 #define FREEBSD32_SYS_ioctl 54 #define FREEBSD32_SYS_reboot 55 @@ -110,11 +110,11 @@ #define FREEBSD32_SYS_setsockopt 105 #define FREEBSD32_SYS_listen 106 /* 107 is obsolete vtimes */ -#define FREEBSD32_SYS_freebsd3_freebsd32_sigvec 108 -#define FREEBSD32_SYS_freebsd3_freebsd32_sigblock 109 -#define FREEBSD32_SYS_freebsd3_freebsd32_sigsetmask 110 -#define FREEBSD32_SYS_freebsd3_freebsd32_sigsuspend 111 -#define FREEBSD32_SYS_freebsd3_freebsd32_sigstack 112 + /* 108 is old freebsd32_sigvec */ + /* 109 is old freebsd32_sigblock */ + /* 110 is old freebsd32_sigsetmask */ + /* 111 is old freebsd32_sigsuspend */ + /* 112 is old freebsd32_sigstack */ /* 113 is obsolete orecvmsg */ /* 114 is obsolete osendmsg */ /* 115 is obsolete vtrace */ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#23 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.35 2005/10/23 10:43:39 ps Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.56 2005/10/23 10:43:14 ps Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.36 2005/10/26 22:21:03 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.57 2005/10/26 22:19:51 peter Exp */ const char *freebsd32_syscallnames[] = { @@ -53,13 +53,13 @@ "getegid", /* 43 = getegid */ "profil", /* 44 = profil */ "ktrace", /* 45 = ktrace */ - "freebsd3_freebsd32_sigaction", /* 46 = freebsd3_freebsd32_sigaction */ + "old.freebsd32_sigaction", /* 46 = old freebsd32_sigaction */ "getgid", /* 47 = getgid */ - "freebsd3_freebsd32_sigprocmask", /* 48 = freebsd3_freebsd32_sigprocmask */ + "old.freebsd32_sigprocmask", /* 48 = old freebsd32_sigprocmask */ "getlogin", /* 49 = getlogin */ "setlogin", /* 50 = setlogin */ "acct", /* 51 = acct */ - "freebsd3_freebsd32_sigpending", /* 52 = freebsd3_freebsd32_sigpending */ + "old.freebsd32_sigpending", /* 52 = old freebsd32_sigpending */ "freebsd32_sigaltstack", /* 53 = freebsd32_sigaltstack */ "ioctl", /* 54 = ioctl */ "reboot", /* 55 = reboot */ @@ -115,11 +115,11 @@ "setsockopt", /* 105 = setsockopt */ "listen", /* 106 = listen */ "obs_vtimes", /* 107 = obsolete vtimes */ - "freebsd3_freebsd32_sigvec", /* 108 = freebsd3_freebsd32_sigvec */ - "freebsd3_freebsd32_sigblock", /* 109 = freebsd3_freebsd32_sigblock */ - "freebsd3_freebsd32_sigsetmask", /* 110 = freebsd3_freebsd32_sigsetmask */ - "freebsd3_freebsd32_sigsuspend", /* 111 = freebsd3_freebsd32_sigsuspend */ - "freebsd3_freebsd32_sigstack", /* 112 = freebsd3_freebsd32_sigstack */ + "old.freebsd32_sigvec", /* 108 = old freebsd32_sigvec */ + "old.freebsd32_sigblock", /* 109 = old freebsd32_sigblock */ + "old.freebsd32_sigsetmask", /* 110 = old freebsd32_sigsetmask */ + "old.freebsd32_sigsuspend", /* 111 = old freebsd32_sigsuspend */ + "old.freebsd32_sigstack", /* 112 = old freebsd32_sigstack */ "obs_orecvmsg", /* 113 = obsolete orecvmsg */ "obs_osendmsg", /* 114 = obsolete osendmsg */ "obs_vtrace", /* 115 = obsolete vtrace */ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#23 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.45 2005/10/23 10:43:39 ps Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.56 2005/10/23 10:43:14 ps Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.46 2005/10/26 22:21:03 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.57 2005/10/26 22:19:51 peter Exp */ #include "opt_compat.h" @@ -18,6 +18,12 @@ #define AS(name) (sizeof(struct name) / sizeof(register_t)) +#ifdef COMPAT_43 +#define compat(n, name) n, (sy_call_t *)__CONCAT(o,name) +#else +#define compat(n, name) 0, (sy_call_t *)nosys +#endif + #ifdef COMPAT_FREEBSD4 #define compat4(n, name) n, (sy_call_t *)__CONCAT(freebsd4_,name) #else @@ -72,13 +78,13 @@ { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_NULL }, /* 43 = getegid */ { SYF_MPSAFE | AS(profil_args), (sy_call_t *)profil, AUE_NULL }, /* 44 = profil */ { SYF_MPSAFE | AS(ktrace_args), (sy_call_t *)ktrace, AUE_NULL }, /* 45 = ktrace */ - { SYF_MPSAFE | AS(freebsd3_freebsd32_sigaction_args), (sy_call_t *)freebsd3_freebsd32_sigaction, AUE_NULL }, /* 46 = freebsd3_freebsd32_sigaction */ + { compat(SYF_MPSAFE | AS(ofreebsd32_sigaction_args),freebsd32_sigaction), AUE_NULL }, /* 46 = old freebsd32_sigaction */ { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_NULL }, /* 47 = getgid */ - { SYF_MPSAFE | AS(freebsd3_freebsd32_sigprocmask_args), (sy_call_t *)freebsd3_freebsd32_sigprocmask, AUE_NULL }, /* 48 = freebsd3_freebsd32_sigprocmask */ + { compat(SYF_MPSAFE | AS(ofreebsd32_sigprocmask_args),freebsd32_sigprocmask), AUE_NULL }, /* 48 = old freebsd32_sigprocmask */ { SYF_MPSAFE | AS(getlogin_args), (sy_call_t *)getlogin, AUE_NULL }, /* 49 = getlogin */ { SYF_MPSAFE | AS(setlogin_args), (sy_call_t *)setlogin, AUE_NULL }, /* 50 = setlogin */ { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_NULL }, /* 51 = acct */ - { SYF_MPSAFE | 0, (sy_call_t *)freebsd3_freebsd32_sigpending, AUE_NULL }, /* 52 = freebsd3_freebsd32_sigpending */ + { compat(SYF_MPSAFE | 0,freebsd32_sigpending), AUE_NULL }, /* 52 = old freebsd32_sigpending */ { SYF_MPSAFE | AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_NULL }, /* 53 = freebsd32_sigaltstack */ { SYF_MPSAFE | AS(ioctl_args), (sy_call_t *)ioctl, AUE_NULL }, /* 54 = ioctl */ { SYF_MPSAFE | AS(reboot_args), (sy_call_t *)reboot, AUE_NULL }, /* 55 = reboot */ @@ -134,11 +140,11 @@ { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_NULL }, /* 105 = setsockopt */ { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_NULL }, /* 106 = listen */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 107 = obsolete vtimes */ - { SYF_MPSAFE | AS(freebsd3_freebsd32_sigvec_args), (sy_call_t *)freebsd3_freebsd32_sigvec, AUE_NULL }, /* 108 = freebsd3_freebsd32_sigvec */ - { SYF_MPSAFE | AS(freebsd3_freebsd32_sigblock_args), (sy_call_t *)freebsd3_freebsd32_sigblock, AUE_NULL }, /* 109 = freebsd3_freebsd32_sigblock */ - { SYF_MPSAFE | AS(freebsd3_freebsd32_sigsetmask_args), (sy_call_t *)freebsd3_freebsd32_sigsetmask, AUE_NULL }, /* 110 = freebsd3_freebsd32_sigsetmask */ - { SYF_MPSAFE | AS(freebsd3_freebsd32_sigsuspend_args), (sy_call_t *)freebsd3_freebsd32_sigsuspend, AUE_NULL }, /* 111 = freebsd3_freebsd32_sigsuspend */ - { SYF_MPSAFE | AS(freebsd3_freebsd32_sigstack_args), (sy_call_t *)freebsd3_freebsd32_sigstack, AUE_NULL }, /* 112 = freebsd3_freebsd32_sigstack */ + { compat(SYF_MPSAFE | AS(ofreebsd32_sigvec_args),freebsd32_sigvec), AUE_NULL }, /* 108 = old freebsd32_sigvec */ + { compat(SYF_MPSAFE | AS(ofreebsd32_sigblock_args),freebsd32_sigblock), AUE_NULL }, /* 109 = old freebsd32_sigblock */ + { compat(SYF_MPSAFE | AS(ofreebsd32_sigsetmask_args),freebsd32_sigsetmask), AUE_NULL }, /* 110 = old freebsd32_sigsetmask */ + { compat(SYF_MPSAFE | AS(ofreebsd32_sigsuspend_args),freebsd32_sigsuspend), AUE_NULL }, /* 111 = old freebsd32_sigsuspend */ + { compat(SYF_MPSAFE | AS(ofreebsd32_sigstack_args),freebsd32_sigstack), AUE_NULL }, /* 112 = old freebsd32_sigstack */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 113 = obsolete orecvmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 114 = obsolete osendmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = obsolete vtrace */ ==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#23 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.56 2005/10/23 10:43:14 ps Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.57 2005/10/26 22:19:51 peter Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -116,18 +116,17 @@ size_t offset, u_int scale); } 45 AUE_NULL MNOPROTO { int ktrace(const char *fname, int ops, \ int facs, int pid); } -46 AUE_NULL MSTD { int freebsd3_freebsd32_sigaction( \ - int signum, \ - struct freebsd3_sigaction32 *nsa, \ - struct freebsd3_sigaction32 *osa); } +46 AUE_NULL MCOMPAT { int freebsd32_sigaction( int signum, \ + struct osigaction32 *nsa, \ + struct osigaction32 *osa); } 47 AUE_NULL MNOPROTO { gid_t getgid(void); } -48 AUE_NULL MSTD { int freebsd3_freebsd32_sigprocmask(int how, \ +48 AUE_NULL MCOMPAT { int freebsd32_sigprocmask(int how, \ osigset_t mask); } 49 AUE_NULL MNOPROTO { int getlogin(char *namebuf, \ u_int namelen); } 50 AUE_NULL MNOPROTO { int setlogin(char *namebuf); } 51 AUE_NULL MNOPROTO { int acct(char *path); } -52 AUE_NULL MSTD { int freebsd3_freebsd32_sigpending(void); } +52 AUE_NULL MCOMPAT { int freebsd32_sigpending(void); } 53 AUE_NULL MSTD { int freebsd32_sigaltstack( \ struct sigaltstack32 *ss, \ struct sigaltstack32 *oss); } @@ -209,15 +208,13 @@ int name, caddr_t val, int valsize); } 106 AUE_NULL MNOPROTO { int listen(int s, int backlog); } 107 AUE_NULL OBSOL vtimes -108 AUE_NULL MSTD { int freebsd3_freebsd32_sigvec(int signum, \ +108 AUE_NULL MCOMPAT { int freebsd32_sigvec(int signum, \ struct sigvec32 *nsv, \ struct sigvec32 *osv); } -109 AUE_NULL MSTD { int freebsd3_freebsd32_sigblock(int mask); } -110 AUE_NULL MSTD { int freebsd3_freebsd32_sigsetmask( \ - int mask); } -111 AUE_NULL MSTD { int freebsd3_freebsd32_sigsuspend( \ - int mask); } -112 AUE_NULL MSTD { int freebsd3_freebsd32_sigstack( \ +109 AUE_NULL MCOMPAT { int freebsd32_sigblock(int mask); } +110 AUE_NULL MCOMPAT { int freebsd32_sigsetmask( int mask); } +111 AUE_NULL MCOMPAT { int freebsd32_sigsuspend( int mask); } +112 AUE_NULL MCOMPAT { int freebsd32_sigstack( \ struct sigstack32 *nss, \ struct sigstack32 *oss); } 113 AUE_NULL OBSOL orecvmsg ==== //depot/projects/smpng/sys/compat/ndis/pe_var.h#10 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/pe_var.h,v 1.13 2005/04/11 02:02:34 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/pe_var.h,v 1.14 2005/10/26 18:46:27 wpaul Exp $ */ #ifndef _PE_VAR_H_ @@ -214,6 +214,10 @@ typedef struct image_nt_header image_nt_header; +#define IMAGE_SIZEOF_NT_HEADER(nthdr) \ + (offsetof(image_nt_header, inh_optionalhdr) + \ + ((image_nt_header *)(nthdr))->inh_filehdr.ifh_optionalhdrlen) + /* Directory Entries */ #define IMAGE_DIRECTORY_ENTRY_EXPORT 0 /* Export Directory */ @@ -281,6 +285,11 @@ #define IMAGE_SIZEOF_SECTION_HEADER 40 +#define IMAGE_FIRST_SECTION(nthdr) \ + ((image_section_header *)((vm_offset_t)(nthdr) + \ + offsetof(image_nt_header, inh_optionalhdr) + \ + ((image_nt_header *)(nthdr))->inh_filehdr.ifh_optionalhdrlen)) + /* * Import format */ ==== //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#34 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.78 2005/10/26 06:52:57 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.79 2005/10/26 20:21:45 wpaul Exp $"); #include #include @@ -2556,6 +2556,8 @@ int i; vm_offset_t v; + /* There will always be at least one nexus. */ + nexus_class = devclass_find("nexus"); devclass_get_devices(nexus_class, &nexus_devs, &nexus_count); @@ -2593,7 +2595,7 @@ uint64_t paddr; struct resource **res; { - device_t *children; + device_t *children = NULL; device_t matching_dev; int childcnt; struct resource *r; @@ -2648,7 +2650,12 @@ } } - free(children, M_TEMP); + + /* Won't somebody please think of the children! */ + + if (children != NULL) + free(children, M_TEMP); + return(NULL); } ==== //depot/projects/smpng/sys/compat/ndis/subr_pe.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.11 2005/02/24 17:58:27 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.12 2005/10/26 18:46:27 wpaul Exp $"); /* * This file contains routines for relocating and dynamically linking @@ -57,6 +57,7 @@ #define strncasecmp(a, b, c) ndis_strncasecmp(a, b, c) #else #include +#include #include #include #include @@ -142,7 +143,7 @@ nt_hdr = (image_nt_header *)(imgbase + dos_hdr->idh_lfanew); bcopy ((char *)&nt_hdr->inh_optionalhdr, (char *)hdr, - sizeof(image_optional_header)); + nt_hdr->inh_filehdr.ifh_optionalhdrlen); return(0); } @@ -169,6 +170,14 @@ dos_hdr = (image_dos_header *)imgbase; nt_hdr = (image_nt_header *)(imgbase + dos_hdr->idh_lfanew); + /* + * Note: the size of the nt_header is variable since it + * can contain optional fields, as indicated by ifh_optionalhdrlen. + * However it happens we're only interested in fields in the + * non-variant portion of the nt_header structure, so we don't + * bother copying the optional parts here. + */ + bcopy ((char *)&nt_hdr->inh_filehdr, (char *)hdr, sizeof(image_file_header)); @@ -197,8 +206,7 @@ dos_hdr = (image_dos_header *)imgbase; nt_hdr = (image_nt_header *)(imgbase + dos_hdr->idh_lfanew); - sect_hdr = (image_section_header *)((vm_offset_t)nt_hdr + - sizeof(image_nt_header)); + sect_hdr = IMAGE_FIRST_SECTION(nt_hdr); bcopy ((char *)sect_hdr, (char *)hdr, sizeof(image_section_header)); @@ -280,8 +288,7 @@ dos_hdr = (image_dos_header *)imgbase; nt_hdr = (image_nt_header *)(imgbase + dos_hdr->idh_lfanew); - sect_hdr = (image_section_header *)((vm_offset_t)nt_hdr + - sizeof(image_nt_header)); + sect_hdr = IMAGE_FIRST_SECTION(nt_hdr); /* * The test here is to see if the RVA falls somewhere @@ -339,8 +346,7 @@ dos_hdr = (image_dos_header *)imgbase; nt_hdr = (image_nt_header *)(imgbase + dos_hdr->idh_lfanew); - sect_hdr = (image_section_header *)((vm_offset_t)nt_hdr + - sizeof(image_nt_header)); + sect_hdr = IMAGE_FIRST_SECTION(nt_hdr); for (i = 0; i < sections; i++) { if (!strcmp ((char *)§_hdr->ish_name, name)) { ==== //depot/projects/smpng/sys/conf/Makefile.alpha#25 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.alpha -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.alpha 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.135 2005/04/13 14:49:57 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.136 2005/10/27 19:27:54 jhb Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600002 +%VERSREQ= 600003 .if !defined(S) .if exists(./@/.) ==== //depot/projects/smpng/sys/conf/Makefile.amd64#12 (text+ko) ==== @@ -2,7 +2,7 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 -# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.17 2005/09/07 17:38:46 obrien Exp $ +# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.18 2005/10/27 19:27:54 jhb Exp $ # # Makefile for FreeBSD # @@ -18,7 +18,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600002 +%VERSREQ= 600003 STD8X16FONT?= iso ==== //depot/projects/smpng/sys/conf/Makefile.arm#13 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.13 2005/10/17 18:31:37 cognet Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.14 2005/10/27 19:27:54 jhb Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600002 +%VERSREQ= 600003 # Temporary stuff while we're still embryonic NO_MODULES= ==== //depot/projects/smpng/sys/conf/Makefile.i386#23 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.i386,v 1.265 2005/04/13 14:49:57 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.i386,v 1.266 2005/10/27 19:27:54 jhb Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600002 +%VERSREQ= 600003 STD8X16FONT?= iso ==== //depot/projects/smpng/sys/conf/Makefile.ia64#30 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.62 2005/04/13 14:49:57 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.63 2005/10/27 19:27:54 jhb Exp $ # # Makefile for FreeBSD # @@ -19,7 +19,7 @@ GCC3= you bet # Which version of config(8) is required. -%VERSREQ= 600002 +%VERSREQ= 600003 STD8X16FONT?= iso ==== //depot/projects/smpng/sys/conf/Makefile.pc98#22 (text+ko) ==== @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.167 2005/04/13 14:49:57 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.168 2005/10/27 19:27:54 jhb Exp $ # # Makefile for FreeBSD # @@ -19,7 +19,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600002 +%VERSREQ= 600003 .if !defined(S) .if exists(./@/.) ==== //depot/projects/smpng/sys/conf/Makefile.powerpc#31 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.powerpc -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.278 2005/09/07 17:38:46 obrien Exp $ +# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.279 2005/10/27 19:27:54 jhb Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600002 +%VERSREQ= 600003 STD8X16FONT?= iso ==== //depot/projects/smpng/sys/conf/Makefile.sparc64#26 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.sparc64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.33 2005/04/13 14:49:57 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.34 2005/10/27 19:27:54 jhb Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600002 +%VERSREQ= 600003 STD8X16FONT?= iso ==== //depot/projects/smpng/sys/conf/kern.post.mk#49 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.86 2005/10/25 09:05:07 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.89 2005/10/27 17:39:03 ru Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -29,11 +29,7 @@ # Handle out of tree ports .if !defined(NO_MODULES) && defined(PORTS_MODULES) -.for _dir in ${.CURDIR}/../../.. -.if !defined(SYSDIR) && exists(${_dir}/kern/) -SYSDIR= ${_dir} -.endif -.endfor +SYSDIR?= ${S:C;^[^/];${.CURDIR}/&;} PORTSMODULESENV=SYSDIR=${SYSDIR} .for __target in all install reinstall clean ${__target}: ports-${__target} @@ -67,8 +63,11 @@ FULLKERNEL= ${KERNEL_KO} .else FULLKERNEL= ${KERNEL_KO}.debug -${KERNEL_KO}: ${FULLKERNEL} - ${OBJCOPY} --strip-debug ${FULLKERNEL} ${KERNEL_KO} +${KERNEL_KO}: ${FULLKERNEL} ${KERNEL_KO}.symbols + ${OBJCOPY} --strip-debug --add-gnu-debuglink=${KERNEL_KO}.symbols\ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 28 19:41:50 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7287116A422; Fri, 28 Oct 2005 19:41:49 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 34EC216A41F for ; Fri, 28 Oct 2005 19:41:49 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1108243D46 for ; Fri, 28 Oct 2005 19:41:48 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9SJfmc1047025 for ; Fri, 28 Oct 2005 19:41:48 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9SJflbC047022 for perforce@freebsd.org; Fri, 28 Oct 2005 19:41:47 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Oct 2005 19:41:47 GMT Message-Id: <200510281941.j9SJflbC047022@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 Cc: Subject: PERFORCE change 85991 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2005 19:41:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=85991 Change 85991 by jhb@jhb_slimer on 2005/10/28 19:40:55 IFC @85989. Affected files ... .. //depot/projects/smpng/sys/conf/files#155 integrate .. //depot/projects/smpng/sys/conf/files.i386#88 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#52 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#27 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#25 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbusreg.h#6 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbusvar.h#10 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#28 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#63 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#11 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#29 integrate .. //depot/projects/smpng/sys/dev/txp/if_txpreg.h#5 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_ebus.c#8 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_pccard.c#6 integrate .. //depot/projects/smpng/sys/dev/uart/uart_core.c#9 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/smpng/sys/i386/isa/pcf.c#9 delete .. //depot/projects/smpng/sys/modules/Makefile#109 integrate .. //depot/projects/smpng/sys/modules/i2c/controllers/pcf/Makefile#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.h#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_parse.h#8 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.h#11 integrate .. //depot/projects/smpng/sys/netgraph/ng_vlan.h#2 integrate .. //depot/projects/smpng/sys/pc98/conf/DEFAULTS#1 branch .. //depot/projects/smpng/sys/pc98/conf/GENERIC#58 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#41 integrate .. //depot/projects/smpng/sys/pci/if_vrreg.h#10 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#36 integrate .. //depot/projects/smpng/sys/pci/if_wbreg.h#6 integrate Differences ... ==== //depot/projects/smpng/sys/conf/files#155 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1060 2005/10/23 00:22:02 njl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1061 2005/10/28 15:58:17 joerg Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -763,6 +763,7 @@ dev/pccbb/pccbb.c optional cbb dev/pccbb/pccbb_isa.c optional cbb isa dev/pccbb/pccbb_pci.c optional cbb pci +dev/pcf/pcf.c optional pcf dev/pci/eisa_pci.c optional pci eisa dev/pci/fixup_pci.c optional pci dev/pci/ignore_pci.c optional pci ==== //depot/projects/smpng/sys/conf/files.i386#88 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.541 2005/09/17 03:36:46 anholt Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.542 2005/10/28 15:58:18 joerg Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -199,6 +199,7 @@ dev/mse/mse.c optional mse dev/mse/mse_isa.c optional mse isa dev/nve/if_nve.c optional nve pci +dev/pcf/pcf_isa.c optional pcf dev/ppc/ppc.c optional ppc dev/ppc/ppc_puc.c optional ppc puc pci dev/random/nehemiah.c optional random @@ -325,7 +326,6 @@ i386/isa/isa_dma.c optional isa i386/isa/nmi.c standard i386/isa/npx.c optional npx -i386/isa/pcf.c optional pcf i386/isa/pcvt/pcvt_drv.c optional vt i386/isa/pcvt/pcvt_ext.c optional vt i386/isa/pcvt/pcvt_kbd.c optional vt ==== //depot/projects/smpng/sys/conf/files.sparc64#52 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.73 2005/06/12 00:47:21 marcel Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.74 2005/10/28 15:58:18 joerg Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -46,6 +46,8 @@ dev/ofw/openfirm.c standard dev/ofw/openfirmio.c standard dev/ofw/openpromio.c standard +dev/pcf/envctrl.c optional pcf +dev/pcf/pcf_ebus.c optional pcf ebus dev/sound/sbus/cs4231.c optional snd_audiocs ebus dev/sound/sbus/cs4231.c optional snd_audiocs sbus dev/syscons/scgfbrndr.c optional sc ==== //depot/projects/smpng/sys/dev/cardbus/cardbus.c#27 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.53 2005/09/27 13:33:46 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.54 2005/10/28 06:03:53 imp Exp $"); #include #include @@ -112,8 +112,8 @@ return; } - if (reg == CARDBUS_ROM_REG) - testval = CARDBUS_ROM_ADDRMASK; + if (reg == PCIR_BIOS) + testval = PCIM_BIOS_ADDR_MASK; else testval = ~0; @@ -435,50 +435,48 @@ device_t child; int cardattached = 0; int bus, slot, func; + int cardbusfunchigh = 0; cardbus_detach_card(cbdev); /* detach existing cards */ POWER_ENABLE_SOCKET(brdev, cbdev); bus = pcib_get_bus(cbdev); + slot = 0; /* For each function, set it up and try to attach a driver to it */ - for (slot = 0; slot <= CARDBUS_SLOTMAX; slot++) { - int cardbusfunchigh = 0; - for (func = 0; func <= cardbusfunchigh; func++) { - struct cardbus_devinfo *dinfo; + for (func = 0; func <= cardbusfunchigh; func++) { + struct cardbus_devinfo *dinfo; - dinfo = (struct cardbus_devinfo *) - pci_read_device(brdev, bus, slot, func, - sizeof(struct cardbus_devinfo)); - if (dinfo == NULL) - continue; - if (dinfo->pci.cfg.mfdev) - cardbusfunchigh = CARDBUS_FUNCMAX; + dinfo = (struct cardbus_devinfo *) + pci_read_device(brdev, bus, slot, func, + sizeof(struct cardbus_devinfo)); + if (dinfo == NULL) + continue; + if (dinfo->pci.cfg.mfdev) + cardbusfunchigh = PCI_FUNCMAX; - cardbus_device_setup_regs(brdev, bus, slot, func, - &dinfo->pci.cfg); - child = device_add_child(cbdev, NULL, -1); - if (child == NULL) { - DEVPRINTF((cbdev, "Cannot add child!\n")); - pci_freecfg((struct pci_devinfo *)dinfo); - continue; - } - dinfo->pci.cfg.dev = child; - resource_list_init(&dinfo->pci.resources); - device_set_ivars(child, dinfo); - if (cardbus_do_cis(cbdev, child) != 0) { - DEVPRINTF((cbdev, "Can't parse cis\n")); - pci_freecfg((struct pci_devinfo *)dinfo); - continue; - } - cardbus_pickup_maps(cbdev, child); - cardbus_alloc_resources(cbdev, child); - pci_print_verbose(&dinfo->pci); - if (device_probe_and_attach(child) != 0) - cardbus_release_all_resources(cbdev, dinfo); - else - cardattached++; + cardbus_device_setup_regs(brdev, bus, slot, func, + &dinfo->pci.cfg); + child = device_add_child(cbdev, NULL, -1); + if (child == NULL) { + DEVPRINTF((cbdev, "Cannot add child!\n")); + pci_freecfg((struct pci_devinfo *)dinfo); + continue; + } + dinfo->pci.cfg.dev = child; + resource_list_init(&dinfo->pci.resources); + device_set_ivars(child, dinfo); + if (cardbus_do_cis(cbdev, child) != 0) { + DEVPRINTF((cbdev, "Can't parse cis\n")); + pci_freecfg((struct pci_devinfo *)dinfo); + continue; } + cardbus_pickup_maps(cbdev, child); + cardbus_alloc_resources(cbdev, child); + pci_print_verbose(&dinfo->pci); + if (device_probe_and_attach(child) != 0) + cardbus_release_all_resources(cbdev, dinfo); + else + cardattached++; } - if (cardattached > 0) return (0); POWER_DISABLE_SOCKET(brdev, cbdev); ==== //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#25 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.50 2005/02/20 20:36:16 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.52 2005/10/28 05:55:52 imp Exp $"); /* * CIS Handling for the Cardbus Bus @@ -325,7 +325,7 @@ } /* Convert from BAR type to BAR offset */ - bar = CARDBUS_BASE0_REG + (bar - 1) * 4; + bar = PCIR_BAR(bar - 1); if (type == SYS_RES_MEMORY) { if (reg & TPL_BAR_REG_PREFETCHABLE) @@ -491,32 +491,27 @@ uint32_t testval; uint32_t size; struct resource *res; + uint32_t space; - switch (CARDBUS_CIS_SPACE(*start)) { - case CARDBUS_CIS_ASI_TUPLE: + space = *start & PCIM_CIS_ASI_MASK; + switch (space) { + case PCIM_CIS_ASI_TUPLE: /* CIS in PCI config space need no initialization */ return ((struct resource*)~0UL); - case CARDBUS_CIS_ASI_BAR0: - case CARDBUS_CIS_ASI_BAR1: - case CARDBUS_CIS_ASI_BAR2: - case CARDBUS_CIS_ASI_BAR3: - case CARDBUS_CIS_ASI_BAR4: - case CARDBUS_CIS_ASI_BAR5: - *rid = CARDBUS_BASE0_REG + (CARDBUS_CIS_SPACE(*start) - 1) * 4; + case PCIM_CIS_ASI_BAR0: + case PCIM_CIS_ASI_BAR1: + case PCIM_CIS_ASI_BAR2: + case PCIM_CIS_ASI_BAR3: + case PCIM_CIS_ASI_BAR4: + case PCIM_CIS_ASI_BAR5: + *rid = PCIR_BAR(space - PCIM_CIS_ASI_BAR0); break; - case CARDBUS_CIS_ASI_ROM: - *rid = CARDBUS_ROM_REG; -#if 0 - /* - * This mask doesn't contain the bit that actually enables - * the Option ROM. - */ - pci_write_config(child, *rid, CARDBUS_ROM_ADDRMASK, 4); -#endif + case PCIM_CIS_ASI_ROM: + *rid = PCIR_BIOS; break; default: device_printf(cbdev, "Unable to read CIS: Unknown space: %d\n", - CARDBUS_CIS_SPACE(*start)); + space); return (NULL); } @@ -528,7 +523,7 @@ * This bit has a different meaning depending if we are dealing * with a normal BAR or an Option ROM BAR. */ - if (((testval & 0x1) == 0x1) && (*rid != CARDBUS_ROM_REG)) { + if (((testval & 0x1) == 0x1) && (*rid != PCIR_BIOS)) { device_printf(cbdev, "CIS Space is IO, expecting memory.\n"); return (NULL); } @@ -546,13 +541,12 @@ return (NULL); } pci_write_config(child, *rid, - rman_get_start(res) | ((*rid == CARDBUS_ROM_REG)? - CARDBUS_ROM_ENABLE : 0), + rman_get_start(res) | ((*rid == PCIR_BIOS) ? PCIM_BIOS_ENABLE : 0), 4); PCI_ENABLE_IO(cbdev, child, SYS_RES_MEMORY); /* Flip to the right ROM image if CIS is in ROM */ - if (CARDBUS_CIS_SPACE(*start) == CARDBUS_CIS_ASI_ROM) { + if (space == PCIM_CIS_ASI_ROM) { bus_space_tag_t bt; bus_space_handle_t bh; uint32_t imagesize; @@ -565,7 +559,7 @@ bt = rman_get_bustag(res); bh = rman_get_bushandle(res); - imagenum = CARDBUS_CIS_ASI_ROM_IMAGE(*start); + imagenum = (*start & PCIM_CIS_ROM_MASK) >> 28; for (romnum = 0;; romnum++) { romsig = bus_space_read_2(bt, bh, imagebase + CARDBUS_EXROM_SIGNATURE); @@ -617,9 +611,9 @@ } imagebase += imagesize; } - *start = imagebase + CARDBUS_CIS_ADDR(*start); + *start = imagebase + (*start & PCIM_CIS_ADDR_MASK); } else { - *start = CARDBUS_CIS_ADDR(*start); + *start = *start & PCIM_CIS_ADDR_MASK; } return (res); @@ -658,7 +652,7 @@ bzero(tupledata, MAXTUPLESIZE); expect_linktarget = TRUE; - if ((start = pci_read_config(child, CARDBUS_CIS_REG, 4)) == 0) { + if ((start = pci_read_config(child, PCIR_CIS, 4)) == 0) { device_printf(cbdev, "CIS pointer is 0!\n"); return (ENXIO); } ==== //depot/projects/smpng/sys/dev/cardbus/cardbusreg.h#6 (text+ko) ==== @@ -23,40 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/cardbus/cardbusreg.h,v 1.8 2005/01/13 19:12:10 imp Exp $ + * $FreeBSD: src/sys/dev/cardbus/cardbusreg.h,v 1.11 2005/10/28 06:03:53 imp Exp $ */ /* * Register definitions for the Cardbus Bus */ - -/* Cardbus bus constants */ -#define CARDBUS_SLOTMAX 0 -#define CARDBUS_FUNCMAX 7 - -/* Cardbus configuration header registers */ -#define CARDBUS_BASE0_REG 0x10 -#define CARDBUS_BASE1_REG 0x14 -#define CARDBUS_BASE2_REG 0x18 -#define CARDBUS_BASE3_REG 0x1C -#define CARDBUS_BASE4_REG 0x20 -#define CARDBUS_BASE5_REG 0x24 -#define CARDBUS_CIS_REG 0x28 -# define CARDBUS_CIS_ASIMASK 0x07 -# define CARDBUS_CIS_ADDRMASK 0x0ffffff8 -# define CARDBUS_CIS_ASI_TUPLE 0x00 -# define CARDBUS_CIS_ASI_BAR0 0x01 -# define CARDBUS_CIS_ASI_BAR1 0x02 -# define CARDBUS_CIS_ASI_BAR2 0x03 -# define CARDBUS_CIS_ASI_BAR3 0x04 -# define CARDBUS_CIS_ASI_BAR4 0x05 -# define CARDBUS_CIS_ASI_BAR5 0x06 -# define CARDBUS_CIS_ASI_ROM 0x07 -#define CARDBUS_ROM_REG 0x30 -# define CARDBUS_ROM_ENABLE 0x00000001 -# define CARDBUS_ROM_ADDRMASK 0xfffff800 - /* EXROM offsets for reading CIS */ #define CARDBUS_EXROM_SIGNATURE 0x00 #define CARDBUS_EXROM_DATA_PTR 0x18 @@ -72,16 +45,6 @@ #define CARDBUS_EXROM_DATA_CODE_TYPE 0x14 /* Code Type */ #define CARDBUS_EXROM_DATA_INDICATOR 0x15 /* Indicator */ -/* useful macros */ -#define CARDBUS_CIS_ADDR(x) \ - (CARDBUS_CIS_ADDRMASK & (x)) -#define CARDBUS_CIS_SPACE(x) \ - (CARDBUS_CIS_ASIMASK & (x)) -#define CARDBUS_CIS_ASI_BAR(x) \ - (((CARDBUS_CIS_ASIMASK & (x))-1)*4+0x10) -#define CARDBUS_CIS_ASI_ROM_IMAGE(x) \ - (((x) >> 28) & 0xf) - #define CARDBUS_MAPREG_MEM_ADDR_MASK 0x0ffffff0 #define CARDBUS_MAPREG_MEM_ADDR(mr) \ ((mr) & CARDBUS_MAPREG_MEM_ADDR_MASK) ==== //depot/projects/smpng/sys/dev/cardbus/cardbusvar.h#10 (text+ko) ==== @@ -23,18 +23,19 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/cardbus/cardbusvar.h,v 1.11 2005/02/06 21:03:13 imp Exp $ + * $FreeBSD: src/sys/dev/cardbus/cardbusvar.h,v 1.12 2005/10/28 05:29:41 imp Exp $ */ /* * Structure definitions for the Cardbus Bus driver */ -struct cardbus_devinfo { +struct cardbus_devinfo +{ struct pci_devinfo pci; uint8_t mprefetchable; /* bit mask of prefetchable BARs */ uint8_t mbelow1mb; /* bit mask of BARs which require below 1Mb */ uint8_t ibelow1mb; /* bit mask of BARs which require below 1Mb */ -#define BARBIT(RID) (1<<(((RID)-CARDBUS_BASE0_REG)/4)) +#define BARBIT(RID) (1<<(((RID)-PCIR_BARS)/4)) uint16_t mfrid; /* manufacturer id */ uint16_t prodid; /* product id */ u_int funcid; /* function id */ ==== //depot/projects/smpng/sys/dev/en/midway.c#28 (text+ko) ==== @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/en/midway.c,v 1.66 2005/08/09 10:19:46 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/en/midway.c,v 1.67 2005/10/27 21:08:12 jhb Exp $"); /* * @@ -1869,7 +1869,9 @@ #ifdef ENABLE_BPF BPF_MTAP(sc->ifp, m); #endif + EN_UNLOCK(sc); atm_input(sc->ifp, &ah, m, vc->rxhand); + EN_LOCK(sc); } } ==== //depot/projects/smpng/sys/dev/pci/pci.c#63 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.300 2005/10/25 06:53:45 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.301 2005/10/28 05:56:50 imp Exp $"); #include "opt_bus.h" @@ -913,8 +913,7 @@ if (progif & PCIP_STORAGE_IDE_MODEPRIM) { pci_add_map(pcib, bus, dev, b, s, f, PCIR_BAR(0), rl); pci_add_map(pcib, bus, dev, b, s, f, PCIR_BAR(1), rl); - } - else { + } else { rid = PCIR_BAR(0); resource_list_add(rl, type, rid, 0x1f0, 0x1f7, 8); resource_list_alloc(rl, bus, dev, type, &rid, 0x1f0, 0x1f7,8,0); @@ -925,8 +924,7 @@ if (progif & PCIP_STORAGE_IDE_MODESEC) { pci_add_map(pcib, bus, dev, b, s, f, PCIR_BAR(2), rl); pci_add_map(pcib, bus, dev, b, s, f, PCIR_BAR(3), rl); - } - else { + } else { rid = PCIR_BAR(2); resource_list_add(rl, type, rid, 0x170, 0x177, 8); resource_list_alloc(rl, bus, dev, type, &rid, 0x170, 0x177,8,0); ==== //depot/projects/smpng/sys/dev/pci/pcireg.h#11 (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/dev/pci/pcireg.h,v 1.45 2005/06/05 23:08:59 imp Exp $ + * $FreeBSD: src/sys/dev/pci/pcireg.h,v 1.47 2005/10/28 06:02:51 imp Exp $ * */ @@ -111,11 +111,23 @@ #define PCIR_BARS 0x10 #define PCIR_BAR(x) (PCIR_BARS + (x) * 4) -#define PCIR_CARDBUSCIS 0x28 +#define PCIR_CIS 0x28 +#define PCIM_CIS_ASI_MASK 0x7 +#define PCIM_CIS_ASI_TUPLE 0 +#define PCIM_CIS_ASI_BAR0 1 +#define PCIM_CIS_ASI_BAR1 2 +#define PCIM_CIS_ASI_BAR2 3 +#define PCIM_CIS_ASI_BAR3 4 +#define PCIM_CIS_ASI_BAR4 5 +#define PCIM_CIS_ASI_BAR5 6 +#define PCIM_CIS_ASI_ROM 7 +#define PCIM_CIS_ADDR_MASK 0x0ffffff8 +#define PCIM_CIS_ROM_MASK 0xf0000000 #define PCIR_SUBVEND_0 0x2c #define PCIR_SUBDEV_0 0x2e #define PCIR_BIOS 0x30 #define PCIM_BIOS_ENABLE 0x01 +#define PCIM_BIOS_ADDR_MASK 0xfffff800 #define PCIR_CAP_PTR 0x34 #define PCIR_INTLINE 0x3c #define PCIR_INTPIN 0x3d ==== //depot/projects/smpng/sys/dev/txp/if_txp.c#29 (text+ko) ==== @@ -35,14 +35,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.36 2005/09/19 03:10:20 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.37 2005/10/27 21:16:17 jhb Exp $"); /* * Driver for 3c990 (Typhoon) Ethernet ASIC */ #include -__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.36 2005/09/19 03:10:20 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.37 2005/10/27 21:16:17 jhb Exp $"); #include #include @@ -92,7 +92,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.36 2005/09/19 03:10:20 imp Exp $"; + "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.37 2005/10/27 21:16:17 jhb Exp $"; #endif /* @@ -122,8 +122,10 @@ static int txp_shutdown(device_t); static int txp_ioctl(struct ifnet *, u_long, caddr_t); static void txp_start(struct ifnet *); +static void txp_start_locked(struct ifnet *); static void txp_stop(struct txp_softc *); static void txp_init(void *); +static void txp_init_locked(struct txp_softc *); static void txp_watchdog(struct ifnet *); static void txp_release_resources(struct txp_softc *); @@ -216,16 +218,17 @@ struct ifnet *ifp; u_int16_t p1; u_int32_t p2; - int unit, error = 0, rid; + int error = 0, rid; u_char eaddr[6]; sc = device_get_softc(dev); - unit = device_get_unit(dev); sc->sc_dev = dev; sc->sc_cold = 1; mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, - MTX_DEF | MTX_RECURSE); + MTX_DEF); + callout_init_mtx(&sc->sc_tick, &sc->sc_mtx, 0); + /* * Map control/status registers. */ @@ -324,8 +327,7 @@ 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 = txp_ioctl; ifp->if_start = txp_start; ifp->if_watchdog = txp_watchdog; @@ -339,9 +341,8 @@ * Attach us everywhere */ ether_ifattach(ifp, eaddr); - callout_handle_init(&sc->sc_tick); - error = bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET, + error = bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET | INTR_MPSAFE, txp_intr, sc, &sc->sc_intrhand); if (error) { @@ -369,8 +370,11 @@ sc = device_get_softc(dev); ifp = sc->sc_ifp; + TXP_LOCK(sc); txp_stop(sc); + TXP_UNLOCK(sc); txp_shutdown(dev); + callout_drain(&sc->sc_tick); ifmedia_removeall(&sc->sc_ifmedia); ether_ifdetach(ifp); @@ -657,6 +661,7 @@ u_int32_t isr; /* mask all interrupts */ + TXP_LOCK(sc); WRITE_REG(sc, TXP_IMR, TXP_INT_RESERVED | TXP_INT_SELF | TXP_INT_A2H_7 | TXP_INT_A2H_6 | TXP_INT_A2H_5 | TXP_INT_A2H_4 | TXP_INT_A2H_2 | TXP_INT_A2H_1 | TXP_INT_A2H_0 | @@ -689,7 +694,8 @@ /* unmask all interrupts */ WRITE_REG(sc, TXP_IMR, TXP_INT_A2H_3); - txp_start(sc->sc_ifp); + txp_start_locked(sc->sc_ifp); + TXP_UNLOCK(sc); return; } @@ -705,6 +711,7 @@ struct txp_swdesc *sd = NULL; u_int32_t roff, woff; + TXP_LOCK_ASSERT(sc); roff = *r->r_roff; woff = *r->r_woff; rxd = r->r_desc + (roff / sizeof(struct txp_rx_desc)); @@ -736,24 +743,13 @@ */ struct mbuf *mnew; - MGETHDR(mnew, M_DONTWAIT, MT_DATA); + mnew = m_devget(mtod(m, caddr_t), rxd->rx_len, + ETHER_ALIGN, ifp, NULL); + m_freem(m); if (mnew == NULL) { - m_freem(m); + ifp->if_ierrors++; goto next; } - if (m->m_len > (MHLEN - 2)) { - MCLGET(mnew, M_DONTWAIT); - if (!(mnew->m_flags & M_EXT)) { - m_freem(mnew); - m_freem(m); - goto next; - } - } - mnew->m_pkthdr.rcvif = ifp; - m_adj(mnew, 2); - mnew->m_pkthdr.len = mnew->m_len = m->m_len; - m_copydata(m, 0, m->m_pkthdr.len, mtod(mnew, caddr_t)); - m_freem(m); m = mnew; } #endif @@ -776,7 +772,9 @@ m, htons(rxd->rx_vlan >> 16), goto next); } + TXP_UNLOCK(sc); (*ifp->if_input)(ifp, m); + TXP_LOCK(sc); next: @@ -804,6 +802,7 @@ struct txp_swdesc *sd; u_int32_t i; + TXP_LOCK_ASSERT(sc); if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) return; @@ -815,13 +814,9 @@ if (sd->sd_mbuf != NULL) break; - MGETHDR(sd->sd_mbuf, M_DONTWAIT, MT_DATA); + sd->sd_mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); if (sd->sd_mbuf == NULL) - goto err_sd; - - MCLGET(sd->sd_mbuf, M_DONTWAIT); - if ((sd->sd_mbuf->m_flags & M_EXT) == 0) - goto err_mbuf; + return; sd->sd_mbuf->m_pkthdr.rcvif = ifp; sd->sd_mbuf->m_pkthdr.len = sd->sd_mbuf->m_len = MCLBYTES; @@ -841,11 +836,6 @@ sc->sc_rxbufprod = i; return; - -err_mbuf: - m_freem(sd->sd_mbuf); -err_sd: - free(sd, M_DEVBUF); } /* @@ -863,6 +853,7 @@ struct txp_swdesc *sd = sc->sc_txd + cons; struct mbuf *m; + TXP_LOCK_ASSERT(sc); while (cons != idx) { if (cnt == 0) break; @@ -905,6 +896,8 @@ sc = device_get_softc(dev); + TXP_LOCK(sc); + /* mask all interrupts */ WRITE_REG(sc, TXP_IMR, TXP_INT_SELF | TXP_INT_PCI_TABORT | TXP_INT_PCI_MABORT | @@ -914,6 +907,7 @@ txp_command(sc, TXP_CMD_TX_DISABLE, 0, 0, 0, NULL, NULL, NULL, 0); txp_command(sc, TXP_CMD_RX_DISABLE, 0, 0, 0, NULL, NULL, NULL, 0); txp_command(sc, TXP_CMD_HALT, 0, 0, 0, NULL, NULL, NULL, 0); + TXP_UNLOCK(sc); return(0); } @@ -1062,18 +1056,18 @@ { struct txp_softc *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; - int s, error = 0; + int error = 0; - s = splnet(); - switch(command) { case SIOCSIFFLAGS: + TXP_LOCK(sc); if (ifp->if_flags & IFF_UP) { - txp_init(sc); + txp_init_locked(sc); } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) txp_stop(sc); } + TXP_UNLOCK(sc); break; case SIOCADDMULTI: case SIOCDELMULTI: @@ -1081,7 +1075,9 @@ * Multicast list has changed; set the hardware * filter accordingly. */ + TXP_LOCK(sc); txp_set_filter(sc); + TXP_UNLOCK(sc); error = 0; break; case SIOCGIFMEDIA: @@ -1093,8 +1089,6 @@ break; } - (void)splx(s); - return(error); } @@ -1106,19 +1100,15 @@ struct ifnet *ifp; struct txp_swdesc *sd; + TXP_LOCK_ASSERT(sc); ifp = sc->sc_ifp; for (i = 0; i < RXBUF_ENTRIES; i++) { sd = sc->sc_rxbufs[i].rb_sd; - MGETHDR(sd->sd_mbuf, M_DONTWAIT, MT_DATA); + sd->sd_mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); if (sd->sd_mbuf == NULL) return(ENOBUFS); - MCLGET(sd->sd_mbuf, M_DONTWAIT); - if ((sd->sd_mbuf->m_flags & M_EXT) == 0) { - m_freem(sd->sd_mbuf); - return(ENOBUFS); - } sd->sd_mbuf->m_pkthdr.len = sd->sd_mbuf->m_len = MCLBYTES; sd->sd_mbuf->m_pkthdr.rcvif = ifp; @@ -1140,6 +1130,7 @@ int i; struct txp_swdesc *sd; + TXP_LOCK_ASSERT(sc); if (sc->sc_rxbufs == NULL) return; @@ -1163,12 +1154,22 @@ void *xsc; { struct txp_softc *sc; + + sc = xsc; + TXP_LOCK(sc); + txp_init_locked(sc); + TXP_UNLOCK(sc); +} + +static void +txp_init_locked(sc) + struct txp_softc *sc; +{ struct ifnet *ifp; u_int16_t p1; u_int32_t p2; - int s; - sc = xsc; + TXP_LOCK_ASSERT(sc); ifp = sc->sc_ifp; if (ifp->if_drv_flags & IFF_DRV_RUNNING) @@ -1176,8 +1177,6 @@ txp_stop(sc); - s = splnet(); - txp_command(sc, TXP_CMD_MAX_PKT_SIZE_WRITE, TXP_MAX_PKTLEN, 0, 0, NULL, NULL, NULL, 1); @@ -1209,9 +1208,7 @@ ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_timer = 0; - sc->sc_tick = timeout(txp_tick, sc, hz); - - splx(s); + callout_reset(&sc->sc_tick, hz, txp_tick, sc); } static void @@ -1222,9 +1219,8 @@ struct ifnet *ifp = sc->sc_ifp; struct txp_rsp_desc *rsp = NULL; struct txp_ext_desc *ext; - int s; - s = splnet(); + TXP_LOCK_ASSERT(sc); txp_rxbuf_reclaim(sc); if (txp_command2(sc, TXP_CMD_READ_STATISTICS, 0, 0, 0, NULL, 0, @@ -1250,8 +1246,7 @@ if (rsp != NULL) free(rsp, M_DEVBUF); - splx(s); - sc->sc_tick = timeout(txp_tick, sc, hz); + callout_reset(&sc->sc_tick, hz, txp_tick, sc); return; } @@ -1260,6 +1255,18 @@ txp_start(ifp) struct ifnet *ifp; { + struct txp_softc *sc; + + sc = ifp->if_softc; + TXP_LOCK(sc); + txp_start_locked(ifp); + TXP_UNLOCK(sc); +} + +static void +txp_start_locked(ifp) + struct ifnet *ifp; +{ struct txp_softc *sc = ifp->if_softc; struct txp_tx_ring *r = &sc->sc_txhir; struct txp_tx_desc *txd; @@ -1269,6 +1276,7 @@ u_int32_t firstprod, firstcnt, prod, cnt; struct m_tag *mtag; + TXP_LOCK_ASSERT(sc); if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) != IFF_DRV_RUNNING) return; @@ -1572,11 +1580,12 @@ { struct ifnet *ifp; + TXP_LOCK_ASSERT(sc); ifp = sc->sc_ifp; ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); - untimeout(txp_tick, sc, sc->sc_tick); + callout_stop(&sc->sc_tick); txp_command(sc, TXP_CMD_TX_DISABLE, 0, 0, 0, NULL, NULL, NULL, 1); txp_command(sc, TXP_CMD_RX_DISABLE, 0, 0, 0, NULL, NULL, NULL, 1); @@ -1601,8 +1610,11 @@ struct ifmedia *ifm = &sc->sc_ifmedia; u_int16_t new_xcvr; - if (IFM_TYPE(ifm->ifm_media) != IFM_ETHER) + TXP_LOCK(sc); + if (IFM_TYPE(ifm->ifm_media) != IFM_ETHER) { + TXP_UNLOCK(sc); return (EINVAL); + } if (IFM_SUBTYPE(ifm->ifm_media) == IFM_10_T) { if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) @@ -1616,16 +1628,21 @@ new_xcvr = TXP_XCVR_100_HDX; } else if (IFM_SUBTYPE(ifm->ifm_media) == IFM_AUTO) { new_xcvr = TXP_XCVR_AUTO; - } else + } else { + TXP_UNLOCK(sc); return (EINVAL); + } /* nothing to do */ - if (sc->sc_xcvr == new_xcvr) + if (sc->sc_xcvr == new_xcvr) { + TXP_UNLOCK(sc); return (0); + } txp_command(sc, TXP_CMD_XCVR_SELECT, new_xcvr, 0, 0, NULL, NULL, NULL, 0); sc->sc_xcvr = new_xcvr; + TXP_UNLOCK(sc); return (0); } @@ -1642,6 +1659,7 @@ ifmr->ifm_status = IFM_AVALID; ifmr->ifm_active = IFM_ETHER; + TXP_LOCK(sc); if (txp_command(sc, TXP_CMD_PHY_MGMT_READ, 0, MII_BMSR, 0, &bmsr, NULL, NULL, 1)) goto bail; @@ -1656,6 +1674,7 @@ if (txp_command(sc, TXP_CMD_PHY_MGMT_READ, 0, MII_ANLPAR, 0, &anlpar, NULL, NULL, 1)) goto bail; + TXP_UNLOCK(sc); if (bmsr & BMSR_LINK) ifmr->ifm_status |= IFM_ACTIVE; @@ -1692,6 +1711,7 @@ return; bail: + TXP_UNLOCK(sc); ifmr->ifm_active |= IFM_NONE; ifmr->ifm_status &= ~IFM_AVALID; } ==== //depot/projects/smpng/sys/dev/txp/if_txpreg.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: if_txpreg.h,v 1.30 2001/06/23 04:18:02 jason Exp $ */ -/* $FreeBSD: src/sys/dev/txp/if_txpreg.h,v 1.5 2005/10/03 15:47:15 jhb Exp $ */ +/* $FreeBSD: src/sys/dev/txp/if_txpreg.h,v 1.6 2005/10/27 21:16:17 jhb Exp $ */ /*- * Copyright (c) 2001 Aaron Campbell . @@ -606,7 +606,7 @@ struct txp_cmd_ring sc_cmdring; struct txp_rsp_ring sc_rspring; struct txp_swdesc sc_txd[TX_ENTRIES]; - struct callout_handle sc_tick; + struct callout sc_tick; struct ifmedia sc_ifmedia; struct txp_tx_ring sc_txhir, sc_txlor; struct txp_rxbuf_desc *sc_rxbufs; @@ -639,6 +639,10 @@ #define READ_REG(sc,reg) \ bus_space_read_4((sc)->sc_bt, (sc)->sc_bh, reg) +#define TXP_LOCK(sc) mtx_lock(&(sc)->sc_mtx) +#define TXP_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx) +#define TXP_LOCK_ASSERT(sc) mtx_assert(&(sc)->sc_mtx, MA_OWNED) + >>> TRUNCATED FOR MAIL (1000 lines) <<<