From owner-p4-projects@FreeBSD.ORG Sun Mar 5 01:09:11 2006 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 B21A016A423; Sun, 5 Mar 2006 01:09:10 +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 898F516A420 for ; Sun, 5 Mar 2006 01:09:10 +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 3C7C243D45 for ; Sun, 5 Mar 2006 01:09:10 +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 k2519AER004879 for ; Sun, 5 Mar 2006 01:09:10 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 k251999V004876 for perforce@freebsd.org; Sun, 5 Mar 2006 01:09:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 01:09:09 GMT Message-Id: <200603050109.k251999V004876@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 92753 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, 05 Mar 2006 01:09:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=92753 Change 92753 by rwatson@rwatson_peppercorn on 2006/03/05 01:08:12 Belatedly update VERSION. Need to do this *before* the release next time. Maybe next time around. Affected files ... .. //depot/projects/trustedbsd/openbsm/VERSION#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/VERSION#7 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_3 +OPENBSM_1_0_ALPHA_5 From owner-p4-projects@FreeBSD.ORG Sun Mar 5 01:54:06 2006 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 CC51A16A423; Sun, 5 Mar 2006 01:54: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 9C9F316A420 for ; Sun, 5 Mar 2006 01:54:05 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D81D43D45 for ; Sun, 5 Mar 2006 01:54:05 +0000 (GMT) (envelope-from kmacy@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 k251s5cO006485 for ; Sun, 5 Mar 2006 01:54:05 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k251s5Un006482 for perforce@freebsd.org; Sun, 5 Mar 2006 01:54:05 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 5 Mar 2006 01:54:05 GMT Message-Id: <200603050154.k251s5Un006482@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92755 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, 05 Mar 2006 01:54:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=92755 Change 92755 by kmacy@kmacy_storage:sun4v_work on 2006/03/05 01:53:11 Switch kernel over to being backed by a hashtable for 8K pages Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#14 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#2 (text+ko) ==== @@ -7,6 +7,8 @@ void tte_hash_init(void); +tte_hash_t tte_hash_kernel_create(vm_offset_t, uint64_t); + tte_hash_t tte_hash_create(uint64_t context); void tte_hash_destroy(tte_hash_t th); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#14 (text+ko) ==== @@ -113,6 +113,12 @@ hv_tsb_info_t kernel_td[MAX_TSB_INFO]; +/* + * This should be determined at boot time + * with tiny TLBS it doesn't make sense to try and selectively + * invalidate more than this + */ +#define MAX_INVALIDATES 32 /* * Allocate physical memory for use in pmap_bootstrap. @@ -208,10 +214,6 @@ vm_offset_t va; vm_page_t m; - - KASSERT(locked_pmap->pm_context != 0, - ("context 0 not backed by pv_entry management")); - PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); allocated_pv = uma_zalloc(pvzone, M_NOWAIT); @@ -352,7 +354,7 @@ pmap_bootstrap(vm_offset_t ekva) { struct pmap *pm; - vm_offset_t off, va; + vm_offset_t off, va, kernel_hash; vm_paddr_t pa; vm_size_t physsz, virtsz; ihandle_t pmem, vmem; @@ -408,6 +410,24 @@ */ virtsz = roundup(physsz, PAGE_SIZE_4M << (PAGE_SHIFT - TTE_SHIFT)); vm_max_kernel_address = VM_MIN_KERNEL_ADDRESS + virtsz; + + + + /* + * Allocate and map a 4MB page for the kernel hashtable + * + */ + pa = pmap_bootstrap_alloc(PAGE_SIZE_4M); + if (pa & PAGE_MASK_4M) + panic("pmap_bootstrap: hashtable unaligned\n"); + kernel_hash = virtual_avail; + virtual_avail += PAGE_SIZE_4M; + pmap_scrub_pages(pa, PAGE_SIZE_4M); + + /* + * Set up TSB descriptors for the hypervisor + * + */ tsb_8k_size = virtsz >> (PAGE_SHIFT - TTE_SHIFT); pa = pmap_bootstrap_alloc(tsb_8k_size); @@ -421,8 +441,19 @@ kernel_td[TSB8K_INDEX].hvtsb_rsvd = 0; kernel_td[TSB8K_INDEX].hvtsb_pa = pa; + /* + * Initialize kernel's private TSB from 8K page TSB + * + */ + kernel_pmap->pm_tsb.hvtsb_idxpgsz = TTE8K; + kernel_pmap->pm_tsb.hvtsb_assoc = 1; + kernel_pmap->pm_tsb.hvtsb_ntte = (tsb_8k_size >> TTE_SHIFT); + kernel_pmap->pm_tsb.hvtsb_ctx_index = 0; + kernel_pmap->pm_tsb.hvtsb_pgszs = TSB8K; + kernel_pmap->pm_tsb.hvtsb_rsvd = 0; + kernel_pmap->pm_tsb.hvtsb_pa = kernel_td[TSB8K_INDEX].hvtsb_pa; + tsb_4m_size = virtsz >> (PAGE_SHIFT_4M - TTE_SHIFT); - pa = pmap_bootstrap_alloc(tsb_4m_size); kernel_td[TSB4M_INDEX].hvtsb_idxpgsz = TTE4M; @@ -438,13 +469,12 @@ pmap_scrub_pages(kernel_td[TSB4M_INDEX].hvtsb_pa, tsb_4m_size); /* - * Set up TSB descriptors for the hypervisor - * + * Install kernel hashtable into 4M TSB + * */ + tsb_set_tte(&kernel_td[TSB4M_INDEX], kernel_hash, + pa | TTE_KERNEL | VTD_4M, 0); - - - /* * allocate MMU fault status areas for all CPUS */ @@ -471,6 +501,7 @@ virtual_end = vm_max_kernel_address; kernel_vm_end = vm_max_kernel_address; + /* * Allocate a kernel stack with guard page for thread0 and map it into * the kernel tsb. @@ -560,6 +591,17 @@ if (error != H_EOK) panic("failed to set ctx0 TSBs error: %ld", error); + /* + * This could happen earlier - but I put it here to avoid + * attempts to do updates until they're legal + */ + pm->pm_hash = tte_hash_kernel_create(kernel_hash, PAGE_SIZE_4M); + + /* + * XXX - We should read the kernel mappings into the hash table + * + */ + } @@ -633,8 +675,6 @@ printf("ctx=%d va=%lx prot=%x wired=%x\n", pmap->pm_context, va, prot, wired); #endif - KASSERT(pmap->pm_context != 0, - ("inserting faultable entries into context 0 without backing hash")); om = NULL; @@ -895,15 +935,15 @@ #endif /* XXX SUN4V_FIXME - oversimplified logic */ - if (pmap->pm_context != 0) { - tsb_clear_range(&pmap->pm_tsb, sva, eva); - } + tsb_clear_range(&pmap->pm_tsb, sva, eva); + - if (((sva & PAGE_MASK_4M) != 0) || ((eva & PAGE_MASK_4M) != 0)) { + if ((((eva - sva) >> PAGE_SHIFT) < MAX_INVALIDATES) || + ((sva & PAGE_MASK_4M) != 0) || ((eva & PAGE_MASK_4M) != 0)) { for (tva = sva; tva < eva; tva += PAGE_SIZE_8K) invlpg(tva, pmap->pm_context); } else - UNIMPLEMENTED; + invlctx(pmap->pm_context); } @@ -1125,9 +1165,6 @@ uint64_t *tte; - KASSERT(pmap->pm_context != 0, - ("protection downgrades not handled correctly without backing hash")); - if ((prot & VM_PROT_READ) == VM_PROT_NONE) { pmap_remove(pmap, sva, eva); return; @@ -1173,7 +1210,7 @@ sched_unpin(); if (anychanged) - pmap_invalidate_all(pmap); + pmap_invalidate_range(pmap, sva, eva); vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } @@ -1292,8 +1329,6 @@ while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { PMAP_LOCK(pv->pv_pmap); pv->pv_pmap->pm_stats.resident_count--; - KASSERT(pv->pv_pmap->pm_context != 0, - ("cannot special case absence of backing hash")); tte = tte_hash_lookup(pv->pv_pmap->pm_hash, pv->pv_va); tte_data = *tte; tte_hash_delete(pv->pv_pmap->pm_hash, pv->pv_va); @@ -1360,9 +1395,6 @@ pv_entry_t pv, npv; tte_t *tte, tte_data; - KASSERT(pmap->pm_context != 0, - ("cannot special case absence of backing hash")); - vm_page_lock_queues(); PMAP_LOCK(pmap); sched_pin(); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#2 (text+ko) ==== @@ -57,6 +57,8 @@ tte_hash_entry_t th_hashtable; /* hash of TTEs */ }; +static struct tte_hash kernel_tte_hash; + /* * Data for the tte_hash allocation mechanism @@ -95,6 +97,19 @@ } +tte_hash_t +tte_hash_kernel_create(vm_offset_t va, uint64_t size) +{ + tte_hash_t th; + + th = &kernel_tte_hash; + th->th_size = (size >> PAGE_SHIFT); + th->th_entries = 0; + th->th_context = 0; + + return th; +} + tte_hash_t tte_hash_create(uint64_t context) From owner-p4-projects@FreeBSD.ORG Sun Mar 5 02:10:26 2006 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 2708216A423; Sun, 5 Mar 2006 02:10: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 E53A916A420 for ; Sun, 5 Mar 2006 02:10:25 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 96EA443D46 for ; Sun, 5 Mar 2006 02:10:25 +0000 (GMT) (envelope-from kmacy@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 k252APMQ007129 for ; Sun, 5 Mar 2006 02:10:25 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k252APHH007126 for perforce@freebsd.org; Sun, 5 Mar 2006 02:10:25 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 5 Mar 2006 02:10:25 GMT Message-Id: <200603050210.k252APHH007126@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92756 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, 05 Mar 2006 02:10:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=92756 Change 92756 by kmacy@kmacy_storage:sun4v_work on 2006/03/05 02:09:57 allocate 4th (and final) scratchpad to storing the active TSB real address Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#10 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/sun4v_cpufunc.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#15 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#10 (text+ko) ==== @@ -128,6 +128,7 @@ #define SCRATCH_REG_MMFSA ASI_SCRATCHPAD_0_REG #define SCRATCH_REG_PCPU ASI_SCRATCHPAD_1_REG #define SCRATCH_REG_HASH ASI_SCRATCHPAD_2_REG +#define SCRATCH_REG_TSB ASI_SCRATCHPAD_3_REG #define MMU_CID_P 0x08 #define MMU_CID_S 0x10 ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#5 (text+ko) ==== @@ -139,7 +139,12 @@ mov SCRATCH_REG_HASH, reg; \ ldxa [%g0 + reg]ASI_SCRATCHPAD, reg; +#define GET_TSB_SCRATCH(reg) \ + mov SCRATCH_REG_TSB, reg; \ + ldxa [%g0 + reg]ASI_SCRATCHPAD, reg; + #define SET_HASH_SCRATCH(reg) stxa reg, [%g0 + SCRATCH_REG_HASH]ASI_SCRATCHPAD +#define SET_TSB_SCRATCH(reg) stxa reg, [%g0 + SCRATCH_REG_TSB]ASI_SCRATCHPAD #define GET_PCB(reg) \ GET_PCPU_SCRATCH; \ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#15 (text+ko) ==== @@ -451,8 +451,15 @@ kernel_pmap->pm_tsb.hvtsb_ctx_index = 0; kernel_pmap->pm_tsb.hvtsb_pgszs = TSB8K; kernel_pmap->pm_tsb.hvtsb_rsvd = 0; - kernel_pmap->pm_tsb.hvtsb_pa = kernel_td[TSB8K_INDEX].hvtsb_pa; + kernel_pmap->pm_tsb.hvtsb_pa = pa; + set_tsb_scratchpad(pa); + + /* + * Initialize kernel TSB for 4M pages + * currently (not by design) used for permanent mappings + */ + tsb_4m_size = virtsz >> (PAGE_SHIFT_4M - TTE_SHIFT); pa = pmap_bootstrap_alloc(tsb_4m_size); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#8 (text+ko) ==== @@ -678,7 +678,14 @@ retl nop END(set_pcpu_scratchpad) +ENTRY(set_tsb_scratchpad) + mov SCRATCH_REG_TSB, %g2 + stxa %o0, [%g0 + %g2]ASI_SCRATCHPAD + retl + nop +END(set_hash_scratchpad) + /* * %o0 ra - real address * [%o1] lo - lower 64-bits From owner-p4-projects@FreeBSD.ORG Sun Mar 5 02:12:29 2006 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 1447F16A423; Sun, 5 Mar 2006 02: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 C898916A420 for ; Sun, 5 Mar 2006 02:12:28 +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 86D2843D46 for ; Sun, 5 Mar 2006 02:12:28 +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 k252CSeg007200 for ; Sun, 5 Mar 2006 02:12:28 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 k252CSjB007197 for perforce@freebsd.org; Sun, 5 Mar 2006 02:12:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 02:12:28 GMT Message-Id: <200603050212.k252CSjB007197@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 92757 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, 05 Mar 2006 02:12:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=92757 Change 92757 by rwatson@rwatson_peppercorn on 2006/03/05 02:12:12 Switch to using Solaris-style AU_TO_WRITE and AU_NO_WRITE for 'keep' argument to au_close(). This appeared already to work due to numeric constants aligning (a bit like the stars), but using the actual constant names is better. Add a man page for au_open(), au_write(), au_close(), and au_close_buffer(). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#4 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#23 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#19 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#3 $ # INCLUDES = -I$(top_srcdir) @@ -30,6 +30,7 @@ au_free_token.3 \ au_io.3 \ au_mask.3 \ + au_open.3 \ au_token.3 \ au_user.3 \ libbsm.3 ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#4 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#3 $ +# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#4 $ # srcdir = @srcdir@ @@ -204,6 +204,7 @@ au_free_token.3 \ au_io.3 \ au_mask.3 \ + au_open.3 \ au_token.3 \ au_user.3 \ libbsm.3 ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#23 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#22 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#23 $ */ #include @@ -280,12 +280,11 @@ return (-1); /* Invalid descriptor */ } - if (!keep) { + if (keep == AU_NO_WRITE) { retval = 0; goto cleanup; } - tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; if (tot_rec_size > MAX_AUDIT_RECORD_SIZE) { ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#19 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#18 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#19 $ */ #ifdef __APPLE__ @@ -130,7 +130,7 @@ * tok = au_to_random_token_2(...); * au_write(aufd, tok); * ... - * au_close(aufd, 1, AUE_your_event_type); + * au_close(aufd, AU_TO_WRITE, AUE_your_event_type); * * Assumes, like all wrapper calls, that the caller has previously checked * that auditing is enabled via the audit_get_state() call. @@ -156,7 +156,7 @@ if (subject && au_write(aufd, subject) == -1) { au_free_token(subject); au_free_token(misctok); - (void)au_close(aufd, 0, event_code); + (void)au_close(aufd, AU_TO_WRITE, event_code); syslog(LOG_ERR, "%s: write of subject failed", func); return (kAUWriteSubjectTokErr); } @@ -164,31 +164,30 @@ /* Save the event-specific token. */ if (misctok && au_write(aufd, misctok) == -1) { au_free_token(misctok); - (void)au_close(aufd, 0, event_code); + (void)au_close(aufd, AU_NO_WRITE, event_code); syslog(LOG_ERR, "%s: write of caller token failed", func); return (kAUWriteCallerTokErr); } /* Tokenize and save the return value. */ if ((rettok = au_to_return32(retval, errcode)) == NULL) { - (void)au_close(aufd, 0, event_code); + (void)au_close(aufd, AU_NO_WRITE, event_code); syslog(LOG_ERR, "%s: au_to_return32() failed", func); return (kAUMakeReturnTokErr); } if (au_write(aufd, rettok) == -1) { au_free_token(rettok); - (void)au_close(aufd, 0, event_code); + (void)au_close(aufd, AU_NO_WRITE, event_code); syslog(LOG_ERR, "%s: write of return code failed", func); return (kAUWriteReturnTokErr); } /* - * au_close()'s second argument is "keep": if keep == 0, the record is - * discarded. We assume the caller wouldn't have bothered with this + * We assume the caller wouldn't have bothered with this * function if it hadn't already decided to keep the record. */ - if (au_close(aufd, 1, event_code) < 0) { + if (au_close(aufd, AU_TO_WRITE, event_code) < 0) { syslog(LOG_ERR, "%s: au_close() failed", func); return (kAUCloseErr); } From owner-p4-projects@FreeBSD.ORG Sun Mar 5 02:20:18 2006 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 EF02D16A423; Sun, 5 Mar 2006 02:20: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 B8CF616A420 for ; Sun, 5 Mar 2006 02:20:17 +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 503F843D46 for ; Sun, 5 Mar 2006 02:20:17 +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 k252KH2O007557 for ; Sun, 5 Mar 2006 02:20:17 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k252Jl6U007484 for perforce@freebsd.org; Sun, 5 Mar 2006 02:19:47 GMT (envelope-from peter@freebsd.org) Date: Sun, 5 Mar 2006 02:19:47 GMT Message-Id: <200603050219.k252Jl6U007484@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 92758 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, 05 Mar 2006 02:20:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=92758 Change 92758 by peter@peter_overcee on 2006/03/05 02:19:24 IFC @92754 Affected files ... .. //depot/projects/hammer/MAINTAINERS#39 integrate .. //depot/projects/hammer/Makefile#37 integrate .. //depot/projects/hammer/Makefile.inc1#112 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#14 integrate .. //depot/projects/hammer/README#3 integrate .. //depot/projects/hammer/UPDATING#91 integrate .. //depot/projects/hammer/bin/chflags/chflags.1#11 integrate .. //depot/projects/hammer/bin/csh/Makefile#9 integrate .. //depot/projects/hammer/bin/csh/config.h#7 integrate .. //depot/projects/hammer/bin/csh/iconv.h#1 branch .. //depot/projects/hammer/bin/csh/iconv_stub.c#1 branch .. //depot/projects/hammer/bin/ln/ln.1#7 integrate .. //depot/projects/hammer/bin/ln/ln.c#6 integrate .. //depot/projects/hammer/bin/ps/print.c#15 integrate .. //depot/projects/hammer/bin/sh/error.c#5 integrate .. //depot/projects/hammer/bin/sh/eval.c#12 integrate .. //depot/projects/hammer/bin/sh/expand.c#12 integrate .. //depot/projects/hammer/bin/sh/jobs.c#14 integrate .. //depot/projects/hammer/bin/sh/main.c#4 integrate .. //depot/projects/hammer/bin/sh/miscbltin.c#7 integrate .. //depot/projects/hammer/bin/sh/var.c#9 integrate .. //depot/projects/hammer/bin/sh/var.h#4 integrate .. //depot/projects/hammer/contrib/bsnmp/NEWS#9 integrate .. //depot/projects/hammer/contrib/bsnmp/TODO#3 integrate .. //depot/projects/hammer/contrib/bsnmp/VERSION#9 integrate .. //depot/projects/hammer/contrib/bsnmp/gensnmptree/gensnmptree.1#6 integrate .. //depot/projects/hammer/contrib/bsnmp/gensnmptree/gensnmptree.c#9 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/asn1.c#6 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/asn1.h#6 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/snmpclient.c#7 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/support.h#2 integrate .. //depot/projects/hammer/contrib/bsnmp/oid-list#4 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII.c#10 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII.h#6 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#8 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_route.c#6 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/snmp_mibII.h#6 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_ntp/snmp_ntp.c#5 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/bsnmpd.1#7 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/config.c#7 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/export.c#4 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/main.c#11 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpd.config#7 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpmod.3#8 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpmod.h#6 integrate .. //depot/projects/hammer/contrib/csup/GNUmakefile#1 branch .. //depot/projects/hammer/contrib/csup/Makefile#1 branch .. //depot/projects/hammer/contrib/csup/README#1 branch .. //depot/projects/hammer/contrib/csup/TODO#1 branch .. //depot/projects/hammer/contrib/csup/attrstack.c#1 branch .. //depot/projects/hammer/contrib/csup/attrstack.h#1 branch .. //depot/projects/hammer/contrib/csup/config.c#1 branch .. //depot/projects/hammer/contrib/csup/config.h#1 branch .. //depot/projects/hammer/contrib/csup/csup.1#1 branch .. //depot/projects/hammer/contrib/csup/detailer.c#1 branch .. //depot/projects/hammer/contrib/csup/detailer.h#1 branch .. //depot/projects/hammer/contrib/csup/diff.c#1 branch .. //depot/projects/hammer/contrib/csup/diff.h#1 branch .. //depot/projects/hammer/contrib/csup/fattr.c#1 branch .. //depot/projects/hammer/contrib/csup/fattr.h#1 branch .. //depot/projects/hammer/contrib/csup/fattr_bsd.h#1 branch .. //depot/projects/hammer/contrib/csup/fattr_posix.h#1 branch .. //depot/projects/hammer/contrib/csup/fixups.c#1 branch .. //depot/projects/hammer/contrib/csup/fixups.h#1 branch .. //depot/projects/hammer/contrib/csup/fnmatch.c#1 branch .. //depot/projects/hammer/contrib/csup/fnmatch.h#1 branch .. //depot/projects/hammer/contrib/csup/globtree.c#1 branch .. //depot/projects/hammer/contrib/csup/globtree.h#1 branch .. //depot/projects/hammer/contrib/csup/keyword.c#1 branch .. //depot/projects/hammer/contrib/csup/keyword.h#1 branch .. //depot/projects/hammer/contrib/csup/lister.c#1 branch .. //depot/projects/hammer/contrib/csup/lister.h#1 branch .. //depot/projects/hammer/contrib/csup/main.c#1 branch .. //depot/projects/hammer/contrib/csup/main.h#1 branch .. //depot/projects/hammer/contrib/csup/misc.c#1 branch .. //depot/projects/hammer/contrib/csup/misc.h#1 branch .. //depot/projects/hammer/contrib/csup/mux.c#1 branch .. //depot/projects/hammer/contrib/csup/mux.h#1 branch .. //depot/projects/hammer/contrib/csup/parse.y#1 branch .. //depot/projects/hammer/contrib/csup/pathcomp.c#1 branch .. //depot/projects/hammer/contrib/csup/pathcomp.h#1 branch .. //depot/projects/hammer/contrib/csup/proto.c#1 branch .. //depot/projects/hammer/contrib/csup/proto.h#1 branch .. //depot/projects/hammer/contrib/csup/queue.h#1 branch .. //depot/projects/hammer/contrib/csup/status.c#1 branch .. //depot/projects/hammer/contrib/csup/status.h#1 branch .. //depot/projects/hammer/contrib/csup/stream.c#1 branch .. //depot/projects/hammer/contrib/csup/stream.h#1 branch .. //depot/projects/hammer/contrib/csup/threads.c#1 branch .. //depot/projects/hammer/contrib/csup/threads.h#1 branch .. //depot/projects/hammer/contrib/csup/token.h#1 branch .. //depot/projects/hammer/contrib/csup/token.l#1 branch .. //depot/projects/hammer/contrib/csup/updater.c#1 branch .. //depot/projects/hammer/contrib/csup/updater.h#1 branch .. //depot/projects/hammer/contrib/ipfilter/man/Makefile#3 integrate .. //depot/projects/hammer/contrib/ipfilter/man/mkfilters.1#3 integrate .. //depot/projects/hammer/contrib/libbegemot/rpoll.c#2 integrate .. //depot/projects/hammer/contrib/openbsm/FREEBSD-upgrade#1 branch .. //depot/projects/hammer/contrib/openbsm/HISTORY#1 branch .. //depot/projects/hammer/contrib/openbsm/LICENSE#1 branch .. //depot/projects/hammer/contrib/openbsm/Makefile.am#1 branch .. //depot/projects/hammer/contrib/openbsm/Makefile.in#1 branch .. //depot/projects/hammer/contrib/openbsm/README#1 branch .. //depot/projects/hammer/contrib/openbsm/TODO#1 branch .. //depot/projects/hammer/contrib/openbsm/VERSION#1 branch .. //depot/projects/hammer/contrib/openbsm/aclocal.m4#1 branch .. //depot/projects/hammer/contrib/openbsm/autogen.sh#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/Makefile.am#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/Makefile.in#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/audit/Makefile.am#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/audit/Makefile.in#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/audit/audit.8#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/audit/audit.c#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/auditd/Makefile.am#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/auditd/Makefile.in#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/auditd/audit_warn.c#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.8#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.c#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.h#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/Makefile.am#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/Makefile.in#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/auditreduce.1#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/auditreduce.c#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/auditreduce.h#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/praudit/Makefile.am#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/praudit/Makefile.in#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/praudit/praudit.1#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/praudit/praudit.c#1 branch .. //depot/projects/hammer/contrib/openbsm/bsm/Makefile.am#1 branch .. //depot/projects/hammer/contrib/openbsm/bsm/Makefile.in#1 branch .. //depot/projects/hammer/contrib/openbsm/bsm/audit.h#1 branch .. //depot/projects/hammer/contrib/openbsm/bsm/audit_internal.h#1 branch .. //depot/projects/hammer/contrib/openbsm/bsm/audit_kevents.h#1 branch .. //depot/projects/hammer/contrib/openbsm/bsm/audit_record.h#1 branch .. //depot/projects/hammer/contrib/openbsm/bsm/audit_uevents.h#1 branch .. //depot/projects/hammer/contrib/openbsm/bsm/libbsm.h#1 branch .. //depot/projects/hammer/contrib/openbsm/compat/endian.h#1 branch .. //depot/projects/hammer/contrib/openbsm/compat/queue.h#1 branch .. //depot/projects/hammer/contrib/openbsm/config/config.guess#1 branch .. //depot/projects/hammer/contrib/openbsm/config/config.h#1 branch .. //depot/projects/hammer/contrib/openbsm/config/config.h.in#1 branch .. //depot/projects/hammer/contrib/openbsm/config/config.sub#1 branch .. //depot/projects/hammer/contrib/openbsm/config/depcomp#1 branch .. //depot/projects/hammer/contrib/openbsm/config/install-sh#1 branch .. //depot/projects/hammer/contrib/openbsm/config/ltmain.sh#1 branch .. //depot/projects/hammer/contrib/openbsm/config/missing#1 branch .. //depot/projects/hammer/contrib/openbsm/configure#1 branch .. //depot/projects/hammer/contrib/openbsm/configure.ac#1 branch .. //depot/projects/hammer/contrib/openbsm/etc/audit_class#1 branch .. //depot/projects/hammer/contrib/openbsm/etc/audit_control#1 branch .. //depot/projects/hammer/contrib/openbsm/etc/audit_event#1 branch .. //depot/projects/hammer/contrib/openbsm/etc/audit_user#1 branch .. //depot/projects/hammer/contrib/openbsm/etc/audit_warn#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/Makefile.am#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/Makefile.in#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/au_class.3#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/au_control.3#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/au_event.3#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/au_free_token.3#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/au_io.3#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/au_mask.3#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/au_token.3#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/au_user.3#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_audit.c#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_class.c#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_control.c#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_event.c#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_flags.c#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_io.c#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_mask.c#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_notify.c#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_token.c#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_user.c#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_wrappers.c#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/libbsm.3#1 branch .. //depot/projects/hammer/contrib/openbsm/man/Makefile.am#1 branch .. //depot/projects/hammer/contrib/openbsm/man/Makefile.in#1 branch .. //depot/projects/hammer/contrib/openbsm/man/audit.2#1 branch .. //depot/projects/hammer/contrib/openbsm/man/audit.log.5#1 branch .. //depot/projects/hammer/contrib/openbsm/man/audit_class.5#1 branch .. //depot/projects/hammer/contrib/openbsm/man/audit_control.5#1 branch .. //depot/projects/hammer/contrib/openbsm/man/audit_event.5#1 branch .. //depot/projects/hammer/contrib/openbsm/man/audit_user.5#1 branch .. //depot/projects/hammer/contrib/openbsm/man/audit_warn.5#1 branch .. //depot/projects/hammer/contrib/openbsm/man/auditctl.2#1 branch .. //depot/projects/hammer/contrib/openbsm/man/auditon.2#1 branch .. //depot/projects/hammer/contrib/openbsm/man/getaudit.2#1 branch .. //depot/projects/hammer/contrib/openbsm/man/getauid.2#1 branch .. //depot/projects/hammer/contrib/openbsm/man/setaudit.2#1 branch .. //depot/projects/hammer/contrib/openbsm/man/setauid.2#1 branch .. //depot/projects/hammer/contrib/openbsm/tools/Makefile.am#1 branch .. //depot/projects/hammer/contrib/openbsm/tools/Makefile.in#1 branch .. //depot/projects/hammer/contrib/openbsm/tools/audump.c#1 branch .. //depot/projects/hammer/contrib/tcsh/nls/C/charset#1 branch .. //depot/projects/hammer/contrib/tcsh/nls/et/charset#1 branch .. //depot/projects/hammer/contrib/tcsh/nls/finnish/charset#1 branch .. //depot/projects/hammer/contrib/tcsh/nls/french/charset#1 branch .. //depot/projects/hammer/contrib/tcsh/nls/german/charset#1 branch .. //depot/projects/hammer/contrib/tcsh/nls/greek/charset#1 branch .. //depot/projects/hammer/contrib/tcsh/nls/italian/charset#1 branch .. //depot/projects/hammer/contrib/tcsh/nls/ja/charset#1 branch .. //depot/projects/hammer/contrib/tcsh/nls/pl/charset#1 branch .. //depot/projects/hammer/contrib/tcsh/nls/russian/charset#1 branch .. //depot/projects/hammer/contrib/tcsh/nls/spanish/charset#1 branch .. //depot/projects/hammer/contrib/tcsh/nls/ukrainian/charset#1 branch .. //depot/projects/hammer/etc/Makefile#47 integrate .. //depot/projects/hammer/etc/defaults/periodic.conf#16 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#69 integrate .. //depot/projects/hammer/etc/etc.sparc64/ttys#10 integrate .. //depot/projects/hammer/etc/group#7 integrate .. //depot/projects/hammer/etc/hosts.allow#4 integrate .. //depot/projects/hammer/etc/inetd.conf#9 integrate .. //depot/projects/hammer/etc/mtree/BSD.var.dist#9 integrate .. //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#12 integrate .. //depot/projects/hammer/etc/periodic/daily/407.status-graid3#1 branch .. //depot/projects/hammer/etc/periodic/daily/408.status-gstripe#1 branch .. //depot/projects/hammer/etc/periodic/daily/409.status-gconcat#1 branch .. //depot/projects/hammer/etc/periodic/daily/440.status-mailq#3 integrate .. //depot/projects/hammer/etc/periodic/daily/Makefile#5 integrate .. //depot/projects/hammer/etc/rc#19 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#46 integrate .. //depot/projects/hammer/etc/rc.d/SERVERS#5 integrate .. //depot/projects/hammer/etc/rc.d/abi#8 integrate .. //depot/projects/hammer/etc/rc.d/archdep#9 integrate .. //depot/projects/hammer/etc/rc.d/auditd#1 branch .. //depot/projects/hammer/etc/rc.d/hostapd#1 branch .. //depot/projects/hammer/etc/rc.d/ipfw#12 integrate .. //depot/projects/hammer/etc/rc.d/localpkg#6 integrate .. //depot/projects/hammer/etc/rc.d/named#15 integrate .. //depot/projects/hammer/etc/rc.d/netif#15 integrate .. //depot/projects/hammer/etc/rc.d/pccard#6 delete .. //depot/projects/hammer/etc/rc.d/pflog#8 integrate .. //depot/projects/hammer/etc/rc.d/root#11 integrate .. //depot/projects/hammer/etc/rc.subr#32 integrate .. //depot/projects/hammer/etc/snmpd.config#3 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#59 integrate .. //depot/projects/hammer/gnu/usr.bin/dialog/dialog.1#2 integrate .. //depot/projects/hammer/gnu/usr.bin/dialog/dialog.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#10 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/search.c#9 integrate .. //depot/projects/hammer/include/printf.h#3 integrate .. //depot/projects/hammer/include/proc_service.h#4 integrate .. //depot/projects/hammer/include/resolv.h#8 integrate .. //depot/projects/hammer/include/rpc/auth.h#3 integrate .. //depot/projects/hammer/lib/Makefile#55 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#25 integrate .. //depot/projects/hammer/lib/libbsm/Makefile#1 branch .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#25 integrate .. //depot/projects/hammer/lib/libc/net/inet_net.3#3 integrate .. //depot/projects/hammer/lib/libc/net/inet_net_ntop.c#2 integrate .. //depot/projects/hammer/lib/libc/net/inet_net_pton.c#3 integrate .. //depot/projects/hammer/lib/libc/net/res_comp.c#3 integrate .. //depot/projects/hammer/lib/libc/net/res_debug.c#3 integrate .. //depot/projects/hammer/lib/libc/net/res_query.c#6 integrate .. //depot/projects/hammer/lib/libc/net/res_send.c#7 integrate .. //depot/projects/hammer/lib/libc/rpc/auth_des.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/auth_none.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/auth_unix.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/clnt_dg.c#5 integrate .. //depot/projects/hammer/lib/libc/rpc/clnt_raw.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/clnt_simple.c#4 integrate .. //depot/projects/hammer/lib/libc/rpc/clnt_vc.c#5 integrate .. //depot/projects/hammer/lib/libc/rpc/getpublickey.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/key_call.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/mt_misc.c#4 integrate .. //depot/projects/hammer/lib/libc/rpc/mt_misc.h#1 branch .. //depot/projects/hammer/lib/libc/rpc/rpc_com.h#3 integrate .. //depot/projects/hammer/lib/libc/rpc/rpc_generic.c#4 integrate .. //depot/projects/hammer/lib/libc/rpc/rpc_soc.c#5 integrate .. //depot/projects/hammer/lib/libc/rpc/rpcb_clnt.c#5 integrate .. //depot/projects/hammer/lib/libc/rpc/svc.c#4 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_auth.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_dg.c#4 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_generic.c#4 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_raw.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_run.c#4 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_simple.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_vc.c#8 integrate .. //depot/projects/hammer/lib/libc/stdio/xprintf_quote.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/xprintf_time.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/a64l.3#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/grantpt.c#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.3#8 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#23 integrate .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#21 integrate .. //depot/projects/hammer/lib/libc/sys/gettimeofday.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/kldnext.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/recv.2#11 integrate .. //depot/projects/hammer/lib/libgssapi/gss_mech_switch.c#2 integrate .. //depot/projects/hammer/lib/libipsec/ipsec_set_policy.3#7 integrate .. //depot/projects/hammer/lib/libipsec/ipsec_strerror.3#6 integrate .. //depot/projects/hammer/lib/libmemstat/memstat_uma.c#8 integrate .. //depot/projects/hammer/lib/libpmc/libpmc.c#5 integrate .. //depot/projects/hammer/lib/libpmc/pmc.3#8 integrate .. //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/context.S#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#18 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#40 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#17 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_nanosleep.c#9 integrate .. //depot/projects/hammer/lib/librt/Makefile#1 branch .. //depot/projects/hammer/lib/librt/aio.c#1 branch .. //depot/projects/hammer/lib/librt/mq.c#1 branch .. //depot/projects/hammer/lib/librt/sigev_thread.c#1 branch .. //depot/projects/hammer/lib/librt/sigev_thread.h#1 branch .. //depot/projects/hammer/lib/librt/timer.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#12 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_info.c#6 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#19 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_list.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#27 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_once.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#29 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_suspend_np.c#5 integrate .. //depot/projects/hammer/lib/libthread_db/libpthread_db.c#7 integrate .. //depot/projects/hammer/lib/libthread_db/libthr_db.c#7 integrate .. //depot/projects/hammer/lib/libutil/Makefile#11 integrate .. //depot/projects/hammer/lib/libutil/kld.3#1 branch .. //depot/projects/hammer/lib/libutil/kld.c#1 branch .. //depot/projects/hammer/lib/libutil/libutil.h#6 integrate .. //depot/projects/hammer/lib/libutil/pidfile.3#5 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#29 integrate .. //depot/projects/hammer/libexec/rtld-elf/libmap.c#15 integrate .. //depot/projects/hammer/release/Makefile#82 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#9 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#85 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#7 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#111 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#13 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#16 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#37 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.ent#18 integrate .. //depot/projects/hammer/release/picobsd/bridge/config#2 integrate .. //depot/projects/hammer/release/picobsd/bridge/crunch.conf#6 integrate .. //depot/projects/hammer/release/picobsd/build/picobsd#5 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.8#12 integrate .. //depot/projects/hammer/sbin/devd/Makefile#8 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#20 integrate .. //depot/projects/hammer/sbin/devd/devd.hh#4 integrate .. //depot/projects/hammer/sbin/dhclient/dhcp-options.5#3 integrate .. //depot/projects/hammer/sbin/dmesg/dmesg.c#12 integrate .. //depot/projects/hammer/sbin/dump/dump.8#16 integrate .. //depot/projects/hammer/sbin/dumpon/dumpon.8#9 integrate .. //depot/projects/hammer/sbin/fdisk_pc98/fdisk.8#5 integrate .. //depot/projects/hammer/sbin/fdisk_pc98/fdisk.c#12 integrate .. //depot/projects/hammer/sbin/gbde/gbde.8#9 integrate .. //depot/projects/hammer/sbin/gbde/gbde.c#16 integrate .. //depot/projects/hammer/sbin/geom/class/concat/gconcat.8#11 integrate .. //depot/projects/hammer/sbin/geom/class/concat/geom_concat.c#10 integrate .. //depot/projects/hammer/sbin/geom/class/eli/geli.8#5 integrate .. //depot/projects/hammer/sbin/geom/class/eli/geom_eli.c#6 integrate .. //depot/projects/hammer/sbin/geom/class/label/geom_label.c#8 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/geom_mirror.c#10 integrate .. //depot/projects/hammer/sbin/geom/class/nop/geom_nop.c#7 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#14 integrate .. //depot/projects/hammer/sbin/geom/class/shsec/geom_shsec.c#6 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#13 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#13 integrate .. //depot/projects/hammer/sbin/geom/core/geom.h#3 integrate .. //depot/projects/hammer/sbin/geom/misc/subr.c#6 integrate .. //depot/projects/hammer/sbin/geom/misc/subr.h#6 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#35 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#24 integrate .. //depot/projects/hammer/sbin/init/Makefile#7 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#52 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#48 integrate .. //depot/projects/hammer/sbin/kldunload/Makefile#3 integrate .. //depot/projects/hammer/sbin/kldunload/kldunload.8#6 integrate .. //depot/projects/hammer/sbin/kldunload/kldunload.c#6 integrate .. //depot/projects/hammer/sbin/mca/Makefile#5 integrate .. //depot/projects/hammer/sbin/mca/mca.8#1 branch .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#23 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.8#12 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.c#17 integrate .. //depot/projects/hammer/sbin/mount/mount.8#19 integrate .. //depot/projects/hammer/sbin/mount/mount.c#25 integrate .. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#13 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#45 integrate .. //depot/projects/hammer/share/examples/ipfilter/Makefile#4 integrate .. //depot/projects/hammer/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/hammer/share/man/man3/pthread_mutex_lock.3#3 integrate .. //depot/projects/hammer/share/man/man4/Makefile#81 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#37 integrate .. //depot/projects/hammer/share/man/man4/agp.4#7 integrate .. //depot/projects/hammer/share/man/man4/altq.4#11 integrate .. //depot/projects/hammer/share/man/man4/ata.4#24 integrate .. //depot/projects/hammer/share/man/man4/ataraid.4#8 integrate .. //depot/projects/hammer/share/man/man4/atkbd.4#5 integrate .. //depot/projects/hammer/share/man/man4/audit.4#1 branch .. //depot/projects/hammer/share/man/man4/cpufreq.4#9 integrate .. //depot/projects/hammer/share/man/man4/ddb.4#8 integrate .. //depot/projects/hammer/share/man/man4/hwpmc.4#12 integrate .. //depot/projects/hammer/share/man/man4/if_bridge.4#9 integrate .. //depot/projects/hammer/share/man/man4/ipmi.4#1 branch .. //depot/projects/hammer/share/man/man4/ipsec.4#4 integrate .. //depot/projects/hammer/share/man/man4/isp.4#7 integrate .. //depot/projects/hammer/share/man/man4/kbdmux.4#4 integrate .. //depot/projects/hammer/share/man/man4/le.4#1 branch .. //depot/projects/hammer/share/man/man4/lp.4#5 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#34 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_ibm.4#9 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ce.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/cs.4#8 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ep.4#18 integrate .. //depot/projects/hammer/share/man/man4/man4.sparc64/eeprom.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.sparc64/sbus.4#2 integrate .. //depot/projects/hammer/share/man/man4/myri10ge.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_netflow.4#11 integrate .. //depot/projects/hammer/share/man/man4/ng_one2many.4#11 integrate .. //depot/projects/hammer/share/man/man4/ng_pppoe.4#11 integrate .. //depot/projects/hammer/share/man/man4/ohci.4#7 integrate .. //depot/projects/hammer/share/man/man4/pcn.4#8 integrate .. //depot/projects/hammer/share/man/man4/pty.4#6 integrate .. //depot/projects/hammer/share/man/man4/syscons.4#10 integrate .. //depot/projects/hammer/share/man/man4/tdfx.4#5 integrate .. //depot/projects/hammer/share/man/man4/twa.4#5 integrate .. //depot/projects/hammer/share/man/man4/uart.4#4 integrate .. //depot/projects/hammer/share/man/man4/vga.4#4 integrate .. //depot/projects/hammer/share/man/man4/vlan.4#15 integrate .. //depot/projects/hammer/share/man/man5/Makefile#16 integrate .. //depot/projects/hammer/share/man/man5/devfs.rules.5#4 integrate .. //depot/projects/hammer/share/man/man5/group.5#6 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#43 integrate .. //depot/projects/hammer/share/man/man5/periodic.conf.5#14 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#71 integrate .. //depot/projects/hammer/share/man/man8/picobsd.8#6 integrate .. //depot/projects/hammer/share/man/man8/rc.subr.8#7 integrate .. //depot/projects/hammer/share/man/man9/Makefile#61 integrate .. //depot/projects/hammer/share/man/man9/acl.9#5 integrate .. //depot/projects/hammer/share/man/man9/buf.9#8 integrate .. //depot/projects/hammer/share/man/man9/bus_dma.9#23 integrate .. //depot/projects/hammer/share/man/man9/condvar.9#5 integrate .. //depot/projects/hammer/share/man/man9/firmware.9#2 integrate .. //depot/projects/hammer/share/man/man9/memguard.9#3 integrate .. //depot/projects/hammer/share/man/man9/mtx_pool.9#4 integrate .. //depot/projects/hammer/share/man/man9/mutex.9#15 integrate .. //depot/projects/hammer/share/man/man9/redzone.9#1 branch .. //depot/projects/hammer/share/man/man9/rman.9#7 integrate .. //depot/projects/hammer/share/man/man9/rwlock.9#1 branch .. //depot/projects/hammer/share/man/man9/sema.9#4 integrate .. //depot/projects/hammer/share/man/man9/sleep.9#10 integrate .. //depot/projects/hammer/share/man/man9/sx.9#10 integrate .. //depot/projects/hammer/share/man/man9/time.9#9 integrate .. //depot/projects/hammer/share/man/man9/vm_page_wakeup.9#3 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#31 integrate .. //depot/projects/hammer/share/mk/bsd.incs.mk#4 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#26 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#29 integrate .. //depot/projects/hammer/share/mk/bsd.prog.mk#16 integrate .. //depot/projects/hammer/share/mklocale/ja_JP.SJIS.src#3 integrate .. //depot/projects/hammer/share/mklocale/ja_JP.eucJP.src#2 integrate .. //depot/projects/hammer/share/mklocale/ko_KR.eucKR.src#2 integrate .. //depot/projects/hammer/share/mklocale/zh_CN.GBK.src#2 integrate .. //depot/projects/hammer/share/mklocale/zh_CN.eucCN.src#2 integrate .. //depot/projects/hammer/share/mklocale/zh_TW.Big5.src#2 integrate .. //depot/projects/hammer/share/msgdef/am_ET.UTF-8.src#2 integrate .. //depot/projects/hammer/share/msgdef/ro_RO.ISO8859-2.src#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#36 integrate .. //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#17 integrate .. //depot/projects/hammer/sys/alpha/alpha/trap.c#21 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_machdep.c#12 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_proto.h#14 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_syscall.h#14 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysent.c#14 integrate .. //depot/projects/hammer/sys/alpha/linux/syscalls.master#14 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_misc.c#20 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#50 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#45 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#46 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#65 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#150 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#115 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#132 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#88 integrate .. //depot/projects/hammer/sys/amd64/amd64/tsc.c#14 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_syscall.c#13 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#41 integrate .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#22 integrate .. //depot/projects/hammer/sys/amd64/include/mptable.h#10 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#55 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#9 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#17 integrate .. //depot/projects/hammer/sys/arm/arm/identcpu.c#7 integrate .. //depot/projects/hammer/sys/arm/arm/machdep.c#17 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#29 integrate .. //depot/projects/hammer/sys/arm/arm/trap.c#16 integrate .. //depot/projects/hammer/sys/arm/arm/undefined.c#8 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#21 integrate .. //depot/projects/hammer/sys/arm/at91/at91.c#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/hammer/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/hammer/sys/arm/at91/at91var.h#1 branch .. //depot/projects/hammer/sys/arm/at91/files.at91#1 branch .. //depot/projects/hammer/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/hammer/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/hammer/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/hammer/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/hammer/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/hammer/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/hammer/sys/arm/at91/std.at91#1 branch .. //depot/projects/hammer/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/hammer/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/hammer/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/hammer/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/hammer/sys/arm/conf/KB920X#1 branch .. //depot/projects/hammer/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/hammer/sys/arm/include/atomic.h#14 integrate .. //depot/projects/hammer/sys/arm/include/pmap.h#15 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_aau.c#3 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_dma.c#3 integrate .. //depot/projects/hammer/sys/bsm/audit.h#2 integrate .. //depot/projects/hammer/sys/bsm/audit_internal.h#1 branch .. //depot/projects/hammer/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/hammer/sys/bsm/audit_record.h#1 branch .. //depot/projects/hammer/sys/coda/coda.h#6 integrate .. //depot/projects/hammer/sys/coda/coda_vnops.c#20 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#40 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#41 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#38 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#38 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#38 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#42 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#24 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#24 integrate .. //depot/projects/hammer/sys/conf/NOTES#106 integrate .. //depot/projects/hammer/sys/conf/files#137 integrate .. //depot/projects/hammer/sys/conf/files.amd64#84 integrate .. //depot/projects/hammer/sys/conf/files.i386#70 integrate .. //depot/projects/hammer/sys/conf/files.pc98#53 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#34 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#38 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#56 integrate .. //depot/projects/hammer/sys/conf/options#93 integrate .. //depot/projects/hammer/sys/conf/options.i386#45 integrate .. //depot/projects/hammer/sys/conf/options.pc98#41 integrate .. //depot/projects/hammer/sys/contrib/altq/altq/altq_subr.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/COPYRIGHT#3 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/README#4 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/ah.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/ah_desc.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/ah_devid.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_if.m#3 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_osdep.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_osdep.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/version.h#7 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#17 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.h#6 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#21 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_smbat.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_throttle.c#8 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_eisa.c#9 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#31 integrate .. //depot/projects/hammer/sys/dev/amr/amr_linux.c#2 integrate .. //depot/projects/hammer/sys/dev/amr/amr_pci.c#21 integrate .. //depot/projects/hammer/sys/dev/amr/amrvar.h#18 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#31 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar.c#18 integrate .. //depot/projects/hammer/sys/dev/asr/asr.c#19 integrate .. //depot/projects/hammer/sys/dev/asr/i2odep.h#3 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#58 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#38 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#70 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#39 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#41 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#30 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#35 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.h#21 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.c#9 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#10 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.c#6 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.h#3 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#42 integrate .. //depot/projects/hammer/sys/dev/ath/if_athioctl.h#11 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#22 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#23 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#65 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#32 integrate .. //depot/projects/hammer/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/hammer/sys/dev/ce/tau32-ddk.c#2 integrate .. //depot/projects/hammer/sys/dev/ce/tau32-ddk.h#2 integrate .. //depot/projects/hammer/sys/dev/cs/if_csvar.h#6 integrate .. //depot/projects/hammer/sys/dev/dc/if_dc.c#7 integrate .. //depot/projects/hammer/sys/dev/de/dc21040reg.h#1 branch .. //depot/projects/hammer/sys/dev/de/if_de.c#1 branch .. //depot/projects/hammer/sys/dev/de/if_devar.h#1 branch .. //depot/projects/hammer/sys/dev/ed/if_ed_cbus.c#16 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#60 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#29 integrate .. //depot/projects/hammer/sys/dev/em/if_em_osdep.h#12 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#26 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex.c#20 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#29 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_acpi.c#8 integrate .. //depot/projects/hammer/sys/dev/firewire/fwcrom.c#11 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#57 integrate .. //depot/projects/hammer/sys/dev/ic/z8530.h#3 integrate .. //depot/projects/hammer/sys/dev/ichwd/ichwd.c#6 integrate .. //depot/projects/hammer/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#47 integrate .. //depot/projects/hammer/sys/dev/iir/iir.c#12 integrate .. //depot/projects/hammer/sys/dev/iir/iir.h#13 integrate .. //depot/projects/hammer/sys/dev/iir/iir_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/ipmi/ipmi.c#1 branch .. //depot/projects/hammer/sys/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/hammer/sys/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/hammer/sys/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/hammer/sys/dev/isp/isp.c#17 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#20 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.h#14 integrate .. //depot/projects/hammer/sys/dev/isp/isp_inline.h#8 delete .. //depot/projects/hammer/sys/dev/isp/isp_ioctl.h#8 integrate .. //depot/projects/hammer/sys/dev/isp/isp_library.c#1 branch .. //depot/projects/hammer/sys/dev/isp/isp_library.h#1 branch .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#20 integrate .. //depot/projects/hammer/sys/dev/isp/isp_sbus.c#11 integrate .. //depot/projects/hammer/sys/dev/isp/isp_target.c#11 integrate .. //depot/projects/hammer/sys/dev/isp/isp_target.h#6 integrate .. //depot/projects/hammer/sys/dev/isp/isp_tpublic.h#6 integrate .. //depot/projects/hammer/sys/dev/isp/ispmbox.h#9 integrate .. //depot/projects/hammer/sys/dev/isp/ispreg.h#4 integrate .. //depot/projects/hammer/sys/dev/isp/ispvar.h#14 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#15 integrate .. //depot/projects/hammer/sys/dev/kbd/kbd.c#12 integrate .. //depot/projects/hammer/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/hammer/sys/dev/le/am7990.c#1 branch .. //depot/projects/hammer/sys/dev/le/am79900.c#1 branch .. //depot/projects/hammer/sys/dev/le/am79900reg.h#1 branch .. //depot/projects/hammer/sys/dev/le/am79900var.h#1 branch .. //depot/projects/hammer/sys/dev/le/am7990reg.h#1 branch .. //depot/projects/hammer/sys/dev/le/am7990var.h#1 branch .. //depot/projects/hammer/sys/dev/le/if_le_ledma.c#1 branch .. //depot/projects/hammer/sys/dev/le/if_le_pci.c#1 branch .. //depot/projects/hammer/sys/dev/le/lance.c#1 branch .. //depot/projects/hammer/sys/dev/le/lancereg.h#1 branch .. //depot/projects/hammer/sys/dev/le/lancevar.h#1 branch .. //depot/projects/hammer/sys/dev/lge/if_lge.c#31 integrate .. //depot/projects/hammer/sys/dev/md/md.c#57 integrate .. //depot/projects/hammer/sys/dev/mii/mii.c#13 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/fc_log.h#4 delete .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi.h#6 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_cnfg.h#6 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_ioc.h#6 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_type.h#7 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.c#11 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.h#8 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.h#3 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_debug.c#9 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#15 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/hammer/sys/dev/mse/mse.c#5 integrate .. //depot/projects/hammer/sys/dev/myri10ge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/hammer/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/hammer/sys/dev/myri10ge/if_myri10ge.c#1 branch .. //depot/projects/hammer/sys/dev/myri10ge/if_myri10ge_var.h#1 branch .. //depot/projects/hammer/sys/dev/myri10ge/mcp_gen_header.h#1 branch .. //depot/projects/hammer/sys/dev/myri10ge/myri10ge_mcp.h#1 branch .. //depot/projects/hammer/sys/dev/nge/if_nge.c#38 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#40 integrate .. //depot/projects/hammer/sys/dev/pcf/envctrl.c#5 integrate .. //depot/projects/hammer/sys/dev/pcf/pcf_ebus.c#4 integrate .. //depot/projects/hammer/sys/dev/pcf/pcf_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/ppbus/if_plip.c#14 integrate .. //depot/projects/hammer/sys/dev/ppbus/lpt.c#12 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppi.c#10 integrate .. //depot/projects/hammer/sys/dev/ppc/ppc.c#8 integrate .. //depot/projects/hammer/sys/dev/puc/puc.c#20 integrate .. //depot/projects/hammer/sys/dev/puc/puc_ebus.c#7 integrate .. //depot/projects/hammer/sys/dev/puc/puc_sbus.c#9 integrate .. //depot/projects/hammer/sys/dev/ral/if_ral.c#14 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#39 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#51 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn.c#25 integrate .. //depot/projects/hammer/sys/dev/sound/isa/mss.c#17 integrate .. //depot/projects/hammer/sys/dev/sound/pci/atiixp.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/hammer/sys/dev/sound/pci/csapcm.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#27 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#16 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio.c#10 integrate .. //depot/projects/hammer/sys/dev/sr/if_sr.c#19 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#37 integrate .. //depot/projects/hammer/sys/dev/tdfx/tdfx_linux.c#1 branch .. //depot/projects/hammer/sys/dev/tdfx/tdfx_pci.c#16 integrate .. //depot/projects/hammer/sys/dev/tx/if_tx.c#26 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus.h#9 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_ebus.c#9 integrate .. //depot/projects/hammer/sys/dev/uart/uart_core.c#12 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_sparc64.c#18 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_ns8250.c#10 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_sab82532.c#10 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_z8530.c#11 integrate .. //depot/projects/hammer/sys/dev/uart/uart_kbd_sun.c#7 integrate .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#19 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#28 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#27 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/if_udav.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/ohci.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/ohci_pci.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/ohcivar.h#10 integrate .. //depot/projects/hammer/sys/dev/usb/uhci.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/ukbd.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#37 integrate .. //depot/projects/hammer/sys/dev/usb/umct.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/uplcom.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/usb_port.h#17 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.h#6 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#69 integrate .. //depot/projects/hammer/sys/dev/usb/usbdivar.h#7 integrate .. //depot/projects/hammer/sys/dev/vge/if_vge.c#16 integrate .. //depot/projects/hammer/sys/dev/vkbd/vkbd.c#10 integrate .. //depot/projects/hammer/sys/fs/deadfs/dead_vnops.c#13 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#15 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#16 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#24 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_subr.c#15 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#20 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#23 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_ctl.c#11 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#21 integrate .. //depot/projects/hammer/sys/fs/udf/ecma167-udf.h#4 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#25 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#32 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.c#17 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.h#9 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli.c#7 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli.h#4 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli_ctl.c#4 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/hammer/sys/geom/eli/pkcs5v2.c#2 integrate .. //depot/projects/hammer/sys/geom/eli/pkcs5v2.h#2 integrate .. //depot/projects/hammer/sys/geom/gate/g_gate.c#14 integrate .. //depot/projects/hammer/sys/geom/gate/g_gate.h#4 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#34 integrate .. //depot/projects/hammer/sys/geom/geom_slice.c#22 integrate .. //depot/projects/hammer/sys/geom/geom_slice.h#9 integrate .. //depot/projects/hammer/sys/geom/geom_vfs.c#8 integrate .. //depot/projects/hammer/sys/geom/label/g_label.c#12 integrate .. //depot/projects/hammer/sys/geom/label/g_label.h#7 integrate .. //depot/projects/hammer/sys/geom/label/g_label_iso9660.c#4 integrate .. //depot/projects/hammer/sys/geom/label/g_label_msdosfs.c#3 integrate .. //depot/projects/hammer/sys/geom/label/g_label_ufs.c#5 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#28 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.h#9 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror_ctl.c#7 integrate .. //depot/projects/hammer/sys/geom/nop/g_nop.c#10 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#21 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.h#10 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3_ctl.c#9 integrate .. //depot/projects/hammer/sys/geom/shsec/g_shsec.c#5 integrate .. //depot/projects/hammer/sys/geom/shsec/g_shsec.h#4 integrate .. //depot/projects/hammer/sys/geom/stripe/g_stripe.c#15 integrate .. //depot/projects/hammer/sys/geom/stripe/g_stripe.h#8 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/hammer/sys/geom/zero/g_zero.c#4 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#84 integrate .. //depot/projects/hammer/sys/i386/conf/PAE#18 integrate .. //depot/projects/hammer/sys/i386/conf/XBOX#3 integrate .. //depot/projects/hammer/sys/i386/cpufreq/est.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/geode.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#31 integrate .. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#20 integrate .. //depot/projects/hammer/sys/i386/i386/io_apic.c#19 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#24 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#68 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#54 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#79 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#47 integrate .. //depot/projects/hammer/sys/i386/i386/tsc.c#8 integrate .. //depot/projects/hammer/sys/i386/ibcs2/Makefile#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_isc_syscall.h#6 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_isc_sysent.c#7 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#15 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_proto.h#8 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_syscall.h#8 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysent.c#10 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix.c#7 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix.h#6 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix_syscall.h#6 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix_sysent.c#7 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.isc#6 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.master#8 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.xenix#6 integrate .. //depot/projects/hammer/sys/i386/include/apicvar.h#17 integrate .. //depot/projects/hammer/sys/i386/include/intr_machdep.h#9 integrate .. //depot/projects/hammer/sys/i386/include/mptable.h#4 integrate .. //depot/projects/hammer/sys/i386/include/xbox.h#2 integrate .. //depot/projects/hammer/sys/i386/isa/atpic.c#18 integrate .. //depot/projects/hammer/sys/i386/linux/linux_machdep.c#19 integrate .. //depot/projects/hammer/sys/i386/linux/linux_proto.h#17 integrate .. //depot/projects/hammer/sys/i386/linux/linux_ptrace.c#11 integrate .. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#17 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#18 integrate .. //depot/projects/hammer/sys/i386/linux/syscalls.master#17 integrate .. //depot/projects/hammer/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/hammer/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/hammer/sys/ia64/conf/SKI#15 integrate .. //depot/projects/hammer/sys/ia64/ia32/ia32_trap.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#56 integrate .. //depot/projects/hammer/sys/ia64/ia64/mca.c#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#14 integrate .. //depot/projects/hammer/sys/ia64/ia64/trap.c#37 integrate .. //depot/projects/hammer/sys/isa/syscons_isa.c#11 integrate .. //depot/projects/hammer/sys/kern/init_main.c#38 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#54 integrate .. //depot/projects/hammer/sys/kern/kern_acct.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#33 integrate .. //depot/projects/hammer/sys/kern/kern_condvar.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_cpu.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#56 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#60 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#57 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#53 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_kthread.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_mbuf.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#53 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#26 integrate .. //depot/projects/hammer/sys/kern/kern_resource.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#39 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#69 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#53 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_tc.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#86 integrate .. //depot/projects/hammer/sys/kern/kern_time.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_timeout.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#21 integrate .. //depot/projects/hammer/sys/kern/subr_prf.c#24 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#20 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#34 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#36 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#52 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#52 integrate .. //depot/projects/hammer/sys/kern/tty_pts.c#2 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#32 integrate .. //depot/projects/hammer/sys/kern/uipc_domain.c#15 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#37 integrate .. //depot/projects/hammer/sys/kern/uipc_mqueue.c#5 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#64 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#53 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#43 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#66 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#16 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#20 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#68 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#100 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#57 integrate .. //depot/projects/hammer/sys/modules/3dfx/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/3dfx_linux/Makefile#1 branch .. //depot/projects/hammer/sys/modules/Makefile#96 integrate .. //depot/projects/hammer/sys/modules/arcnet/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/ce/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/coda5/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/crypto/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/de/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/dummynet/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/firewire/firewire/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/firewire/fwe/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/firewire/sbp/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/firewire/sbp_targ/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/if_ef/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/if_ppp/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/if_vlan/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/ipmi/Makefile#1 branch .. //depot/projects/hammer/sys/modules/kbdmux/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/le/Makefile#1 branch .. //depot/projects/hammer/sys/modules/myri10ge/Makefile#1 branch .. //depot/projects/hammer/sys/modules/myri10ge/myri10ge/Makefile#1 branch .. //depot/projects/hammer/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#1 branch .. //depot/projects/hammer/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#1 branch .. //depot/projects/hammer/sys/modules/netgraph/atm/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/bluetooth/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/bt3c/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/h4/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/ubt/Makefile#8 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/nfs4client/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/nfsclient/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/pf/Makefile#9 integrate .. //depot/projects/hammer/sys/modules/twa/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/uart/Makefile#9 integrate .. //depot/projects/hammer/sys/net/bridgestp.c#8 integrate .. //depot/projects/hammer/sys/net/if.c#61 integrate .. //depot/projects/hammer/sys/net/if.h#23 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#23 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#56 integrate .. //depot/projects/hammer/sys/net/if_gre.c#31 integrate .. //depot/projects/hammer/sys/net/if_media.c#7 integrate .. //depot/projects/hammer/sys/net/if_media.h#13 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#36 integrate .. //depot/projects/hammer/sys/net/pfil.c#9 integrate .. //depot/projects/hammer/sys/net/pfil.h#6 integrate .. //depot/projects/hammer/sys/net/ppp_deflate.c#5 integrate .. //depot/projects/hammer/sys/net/radix.c#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#23 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#28 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#23 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#24 integrate .. //depot/projects/hammer/sys/netgraph/netflow/ng_netflow.h#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#23 integrate .. //depot/projects/hammer/sys/netgraph/ng_ipfw.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_ipfw.h#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#21 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#32 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#38 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#36 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.h#15 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#27 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#27 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 5 02:22:21 2006 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 ADD7416A423; Sun, 5 Mar 2006 02:22:20 +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 871C016A420 for ; Sun, 5 Mar 2006 02:22:20 +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 3E8A943D48 for ; Sun, 5 Mar 2006 02:22:20 +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 k252MKJi007888 for ; Sun, 5 Mar 2006 02:22:20 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k252MJGg007885 for perforce@freebsd.org; Sun, 5 Mar 2006 02:22:19 GMT (envelope-from peter@freebsd.org) Date: Sun, 5 Mar 2006 02:22:19 GMT Message-Id: <200603050222.k252MJGg007885@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 92759 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, 05 Mar 2006 02:22:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=92759 Change 92759 by peter@peter_overcee on 2006/03/05 02:21:56 IFC @92754 Affected files ... .. //depot/projects/hammer/sys/modules/pflog/Makefile#4 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Mar 5 02:32:34 2006 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 271EC16A423; Sun, 5 Mar 2006 02:32: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 D9DF416A420 for ; Sun, 5 Mar 2006 02:32:33 +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 7538543D45 for ; Sun, 5 Mar 2006 02:32:33 +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 k252WXHT008391 for ; Sun, 5 Mar 2006 02:32:33 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 k252WXgk008388 for perforce@freebsd.org; Sun, 5 Mar 2006 02:32:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 02:32:33 GMT Message-Id: <200603050232.k252WXgk008388@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 92761 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, 05 Mar 2006 02:32:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=92761 Change 92761 by rwatson@rwatson_fledge on 2006/03/05 02:32:16 s/AU_NO_WRITE/AU_TO_NO_WRITE/ Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#2 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#24 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#20 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#1 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#2 $ .\" .Dd March 4, 2006 .Dt AU_OPEN 3 @@ -74,7 +74,7 @@ argument determines the behavior: a value of .Dv AU_TO_WRITE causes the record to be committed; a value of -.Dv AU_NO_WRITE +.Dv AU_TO_NO_WRITE causes it to be abandoned. When the audit record is committed, a BSM header will be inserted before tokens added to the record, using the event identifier passed via ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#24 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#23 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#24 $ */ #include @@ -280,7 +280,7 @@ return (-1); /* Invalid descriptor */ } - if (keep == AU_NO_WRITE) { + if (keep == AU_TO_NO_WRITE) { retval = 0; goto cleanup; } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#20 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#19 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#20 $ */ #ifdef __APPLE__ @@ -164,21 +164,21 @@ /* Save the event-specific token. */ if (misctok && au_write(aufd, misctok) == -1) { au_free_token(misctok); - (void)au_close(aufd, AU_NO_WRITE, event_code); + (void)au_close(aufd, AU_TO_NO_WRITE, event_code); syslog(LOG_ERR, "%s: write of caller token failed", func); return (kAUWriteCallerTokErr); } /* Tokenize and save the return value. */ if ((rettok = au_to_return32(retval, errcode)) == NULL) { - (void)au_close(aufd, AU_NO_WRITE, event_code); + (void)au_close(aufd, AU_TO_NO_WRITE, event_code); syslog(LOG_ERR, "%s: au_to_return32() failed", func); return (kAUMakeReturnTokErr); } if (au_write(aufd, rettok) == -1) { au_free_token(rettok); - (void)au_close(aufd, AU_NO_WRITE, event_code); + (void)au_close(aufd, AU_TO_NO_WRITE, event_code); syslog(LOG_ERR, "%s: write of return code failed", func); return (kAUWriteReturnTokErr); } From owner-p4-projects@FreeBSD.ORG Sun Mar 5 02:34:37 2006 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 E34E116A423; Sun, 5 Mar 2006 02:34: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 BC2E516A420 for ; Sun, 5 Mar 2006 02:34:36 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C95B43D45 for ; Sun, 5 Mar 2006 02:34:36 +0000 (GMT) (envelope-from kmacy@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 k252YaGI008475 for ; Sun, 5 Mar 2006 02:34:36 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k252Yax3008472 for perforce@freebsd.org; Sun, 5 Mar 2006 02:34:36 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 5 Mar 2006 02:34:36 GMT Message-Id: <200603050234.k252Yax3008472@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92762 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, 05 Mar 2006 02:34:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=92762 Change 92762 by kmacy@kmacy_storage:sun4v_work on 2006/03/05 02:34:18 remove unused code to simplify future additions Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#14 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#14 (text+ko) ==== @@ -766,443 +766,7 @@ .align 128 .endm -#ifdef notyet -/* SUN4V_FIXME */ -ENTRY(tl0_immu_miss_set_ref) - /* - * Set the reference bit. - */ - TTE_SET_REF(%g4, %g2, %g3) - - /* - * May have become invalid during casxa, in which case start over. - */ - brgez,pn %g2, 1f - nop - - /* - * Load the tte tag and data into the tlb and retry the instruction. - */ - stxa %g1, [%g0 + AA_IMMU_TAR] %asi - stxa %g2, [%g0] ASI_ITLB_DATA_IN_REG -1: retry -END(tl0_immu_miss_set_ref) - - -ENTRY(tl0_immu_miss_trap) - /* - * Put back the contents of the tag access register, in case we - * faulted. - */ - stxa %g1, [%g0 + AA_IMMU_TAR] %asi - membar #Sync - - /* - * Switch to alternate globals. - */ - LOAD_ALT - - /* - * Reload the tag access register. - */ - ldxa [%g0 + AA_IMMU_TAR] %asi, %g2 - - /* - * Save the tag access register, and call common trap code. - */ - tl0_split - clr %o1 - set trap, %o2 - mov %g2, %o3 - ba %xcc, tl0_utrap - mov T_INSTRUCTION_MISS, %o0 -END(tl0_immu_miss_trap) - - .macro tl0_dmmu_miss - /* - * Load the virtual page number and context from the tag access - * register. We ignore the context. - */ - wr %g0, ASI_DMMU, %asi - ldxa [%g0 + AA_DMMU_TAR] %asi, %g1 - - /* - * Initialize the page size walker. - */ -tl1_dmmu_miss_user: - mov TS_MIN, %g2 - - /* - * Loop over all supported page sizes. - */ - - /* - * Compute the page shift for the page size we are currently looking - * for. - */ -1: add %g2, %g2, %g3 - add %g3, %g2, %g3 - add %g3, PAGE_SHIFT, %g3 - - /* - * Extract the virtual page number from the contents of the tag - * access register. - */ - srlx %g1, %g3, %g3 - - /* - * Compute the tte bucket address. - */ - ldxa [%g0 + AA_DMMU_TSB] %asi, %g5 - and %g3, TSB_BUCKET_MASK, %g4 - sllx %g4, TSB_BUCKET_SHIFT + TTE_SHIFT, %g4 - add %g4, %g5, %g4 - - /* - * Compute the tte tag target. - */ - sllx %g3, TV_SIZE_BITS, %g3 - or %g3, %g2, %g3 - - /* - * Loop over the ttes in this bucket - */ - - /* - * Load the tte. Note that this instruction may fault, clobbering - * the contents of the tag access register, %g5, %g6, and %g7. We - * do not use %g5, and %g6 and %g7 are not used until this instruction - * completes successfully. - */ -2: ldda [%g4] ASI_NUCLEUS_QUAD_LDD, %g6 /*, %g7 */ - - /* - * Check that its valid and that the virtual page numbers match. - */ - brgez,pn %g7, 3f - cmp %g3, %g6 - bne,pn %xcc, 3f - EMPTY - - /* - * We matched a tte, load the tlb. - */ - - /* - * Set the reference bit, if it's currently clear. - */ - andcc %g7, TD_REF, %g0 - bz,a,pn %xcc, tl0_dmmu_miss_set_ref - nop - - /* - * Load the tte tag and data into the tlb and retry the instruction. - */ - stxa %g1, [%g0 + AA_DMMU_TAR] %asi - stxa %g7, [%g0] ASI_DTLB_DATA_IN_REG - retry - - /* - * Advance to the next tte in this bucket, and check the low bits - * of the bucket pointer to see if we've finished the bucket. - */ -3: add %g4, 1 << TTE_SHIFT, %g4 - andcc %g4, (1 << (TSB_BUCKET_SHIFT + TTE_SHIFT)) - 1, %g0 - bnz,pt %xcc, 2b - EMPTY - /* - * See if we just checked the largest page size, and advance to the - * next one if not. - */ - cmp %g2, TS_MAX - bne,pt %xcc, 1b - add %g2, 1, %g2 - - /* - * Not in user tsb, call c code. - */ - ba,a %xcc, tl0_dmmu_miss_trap - .align 128 - .endm - -ENTRY(tl0_dmmu_miss_set_ref) - /* - * Set the reference bit. - */ - TTE_SET_REF(%g4, %g2, %g3) - - /* - * May have become invalid during casxa, in which case start over. - */ - brgez,pn %g2, 1f - nop - - /* - * Load the tte tag and data into the tlb and retry the instruction. - */ - stxa %g1, [%g0 + AA_DMMU_TAR] %asi - stxa %g2, [%g0] ASI_DTLB_DATA_IN_REG -1: retry -END(tl0_dmmu_miss_set_ref) - -ENTRY(tl0_dmmu_miss_trap) - /* - * Put back the contents of the tag access register, in case we - * faulted. - */ - stxa %g1, [%g0 + AA_DMMU_TAR] %asi - membar #Sync - - /* - * Switch to alternate globals. - */ - LOAD_ALT - - /* - * Check if we actually came from the kernel. - */ - rdpr %tl, %g1 - cmp %g1, 1 - bgt,a,pn %xcc, 1f - nop - - /* - * Reload the tag access register. - */ - ldxa [%g0 + AA_DMMU_TAR] %asi, %g2 - - /* - * Save the tag access register and call common trap code. - */ - tl0_split - clr %o1 - set trap, %o2 - mov %g2, %o3 - ba %xcc, tl0_utrap - mov T_DATA_MISS, %o0 - - /* - * Handle faults during window spill/fill. - */ -1: RESUME_SPILLFILL_MMU - - /* - * Reload the tag access register. - */ - ldxa [%g0 + AA_DMMU_TAR] %asi, %g2 - - tl1_split - clr %o1 - set trap, %o2 - mov %g2, %o3 - ba %xcc, tl1_trap - mov T_DATA_MISS | T_KERNEL, %o0 -END(tl0_dmmu_miss_trap) - - .macro tl0_dmmu_prot - ba,a %xcc, tl0_dmmu_prot_1 - nop - .align 128 - .endm - -ENTRY(tl0_dmmu_prot_1) - /* - * Load the virtual page number and context from the tag access - * register. We ignore the context. - */ - wr %g0, ASI_DMMU, %asi - ldxa [%g0 + AA_DMMU_TAR] %asi, %g1 - - /* - * Initialize the page size walker. - */ -tl1_dmmu_prot_user: - mov TS_MIN, %g2 - - /* - * Loop over all supported page sizes. - */ - - /* - * Compute the page shift for the page size we are currently looking - * for. - */ -1: add %g2, %g2, %g3 - add %g3, %g2, %g3 - add %g3, PAGE_SHIFT, %g3 - - /* - * Extract the virtual page number from the contents of the tag - * access register. - */ - srlx %g1, %g3, %g3 - - /* - * Compute the tte bucket address. - */ - ldxa [%g0 + AA_DMMU_TSB] %asi, %g5 - and %g3, TSB_BUCKET_MASK, %g4 - sllx %g4, TSB_BUCKET_SHIFT + TTE_SHIFT, %g4 - add %g4, %g5, %g4 - - /* - * Compute the tte tag target. - */ - sllx %g3, TV_SIZE_BITS, %g3 - or %g3, %g2, %g3 - - /* - * Loop over the ttes in this bucket - */ - - /* - * Load the tte. Note that this instruction may fault, clobbering - * the contents of the tag access register, %g5, %g6, and %g7. We - * do not use %g5, and %g6 and %g7 are not used until this instruction - * completes successfully. - */ -2: ldda [%g4] ASI_NUCLEUS_QUAD_LDD, %g6 /*, %g7 */ - - /* - * Check that its valid and writable and that the virtual page - * numbers match. - */ - brgez,pn %g7, 4f - andcc %g7, TD_SW, %g0 - bz,pn %xcc, 4f - cmp %g3, %g6 - bne,pn %xcc, 4f - nop - - /* - * Set the hardware write bit. - */ - TTE_SET_W(%g4, %g2, %g3) - - /* - * Delete the old TLB entry and clear the sfsr. - */ - srlx %g1, PAGE_SHIFT, %g3 - sllx %g3, PAGE_SHIFT, %g3 - stxa %g0, [%g3] ASI_DMMU_DEMAP - stxa %g0, [%g0 + AA_DMMU_SFSR] %asi - membar #Sync - - /* - * May have become invalid during casxa, in which case start over. - */ - brgez,pn %g2, 3f - or %g2, TD_W, %g2 - - /* - * Load the tte data into the tlb and retry the instruction. - */ - stxa %g1, [%g0 + AA_DMMU_TAR] %asi - stxa %g2, [%g0] ASI_DTLB_DATA_IN_REG -3: retry - - /* - * Check the low bits to see if we've finished the bucket. - */ -4: add %g4, 1 << TTE_SHIFT, %g4 - andcc %g4, (1 << (TSB_BUCKET_SHIFT + TTE_SHIFT)) - 1, %g0 - bnz,pt %xcc, 2b - EMPTY - - /* - * See if we just checked the largest page size, and advance to the - * next one if not. - */ - cmp %g2, TS_MAX - bne,pt %xcc, 1b - add %g2, 1, %g2 - - /* - * Not in user tsb, call c code. - */ - ba,a %xcc, tl0_dmmu_prot_trap - nop -END(tl0_dmmu_prot_1) - -ENTRY(tl0_dmmu_prot_trap) - /* - * Put back the contents of the tag access register, in case we - * faulted. - */ - stxa %g1, [%g0 + AA_DMMU_TAR] %asi - membar #Sync - - /* - * Switch to alternate globals. - */ - LOAD_ALT - - /* - * Check if we actually came from the kernel. - */ - rdpr %tl, %g1 - cmp %g1, 1 - bgt,a,pn %xcc, 1f - nop - - /* - * Load the tar, sfar and sfsr. - */ - ldxa [%g0 + AA_DMMU_TAR] %asi, %g2 - ldxa [%g0 + AA_DMMU_SFAR] %asi, %g3 - ldxa [%g0 + AA_DMMU_SFSR] %asi, %g4 - stxa %g0, [%g0 + AA_DMMU_SFSR] %asi - membar #Sync - - /* - * Save the mmu registers and call common trap code. - */ - tl0_split - clr %o1 - set trap, %o2 - mov %g2, %o3 - mov %g3, %o4 - mov %g4, %o5 - ba %xcc, tl0_utrap - mov T_DATA_PROTECTION, %o0 - - /* - * Handle faults during window spill/fill. - */ -1: RESUME_SPILLFILL_MMU_CLR_SFSR - - /* - * Load the sfar, sfsr and tar. Clear the sfsr. - */ - ldxa [%g0 + AA_DMMU_TAR] %asi, %g2 - ldxa [%g0 + AA_DMMU_SFAR] %asi, %g3 - ldxa [%g0 + AA_DMMU_SFSR] %asi, %g4 - stxa %g0, [%g0 + AA_DMMU_SFSR] %asi - membar #Sync - - tl1_split - clr %o1 - set trap, %o2 - mov %g2, %o3 - mov %g3, %o4 - mov %g4, %o5 - ba %xcc, tl1_trap - mov T_DATA_PROTECTION | T_KERNEL, %o0 -END(tl0_dmmu_prot_trap) - -#endif /* notyet */ -ENTRY(tl0_sftrap) - rdpr %tstate, %g1 - and %g1, TSTATE_CWP_MASK, %g1 - wrpr %g1, 0, %cwp - tl0_split - clr %o1 - set trap, %o2 - ba %xcc, tl0_trap - mov %g2, %o0 -END(tl0_sftrap) - .macro tl0_spill_bad count .rept \count sir @@ -1252,449 +816,8 @@ .macro tl1_insn_excptn .align 32 .endm -#if 0 -ENTRY(tl1_insn_exceptn_trap) - tl1_split - clr %o1 - set trap, %o2 - mov %g3, %o4 - mov %g4, %o5 - ba %xcc, tl1_trap - mov %g2, %o0 -END(tl1_insn_exceptn_trap) - - .macro tl1_fp_disabled - ba,a %xcc, tl1_fp_disabled_1 - nop - .align 32 - .endm - -ENTRY(tl1_fp_disabled_1) - rdpr %tpc, %g1 - set fpu_fault_begin, %g2 - sub %g1, %g2, %g1 - cmp %g1, fpu_fault_size - bgeu,a,pn %xcc, 1f - nop - - GET_PCB(PCB_REG) - wr %g0, FPRS_FEF, %fprs - wr %g0, ASI_BLK_S, %asi - ldda [PCB_REG + PCB_KFP + (0 * 64)] %asi, %f0 - ldda [PCB_REG + PCB_KFP + (1 * 64)] %asi, %f16 - ldda [PCB_REG + PCB_KFP + (2 * 64)] %asi, %f32 - ldda [PCB_REG + PCB_KFP + (3 * 64)] %asi, %f48 - membar #Sync - retry - -1: tl1_split - clr %o1 - set trap, %o2 - ba %xcc, tl1_trap - mov T_FP_DISABLED | T_KERNEL, %o0 -END(tl1_fp_disabled_1) - - .macro tl1_data_excptn - LOAD_ALT - ba,a %xcc, tl1_data_excptn_trap - nop - .align 32 - .endm - -ENTRY(tl1_data_excptn_trap) - -END(tl1_data_excptn_trap) - - .macro tl1_align - ba,a %xcc, tl1_align_trap - nop - .align 32 - .endm - -ENTRY(tl1_align_trap) -END(tl1_data_excptn_trap) - -ENTRY(tl1_sfsr_trap) -END(tl1_sfsr_trap) -#endif - .macro tl1_intr level, mask - tl1_split - set \mask, %o1 - ba %xcc, tl1_intr - mov \level, %o0 - .align 32 - .endm - - .macro tl1_intr_level - INTR_LEVEL(1) - .endm -#ifdef notyet -/* SUN4V_FIXME */ - .macro tl1_immu_miss - /* - * Load the context and the virtual page number from the tag access - * register. We ignore the context. - */ - wr %g0, ASI_IMMU, %asi - ldxa [%g0 + AA_IMMU_TAR] %asi, %g5 - - /* - * Compute the address of the tte. The tsb mask and address of the - * tsb are patched at startup. - */ - .globl tl1_immu_miss_patch_1 -tl1_immu_miss_patch_1: - sethi %hi(TSB_KERNEL_MASK), %g6 - or %g6, %lo(TSB_KERNEL_MASK), %g6 - sethi %hi(TSB_KERNEL), %g7 - - srlx %g5, TAR_VPN_SHIFT, %g5 - and %g5, %g6, %g6 - sllx %g6, TTE_SHIFT, %g6 - add %g6, %g7, %g6 - - /* - * Load the tte. - */ - ldda [%g6] ASI_NUCLEUS_QUAD_LDD, %g6 /*, %g7 */ - - /* - * Check that its valid and executable and that the virtual page - * numbers match. - */ - brgez,pn %g7, tl1_immu_miss_trap - andcc %g7, TD_EXEC, %g0 - bz,pn %xcc, tl1_immu_miss_trap - srlx %g6, TV_SIZE_BITS, %g6 - cmp %g5, %g6 - bne,pn %xcc, tl1_immu_miss_trap - EMPTY - - /* - * Set the reference bit if its currently clear. - */ - andcc %g7, TD_REF, %g0 - bz,a,pn %xcc, tl1_immu_miss_set_ref - nop - - /* - * Load the tte data into the TLB and retry the instruction. - */ - stxa %g7, [%g0] ASI_ITLB_DATA_IN_REG - retry - .align 128 - .endm - -ENTRY(tl1_immu_miss_set_ref) - /* - * Recompute the tte address, which we clobbered loading the tte. The - * tsb mask and address of the tsb are patched at startup. - */ - .globl tl1_immu_miss_patch_2 -tl1_immu_miss_patch_2: - sethi %hi(TSB_KERNEL_MASK), %g6 - or %g6, %lo(TSB_KERNEL_MASK), %g6 - sethi %hi(TSB_KERNEL), %g7 - - and %g5, %g6, %g5 - sllx %g5, TTE_SHIFT, %g5 - add %g5, %g7, %g5 - - /* - * Set the reference bit. - */ - TTE_SET_REF(%g5, %g6, %g7) - - /* - * May have become invalid during casxa, in which case start over. - */ - brgez,pn %g6, 1f - nop - - /* - * Load the tte data into the TLB and retry the instruction. - */ - stxa %g6, [%g0] ASI_ITLB_DATA_IN_REG -1: retry -END(tl1_immu_miss_set_ref) - -ENTRY(tl1_immu_miss_trap) - /* - * Switch to alternate globals. - */ - LOAD_ALT - - ldxa [%g0 + AA_IMMU_TAR] %asi, %g2 - - tl1_split - clr %o1 - set trap, %o2 - mov %g2, %o3 - ba %xcc, tl1_trap - mov T_INSTRUCTION_MISS | T_KERNEL, %o0 -END(tl1_immu_miss_trap) - - .macro tl1_dmmu_miss - /* - * Load the context and the virtual page number from the tag access - * register. - */ - wr %g0, ASI_DMMU, %asi - ldxa [%g0 + AA_DMMU_TAR] %asi, %g5 - - /* - * Extract the context from the contents of the tag access register. - * If its non-zero this is a fault on a user address. Note that the - * faulting address is passed in %g1. - */ - sllx %g5, 64 - TAR_VPN_SHIFT, %g6 - brnz,a,pn %g6, tl1_dmmu_miss_user - mov %g5, %g1 - - /* - * Check for the direct mapped physical region. These addresses have - * the high bit set so they are negative. - */ - brlz,pn %g5, tl1_dmmu_miss_direct - EMPTY - - /* - * Compute the address of the tte. The tsb mask and address of the - * tsb are patched at startup. - */ - .globl tl1_dmmu_miss_patch_1 -tl1_dmmu_miss_patch_1: - sethi %hi(TSB_KERNEL_MASK), %g6 - or %g6, %lo(TSB_KERNEL_MASK), %g6 - sethi %hi(TSB_KERNEL), %g7 - - srlx %g5, TAR_VPN_SHIFT, %g5 - and %g5, %g6, %g6 - sllx %g6, TTE_SHIFT, %g6 - add %g6, %g7, %g6 - - /* - * Load the tte. - */ - ldda [%g6] ASI_NUCLEUS_QUAD_LDD, %g6 /*, %g7 */ - - /* - * Check that its valid and that the virtual page numbers match. - */ - brgez,pn %g7, tl1_dmmu_miss_trap - srlx %g6, TV_SIZE_BITS, %g6 - cmp %g5, %g6 - bne,pn %xcc, tl1_dmmu_miss_trap - EMPTY - - /* - * Set the reference bit if its currently clear. - */ - andcc %g7, TD_REF, %g0 - bz,a,pt %xcc, tl1_dmmu_miss_set_ref - nop - - /* - * Load the tte data into the TLB and retry the instruction. - */ - stxa %g7, [%g0] ASI_DTLB_DATA_IN_REG - retry - .align 128 - .endm - -ENTRY(tl1_dmmu_miss_set_ref) - /* - * Recompute the tte address, which we clobbered loading the tte. The - * tsb mask and address of the tsb are patched at startup. - */ - .globl tl1_dmmu_miss_patch_2 -tl1_dmmu_miss_patch_2: - sethi %hi(TSB_KERNEL_MASK), %g6 - or %g6, %lo(TSB_KERNEL_MASK), %g6 - sethi %hi(TSB_KERNEL), %g7 - - and %g5, %g6, %g5 - sllx %g5, TTE_SHIFT, %g5 - add %g5, %g7, %g5 - - /* - * Set the reference bit. - */ - TTE_SET_REF(%g5, %g6, %g7) - - /* - * May have become invalid during casxa, in which case start over. - */ - brgez,pn %g6, 1f - nop - /* - * Load the tte data into the TLB and retry the instruction. - */ - stxa %g6, [%g0] ASI_DTLB_DATA_IN_REG -1: retry -END(tl1_dmmu_miss_set_ref) -ENTRY(tl1_dmmu_miss_trap) - /* - * Switch to alternate globals. - */ - LOAD_ALT - - ldxa [%g0 + AA_DMMU_TAR] %asi, %g2 - - KSTACK_CHECK - - tl1_split - clr %o1 - set trap, %o2 - mov %g2, %o3 - ba %xcc, tl1_trap - mov T_DATA_MISS | T_KERNEL, %o0 -END(tl1_dmmu_miss_trap) - -ENTRY(tl1_dmmu_miss_direct) - /* - * Mask off the high bits of the virtual address to get the physical - * address, and or in the tte bits. The virtual address bits that - * correspond to the tte valid and page size bits are left set, so - * they don't have to be included in the tte bits below. We know they - * are set because the virtual address is in the upper va hole. - */ - setx TLB_DIRECT_TO_TTE_MASK, %g7, %g6 - and %g5, %g6, %g5 - or %g5, TD_CP | TD_CV | TD_W, %g5 - - /* - * Load the tte data into the TLB and retry the instruction. - */ - stxa %g5, [%g0] ASI_DTLB_DATA_IN_REG - retry -END(tl1_dmmu_miss_direct) - - .macro tl1_dmmu_prot - ba,a %xcc, tl1_dmmu_prot_1 - nop - .align 128 - .endm - -ENTRY(tl1_dmmu_prot_1) - /* - * Load the context and the virtual page number from the tag access - * register. - */ - wr %g0, ASI_DMMU, %asi - ldxa [%g0 + AA_DMMU_TAR] %asi, %g5 - - /* - * Extract the context from the contents of the tag access register. - * If its non-zero this is a fault on a user address. Note that the - * faulting address is passed in %g1. - */ - sllx %g5, 64 - TAR_VPN_SHIFT, %g6 - brnz,a,pn %g6, tl1_dmmu_prot_user - mov %g5, %g1 - - /* - * Compute the address of the tte. The tsb mask and address of the - * tsb are patched at startup. - */ - .globl tl1_dmmu_prot_patch_1 -tl1_dmmu_prot_patch_1: - sethi %hi(TSB_KERNEL_MASK), %g6 - or %g6, %lo(TSB_KERNEL_MASK), %g6 - sethi %hi(TSB_KERNEL), %g7 - - srlx %g5, TAR_VPN_SHIFT, %g5 - and %g5, %g6, %g6 - sllx %g6, TTE_SHIFT, %g6 - add %g6, %g7, %g6 - - /* - * Load the tte. - */ - ldda [%g6] ASI_NUCLEUS_QUAD_LDD, %g6 /*, %g7 */ - - /* - * Check that its valid and writeable and that the virtual page - * numbers match. - */ - brgez,pn %g7, tl1_dmmu_prot_trap - andcc %g7, TD_SW, %g0 - bz,pn %xcc, tl1_dmmu_prot_trap - srlx %g6, TV_SIZE_BITS, %g6 - cmp %g5, %g6 - bne,pn %xcc, tl1_dmmu_prot_trap - EMPTY - - /* - * Delete the old TLB entry and clear the sfsr. - */ - sllx %g5, TAR_VPN_SHIFT, %g6 - or %g6, TLB_DEMAP_NUCLEUS, %g6 - stxa %g0, [%g6] ASI_DMMU_DEMAP - stxa %g0, [%g0 + AA_DMMU_SFSR] %asi - membar #Sync - - /* - * Recompute the tte address, which we clobbered loading the tte. The - * tsb mask and address of the tsb are patched at startup. - */ - .globl tl1_dmmu_prot_patch_2 -tl1_dmmu_prot_patch_2: - sethi %hi(TSB_KERNEL_MASK), %g6 - or %g6, %lo(TSB_KERNEL_MASK), %g6 - sethi %hi(TSB_KERNEL), %g7 - - and %g5, %g6, %g5 - sllx %g5, TTE_SHIFT, %g5 - add %g5, %g7, %g5 - - /* - * Set the hardware write bit. - */ - TTE_SET_W(%g5, %g6, %g7) - - /* - * May have become invalid during casxa, in which case start over. - */ - brgez,pn %g6, 1f - or %g6, TD_W, %g6 - - /* - * Load the tte data into the TLB and retry the instruction. - */ - stxa %g6, [%g0] ASI_DTLB_DATA_IN_REG -1: retry -END(tl1_dmmu_prot_1) - -ENTRY(tl1_dmmu_prot_trap) - /* - * Switch to alternate globals. - */ - LOAD_ALT - - /* - * Load the sfar, sfsr and tar. Clear the sfsr. - */ - ldxa [%g0 + AA_DMMU_TAR] %asi, %g2 - ldxa [%g0 + AA_DMMU_SFAR] %asi, %g3 - ldxa [%g0 + AA_DMMU_SFSR] %asi, %g4 - stxa %g0, [%g0 + AA_DMMU_SFSR] %asi - membar #Sync - - tl1_split - clr %o1 - set trap, %o2 - mov %g2, %o3 - mov %g3, %o4 - mov %g4, %o5 - ba %xcc, tl1_trap - mov T_DATA_PROTECTION | T_KERNEL, %o0 -END(tl1_dmmu_prot_trap) -#endif /* notyet */ - - .macro tl1_soft count .rept \count tl1_gen T_SOFT | T_KERNEL @@ -1896,9 +1019,6 @@ tl1_reserved 256 .globl tl1_end tl1_end: -/* - * no discretionary traps at TL 1 - leaving us with a 24k trap table - */ spill_clean: sethi %hi(nwin_minus_one), %g5 @@ -1921,140 +1041,6 @@ -/* - * User trap entry point. - * - * void tl0_utrap(u_long type, u_long o1, u_long o2, u_long tar, u_long sfar, - * u_long sfsr) - * - * This handles redirecting a trap back to usermode as a user trap. The user - * program must have first registered a trap handler with the kernel using - * sysarch(SPARC_UTRAP_INSTALL). The trap handler is passed enough state - * for it to return to the trapping code directly, it will not return through - * the kernel. The trap type is passed in %o0, all out registers must be - * passed through to tl0_trap or to usermode untouched. Note that the - * parameters passed in out registers may be used by the user trap handler. - * Do not change the registers they are passed in or you will break the ABI. - * - * If the trap type allows user traps, setup state to execute the user trap - * handler and bounce back to usermode, otherwise branch to tl0_trap. - */ -#if 0 -ENTRY(tl0_utrap) - /* - * Check if the trap type allows user traps. - */ - cmp %o0, UT_MAX - bge,a,pt %xcc, tl0_trap - nop - - /* - * Load the user trap handler from the utrap table. - */ - ldx [PCPU(CURTHREAD)], %l0 - ldx [%l0 + TD_PROC], %l0 - ldx [%l0 + P_MD + MD_UTRAP], %l0 - brz,pt %l0, tl0_trap - sllx %o0, PTR_SHIFT, %l1 - ldx [%l0 + %l1], %l0 - brz,a,pt %l0, tl0_trap - nop - - /* - * If the save we did on entry to the kernel had to spill a window - * to the pcb, pretend we took a spill trap instead. Any windows - * that are in the pcb must be copied out or the fill handler will - * not be able to find them, since the user trap handler returns - * directly to the trapping code. Note that we only support precise - * user traps, which implies that the condition that caused the trap - * in the first place is still valid, so it will occur again when we - * re-execute the trapping instruction. - */ -#if 0 - ldx [PCB_REG + PCB_NSAVED], %l1 -#endif - brnz,a,pn %l1, tl0_trap - mov T_SPILL, %o0 - - /* - * Pass %fsr in %l4, %tstate in %l5, %tpc in %l6 and %tnpc in %l7. - * The ABI specifies only %l6 and %l7, but we need to pass %fsr or - * it may be clobbered by an interrupt before the user trap code - * can read it, and we must pass %tstate in order to restore %ccr - * and %asi. The %fsr must be stored to memory, so we use the - * temporary stack for that. - */ - rd %fprs, %l1 - or %l1, FPRS_FEF, %l2 - wr %l2, 0, %fprs -#if 0 - dec 8, ASP_REG - stx %fsr, [ASP_REG] - ldx [ASP_REG], %l4 - inc 8, ASP_REG -#endif - wr %l1, 0, %fprs - - rdpr %tstate, %l5 - rdpr %tpc, %l6 - rdpr %tnpc, %l7 - - /* - * Setup %tnpc to return to. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 5 02:42:48 2006 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 6BBB016A423; Sun, 5 Mar 2006 02:42:47 +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 3F9A616A420 for ; Sun, 5 Mar 2006 02:42:47 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF36343D45 for ; Sun, 5 Mar 2006 02:42:46 +0000 (GMT) (envelope-from kmacy@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 k252gkhH008785 for ; Sun, 5 Mar 2006 02:42:46 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k252gko0008782 for perforce@freebsd.org; Sun, 5 Mar 2006 02:42:46 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 5 Mar 2006 02:42:46 GMT Message-Id: <200603050242.k252gko0008782@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92763 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, 05 Mar 2006 02:42:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=92763 Change 92763 by kmacy@kmacy_storage:sun4v_work on 2006/03/05 02:42:39 remove last vestiges of original code Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#15 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#15 (text+ko) ==== @@ -1,34 +1,5 @@ /*- - * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Berkeley Software Design Inc's name may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL BERKELEY SOFTWARE DESIGN INC BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * BSDI $Id: locore.s,v 1.36.2.15 1999/08/23 22:34:41 cp Exp $ - */ -/*- - * Copyright (c) 2001 Jake Burkholder. + * Copyright (c) 2006 Kip Macy * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -51,10 +22,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + + + * $ Exp $ */ + #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/exception.S,v 1.71 2006/01/16 01:35:25 kris Exp $"); +__FBSDID("$$") #include "opt_compat.h" #include "opt_ddb.h" @@ -83,8 +59,6 @@ #endif #define REGSIZE 8 -#define TSB_KERNEL_MASK 0x0 -#define TSB_KERNEL 0x0 .register %g2,#ignore .register %g3,#ignore @@ -189,216 +163,6 @@ ldda [%g3 + %g1]asi, %i4 ;\ ldda [%g3 + %g2]asi, %i6 -#define ERRATUM50(reg) mov reg, reg - -#define KSTACK_SLOP 1024 - -/* - * Sanity check the kernel stack and bail out if its wrong. - * XXX: doesn't handle being on the panic stack. - */ -#define KSTACK_CHECK \ - dec 16, ASP_REG ; \ - stx %g1, [ASP_REG + 0] ; \ - stx %g2, [ASP_REG + 8] ; \ - add %sp, SPOFF, %g1 ; \ - andcc %g1, (1 << PTR_SHIFT) - 1, %g0 ; \ - bnz,a %xcc, tl1_kstack_fault ; \ - inc 16, ASP_REG ; \ - ldx [PCPU(CURTHREAD)], %g2 ; \ - ldx [%g2 + TD_KSTACK], %g2 ; \ - add %g2, KSTACK_SLOP, %g2 ; \ - subcc %g1, %g2, %g1 ; \ - ble,a %xcc, tl1_kstack_fault ; \ - inc 16, ASP_REG ; \ - set KSTACK_PAGES * PAGE_SIZE, %g2 ; \ - cmp %g1, %g2 ; \ - bgt,a %xcc, tl1_kstack_fault ; \ - inc 16, ASP_REG ; \ - ldx [ASP_REG + 8], %g2 ; \ - ldx [ASP_REG + 0], %g1 ; \ - inc 16, ASP_REG -#if 0 -ENTRY(tl1_kstack_fault) - rdpr %tl, %g1 -1: cmp %g1, 2 - be,a 2f - nop - -#if KTR_COMPILE & KTR_TRAP - CATR(KTR_TRAP, "tl1_kstack_fault: tl=%#lx tpc=%#lx tnpc=%#lx" - , %g2, %g3, %g4, 7, 8, 9) - rdpr %tl, %g3 - stx %g3, [%g2 + KTR_PARM1] - rdpr %tpc, %g3 - stx %g3, [%g2 + KTR_PARM1] - rdpr %tnpc, %g3 - stx %g3, [%g2 + KTR_PARM1] -9: -#endif - - sub %g1, 1, %g1 - wrpr %g1, 0, %tl - ba,a %xcc, 1b - nop - -2: -#if KTR_COMPILE & KTR_TRAP - CATR(KTR_TRAP, - "tl1_kstack_fault: sp=%#lx ks=%#lx cr=%#lx cs=%#lx ow=%#lx ws=%#lx" - , %g1, %g2, %g3, 7, 8, 9) - add %sp, SPOFF, %g2 - stx %g2, [%g1 + KTR_PARM1] - ldx [PCPU(CURTHREAD)], %g2 - ldx [%g2 + TD_KSTACK], %g2 - stx %g2, [%g1 + KTR_PARM2] - rdpr %canrestore, %g2 - stx %g2, [%g1 + KTR_PARM3] - rdpr %cansave, %g2 - stx %g2, [%g1 + KTR_PARM4] - rdpr %otherwin, %g2 - stx %g2, [%g1 + KTR_PARM5] - rdpr %wstate, %g2 - stx %g2, [%g1 + KTR_PARM6] -9: -#endif - - wrpr %g0, 0, %canrestore - wrpr %g0, 6, %cansave - wrpr %g0, 0, %otherwin - wrpr %g0, WSTATE_KERNEL, %wstate - - sub ASP_REG, SPOFF + CCFSZ, %sp - clr %fp - - set trap, %o2 - ba %xcc, tl1_trap - mov T_KSTACK_FAULT | T_KERNEL, %o0 -END(tl1_kstack_fault) -#endif - -/* - * Magic to resume from a spill or fill trap. If we get an alignment or an - * mmu fault during a spill or a fill, this macro will detect the fault and - * resume at a set instruction offset in the trap handler. - * - * To check if the previous trap was a spill/fill we convert the trapped pc - * to a trap type and verify that it is in the range of spill/fill vectors. - * The spill/fill vectors are types 0x80-0xff and 0x280-0x2ff, masking off the - * tl bit allows us to detect both ranges with one test. - * - * This is: - * 0x80 <= (((%tpc - %tba) >> 5) & ~0x200) < 0x100 - * - * To calculate the new pc we take advantage of the xor feature of wrpr. - * Forcing all the low bits of the trapped pc on we can produce any offset - * into the spill/fill vector. The size of a spill/fill trap vector is 0x80. - * - * 0x7f ^ 0x1f == 0x60 - * 0x1f == (0x80 - 0x60) - 1 - * - * Which are the offset and xor value used to resume from alignment faults. - */ - -/* - * Determine if we have trapped inside of a spill/fill vector, and if so resume - * at a fixed instruction offset in the trap vector. Must be called on - * alternate globals. - */ -#define RESUME_SPILLFILL_MAGIC(stxa_g0_sfsr, xor) \ - dec 16, ASP_REG ; \ - stx %g1, [ASP_REG + 0] ; \ - stx %g2, [ASP_REG + 8] ; \ - rdpr %tpc, %g1 ; \ - ERRATUM50(%g1) ; \ - rdpr %tba, %g2 ; \ - sub %g1, %g2, %g2 ; \ - srlx %g2, 5, %g2 ; \ - andn %g2, 0x200, %g2 ; \ - cmp %g2, 0x80 ; \ - blu,pt %xcc, 9f ; \ - cmp %g2, 0x100 ; \ - bgeu,pt %xcc, 9f ; \ - or %g1, 0x7f, %g1 ; \ - wrpr %g1, xor, %tnpc ; \ - stxa_g0_sfsr ; \ - ldx [ASP_REG + 8], %g2 ; \ - ldx [ASP_REG + 0], %g1 ; \ - inc 16, ASP_REG ; \ - done ; \ -9: ldx [ASP_REG + 8], %g2 ; \ - ldx [ASP_REG + 0], %g1 ; \ - inc 16, ASP_REG - -#define RSF_XOR(off) ((0x80 - off) - 1) - -/* - * Instruction offsets in spill and fill trap handlers for handling certain - * nested traps, and corresponding xor constants for wrpr. - */ -#define RSF_OFF_ALIGN 0x60 -#define RSF_OFF_MMU 0x70 - -#define RESUME_SPILLFILL_ALIGN \ - RESUME_SPILLFILL_MAGIC(RSF_CLR_SFSR, RSF_XOR(RSF_OFF_ALIGN)) -#define RESUME_SPILLFILL_MMU \ - RESUME_SPILLFILL_MAGIC(EMPTY, RSF_XOR(RSF_OFF_MMU)) -#define RESUME_SPILLFILL_MMU_CLR_SFSR \ - RESUME_SPILLFILL_MAGIC(RSF_CLR_SFSR, RSF_XOR(RSF_OFF_MMU)) - -/* - * Constant to add to %tnpc when taking a fill trap just before returning to - * user mode. - */ -#define RSF_FILL_INC tl0_ret_fill_end - tl0_ret_fill - -/* - * Retry a spill or fill with a different wstate due to an alignment fault. - * We may just be using the wrong stack offset. - */ -#define RSF_ALIGN_RETRY(ws) \ - wrpr %g0, (ws), %wstate ; \ - retry ; \ - .align 16 - - -ENTRY(rsf_fatal) -#if KTR_COMPILE & KTR_TRAP - CATR(KTR_TRAP, "rsf_fatal: bad window trap tt=%#lx type=%#lx" - , %g1, %g3, %g4, 7, 8, 9) - rdpr %tt, %g3 - stx %g3, [%g1 + KTR_PARM1] - stx %g2, [%g1 + KTR_PARM2] -9: -#endif -#if 0 - KSTACK_CHECK -#endif - sir -END(rsf_fatal) - - .comm intrnames, IV_NAMLEN - .comm eintrnames, 0 - - .comm intrcnt, IV_MAX * 8 - .comm eintrcnt, 0 - -/* - * Trap table and associated macros - * - * Due to its size a trap table is an inherently hard thing to represent in - * code in a clean way. There are approximately 1024 vectors, of 8 or 32 - * instructions each, many of which are identical. The way that this is - * layed out is the instructions (8 or 32) for the actual trap vector appear - * as an AS macro. In general this code branches to tl0_trap or tl1_trap, - * but if not supporting code can be placed just after the definition of the - * macro. The macros are then instantiated in a different section (.trap), - * which is setup to be placed by the linker at the beginning of .text, and the - * code around the macros is moved to the end of trap table. In this way the - * code that must be sequential in memory can be split up, and located near - * its supporting code so that it is easier to follow. - */ - /* * Clean window traps occur when %cleanwin is zero to ensure that data * is not leaked between address spaces in registers. @@ -433,7 +197,7 @@ .macro tl0_setup type tl0_split - ba %xcc, tl0_utrap + ba %xcc, tl0_trap mov \type, %g1 .endm @@ -1245,457 +1009,3 @@ END(tl0_trap) END(tl0_intr) -/* - * Initiate return to usermode. - * - * Called with a trapframe on the stack. The window that was setup in - * tl0_trap may have been used by "fast" trap handlers that pretend to be - * leaf functions, so all ins and locals may have been clobbered since - * then. - * - * This code is rather long and complicated. - */ -ENTRY(tl0_ret) - /* - * Check for pending asts atomically with returning. We must raise - * the pil before checking, and if no asts are found the pil must - * remain raised until the retry is executed, or we risk missing asts - * caused by interrupts occuring after the test. If the pil is lowered, - * as it is when we call ast, the check must be re-executed. - */ - wrpr %g0, PIL_TICK, %pil - ldx [PCPU(CURTHREAD)], %l0 - lduw [%l0 + TD_FLAGS], %l1 - set TDF_ASTPENDING | TDF_NEEDRESCHED, %l2 - and %l1, %l2, %l1 - brz,a,pt %l1, 1f - nop - - /* - * We have an ast. Re-enable interrupts and handle it, then restart - * the return sequence. - */ - wrpr %g0, 0, %pil - call ast - add %sp, CCFSZ + SPOFF, %o0 - ba,a %xcc, tl0_ret - nop - - /* - * Check for windows that were spilled to the pcb and need to be - * copied out. This must be the last thing that is done before the - * return to usermode. If there are still user windows in the cpu - * and we call a nested function after this, which causes them to be - * spilled to the pcb, they will not be copied out and the stack will - * be inconsistent. - */ -#if 0 -1: ldx [PCB_REG + PCB_NSAVED], %l1 -#endif - brz,a,pt %l1, 2f - nop - wrpr %g0, 0, %pil - mov T_SPILL, %o0 - stx %o0, [%sp + SPOFF + CCFSZ + TF_TYPE] - call trap - add %sp, SPOFF + CCFSZ, %o0 - ba,a %xcc, tl0_ret - nop - - /* - * Restore the out and most global registers from the trapframe. - * The ins will become the outs when we restore below. - */ -2: ldx [%sp + SPOFF + CCFSZ + TF_O0], %i0 - ldx [%sp + SPOFF + CCFSZ + TF_O1], %i1 - ldx [%sp + SPOFF + CCFSZ + TF_O2], %i2 - ldx [%sp + SPOFF + CCFSZ + TF_O3], %i3 - ldx [%sp + SPOFF + CCFSZ + TF_O4], %i4 - ldx [%sp + SPOFF + CCFSZ + TF_O5], %i5 - ldx [%sp + SPOFF + CCFSZ + TF_O6], %i6 - ldx [%sp + SPOFF + CCFSZ + TF_O7], %i7 - - ldx [%sp + SPOFF + CCFSZ + TF_G1], %g1 - ldx [%sp + SPOFF + CCFSZ + TF_G2], %g2 - ldx [%sp + SPOFF + CCFSZ + TF_G3], %g3 - ldx [%sp + SPOFF + CCFSZ + TF_G4], %g4 - ldx [%sp + SPOFF + CCFSZ + TF_G5], %g5 - - /* - * Load everything we need to restore below before disabling - * interrupts. - */ - ldx [%sp + SPOFF + CCFSZ + TF_FPRS], %l0 - ldx [%sp + SPOFF + CCFSZ + TF_GSR], %l1 - ldx [%sp + SPOFF + CCFSZ + TF_TNPC], %l2 - ldx [%sp + SPOFF + CCFSZ + TF_TPC], %l3 - ldx [%sp + SPOFF + CCFSZ + TF_TSTATE], %l4 - ldx [%sp + SPOFF + CCFSZ + TF_Y], %l5 - ldx [%sp + SPOFF + CCFSZ + TF_WSTATE], %l6 - - /* - * Disable interrupts to restore the special globals. They are not - * saved and restored for all kernel traps, so an interrupt at the - * wrong time would clobber them. - */ - wrpr %g0, PSTATE_NORMAL, %pstate - - ldx [%sp + SPOFF + CCFSZ + TF_G6], %g6 - ldx [%sp + SPOFF + CCFSZ + TF_G7], %g7 - - /* - * Switch to alternate globals. This frees up some registers we - * can use after the restore changes our window. - */ -#if 0 - LOAD_ALT -#endif - /* - * Drop %pil to zero. It must have been zero at the time of the - * trap, since we were in usermode, but it was raised above in - * order to check for asts atomically. We have interrupts disabled - * so any interrupts will not be serviced until we complete the - * return to usermode. - */ - wrpr %g0, 0, %pil - - /* - * Save %fprs in an alternate global so it can be restored after the - * restore instruction below. If we restore it before the restore, - * and the restore traps we may run for a while with floating point - * enabled in the kernel, which we want to avoid. - */ - mov %l0, %g1 - - /* - * Restore %fsr and %gsr. These need floating point enabled in %fprs, - * so we set it temporarily and then clear it. - */ - wr %g0, FPRS_FEF, %fprs - ldx [%sp + SPOFF + CCFSZ + TF_FSR], %fsr - wr %l1, 0, %gsr - wr %g0, 0, %fprs - - /* - * Restore program counters. This could be done after the restore - * but we're out of alternate globals to store them in... - */ - wrpr %l2, 0, %tnpc - wrpr %l3, 0, %tpc - - /* - * Save %tstate in an alternate global and clear the %cwp field. %cwp - * will be affected by the restore below and we need to make sure it - * points to the current window at that time, not the window that was - * active at the time of the trap. - */ - andn %l4, TSTATE_CWP_MASK, %g2 - - /* - * Restore %y. Could also be below if we had more alternate globals. - */ - wr %l5, 0, %y - - /* - * Setup %wstate for return. We need to restore the user window state - * which we saved in wstate.other when we trapped. We also need to - * set the transition bit so the restore will be handled specially - * if it traps, use the xor feature of wrpr to do that. - */ -#if 0 - srlx %l6, WSTATE_OTHER_SHIFT, %g3 - wrpr %g3, WSTATE_TRANSITION, %wstate -#endif - /* - * Setup window management registers for return. If not all user - * windows were spilled in the kernel %otherwin will be non-zero, - * so we need to transfer it to %canrestore to correctly restore - * those windows. Otherwise everything gets set to zero and the - * restore below will fill a window directly from the user stack. - */ - rdpr %otherwin, %o0 - wrpr %o0, 0, %canrestore - wrpr %g0, 0, %otherwin - wrpr %o0, 0, %cleanwin - - /* - * Now do the restore. If this instruction causes a fill trap which - * fails to fill a window from the user stack, we will resume at - * tl0_ret_fill_end and call back into the kernel. - */ - restore -tl0_ret_fill: - - /* - * We made it. We're back in the window that was active at the time - * of the trap, and ready to return to usermode. - */ - - /* - * Restore %frps. This was saved in an alternate global above. - */ - wr %g1, 0, %fprs - - /* - * Fixup %tstate so the saved %cwp points to the current window and - * restore it. - */ - rdpr %cwp, %g4 - wrpr %g2, %g4, %tstate - - /* - * Restore the user window state. The transition bit was set above - * for special handling of the restore, this clears it. - */ - wrpr %g3, 0, %wstate - -#if KTR_COMPILE & KTR_TRAP - CATR(KTR_TRAP, "tl0_ret: td=%#lx pil=%#lx pc=%#lx npc=%#lx sp=%#lx" - , %g2, %g3, %g4, 7, 8, 9) - ldx [PCPU(CURTHREAD)], %g3 - stx %g3, [%g2 + KTR_PARM1] - rdpr %pil, %g3 - stx %g3, [%g2 + KTR_PARM2] - rdpr %tpc, %g3 - stx %g3, [%g2 + KTR_PARM3] - rdpr %tnpc, %g3 - stx %g3, [%g2 + KTR_PARM4] - stx %sp, [%g2 + KTR_PARM5] -9: -#endif - - /* - * Return to usermode. - */ - retry -tl0_ret_fill_end: - -#if KTR_COMPILE & KTR_TRAP - CATR(KTR_TRAP, "tl0_ret: fill magic ps=%#lx ws=%#lx sp=%#lx" - , %l0, %l1, %l2, 7, 8, 9) - rdpr %pstate, %l1 - stx %l1, [%l0 + KTR_PARM1] - stx %l5, [%l0 + KTR_PARM2] - stx %sp, [%l0 + KTR_PARM3] -9: -#endif - - /* - * The restore above caused a fill trap and the fill handler was - * unable to fill a window from the user stack. The special fill - * handler recognized this and punted, sending us here. We need - * to carefully undo any state that was restored before the restore - * was executed and call trap again. Trap will copyin a window - * from the user stack which will fault in the page we need so the - * restore above will succeed when we try again. If this fails - * the process has trashed its stack, so we kill it. - */ - - /* - * Restore the kernel window state. This was saved in %l6 above, and - * since the restore failed we're back in the same window. - */ - wrpr %l6, 0, %wstate - - /* - * Restore the normal globals which have predefined values in the - * kernel. We clobbered them above restoring the user's globals - * so this is very important. - */ - GET_PCB(PCB_REG) - mov PCB_REG, %o0 - mov PCPU_REG, %o1 - wrpr %g0, PSTATE_NORMAL, %pstate - mov %o0, PCB_REG - mov %o1, PCPU_REG - wrpr %g0, PSTATE_KERNEL, %pstate - - /* - * Simulate a fill trap and then start the whole return sequence over - * again. This is special because it only copies in 1 window, not 2 - * as we would for a normal failed fill. This may be the first time - * the process has been run, so there may not be 2 windows worth of - * stack to copyin. - */ - mov T_FILL_RET, %o0 - stx %o0, [%sp + SPOFF + CCFSZ + TF_TYPE] - call trap - add %sp, SPOFF + CCFSZ, %o0 - ba,a %xcc, tl0_ret - nop -END(tl0_ret) - -/* - * Kernel trap entry point - * - * void tl1_trap(u_int type, u_long o1, u_long o2, u_long tar, u_long sfar, - * u_int sfsr) - * - * This is easy because the stack is already setup and the windows don't need - * to be split. We build a trapframe and call trap(), the same as above, but - * the outs don't need to be saved. - */ -ENTRY(tl1_trap) - rdpr %tstate, %l0 - rdpr %tpc, %l1 - rdpr %tnpc, %l2 - rdpr %pil, %l3 - rd %y, %l4 - rdpr %wstate, %l5 - -#if KTR_COMPILE & KTR_TRAP - CATR(KTR_TRAP, "tl1_trap: td=%p type=%#lx pil=%#lx pc=%#lx sp=%#lx" - , %g1, %g2, %g3, 7, 8, 9) - ldx [PCPU(CURTHREAD)], %g2 - stx %g2, [%g1 + KTR_PARM1] - stx %o0, [%g1 + KTR_PARM2] - stx %l3, [%g1 + KTR_PARM3] - stx %l1, [%g1 + KTR_PARM4] - stx %i6, [%g1 + KTR_PARM5] -9: -#endif - - wrpr %g0, 1, %tl -#if 0 - and %l5, WSTATE_OTHER_MASK, %l5 - wrpr %l5, WSTATE_KERNEL, %wstate -#endif - stx %o0, [%sp + SPOFF + CCFSZ + TF_TYPE] - stx %o1, [%sp + SPOFF + CCFSZ + TF_LEVEL] - stx %o3, [%sp + SPOFF + CCFSZ + TF_TAR] - stx %o4, [%sp + SPOFF + CCFSZ + TF_SFAR] - stx %o5, [%sp + SPOFF + CCFSZ + TF_SFSR] - - stx %l0, [%sp + SPOFF + CCFSZ + TF_TSTATE] - stx %l1, [%sp + SPOFF + CCFSZ + TF_TPC] - stx %l2, [%sp + SPOFF + CCFSZ + TF_TNPC] - stx %l3, [%sp + SPOFF + CCFSZ + TF_PIL] - stx %l4, [%sp + SPOFF + CCFSZ + TF_Y] - - mov PCB_REG, %l0 - mov PCPU_REG, %l1 - wrpr %g0, PSTATE_NORMAL, %pstate - - stx %g6, [%sp + SPOFF + CCFSZ + TF_G6] - stx %g7, [%sp + SPOFF + CCFSZ + TF_G7] - - mov %l0, PCB_REG - mov %l1, PCPU_REG - wrpr %g0, PSTATE_KERNEL, %pstate - - stx %i0, [%sp + SPOFF + CCFSZ + TF_O0] - stx %i1, [%sp + SPOFF + CCFSZ + TF_O1] - stx %i2, [%sp + SPOFF + CCFSZ + TF_O2] - stx %i3, [%sp + SPOFF + CCFSZ + TF_O3] - stx %i4, [%sp + SPOFF + CCFSZ + TF_O4] - stx %i5, [%sp + SPOFF + CCFSZ + TF_O5] - stx %i6, [%sp + SPOFF + CCFSZ + TF_O6] - stx %i7, [%sp + SPOFF + CCFSZ + TF_O7] - - stx %g1, [%sp + SPOFF + CCFSZ + TF_G1] - stx %g2, [%sp + SPOFF + CCFSZ + TF_G2] - stx %g3, [%sp + SPOFF + CCFSZ + TF_G3] - stx %g4, [%sp + SPOFF + CCFSZ + TF_G4] - stx %g5, [%sp + SPOFF + CCFSZ + TF_G5] - - set tl1_ret - 8, %o7 - jmpl %o2, %g0 - add %sp, CCFSZ + SPOFF, %o0 -END(tl1_trap) - -ENTRY(tl1_ret) - ldx [%sp + SPOFF + CCFSZ + TF_O0], %i0 - ldx [%sp + SPOFF + CCFSZ + TF_O1], %i1 - ldx [%sp + SPOFF + CCFSZ + TF_O2], %i2 - ldx [%sp + SPOFF + CCFSZ + TF_O3], %i3 - ldx [%sp + SPOFF + CCFSZ + TF_O4], %i4 - ldx [%sp + SPOFF + CCFSZ + TF_O5], %i5 - ldx [%sp + SPOFF + CCFSZ + TF_O6], %i6 - ldx [%sp + SPOFF + CCFSZ + TF_O7], %i7 - - ldx [%sp + SPOFF + CCFSZ + TF_G1], %g1 - ldx [%sp + SPOFF + CCFSZ + TF_G2], %g2 - ldx [%sp + SPOFF + CCFSZ + TF_G3], %g3 - ldx [%sp + SPOFF + CCFSZ + TF_G4], %g4 - ldx [%sp + SPOFF + CCFSZ + TF_G5], %g5 - - ldx [%sp + SPOFF + CCFSZ + TF_TSTATE], %l0 - ldx [%sp + SPOFF + CCFSZ + TF_TPC], %l1 - ldx [%sp + SPOFF + CCFSZ + TF_TNPC], %l2 - ldx [%sp + SPOFF + CCFSZ + TF_PIL], %l3 - ldx [%sp + SPOFF + CCFSZ + TF_Y], %l4 - - set VM_MIN_PROM_ADDRESS, %l5 - cmp %l1, %l5 - bl,a,pt %xcc, 1f - nop - - wrpr %g0, PSTATE_NORMAL, %pstate - - ldx [%sp + SPOFF + CCFSZ + TF_G6], %g6 - ldx [%sp + SPOFF + CCFSZ + TF_G7], %g7 - -1: -#if 0 - LOAD_ALT -#endif - andn %l0, TSTATE_CWP_MASK, %g1 - mov %l1, %g2 - mov %l2, %g3 - - wrpr %l3, 0, %pil - wr %l4, 0, %y - - restore - - wrpr %g0, 2, %tl - - rdpr %cwp, %g4 - wrpr %g1, %g4, %tstate - wrpr %g2, 0, %tpc - wrpr %g3, 0, %tnpc - -#if KTR_COMPILE & KTR_TRAP - CATR(KTR_TRAP, "tl1_ret: td=%#lx pil=%#lx ts=%#lx pc=%#lx sp=%#lx" - , %g2, %g3, %g4, 7, 8, 9) - ldx [PCPU(CURTHREAD)], %g3 - stx %g3, [%g2 + KTR_PARM1] - rdpr %pil, %g3 - stx %g3, [%g2 + KTR_PARM2] - rdpr %tstate, %g3 - stx %g3, [%g2 + KTR_PARM3] - rdpr %tpc, %g3 - stx %g3, [%g2 + KTR_PARM4] - stx %sp, [%g2 + KTR_PARM5] -9: -#endif - - retry -END(tl1_ret) - - -/* - * Freshly forked processes come here when switched to for the first time. - * The arguments to fork_exit() have been setup in the locals, we must move - * them to the outs. - */ -ENTRY(fork_trampoline) -#if KTR_COMPILE & KTR_PROC - CATR(KTR_PROC, "fork_trampoline: td=%p (%s) cwp=%#lx" - , %g1, %g2, %g3, 7, 8, 9) - ldx [PCPU(CURTHREAD)], %g2 - stx %g2, [%g1 + KTR_PARM1] - ldx [%g2 + TD_PROC], %g2 - add %g2, P_COMM, %g2 - stx %g2, [%g1 + KTR_PARM2] - rdpr %cwp, %g2 - stx %g2, [%g1 + KTR_PARM3] -9: -#endif - mov %l0, %o0 - mov %l1, %o1 - call fork_exit - mov %l2, %o2 - ba,a %xcc, tl0_ret - nop -END(fork_trampoline) From owner-p4-projects@FreeBSD.ORG Sun Mar 5 02:45:52 2006 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 8DEFB16A423; Sun, 5 Mar 2006 02:45: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 4CCEC16A420 for ; Sun, 5 Mar 2006 02:45:51 +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 15BEF43D45 for ; Sun, 5 Mar 2006 02:45:51 +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 k252jo7Z008959 for ; Sun, 5 Mar 2006 02:45:50 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 k252joHI008956 for perforce@freebsd.org; Sun, 5 Mar 2006 02:45:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 02:45:50 GMT Message-Id: <200603050245.k252joHI008956@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 92764 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, 05 Mar 2006 02:45:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=92764 Change 92764 by rwatson@rwatson_fledge on 2006/03/05 02:45:38 Add information on au_close() changes and au_open.3 to HISTORY. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#3 (text+ko) ==== @@ -1,3 +1,10 @@ +OpenBSM 1.0 alpha 6 + +- Use AU_TO_WRITE and AU_NO_TO_WRITE for the 'keep' argument to au_close(); + previously we used hard-coded 0 and 1 values. +- Add man page for au_open(), au_write(), au_close(), and + au_close_buffer(). + OpenBSM 1.0 alpha 5 - Update install notes to indicate /etc files are to be installed manually. @@ -124,4 +131,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#2 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#3 $ From owner-p4-projects@FreeBSD.ORG Sun Mar 5 03:07:20 2006 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 8BFC816A423; Sun, 5 Mar 2006 03:07:19 +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 2A52416A420 for ; Sun, 5 Mar 2006 03:07:19 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CAC0843D46 for ; Sun, 5 Mar 2006 03:07:18 +0000 (GMT) (envelope-from kmacy@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 k2537HsP009824 for ; Sun, 5 Mar 2006 03:07:18 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2537H9C009821 for perforce@freebsd.org; Sun, 5 Mar 2006 03:07:17 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 5 Mar 2006 03:07:17 GMT Message-Id: <200603050307.k2537H9C009821@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92765 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, 05 Mar 2006 03:07:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=92765 Change 92765 by kmacy@kmacy_storage:sun4v_work on 2006/03/05 03:06:50 suck back in bits required to make the linker happy Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#16 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#16 (text+ko) ==== @@ -267,10 +267,7 @@ .macro data_miss MAGIC_TRAP_ON - MAGIC_TRAP_ON - MAGIC_TRAP_ON - MAGIC_TRAP_ON - MAGIC_TRAP_ON + .align 32 .endm @@ -999,7 +996,7 @@ brlz,pt %g1, 1f nop wrpr %g0, %g1, %pil - +1: wrpr %g0, %g4, %tnpc rdpr %cwp, %l0 set TSTATE_KERNEL, %l1 @@ -1009,3 +1006,328 @@ END(tl0_trap) END(tl0_intr) + + +/* + * Freshly forked processes come here when switched to for the first time. + * The arguments to fork_exit() have been setup in the locals, we must move + * them to the outs. + */ +ENTRY(fork_trampoline) +#if KTR_COMPILE & KTR_PROC + CATR(KTR_PROC, "fork_trampoline: td=%p (%s) cwp=%#lx" + , %g1, %g2, %g3, 7, 8, 9) + ldx [PCPU(CURTHREAD)], %g2 + stx %g2, [%g1 + KTR_PARM1] + ldx [%g2 + TD_PROC], %g2 + add %g2, P_COMM, %g2 + stx %g2, [%g1 + KTR_PARM2] + rdpr %cwp, %g2 + stx %g2, [%g1 + KTR_PARM3] +9: +#endif + mov %l0, %o0 + mov %l1, %o1 + call fork_exit + mov %l2, %o2 + ba,a %xcc, tl0_ret + nop +END(fork_trampoline) + + + +/* + * The following code is all going to need to be re-written + * but is here to make the linker happy + * + */ + + .comm intrnames, IV_NAMLEN + .comm eintrnames, 0 + + .comm intrcnt, IV_MAX * 8 + .comm eintrcnt, 0 + + +ENTRY(tl1_trap) + illtrap +END(tl1_trap) +/* + * Initiate return to usermode. + * + * Called with a trapframe on the stack. The window that was setup in + * tl0_trap may have been used by "fast" trap handlers that pretend to be + * leaf functions, so all ins and locals may have been clobbered since + * then. + * + * This code is rather long and complicated. + */ +ENTRY(tl0_ret) + /* + * Check for pending asts atomically with returning. We must raise + * the pil before checking, and if no asts are found the pil must + * remain raised until the retry is executed, or we risk missing asts + * caused by interrupts occuring after the test. If the pil is lowered, + * as it is when we call ast, the check must be re-executed. + */ + wrpr %g0, PIL_TICK, %pil + ldx [PCPU(CURTHREAD)], %l0 + lduw [%l0 + TD_FLAGS], %l1 + set TDF_ASTPENDING | TDF_NEEDRESCHED, %l2 + and %l1, %l2, %l1 + brz,a,pt %l1, 1f + nop + + /* + * We have an ast. Re-enable interrupts and handle it, then restart + * the return sequence. + */ + wrpr %g0, 0, %pil + call ast + add %sp, CCFSZ + SPOFF, %o0 + ba,a %xcc, tl0_ret + nop + + /* + * Check for windows that were spilled to the pcb and need to be + * copied out. This must be the last thing that is done before the + * return to usermode. If there are still user windows in the cpu + * and we call a nested function after this, which causes them to be + * spilled to the pcb, they will not be copied out and the stack will + * be inconsistent. + */ +1: ldx [PCB_REG + PCB_NSAVED], %l1 + brz,a,pt %l1, 2f + nop + wrpr %g0, 0, %pil + mov T_SPILL, %o0 + stx %o0, [%sp + SPOFF + CCFSZ + TF_TYPE] + call trap + add %sp, SPOFF + CCFSZ, %o0 + ba,a %xcc, tl0_ret + nop + + /* + * Restore the out and most global registers from the trapframe. + * The ins will become the outs when we restore below. + */ +2: ldx [%sp + SPOFF + CCFSZ + TF_O0], %i0 + ldx [%sp + SPOFF + CCFSZ + TF_O1], %i1 + ldx [%sp + SPOFF + CCFSZ + TF_O2], %i2 + ldx [%sp + SPOFF + CCFSZ + TF_O3], %i3 + ldx [%sp + SPOFF + CCFSZ + TF_O4], %i4 + ldx [%sp + SPOFF + CCFSZ + TF_O5], %i5 + ldx [%sp + SPOFF + CCFSZ + TF_O6], %i6 + ldx [%sp + SPOFF + CCFSZ + TF_O7], %i7 + + ldx [%sp + SPOFF + CCFSZ + TF_G1], %g1 + ldx [%sp + SPOFF + CCFSZ + TF_G2], %g2 + ldx [%sp + SPOFF + CCFSZ + TF_G3], %g3 + ldx [%sp + SPOFF + CCFSZ + TF_G4], %g4 + ldx [%sp + SPOFF + CCFSZ + TF_G5], %g5 + + /* + * Load everything we need to restore below before disabling + * interrupts. + */ + ldx [%sp + SPOFF + CCFSZ + TF_FPRS], %l0 + ldx [%sp + SPOFF + CCFSZ + TF_GSR], %l1 + ldx [%sp + SPOFF + CCFSZ + TF_TNPC], %l2 + ldx [%sp + SPOFF + CCFSZ + TF_TPC], %l3 + ldx [%sp + SPOFF + CCFSZ + TF_TSTATE], %l4 + ldx [%sp + SPOFF + CCFSZ + TF_Y], %l5 + ldx [%sp + SPOFF + CCFSZ + TF_WSTATE], %l6 + + /* + * Disable interrupts to restore the special globals. They are not + * saved and restored for all kernel traps, so an interrupt at the + * wrong time would clobber them. + */ + wrpr %g0, PSTATE_NORMAL, %pstate + + ldx [%sp + SPOFF + CCFSZ + TF_G6], %g6 + ldx [%sp + SPOFF + CCFSZ + TF_G7], %g7 + +#if 0 + /* + * Switch to alternate globals. This frees up some registers we + * can use after the restore changes our window. + */ + wrpr %g0, PSTATE_ALT, %pstate +#endif + /* + * Drop %pil to zero. It must have been zero at the time of the + * trap, since we were in usermode, but it was raised above in + * order to check for asts atomically. We have interrupts disabled + * so any interrupts will not be serviced until we complete the + * return to usermode. + */ + wrpr %g0, 0, %pil + + /* + * Save %fprs in an alternate global so it can be restored after the + * restore instruction below. If we restore it before the restore, + * and the restore traps we may run for a while with floating point + * enabled in the kernel, which we want to avoid. + */ + mov %l0, %g1 + + /* + * Restore %fsr and %gsr. These need floating point enabled in %fprs, + * so we set it temporarily and then clear it. + */ + wr %g0, FPRS_FEF, %fprs + ldx [%sp + SPOFF + CCFSZ + TF_FSR], %fsr + wr %l1, 0, %gsr + wr %g0, 0, %fprs + + /* + * Restore program counters. This could be done after the restore + * but we're out of alternate globals to store them in... + */ + wrpr %l2, 0, %tnpc + wrpr %l3, 0, %tpc + + /* + * Save %tstate in an alternate global and clear the %cwp field. %cwp + * will be affected by the restore below and we need to make sure it + * points to the current window at that time, not the window that was + * active at the time of the trap. + */ + andn %l4, TSTATE_CWP_MASK, %g2 + + /* + * Restore %y. Could also be below if we had more alternate globals. + */ + wr %l5, 0, %y + + /* + * Setup %wstate for return. We need to restore the user window state + * which we saved in wstate.other when we trapped. We also need to + * set the transition bit so the restore will be handled specially + * if it traps, use the xor feature of wrpr to do that. + */ +#if 0 + srlx %l6, WSTATE_OTHER_SHIFT, %g3 + wrpr %g3, WSTATE_TRANSITION, %wstate +#endif + /* + * Setup window management registers for return. If not all user + * windows were spilled in the kernel %otherwin will be non-zero, + * so we need to transfer it to %canrestore to correctly restore + * those windows. Otherwise everything gets set to zero and the + * restore below will fill a window directly from the user stack. + */ + rdpr %otherwin, %o0 + wrpr %o0, 0, %canrestore + wrpr %g0, 0, %otherwin + wrpr %o0, 0, %cleanwin + + /* + * Now do the restore. If this instruction causes a fill trap which + * fails to fill a window from the user stack, we will resume at + * tl0_ret_fill_end and call back into the kernel. + */ + restore +tl0_ret_fill: + + /* + * We made it. We're back in the window that was active at the time + * of the trap, and ready to return to usermode. + */ + + /* + * Restore %frps. This was saved in an alternate global above. + */ + wr %g1, 0, %fprs + + /* + * Fixup %tstate so the saved %cwp points to the current window and + * restore it. + */ + rdpr %cwp, %g4 + wrpr %g2, %g4, %tstate + + /* + * Restore the user window state. The transition bit was set above + * for special handling of the restore, this clears it. + */ + wrpr %g3, 0, %wstate + +#if KTR_COMPILE & KTR_TRAP + CATR(KTR_TRAP, "tl0_ret: td=%#lx pil=%#lx pc=%#lx npc=%#lx sp=%#lx" + , %g2, %g3, %g4, 7, 8, 9) + ldx [PCPU(CURTHREAD)], %g3 + stx %g3, [%g2 + KTR_PARM1] + rdpr %pil, %g3 + stx %g3, [%g2 + KTR_PARM2] + rdpr %tpc, %g3 + stx %g3, [%g2 + KTR_PARM3] + rdpr %tnpc, %g3 + stx %g3, [%g2 + KTR_PARM4] + stx %sp, [%g2 + KTR_PARM5] +9: +#endif + + /* + * Return to usermode. + */ + retry +tl0_ret_fill_end: + +#if KTR_COMPILE & KTR_TRAP + CATR(KTR_TRAP, "tl0_ret: fill magic ps=%#lx ws=%#lx sp=%#lx" + , %l0, %l1, %l2, 7, 8, 9) + rdpr %pstate, %l1 + stx %l1, [%l0 + KTR_PARM1] + stx %l5, [%l0 + KTR_PARM2] + stx %sp, [%l0 + KTR_PARM3] +9: +#endif + + /* + * The restore above caused a fill trap and the fill handler was + * unable to fill a window from the user stack. The special fill + * handler recognized this and punted, sending us here. We need + * to carefully undo any state that was restored before the restore + * was executed and call trap again. Trap will copyin a window + * from the user stack which will fault in the page we need so the + * restore above will succeed when we try again. If this fails + * the process has trashed its stack, so we kill it. + */ + + /* + * Restore the kernel window state. This was saved in %l6 above, and + * since the restore failed we're back in the same window. + */ + wrpr %l6, 0, %wstate + +#if 0 + /* + * Restore the normal globals which have predefined values in the + * kernel. We clobbered them above restoring the user's globals + * so this is very important. + * XXX PSTATE_ALT must already be set. + */ + wrpr %g0, PSTATE_ALT, %pstate + mov PCPU_REG, %o1 + wrpr %g0, PSTATE_NORMAL, %pstate + mov %o0, PCB_REG + mov %o1, PCPU_REG + wrpr %g0, PSTATE_KERNEL, %pstate +#endif + /* + * Simulate a fill trap and then start the whole return sequence over + * again. This is special because it only copies in 1 window, not 2 + * as we would for a normal failed fill. This may be the first time + * the process has been run, so there may not be 2 windows worth of + * stack to copyin. + */ + mov T_FILL_RET, %o0 + stx %o0, [%sp + SPOFF + CCFSZ + TF_TYPE] + call trap + add %sp, SPOFF + CCFSZ, %o0 + ba,a %xcc, tl0_ret + nop +END(tl0_ret) + From owner-p4-projects@FreeBSD.ORG Sun Mar 5 04:37:08 2006 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 A635316A424; Sun, 5 Mar 2006 04:37:07 +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 2D27216A422 for ; Sun, 5 Mar 2006 04:37:07 +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 E418943D45 for ; Sun, 5 Mar 2006 04:37:06 +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 k254b6BV013236 for ; Sun, 5 Mar 2006 04:37:06 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k254b6Fi013233 for perforce@freebsd.org; Sun, 5 Mar 2006 04:37:06 GMT (envelope-from peter@freebsd.org) Date: Sun, 5 Mar 2006 04:37:06 GMT Message-Id: <200603050437.k254b6Fi013233@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 92766 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, 05 Mar 2006 04:37:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=92766 Change 92766 by peter@peter_overcee on 2006/03/05 04:36:50 Integ -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#46 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#47 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#66 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#151 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#116 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#89 integrate .. //depot/projects/hammer/sys/amd64/amd64/tsc.c#15 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#93 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#42 integrate .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#23 integrate .. //depot/projects/hammer/sys/amd64/include/mptable.h#11 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#56 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#46 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#47 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#66 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#151 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#116 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#89 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/tsc.c#15 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#93 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1217) +# (XXX from i386:NOTES,v 1.1220) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.51 2005/12/03 01:23:49 anholt Exp $ # @@ -171,11 +171,10 @@ # the tdfx DRI module from XFree86 and is completely unrelated. # # To enable Linuxulator support, one must also include COMPAT_LINUX in the -# config as well, or you will not have the dependencies. The other option -# is to load both as modules. +# config as well. The other option is to load both as modules. device tdfx # Enable 3Dfx Voodoo support -#XXX#options TDFX_LINUX # Enable Linuxulator support +#XXX#device tdfx_linux # Enable Linuxulator support # # ACPI support using the Intel ACPI Component Architecture reference @@ -281,6 +280,12 @@ device aac device aacp # SCSI Passthrough interface (optional, CAM required) +# The 'asr' driver provides support for current DPT/Adaptec SCSI RAID +# controllers (SmartRAID V and VI and later). +# These controllers require the CAM infrastructure. +# +device asr + # # Highpoint RocketRAID 182x. This is really just software RAID on a # Marvell SATA chip. ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#42 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#23 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/mptable.h#11 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#56 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Mar 5 06:09:06 2006 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 3999A16A423; Sun, 5 Mar 2006 06:09:06 +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 DE5E816A420 for ; Sun, 5 Mar 2006 06:09:05 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8152243D45 for ; Sun, 5 Mar 2006 06:09:05 +0000 (GMT) (envelope-from scottl@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 k25695WC023792 for ; Sun, 5 Mar 2006 06:09:05 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2568xDH023780 for perforce@freebsd.org; Sun, 5 Mar 2006 06:08:59 GMT (envelope-from scottl@freebsd.org) Date: Sun, 5 Mar 2006 06:08:59 GMT Message-Id: <200603050608.k2568xDH023780@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 92767 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, 05 Mar 2006 06:09:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=92767 Change 92767 by scottl@scottl-x64 on 2006/03/05 06:08:50 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/trap.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/io_apic.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/intr_machdep.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/mptable.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/atpic.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/trap.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/undefined.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pmap.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_aau.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_dma.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/loader.rc#3 branch .. //depot/projects/scottl-camlock/src/sys/bsm/audit.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.i386#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.pc98#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_throttle.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_linux.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ar/if_ar.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athvar.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ce/tau32-ddk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ce/tau32-ddk.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/de/dc21040reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/de/if_de.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/de/if_devar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_cbus.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc_acpi.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ic/z8530.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/kbd/kbd.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/le/am7990.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/le/am79900.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_cnfg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_ioc.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_type.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_debug.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mse/mse.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/myri10ge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/myri10ge/if_myri10ge.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/myri10ge/if_myri10ge_var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/myri10ge/mcp_gen_header.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/myri10ge/myri10ge_mcp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/pcf/envctrl.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pcf/pcf_ebus.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pcf/pcf_isa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/if_plip.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/lpt.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/ppi.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppc/ppc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc_ebus.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc_sbus.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sio/sio.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ich.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/feeder.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sr/if_sr.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/tdfx/tdfx_linux.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/tdfx/tdfx_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus_ebus.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_core.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_sab82532.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_z8530.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_kbd_sun.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_tty.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ehci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ohci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ukbd.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uplcom.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_port.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_quirks.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_subr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdivar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/vkbd/vkbd.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/deadfs/dead_vnops.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_devs.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nullfs/null_subr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs_ctl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_vnops.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_io.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_vfs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label_ufs.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/PAE#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/io_apic.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/apicvar.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/intr_machdep.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/mptable.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/xbox.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/atpic.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_ptrace.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/isa/syscons_isa.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/init_sysent.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_condvar.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_cpu.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exit.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_kse.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_kthread.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_malloc.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_resource.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_synch.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_tc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_time.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_timeout.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_prf.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_process.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/syscalls.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/syscalls.master#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_aio.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/modules/3dfx/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/3dfx_linux/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ce/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/coda5/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/crypto/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/de/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/modules/dummynet/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/if_ef/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/if_ppp/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/kbdmux/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/myri10ge/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/myri10ge/myri10ge/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/pflog/Makefile#3 branch .. //depot/projects/scottl-camlock/src/sys/modules/uart/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/net/bridgestp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/ppp_deflate.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ksocket.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_dummynet.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/mld6.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsock.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/opencrypto/crypto.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/opencrypto/cryptodev.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/cbus/fdc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/cbus/ppc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/cbus/sio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/NOTES#7 integrate .. //depot/projects/scottl-camlock/src/sys/pci/dc21040reg.h#2 delete .. //depot/projects/scottl-camlock/src/sys/pci/if_de.c#7 delete .. //depot/projects/scottl-camlock/src/sys/pci/if_devar.h#5 delete .. //depot/projects/scottl-camlock/src/sys/security/audit/audit.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_process.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/trap.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/_types.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/bio.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mount.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/proc.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/queue.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/serial.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/signalvar.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscall.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscall.mk#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscallsubr.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sysproto.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/timers.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/vnode.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_alloc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_extern.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_rawread.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_snapshot.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/softdep.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_quota.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufsmount.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_object.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vnode_pager.c#6 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/alpha/alpha/machdep.c#7 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.237 2006/02/14 14:50:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.238 2006/02/22 18:57:48 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -1756,6 +1756,8 @@ { struct iovec iov; struct uio uio; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); iov.iov_base = (caddr_t) v; iov.iov_len = sizeof(u_int32_t); uio.uio_iov = &iov; @@ -1773,6 +1775,8 @@ { struct iovec iov; struct uio uio; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); iov.iov_base = (caddr_t) &v; iov.iov_len = sizeof(u_int32_t); uio.uio_iov = &iov; @@ -1836,6 +1840,8 @@ static int ptrace_clear_bpt(struct thread *td, struct mdbpt *bpt) { + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); return ptrace_write_int(td, bpt->addr, bpt->contents); } @@ -1844,6 +1850,8 @@ { int error; u_int32_t bpins = 0x00000080; + + PROC_LOCK_ASSERT(td->td_proc, MA_NOTOWNED); error = ptrace_read_int(td, bpt->addr, &bpt->contents); if (error) return error; @@ -1853,12 +1861,20 @@ int ptrace_clear_single_step(struct thread *td) { + struct proc *p; + + p = td->td_proc; + PROC_LOCK_ASSERT(p, MA_OWNED); if (td->td_md.md_flags & MDTD_STEP2) { + PROC_UNLOCK(p); ptrace_clear_bpt(td, &td->td_md.md_sstep[1]); ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); + PROC_LOCK(p); td->td_md.md_flags &= ~MDTD_STEP2; } else if (td->td_md.md_flags & MDTD_STEP1) { + PROC_UNLOCK(p); ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); + PROC_LOCK(p); td->td_md.md_flags &= ~MDTD_STEP1; } return 0; @@ -1867,6 +1883,7 @@ int ptrace_single_step(struct thread *td) { + struct proc *p; int error; vm_offset_t pc = td->td_frame->tf_regs[FRAME_PC]; alpha_instruction ins; @@ -1876,9 +1893,11 @@ if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) panic("ptrace_single_step: step breakpoints not removed"); + p = td->td_proc; + PROC_UNLOCK(p); error = ptrace_read_int(td, pc, &ins.bits); if (error) - return (error); + goto out; switch (ins.branch_format.opcode) { @@ -1918,18 +1937,20 @@ td->td_md.md_sstep[0].addr = addr[0]; error = ptrace_set_bpt(td, &td->td_md.md_sstep[0]); if (error) - return (error); + goto out; if (count == 2) { td->td_md.md_sstep[1].addr = addr[1]; error = ptrace_set_bpt(td, &td->td_md.md_sstep[1]); if (error) { ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); - return (error); + goto out; } td->td_md.md_flags |= MDTD_STEP2; } else td->td_md.md_flags |= MDTD_STEP1; +out: + PROC_LOCK(p); return (error); } ==== //depot/projects/scottl-camlock/src/sys/alpha/alpha/trap.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.128 2006/02/08 08:09:14 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.129 2006/02/22 18:57:49 jhb Exp $"); /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" @@ -403,8 +403,12 @@ case ALPHA_IF_CODE_BUGCHK: if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) { mtx_lock(&Giant); + PROC_LOCK(p); + _PHOLD(p); ptrace_clear_single_step(td); td->td_frame->tf_regs[FRAME_PC] -= 4; + _PRELE(p); + PROC_UNLOCK(p); mtx_unlock(&Giant); } ucode = a0; /* trap type */ ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/intr_machdep.c#7 (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.18 2005/12/08 18:33:29 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.19 2006/02/28 22:24:54 jhb Exp $ */ /* @@ -63,6 +63,12 @@ static struct intsrc *interrupt_sources[NUM_IO_INTS]; static struct mtx intr_table_lock; +#ifdef SMP +static int assign_cpu; + +static void intr_assign_next_cpu(struct intsrc *isrc); +#endif + static void intr_init(void *__dummy); static void intrcnt_setname(const char *name, int index); static void intrcnt_updatename(struct intsrc *is); @@ -93,6 +99,7 @@ } intrcnt_register(isrc); interrupt_sources[vector] = isrc; + isrc->is_enabled = 0; mtx_unlock_spin(&intr_table_lock); return (0); } @@ -118,7 +125,17 @@ intr_priority(flags), flags, cookiep); if (error == 0) { intrcnt_updatename(isrc); - isrc->is_pic->pic_enable_intr(isrc); + mtx_lock_spin(&intr_table_lock); + if (!isrc->is_enabled) { + isrc->is_enabled = 1; +#ifdef SMP + if (assign_cpu) + intr_assign_next_cpu(isrc); +#endif + mtx_unlock_spin(&intr_table_lock); + isrc->is_pic->pic_enable_intr(isrc); + } else + mtx_unlock_spin(&intr_table_lock); isrc->is_pic->pic_enable_source(isrc); } return (error); @@ -335,3 +352,76 @@ db_dump_intr_event((*isrc)->is_event, verbose); } #endif + +#ifdef SMP +/* + * Support for balancing interrupt sources across CPUs. For now we just + * allocate CPUs round-robin. + */ + +static u_int cpu_apic_ids[MAXCPU]; +static int current_cpu, num_cpus; + +static void +intr_assign_next_cpu(struct intsrc *isrc) +{ + struct pic *pic; + u_int apic_id; + + /* + * Assign this source to a local APIC in a round-robin fashion. + */ + pic = isrc->is_pic; + apic_id = cpu_apic_ids[current_cpu]; + current_cpu++; + if (current_cpu >= num_cpus) + current_cpu = 0; + if (bootverbose) { + printf("INTR: Assigning IRQ %d", pic->pic_vector(isrc)); + printf(" to local APIC %u\n", apic_id); + } + pic->pic_assign_cpu(isrc, apic_id); +} + +/* + * Add a local APIC ID to our list of valid local APIC IDs that can + * be destinations of interrupts. + */ +void +intr_add_cpu(u_int apic_id) +{ + + if (bootverbose) + printf("INTR: Adding local APIC %d as a target\n", apic_id); + if (num_cpus >= MAXCPU) + panic("WARNING: Local APIC IDs exhausted!"); + cpu_apic_ids[num_cpus] = apic_id; + num_cpus++; +} + +/* + * Distribute all the interrupt sources among the available CPUs once the + * AP's have been launched. + */ +static void +intr_shuffle_irqs(void *arg __unused) +{ + struct intsrc *isrc; + int i; + + /* Don't bother on UP. */ + if (num_cpus <= 1) + return; + + /* Round-robin assign each enabled source a CPU. */ + mtx_lock_spin(&intr_table_lock); + assign_cpu = 1; + for (i = 0; i < NUM_IO_INTS; i++) { + isrc = interrupt_sources[i]; + if (isrc != NULL && isrc->is_enabled) + intr_assign_next_cpu(isrc); + } + mtx_unlock_spin(&intr_table_lock); +} +SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs, NULL) +#endif ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/io_apic.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.20 2005/11/16 20:29:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.21 2006/02/28 22:24:54 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -61,8 +61,6 @@ #define IRQ_SMI (NUM_IO_INTS + 3) #define IRQ_DISABLED (NUM_IO_INTS + 4) -#define DEST_NONE -1 - #define TODO printf("%s: not implemented!\n", __func__) static MALLOC_DEFINE(M_IOAPIC, "io_apic", "I/O APIC structures"); @@ -82,10 +80,10 @@ u_int io_irq; u_int io_intpin:8; u_int io_vector:8; + u_int io_cpu:8; u_int io_activehi:1; u_int io_edgetrigger:1; u_int io_masked:1; - int io_dest:5; int io_bus:4; }; @@ -114,7 +112,7 @@ enum intr_polarity pol); static void ioapic_suspend(struct intsrc *isrc); static void ioapic_resume(struct intsrc *isrc); -static void ioapic_program_destination(struct ioapic_intsrc *intpin); +static void ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id); static void ioapic_program_intpin(struct ioapic_intsrc *intpin); static STAILQ_HEAD(,ioapic) ioapic_list = STAILQ_HEAD_INITIALIZER(ioapic_list); @@ -122,10 +120,10 @@ ioapic_eoi_source, ioapic_enable_intr, ioapic_vector, ioapic_source_pending, ioapic_suspend, ioapic_resume, - ioapic_config_intr }; - -static int bsp_id, current_cluster, logical_clusters, next_ioapic_base; -static u_int next_id, program_logical_dest; + ioapic_config_intr, ioapic_assign_cpu }; + +static int next_ioapic_base; +static u_int next_id; SYSCTL_NODE(_hw, OID_AUTO, apic, CTLFLAG_RD, 0, "APIC options"); static int enable_extint; @@ -273,14 +271,8 @@ } /* Set the destination. */ - if (intpin->io_dest == DEST_NONE) { - low = IOART_DESTPHY; - high = bsp_id << APIC_ID_SHIFT; - } else { - low = IOART_DESTLOG; - high = (intpin->io_dest << APIC_ID_CLUSTER_SHIFT | - APIC_ID_CLUSTER_ID) << APIC_ID_SHIFT; - } + low = IOART_DESTPHY; + high = intpin->io_cpu << APIC_ID_SHIFT; /* Program the rest of the low word. */ if (intpin->io_edgetrigger) @@ -312,7 +304,7 @@ default: KASSERT(intpin->io_vector != 0, ("No vector for IRQ %u", intpin->io_irq)); - low |= IOART_DELLOPRI | intpin->io_vector; + low |= IOART_DELFIXED | intpin->io_vector; } /* Write the values to the APIC. */ @@ -325,60 +317,31 @@ mtx_unlock_spin(&icu_lock); } -/* - * Program an individual intpin's logical destination. - */ static void -ioapic_program_destination(struct ioapic_intsrc *intpin) +ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id) { - struct ioapic *io = (struct ioapic *)intpin->io_intsrc.is_pic; + struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; + struct ioapic *io = (struct ioapic *)isrc->is_pic; - KASSERT(intpin->io_dest != DEST_NONE, - ("intpin not assigned to a cluster")); + intpin->io_cpu = apic_id; if (bootverbose) { - printf("ioapic%u: routing intpin %u (", io->io_id, - intpin->io_intpin); + printf("ioapic%u: Assigning ", io->io_id); ioapic_print_irq(intpin); - printf(") to cluster %u\n", intpin->io_dest); + printf(" to local APIC %u\n", intpin->io_cpu); } ioapic_program_intpin(intpin); } static void -ioapic_assign_cluster(struct ioapic_intsrc *intpin) -{ - - /* - * Assign this intpin to a logical APIC cluster in a - * round-robin fashion. We don't actually use the logical - * destination for this intpin until after all the CPU's - * have been started so that we don't end up with interrupts - * that don't go anywhere. Another alternative might be to - * start up the CPU's earlier so that they can handle interrupts - * sooner. - */ - intpin->io_dest = current_cluster; - current_cluster++; - if (current_cluster >= logical_clusters) - current_cluster = 0; - if (program_logical_dest) - ioapic_program_destination(intpin); -} - -static void ioapic_enable_intr(struct intsrc *isrc) { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; struct ioapic *io = (struct ioapic *)isrc->is_pic; - if (intpin->io_dest == DEST_NONE) { + if (intpin->io_vector == 0) { /* * Allocate an APIC vector for this interrupt pin. Once - * we have a vector we program the interrupt pin. Note - * that after we have booted ioapic_assign_cluster() - * will program the interrupt pin again, but it doesn't - * hurt to do that and trying to avoid that adds needless - * complication. + * we have a vector we program the interrupt pin. */ intpin->io_vector = apic_alloc_vector(intpin->io_irq); if (bootverbose) { @@ -388,7 +351,6 @@ printf(") to vector %u\n", intpin->io_vector); } ioapic_program_intpin(intpin); - ioapic_assign_cluster(intpin); apic_enable_vector(intpin->io_vector); } } @@ -469,22 +431,6 @@ } /* - * Allocate and return a logical cluster ID. Note that the first time - * this is called, it returns cluster 0. ioapic_enable_intr() treats - * the two cases of logical_clusters == 0 and logical_clusters == 1 the - * same: one cluster of ID 0 exists. The logical_clusters == 0 case is - * for UP kernels, which should never call this function. - */ -int -ioapic_next_logical_cluster(void) -{ - - if (logical_clusters >= APIC_MAX_CLUSTER) - panic("WARNING: Local APIC cluster IDs exhausted!"); - return (logical_clusters++); -} - -/* * Create a plain I/O APIC object. */ void * @@ -568,11 +514,10 @@ } /* - * Route interrupts to the BSP by default using physical - * addressing. Vectored interrupts get readdressed using - * logical IDs to CPU clusters when they are enabled. + * Route interrupts to the BSP by default. Interrupts may + * be routed to other CPUs later after they are enabled. */ - intpin->io_dest = DEST_NONE; + intpin->io_cpu = PCPU_GET(apic_id); if (bootverbose && intpin->io_irq != IRQ_DISABLED) { printf("ioapic%u: intpin %d -> ", io->io_id, i); ioapic_print_irq(intpin); @@ -778,29 +723,9 @@ printf("ioapic%u irqs %u-%u on motherboard\n", io->io_id, flags >> 4, flags & 0xf, io->io_intbase, io->io_intbase + io->io_numintr - 1); - bsp_id = PCPU_GET(apic_id); /* Register valid pins as interrupt sources. */ for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++) if (pin->io_irq < NUM_IO_INTS) intr_register_source(&pin->io_intsrc); } - -/* - * Program all the intpins to use logical destinations once the AP's - * have been launched. - */ -static void -ioapic_set_logical_destinations(void *arg __unused) -{ - struct ioapic *io; - int i; - - program_logical_dest = 1; - STAILQ_FOREACH(io, &ioapic_list, io_next) - for (i = 0; i < io->io_numintr; i++) - if (io->io_pins[i].io_dest != DEST_NONE) - ioapic_program_destination(&io->io_pins[i]); -} -SYSINIT(ioapic_destinations, SI_SUB_SMP, SI_ORDER_SECOND, - ioapic_set_logical_destinations, NULL) ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.23 2005/12/22 22:16:05 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.24 2006/02/28 22:24:54 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -217,6 +217,7 @@ /* Set BSP's per-CPU local APIC ID. */ PCPU_SET(apic_id, lapic_id()); + intr_add_cpu(PCPU_GET(apic_id)); /* Local APIC timer interrupt. */ setidt(APIC_TIMER_INT, IDTVEC(timerint), SDT_SYSIGT, SEL_KPL, 0); @@ -279,7 +280,7 @@ lapic_setup(void) { struct lapic *la; - u_int32_t value, maxlvt; + u_int32_t maxlvt; register_t eflags; char buf[MAXCOMLEN + 1]; @@ -291,19 +292,6 @@ /* Initialize the TPR to allow all interrupts. */ lapic_set_tpr(0); - /* Use the cluster model for logical IDs. */ - value = lapic->dfr; - value &= ~APIC_DFR_MODEL_MASK; - value |= APIC_DFR_MODEL_CLUSTER; - lapic->dfr = value; - - /* Set this APIC's logical ID. */ - value = lapic->ldr; - value &= ~APIC_ID_MASK; - value |= (la->la_cluster << APIC_ID_CLUSTER_SHIFT | - 1 << la->la_cluster_id) << APIC_ID_SHIFT; - lapic->ldr = value; - /* Setup spurious vector and enable the local APIC. */ lapic_enable(); ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.268 2006/02/07 21:22:01 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.269 2006/02/28 22:24:54 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -160,7 +160,7 @@ static u_int boot_address; -static void set_logical_apic_ids(void); +static void set_interrupt_apic_ids(void); static int start_all_aps(void); static int start_ap(int apic_id); static void release_aps(void *dummy); @@ -405,7 +405,7 @@ hyperthreading_cpus = logical_cpus; } - set_logical_apic_ids(); + set_interrupt_apic_ids(); } @@ -596,33 +596,29 @@ */ /* - * Set the APIC logical IDs. - * - * We want to cluster logical CPU's within the same APIC ID cluster. - * Since logical CPU's are aligned simply filling in the clusters in - * APIC ID order works fine. Note that this does not try to balance - * the number of CPU's in each cluster. (XXX?) + * We tell the I/O APIC code about all the CPUs we want to receive + * interrupts. If we don't want certain CPUs to receive IRQs we + * can simply not tell the I/O APIC code about them in this function. + * We also do not tell it about the BSP since it tells itself about + * the BSP internally to work with UP kernels and on UP machines. */ static void -set_logical_apic_ids(void) +set_interrupt_apic_ids(void) { - u_int apic_id, cluster, cluster_id; + u_int apic_id; - /* Force us to allocate cluster 0 at the start. */ - cluster = -1; - cluster_id = APIC_MAX_INTRACLUSTER_ID; for (apic_id = 0; apic_id < MAXCPU; apic_id++) { if (!cpu_info[apic_id].cpu_present) continue; - if (cluster_id == APIC_MAX_INTRACLUSTER_ID) { - cluster = ioapic_next_logical_cluster(); - cluster_id = 0; - } else - cluster_id++; - if (bootverbose) - printf("APIC ID: physical %u, logical %u:%u\n", - apic_id, cluster, cluster_id); - lapic_set_logical_id(apic_id, cluster, cluster_id); + if (cpu_info[apic_id].cpu_bsp) + continue; +#if 0 + /* Don't let hyperthreads service interrupts. */ + if (hyperthreading_cpus > 1 && + apic_id % hyperthreading_cpus != 0) + continue; +#endif + intr_add_cpu(apic_id); } } ==== //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#7 (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/include/apicvar.h,v 1.16 2005/12/22 22:16:05 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.17 2006/02/28 22:24:54 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -181,7 +181,6 @@ void *ioapic_create(uintptr_t addr, int32_t id, int intbase); int ioapic_disable_pin(void *cookie, u_int pin); int ioapic_get_vector(void *cookie, u_int pin); -int ioapic_next_logical_cluster(void); void ioapic_register(void *cookie); int ioapic_remap_vector(void *cookie, u_int pin, int vector); int ioapic_set_bus(void *cookie, u_int pin, int bus_type); ==== //depot/projects/scottl-camlock/src/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.8 2005/12/08 18:33:30 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.9 2006/02/28 22:24:54 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -85,6 +85,7 @@ void (*pic_resume)(struct intsrc *); int (*pic_config_intr)(struct intsrc *, enum intr_trigger, enum intr_polarity); + void (*pic_assign_cpu)(struct intsrc *, u_int apic_id); }; /* Flags for pic_disable_source() */ @@ -105,6 +106,7 @@ u_long *is_count; u_long *is_straycount; u_int is_index; + u_int is_enabled:1; }; struct trapframe; @@ -117,6 +119,11 @@ enum intr_trigger elcr_read_trigger(u_int irq); void elcr_resume(void); void elcr_write_trigger(u_int irq, enum intr_trigger trigger); +#ifdef SMP +void intr_add_cpu(u_int apic_id); +#else +#define intr_add_cpu(apic_id) +#endif int intr_add_handler(const char *name, int vector, driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep); int intr_config_intr(int vector, enum intr_trigger trig, ==== //depot/projects/scottl-camlock/src/sys/amd64/include/mptable.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/mptable.h,v 1.222 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/mptable.h,v 1.223 2006/03/01 05:59:56 sam Exp $ */ #ifndef __MACHINE_MPTABLE_H__ @@ -139,7 +139,8 @@ char name[16]; } basetable_entry; +#ifdef _KERNEL int mptable_pci_probe_table(int bus); int mptable_pci_route_interrupt(device_t pcib, device_t dev, int pin); - +#endif #endif /* !__MACHINE_MPTABLE_H__ */ ==== //depot/projects/scottl-camlock/src/sys/amd64/isa/atpic.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.18 2005/12/08 18:33:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.19 2006/02/28 22:24:54 jhb Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -108,8 +108,8 @@ #define ATPIC(io, base, eoi, imenptr) \ { { atpic_enable_source, atpic_disable_source, (eoi), \ atpic_enable_intr, atpic_vector, atpic_source_pending, NULL, \ - atpic_resume, atpic_config_intr }, (io), (base), \ - IDT_IO_INTS + (base), (imenptr) } + atpic_resume, atpic_config_intr, atpic_assign_cpu }, (io), \ + (base), IDT_IO_INTS + (base), (imenptr) } #define INTSRC(irq) \ { { &atpics[(irq) / 8].at_pic }, IDTVEC(atpic_intr ## irq ), \ @@ -142,6 +142,7 @@ static int atpic_source_pending(struct intsrc *isrc); static int atpic_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); +static void atpic_assign_cpu(struct intsrc *isrc, u_int apic_id); static void i8259_init(struct atpic *pic, int slave); static struct atpic atpics[] = { @@ -353,6 +354,17 @@ } static void >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 5 09:26:08 2006 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 6CD8416A423; Sun, 5 Mar 2006 09:26:07 +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 25EB916A420 for ; Sun, 5 Mar 2006 09:26:07 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE52E43D46 for ; Sun, 5 Mar 2006 09:26:06 +0000 (GMT) (envelope-from soc-andrew@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 k259Q6kt038426 for ; Sun, 5 Mar 2006 09:26:06 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k259Q6hf038423 for perforce@freebsd.org; Sun, 5 Mar 2006 09:26:06 GMT (envelope-from soc-andrew@freebsd.org) Date: Sun, 5 Mar 2006 09:26:06 GMT Message-Id: <200603050926.k259Q6hf038423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 92769 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, 05 Mar 2006 09:26:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=92769 Change 92769 by soc-andrew@soc-andrew_serv on 2006/03/05 09:25:27 1. Install the lua package to the CD. It dosn't matter we are not registering the install as it will be quite hard to remove the package from read only media. It is also needed to run the installer. 2. Use the lua from the package. It needs liblua.so, liblualib.so and libm.so to be loaded to resolve all the needed symbols. Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#31 edit .. //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#8 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#31 (text+ko) ==== @@ -793,16 +793,18 @@ tar xf - -C ${RD}/bsdinstaller/root/$$dir; \ done ) # Create the needed mount points - ( for dir in dev mnt proc root tmp var ; do \ - mkdir ${RD}/bsdinstaller/root/$$dir; \ + ( for dir in dev mnt proc root tmp var/run ; do \ + mkdir -p ${RD}/bsdinstaller/root/$$dir; \ done ) # Install Lua into the package root # XXX Make the ftp site changeable - ( /usr/bin/fetch -ARr -o ${RD}/bsdinstaller/root/lua.tbz \ - ftp://ftp.freebsd.org/pub/FreeBSD/ports/${MACHIVE_ARCH}/packages-7-current/latest/lua.tbz && \ - pkg_add -C ${RD}/bsdinstaller/root /lua.tbz ) - rm ${RD}/bsdinstaller/root/lua.tbz + ( /usr/bin/fetch -ARr -o ${RD}/bsdinstaller/lua.tbz \ + ftp://ftp.freebsd.org/pub/FreeBSD/ports/${MACHINE_ARCH}/packages-7-current/Latest/lua.tbz && \ + pkg_add -R -P ${RD}/bsdinstaller/root ${RD}/bsdinstaller/lua.tbz ) + rm ${RD}/bsdinstaller/lua.tbz + # Reset the library directories + ldconfig /lib /usr/lib /usr/lib/compat /usr/local/lib @touch ${RD}/bsdinstaller/root/etc/fstab @echo "sendmail_enable=\"NONE\"" > ${RD}/bsdinstaller/root/etc/rc.conf @@ -992,8 +994,8 @@ tar --exclude CVS -cf - -C ${RD}/bsdinstaller/root/$$dir . | \ tar xf - -C ${RD}/bsdinstaller/mfs_root/$$dir; \ done ) - ( for dir in dev mnt proc root tmp usr var ; do \ - mkdir ${RD}/bsdinstaller/mfs_root/$$dir; \ + ( for dir in dev mnt proc root tmp usr var/run ; do \ + mkdir -p ${RD}/bsdinstaller/mfs_root/$$dir; \ done ) cp ${.CURDIR}/bsdinstaller/bsdinstaller ${RD}/bsdinstaller/mfs_root/etc/rc.d/ chmod u+x ${RD}/bsdinstaller/mfs_root/etc/rc.d/bsdinstaller ==== //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#8 (text+ko) ==== @@ -13,7 +13,7 @@ /usr/sbin/bsd_installer_ncurses elif [ ${TTY} = "/dev/ttyv1" ] then - LUA_PATH="/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH=/usr/lib/lua/?.so LUA_SOPATH=/usr/lib/lua/ bsdlua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ booted_from_install_media=true + LD_PRELOAD="/usr/local/lib/liblua.so;/usr/local/lib/liblualib.so;/usr/lib/libm.so" LUA_PATH="/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH=/usr/lib/lua/?.so LUA_SOPATH=/usr/lib/lua/ lua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ booted_from_install_media=true #/usr/sbin/bsd_installer_be if [ $? -eq 5 ] then From owner-p4-projects@FreeBSD.ORG Sun Mar 5 09:34:18 2006 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 B30AA16A423; Sun, 5 Mar 2006 09:34: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 80BE016A420 for ; Sun, 5 Mar 2006 09:34:17 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49FD643D49 for ; Sun, 5 Mar 2006 09:34:17 +0000 (GMT) (envelope-from brueffer@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 k259YHke038740 for ; Sun, 5 Mar 2006 09:34:17 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k259YHh0038737 for perforce@freebsd.org; Sun, 5 Mar 2006 09:34:17 GMT (envelope-from brueffer@freebsd.org) Date: Sun, 5 Mar 2006 09:34:17 GMT Message-Id: <200603050934.k259YHh0038737@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 92770 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, 05 Mar 2006 09:34:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=92770 Change 92770 by brueffer@brueffer_serenity on 2006/03/05 09:33:24 Fixes. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#2 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#3 $ .\" .Dd March 4, 2006 .Dt AU_OPEN 3 @@ -66,8 +66,8 @@ .Pp The .Fn au_close -is used to commit an audit record to the system audit log, or abandon the -record. +function is used to commit an audit record to the system audit log, or +abandon the record. In either cases, all resources associated with the record will be released. The .Va keep @@ -82,6 +82,7 @@ and a trailer added to the end. Committing a record to the system audit log requires privilege. .Pp +The .Fn au_close_buffer function writes the resulting record to an in-memory buffer of size .Va *buflen ; @@ -93,7 +94,7 @@ The function .Fn au_open returns a non-negative audit record descriptor number on success, or a -negative value on failure, along with error information in. +negative value on failure, along with error information in .Va errno . .Pp The functions @@ -119,7 +120,7 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh BUGS -There is currently no interface to extract a single token without wrapping +There is currently no interface to extract a single token without it being automatically wrapped in a header and trailer. .Pp Currently, @@ -134,4 +135,4 @@ .Fn au_open would reserve resources necessary to commit any submitted record, releasing them on -.Fn au_close. +.Fn au_close . From owner-p4-projects@FreeBSD.ORG Sun Mar 5 10:18:22 2006 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 CFB6016A423; Sun, 5 Mar 2006 10:18:21 +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 A58C016A420 for ; Sun, 5 Mar 2006 10:18:21 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 57A5043D46 for ; Sun, 5 Mar 2006 10:18:21 +0000 (GMT) (envelope-from kmacy@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 k25AILNg040221 for ; Sun, 5 Mar 2006 10:18:21 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k25AIL6Y040203 for perforce@freebsd.org; Sun, 5 Mar 2006 10:18:21 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 5 Mar 2006 10:18:21 GMT Message-Id: <200603051018.k25AIL6Y040203@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92773 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, 05 Mar 2006 10:18:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=92773 Change 92773 by kmacy@kmacy_storage:sun4v_work on 2006/03/05 10:18:20 add basic TSB miss handling support Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#6 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/param.h#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/sun4v_cpufunc.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#8 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#17 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#16 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#6 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#6 (text+ko) ==== @@ -71,6 +71,11 @@ #include #include #include +#ifdef SUN4V +#include +#include +#endif + ASSYM(KERNBASE, KERNBASE); ASSYM(VM_MIN_PROM_ADDRESS, VM_MIN_PROM_ADDRESS); @@ -100,13 +105,16 @@ ASSYM(TLB_DEMAP_CONTEXT, TLB_DEMAP_CONTEXT); ASSYM(TLB_DEMAP_PAGE, TLB_DEMAP_PAGE); +#ifndef SUN4V ASSYM(TSB_BUCKET_MASK, TSB_BUCKET_MASK); ASSYM(TSB_BUCKET_SHIFT, TSB_BUCKET_SHIFT); - +#endif ASSYM(INT_SHIFT, INT_SHIFT); ASSYM(PTR_SHIFT, PTR_SHIFT); ASSYM(PAGE_SHIFT, PAGE_SHIFT); +ASSYM(PAGE_MASK, PAGE_MASK); +ASSYM(PAGE_MASK_4M, PAGE_MASK_4M); ASSYM(PAGE_SHIFT_8K, PAGE_SHIFT_8K); ASSYM(PAGE_SHIFT_4M, PAGE_SHIFT_4M); ASSYM(PAGE_SIZE, PAGE_SIZE); @@ -170,6 +178,11 @@ ASSYM(TS_MAX, TS_MAX); ASSYM(TLB_DIRECT_TO_TTE_MASK, TLB_DIRECT_TO_TTE_MASK); ASSYM(TV_SIZE_BITS, TV_SIZE_BITS); +#else +ASSYM(VTD_REF, VTD_REF); +ASSYM(TTARGET_VA_MASK, TTARGET_VA_MASK); +ASSYM(TTARGET_VA_BITS, TTARGET_VA_BITS); +ASSYM(THE_SHIFT, THE_SHIFT); #endif ASSYM(V_INTR, offsetof(struct vmmeter, v_intr)); @@ -198,6 +211,11 @@ ASSYM(PC_RQ_SIZE, offsetof(struct pcpu, pc_rq_size)); ASSYM(PC_NRQ_BASE, offsetof(struct pcpu, pc_nrq_ra)); ASSYM(PC_NRQ_SIZE, offsetof(struct pcpu, pc_nrq_size)); + +ASSYM(PC_KWBUF_FULL, offsetof(struct pcpu, pc_kwbuf_full)); +ASSYM(PC_KWBUF_SP, offsetof(struct pcpu, pc_kwbuf_sp)); +ASSYM(PC_KWBUF, offsetof(struct pcpu, pc_kwbuf)); + #else ASSYM(PC_PMAP, offsetof(struct pcpu, pc_pmap)); ASSYM(PM_TSB, offsetof(struct pmap, pm_tsb)); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/param.h#5 (text+ko) ==== @@ -120,6 +120,7 @@ /* * Mach derived conversion macros */ +#ifndef LOCORE #define round_page(x) (((unsigned long)(x) + PAGE_MASK) & ~PAGE_MASK) #define trunc_page(x) ((unsigned long)(x) & ~PAGE_MASK) @@ -130,10 +131,8 @@ #define sparc64_ptob(x) ((unsigned long)(x) << PAGE_SHIFT) #define pgtok(x) ((unsigned long)(x) * (PAGE_SIZE / 1024)) +#endif /* LOCORE */ -#define NPGPTD 1 /* number of page table directory pages */ -#define NBPTD (NPGPTD << PAGE_SHIFT) /* number of bytes in a page table directory */ -#define NPDEPG (PAGE_SIZE/(sizeof (vm_offset_t))) #endif /* !_MACHINE_PARAM_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/sun4v_cpufunc.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ #define _MACHINE_SUN4V_CPUFUNC_H_ #include void set_mmfsa_scratchpad(vm_paddr_t mmfsa); -void set_hash_scratchpad(void *hash); +void set_hash_scratchpad(vm_offset_t hash); void set_tsb_scratchpad(vm_paddr_t tsb); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#8 (text+ko) ==== @@ -38,4 +38,6 @@ void tsb_clear_range(struct hv_tsb_info *tsb, vm_offset_t sva, vm_offset_t eva); +void tsb_set_scratchpad(struct hv_tsb_info *tsb); + #endif /* !_MACHINE_TSB_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#3 (text+ko) ==== @@ -1,6 +1,7 @@ #ifndef _MACHINE_TTE_HASH_H_ #define _MACHINE_TTE_HASH_H_ +#define THE_SHIFT 6 /* size of hash entry is 64-bytes */ struct tte_hash; typedef struct tte_hash *tte_hash_t; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#17 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include #include +#include #include "assym.s" @@ -228,7 +229,7 @@ wrpr %g1, WSTATE_NESTED, %wstate save %sp, -(CCFSZ + TF_SIZEOF), %sp #endif - nop + illtrap .endm .macro tl1_setup type @@ -252,32 +253,40 @@ .macro insn_excptn MAGIC_TRAP_ON + illtrap .align 32 .endm .macro insn_miss MAGIC_TRAP_ON + illtrap .align 32 .endm .macro data_excptn MAGIC_TRAP_ON + illtrap .align 32 .endm .macro data_miss - MAGIC_TRAP_ON - + GET_MMFSA_SCRATCH(%g1) ! insn 1 + GET_HASH_SCRATCH(%g2) ! insn 2,3 + GET_TSB_SCRATCH(%g3) ! insn 4,5 + ba,pt %xcc, tsb_miss + add %g1, MMFSA_D_, %g1 ! set fsa to data .align 32 .endm .macro data_prot MAGIC_TRAP_ON + illtrap .align 32 .endm .macro tl0_align MAGIC_TRAP_ON + illtrap .align 32 .endm @@ -1007,6 +1016,134 @@ END(tl0_intr) +! %g1==mmfsa (RA) +! %g2==hash base (VA) +! %g3==TSB (RA) +! internal usage: +! %g1==absolute index +! %g4==fault type,entry tag +! %g5==fault address,entry data +! %g6==hash size,tag, temp +! %g7 temp +ENTRY(tsb_miss) + ldda [%g0 + %g1]ASI_LDTD_REAL, %g4 + ! %g4 == fault type %g5 == fault address + ! ignore context for now + ! XXX only handle normal miss for now + mov 1, %g7 + sllx %g7, PAGE_SHIFT, %g7 + sub %g7, 1, %g7 ! %g7==PAGE_MASK + + MAGIC_TRAP_ON + and %g2, %g7, %g6 ! size stored in lower 13 bits + andn %g2, %g7, %g2 ! actual VA of hash + + ! XXX only handle 8k page miss + ! calculate hash index + srlx %g5, PAGE_SHIFT, %g1 ! absolute hash index + sllx %g6, (PAGE_SHIFT - THE_SHIFT), %g6 ! size of hash in THEs + sub %g6, 1, %g6 ! THE_MASK + and %g1, %g6, %g6 ! masked hash index + sllx %g6, THE_SHIFT, %g6 ! masked hash offset + srlx %g5, PAGE_SHIFT_4M, %g7 ! VA tag + ! fetch hash entries - exit when we find what were looking for + + ! %g2==entry base + add %g2, %g6, %g2 ! base + offset == entry base + + ! entry 0 +tsb_miss_lookup_0: + mov 1, %g6 + sllx %g6, TTARGET_VA_BITS, %g6 + subx %g6, 1, %g6 ! %g6 == TTARGET_VA_MASK + + ldda [%g2 + %g0]ASI_LDTD_N, %g4 + and %g4, %g6, %g6 ! mask off context bits + cmp %g6, %g0 ! entry tag == 0 + be,pn %xcc, 1f + nop + cmp %g6, %g7 ! entry tag == VA tag? + be,pn %xcc, 2f + nop + ! entry 1 +tsb_miss_lookup_1: + mov 1, %g6 + sllx %g6, TTARGET_VA_BITS, %g6 + subx %g6, 1, %g6 ! %g6 == TTARGET_VA_MASK + + add %g2, 16, %g2 + ldda [%g2 + %g0]ASI_LDTD_N, %g4 + and %g4, %g6, %g6 ! mask off context bits + cmp %g6, %g0 ! entry tag == 0 + be,pn %xcc, 1f + nop + cmp %g6, %g7 ! entry tag == VA tag? + be,pn %xcc, 2f + nop + ! entry 2 +tsb_miss_lookup_2: + mov 1, %g6 + sllx %g6, TTARGET_VA_BITS, %g6 + subx %g6, 1, %g6 ! %g6 == TTARGET_VA_MASK + + add %g2, 16, %g2 + ldda [%g2 + %g0]ASI_LDTD_N, %g4 + and %g4, %g6, %g6 ! mask off context bits + cmp %g6, %g0 ! entry tag == 0 + be,pn %xcc, 1f + nop + cmp %g6, %g7 ! entry tag == VA tag? + be,pn %xcc, 2f + nop + ! entry 3 +tsb_miss_lookup_3: + mov 1, %g6 + sllx %g6, TTARGET_VA_BITS, %g6 + subx %g6, 1, %g6 ! %g6 == TTARGET_VA_MASK + + add %g2, 16, %g2 + ldda [%g2 + %g0]ASI_LDTD_N, %g4 + and %g4, %g6, %g6 ! mask off context bits + cmp %g6, %g0 ! entry tag == 0 + be,pn %xcc, 1f + nop + cmp %g6, %g7 ! entry tag == VA tag? + be,pn %xcc, 2f + nop +tsb_miss_not_found: +1: ! not found + ! we need to jump to tl0_trap to drop us back down to tl0 + ! and take us to trap(...) to service the fault + ! skipping this step for the moment so we just do an illtrap + illtrap + +tsb_miss_found: +2: !found + ! set referenced bit unconditionally for now + or %g5, VTD_REF, %g5 + stx %g5, [%g2 + 8] ! set ref bit + + mov 1, %g7 + sllx %g7, PAGE_SHIFT, %g7 + sub %g7, 1, %g7 ! %g7==PAGE_MASK + + and %g3, %g7, %g6 ! size of TSB in pages + + andn %g3, %g7, %g3 ! TSB real address + sllx %g6, (PAGE_SHIFT - TTE_SHIFT), %g6 ! nttes + subx %g6, 1, %g6 ! TSB_MASK + and %g6, %g1, %g6 ! masked index + sllx %g6, TTE_SHIFT, %g6 ! masked byte offset + add %g6, %g3, %g6 ! TTE RA + mov 8, %g7 + stxa %g4, [%g6]ASI_REAL ! store tag + stxa %g5, [%g6 + %g7]ASI_REAL ! store data + MAGIC_TRAP_OFF + retry +END(tsb_miss) + + + /* * Freshly forked processes come here when switched to for the first time. ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#16 (text+ko) ==== @@ -355,7 +355,7 @@ { struct pmap *pm; vm_offset_t off, va, kernel_hash; - vm_paddr_t pa; + vm_paddr_t pa, kernel_hash_pa; vm_size_t physsz, virtsz; ihandle_t pmem, vmem; int i, sz, j; @@ -411,18 +411,26 @@ virtsz = roundup(physsz, PAGE_SIZE_4M << (PAGE_SHIFT - TTE_SHIFT)); vm_max_kernel_address = VM_MIN_KERNEL_ADDRESS + virtsz; - + /* + * Set the start and end of kva. The kernel is loaded at the first + * available 4 meg super page, so round up to the end of the page. + */ + virtual_avail = roundup2(ekva, PAGE_SIZE_4M); + virtual_end = vm_max_kernel_address; + kernel_vm_end = vm_max_kernel_address; /* * Allocate and map a 4MB page for the kernel hashtable * */ - pa = pmap_bootstrap_alloc(PAGE_SIZE_4M); - if (pa & PAGE_MASK_4M) - panic("pmap_bootstrap: hashtable unaligned\n"); + kernel_hash_pa = pmap_bootstrap_alloc(PAGE_SIZE_4M); + if (kernel_hash_pa & PAGE_MASK_4M) + panic("pmap_bootstrap: hashtable pa unaligned\n"); kernel_hash = virtual_avail; + if (kernel_hash & PAGE_MASK_4M) + panic("pmap_bootstrap: hashtable va unaligned\n"); virtual_avail += PAGE_SIZE_4M; - pmap_scrub_pages(pa, PAGE_SIZE_4M); + pmap_scrub_pages(kernel_hash_pa, PAGE_SIZE_4M); /* * Set up TSB descriptors for the hypervisor @@ -453,7 +461,7 @@ kernel_pmap->pm_tsb.hvtsb_rsvd = 0; kernel_pmap->pm_tsb.hvtsb_pa = pa; - set_tsb_scratchpad(pa); + tsb_set_scratchpad(&kernel_pmap->pm_tsb); /* * Initialize kernel TSB for 4M pages @@ -480,7 +488,7 @@ * */ tsb_set_tte(&kernel_td[TSB4M_INDEX], kernel_hash, - pa | TTE_KERNEL | VTD_4M, 0); + kernel_hash_pa | TTE_KERNEL | VTD_4M, 0); /* * allocate MMU fault status areas for all CPUS @@ -501,15 +509,6 @@ #endif /* - * Set the start and end of kva. The kernel is loaded at the first - * available 4 meg super page, so round up to the end of the page. - */ - virtual_avail = roundup2(ekva, PAGE_SIZE_4M); - virtual_end = vm_max_kernel_address; - kernel_vm_end = vm_max_kernel_address; - - - /* * Allocate a kernel stack with guard page for thread0 and map it into * the kernel tsb. */ @@ -603,6 +602,7 @@ * attempts to do updates until they're legal */ pm->pm_hash = tte_hash_kernel_create(kernel_hash, PAGE_SIZE_4M); + tte_hash_set_scratchpad(pm->pm_hash); /* * XXX - We should read the kernel mappings into the hash table @@ -989,7 +989,7 @@ void pmap_kenter(vm_offset_t va, vm_paddr_t pa) { - tsb_set_tte(&kernel_td[TSB8K_INDEX], va, pa | TTE_KERNEL | VTD_8K, 0); + tte_hash_insert(kernel_pmap->pm_hash, va, pa | TTE_KERNEL | VTD_8K); } /* @@ -1022,7 +1022,7 @@ tsb_get_tte(&kernel_td[TSB4M_INDEX], va) != 0) tsb_clear_tte(&kernel_td[TSB4M_INDEX], va); else - tsb_clear_tte(&kernel_td[TSB8K_INDEX], va); + tte_hash_delete(kernel_pmap->pm_hash, va); } static void ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#6 (text+ko) ==== @@ -39,7 +39,8 @@ #define PCB_REG %g6 - +#define MAGIC_TRAP_ON ta 0x77 +#define MAGIC_TRAP_OFF ta 0x78 /* * void cpu_throw(struct thread *old, struct thread *new) */ @@ -54,6 +55,7 @@ * void cpu_switch(struct thread *old, struct thread *new) */ ENTRY(cpu_switch) + MAGIC_TRAP_ON GET_PCB(PCB_REG) save %sp, -CCFSZ, %sp mov %i1, %i0 @@ -243,7 +245,7 @@ stxa %i4, [%i5] ASI_IMMU mov AA_DMMU_PCXR, %i5 stxa %i3, [%i5] ASI_DMMU - membar #Sync + membar #Sync /* Check the hypervisor spec */ #endif /* * Done. Return and load the new process's window from the stack. ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#7 (text+ko) ==== @@ -184,3 +184,10 @@ return tte_data; } +void +tsb_set_scratchpad(hv_tsb_info_t *tsb) +{ + uint64_t tsb_pages; + tsb_pages = tsb->hvtsb_ntte >> (PAGE_SHIFT - TTE_SHIFT); + set_tsb_scratchpad(tsb->hvtsb_pa | tsb_pages); +} ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ #define HASH_SIZE 4 #define MAX_HASH_SIZE 16 -#define HASH_MASK(th) ((th->th_size << PAGE_SHIFT) - 1) +#define HASH_MASK(th) ((th->th_size << (PAGE_SHIFT - THE_SHIFT)) - 1) #define HASH_VALID 0x1 struct tte_hash_entry; @@ -106,6 +106,8 @@ th->th_size = (size >> PAGE_SHIFT); th->th_entries = 0; th->th_context = 0; + printf("setting kernel hashtable to %lx\n", va); + th->th_hashtable = (tte_hash_entry_t)va; return th; } @@ -217,15 +219,17 @@ hash_shift = PAGE_SHIFT; hash_index = (va >> hash_shift) & HASH_MASK(th); + fields = (th->th_hashtable[hash_index].the_fields); - tte_tag = (((uint64_t)th->th_context << TTARGET_CTX_SHIFT)||(va >> TTARGET_VA_SHIFT)); - + tte_tag = (((uint64_t)th->th_context << TTARGET_CTX_SHIFT)|(va >> TTARGET_VA_SHIFT)); for (i = 0; i <= 3; i++) { - if ((fields[i].tte.data == 0) || (fields[i].tte.tag == tte_tag)) { + if ((fields[i].tte.tag == 0) || (fields[i].tte.tag == tte_tag)) { fields[i].tte.data = tte_data; fields[i].tte.tag = tte_tag; + printf("data: 0x%016lx tag: 0x%016lx\n", fields[i].tte.data, fields[i].tte.tag); goto done; - } + } + } panic("collision handling unimplemented - please re-consider"); @@ -259,6 +263,11 @@ void tte_hash_set_scratchpad(tte_hash_t th) { - set_hash_scratchpad(th->th_hashtable); + /* This will break if a hash table ever grows above 64MB + * 2^(13+13) + */ + printf("setting hash scratch to %lx\n", + ((vm_offset_t)th->th_hashtable) | ((vm_offset_t)th->th_size)); + set_hash_scratchpad(((vm_offset_t)th->th_hashtable) | ((vm_offset_t)th->th_size)); } From owner-p4-projects@FreeBSD.ORG Sun Mar 5 10:19:24 2006 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 8ABEA16A423; Sun, 5 Mar 2006 10:19:23 +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 64E4C16A420 for ; Sun, 5 Mar 2006 10:19:23 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E64543D46 for ; Sun, 5 Mar 2006 10:19:23 +0000 (GMT) (envelope-from kmacy@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 k25AJNUN040291 for ; Sun, 5 Mar 2006 10:19:23 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k25AJMfH040288 for perforce@freebsd.org; Sun, 5 Mar 2006 10:19:22 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 5 Mar 2006 10:19:22 GMT Message-Id: <200603051019.k25AJMfH040288@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92774 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, 05 Mar 2006 10:19:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=92774 Change 92774 by kmacy@kmacy_storage:sun4v_work on 2006/03/05 10:19:02 missed file add Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/mmu.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Mar 5 15:30:05 2006 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 2411C16A423; Sun, 5 Mar 2006 15:30: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 D752316A422 for ; Sun, 5 Mar 2006 15:30:04 +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 A0DCC43D66 for ; Sun, 5 Mar 2006 15:30:01 +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 k25FU1Fl059642 for ; Sun, 5 Mar 2006 15:30:01 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 k25FU1ll059639 for perforce@freebsd.org; Sun, 5 Mar 2006 15:30:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 15:30:01 GMT Message-Id: <200603051530.k25FU1ll059639@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 92785 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, 05 Mar 2006 15:30:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=92785 Change 92785 by rwatson@rwatson_peppercorn on 2006/03/05 15:29:13 Correct typo. Submitted by: keramida Affected files ... .. //depot/projects/trustedbsd/openbsm/README#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#17 (text+ko) ==== @@ -27,7 +27,7 @@ OpenBSM is currently built using autoconf and automake, which should allow for building on a range of operating systems, including FreeBSD, Mac OS X, -and Linux. Depending on the availability of audit facailities in the +and Linux. Depending on the availability of audit facilities in the underlying operating system, some components that depend on kernel audit support are built conditionally. Typically, build will be performed using @@ -95,4 +95,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#16 $ +$P4: //depot/projects/trustedbsd/openbsm/README#17 $ From owner-p4-projects@FreeBSD.ORG Sun Mar 5 15:34:08 2006 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 0084516A424; Sun, 5 Mar 2006 15:34:07 +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 CF6F416A420 for ; Sun, 5 Mar 2006 15:34:07 +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 2809143D49 for ; Sun, 5 Mar 2006 15:34:07 +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 k25FY7CU059858 for ; Sun, 5 Mar 2006 15:34:07 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 k25FY6RY059855 for perforce@freebsd.org; Sun, 5 Mar 2006 15:34:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 15:34:06 GMT Message-Id: <200603051534.k25FY6RY059855@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 92786 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, 05 Mar 2006 15:34:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=92786 Change 92786 by rwatson@rwatson_peppercorn on 2006/03/05 15:33:21 Various compatibility and functionality tweaks to help support a BSM file format and API test suite: - Support a more complete range of data types for the arbitrary data token: add AUR_CHAR (alias to AUR_BYTE), remove AUR_LONG, add AUR_INT32 (alias to AUR_INT), add AUR_INT64. - Add au_close_token(), which allows writing a single token_t to a memory buffer. Not likely to be used much by applications, but useful for writing test tools. This is not a Solaris BSM API. - Modify au_to_file() so that it accepts a timeval in user space, not just kernel -- this is not a Solaris BSM API so can be modified without causing compatibility issues. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#4 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#15 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#4 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#6 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#25 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#35 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#44 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#4 (text+ko) ==== @@ -4,6 +4,15 @@ previously we used hard-coded 0 and 1 values. - Add man page for au_open(), au_write(), au_close(), and au_close_buffer(). +- Support a more complete range of data types for the arbitrary data token: + add AUR_CHAR (alias to AUR_BYTE), remove AUR_LONG, add AUR_INT32 (alias + to AUR_INT), add AUR_INT64. +- Add au_close_token(), which allows writing a single token_t to a memory + buffer. Not likely to be used much by applications, but useful for + writing test tools. +- Modify au_to_file() so that it accepts a timeval in user space, not just + kernel -- this is not a Solaris BSM API so can be modified without + causing compatibility issues. OpenBSM 1.0 alpha 5 @@ -131,4 +140,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#3 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#4 $ ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#15 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#15 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -187,13 +187,19 @@ /* data-types for the arbitrary token */ #define AUR_BYTE 0 +#define AUR_CHAR AUR_BYTE #define AUR_SHORT 1 -#define AUR_LONG 2 +#define AUR_INT32 2 +#define AUR_INT AUR_INT +#define AUR_INT64 3 /* ... and their sizes */ #define AUR_BYTE_SIZE sizeof(u_char) +#define AUR_CHAR_SIZE AUR_BYTE_SIZE #define AUR_SHORT_SIZE sizeof(uint16_t) -#define AUR_LONG_SIZE sizeof(uint32_t) +#define AUR_INT32_SIZE sizeof(uint32_t) +#define AUR_INT_SIZE AUR_INT32_SIZE +#define AUR_INT64_SIZE sizeof(uint64_t) /* Modifiers for the header token */ #define PAD_NOTATTR 0x4000 /* nonattributable event */ @@ -230,12 +236,9 @@ int au_write(int d, token_t *m); int au_close(int d, int keep, short event); int au_close_buffer(int d, short event, u_char *buffer, size_t *buflen); +int au_close_token(token_t *tok, u_char *buffer, size_t *buflen); -#if defined(KERNEL) || defined(_KERNEL) token_t *au_to_file(char *file, struct timeval tm); -#else -token_t *au_to_file(char *file); -#endif #if defined(KERNEL) || defined(_KERNEL) token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod, ==== //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#4 $ .\" .Dd March 4, 2006 .Dt AU_OPEN 3 @@ -46,6 +46,8 @@ .Fn au_close "int d" "int keep" "short event" .Ft int .Fn au_close_buffer "int d" "short event" "u_char *buffer" "size_t *buflen" +.Ft int +.Fn au_close_token "token_t *tok" "u_char *buffer" "size_t *buflen" .Sh DESCRIPTION These interfaces allow applications to allocate audit records, construct a record using a series of tokens, and commit the audit record to the system @@ -90,6 +92,17 @@ The argument .Va short is the event identifier to use in the record header. +.Pp +The +.Fn au_close_token +function generates the BSM stream output for a single token, +.Va tok , +in the passed buffer +.Va buffer . +The initial buffer size and resulting data size are passed via +.Va *buflen . +.Fn au_close_token +will free the token before returning. .Sh RETURN VALUES The function .Fn au_open @@ -100,8 +113,9 @@ The functions .Fn au_write , .Fn au_close , +.Fn au_close_buffer , and -.Fn au_close_buffer +.Fn au_close_token return 0 on success, or a negative value on failure, along with error information in .Va errno . @@ -120,9 +134,6 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh BUGS -There is currently no interface to extract a single token without -it being automatically wrapped in a header and trailer. -.Pp Currently, .Fn au_open does not reserve kernel resources necessary to commit the record to the ==== //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#6 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#6 $ .\" .Dd April 19, 2005 .Dt AU_TOKEN 3 @@ -116,9 +116,7 @@ .Ft token_t * .Fn au_to_opaque "char *data" "u_int64_t bytes" .Ft token_t * -.Fn au_to_file "char *file" -.Ft token_t * -.Fn au_to_file "char *file" +.Fn au_to_file "char *file" "struct timeval tm" .Ft token_t * .Fn au_to_text "char *text" .Ft token_t * ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#25 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#24 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#25 $ */ #include @@ -360,3 +360,24 @@ au_teardown(rec); return (retval); } + +/* + * au_close_token() returns the byte format of a token_t. This won't + * generally be used by applications, but is quite useful for writing test + * tools. Will free the token on either success or failure. + */ +int +au_close_token(token_t *tok, u_char *buffer, size_t *buflen) +{ + + if (tok->len > *buflen) { + au_free_token(tok); + errno = ENOMEM; + return (EINVAL); + } + + memcpy(buffer, tok->t_data, tok->len); + *buflen = tok->len; + au_free_token(tok); + return (0); +} ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#35 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#34 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#35 $ */ #include @@ -893,6 +893,7 @@ */ switch(tok->tt.arb.bu) { case AUR_BYTE: + /* case AUR_CHAR: */ datasize = AUR_BYTE_SIZE; break; @@ -900,8 +901,13 @@ datasize = AUR_SHORT_SIZE; break; - case AUR_LONG: - datasize = AUR_LONG_SIZE; + case AUR_INT32: + /* case AUR_INT: */ + datasize = AUR_INT32_SIZE; + break; + + case AUR_INT64: + datasize = AUR_INT64_SIZE; break; default: @@ -962,6 +968,7 @@ print_delim(fp, del); switch(tok->tt.arb.bu) { case AUR_BYTE: + /* case AUR_CHAR: */ str = "byte"; size = AUR_BYTE_SIZE; print_string(fp, str, strlen(str)); @@ -979,23 +986,36 @@ print_delim(fp, del); print_1_byte(fp, tok->tt.arb.uc, "%u"); print_delim(fp, del); - for (i = 0; itt.arb.uc; i++) + for (i = 0; i < tok->tt.arb.uc; i++) fprintf(fp, format, *((u_int16_t *)(tok->tt.arb.data + (size * i)))); break; - case AUR_LONG: + case AUR_INT32: + /* case AUR_INT: */ str = "int"; - size = AUR_LONG_SIZE; + size = AUR_INT32_SIZE; print_string(fp, str, strlen(str)); print_delim(fp, del); print_1_byte(fp, tok->tt.arb.uc, "%u"); print_delim(fp, del); - for (i = 0; itt.arb.uc; i++) + for (i = 0; i < tok->tt.arb.uc; i++) fprintf(fp, format, *((u_int32_t *)(tok->tt.arb.data + (size * i)))); break; + case AUR_INT64: + str = "int64"; + size = AUR_INT64_SIZE; + print_string(fp, str, strlen(str)); + print_delim(fp, del); + print_1_byte(fp, tok->tt.arb.uc, "%u"); + print_delim(fp, del); + for (i = 0; i < tok->tt.arb.uc; i++) + fprintf(fp, format, *((u_int64_t *)(tok->tt.arb.data + + (size * i)))); + break; + default: return; } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#44 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#43 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#44 $ */ #include @@ -243,6 +243,7 @@ /* Determine the size of the basic unit. */ switch (unit_type) { case AUR_BYTE: + /* case AUR_CHAR: */ datasize = AUR_BYTE_SIZE; break; @@ -250,8 +251,13 @@ datasize = AUR_SHORT_SIZE; break; - case AUR_LONG: - datasize = AUR_LONG_SIZE; + case AUR_INT32: + /* case AUR_INT: */ + datasize = AUR_INT32_SIZE; + break; + + case AUR_INT64: + datasize = AUR_INT64_SIZE; break; default: @@ -261,7 +267,7 @@ totdata = datasize * unit_count; - GET_TOKEN_AREA(t, dptr, totdata + 4 * sizeof(u_char)); + GET_TOKEN_AREA(t, dptr, 4 * sizeof(u_char) + totdata); if (t == NULL) return (NULL); @@ -528,23 +534,12 @@ * file pathname N bytes + 1 terminating NULL byte */ token_t * -#if defined(KERNEL) || defined(_KERNEL) au_to_file(char *file, struct timeval tm) -#else -au_to_file(char *file) -#endif { token_t *t; u_char *dptr = NULL; u_int16_t filelen; u_int32_t timems; -#if !defined(KERNEL) && !defined(_KERNEL) - struct timeval tm; - struct timezone tzp; - - if (gettimeofday(&tm, &tzp) == -1) - return (NULL); -#endif filelen = strlen(file); filelen += 1; From owner-p4-projects@FreeBSD.ORG Sun Mar 5 15:45:25 2006 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 339FB16A423; Sun, 5 Mar 2006 15:45: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 0CCEE16A420 for ; Sun, 5 Mar 2006 15:45:25 +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 BD2DD43D45 for ; Sun, 5 Mar 2006 15:45:24 +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 k25FjOxA060475 for ; Sun, 5 Mar 2006 15:45:24 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 k25FjOtq060472 for perforce@freebsd.org; Sun, 5 Mar 2006 15:45:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 15:45:24 GMT Message-Id: <200603051545.k25FjOtq060472@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 92789 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, 05 Mar 2006 15:45:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=92789 Change 92789 by rwatson@rwatson_peppercorn on 2006/03/05 15:45:02 Define a new API, au_to_header32_tm(), which adds a struct timeval argument to the ordinary au_to_header32(), which is now implemented by wrapping au_to_header32_tm() and calling gettimeofday(). #ifndef KERNEL the APIs that invoke gettimeofday(), rather than having a variable definition. Don't try to retrieve time zone information using gettimeofday(), as it's not needed, and introduces possible failure modes. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#5 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#16 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#26 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#45 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#5 (text+ko) ==== @@ -13,6 +13,13 @@ - Modify au_to_file() so that it accepts a timeval in user space, not just kernel -- this is not a Solaris BSM API so can be modified without causing compatibility issues. +- Define a new API, au_to_header32_tm(), which adds a struct timeval + argument to the ordinary au_to_header32(), which is now implemented by + wrapping au_to_header32_tm() and calling gettimeofday(). #ifndef KERNEL + the APIs that invoke gettimeofday(), rather than having a variable + definition. Don't try to retrieve time zone information using + gettimeofday(), as it's not needed, and introduces possible failure + modes. OpenBSM 1.0 alpha 5 @@ -140,4 +147,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#4 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#5 $ ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#16 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#15 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#16 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -240,17 +240,14 @@ token_t *au_to_file(char *file, struct timeval tm); -#if defined(KERNEL) || defined(_KERNEL) -token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod, +token_t *au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm); -token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod, - struct timeval tm); -#else +#if !defined(KERNEL) && !defined(_KERNEL) token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); +token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); #endif -token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_me(void); token_t *au_to_arg(char n, char *text, uint32_t v); token_t *au_to_arg32(char n, char *text, uint32_t v); ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#26 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#25 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#26 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#45 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#44 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#45 $ */ #include @@ -1112,24 +1112,13 @@ * milliseconds of time 4 bytes/8 bytes (32-bit/64-bit value) */ token_t * -#if defined(KERNEL) || defined(_KERNEL) -au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod, +au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm) -#else -au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod) -#endif { token_t *t; u_char *dptr = NULL; u_int32_t timems; -#if !defined(KERNEL) && !defined(_KERNEL) - struct timeval tm; - struct timezone tzp; - if (gettimeofday(&tm, &tzp) == -1) - return (NULL); -#endif - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t) + sizeof(u_char) + 2 * sizeof(u_int16_t) + 2 * sizeof(u_int32_t)); if (t == NULL) @@ -1149,7 +1138,18 @@ return (t); } +#if !defined(KERNEL) && !defined(_KERNEL) token_t * +au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod) +{ + struct timeval tm; + + if (gettimeofday(&tm, NULL) == -1) + return (NULL); + return (au_to_header32_tm(rec_size, e_type, e_mod, tm)); +} + +token_t * au_to_header64(__unused int rec_size, __unused au_event_t e_type, __unused au_emod_t e_mod) { @@ -1164,6 +1164,7 @@ return (au_to_header32(rec_size, e_type, e_mod)); } +#endif /* * token ID 1 byte From owner-p4-projects@FreeBSD.ORG Sun Mar 5 16:16:03 2006 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 42FA316A423; Sun, 5 Mar 2006 16:16:03 +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 EA00F16A420 for ; Sun, 5 Mar 2006 16:16:02 +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 9ADB643D49 for ; Sun, 5 Mar 2006 16:16:02 +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 k25GG2gv061790 for ; Sun, 5 Mar 2006 16:16:02 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 k25GG16R061787 for perforce@freebsd.org; Sun, 5 Mar 2006 16:16:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 16:16:01 GMT Message-Id: <200603051616.k25GG16R061787@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 92790 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, 05 Mar 2006 16:16:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=92790 Change 92790 by rwatson@rwatson_peppercorn on 2006/03/05 16:15:28 Mark several files as being executable. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/install-sh#2 edit .. //depot/projects/trustedbsd/openbsm/config/ltmain.sh#2 edit .. //depot/projects/trustedbsd/openbsm/config/missing#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/install-sh#2 (xtext/text+ko) ==== ==== //depot/projects/trustedbsd/openbsm/config/ltmain.sh#2 (xtext/text+ko) ==== ==== //depot/projects/trustedbsd/openbsm/config/missing#2 (xtext/text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Mar 5 16:16:04 2006 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 74AA016A438; Sun, 5 Mar 2006 16:16:03 +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 4568916A420 for ; Sun, 5 Mar 2006 16:16:03 +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 E659643D4C for ; Sun, 5 Mar 2006 16:16:02 +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 k25GG2nb061796 for ; Sun, 5 Mar 2006 16:16:02 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 k25GG2YJ061793 for perforce@freebsd.org; Sun, 5 Mar 2006 16:16:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 16:16:02 GMT Message-Id: <200603051616.k25GG2YJ061793@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 92791 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, 05 Mar 2006 16:16:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=92791 Change 92791 by rwatson@rwatson_peppercorn on 2006/03/05 16:15:56 Mark configure.guess as executable. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.guess#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.guess#2 (xtext/text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Mar 5 16:17:05 2006 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 2703A16A423; Sun, 5 Mar 2006 16:17: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 012C216A420 for ; Sun, 5 Mar 2006 16:17:05 +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 A938443D48 for ; Sun, 5 Mar 2006 16:17:04 +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 k25GH4U8061895 for ; Sun, 5 Mar 2006 16:17:04 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 k25GH4cE061892 for perforce@freebsd.org; Sun, 5 Mar 2006 16:17:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 16:17:04 GMT Message-Id: <200603051617.k25GH4cE061892@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 92792 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, 05 Mar 2006 16:17:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=92792 Change 92792 by rwatson@rwatson_peppercorn on 2006/03/05 16:16:30 Two more files as executable. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.sub#2 edit .. //depot/projects/trustedbsd/openbsm/config/depcomp#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.sub#2 (xtext/text+ko) ==== ==== //depot/projects/trustedbsd/openbsm/config/depcomp#2 (xtext/text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Mar 5 18:18:36 2006 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 50A5616A43C; Sun, 5 Mar 2006 18:18: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 1617B16A422 for ; Sun, 5 Mar 2006 18:18:35 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8A5943D55 for ; Sun, 5 Mar 2006 18:18:34 +0000 (GMT) (envelope-from scottl@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 k25IIYfu073920 for ; Sun, 5 Mar 2006 18:18:34 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k25IIYNp073917 for perforce@freebsd.org; Sun, 5 Mar 2006 18:18:34 GMT (envelope-from scottl@freebsd.org) Date: Sun, 5 Mar 2006 18:18:34 GMT Message-Id: <200603051818.k25IIYNp073917@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 92800 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, 05 Mar 2006 18:18:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=92800 Change 92800 by scottl@scottl-x64 on 2006/03/05 18:17:49 Make the topo lock visible to the rest of CAM that needs it. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#19 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#6 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#19 (text+ko) ==== @@ -635,7 +635,7 @@ typedef TAILQ_HEAD(cam_isrq, ccb_hdr) cam_isrq_t; static cam_isrq_t cam_bioq; static struct mtx cam_bioq_lock; -static struct mtx cam_topo_lock; +struct mtx cam_topo_lock; /* "Pool" of inactive ccbs managed by xpt_alloc_ccb and xpt_free_ccb */ static SLIST_HEAD(,ccb_hdr) ccb_freeq; ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#6 (text+ko) ==== @@ -37,6 +37,9 @@ /* Functions accessed by the peripheral drivers */ #ifdef _KERNEL + +extern struct mtx cam_topo_lock; + void xpt_polled_action(union ccb *ccb); union ccb *xpt_alloc_ccb(void); union ccb *xpt_alloc_ccb_nowait(void); From owner-p4-projects@FreeBSD.ORG Sun Mar 5 18:18:37 2006 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 61C2A16A4A1; Sun, 5 Mar 2006 18:18: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 8EE1916A454 for ; Sun, 5 Mar 2006 18:18:35 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 34C6443D55 for ; Sun, 5 Mar 2006 18:18:35 +0000 (GMT) (envelope-from scottl@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 k25IIZRU073929 for ; Sun, 5 Mar 2006 18:18:35 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k25IIY1p073923 for perforce@freebsd.org; Sun, 5 Mar 2006 18:18:34 GMT (envelope-from scottl@freebsd.org) Date: Sun, 5 Mar 2006 18:18:34 GMT Message-Id: <200603051818.k25IIY1p073923@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 92801 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, 05 Mar 2006 18:18:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=92801 Change 92801 by scottl@scottl-x64 on 2006/03/05 18:17:58 Fix compile problems. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#7 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#7 (text+ko) ==== @@ -412,7 +412,6 @@ void cam_periph_invalidate(struct cam_periph *periph) { - int s; /* * We only call this routine the first time a peripheral is @@ -444,7 +443,7 @@ { struct periph_driver **p_drv; - mtx_assert(&cam_topo_lock, MTX_OWNED); + mtx_assert(&cam_topo_lock, MA_OWNED); for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) { if (strcmp((*p_drv)->driver_name, periph->periph_name) == 0) { From owner-p4-projects@FreeBSD.ORG Sun Mar 5 18:38:00 2006 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 3744516A422; Sun, 5 Mar 2006 18:38: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 EC1E316A423 for ; Sun, 5 Mar 2006 18:37:59 +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 98A1343D49 for ; Sun, 5 Mar 2006 18:37:59 +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 k25IbxmO074623 for ; Sun, 5 Mar 2006 18:37:59 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 k25IbxZg074620 for perforce@freebsd.org; Sun, 5 Mar 2006 18:37:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 18:37:59 GMT Message-Id: <200603051837.k25IbxZg074620@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 92803 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, 05 Mar 2006 18:38:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=92803 Change 92803 by rwatson@rwatson_peppercorn on 2006/03/05 18:37:45 Always read and write process32/subject32 addr/machine fields in network byte order, as they are interpreted as IP addresses. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#6 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#36 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#46 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#6 (text+ko) ==== @@ -20,6 +20,8 @@ definition. Don't try to retrieve time zone information using gettimeofday(), as it's not needed, and introduces possible failure modes. +- Always read and write process32 and subject32 machine/addr fields in + network byte order. OpenBSM 1.0 alpha 5 @@ -147,4 +149,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#5 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#6 $ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#36 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#35 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#36 $ */ #include @@ -1732,7 +1732,8 @@ if (err) return (-1); - READ_TOKEN_U_INT32(buf, len, tok->tt.proc32.tid.addr, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.proc32.tid.addr, + sizeof(tok->tt.proc32.tid.addr), tok->len, err); if (err) return (-1); ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#46 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#45 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#46 $ */ #include @@ -645,7 +645,7 @@ ADD_U_INT32(dptr, pid); ADD_U_INT32(dptr, sid); ADD_U_INT32(dptr, tid->port); - ADD_U_INT32(dptr, tid->machine); + ADD_MEM(dptr, &tid->machine, sizeof(u_int32_t)); return (t); } @@ -918,7 +918,7 @@ ADD_U_INT32(dptr, pid); ADD_U_INT32(dptr, sid); ADD_U_INT32(dptr, tid->port); - ADD_U_INT32(dptr, tid->machine); + ADD_MEM(dptr, &tid->machine, sizeof(u_int32_t)); return (t); } From owner-p4-projects@FreeBSD.ORG Sun Mar 5 18:40:03 2006 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 EAD4016A423; Sun, 5 Mar 2006 18:40: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 C465416A420 for ; Sun, 5 Mar 2006 18:40:02 +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 8DEF043D45 for ; Sun, 5 Mar 2006 18:40:02 +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 k25Ie2rZ074768 for ; Sun, 5 Mar 2006 18:40:02 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 k25Ie2Xe074765 for perforce@freebsd.org; Sun, 5 Mar 2006 18:40:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 18:40:02 GMT Message-Id: <200603051840.k25Ie2Xe074765@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 92804 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, 05 Mar 2006 18:40:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=92804 Change 92804 by rwatson@rwatson_peppercorn on 2006/03/05 18:39:14 Slightly revise description of previous change, in order to note that the byte order here is a property of the consumer using the APIs properly with network byte order IP address fields. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#7 (text+ko) ==== @@ -20,8 +20,10 @@ definition. Don't try to retrieve time zone information using gettimeofday(), as it's not needed, and introduces possible failure modes. -- Always read and write process32 and subject32 machine/addr fields in - network byte order. +- Don't perform byte order transformations on the addr/machine fields of + the terminal ID that appears in the process32/subject32 tokens. These + are assumed to be IP addresses, and as such, to be in network byte + order. OpenBSM 1.0 alpha 5 @@ -149,4 +151,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#6 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#7 $ From owner-p4-projects@FreeBSD.ORG Sun Mar 5 18:42:08 2006 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 7993116A486; Sun, 5 Mar 2006 18:42: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 5104716A481 for ; Sun, 5 Mar 2006 18:42:08 +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 B342543D45 for ; Sun, 5 Mar 2006 18:42:07 +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 k25Ig7LF074909 for ; Sun, 5 Mar 2006 18:42:07 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 k25Ig7oB074906 for perforce@freebsd.org; Sun, 5 Mar 2006 18:42:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 18:42:07 GMT Message-Id: <200603051842.k25Ig7oB074906@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 92805 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, 05 Mar 2006 18:42:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=92805 Change 92805 by rwatson@rwatson_peppercorn on 2006/03/05 18:41:06 Bump version string to alpha 6 now so I don't forget later. Affected files ... .. //depot/projects/trustedbsd/openbsm/VERSION#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/VERSION#8 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_5 +OPENBSM_1_0_ALPHA_6 From owner-p4-projects@FreeBSD.ORG Sun Mar 5 18:50:19 2006 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 7C9A916A424; Sun, 5 Mar 2006 18:50: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 5716316A420 for ; Sun, 5 Mar 2006 18:50:18 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1224C43D46 for ; Sun, 5 Mar 2006 18:50:18 +0000 (GMT) (envelope-from scottl@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 k25IoH4B075213 for ; Sun, 5 Mar 2006 18:50:17 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k25IoHbX075210 for perforce@freebsd.org; Sun, 5 Mar 2006 18:50:17 GMT (envelope-from scottl@freebsd.org) Date: Sun, 5 Mar 2006 18:50:17 GMT Message-Id: <200603051850.k25IoHbX075210@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 92806 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, 05 Mar 2006 18:50:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=92806 Change 92806 by scottl@scottl-x64 on 2006/03/05 18:49:18 Drivers have no need to look inside of cam_xpt_periph.h Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/advansys/advansys.c#4 edit .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/osbsd.h#4 edit .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_cam.c#3 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/advansys/advansys.c#4 (text+ko) ==== @@ -64,7 +64,6 @@ #include #include #include -#include #include #include ==== //depot/projects/scottl-camlock/src/sys/dev/hptmv/osbsd.h#4 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include #include -#include #include #include ==== //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_cam.c#3 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Sun Mar 5 19:55:40 2006 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 8BFF516A423; Sun, 5 Mar 2006 19:55:39 +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 60F3216A420 for ; Sun, 5 Mar 2006 19:55:39 +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 0F08F43D49 for ; Sun, 5 Mar 2006 19:55:38 +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 k25JtboL079501 for ; Sun, 5 Mar 2006 19:55:37 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 k25Jtbsu079498 for perforce@freebsd.org; Sun, 5 Mar 2006 19:55:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 19:55:37 GMT Message-Id: <200603051955.k25Jtbsu079498@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 92809 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, 05 Mar 2006 19:55:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=92809 Change 92809 by rwatson@rwatson_peppercorn on 2006/03/05 19:54:48 When decoding the following token types, assume that the consumer wants network byte order IP addresses and port numbers, and in some cases other multi-byte IP header fields: - AUT_IN_ADDR - AUT_IP - AUT_IPORT - AUT_SOCKINET32 - AUT_SOCKET - AUT_SOCKET32_EX When printing these fields, convert from network byte order. When encoding the following token types, assume the consumer provides IP addresses and port numbers in network byte order: - AUT_IN_ADDR - AUT_IN_ADDR_EX - AUT_SOCKINET32 - AUT_SOCKINET128 In general, prefer to hard-code the size of fields in terms of the sizes they are defined in in the BSM spec. It's not clear whether this is really better or worse than defining it in terms of local data types, since we will break nastily either way. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#37 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#47 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#37 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#36 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#37 $ */ #include @@ -1356,7 +1356,8 @@ { int err = 0; - READ_TOKEN_U_INT32(buf, len, tok->tt.inaddr.addr, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.inaddr.addr, sizeof(uint32_t), + tok->len, err); if (err) return (-1); @@ -1430,15 +1431,18 @@ if (err) return (-1); - READ_TOKEN_U_INT16(buf, len, tok->tt.ip.len, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.ip.len, sizeof(uint16_t), + tok->len, err); if (err) return (-1); - READ_TOKEN_U_INT16(buf, len, tok->tt.ip.id, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.ip.id, sizeof(uint16_t), + tok->len, err); if (err) return (-1); - READ_TOKEN_U_INT16(buf, len, tok->tt.ip.offset, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.ip.offset, sizeof(uint16_t), + tok->len, err); if (err) return (-1); @@ -1450,7 +1454,8 @@ if (err) return (-1); - READ_TOKEN_U_INT16(buf, len, tok->tt.ip.chksm, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.ip.chksm, sizeof(uint16_t), + tok->len, err); if (err) return (-1); @@ -1478,17 +1483,17 @@ print_delim(fp, del); print_mem(fp, (u_char *)(&tok->tt.ip.tos), sizeof(u_char)); print_delim(fp, del); - print_2_bytes(fp, tok->tt.ip.len, "%u"); + print_2_bytes(fp, ntohs(tok->tt.ip.len), "%u"); print_delim(fp, del); - print_2_bytes(fp, tok->tt.ip.id, "%u"); + print_2_bytes(fp, ntohs(tok->tt.ip.id), "%u"); print_delim(fp, del); - print_2_bytes(fp, tok->tt.ip.offset, "%u"); + print_2_bytes(fp, ntohs(tok->tt.ip.offset), "%u"); print_delim(fp, del); print_mem(fp, (u_char *)(&tok->tt.ip.ttl), sizeof(u_char)); print_delim(fp, del); print_mem(fp, (u_char *)(&tok->tt.ip.prot), sizeof(u_char)); print_delim(fp, del); - print_2_bytes(fp, tok->tt.ip.chksm, "%u"); + print_2_bytes(fp, ntohs(tok->tt.ip.chksm), "%u"); print_delim(fp, del); print_ip_address(fp, tok->tt.ip.src); print_delim(fp, del); @@ -1602,7 +1607,8 @@ { int err = 0; - READ_TOKEN_U_INT16(buf, len, tok->tt.iport.port, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.iport.port, sizeof(uint16_t), + tok->len, err); if (err) return (-1); @@ -1616,7 +1622,7 @@ print_tok_type(fp, tok->id, "ip port", raw); print_delim(fp, del); - print_2_bytes(fp, tok->tt.iport.port, "%#x"); + print_2_bytes(fp, ntohs(tok->tt.iport.port), "%#x"); } /* @@ -1952,7 +1958,8 @@ if (err) return (-1); - READ_TOKEN_U_INT16(buf, len, tok->tt.sockinet32.port, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet32.port, + sizeof(uint16_t), tok->len, err); if (err) return (-1); @@ -1973,7 +1980,7 @@ print_delim(fp, del); print_2_bytes(fp, tok->tt.sockinet32.family, "%u"); print_delim(fp, del); - print_2_bytes(fp, tok->tt.sockinet32.port, "%u"); + print_2_bytes(fp, ntohs(tok->tt.sockinet32.port), "%u"); print_delim(fp, del); print_ip_address(fp, tok->tt.sockinet32.addr); } @@ -1982,7 +1989,8 @@ * socket family 2 bytes * path 104 bytes */ -static int fetch_sock_unix_tok(tokenstr_t *tok, char *buf, int len) +static int +fetch_sock_unix_tok(tokenstr_t *tok, char *buf, int len) { int err = 0; @@ -2018,7 +2026,8 @@ * remote port 2 bytes * remote address 4 bytes */ -static int fetch_socket_tok(tokenstr_t *tok, char *buf, int len) +static int +fetch_socket_tok(tokenstr_t *tok, char *buf, int len) { int err = 0; @@ -2026,7 +2035,8 @@ if (err) return (-1); - READ_TOKEN_U_INT16(buf, len, tok->tt.socket.l_port, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.socket.l_port, sizeof(uint16_t), + tok->len, err); if (err) return (-1); @@ -2035,7 +2045,8 @@ if (err) return (-1); - READ_TOKEN_U_INT16(buf, len, tok->tt.socket.r_port, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.socket.r_port, sizeof(uint16_t), + tok->len, err); if (err) return (-1); @@ -2056,11 +2067,11 @@ print_delim(fp, del); print_2_bytes(fp, tok->tt.socket.type, "%u"); print_delim(fp, del); - print_2_bytes(fp, tok->tt.socket.l_port, "%u"); + print_2_bytes(fp, ntohs(tok->tt.socket.l_port), "%u"); print_delim(fp, del); print_ip_address(fp, tok->tt.socket.l_addr); print_delim(fp, del); - print_2_bytes(fp, tok->tt.socket.r_port, "%u"); + print_2_bytes(fp, ntohs(tok->tt.socket.r_port), "%u"); print_delim(fp, del); print_ip_address(fp, tok->tt.socket.r_addr); } @@ -2380,8 +2391,8 @@ if (err) return (-1); - READ_TOKEN_U_INT16(buf, len, tok->tt.socket_ex32.l_port, tok->len, - err); + READ_TOKEN_BYTES(buf, len, &tok->tt.socket_ex32.l_port, + sizeof(uint16_t), tok->len, err); if (err) return (-1); @@ -2395,8 +2406,8 @@ if (err) return (-1); - READ_TOKEN_U_INT32(buf, len, tok->tt.socket_ex32.r_port, tok->len, - err); + READ_TOKEN_BYTES(buf, len, &tok->tt.socket_ex32.r_port, + sizeof(uint16_t), tok->len, err); if (err) return (-1); @@ -2422,11 +2433,11 @@ print_delim(fp, del); print_2_bytes(fp, tok->tt.socket_ex32.type, "%#x"); print_delim(fp, del); - print_2_bytes(fp, tok->tt.socket_ex32.l_port, "%#x"); + print_2_bytes(fp, ntohs(tok->tt.socket_ex32.l_port), "%#x"); print_delim(fp, del); print_ip_address(fp, tok->tt.socket_ex32.l_addr); print_delim(fp, del); - print_4_bytes(fp, tok->tt.socket_ex32.r_port, "%#x"); + print_4_bytes(fp, ntohs(tok->tt.socket_ex32.r_port), "%#x"); print_delim(fp, del); print_ip_address(fp, tok->tt.socket_ex32.r_addr); } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#47 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#46 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#47 $ */ #include @@ -347,12 +347,12 @@ token_t *t; u_char *dptr = NULL; - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t)); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(uint32_t)); if (t == NULL) return (NULL); ADD_U_CHAR(dptr, AUT_IN_ADDR); - ADD_U_INT32(dptr, internet_addr->s_addr); + ADD_MEM(dptr, &internet_addr->s_addr, sizeof(uint32_t)); return (t); } @@ -369,13 +369,13 @@ u_char *dptr = NULL; u_int32_t type = AF_INET6; - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 5 * sizeof(u_int32_t)); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 5 * sizeof(uint32_t)); if (t == NULL) return (NULL); ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); - ADD_MEM(dptr, internet_addr, sizeof(*internet_addr)); + ADD_MEM(dptr, internet_addr, 5 * sizeof(uint32_t)); return (t); } @@ -832,21 +832,28 @@ { token_t *t; u_char *dptr = NULL; + uint16_t family; - GET_TOKEN_AREA(t, dptr, 3 * sizeof(u_char) + sizeof(u_int16_t) + - sizeof(u_int32_t)); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 2 * sizeof(uint16_t) + + sizeof(uint32_t)); if (t == NULL) return (NULL); ADD_U_CHAR(dptr, AUT_SOCKINET32); /* - * In Darwin, sin_family is one octet, but BSM defines the token - * to store two. So we copy in a 0 first. + * BSM defines the family field as 16 bits, but many operating + * systems have an 8-bit sin_family field. Extend to 16 bits before + * writing into the token. Assume that both the port and the address + * in the sockaddr_in are already in network byte order, but family + * is in local byte order. + * + * XXXRW: Should a name space conversion be taking place on the value + * of sin_family? */ - ADD_U_CHAR(dptr, 0); - ADD_U_CHAR(dptr, so->sin_family); - ADD_U_INT16(dptr, so->sin_port); - ADD_U_INT32(dptr, so->sin_addr.s_addr); + family = so->sin_family; + ADD_U_INT16(dptr, family); + ADD_MEM(dptr, &so->sin_port, sizeof(uint16_t)); + ADD_MEM(dptr, &so->sin_addr.s_addr, sizeof(uint32_t)); return (t); @@ -872,7 +879,7 @@ ADD_U_CHAR(dptr, so->sin6_family); ADD_U_INT16(dptr, so->sin6_port); - ADD_MEM(dptr, &so->sin6_addr, sizeof(so->sin6_addr)); + ADD_MEM(dptr, &so->sin6_addr, 4 * sizeof(uint32_t)); return (t); From owner-p4-projects@FreeBSD.ORG Sun Mar 5 21:48:00 2006 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 1C2A916A423; Sun, 5 Mar 2006 21:48: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 CD8FB16A420 for ; Sun, 5 Mar 2006 21:47:59 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 991F043D45 for ; Sun, 5 Mar 2006 21:47:59 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k25LlxtQ092108 for ; Sun, 5 Mar 2006 21:47:59 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k25LlxaL092105 for perforce@freebsd.org; Sun, 5 Mar 2006 21:47:59 GMT (envelope-from wsalamon@computer.org) Date: Sun, 5 Mar 2006 21:47:59 GMT Message-Id: <200603052147.k25LlxaL092105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 92819 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, 05 Mar 2006 21:48:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=92819 Change 92819 by wsalamon@gretsch on 2006/03/05 21:47:32 Audit the remaining required arguments for quotactl(), mkfifo(), and symlink() system calls. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#30 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#30 (text+ko) ==== @@ -191,6 +191,8 @@ int error; struct nameidata nd; + AUDIT_ARG(cmd, uap->cmd); + AUDIT_ARG(uid, uap->uid); if (jailed(td->td_ucred) && !prison_quotas) return (EPERM); mtx_lock(&Giant); @@ -1316,6 +1318,7 @@ struct nameidata nd; int vfslocked; + AUDIT_ARG(mode, mode); restart: bwillwrite(); NDINIT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, @@ -1531,6 +1534,7 @@ if ((error = copyinstr(path, syspath, MAXPATHLEN, NULL)) != 0) goto out; } + AUDIT_ARG(text, syspath); restart: bwillwrite(); NDINIT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#10 (text+ko) ==== @@ -547,6 +547,12 @@ /* Header, subject, and return tokens added at end */ break; + case AUE_MKFIFO: + if (ARG_IS_VALID(kar, ARG_MODE)) { + tok = au_to_arg32(2, "mode", ar->ar_arg_mode); + kau_write(rec, tok); + } + /* fall through */ case AUE_ACCESS: case AUE_CHDIR: case AUE_CHROOT: @@ -555,7 +561,6 @@ case AUE_GETATTRLIST: case AUE_NFS_GETFH: case AUE_LSTAT: - case AUE_MKFIFO: case AUE_PATHCONF: case AUE_READLINK: case AUE_REVOKE: From owner-p4-projects@FreeBSD.ORG Sun Mar 5 22:41:04 2006 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 389BF16A423; Sun, 5 Mar 2006 22:41:04 +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 E9C7116A420 for ; Sun, 5 Mar 2006 22:41:03 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B64D043D46 for ; Sun, 5 Mar 2006 22:41:03 +0000 (GMT) (envelope-from soc-andrew@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 k25Mf3TQ093970 for ; Sun, 5 Mar 2006 22:41:03 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k25Mf3SB093967 for perforce@freebsd.org; Sun, 5 Mar 2006 22:41:03 GMT (envelope-from soc-andrew@freebsd.org) Date: Sun, 5 Mar 2006 22:41:03 GMT Message-Id: <200603052241.k25Mf3SB093967@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 92820 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, 05 Mar 2006 22:41:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=92820 Change 92820 by soc-andrew@soc-andrew_serv on 2006/03/05 22:40:49 Reduce the diff to HEAD and make it easyer to read Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#32 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#32 (text+ko) ==== @@ -1220,7 +1220,8 @@ md5 * > .CHECKSUM.MD5; \ sha256 * > .CHECKSUM.SHA256; \ mv .CHECKSUM.MD5 CHECKSUM.MD5; \ - mv .CHECKSUM.SHA256 CHECKSUM.SHA256) + mv .CHECKSUM.SHA256 CHECKSUM.SHA256 \ + ) doRELEASE: release.1 release.2 ${DOCREL} release.3 release.4 \ release.5 release.6 release.7 release.8 release.9 ${EXTRAS} From owner-p4-projects@FreeBSD.ORG Sun Mar 5 23:13:45 2006 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 2049C16A423; Sun, 5 Mar 2006 23:13: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 B942F16A422 for ; Sun, 5 Mar 2006 23:13:44 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 50DB243D45 for ; Sun, 5 Mar 2006 23:13:44 +0000 (GMT) (envelope-from soc-andrew@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 k25NDiof095700 for ; Sun, 5 Mar 2006 23:13:44 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k25NDi8w095697 for perforce@freebsd.org; Sun, 5 Mar 2006 23:13:44 GMT (envelope-from soc-andrew@freebsd.org) Date: Sun, 5 Mar 2006 23:13:44 GMT Message-Id: <200603052313.k25NDi8w095697@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 92822 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, 05 Mar 2006 23:13:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=92822 Change 92822 by soc-andrew@soc-andrew_serv on 2006/03/05 23:13:24 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/errata/article.sgml#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#5 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/share/sgml/release.dsl#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#4 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/errata/article.sgml#3 (text+ko) ==== @@ -10,7 +10,7 @@ The FreeBSD Simplified Chinese Project - Original Revision: 1.73.2.1 + Original Revision: 1.73 --> %release; - + ]>
- &os; &release.bugfix; ·¢Ðа濱Îó + &os; +<![ %release.type.current [ + &release.current; +]]> +<![ %release.type.snapshot [ + &release.prev; +]]> +<![ %release.type.release [ + &release.current; +]]> + ·¢Ðа濱Îó The &os; Project - $FreeBSD: src/release/doc/zh_CN.GB2312/errata/article.sgml,v 1.3 2005/10/12 20:30:38 delphij Exp $ + $FreeBSD: src/release/doc/zh_CN.GB2312/errata/article.sgml,v 1.4 2006/03/05 15:07:55 delphij Exp $ 2000 @@ -51,21 +61,49 @@ - Õâ·ÝÎĵµÁгöÁË &os; &release.bugfix; µÄ¿±ÎóÄÚÈÝ£¬ + Õâ·ÝÎĵµÁгöÁË for &os; + + + + µÄ¿±ÎóÄÚÈÝ£¬ µÄ¿±ÎóÄÚÈÝ£¬ ÆäÖаüÀ¨ÔÚ·¢Ðа淢²¼Ö®ºó·¢ÏÖµÄÖØ´óÎÊÌ⣬ ÒÔ¼°ÔÚ·¢ÐаæµÄ½»¸¶¹¤³ÌºóÆÚ±¾Ó¦Ð´½ø·¢ÐаæÎĵµ£¬ ¶øûÓÐÀ´µÃ¼°¼ÓÈëµÄÖØÒªÐÅÏ¢¡£ ÕâЩÐÅÏ¢¿ÉÄÜ°üÀ¨°²È«¹«¸æ£¬ ÒÔ¼°¹ØÓÚ¿ÉÄÜÓ°ÏìÈí¼þºÍÎĵµµÄ²Ù×÷»ò¿ÉÓÃÐÔµÄÐÂÎÅ¡£ ÔÚ°²×°´Ë°æ±¾µÄ &os; ֮ǰ£¬ Ó¦Ê×ÏÈÔĶÁ´ËÎĵµµÄ×îа汾¡£ - Õâ·Ý &os; &release.bugfix; µÄ¿±ÎóÎĵµ½«³ÖÐøµØά»¤£¬ + Õâ·Ý &os; + + + + µÄ¿±ÎóÎĵµ½«³ÖÐøµØά»¤£¬ Ö±µ½ &os; &release.next; ·¢²¼ÎªÖ¹¡£ ½éÉÜ - Õâ·Ý¿±ÎóÎĵµ°üº¬Á˹ØÓÚ &os; &release.bugfix; + Õâ·Ý¿±ÎóÎĵµ°üº¬Á˹ØÓÚ &os; + + µÄ ×îÐÂÖØ´óÐÂÎÅ¡£ ÔÚ°²×°ÕâÒ»°æ±¾Ö®Ç°£¬ ͨ¹ý²Î¿¼Õâ·ÝÎĵµÀ´Á˽âÔÚ·¢²¼Ö®ºó£¬ ¿ÉÄÜÒѾ­·¢ÏÖ²¢ÐÞÕýµÄÎÊÌâ·Ç³£ÖØÒª¡£ @@ -86,40 +124,54 @@ - - ¸üÐÂÏûÏ¢ + + °²È«¹«¸æ + +ÔÝÎÞ°²È«¹«¸æ¡£ +]]> + +ÔÝÎÞ°²È«¹«¸æ¡£ +]]> + +ÔÝÎÞ°²È«¹«¸æ¡£ +]]> - ÔÝʱûÓÐÏà¹ØÏûÏ¢¡£ - - °²È«¹«¸æ + + δ½â¾öµÄÎÊÌâ + +ÔÝÎÞδ½â¾öµÄÎÊÌâ¡£ +]]> - ÔÝʱ»¹Ã»ÓÐÐµİ²È«¹«¸æ¡£ - +ÔÝÎÞδ½â¾öµÄÎÊÌâ¡£ +]]> - - ÒÑÖªÎÊÌâºÍ½â¾ö°ì·¨ +ÔÝÎÞδ½â¾öµÄÎÊÌâ¡£ +]]> - (2005/10/3) - ÔÚ»úÆ÷ûÓÐÖ¡»º´æʱ£¬ Òýµ¼Ê± &os;/sparc64 GENERIC - Äں˿ÉÄÜ»áÊä³öÏÂÁÐÏûÏ¢£º + - Aug 26 19:31:27 hostname getty[429]: open /dev/ttyv1: No such file or directory + + ×îÐÂÏûÏ¢ - ÕâÊÇÓÉÓÚ¼ÆËã»úûÓпÉÒÔ±» &man.syscons.4; ʶ±ðµÄͼÐÎÓ²¼þÉ豸£¬ Òò´Ë - /dev/ttyv* É豸½ÚµãÒ²¾Í²»»á×Ô¶¯´´½¨¡£ - ÕâÊÇÒ»¸öÎÞº¦µÄ´íÎóÌáʾ£¬ Äú¿ÉÒÔͨ¹ý½ûÓà - /etc/ttys ÖÐµÄ - /dev/ttyv* ÏîÀ´ÆÁ±ÎËü¡£ +ÎÞÐÂÎÅ¡£ +]]> - (2005/10/3) - ÔÚÄڴ泬¹ý 4GB µÄÔËÐÐ &os;/sparc64 µÄ¼ÆËã»úÉÏ£¬ ÎÞ·¨¼ÓÔغÍʹÓÃÄÚºËÄ£¿é¡£ - ĿǰûÓа취ÈƹýÕâ¸öÎÊÌ⣬ ÄúÖ»Äܽ«ÕâЩģ¿é¾²Ì¬Áª±àµ½¶¨ÖƵÄÄں˲ÅÐС£ +ÎÞÐÂÎÅ¡£ +]]> - (2005/10/3) - &man.kgdb.1; ¹¤¾ßÎÞ·¨ÔÚ &os;/sparc64 ÓÃÓÚµ÷ÊÔ°üº¬ trap µÄ panic¡£ - Èƹý´ËÎÊÌâµÄÁÙʱ·½·¨ÊÇʹÓà devel/gdb53¡£ +ÎÞÐÂÎÅ¡£ +]]>
==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#3 (text+ko) ==== @@ -1,8 +1,8 @@ Ö§³ÖµÄ´¦ÀíÆ÷ºÍÖ÷°å ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Simplified Chinese Project -Original Revision: 1.31 -$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/install.sgml,v 1.3 2005/04/03 17:41:21 delphij Exp $ +Original Revision: 1.32 +$FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/install.sgml,v 1.4 2006/03/05 15:07:56 delphij Exp $ install.sgml @@ -185,7 +185,7 @@ ¹¤×÷Õý³££¬ÕâÈ¡¾öÓÚÄúµÄÓ²¼þºÍ²Ù×÷ϵͳ»·¾³ (²»Í¬°æ±¾µÄ UNIX ¶ÔÈíÇýÓв»Í¬µÄÃüÃû)¡£ - &os;/&arch; ²»Ö§³ÖÈíÅÌ°²×°¡£ + &os;/&arch; ²»Ö§³ÖÈíÅÌ°²×°¡£ ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#3 (text+ko) ==== @@ -1,8 +1,8 @@ @@ -59,7 +59,7 @@ &arch.print; ¼Ü¹¹Éϳ£¼ûµÄÎÊÌâ - + ÎҵļÆËã»úÔÚÆô¶¯²¢¼ì²âÓ²¼þʱͣסÁË£¬ @@ -83,20 +83,6 @@ &os; ʹÓÃÊֲᡣ - - - ÎÒµÄϵͳʹÓà nVidia nForce3 Pro-150 оƬ×飬 - ÔÚÆô¶¯¿ì½áÊøʱϵͳͻȻֹͣÏàÓ¦»ò¿ªÊ¼¶ªÊ§Öжϡ£ - - - ÕâÖÖоƬ×éµÄ APIC ÒÔ¼°ÅäÌ×µÄ BIOS ÔÚ±¾´Î release - ʱÈÔÈ»ÓкܶàÎÊÌâ¡£ ¾¡¹Ü°´ÕÕÉÏÃæµÄ·½·¨½ûÖ¹µô ACPI Äܹ»ÈÃϵͳÕý³£¹¤×÷£¬ - Äú¿ÉÄÜ»áÏ£Íûͨ¹ýÉèÖà hint.apic.0.disabled - ÕâÑù½ÏΪ»ººÍµÄÑ¡ÏîÀ´´ïµ½Ä¿µÄ¡£ Èç¹ûÔÚ BIOS ÖдæÔÚÕâÑùµÄÑ¡Ï - Çë³¢ÊÔ¹Ø±Õ APIC Ö§³Ö¡£ ²»ÐÒµÄÊÇ£¬ һЩ»úÆ÷²¢Ã»ÓÐÕâÑùµÄÑ¡Ïî¡£ - - - ÏÈÇ°°æ±¾µÄ &os; Äܹ»Ê¶±ðÎҵľÉʽ ISA É豸£¬ ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 (text+ko) ==== @@ -1,8 +1,8 @@ - + + ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#4 (text+ko) ==== @@ -1,14 +1,14 @@ &os;/&arch; &release.current; ·¢ÐÐ˵Ã÷ The &os; Project - $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml,v 1.9 2005/10/27 17:35:48 delphij Exp $ + $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml,v 1.10 2006/03/05 15:07:56 delphij Exp $ 2000 @@ -17,6 +17,7 @@ 2003 2004 2005 + 2006 The &os; Documentation Project @@ -93,7 +94,7 @@ ·¢ÐÐ˵Ã÷Öеľø´ó¶àÊýÌõÄ¿ÊÇÔÚ˵Ã÷×Ô´Ó - &release.prev.historic; + &release.prev; ÒÔÀ´µÄ°²È«¹«¸æ¡¢ÐµÄÇý¶¯³ÌÐò»òÓ²¼þÖ§³Ö¡¢ÐµÄÃüÁî»òÊÇÑ¡Ïî¡¢ ÖØÒªµÄ´íÎóÐÞ²¹£¬ÒÔ¼°»ù±¾ÏµÍ³ÖÐÀ´×ÔµÚÈý·½µÄÈí¼þÉý¼¶¡£ ÖØÒªµÄ ports ºÍ packages ±ä¶¯£¬»ò¹ØÓÚ½»¸¶¹¤³ÌµÄ±ä¶¯Ò²»áÔÚÕâ·ÝÎĵµÖÐÌåÏÖ¡£ @@ -104,298 +105,75 @@ °²È«¹«¸æ - ÔÚ &man.fetch.1; ¹¤¾ßÖз¢ÏÖÁËÒ»´¦ÎÊÌ⣬ - Ëü¿ÉÄܵ¼Ö¶ñÒâµÄ HTTP ·þÎñÆ÷¸²¸Ç¿Í»§³ÌÐòÈÎÒⲿ·ÖµÄÄڴ棬 - ÕâÒ»ÎÊÌâÒѾ­µÃµ½ÐÞ¸´¡£ ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ - FreeBSD-SA-04:16.fetch¡£ - &merged; + ÔÚ &man.texindex.1; Öз¢ÏÖ²¢ÐÞÕýÁËÒ»´¦ÁÙʱÎļþ©¶´£¬ + Õâһ©¶´¿ÉÄܵ¼Ö±¾µØµÄ¹¥»÷ÕßÒÔÔËÐÐ &man.texindex.1; ¹¤¾ßµÄÓû§Éí·Ý¸²¸ÇÎļþ¡£ + ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ FreeBSD-SA-06:01.texindex¡£ &merged; - ÔÚ &man.procfs.5; ºÍ &man.linprocfs.5; - Öз¢ÏÖÁËÒ»´¦ÎÊÌ⣬ ËüÄܹ»ÔÊÐí¶ñÒâµÄ±¾µØÓû§¶ÁÈ¡²¿·ÖÄÚºËÄڴ棬 - »òͨ¹ýÔì³Éϵͳ panic À´ÊµÊ©±¾µØ¾Ü¾ø·þÎñ¹¥»÷£¬ - ÕâÒ»ÎÊÌâÒѾ­µÃµ½ÐÞ¸´¡£ ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ - FreeBSD-SA-04:17.procfs¡£ - &merged; + ÔÚ &man.ee.1; Öз¢ÏÖ²¢ÐÞÕýÁËÒ»´¦ÁÙʱÎļþ©¶´£¬ + Õâһ©¶´¿ÉÄܵ¼Ö±¾µØµÄ¹¥»÷ÕßÒÔÔËÐÐ &man.ee.1; µÄÓû§Éí·Ý¸²¸ÇÎļþ¡£ + ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ FreeBSD-SA-06:02.ee¡£ &merged; - ÐÞÕýÁË TELNET ¿Í»§¶Ë³ÌÐòÖеÄÁ½´¦»º³åÇøÒç³öÎÊÌâ. - ÕâЩÎÊÌâÓпÉÄܵ¼Ö¶ñÒâµÄ TELNET ·þÎñÆ÷»òÖ÷¶¯µØÍøÂç¹¥»÷Õߣ¬ - ʹ &man.telnet.1; ÒÔÖ´ÐÐËüµÄÓû§µÄÉí·ÝÖ´ÐÐÈÎÒâµÄ´úÂë¡£ - ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ - FreeBSD-SA-05:01.telnet¡£ - &merged; + ·¢ÏÖ²¢ÐÞÕýÁË &man.cpio.1; ¹¤¾ßÖеÄһϵÁЩ¶´¡£ + ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ FreeBSD-SA-06:03.cpio¡£ &merged; - ÐÞÕýÁË &man.sendfile.2; ϵͳµ÷ÓÃÖеÄÒ»´¦ÐÅϢй¶ÎÊÌ⣬ - ÕâÒ»ÎÊÌâ¿ÉÄܵ¼ÖÂÄÚºËÖеÄÒ»¶ÎËæ»úµÄ²¿·Ö±»´«µÝ³öÈ¥¡£ - ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ - FreeBSD-SA-05:02.sendfile¡£ - &merged; + ·¢ÏÖ²¢ÐÞÕýÁË &man.ipfw.4; IP ·ÖƬ´¦Àí²¿·ÖµÄÒ»´¦¿ÉÄܵ¼Ö±ÀÀ£µÄÎÊÌâ¡£ + ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ FreeBSD-SA-06:04.ipfw¡£ &merged; - ÐÞÕýÁËÔÚ &os;/amd64 ÖеÄÒ»´¦ÌØȨÌáÉýÎÊÌâ¡£ - ÕâÒ»ÎÊÌâ¿ÉÄܵ¼ÖÂûÓÐÌØȨµÄÓû§·ÃÎÊijЩÔÚûÓÐÌØȨʱÎÞ·¨·ÃÎʵÄÓ²¼þ¡£ - ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ - FreeBSD-SA-05:03.amd64¡£ - &merged; + ·¢ÏÖ²¢ÐÞÕýÁË IEEE 802.11 ɨÃè´úÂëÖеÄÒ»´¦Ç±ÔڵĻº³åÇøÒç³öÎÊÌâ¡£ + ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ FreeBSD-SA-06:05.80211¡£ &merged; - ÐÞÕýÁË - SIOCGIFCONF &man.ioctl.2; µÄÒ»¸öÐÅϢй¶ÎÊÌ⣬ - ÕâÒ»ÎÊÌâ¿ÉÄܵ¼Ö 12 ×Ö½ÚµÄÄÚºËÄڴ汻й¶¡£ - ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ - FreeBSD-SA-05:04.ifconf¡£ - &merged; + ·¢ÏÖ²¢ÐÞÕýÁËÁ½¸ö¿ÉÄܵ¼ÖÂÒ»²¿·ÖÄÚºËÄڴ汻й¶¸øÓû§µÄÎÊÌâ¡£ + ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ FreeBSD-SA-06:06.kmem. &merged; - ÐÞÕýÁË &man.cvs.1; ÖеĶദ³ÌÐòÉè¼ÆÎÊÌ⣬ ÕâЩÎÊÌâ¿ÉÄܵ¼ÖÂÔÚ - CVS ·þÎñÆ÷ÉÏÖ´ÐÐÈÎÒâ´úÂë¡£ - ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ - FreeBSD-SA-05:05.cvs¡£ - &merged; - - ÐÞÕýÁË /dev/iir É豸½ÚµãÉϵÄĬÈÏȨÏÞ´íÎó£¬ - ÕâһʧÎó»áµ¼ÖÂÔÊÐí·ÇÌØȨµÄ±¾µØÓû§·¢ËÍÃüÁî¸ø &man.iir.4; - ËùÖ§³ÖµÄÉ豸¡£ - ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ - FreeBSD-SA-05:06.iir¡£ - &merged; - - ÐÞÕýÁË &man.i386.get.ldt.2; ϵͳµ÷ÓÃÖУ¬ - ¶ÔÓÚÊäÈë²ÎÊýµÄ¼ìÑé´úÂëÖеÄÒ»´¦ÎÊÌ⣬ - ÕâÒ»ÎÊÌâ¿ÉÄܵ¼Ö½«Ä³Ð©ÄÚºËÄÚ´æµÄÄÚÈÝй¶¸øÓû§½ø³Ì¡£ - ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ - FreeBSD-SA-05:07.ldt¡£ - &merged; - - ÐÞÕýÁ˶ദ¿ÉÄܵ¼ÖÂÄÚºËÄÚ´æµÄÄÚÈÝй¶µÄ©¶´¡£ - ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ - FreeBSD-SA-05:08.kmem¡£ - &merged; - - ÓÉÓÚ²ÉÓó¬Ï̼߳¼Êõ (HTT) - µÄ´¦ÀíÆ÷ÖÐËù´æÔÚµÄÐÅϢй¶ÎÊÌ⣬ ¼ÓÈëÁËÐ嵀 sysctl ±äÁ¿ - machdep.hyperthreading_allowed¡£ - ÔÚ &os; CURRENT ÉÏÆðĬÈÏÖµÊÇ 1 - (±íʾÆôÓà HTT)£¬ ¶øÔÚ 4-STABLE ºÍ 5-STABLE ¿ª·¢·ÖÖ§£¬ - ÒÔ¼°ÊÜÖ§³ÖµÄ°²È«ÐÞ¶©·ÖÖ§ÉÏÔòÊÇ 0 (HTT ½ûÓÃ)¡£ - ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ - FreeBSD-SA-05:09.htt¡£ - &merged; - - ÐÞÕýÁË &man.tcpdump.1; ¹¤¾ßÖеÄÒ»´¦Â©¶´£¬ - Õâ¸ö©¶´Äܹ»Ê¹¶ñÒâµÄÔ¶³ÌÓû§Í¨¹ý·¢ËÍÌØÖƵÄÊý¾Ý±¨À´Òý·¢¾Ü¾ø·þÎñ¡£ - ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ - FreeBSD-SA-05:10.tcpdump¡£ - &merged; - - ÐÞÕýÁË &man.gzip.1; ¹¤¾ßÖеÄÁ½´¦°²È«Â©¶´¡£ - ÕâЩ©¶´Ê¹µÃ±¾µØÓû§Äܹ»ÔÚ½âѹËõʱÐÞ¸ÄÈÎÒâÎļþµÄȨÏÞ£¬ - »ò¸²¸Ç±¾µØÎļþ¡£ - ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ - FreeBSD-SA-05:11.gzip¡£ - &merged; - - ÐÞÕýÁË BIND 9 DNSSEC µÄÒ»´¦Â©¶´¡£ - µ±ÆôÓà DNSSEC ʱ£¬ ÕâÒ»ÎÊÌâ»áÔÊÐíÔ¶³Ì¹¥»÷Õßͨ¹ý·¢ËÍÌØÖƵÄÊý¾Ý±¨À´µ¼Ö - &man.named.8; Òì³£ÖÕÖ¹¡£ - ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ - FreeBSD-SA-05:12.bind9¡£ - &merged; - - ÐÞÕýÁË &man.ipfw.4; ÖеÄÒ»´¦¿ÉÄܵ¼Ö°üÔÚ²éѯ±íÖÐÎÞ·¨ÕýÈ·Æ¥ÅäµÄÎÊÌâ¡£ - ÕâÒ»ÎÊÌâÖ»Ó°Ïì SMP ºÍÆôÓÃÁË - PREEMPTION ÄÚºËÑ¡ÏîµÄ UP »úÆ÷¡£ - ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ - FreeBSD-SA-05:13.ipfw¡£ - &merged; + ·¢ÏÖ²¢ÐÞÕýÁË &man.pf.4; ÖÐ IP ·ÖƬ´¦Àí¹ý³ÌÖÐÒ»¸ö¿ÉÄܵ¼ÖÂÔÚÌض¨Çé¿öϱÀÀ£µÄÎÊÌâ¡£ + ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ FreeBSD-SA-06:07.pf. &merged; - ÐÞÕýÁË &man.bzip2.1; µÄÁ½´¦°²È«ÎÊÌâ¡£ Õâ°üÀ¨Ò»´¦¾Ü¾ø·þÎñ¹¥»÷ÎÊÌ⣬ - ÒÔ¼°·ÇÊÚȨµÄÎļþȨÏÞÐÞ¸ÄÎÊÌâ¡£ - ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ - FreeBSD-SA-05:14.bzip2¡£ - &merged; - - ÐÞÕýÁË &os; µÄ TCP ЭÒéÕ»ÖеÄÁ½´¦ÎÊÌâ¡£ - ÕâЩÎÊÌâ»áʹµÃ¹¥»÷ÕßÄܹ»ÈÃôß´æµÄ TCP Á¬½Ó¹ÒÆ𣬠- ´Ó¶øµ¼Ö¾ܾø·þÎñ״̬¡£ - ÒªÁ˽â¸ü¶àÐÅÏ¢£¬ Çë²Î¼û°²È«¹«¸æ - FreeBSD-SA-05:15.tcp¡£ - &merged; - ¶ÔÄں˵ĸĶ¯ - ¶ÔÓÚ 80386 ´¦ÀíÆ÷ (Ò²¾ÍÊÇ - I386_CPU ÄÚºËÅäÖÃÑ¡Ïî) µÄÖ§³Ö£¬ - ÒѾ­±»É¾È¥¡£ ʹÓÃÕâÒ»ÀàÐ굀 CPU µÄÓû§£¬ ӦʹÓà &os; - 5.X »ò¸üÔçµÄ°æ±¾¡£ + ÐÂÔöÁËÒ»¸ö sysctl ±äÁ¿ kern.malloc_stats¡£ + ÕâʹµÃÄÚºË malloc ͳ¼ÆÐÅÏ¢Äܹ»ÒÔ¶þ½øÖƽṹÁ÷µÄÐÎʽÊä³ö¸øÓû§Ì¬³ÌÐò¡£ - Äں˵÷ÊÔÆ÷ &man.ddb.4; ÐÂÔöÁË - show alllocks ÃüÁ - ÓÃÒÔÏÔʾ³ÖÓÐÐÝÃß»¥³âÌå - (ÒÔ¼°µ±Ç°Ïß³ÌËù³ÖÓеÄ×ÔÐý»¥³âÌå) µÄÇé¿öµÄÁË¡£ &merged; + ÐÂÔöÁËÒ»¸ö sysctl ±äÁ¿ vm.zone_stats¡£ + ÕâʹµÃ &man.uma.9; ·ÖÅäÆ÷µÄͳ¼ÆÐÅÏ¢Äܹ»ÒÔ¶þ½øÖƽṹÁ÷µÄÐÎʽÊä³ö¸øÓû§Ì¬³ÌÐò¡£ - ½«±ÀÀ£Ê±µÄÄÚºËת´æ (crash dump) ¸ñʽ¸ÄΪÁË - ELF ÒÔÖ§³Ö´óÄÚ´æ (³¬¹ý 4GB) µÄ»·¾³¡£ + sysctl ±äÁ¿ hw.pci.do_powerstate + ´ÓÒ»¸ö²¼¶ûÖµ±äΪÁËÒ»¸ö·¶Î§¡£ + 0 ±íʾÍêÈ«²»½øÐеçÔ´¹ÜÀí£¬ + 1 ±íʾ½øÐб£ÊصĵçÔ´¹ÜÀí£¬ + ´Ëʱµ¼Ö³öÏÖÎÊÌâµÄÉ豸ÀàÐͻᱻ¼ÓÈë¼àÊÓÁÐ±í£¬ + 2 ±íʾ¼¤½øµÄµçÔ´¹ÜÀí£¬ + ËùÓжÔÓÚϵͳ²»Ö²úÉúÖÂÃüÓ°ÏìµÄÉ豸ÀàÐͶ¼±»¼ÓÈëÁÐ±í£¬ + ¶ø 3 Ôò±íʾÎÞÌõ¼þ¹Ø±ÕÈ«²¿É豸¡£ + ĬÈÏֵΪ 1¡£ - &man.ichsmb.4; Çý¶¯ÏÖÔÚ¿ÉÒÔ×÷Ϊ¿É¼ÓÔØÄÚºËÄ£¿éʹÓÃÁË¡£ + ÏÖÔÚ GENERIC ÄÚºËĬÈÏÆôÓà + SMP Ö§³ÖÁË¡£ - &man.jail.8; ¹¦ÄÜÏÖÔÚÖ§³ÖÒ»¸öÐ嵀 sysctl - security.jail.chflags_allowed£¬ - ÓÃÓÚ¿ØÖÆ &man.chflags.1; ÔÚ jail ÖеÄÐÐΪ¡£ - Èç¹ûÉèÖÃΪ 0 (ĬÈÏÖµ)£¬ jail ÖÐµÄ root - Óû§½«±»ÈÏΪÊÇ·ÇÌØȨÓû§£» Èç¹ûÉèÖÃΪ 1£¬ - Ôò jail ÖÐµÄ root Óû§»á±»ÊÓΪÓëδ jail µÄ root - Óû§Ò»Ñù¡£ &merged; - - sysctl ±äÁ¿ security.jail.getfsstatroot_only - ±»¸ÄÃûΪ security.jail.enforce_statfs - ²¢Äܹ»Ö§³ÖÏÂÊö²ßÂÔ£º - - - - - - - - Öµ - ²ßÂÔ - - + ¼ÓÈëÁËÓÃÒÔչʾ ¼¯È¨Ê½·ÃÎÊ¿ØÖÆ¿ò¼Ü µÄʾ·¶ÄÚºËÅäÖÃÎļþ + src/sys/arch/conf/MAC¡£ - - - 0 - ¶ÔÏÔʾȫ²¿¹Ò½Óµã (mount point) ²»ÉèÈκÎÏÞÖÆ¡£ - - - - 1 - Ö»ÏÔʾ jail µÄ chroot ֮ϵĹҽӵ㣬 - ÇÒÖ»ÏÔʾËüÔÚ¹Ò½Óµã֮ϵIJ¿·Ö (ÀýÈ磬 Èç¹û jail µÄ chroot Ŀ¼ÊÇ - /jails/foo ¶øÓÐÒ»¸ö¹Ò½ÓµãÊÇ - /jails/foo/usr/home£¬ - ÔòÖ»ÏÔʾ /usr/home)¡£ - - - - 2 - Ö»ÏÔʾ jail µÄ chroot Ŀ¼ËùÔڵĹҽӵ㡣 - - - - - - ¼ÓÔØÆ÷±äÁ¿ debug.mpsafevm - ĬÈÏÖÃΪÆôÓÃÁË¡£ &merged; - - ¼ÓÈëÁË &man.memguard.9;£¬ Ò»ÖÖÓÃÀ´°ïÖú¼ì²â - Ðü¹ÒÖ¸Õë²Ù×÷ ÇéÐεÄÄÚºËÄÚ´æ·ÖÅäÆ÷¡£ - ÒªÀûÓÃÕâÒ»¹¦ÄÜ£¬ ¾Í±ØÐëÃ÷È·µØͨ¹ý options - DEBUG_MEMGUARD À´ÆôÓÃËü£¬ ²¢¶ÔÄں˽øÐÐС·ù¶ÈµÄÐ޸ġ£ - Ò»°ã¶øÑÔ£¬ ÕâÊÇΪÄں˿ª·¢ÈËÔ±ÌṩµÄ¹¦ÄÜ¡£ - - struct ifnet ÒÔ¼°ÍøÂç½Ó¿Ú API - ·¢ÉúÁ˱仯¡£ ÓÉÓÚ ABI ²»¼æÈÝ£¬ - ËùÓÐûÓÐÔÚ &os; »ù±¾ÏµÍ³ÖÐÌṩµÄÇý¶¯³ÌÐò£¬ - ¶¼±ØÐë½øÐиÄдÒÔʹÓÃÐ嵀 API£¬ - ²¢ÖØбàÒë·½¿ÉÕý³£Ê¹Óᣠ- - һϵÁÐ ULE µÄÎÊÌâµÃµ½ÁËÐÞÕý¡£ &merged; - - ÔÚ VFS Õ»ÖмÓÈëÁËϸËø£¬ ÕâʹµÃËüµÄ´ó²¿·ÖµÃÒÔÍÑÀëÈ«¾ÖËø¡£ - ÕâÒ»ÌØÐÔÔÚ alpha¡¢ amd64£¬ ÒÔ¼° i386 ƽ̨Éϱ»Ä¬ÈÏ´ò¿ª£¬ - ²¢¿ÉÒÔͨ¹ýÉèÖüÓÔØÆ÷±äÁ¿ (ÒÔ¼° sysctl ±äÁ¿) - debug.mpsafevfs Ϊ - 0 À´½ûÓÃËü¡£ - - Ò»¸ö¹ØÓÚÔÚ¶Ô´¦ÀíÆ÷¼äÖÐ¶Ï (IPI) ½øÐд¦ÀíʱµÄÎÊÌâµÃÒÔÐÞÕý£¬ - ÕâÒ»ÎÊÌâ¿ÉÄܵ¼Ö SMP ϵͳÔÚÖØÔØʱ±ÀÀ£¡£ ¸ü¶àϸ½Ú£¬ ¿ÉÒÔÔÚ¿±Îó˵Ã÷ - FreeBSD-EN-05:03.ipi - ÖÐÕÒµ½¡£ &merged; - - System V IPC ¶ÔÏó (ÏûÏ¢¶ÓÁС¢ ÐźÅÁ¿ºÍ¹²ÏíÄÚ´æ) - ÏÖÔÚÌṩÁËÇ¿ÖÆÐÔ·ÃÎÊ¿ØÖƲßÂÔ£¬ - ÌرðÊÇ &man.mac.biba.4;, &man.mac.mls.4;, &man.mac.stub.4;, ºÍ - &man.mac.test.4; µÄÖ§³Ö¡£ - - ½«´«Í³ PCI ÇŵÄÄÚ´æ·ÖÅ䷶Χ£¬ - ÏÞÖƵ½ÁË RAM ¶¥²¿µÄ 32MB¡£ Ðí¶à½ÏÔçµÄ¡¢ ¾ÉµÄÇÅÓ²¼þ£¬ - Ö»ÔÊÐí·ÖÅäÕâÒ»·¶Î§µÄÄÚ´æ¡£ ÕâÒ»ÐÞ¸ÄÖ»±»Ó¦ÓÃÓÚÄÇЩûÓÐͨ¹ý BIOS - Ö¸¶¨Äڴ淶ΧµÄÉ豸¡£ ËüÐÞÕýÁË CardBus ÇÅ (&man.pccbb.4;) - µÄ bad Vcc ´íÎó¡£ &merged; - - ÒÔ debug ¿ªÍ·µÄ &man.sysctl.3; MIB£¬ - ÏÖÔÚÐèҪʹÓÃÄÚºËÑ¡Ïî options SYSCTL_DEBUG - ²ÅÄÜʹÓÃÁË¡£ ÕâһѡÏîĬÈϲ»ÆôÓᣠ- - ÔÚÐí¶àÇý¶¯ÖмÓÈëÁËͨÓÃµÄ &man.tty.4; Çý¶¯½Ó¿Ú£¬ - Õâ°üÀ¨ - &man.cx.4; ({tty,cua}x), - &man.cy.4; ({tty,cua}c), - &man.digi.4; ({tty,cua}D), - &man.rc.4; ({tty,cua}m), - &man.rp.4; ({tty,cua}R), - &man.sab.4; ({tty,cua}z), - &man.si.4; ({tty,cua}A), - &man.sio.4; ({tty,cua}d), - sx ({tty,cua}G), - &man.uart.4; ({tty,cua}u), - &man.ubser.4; ({tty,cua}y), - &man.ucom.4; ({tty,cua}U), ÒÔ¼° - &man.ucycom.4; ({tty,cua}y) - ²¢½øÐÐÁ˱ØÒªµÄÖØд¡£ Çë×¢Ò⣬ /etc/remote - ºÍ /etc/ttys Ò²ËæÖ®½øÐÐÁ˸üС£ - - ¼ÓÈëÁË &man.vkbd.4; Çý¶¯¡£ Õâ¸öÇý¶¯ÌṩÁËÒ»¸ö¿ÉÒÔÓÃÓÚʵÏÖÀàËÆÓÚ - &man.pty.4; Ö®ÓÚÖÕ¶ËËùÍê³ÉµÄ¹¦ÄܵÄÐéÄâ AT ¼üÅ̵ÄÈí¼þ»·»Ø»úÖÆ¡£ - - - - &os; ÏÖÔÚ¼´Ê¹ÔÚµ¥´¦ÀíÆ÷ϵͳÉÏҲʹÓþֲ¿ APIC - ¼ÆʱÆ÷ÁË¡£ - - ÔÚ i386 ºÍ ia64 ƽ̨ÉÏ£¬ - ĬÈ쵀 HZ ²ÎÊý (Ëü¿ØÖÆÐí¶àÄں˼ÆʱÆ÷) - ´ÓĬÈ쵀 100 Ìá¸ßµ½ÁË 1000¡£ - ÔÚ amd64 ÉÏ£¬ Õâ¸öÖµ´Ó - 1024 ¼õÉÙµ½ÁË 1000£¬ - ÒÔ¼õÉÙºÍÆäËûϵͳʱÖÓÖ®¼äµÄͬ²½Ð§¹û¡£ - - shell ÃüÁîµÄ×î´ó³¤¶È£¬ ´ÓÔ­Ï鵀 128 - ±äΪÁË PAGE_SIZE¡£ ĬÈÏÇé¿öÏ£¬ - Õâ¸öÖµÓ¦¸ÃÊÇ 4KB (i386, pc98, amd64, ºÍ powerpc) »ò 8KB (sparc64 - ºÍ ia64)¡£ Æä½á¹ûÊÇ£¬ ¼æÈÝÄ£¿éÐèÒªÖØбàÒ룬 - ÒÔ±ãÓÚÄÚºËÖеÄÊý¾Ý½á¹¹±£³Öͬ²½¡£ - - ¼ÓÈëÁËÐ嵀 vm.blacklist ±äÁ¿¡£ - Ëü¿ÉÒÔÓÃÓÚÆÁ±ÎÒ»²¿·ÖÎïÀíµØÖ·µÄÄÚ´æ¿Õ¼ä£¬ - ÕâЩÄÚ´æ²»»á¼ÓÈëµ½¿ÕÏÐÒ³±íÖУ¬ - Òò¶ø»á±» &os; VM ºöÂÔµô¡£ ºöÂÔµôµÄÄÚ´æÒ³£¬ - Ò²»áÔÚÏûÏ¢»º´æÖÐÓèÒÔÁгö¡£ - Òýµ¼ÇøºÍ loader µÄ±ä»¯ - ¼ÓÈëÁËÖ§³Ö´®¿Ú¿ØÖÆ̨µÄ - boot0 °æ±¾¡£ ¿ÉÒÔͨ¹ý &man.boot0cfg.8; - ²¢Ê¹Óà /boot/boot0sio - ½«ÆäдÈë´ÅÅÌ¡£ + ÐÂÔöÁËÑ¡Ïî £¬ + ÓÃÒÔÔÚ /boot.config »ò boot: + ÃüÁîÐÐÉèÖà boot2 µÄ´®¿ÚËÙÂÊ¡£ - cdboot ÈƹýÁËÓÉÓÚ BIOS - ÎÊÌâµ¼ÖÂijЩϵͳÎÞ·¨´Ó USB ¹âÇýÆô¶¯µÄÎÊÌâ¡£ - - ¼ÓÔØÆ÷ÃüÁî autoboot - ÏÖÔÚÖ§³ÖÌáʾ·û²ÎÊýÁË¡£ - - autoboot ¼ÓÔØÆ÷ÃüÁîÏÖÔÚÄܹ»ÔÚ - autoboot_delay ±äÁ¿ÉèÖÃΪ - -1 ʱÍêÈ«½ûÖ¹Óû§´ò¶ÏÆô¶¯¹ý³ÌÁË¡£ &merged; - - Ôö¼ÓÁËÒ»¸öÓÃÒÔÉèÖà hint.atkbd.0.flags=0x1 - µÄ¼ÓÔØÆ÷²Ëµ¥Ñ¡Ïî¡£ ÕâÒ»ÉèÖÃʹµÃ USB ¼üÅÌÄܹ»ÔÚûÓÐ½Ó PS/2 - ¼üÅÌʱÕý³£Ê¹Óᣠ- - ĬÈϽûÓÃÁË beastie Òýµ¼²Ëµ¥¡£ + ÐÂÔöÁË loader ±äÁ¿ + comconsole_speed ÓÃÒÔµ÷Õû´®¿ÚËÙÂÊ¡£ + Èç¹ûÇ°Ò»½×¶ÎÖÐÒýµ¼¼ÓÔØÆ÷ÒªÇóʹÓô®¿Ú¿ØÖÆ̨£¬ + ÔòĬÈϵÄËÙÂÊ»á¸ù¾Ýµ±Ç°µÄ´®¿ÚËÙÂÊÈ·¶¨£¬ ·ñÔò½«ÉèΪ 9600 + »ò±àÒëʱÅäÖõÄÄÚºËÑ¡Ïî BOOT_COMCONSOLE_SPEED ËùÖ¸¶¨µÄÖµ¡£ @@ -404,1140 +182,413 @@ Ó²¼þÖ§³Ö - &man.acpi.4; Çý¶¯ÐÂÔöÁËÔÚ¹ÒÆðʱ£¬ - ½« ACPI ºÍ PCI É豸¹Ø±Õ»òÖÃΪµÍ¹¦ºÄģʽµÄ״̬£¬ - ²¢ÔÚ»Ö¸´Ê±ÖØдò¿ª¡£ ÕâÒ»ÐÐΪ¿ÉÒÔͨ¹ý½« - debug.acpi.do_powerstate ºÍ - hw.pci.do_powerstate ÕâÁ½¸ö sysctl - ÉèÖÃΪ 0 À´½ûÓᣠ+ &man.acpi.thermal.4; Çý¶¯ÏÖÔÚÖ§³Ö±»¶¯½µÎÂÁË¡£ - ¼ÓÈëÁËÓÃÓÚ IBM ±Ê¼Ç±¾µÄ &man.acpi.ibm.4; - Çý¶¯¡£ ËüÌṩÁËÐí¶àÈȼü£¬ ÒÔ¼°¶ÁÈ¡·çÉÈ״̬ºÍζȴ«¸ÐÆ÷µÄÄÜÁ¦¡£ + ÔÚ &man.crypto.9; ×ÓϵͳÖмÓÈëÁ˶ÔÓÚ VIA C3 ´¦ÀíÆ÷ÖÐ PadLock °²È«Ð­´¦ÀíÆ÷µÄÖ§³Ö¡£ + &merged; - ¼ÓÈëÁËÓÃÓÚ´¦Àí Fujitsu ±Ê¼Ç±¾É쵀 - &man.acpi.4;-¿ØÖÆ°´Å¥ &man.acpi.fujitsu.4; Çý¶¯¡£ + ÐÞÕýÁ˵¼Ö &man.ichsmb.4; ÄÚºËÄ£¿éÎÞ·¨Ð¶ÔصÄÎÊÌâ¡£ - ¼ÓÈëÁËÓÃÓÚÖ§³ÖÐí¶à Sony ±Ê¼Ç±¾ÉÏ driver, - Sony ±Ê¼Ç±¾¿ØÖÆÆ÷µÄ acpi_sony Çý¶¯¡£ + ¼ÓÔØÆ÷±äÁ¿ debug.mpsafevfs + ÏÖÔÚĬÈÏÉèΪ 1 ÁË¡£ - ¶Ô &man.atkbdc.4;¡¢ &man.atkbd.4; ÒÔ¼° &man.psm.4; - Çý¶¯½øÐÐÁËÖØд£¬ ÒÔ±ãÈÃËüÃǸü¼Ó¶ÀÁ¢ÓÚ×ÜÏߣ¬ - ²¢ÌṩÁË¶Ô sparc64 ƽ̨µÄ EBus µÄÖ§³Ö¡£ + smbios(4) Çý¶¯¼ÓÈëÁ˶ÔÓÚ amd64 µÄÖ§³Ö¡£ - ÏÂÁÐÇý¶¯³ÌÐòÒѾ­¼ÓÈëÁË - GENERIC Äں˲¢Ä¬ÈÏÆôÓ㺠- &man.atkbdc.4;¡¢ - &man.atkbd.4;¡¢ - creator(4)¡¢ - machfb(4)¡¢ - &man.syscons.4;¡¢ - &man.ohci.4;¡¢ - &man.psm.4;¡¢ - &man.ukbd.4;¡¢ - &man.ums.4;¡¢ - and &man.usb.4;¡£ + ¼ÓÈëÁË tnt4882(4) Çý¶¯£¬ ËüÄܹ»Ö§³Ö National Instruments + PCI-GPIB ¿¨¡£ - ¼ÓÈëÁËÓÃÓÚÇý¶¯ SBus/EBus &ultrasparc; - ÐͺÅÉϵÄijЩ¸¨Öú I/O ¹¦ÄÜµÄ &man.auxio.4; Çý¶¯¡£ &merged; + ÐÂÔöÁ˼ÓÔØÆ÷±äÁ¿ + hw.apic.enable_extint¡£ + Õâ¸ö±äÁ¿¿ÉÒÔÓÃÀ´±íʾ²»ÒªÆÁ±ÎµÚÒ»¸ö + I/O APIC É쵀 ExtINT Òý½Å¡£ ÖÁÉÙÓÐÒ»ÖÖÓÃÓÚ Intel Pentium III + µÄоƬ×éÐèÒªÕâÒ»ÉèÖ㬠¼´Ê¹ËùÓÐµÄ 8259A Òý½Å¶¼ÒÑÆÁ±Î¡£ + ĬÈÏÉèÖÃÈÔÈ»ÊÇÆÁ±Î ExtINT Òý½Å¡£ - ¼ÓÈëÁËÓÃÓÚÖ§³ÖƵ¼ûÓÚ Sun Exx00 - ·þÎñÆ÷ÉÏ clock-board É豸µÄ clkbrd Çý¶¯¡£ + + ¶àýÌåÖ§³Ö >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 6 00:24:11 2006 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 EF31F16A423; Mon, 6 Mar 2006 00:24:10 +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 AD1D116A420 for ; Mon, 6 Mar 2006 00:24:10 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A19C43D45 for ; Mon, 6 Mar 2006 00:24:10 +0000 (GMT) (envelope-from scottl@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 k260OAOF098194 for ; Mon, 6 Mar 2006 00:24:10 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k260OA16098191 for perforce@freebsd.org; Mon, 6 Mar 2006 00:24:10 GMT (envelope-from scottl@freebsd.org) Date: Mon, 6 Mar 2006 00:24:10 GMT Message-Id: <200603060024.k260OA16098191@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 92825 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, 06 Mar 2006 00:24:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=92825 Change 92825 by scottl@scottl-junior on 2006/03/06 00:23:26 Define LOCKING_WORKED_AS_IT_SHOULD. It doesn't work, but this is a starting point. Note that the locking semantics in here are NOT how it will work in the future. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.h#6 edit .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_pci.c#6 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.h#6 (text+ko) ==== @@ -636,8 +636,8 @@ } #else +#define LOCKING_WORKED_AS_IT_SHOULD #ifdef LOCKING_WORKED_AS_IT_SHOULD -#error "Shouldn't Be Here!" #define MPT_IFLAGS INTR_TYPE_CAM | INTR_ENTROPY | INTR_MPSAFE #define MPT_LOCK_SETUP(mpt) \ mtx_init(&mpt->mpt_lock, "mpt", NULL, MTX_DEF); \ ==== //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_pci.c#6 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Mar 6 05:29:20 2006 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 8298616A423; Mon, 6 Mar 2006 05:29:19 +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 5C09716A420 for ; Mon, 6 Mar 2006 05:29:19 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28CCF43D45 for ; Mon, 6 Mar 2006 05:29:19 +0000 (GMT) (envelope-from soc-andrew@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 k265TJYa024390 for ; Mon, 6 Mar 2006 05:29:19 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k265TIYE024387 for perforce@freebsd.org; Mon, 6 Mar 2006 05:29:18 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 6 Mar 2006 05:29:18 GMT Message-Id: <200603060529.k265TIYE024387@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 92828 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, 06 Mar 2006 05:29:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=92828 Change 92828 by soc-andrew@soc-andrew_serv on 2006/03/06 05:29:03 Lua should be installed to /usr/local on the install media Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#33 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#33 (text+ko) ==== @@ -801,7 +801,7 @@ # XXX Make the ftp site changeable ( /usr/bin/fetch -ARr -o ${RD}/bsdinstaller/lua.tbz \ ftp://ftp.freebsd.org/pub/FreeBSD/ports/${MACHINE_ARCH}/packages-7-current/Latest/lua.tbz && \ - pkg_add -R -P ${RD}/bsdinstaller/root ${RD}/bsdinstaller/lua.tbz ) + pkg_add -R -P ${RD}/bsdinstaller/root/usr/local ${RD}/bsdinstaller/lua.tbz ) rm ${RD}/bsdinstaller/lua.tbz # Reset the library directories ldconfig /lib /usr/lib /usr/lib/compat /usr/local/lib From owner-p4-projects@FreeBSD.ORG Mon Mar 6 08:15:02 2006 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 1217616A423; Mon, 6 Mar 2006 08:15: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 CA41D16A420 for ; Mon, 6 Mar 2006 08:15:01 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F85143D45 for ; Mon, 6 Mar 2006 08:15:01 +0000 (GMT) (envelope-from soc-andrew@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 k268F1m6034188 for ; Mon, 6 Mar 2006 08:15:01 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k268F1V4034173 for perforce@freebsd.org; Mon, 6 Mar 2006 08:15:01 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 6 Mar 2006 08:15:01 GMT Message-Id: <200603060815.k268F1V4034173@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 92839 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, 06 Mar 2006 08:15:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=92839 Change 92839 by soc-andrew@soc-andrew_serv on 2006/03/06 08:13:56 Make dhclient work Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#34 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#34 (text+ko) ==== @@ -994,7 +994,7 @@ tar --exclude CVS -cf - -C ${RD}/bsdinstaller/root/$$dir . | \ tar xf - -C ${RD}/bsdinstaller/mfs_root/$$dir; \ done ) - ( for dir in dev mnt proc root tmp usr var/run ; do \ + ( for dir in dev mnt proc root tmp usr var/run var/db ; do \ mkdir -p ${RD}/bsdinstaller/mfs_root/$$dir; \ done ) cp ${.CURDIR}/bsdinstaller/bsdinstaller ${RD}/bsdinstaller/mfs_root/etc/rc.d/ From owner-p4-projects@FreeBSD.ORG Mon Mar 6 08:15:03 2006 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 01AFD16A42C; Mon, 6 Mar 2006 08:15: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 55E7D16A425 for ; Mon, 6 Mar 2006 08:15:02 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E233943D45 for ; Mon, 6 Mar 2006 08:15:01 +0000 (GMT) (envelope-from kmacy@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 k268F1eP034204 for ; Mon, 6 Mar 2006 08:15:01 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k268F1Ph034193 for perforce@freebsd.org; Mon, 6 Mar 2006 08:15:01 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 6 Mar 2006 08:15:01 GMT Message-Id: <200603060815.k268F1Ph034193@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92840 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, 06 Mar 2006 08:15:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=92840 Change 92840 by kmacy@kmacy_storage:sun4v_work on 2006/03/06 08:13:57 add support for data protection faults and remove any kernel dependency on TSBs for 8K pages Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/errata.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#18 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#17 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#7 (text+ko) ==== @@ -180,8 +180,12 @@ ASSYM(TV_SIZE_BITS, TV_SIZE_BITS); #else ASSYM(VTD_REF, VTD_REF); -ASSYM(TTARGET_VA_MASK, TTARGET_VA_MASK); +ASSYM(VTD_W, VTD_W); +ASSYM(VTD_SW_W, VTD_SW_W); ASSYM(TTARGET_VA_BITS, TTARGET_VA_BITS); +ASSYM(TTARGET_VA_SHIFT, TTARGET_VA_SHIFT); +ASSYM(TTARGET_CTX_SHIFT, TTARGET_CTX_SHIFT); + ASSYM(THE_SHIFT, THE_SHIFT); #endif ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#18 (text+ko) ==== @@ -43,9 +43,11 @@ #include #include #include +#include #include "assym.s" +#define PMAP_DEBUG #if 1 #define SPILL_FILL_MAGIC_TRAP_ON nop #define SPILL_FILL_MAGIC_TRAP_OFF nop @@ -258,8 +260,10 @@ .endm .macro insn_miss - MAGIC_TRAP_ON - illtrap + GET_MMFSA_SCRATCH(%g1) ! insn 1 + GET_HASH_SCRATCH(%g2) ! insn 2,3 + ba,pt %xcc, tsb_miss + mov VTD_REF, %g3 .align 32 .endm @@ -272,20 +276,25 @@ .macro data_miss GET_MMFSA_SCRATCH(%g1) ! insn 1 GET_HASH_SCRATCH(%g2) ! insn 2,3 - GET_TSB_SCRATCH(%g3) ! insn 4,5 + add %g1, MMFSA_D_, %g1 ! set fsa to data ba,pt %xcc, tsb_miss - add %g1, MMFSA_D_, %g1 ! set fsa to data + mov VTD_REF, %g3 .align 32 .endm .macro data_prot - MAGIC_TRAP_ON - illtrap + GET_MMFSA_SCRATCH(%g1) ! insn 1 + GET_HASH_SCRATCH(%g2) ! insn 2,3 + add %g1, MMFSA_D_, %g1 ! set fsa to data + ba,pt %xcc, tsb_miss + mov VTD_W, %g3 .align 32 .endm .macro tl0_align MAGIC_TRAP_ON + MAGIC_TRAP_ON + MAGIC_TRAP_ON illtrap .align 32 .endm @@ -641,7 +650,7 @@ tl0_reserved 18 ! 0x50-0x61 tl0_watch_virt_62: tl0_gen T_VA_WATCHPOINT ! 0x62 - tl0_reserved 10 ! 0x63-0x6c + tl0_reserved 9 ! 0x63-0x6b tl0_data_prot_6c: data_prot ! 0x6c tl0_reserved 8 ! 0x6d-0x75 @@ -1016,98 +1025,136 @@ END(tl0_intr) +! The HV documentation is wrong +! mappings are not already flushed befor taking a +! data protection trap +! IN: +! %g2 == hash base +! %g3 == flags +! %g5 == fault addr +! %g6 == context +! %g1,%g4,%g7 temps +! OUT: +! %g6 <- TAG +ontario_unmap_addr_errata_begin: + ! do the unmap call + mov %o0, %g1 + mov %o1, %g4 + mov %o2, %g7 + mov %g5, %o0 + mov %g6, %o1 + mov MAP_ITLB|MAP_DTLB, %o2 + ta MMU_UNMAP_ADDR + mov %g1, %o0 + mov %g4, %o1 + mov %g7, %o2 + srlx %g5, TTARGET_VA_SHIFT, %g4 + sllx %g6, TTARGET_CTX_SHIFT, %g6 + ba,pt %xcc, tsb_miss_fault_handler + or %g6, %g4, %g6 +ontario_unmap_addr_errata_end: + + + ! %g1==mmfsa (RA) ! %g2==hash base (VA) -! %g3==TSB (RA) +! %g3==TTE flags ! internal usage: ! %g1==absolute index +! %g2==pointer to hash entry +! %g3==flag bits, TSB (RA) ! %g4==fault type,entry tag -! %g5==fault address,entry data -! %g6==hash size,tag, temp +! %g5==tag +! %g6==hash size, temp ! %g7 temp ENTRY(tsb_miss) ldda [%g0 + %g1]ASI_LDTD_REAL, %g4 - ! %g4 == fault type %g5 == fault address - ! ignore context for now + addx %g1, 0x10, %g1 + ldda [%g0 + %g1]ASI_LDTD_REAL, %g6 + MAGIC_TRAP_ON +/* these two instructions will be patched + * at some point + */ +#ifdef ONTARIO_UNMAP_ERRATA + cmp %g3, VTD_W + be,pn %xcc, ontario_unmap_addr_errata_begin +#endif + srlx %g5, TTARGET_VA_SHIFT, %g1 + sllx %g6, TTARGET_CTX_SHIFT, %g6 + or %g6, %g1, %g6 ! %g6 == search tag + + +tsb_miss_fault_handler: + + ! %g4 == fault type %g5 == fault addr %g6 == tag ! XXX only handle normal miss for now - mov 1, %g7 +#ifdef PMAP_DEBUG + cmp %g6, %g0 ! NULL ptr deref in kernel + bne,pt %xcc, 4f + nop +tsb_miss_null_deref: + illtrap ! give up +4: +#endif + mov 1, %g7 sllx %g7, PAGE_SHIFT, %g7 sub %g7, 1, %g7 ! %g7==PAGE_MASK - MAGIC_TRAP_ON - and %g2, %g7, %g6 ! size stored in lower 13 bits + and %g2, %g7, %g4 ! size stored in lower 13 bits andn %g2, %g7, %g2 ! actual VA of hash ! XXX only handle 8k page miss ! calculate hash index srlx %g5, PAGE_SHIFT, %g1 ! absolute hash index - sllx %g6, (PAGE_SHIFT - THE_SHIFT), %g6 ! size of hash in THEs - sub %g6, 1, %g6 ! THE_MASK - and %g1, %g6, %g6 ! masked hash index - sllx %g6, THE_SHIFT, %g6 ! masked hash offset - srlx %g5, PAGE_SHIFT_4M, %g7 ! VA tag + sllx %g4, (PAGE_SHIFT - THE_SHIFT), %g4 ! size of hash in THEs + sub %g4, 1, %g4 ! THE_MASK + and %g1, %g4, %g4 ! masked hash index + sllx %g4, THE_SHIFT, %g4 ! masked hash offset ! fetch hash entries - exit when we find what were looking for ! %g2==entry base - add %g2, %g6, %g2 ! base + offset == entry base + add %g2, %g4, %g2 ! base + offset == entry base ! entry 0 -tsb_miss_lookup_0: - mov 1, %g6 - sllx %g6, TTARGET_VA_BITS, %g6 - subx %g6, 1, %g6 ! %g6 == TTARGET_VA_MASK - + ! %g1 == abs index %g2 == THE pointer %g3 == flags + ! %g4 <- tag %g5 <- data + ! %g6 == search tag %g7 == PAGE_MASK +tsb_miss_lookup_0: ldda [%g2 + %g0]ASI_LDTD_N, %g4 - and %g4, %g6, %g6 ! mask off context bits - cmp %g6, %g0 ! entry tag == 0 + cmp %g4, %g0 ! entry tag == 0 ? be,pn %xcc, 1f nop - cmp %g6, %g7 ! entry tag == VA tag? + cmp %g4, %g6 ! entry tag == VA tag? be,pn %xcc, 2f nop ! entry 1 tsb_miss_lookup_1: - mov 1, %g6 - sllx %g6, TTARGET_VA_BITS, %g6 - subx %g6, 1, %g6 ! %g6 == TTARGET_VA_MASK - - add %g2, 16, %g2 + add %g2, 16, %g2 ! next THF ldda [%g2 + %g0]ASI_LDTD_N, %g4 - and %g4, %g6, %g6 ! mask off context bits - cmp %g6, %g0 ! entry tag == 0 + cmp %g4, %g0 ! entry tag == 0 ? be,pn %xcc, 1f nop - cmp %g6, %g7 ! entry tag == VA tag? + cmp %g4, %g6 ! entry tag == search tag? be,pn %xcc, 2f nop ! entry 2 tsb_miss_lookup_2: - mov 1, %g6 - sllx %g6, TTARGET_VA_BITS, %g6 - subx %g6, 1, %g6 ! %g6 == TTARGET_VA_MASK - - add %g2, 16, %g2 + add %g2, 16, %g2 ! next THF ldda [%g2 + %g0]ASI_LDTD_N, %g4 - and %g4, %g6, %g6 ! mask off context bits - cmp %g6, %g0 ! entry tag == 0 + cmp %g4, %g0 ! entry tag == 0 ? be,pn %xcc, 1f nop - cmp %g6, %g7 ! entry tag == VA tag? + cmp %g4, %g6 ! entry tag == search tag? be,pn %xcc, 2f nop ! entry 3 tsb_miss_lookup_3: - mov 1, %g6 - sllx %g6, TTARGET_VA_BITS, %g6 - subx %g6, 1, %g6 ! %g6 == TTARGET_VA_MASK - - add %g2, 16, %g2 + add %g2, 16, %g2 ! next THF ldda [%g2 + %g0]ASI_LDTD_N, %g4 - and %g4, %g6, %g6 ! mask off context bits - cmp %g6, %g0 ! entry tag == 0 + cmp %g4, %g0 ! entry tag == 0 ? be,pn %xcc, 1f nop - cmp %g6, %g7 ! entry tag == VA tag? + cmp %g4, %g6 ! entry tag == search tag? be,pn %xcc, 2f nop tsb_miss_not_found: @@ -1119,32 +1166,57 @@ tsb_miss_found: 2: !found - ! set referenced bit unconditionally for now - or %g5, VTD_REF, %g5 - stx %g5, [%g2 + 8] ! set ref bit + ! %g1 == abs index %g2 == THE pointer %g3 == flags + ! %g4 == tag %g5 == data %g7 == PAGE_MASK + ! %g3 <- TSB RA %g6 <- TSB size, TTE RA + + ! XXX set referenced/modified bit unconditionally for now XXX + andcc %g5, %g3, %g0 ! already set + bnz,pt %xcc, 5f + nop + andcc %g3, VTD_REF, %g0 ! TSB miss + bnz,pt %xcc, 6f + or %g5, %g3, %g5 ! add ref/mod bit unconditionally + andcc %g5, VTD_SW_W, %g0 ! write enabled? + bz,pn %xcc, prot_fault_trap ! write to read only page + or %g5, %g3, %g5 ! add ref/mod bit unconditionally +6: + stx %g5, [%g2 + 8] ! set ref/mod bit +5: + GET_TSB_SCRATCH(%g3) ! %g3 == TSB (RA) + - mov 1, %g7 - sllx %g7, PAGE_SHIFT, %g7 - sub %g7, 1, %g7 ! %g7==PAGE_MASK - - and %g3, %g7, %g6 ! size of TSB in pages + and %g3, %g7, %g6 ! size of TSB in pages andn %g3, %g7, %g3 ! TSB real address sllx %g6, (PAGE_SHIFT - TTE_SHIFT), %g6 ! nttes subx %g6, 1, %g6 ! TSB_MASK - and %g6, %g1, %g6 ! masked index + and %g6, %g1, %g6 ! masked index sllx %g6, TTE_SHIFT, %g6 ! masked byte offset - add %g6, %g3, %g6 ! TTE RA - mov 8, %g7 + add %g6, %g3, %g6 ! TTE RA + mov 8, %g7 +#ifdef PMAP_DEBUG + ldda [%g6]ASI_LDTD_REAL, %g2 + cmp %g3, %g5 + bne,pt %xcc, 3f + nop + illtrap ! die if all we're doing + ! is storing same data +3: +#endif stxa %g4, [%g6]ASI_REAL ! store tag stxa %g5, [%g6 + %g7]ASI_REAL ! store data MAGIC_TRAP_OFF + retry END(tsb_miss) - - - +/* + * Write to read-only page + */ +ENTRY(prot_fault_trap) + illtrap +END(prot_fault_trap) /* * Freshly forked processes come here when switched to for the first time. * The arguments to fork_exit() have been setup in the locals, we must move ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#17 (text+ko) ==== @@ -315,7 +315,6 @@ panic("pmap_bootstrap_alloc"); } - /* * Activate a user pmap. The pmap must be activated before its address space * can be accessed in any way. @@ -603,12 +602,19 @@ */ pm->pm_hash = tte_hash_kernel_create(kernel_hash, PAGE_SIZE_4M); tte_hash_set_scratchpad(pm->pm_hash); - - /* - * XXX - We should read the kernel mappings into the hash table - * - */ + for (i = 0; i < sz; i++) { + if (translations[i].om_start < VM_MIN_PROM_ADDRESS || + translations[i].om_start > VM_MAX_PROM_ADDRESS) + continue; + if (translations[i].om_size == PAGE_SIZE_4M) + continue; + for (off = 0; off < translations[i].om_size; off += PAGE_SIZE) { + va = translations[i].om_start + off; + pa = TTE_GET_PA(translations[i].om_tte) + off; + tte_hash_insert(kernel_pmap->pm_hash, va, pa | TTE_KERNEL | VTD_8K); + } + } } @@ -691,7 +697,7 @@ tte_data = pa = VM_PAGE_TO_PHYS(m); otte = tte_hash_lookup(pmap->pm_hash, va); - otte_data = *otte; + otte_data = otte ? *otte : 0; opa = TTE_GET_PA(otte_data); /* * Mapping has not changed, must be protection or wiring change. @@ -780,8 +786,9 @@ } if (invlva) pmap_invalidate_page(pmap, va); - } else + } else { tte_hash_insert(pmap->pm_hash, va, tte_data); + } } @@ -1000,17 +1007,16 @@ vm_paddr_t pmap_kextract(vm_offset_t va) { - uint64_t tte_data; + uint64_t *tte, tte_data; vm_paddr_t pa; pa = 0; -#if 0 - printf("tte_data=%lx TTE_GET_PA(tte_data)=%lx (va & TTE_GET_PAGE_MASK(tte_data))=%lx\n", - tsb_lookup_tte(va, 0), TTE_GET_PA(tte_data), (va & TTE_GET_PAGE_MASK(tte_data))); -#endif if ((tte_data = tsb_lookup_tte(va, 0)) != 0) pa = TTE_GET_PA(tte_data) | (va & TTE_GET_PAGE_MASK(tte_data)); + if ((pa == 0) && (tte = tte_hash_lookup(kernel_pmap->pm_hash, va)) != NULL) + pa = TTE_GET_PA(*tte) | (va & TTE_GET_PAGE_MASK(*tte)); + return pa; } @@ -1290,19 +1296,14 @@ */ if (pmap->pm_stats.resident_count == 0) return; - + + invlva = 0; vm_page_lock_queues(); sched_pin(); PMAP_LOCK(pmap); - if (pmap->pm_context != 0) { - invlva = 0; - for (tva = start; tva < end; tva += PAGE_SIZE) { - tinvlva = tte_hash_delete(pmap->pm_hash, tva); - invlva = tinvlva ? tinvlva : invlva; - } - } else { - tsb_clear_range(&pmap->pm_tsb, start, end); - invlva = 1; + for (tva = start; tva < end; tva += PAGE_SIZE) { + tinvlva = tte_hash_delete(pmap->pm_hash, tva); + invlva = tinvlva ? tinvlva : invlva; } sched_unpin(); vm_page_unlock_queues(); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#7 (text+ko) ==== @@ -55,7 +55,6 @@ * void cpu_switch(struct thread *old, struct thread *new) */ ENTRY(cpu_switch) - MAGIC_TRAP_ON GET_PCB(PCB_REG) save %sp, -CCFSZ, %sp mov %i1, %i0 ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#4 (text+ko) ==== @@ -129,17 +129,21 @@ th->th_hashtable = (tte_hash_entry_t)kmem_alloc_nofault(kernel_map, PAGE_SIZE*HASH_SIZE); - for (i = 0; i < HASH_SIZE; i++) { + printf("th->th_hashtable=%p ", th->th_hashtable); + for (i = 0; i < HASH_SIZE;) { m = vm_page_alloc(NULL, color++, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | VM_ALLOC_ZERO); + printf("PHYS(m)=0x%010lx ", VM_PAGE_TO_PHYS(m)); if (m == NULL) VM_WAIT; else { hash_pages[i++] = m; } } + printf("entered\n"); pmap_qenter((vm_offset_t)th->th_hashtable, hash_pages, HASH_SIZE); + for (i = 0; i < HASH_SIZE; i++) { if ((hash_pages[i]->flags & PG_ZERO) == 0) pmap_zero_page(hash_pages[i]); @@ -188,7 +192,7 @@ KASSERT(tte_hash_lookup(th, va) != 0, ("attempting to delete non-existent entry")); #endif for (i = 0; i <= 3; i++) - if ((fields[i].tte.tag << TTARGET_VA_SHIFT) == (va & PAGE_MASK_4M)) + if ((fields[i].tte.tag << TTARGET_VA_SHIFT) == (va & ~PAGE_MASK_4M)) break; vaindex = i; @@ -215,18 +219,16 @@ uint64_t hash_shift, hash_index, tte_tag; tte_hash_field_t fields; int i; + /* XXX - only handle 8K pages for now */ - hash_shift = PAGE_SHIFT; hash_index = (va >> hash_shift) & HASH_MASK(th); - fields = (th->th_hashtable[hash_index].the_fields); tte_tag = (((uint64_t)th->th_context << TTARGET_CTX_SHIFT)|(va >> TTARGET_VA_SHIFT)); for (i = 0; i <= 3; i++) { if ((fields[i].tte.tag == 0) || (fields[i].tte.tag == tte_tag)) { fields[i].tte.data = tte_data; fields[i].tte.tag = tte_tag; - printf("data: 0x%016lx tag: 0x%016lx\n", fields[i].tte.data, fields[i].tte.tag); goto done; } @@ -250,7 +252,7 @@ fields = (th->th_hashtable[hash_index].the_fields); for (i = 0; i <= 3; i++) { - if ((fields[i].tte.tag << TTARGET_VA_SHIFT) == (va & PAGE_MASK_4M)) + if ((fields[i].tte.tag << TTARGET_VA_SHIFT) == (va & ~PAGE_MASK_4M)) return &(fields[i].tte.data); } /* From owner-p4-projects@FreeBSD.ORG Mon Mar 6 14:25:06 2006 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 8A35916A423; Mon, 6 Mar 2006 14:25: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 489E316A420 for ; Mon, 6 Mar 2006 14:25:05 +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 0E84C43D45 for ; Mon, 6 Mar 2006 14:25:05 +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 k26EP4Qe066903 for ; Mon, 6 Mar 2006 14:25:04 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k26EP4HE066899 for perforce@freebsd.org; Mon, 6 Mar 2006 14:25:04 GMT (envelope-from jhb@freebsd.org) Date: Mon, 6 Mar 2006 14:25:04 GMT Message-Id: <200603061425.k26EP4HE066899@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 92848 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, 06 Mar 2006 14:25:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=92848 Change 92848 by jhb@jhb_zion on 2006/03/06 14:24:04 Attempt to fix the alpha cpu ticker. The RPCC register is not exactly like the TSC on i386. The upper 32-bits have a quirky meaning, so we basically have to treat it like a 32-bit counter and handle the roll-overs ourself. I think this may end up not being any cheaper than just using the alpha timecounter, though perhaps it will be cheaper for SMP where we have to use the i8254 right now for cpu_ticks. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/clock.c#23 edit .. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#38 edit .. //depot/projects/smpng/sys/alpha/include/md_var.h#9 edit .. //depot/projects/smpng/sys/alpha/include/pcpu.h#5 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#23 (text+ko) ==== @@ -152,7 +152,7 @@ calibrate_clocks(cycles_per_sec, &pcc, &freq); cycles_per_sec = pcc; - set_cputicker(alpha_rpcc, cycles_per_sec, 0); + set_cputicker(read_cycle_count, cycles_per_sec, 0); /* * XXX: TurboLaser doesn't have an i8254 counter. @@ -556,6 +556,30 @@ return alpha_rpcc(); } +/* + * The RPCC register actually consists of two halves. The lower half + * is a raw 32-bit counter that wraps. The upper half is defined in + * the Digital UNIX PAL as being a raw per-process cycle count mod 2^32 + * that is updated on each call to swpctx. In order to produce a 64-bit + * counter, we just use the lower half and simulate the upper 32-bits. + * The architecture guarantees that there will always be at least one + * clock interrupt in between overlaps in the lower half, so as long as + * we call this function every clock interrupt we should not miss any + * overlaps. + */ +uint64_t +read_cycle_count(void) +{ + unsigned pcc_cnt; + + /* Assert a critical section? */ + pcc_cnt = alpha_rpcc() & 0xffffffff; + if (pcc_cnt < PCPU_GET(last_pcc_cnt)) + PCPU_SET(pcc_base, PCPU_GET(pcc_base) + 1); + PCPU_SET(last_pcc_cnt, pcc_cnt); + return (pcc_cnt | (PCPU_GET(pcc_base) << 32)); +} + int acquire_timer2(int mode) { ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#38 (text+ko) ==== @@ -483,6 +483,9 @@ #endif if (platform.clockintr) { critical_enter(); + + /* Check for PCC roll-over. */ + (void)read_cycle_count(); #ifdef SMP /* * Only one processor drives the actual timer. ==== //depot/projects/smpng/sys/alpha/include/md_var.h#9 (text+ko) ==== @@ -84,6 +84,7 @@ int is_physical_memory(vm_offset_t addr); void machine_check(unsigned long, struct trapframe *, unsigned long, unsigned long); +uint64_t read_cycle_count(void); void regdump(struct trapframe *); void regtoframe(struct reg *, struct trapframe *); void set_iointr(void (*)(void *, unsigned long)); ==== //depot/projects/smpng/sys/alpha/include/pcpu.h#5 (text+ko) ==== @@ -38,7 +38,9 @@ u_int64_t pc_idlepcbphys; /* pa of pc_idlepcb */ \ u_int64_t pc_pending_ipis; /* pending IPI's */ \ u_int32_t pc_next_asn; /* next ASN to alloc */ \ - u_int32_t pc_current_asngen /* ASN rollover check */ + u_int32_t pc_current_asngen /* ASN rollover check */ \ + u_int32_t pc_last_ppc_cnt; /* Previous PCC_CNT value */ \ + u_int32_t pc_ppc_base; /* Hi word of cycle count. */ struct pcpu; From owner-p4-projects@FreeBSD.ORG Mon Mar 6 15:55:59 2006 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 10BF716A423; Mon, 6 Mar 2006 15:55: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 9541A16A420 for ; Mon, 6 Mar 2006 15:55:58 +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 2887743D6E for ; Mon, 6 Mar 2006 15:55:57 +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 k26FtuRp070508 for ; Mon, 6 Mar 2006 15:55:57 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k26FtulY070505 for perforce@freebsd.org; Mon, 6 Mar 2006 15:55:56 GMT (envelope-from jhb@freebsd.org) Date: Mon, 6 Mar 2006 15:55:56 GMT Message-Id: <200603061555.k26FtulY070505@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 92853 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, 06 Mar 2006 15:56:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=92853 Change 92853 by jhb@jhb_twclab on 2006/03/06 15:54:57 Compile. Affected files ... .. //depot/projects/smpng/sys/alpha/include/pcpu.h#6 edit Differences ... ==== //depot/projects/smpng/sys/alpha/include/pcpu.h#6 (text+ko) ==== @@ -38,9 +38,9 @@ u_int64_t pc_idlepcbphys; /* pa of pc_idlepcb */ \ u_int64_t pc_pending_ipis; /* pending IPI's */ \ u_int32_t pc_next_asn; /* next ASN to alloc */ \ - u_int32_t pc_current_asngen /* ASN rollover check */ \ + u_int32_t pc_current_asngen; /* ASN rollover check */ \ u_int32_t pc_last_ppc_cnt; /* Previous PCC_CNT value */ \ - u_int32_t pc_ppc_base; /* Hi word of cycle count. */ + u_int32_t pc_ppc_base /* Hi word of cycle count. */ struct pcpu; From owner-p4-projects@FreeBSD.ORG Mon Mar 6 17:02:45 2006 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 7310B16A423; Mon, 6 Mar 2006 17:02:44 +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 44B9816A420 for ; Mon, 6 Mar 2006 17:02: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 679BE43D48 for ; Mon, 6 Mar 2006 17:02:34 +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 k26H2YpB080824 for ; Mon, 6 Mar 2006 17:02:34 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 k26H2XvP080821 for perforce@freebsd.org; Mon, 6 Mar 2006 17:02:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Mar 2006 17:02:33 GMT Message-Id: <200603061702.k26H2XvP080821@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 92857 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, 06 Mar 2006 17:02:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=92857 Change 92857 by rwatson@rwatson_zoo on 2006/03/06 17:01:52 Integrate TrustedBSD audit3 branch from TrustedBSD base branch: - OpenBSM 1.0 alpha 5 loop back. - dwmalone's structural improvements to mac_bsdextended. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#12 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#10 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/pidfile.3#4 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#25 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label_ufs.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/opencrypto/crypto.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#19 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/finger/sprint.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#4 (text) ==== @@ -6,12 +6,9 @@ src/contrib/openbsm The OpenBSM distribution itself src/sys/bsm Modified versions of some bsm/ include files src/sys/security/audit Kernel audit framework, some OpenBSM-based files -src/usr.sbin/audit Makefiles for OpenBSM-derived command -src/usr.sbin/auditd "" -src/usr.sbin/auditreduce "" -src/usr.sbin/praudit "" +src/usr.sbin/*audit* Makefiles for various OpenBSM tools src/etc/Makefile Installation of /etc OpenBSM files -src/lib/libbsm Build for OpenBSM library +src/lib/libbsm/* Build for OpenBSM library OpenBSM is normally built using an integrated autoconf/automake build system. For the purposes of tight integration with FreeBSD, we use an @@ -44,4 +41,4 @@ not on CVS vendor branches, but do have the same local vs. vendor merge issues. -$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.2 2006/02/06 00:03:39 rwatson Exp $ +$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.3 2006/03/04 16:50:04 rwatson Exp $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#11 (text+ko) ==== @@ -95,4 +95,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#10 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#11 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#7 (text+ko) ==== @@ -14,4 +14,4 @@ on systems that don't have the necessary audit system calls; that would allow the full libbsm and tool set to build, just not run. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#6 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#7 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#6 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#7 $ */ /* * Program to trigger the audit daemon with a message that is either: ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#3 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#4 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#8 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#10 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#10 $ */ #ifndef _BSM_AUDIT_H ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#8 (text+ko) ==== @@ -34,7 +34,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#8 $ */ #ifndef _AUDIT_INTERNAL_H ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#9 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#9 $ */ #ifndef _LIBBSM_H_ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * Derived from FreeBSD src/sys/sys/endian.h:1.6. - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#4 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#5 $ */ #ifndef _COMPAT_ENDIAN_H_ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#10 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#11 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#12 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#10 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#9 $ */ /* ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#13 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#12 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#13 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#9 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#10 $ */ #ifdef __APPLE__ ==== //depot/projects/trustedbsd/audit3/lib/libutil/pidfile.3#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libutil/pidfile.3,v 1.4 2006/01/28 14:13:15 pjd Exp $ +.\" $FreeBSD: src/lib/libutil/pidfile.3,v 1.5 2006/03/04 15:20:28 keramida Exp $ .\" .Dd August 22, 2005 .Dt PIDFILE 3 @@ -120,8 +120,8 @@ pfh = pidfile_open("/var/run/daemon.pid", 0600, &otherpid); if (pfh == NULL) { if (errno == EEXIST) { - errx(EXIT_FAILURE, "Daemon already running, pid: %d.", - (int)otherpid); + errx(EXIT_FAILURE, "Daemon already running, pid: %jd.", + (intmax_t)otherpid); } /* If we cannot create pidfile from other reasons, only warn. */ warn("Cannot open or create pidfile"); @@ -147,7 +147,7 @@ /* Do child work. */ break; default: - syslog(LOG_INFO, "Child %d started.", (int)childpid); + syslog(LOG_INFO, "Child %jd started.", (intmax_t)childpid); break; } } ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#25 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#24 $ - * $FreeBSD: src/sys/bsm/audit.h,v 1.2 2006/02/01 19:54:22 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#25 $ + * $FreeBSD: src/sys/bsm/audit.h,v 1.3 2006/03/04 16:54:21 rwatson Exp $ */ #ifndef _BSM_AUDIT_H ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#8 (text+ko) ==== @@ -34,7 +34,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#7 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#8 $ + * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.2 2006/03/04 16:54:21 rwatson Exp $ */ #ifndef _AUDIT_INTERNAL_H @@ -68,6 +69,7 @@ typedef struct au_record au_record_t; + /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach * till we have a consistant way of using structures for all tokens. ==== //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.c#8 (text+ko) ==== @@ -92,7 +92,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.18 2006/02/28 07:44:50 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.19 2006/03/04 21:46:34 mjacob Exp $"); #include #include /* XXX For static handler registration */ @@ -502,12 +502,12 @@ handled += pers->event(mpt, req, msg); if (handled == 0 && mpt->mpt_pers_mask == 0) { - mpt_lprt(mpt, MPT_PRT_WARN, + mpt_lprt(mpt, MPT_PRT_INFO, "No Handlers For Any Event Notify Frames. " "Event %#x (ACK %sequired).\n", msg->Event, msg->AckRequired? "r" : "not r"); } else if (handled == 0) { - mpt_prt(mpt, + mpt_lprt(mpt, MPT_PRT_WARN, "Unhandled Event Notify Frame. Event %#x " "(ACK %sequired).\n", msg->Event, msg->AckRequired? "r" : "not r"); ==== //depot/projects/trustedbsd/audit3/sys/geom/label/g_label_ufs.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/label/g_label_ufs.c,v 1.9 2006/02/18 10:59:47 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/label/g_label_ufs.c,v 1.10 2006/03/04 19:41:54 pjd Exp $"); #include #include @@ -78,8 +78,13 @@ if (fs == NULL) continue; /* Check for magic and make sure things are the right size */ - if (fs->fs_magic != FS_UFS1_MAGIC && - fs->fs_magic != FS_UFS2_MAGIC) { + if (fs->fs_magic == FS_UFS1_MAGIC && + fs->fs_old_size * fs->fs_fsize == (int32_t)pp->mediasize) { + /* Valid UFS1. */ + } else if (fs->fs_magic == FS_UFS2_MAGIC && fs->fs_fsize > 0 && + pp->mediasize / fs->fs_fsize == fs->fs_size) { + /* Valid UFS2. */ + } else { g_free(fs); continue; } ==== //depot/projects/trustedbsd/audit3/sys/opencrypto/crypto.c#4 (text+ko) ==== @@ -21,7 +21,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/opencrypto/crypto.c,v 1.16 2005/01/07 02:29:16 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/opencrypto/crypto.c,v 1.17 2006/03/04 15:50:46 wkoszek Exp $"); #define CRYPTO_TIMING /* enable timing support */ @@ -252,6 +252,7 @@ }; MODULE_VERSION(crypto, 1); DECLARE_MODULE(crypto, crypto_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); +MODULE_DEPEND(crypto, zlib, 1, 1, 1); /* * Create a new session. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#16 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit.c,v 1.7 2006/02/11 23:53:00 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit.c,v 1.8 2006/03/04 17:00:55 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#12 (text+ko) ==== @@ -30,7 +30,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#11 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#12 $ + * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.2 2006/03/04 17:00:55 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#10 (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/security/audit/audit_pipe.c,v 1.2 2006/02/07 14:46:26 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.3 2006/03/04 17:09:17 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#19 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_private.h,v 1.2 2006/02/06 22:50:39 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_private.h,v 1.3 2006/03/04 17:00:55 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/audit3/sys/security/mac_bsdextended/mac_bsdextended.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.c,v 1.27 2006/01/15 01:02:20 csjp Exp $ + * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.c,v 1.28 2006/03/04 20:47:19 dwmalone Exp $ */ /* @@ -353,11 +353,10 @@ } static int -mac_bsdextended_check_system_swapon(struct ucred *cred, struct vnode *vp, - struct label *label) +mac_bsdextended_check_vp(struct ucred *cred, struct vnode *vp, int acc_mode) { + int error; struct vattr vap; - int error; if (!mac_bsdextended_enabled) return (0); @@ -365,75 +364,49 @@ error = VOP_GETATTR(vp, &vap, cred, curthread); if (error) return (error); + return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE)); + acc_mode)); +} + +static int +mac_bsdextended_check_system_swapon(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + + return (mac_bsdextended_check_vp(cred, vp, MBI_WRITE)); } static int mac_bsdextended_check_vnode_access(struct ucred *cred, struct vnode *vp, struct label *label, int acc_mode) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, acc_mode)); + return (mac_bsdextended_check_vp(cred, vp, acc_mode)); } static int mac_bsdextended_check_vnode_chdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_EXEC)); + return (mac_bsdextended_check_vp(cred, dvp, MBI_EXEC)); } static int mac_bsdextended_check_vnode_chroot(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_EXEC)); + return (mac_bsdextended_check_vp(cred, dvp, MBI_EXEC)); } static int mac_bsdextended_check_create_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp, struct vattr *vap) { - struct vattr dvap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &dvap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, dvap.va_uid, dvap.va_gid, - MBI_WRITE)); + return (mac_bsdextended_check_vp(cred, dvp, MBI_WRITE)); } static int @@ -441,59 +414,29 @@ struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) { - struct vattr vap; int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &vap, cred, curthread); + error = mac_bsdextended_check_vp(cred, dvp, MBI_WRITE); if (error) return (error); - error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE); - if (error) - return (error); - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE)); + return (mac_bsdextended_check_vp(cred, vp, MBI_WRITE)); } static int mac_bsdextended_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_ADMIN)); + return (mac_bsdextended_check_vp(cred, vp, MBI_ADMIN)); } static int mac_bsdextended_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE)); + return (mac_bsdextended_check_vp(cred, vp, MBI_WRITE)); } static int @@ -501,51 +444,24 @@ struct label *label, struct image_params *imgp, struct label *execlabel) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_READ|MBI_EXEC)); + return (mac_bsdextended_check_vp(cred, vp, MBI_READ|MBI_EXEC)); } static int mac_bsdextended_check_vnode_getacl(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_STAT)); + return (mac_bsdextended_check_vp(cred, vp, MBI_STAT)); } static int mac_bsdextended_check_vnode_getextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_READ)); + return (mac_bsdextended_check_vp(cred, vp, MBI_READ)); } static int @@ -553,25 +469,13 @@ struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) { - struct vattr vap; int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &vap, cred, curthread); + error = mac_bsdextended_check_vp(cred, dvp, MBI_WRITE); if (error) return (error); - error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE); - if (error) - return (error); - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE); + error = mac_bsdextended_check_vp(cred, vp, MBI_WRITE); if (error) return (error); return (0); @@ -581,84 +485,40 @@ mac_bsdextended_check_vnode_listextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_READ)); + return (mac_bsdextended_check_vp(cred, vp, MBI_READ)); } static int mac_bsdextended_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_EXEC)); + return (mac_bsdextended_check_vp(cred, dvp, MBI_EXEC)); } static int mac_bsdextended_check_vnode_open(struct ucred *cred, struct vnode *vp, struct label *filelabel, int acc_mode) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, acc_mode)); + return (mac_bsdextended_check_vp(cred, vp, acc_mode)); } static int mac_bsdextended_check_vnode_readdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_READ)); + return (mac_bsdextended_check_vp(cred, dvp, MBI_READ)); } static int mac_bsdextended_check_vnode_readdlink(struct ucred *cred, struct vnode *vp, struct label *label) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_READ)); + return (mac_bsdextended_check_vp(cred, vp, MBI_READ)); } static int @@ -666,24 +526,12 @@ struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) { - struct vattr vap; int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &vap, cred, curthread); + error = mac_bsdextended_check_vp(cred, dvp, MBI_WRITE); if (error) return (error); - error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE); - if (error) - return (error); - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE); + error = mac_bsdextended_check_vp(cred, vp, MBI_WRITE); return (error); } @@ -693,27 +541,14 @@ struct label *dlabel, struct vnode *vp, struct label *label, int samedir, struct componentname *cnp) { - struct vattr vap; int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &vap, cred, curthread); + error = mac_bsdextended_check_vp(cred, dvp, MBI_WRITE); if (error) return (error); - error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE); - if (error) - return (error); - if (vp != NULL) { - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE); - } + if (vp != NULL) + error = mac_bsdextended_check_vp(cred, vp, MBI_WRITE); return (error); } @@ -722,136 +557,64 @@ mac_bsdextended_check_vnode_revoke(struct ucred *cred, struct vnode *vp, struct label *label) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_ADMIN)); + return (mac_bsdextended_check_vp(cred, vp, MBI_ADMIN)); } static int mac_bsdextended_check_setacl_vnode(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type, struct acl *acl) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_ADMIN)); + return (mac_bsdextended_check_vp(cred, vp, MBI_ADMIN)); } static int mac_bsdextended_check_vnode_setextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE)); + return (mac_bsdextended_check_vp(cred, vp, MBI_WRITE)); } static int mac_bsdextended_check_vnode_setflags(struct ucred *cred, struct vnode *vp, struct label *label, u_long flags) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_ADMIN)); + return (mac_bsdextended_check_vp(cred, vp, MBI_ADMIN)); } static int mac_bsdextended_check_vnode_setmode(struct ucred *cred, struct vnode *vp, struct label *label, mode_t mode) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_ADMIN)); + return (mac_bsdextended_check_vp(cred, vp, MBI_ADMIN)); } static int mac_bsdextended_check_vnode_setowner(struct ucred *cred, struct vnode *vp, struct label *label, uid_t uid, gid_t gid) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_ADMIN)); + return (mac_bsdextended_check_vp(cred, vp, MBI_ADMIN)); } static int mac_bsdextended_check_vnode_setutimes(struct ucred *cred, struct vnode *vp, struct label *label, struct timespec atime, struct timespec utime) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_ADMIN)); + return (mac_bsdextended_check_vp(cred, vp, MBI_ADMIN)); } static int mac_bsdextended_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, active_cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(active_cred, vap.va_uid, vap.va_gid, - MBI_STAT)); + return (mac_bsdextended_check_vp(active_cred, vp, MBI_STAT)); } static struct mac_policy_ops mac_bsdextended_ops = ==== //depot/projects/trustedbsd/audit3/usr.bin/finger/sprint.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 6 19:27:53 2006 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 B5C8916A423; Mon, 6 Mar 2006 19:27: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 7141516A420 for ; Mon, 6 Mar 2006 19:27:52 +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 9533043D6D for ; Mon, 6 Mar 2006 19:27:50 +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 k26JRowY086923 for ; Mon, 6 Mar 2006 19:27:50 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k26JRokZ086920 for perforce@freebsd.org; Mon, 6 Mar 2006 19:27:50 GMT (envelope-from jhb@freebsd.org) Date: Mon, 6 Mar 2006 19:27:50 GMT Message-Id: <200603061927.k26JRokZ086920@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 92865 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, 06 Mar 2006 19:27:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=92865 Change 92865 by jhb@jhb_twclab on 2006/03/06 19:26:49 Compile some more. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/clock.c#24 edit .. //depot/projects/smpng/sys/alpha/include/pcpu.h#7 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#24 (text+ko) ==== @@ -577,7 +577,7 @@ if (pcc_cnt < PCPU_GET(last_pcc_cnt)) PCPU_SET(pcc_base, PCPU_GET(pcc_base) + 1); PCPU_SET(last_pcc_cnt, pcc_cnt); - return (pcc_cnt | (PCPU_GET(pcc_base) << 32)); + return (pcc_cnt | ((uint64_t)PCPU_GET(pcc_base) << 32)); } int ==== //depot/projects/smpng/sys/alpha/include/pcpu.h#7 (text+ko) ==== @@ -39,8 +39,8 @@ u_int64_t pc_pending_ipis; /* pending IPI's */ \ u_int32_t pc_next_asn; /* next ASN to alloc */ \ u_int32_t pc_current_asngen; /* ASN rollover check */ \ - u_int32_t pc_last_ppc_cnt; /* Previous PCC_CNT value */ \ - u_int32_t pc_ppc_base /* Hi word of cycle count. */ + u_int32_t pc_last_pcc_cnt; /* Previous PCC_CNT value */ \ + u_int32_t pc_pcc_base /* Hi word of cycle count. */ struct pcpu; From owner-p4-projects@FreeBSD.ORG Mon Mar 6 19:57:29 2006 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 D3CAB16A423; Mon, 6 Mar 2006 19:57:28 +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 923BD16A420 for ; Mon, 6 Mar 2006 19:57:28 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 53C1843D55 for ; Mon, 6 Mar 2006 19:57:28 +0000 (GMT) (envelope-from kmacy@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 k26JvSdV088188 for ; Mon, 6 Mar 2006 19:57:28 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k26JvRg7088185 for perforce@freebsd.org; Mon, 6 Mar 2006 19:57:27 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 6 Mar 2006 19:57:27 GMT Message-Id: <200603061957.k26JvRg7088185@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92869 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, 06 Mar 2006 19:57:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=92869 Change 92869 by kmacy@kmacy_storage:sun4v_work on 2006/03/06 19:57:13 Add copyrights Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#18 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#18 (text+ko) ==== @@ -1,11 +1,30 @@ -/* - * +/*- * Copyright (c) 2006 Kip Macy * All rights reserved. - * XXX add 2-clause license + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $ Exp $ */ - - #include "opt_kstack_pages.h" #include "opt_msgbuf.h" #include "opt_pmap.h" ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#5 (text+ko) ==== @@ -1,4 +1,31 @@ +/*- + * Copyright (c) 2006 Kip Macy + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $ Exp $ + */ #include #include From owner-p4-projects@FreeBSD.ORG Mon Mar 6 20:34:23 2006 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 951FB16A43A; Mon, 6 Mar 2006 20:34:22 +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 685D916A435 for ; Mon, 6 Mar 2006 20:34:22 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CC9043D5E for ; Mon, 6 Mar 2006 20:34:20 +0000 (GMT) (envelope-from marcel@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 k26KYKrg098585 for ; Mon, 6 Mar 2006 20:34:20 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k26KYID0098582 for perforce@freebsd.org; Mon, 6 Mar 2006 20:34:18 GMT (envelope-from marcel@freebsd.org) Date: Mon, 6 Mar 2006 20:34:18 GMT Message-Id: <200603062034.k26KYID0098582@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 92876 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, 06 Mar 2006 20:34:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=92876 Change 92876 by marcel@marcel_nfs on 2006/03/06 20:33:37 IFC @92871 Affected files ... .. //depot/projects/uart/amd64/amd64/intr_machdep.c#8 integrate .. //depot/projects/uart/amd64/amd64/io_apic.c#6 integrate .. //depot/projects/uart/amd64/amd64/local_apic.c#8 integrate .. //depot/projects/uart/amd64/amd64/mp_machdep.c#10 integrate .. //depot/projects/uart/amd64/conf/NOTES#6 integrate .. //depot/projects/uart/amd64/include/apicvar.h#8 integrate .. //depot/projects/uart/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/uart/amd64/include/mptable.h#3 integrate .. //depot/projects/uart/amd64/isa/atpic.c#4 integrate .. //depot/projects/uart/arm/arm/busdma_machdep.c#9 integrate .. //depot/projects/uart/arm/arm/pmap.c#10 integrate .. //depot/projects/uart/arm/arm/trap.c#11 integrate .. //depot/projects/uart/arm/arm/undefined.c#10 integrate .. //depot/projects/uart/arm/arm/vm_machdep.c#10 integrate .. //depot/projects/uart/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/uart/arm/include/pmap.h#8 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_aau.c#3 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_dma.c#2 integrate .. //depot/projects/uart/bsm/audit.h#3 integrate .. //depot/projects/uart/bsm/audit_internal.h#2 integrate .. //depot/projects/uart/coda/coda.h#5 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_misc.c#12 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_proto.h#13 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscall.h#13 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscalls.c#13 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_sysent.c#13 integrate .. //depot/projects/uart/compat/freebsd32/syscalls.master#12 integrate .. //depot/projects/uart/conf/NOTES#30 integrate .. //depot/projects/uart/conf/files#50 integrate .. //depot/projects/uart/conf/files.alpha#13 integrate .. //depot/projects/uart/conf/files.amd64#17 integrate .. //depot/projects/uart/conf/files.i386#22 integrate .. //depot/projects/uart/conf/files.ia64#15 integrate .. //depot/projects/uart/conf/files.pc98#19 integrate .. //depot/projects/uart/conf/files.powerpc#6 integrate .. //depot/projects/uart/conf/files.sparc64#14 integrate .. //depot/projects/uart/conf/options#24 integrate .. //depot/projects/uart/conf/options.i386#11 integrate .. //depot/projects/uart/conf/options.pc98#10 integrate .. //depot/projects/uart/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/uart/dev/ata/ata-all.c#18 integrate .. //depot/projects/uart/dev/ata/ata-all.h#12 integrate .. //depot/projects/uart/dev/ata/ata-disk.c#12 integrate .. //depot/projects/uart/dev/ata/ata-queue.c#15 integrate .. //depot/projects/uart/dev/ata/atapi-fd.c#8 integrate .. //depot/projects/uart/dev/ata/atapi-fd.h#6 integrate .. //depot/projects/uart/dev/ath/if_ath.c#24 integrate .. //depot/projects/uart/dev/ath/if_athvar.h#18 integrate .. //depot/projects/uart/dev/ce/tau32-ddk.c#2 integrate .. //depot/projects/uart/dev/ce/tau32-ddk.h#2 integrate .. //depot/projects/uart/dev/de/dc21040reg.h#1 branch .. //depot/projects/uart/dev/de/if_de.c#1 branch .. //depot/projects/uart/dev/de/if_devar.h#1 branch .. //depot/projects/uart/dev/iir/iir.c#8 integrate .. //depot/projects/uart/dev/iir/iir.h#8 integrate .. //depot/projects/uart/dev/iir/iir_pci.c#10 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.c#13 integrate .. //depot/projects/uart/dev/kbd/kbd.c#7 integrate .. //depot/projects/uart/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/uart/dev/mpt/mpilib/mpi_type.h#8 integrate .. //depot/projects/uart/dev/mpt/mpt.c#9 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.c#6 integrate .. //depot/projects/uart/dev/mpt/mpt_debug.c#9 integrate .. //depot/projects/uart/dev/ral/if_ral.c#6 delete .. //depot/projects/uart/dev/ral/if_ral_pccard.c#4 delete .. //depot/projects/uart/dev/ral/if_ral_pci.c#3 integrate .. //depot/projects/uart/dev/ral/if_ralreg.h#4 delete .. //depot/projects/uart/dev/ral/if_ralvar.h#4 delete .. //depot/projects/uart/dev/ral/rt2560.c#1 branch .. //depot/projects/uart/dev/ral/rt2560reg.h#1 branch .. //depot/projects/uart/dev/ral/rt2560var.h#1 branch .. //depot/projects/uart/dev/ral/rt2661.c#1 branch .. //depot/projects/uart/dev/ral/rt2661_ucode.h#1 branch .. //depot/projects/uart/dev/ral/rt2661reg.h#1 branch .. //depot/projects/uart/dev/ral/rt2661var.h#1 branch .. //depot/projects/uart/dev/re/if_re.c#16 integrate .. //depot/projects/uart/dev/sound/pci/ich.c#17 integrate .. //depot/projects/uart/dev/syscons/syscons.c#13 integrate .. //depot/projects/uart/dev/tdfx/tdfx_linux.c#1 branch .. //depot/projects/uart/dev/tdfx/tdfx_pci.c#8 integrate .. //depot/projects/uart/dev/usb/ehci.c#14 integrate .. //depot/projects/uart/dev/usb/ohci.c#16 integrate .. //depot/projects/uart/dev/usb/uhci.c#15 integrate .. //depot/projects/uart/dev/usb/ukbd.c#8 integrate .. //depot/projects/uart/dev/usb/umass.c#17 integrate .. //depot/projects/uart/dev/usb/uplcom.c#13 integrate .. //depot/projects/uart/dev/usb/usb_port.h#12 integrate .. //depot/projects/uart/dev/usb/usb_quirks.c#8 integrate .. //depot/projects/uart/dev/usb/usb_subr.c#15 integrate .. //depot/projects/uart/dev/usb/usbdevs#19 integrate .. //depot/projects/uart/dev/usb/usbdivar.h#8 integrate .. //depot/projects/uart/dev/vkbd/vkbd.c#6 integrate .. //depot/projects/uart/fs/fdescfs/fdesc_vnops.c#9 integrate .. //depot/projects/uart/geom/geom_io.c#9 integrate .. //depot/projects/uart/geom/geom_vfs.c#5 integrate .. //depot/projects/uart/geom/label/g_label_ufs.c#7 integrate .. //depot/projects/uart/i386/conf/NOTES#16 integrate .. //depot/projects/uart/i386/conf/PAE#9 integrate .. //depot/projects/uart/i386/conf/XBOX#3 integrate .. //depot/projects/uart/i386/i386/geode.c#5 integrate .. //depot/projects/uart/i386/i386/identcpu.c#17 integrate .. //depot/projects/uart/i386/i386/intr_machdep.c#6 integrate .. //depot/projects/uart/i386/i386/io_apic.c#7 integrate .. //depot/projects/uart/i386/i386/local_apic.c#9 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#19 integrate .. //depot/projects/uart/i386/include/apicvar.h#8 integrate .. //depot/projects/uart/i386/include/intr_machdep.h#5 integrate .. //depot/projects/uart/i386/include/xbox.h#3 integrate .. //depot/projects/uart/i386/isa/atpic.c#5 integrate .. //depot/projects/uart/i386/xbox/xboxfb.c#4 integrate .. //depot/projects/uart/isa/syscons_isa.c#5 integrate .. //depot/projects/uart/kern/init_sysent.c#15 integrate .. //depot/projects/uart/kern/kern_cpu.c#5 integrate .. //depot/projects/uart/kern/kern_malloc.c#13 integrate .. //depot/projects/uart/kern/kern_mbuf.c#8 integrate .. //depot/projects/uart/kern/kern_sig.c#25 integrate .. //depot/projects/uart/kern/kern_tc.c#12 integrate .. //depot/projects/uart/kern/kern_time.c#8 integrate .. //depot/projects/uart/kern/syscalls.c#15 integrate .. //depot/projects/uart/kern/syscalls.master#15 integrate .. //depot/projects/uart/kern/uipc_mqueue.c#4 integrate .. //depot/projects/uart/kern/uipc_syscalls.c#15 integrate .. //depot/projects/uart/kern/vfs_aio.c#13 integrate .. //depot/projects/uart/kern/vfs_subr.c#22 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#21 integrate .. //depot/projects/uart/modules/3dfx/Makefile#3 integrate .. //depot/projects/uart/modules/3dfx_linux/Makefile#1 branch .. //depot/projects/uart/modules/Makefile#27 integrate .. //depot/projects/uart/modules/ce/Makefile#2 integrate .. //depot/projects/uart/modules/coda5/Makefile#5 integrate .. //depot/projects/uart/modules/crypto/Makefile#4 integrate .. //depot/projects/uart/modules/de/Makefile#5 integrate .. //depot/projects/uart/modules/if_ppp/Makefile#5 integrate .. //depot/projects/uart/modules/kbdmux/Makefile#3 integrate .. //depot/projects/uart/modules/ral/Makefile#3 integrate .. //depot/projects/uart/modules/smbfs/Makefile#5 integrate .. //depot/projects/uart/net/bridgestp.c#5 integrate .. //depot/projects/uart/net/if_bridge.c#6 integrate .. //depot/projects/uart/net/if_bridgevar.h#5 integrate .. //depot/projects/uart/net/if_ethersubr.c#15 integrate .. //depot/projects/uart/net/ppp_deflate.c#3 integrate .. //depot/projects/uart/net80211/ieee80211_input.c#15 integrate .. //depot/projects/uart/net80211/ieee80211_node.c#16 integrate .. //depot/projects/uart/net80211/ieee80211_node.h#13 integrate .. //depot/projects/uart/net80211/ieee80211_proto.c#11 integrate .. //depot/projects/uart/net80211/ieee80211_var.h#14 integrate .. //depot/projects/uart/netinet/ip_fw2.c#19 integrate .. //depot/projects/uart/netinet/tcp_input.c#17 integrate .. //depot/projects/uart/netinet/tcp_syncache.c#14 integrate .. //depot/projects/uart/netinet/tcp_var.h#10 integrate .. //depot/projects/uart/netinet6/mld6.c#8 integrate .. //depot/projects/uart/netsmb/smb_crypt.c#4 integrate .. //depot/projects/uart/netsmb/smb_smb.c#4 integrate .. //depot/projects/uart/nfsserver/nfs_srvsock.c#7 integrate .. //depot/projects/uart/opencrypto/crypto.c#5 integrate .. //depot/projects/uart/opencrypto/cryptodev.c#8 integrate .. //depot/projects/uart/pc98/conf/NOTES#15 integrate .. //depot/projects/uart/pci/dc21040reg.h#2 delete .. //depot/projects/uart/pci/if_de.c#9 delete .. //depot/projects/uart/pci/if_devar.h#6 delete .. //depot/projects/uart/security/audit/audit.c#3 integrate .. //depot/projects/uart/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/uart/security/audit/audit_pipe.c#2 integrate .. //depot/projects/uart/security/audit/audit_private.h#2 integrate .. //depot/projects/uart/security/mac/mac_process.c#4 integrate .. //depot/projects/uart/security/mac_bsdextended/mac_bsdextended.c#8 integrate .. //depot/projects/uart/sparc64/sparc64/trap.c#10 integrate .. //depot/projects/uart/sys/_types.h#6 integrate .. //depot/projects/uart/sys/ata.h#9 integrate .. //depot/projects/uart/sys/bio.h#7 integrate .. //depot/projects/uart/sys/mount.h#14 integrate .. //depot/projects/uart/sys/proc.h#20 integrate .. //depot/projects/uart/sys/queue.h#8 integrate .. //depot/projects/uart/sys/signalvar.h#7 integrate .. //depot/projects/uart/sys/syscall.h#14 integrate .. //depot/projects/uart/sys/syscall.mk#14 integrate .. //depot/projects/uart/sys/syscallsubr.h#10 integrate .. //depot/projects/uart/sys/sysproto.h#14 integrate .. //depot/projects/uart/sys/timers.h#4 integrate .. //depot/projects/uart/sys/vnode.h#16 integrate .. //depot/projects/uart/ufs/ffs/ffs_alloc.c#8 integrate .. //depot/projects/uart/ufs/ffs/ffs_extern.h#8 integrate .. //depot/projects/uart/ufs/ffs/ffs_rawread.c#9 integrate .. //depot/projects/uart/ufs/ffs/ffs_snapshot.c#11 integrate .. //depot/projects/uart/ufs/ffs/ffs_softdep.c#15 integrate .. //depot/projects/uart/ufs/ffs/softdep.h#4 integrate .. //depot/projects/uart/ufs/ufs/ufsmount.h#6 integrate .. //depot/projects/uart/vm/vm_contig.c#15 integrate .. //depot/projects/uart/vm/vm_object.c#21 integrate .. //depot/projects/uart/vm/vnode_pager.c#18 integrate Differences ... ==== //depot/projects/uart/amd64/amd64/intr_machdep.c#8 (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.18 2005/12/08 18:33:29 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.19 2006/02/28 22:24:54 jhb Exp $ */ /* @@ -63,6 +63,12 @@ static struct intsrc *interrupt_sources[NUM_IO_INTS]; static struct mtx intr_table_lock; +#ifdef SMP +static int assign_cpu; + +static void intr_assign_next_cpu(struct intsrc *isrc); +#endif + static void intr_init(void *__dummy); static void intrcnt_setname(const char *name, int index); static void intrcnt_updatename(struct intsrc *is); @@ -93,6 +99,7 @@ } intrcnt_register(isrc); interrupt_sources[vector] = isrc; + isrc->is_enabled = 0; mtx_unlock_spin(&intr_table_lock); return (0); } @@ -118,7 +125,17 @@ intr_priority(flags), flags, cookiep); if (error == 0) { intrcnt_updatename(isrc); - isrc->is_pic->pic_enable_intr(isrc); + mtx_lock_spin(&intr_table_lock); + if (!isrc->is_enabled) { + isrc->is_enabled = 1; +#ifdef SMP + if (assign_cpu) + intr_assign_next_cpu(isrc); +#endif + mtx_unlock_spin(&intr_table_lock); + isrc->is_pic->pic_enable_intr(isrc); + } else + mtx_unlock_spin(&intr_table_lock); isrc->is_pic->pic_enable_source(isrc); } return (error); @@ -335,3 +352,76 @@ db_dump_intr_event((*isrc)->is_event, verbose); } #endif + +#ifdef SMP +/* + * Support for balancing interrupt sources across CPUs. For now we just + * allocate CPUs round-robin. + */ + +static u_int cpu_apic_ids[MAXCPU]; +static int current_cpu, num_cpus; + +static void +intr_assign_next_cpu(struct intsrc *isrc) +{ + struct pic *pic; + u_int apic_id; + + /* + * Assign this source to a local APIC in a round-robin fashion. + */ + pic = isrc->is_pic; + apic_id = cpu_apic_ids[current_cpu]; + current_cpu++; + if (current_cpu >= num_cpus) + current_cpu = 0; + if (bootverbose) { + printf("INTR: Assigning IRQ %d", pic->pic_vector(isrc)); + printf(" to local APIC %u\n", apic_id); + } + pic->pic_assign_cpu(isrc, apic_id); +} + +/* + * Add a local APIC ID to our list of valid local APIC IDs that can + * be destinations of interrupts. + */ +void +intr_add_cpu(u_int apic_id) +{ + + if (bootverbose) + printf("INTR: Adding local APIC %d as a target\n", apic_id); + if (num_cpus >= MAXCPU) + panic("WARNING: Local APIC IDs exhausted!"); + cpu_apic_ids[num_cpus] = apic_id; + num_cpus++; +} + +/* + * Distribute all the interrupt sources among the available CPUs once the + * AP's have been launched. + */ +static void +intr_shuffle_irqs(void *arg __unused) +{ + struct intsrc *isrc; + int i; + + /* Don't bother on UP. */ + if (num_cpus <= 1) + return; + + /* Round-robin assign each enabled source a CPU. */ + mtx_lock_spin(&intr_table_lock); + assign_cpu = 1; + for (i = 0; i < NUM_IO_INTS; i++) { + isrc = interrupt_sources[i]; + if (isrc != NULL && isrc->is_enabled) + intr_assign_next_cpu(isrc); + } + mtx_unlock_spin(&intr_table_lock); +} +SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs, NULL) +#endif ==== //depot/projects/uart/amd64/amd64/io_apic.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.20 2005/11/16 20:29:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.21 2006/02/28 22:24:54 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -61,8 +61,6 @@ #define IRQ_SMI (NUM_IO_INTS + 3) #define IRQ_DISABLED (NUM_IO_INTS + 4) -#define DEST_NONE -1 - #define TODO printf("%s: not implemented!\n", __func__) static MALLOC_DEFINE(M_IOAPIC, "io_apic", "I/O APIC structures"); @@ -82,10 +80,10 @@ u_int io_irq; u_int io_intpin:8; u_int io_vector:8; + u_int io_cpu:8; u_int io_activehi:1; u_int io_edgetrigger:1; u_int io_masked:1; - int io_dest:5; int io_bus:4; }; @@ -114,7 +112,7 @@ enum intr_polarity pol); static void ioapic_suspend(struct intsrc *isrc); static void ioapic_resume(struct intsrc *isrc); -static void ioapic_program_destination(struct ioapic_intsrc *intpin); +static void ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id); static void ioapic_program_intpin(struct ioapic_intsrc *intpin); static STAILQ_HEAD(,ioapic) ioapic_list = STAILQ_HEAD_INITIALIZER(ioapic_list); @@ -122,10 +120,10 @@ ioapic_eoi_source, ioapic_enable_intr, ioapic_vector, ioapic_source_pending, ioapic_suspend, ioapic_resume, - ioapic_config_intr }; - -static int bsp_id, current_cluster, logical_clusters, next_ioapic_base; -static u_int next_id, program_logical_dest; + ioapic_config_intr, ioapic_assign_cpu }; + +static int next_ioapic_base; +static u_int next_id; SYSCTL_NODE(_hw, OID_AUTO, apic, CTLFLAG_RD, 0, "APIC options"); static int enable_extint; @@ -273,14 +271,8 @@ } /* Set the destination. */ - if (intpin->io_dest == DEST_NONE) { - low = IOART_DESTPHY; - high = bsp_id << APIC_ID_SHIFT; - } else { - low = IOART_DESTLOG; - high = (intpin->io_dest << APIC_ID_CLUSTER_SHIFT | - APIC_ID_CLUSTER_ID) << APIC_ID_SHIFT; - } + low = IOART_DESTPHY; + high = intpin->io_cpu << APIC_ID_SHIFT; /* Program the rest of the low word. */ if (intpin->io_edgetrigger) @@ -312,7 +304,7 @@ default: KASSERT(intpin->io_vector != 0, ("No vector for IRQ %u", intpin->io_irq)); - low |= IOART_DELLOPRI | intpin->io_vector; + low |= IOART_DELFIXED | intpin->io_vector; } /* Write the values to the APIC. */ @@ -325,60 +317,31 @@ mtx_unlock_spin(&icu_lock); } -/* - * Program an individual intpin's logical destination. - */ static void -ioapic_program_destination(struct ioapic_intsrc *intpin) +ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id) { - struct ioapic *io = (struct ioapic *)intpin->io_intsrc.is_pic; + struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; + struct ioapic *io = (struct ioapic *)isrc->is_pic; - KASSERT(intpin->io_dest != DEST_NONE, - ("intpin not assigned to a cluster")); + intpin->io_cpu = apic_id; if (bootverbose) { - printf("ioapic%u: routing intpin %u (", io->io_id, - intpin->io_intpin); + printf("ioapic%u: Assigning ", io->io_id); ioapic_print_irq(intpin); - printf(") to cluster %u\n", intpin->io_dest); + printf(" to local APIC %u\n", intpin->io_cpu); } ioapic_program_intpin(intpin); } static void -ioapic_assign_cluster(struct ioapic_intsrc *intpin) -{ - - /* - * Assign this intpin to a logical APIC cluster in a - * round-robin fashion. We don't actually use the logical - * destination for this intpin until after all the CPU's - * have been started so that we don't end up with interrupts - * that don't go anywhere. Another alternative might be to - * start up the CPU's earlier so that they can handle interrupts - * sooner. - */ - intpin->io_dest = current_cluster; - current_cluster++; - if (current_cluster >= logical_clusters) - current_cluster = 0; - if (program_logical_dest) - ioapic_program_destination(intpin); -} - -static void ioapic_enable_intr(struct intsrc *isrc) { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; struct ioapic *io = (struct ioapic *)isrc->is_pic; - if (intpin->io_dest == DEST_NONE) { + if (intpin->io_vector == 0) { /* * Allocate an APIC vector for this interrupt pin. Once - * we have a vector we program the interrupt pin. Note - * that after we have booted ioapic_assign_cluster() - * will program the interrupt pin again, but it doesn't - * hurt to do that and trying to avoid that adds needless - * complication. + * we have a vector we program the interrupt pin. */ intpin->io_vector = apic_alloc_vector(intpin->io_irq); if (bootverbose) { @@ -388,7 +351,6 @@ printf(") to vector %u\n", intpin->io_vector); } ioapic_program_intpin(intpin); - ioapic_assign_cluster(intpin); apic_enable_vector(intpin->io_vector); } } @@ -469,22 +431,6 @@ } /* - * Allocate and return a logical cluster ID. Note that the first time - * this is called, it returns cluster 0. ioapic_enable_intr() treats - * the two cases of logical_clusters == 0 and logical_clusters == 1 the - * same: one cluster of ID 0 exists. The logical_clusters == 0 case is - * for UP kernels, which should never call this function. - */ -int -ioapic_next_logical_cluster(void) -{ - - if (logical_clusters >= APIC_MAX_CLUSTER) - panic("WARNING: Local APIC cluster IDs exhausted!"); - return (logical_clusters++); -} - -/* * Create a plain I/O APIC object. */ void * @@ -568,11 +514,10 @@ } /* - * Route interrupts to the BSP by default using physical - * addressing. Vectored interrupts get readdressed using - * logical IDs to CPU clusters when they are enabled. + * Route interrupts to the BSP by default. Interrupts may + * be routed to other CPUs later after they are enabled. */ - intpin->io_dest = DEST_NONE; + intpin->io_cpu = PCPU_GET(apic_id); if (bootverbose && intpin->io_irq != IRQ_DISABLED) { printf("ioapic%u: intpin %d -> ", io->io_id, i); ioapic_print_irq(intpin); @@ -778,29 +723,9 @@ printf("ioapic%u irqs %u-%u on motherboard\n", io->io_id, flags >> 4, flags & 0xf, io->io_intbase, io->io_intbase + io->io_numintr - 1); - bsp_id = PCPU_GET(apic_id); /* Register valid pins as interrupt sources. */ for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++) if (pin->io_irq < NUM_IO_INTS) intr_register_source(&pin->io_intsrc); } - -/* - * Program all the intpins to use logical destinations once the AP's - * have been launched. - */ -static void -ioapic_set_logical_destinations(void *arg __unused) -{ - struct ioapic *io; - int i; - - program_logical_dest = 1; - STAILQ_FOREACH(io, &ioapic_list, io_next) - for (i = 0; i < io->io_numintr; i++) - if (io->io_pins[i].io_dest != DEST_NONE) - ioapic_program_destination(&io->io_pins[i]); -} -SYSINIT(ioapic_destinations, SI_SUB_SMP, SI_ORDER_SECOND, - ioapic_set_logical_destinations, NULL) ==== //depot/projects/uart/amd64/amd64/local_apic.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.23 2005/12/22 22:16:05 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.24 2006/02/28 22:24:54 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -217,6 +217,7 @@ /* Set BSP's per-CPU local APIC ID. */ PCPU_SET(apic_id, lapic_id()); + intr_add_cpu(PCPU_GET(apic_id)); /* Local APIC timer interrupt. */ setidt(APIC_TIMER_INT, IDTVEC(timerint), SDT_SYSIGT, SEL_KPL, 0); @@ -279,7 +280,7 @@ lapic_setup(void) { struct lapic *la; - u_int32_t value, maxlvt; + u_int32_t maxlvt; register_t eflags; char buf[MAXCOMLEN + 1]; @@ -291,19 +292,6 @@ /* Initialize the TPR to allow all interrupts. */ lapic_set_tpr(0); - /* Use the cluster model for logical IDs. */ - value = lapic->dfr; - value &= ~APIC_DFR_MODEL_MASK; - value |= APIC_DFR_MODEL_CLUSTER; - lapic->dfr = value; - - /* Set this APIC's logical ID. */ - value = lapic->ldr; - value &= ~APIC_ID_MASK; - value |= (la->la_cluster << APIC_ID_CLUSTER_SHIFT | - 1 << la->la_cluster_id) << APIC_ID_SHIFT; - lapic->ldr = value; - /* Setup spurious vector and enable the local APIC. */ lapic_enable(); ==== //depot/projects/uart/amd64/amd64/mp_machdep.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.268 2006/02/07 21:22:01 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.269 2006/02/28 22:24:54 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -160,7 +160,7 @@ static u_int boot_address; -static void set_logical_apic_ids(void); +static void set_interrupt_apic_ids(void); static int start_all_aps(void); static int start_ap(int apic_id); static void release_aps(void *dummy); @@ -405,7 +405,7 @@ hyperthreading_cpus = logical_cpus; } - set_logical_apic_ids(); + set_interrupt_apic_ids(); } @@ -596,33 +596,29 @@ */ /* - * Set the APIC logical IDs. - * - * We want to cluster logical CPU's within the same APIC ID cluster. - * Since logical CPU's are aligned simply filling in the clusters in - * APIC ID order works fine. Note that this does not try to balance - * the number of CPU's in each cluster. (XXX?) + * We tell the I/O APIC code about all the CPUs we want to receive + * interrupts. If we don't want certain CPUs to receive IRQs we + * can simply not tell the I/O APIC code about them in this function. + * We also do not tell it about the BSP since it tells itself about + * the BSP internally to work with UP kernels and on UP machines. */ static void -set_logical_apic_ids(void) +set_interrupt_apic_ids(void) { - u_int apic_id, cluster, cluster_id; + u_int apic_id; - /* Force us to allocate cluster 0 at the start. */ - cluster = -1; - cluster_id = APIC_MAX_INTRACLUSTER_ID; for (apic_id = 0; apic_id < MAXCPU; apic_id++) { if (!cpu_info[apic_id].cpu_present) continue; - if (cluster_id == APIC_MAX_INTRACLUSTER_ID) { - cluster = ioapic_next_logical_cluster(); - cluster_id = 0; - } else - cluster_id++; - if (bootverbose) - printf("APIC ID: physical %u, logical %u:%u\n", - apic_id, cluster, cluster_id); - lapic_set_logical_id(apic_id, cluster, cluster_id); + if (cpu_info[apic_id].cpu_bsp) + continue; +#if 0 + /* Don't let hyperthreads service interrupts. */ + if (hyperthreading_cpus > 1 && + apic_id % hyperthreading_cpus != 0) + continue; +#endif + intr_add_cpu(apic_id); } } ==== //depot/projects/uart/amd64/conf/NOTES#6 (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.51 2005/12/03 01:23:49 anholt Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.52 2006/03/06 15:29:28 yar Exp $ # # @@ -170,11 +170,10 @@ # the tdfx DRI module from XFree86 and is completely unrelated. # # To enable Linuxulator support, one must also include COMPAT_LINUX in the -# config as well, or you will not have the dependencies. The other option -# is to load both as modules. +# config as well. The other option is to load both as modules. device tdfx # Enable 3Dfx Voodoo support -#XXX#options TDFX_LINUX # Enable Linuxulator support +#XXX#device tdfx_linux # Enable Linuxulator support # # ACPI support using the Intel ACPI Component Architecture reference ==== //depot/projects/uart/amd64/include/apicvar.h#8 (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/include/apicvar.h,v 1.16 2005/12/22 22:16:05 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.17 2006/02/28 22:24:54 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -181,7 +181,6 @@ void *ioapic_create(uintptr_t addr, int32_t id, int intbase); int ioapic_disable_pin(void *cookie, u_int pin); int ioapic_get_vector(void *cookie, u_int pin); -int ioapic_next_logical_cluster(void); void ioapic_register(void *cookie); int ioapic_remap_vector(void *cookie, u_int pin, int vector); int ioapic_set_bus(void *cookie, u_int pin, int bus_type); ==== //depot/projects/uart/amd64/include/intr_machdep.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.8 2005/12/08 18:33:30 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.9 2006/02/28 22:24:54 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -85,6 +85,7 @@ void (*pic_resume)(struct intsrc *); int (*pic_config_intr)(struct intsrc *, enum intr_trigger, enum intr_polarity); + void (*pic_assign_cpu)(struct intsrc *, u_int apic_id); }; /* Flags for pic_disable_source() */ @@ -105,6 +106,7 @@ u_long *is_count; u_long *is_straycount; u_int is_index; + u_int is_enabled:1; }; struct trapframe; @@ -117,6 +119,11 @@ enum intr_trigger elcr_read_trigger(u_int irq); void elcr_resume(void); void elcr_write_trigger(u_int irq, enum intr_trigger trigger); +#ifdef SMP +void intr_add_cpu(u_int apic_id); +#else +#define intr_add_cpu(apic_id) +#endif int intr_add_handler(const char *name, int vector, driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep); int intr_config_intr(int vector, enum intr_trigger trig, ==== //depot/projects/uart/amd64/include/mptable.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/mptable.h,v 1.222 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/mptable.h,v 1.223 2006/03/01 05:59:56 sam Exp $ */ #ifndef __MACHINE_MPTABLE_H__ @@ -139,7 +139,8 @@ char name[16]; } basetable_entry; +#ifdef _KERNEL int mptable_pci_probe_table(int bus); int mptable_pci_route_interrupt(device_t pcib, device_t dev, int pin); - +#endif #endif /* !__MACHINE_MPTABLE_H__ */ ==== //depot/projects/uart/amd64/isa/atpic.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.18 2005/12/08 18:33:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.19 2006/02/28 22:24:54 jhb Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -108,8 +108,8 @@ #define ATPIC(io, base, eoi, imenptr) \ { { atpic_enable_source, atpic_disable_source, (eoi), \ atpic_enable_intr, atpic_vector, atpic_source_pending, NULL, \ - atpic_resume, atpic_config_intr }, (io), (base), \ - IDT_IO_INTS + (base), (imenptr) } + atpic_resume, atpic_config_intr, atpic_assign_cpu }, (io), \ + (base), IDT_IO_INTS + (base), (imenptr) } #define INTSRC(irq) \ { { &atpics[(irq) / 8].at_pic }, IDTVEC(atpic_intr ## irq ), \ @@ -142,6 +142,7 @@ static int atpic_source_pending(struct intsrc *isrc); static int atpic_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); +static void atpic_assign_cpu(struct intsrc *isrc, u_int apic_id); static void i8259_init(struct atpic *pic, int slave); static struct atpic atpics[] = { @@ -353,6 +354,17 @@ } static void +atpic_assign_cpu(struct intsrc *isrc, u_int apic_id) +{ + + /* + * 8259A's are only used in UP in which case all interrupts always + * go to the sole CPU and this function shouldn't even be called. + */ + panic("%s: bad cookie", __func__); +} + +static void i8259_init(struct atpic *pic, int slave) { int imr_addr; ==== //depot/projects/uart/arm/arm/busdma_machdep.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.24 2005/10/03 22:44:54 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.25 2006/03/01 23:04:25 cognet Exp $"); /* * MacPPC bus dma support routines @@ -93,6 +93,8 @@ bus_dma_tag_t dmat; int flags; void *buffer; + void *origbuffer; + void *allocbuffer; TAILQ_ENTRY(bus_dmamap) freelist; int len; }; @@ -416,6 +418,23 @@ *mapp = NULL; return (ENOMEM); } + if (flags & BUS_DMA_COHERENT) { + void *tmpaddr = arm_remap_nocache( + (void *)((vm_offset_t)*vaddr &~ PAGE_MASK), + dmat->maxsize + ((vm_offset_t)*vaddr & PAGE_MASK)); + + if (tmpaddr) { + tmpaddr = (void *)((vm_offset_t)(tmpaddr) + + ((vm_offset_t)*vaddr & PAGE_MASK)); + newmap->origbuffer = *vaddr; + newmap->allocbuffer = tmpaddr; + cpu_idcache_wbinv_range((vm_offset_t)*vaddr, + dmat->maxsize); + *vaddr = tmpaddr; + } else + newmap->origbuffer = newmap->allocbuffer = NULL; + } else + newmap->origbuffer = newmap->allocbuffer = NULL; return (0); } @@ -426,6 +445,12 @@ void bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map) { + if (map->allocbuffer) { + KASSERT(map->allocbuffer == vaddr, + ("Trying to freeing the wrong DMA buffer")); + vaddr = map->origbuffer; + arm_unmap_nocache(map->allocbuffer, dmat->maxsize); + } if (dmat->maxsize <= PAGE_SIZE) free(vaddr, M_DEVBUF); else { ==== //depot/projects/uart/arm/arm/pmap.c#10 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.41 2005/11/20 06:09:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.42 2006/03/01 23:04:25 cognet Exp $"); #include #include #include @@ -2553,9 +2553,12 @@ virtual_avail = round_page(virtual_avail); virtual_end = lastaddr; kernel_vm_end = pmap_curmaxkvaddr; + arm_nocache_startaddr = lastaddr; + #ifdef ARM_USE_SMALL_ALLOC mtx_init(&smallalloc_mtx, "Small alloc page list", NULL, MTX_DEF); - alloc_firstaddr = alloc_curaddr = lastaddr; + alloc_firstaddr = alloc_curaddr = arm_nocache_startaddr + + ARM_NOCACHE_KVA_SIZE; #endif } @@ -2916,6 +2919,13 @@ } void +pmap_kenter_nocache(vm_offset_t va, vm_paddr_t pa) +{ + + pmap_kenter_internal(va, pa, 0); +} + +void pmap_kenter_user(vm_offset_t va, vm_paddr_t pa) { ==== //depot/projects/uart/arm/arm/trap.c#11 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.21 2006/02/08 08:09:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.23 2006/03/01 20:43:51 cognet Exp $"); #include @@ -428,15 +428,14 @@ error = vm_fault(map, va, ftype, (ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY : VM_FAULT_NORMAL); pcb->pcb_onfault = onfault; - if (__predict_true(error == 0)) { - goto out; - } if (map != kernel_map) { PROC_LOCK(p); p->p_lock--; PROC_UNLOCK(p); } + if (__predict_true(error == 0)) + goto out; if (user == 0) { if (pcb->pcb_onfault) { tf->tf_r0 = error; @@ -930,6 +929,8 @@ AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args); AUDIT_SYSCALL_EXIT(error, td); + KASSERT(td->td_ar == NULL, + ("returning from syscall with td_ar set!")); } switch (error) { case 0: ==== //depot/projects/uart/arm/arm/undefined.c#10 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.11 2006/02/22 18:57:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.12 2006/03/01 18:33:45 cognet Exp $"); #include #include @@ -212,7 +212,7 @@ ksi.ksi_code = ILL_ILLADR; ksi.ksi_addr = (u_int32_t *)(intptr_t) fault_pc; trapsignal(td, &ksi); - userret(td, frame, 0); + userret(td, frame); return; } @@ -317,6 +317,6 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 6 22:38:53 2006 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 8488F16A420; Mon, 6 Mar 2006 22:38: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 315AD16A420 for ; Mon, 6 Mar 2006 22:38:52 +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 B2DF043D7B for ; Mon, 6 Mar 2006 22:38:51 +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 k26McpYl011824 for ; Mon, 6 Mar 2006 22:38:51 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 k26McpI9011819 for perforce@freebsd.org; Mon, 6 Mar 2006 22:38:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Mar 2006 22:38:51 GMT Message-Id: <200603062238.k26McpI9011819@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 92880 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, 06 Mar 2006 22:38:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=92880 Change 92880 by rwatson@rwatson_peppercorn on 2006/03/06 22:38:02 Update HISTORY. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#8 (text+ko) ==== @@ -24,6 +24,9 @@ the terminal ID that appears in the process32/subject32 tokens. These are assumed to be IP addresses, and as such, to be in network byte order. +- Universally, APIs now assume that IP addresses and ports are provided + in network byte order. APIs now generally provide these types in + network byte order when decoding. OpenBSM 1.0 alpha 5 @@ -151,4 +154,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#7 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#8 $ From owner-p4-projects@FreeBSD.ORG Mon Mar 6 23:02:37 2006 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 DD12216A423; Mon, 6 Mar 2006 23:02: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 9B5AF16A420 for ; Mon, 6 Mar 2006 23:02:36 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6203143D49 for ; Mon, 6 Mar 2006 23:02:36 +0000 (GMT) (envelope-from kmacy@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 k26N2aS5013015 for ; Mon, 6 Mar 2006 23:02:36 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k26N2ZoP013012 for perforce@freebsd.org; Mon, 6 Mar 2006 23:02:35 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 6 Mar 2006 23:02:35 GMT Message-Id: <200603062302.k26N2ZoP013012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92883 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, 06 Mar 2006 23:02:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=92883 Change 92883 by kmacy@kmacy_storage:sun4v_work on 2006/03/06 23:01:35 move data protection fault TLB flush inline Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#19 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#19 (text+ko) ==== @@ -261,8 +261,10 @@ .macro insn_miss GET_MMFSA_SCRATCH(%g1) ! insn 1 - GET_HASH_SCRATCH(%g2) ! insn 2,3 - ba,pt %xcc, tsb_miss + ldda [%g0 + %g1]ASI_LDTD_REAL, %g4 + addx %g1, 0x10, %g1 + ldda [%g0 + %g1]ASI_LDTD_REAL, %g6 + ba,pt %xcc, tsb_miss_handler mov VTD_REF, %g3 .align 32 .endm @@ -274,19 +276,25 @@ .endm .macro data_miss - GET_MMFSA_SCRATCH(%g1) ! insn 1 - GET_HASH_SCRATCH(%g2) ! insn 2,3 - add %g1, MMFSA_D_, %g1 ! set fsa to data - ba,pt %xcc, tsb_miss + GET_MMFSA_SCRATCH(%g1) ! insn 1 + add %g1, MMFSA_D_, %g1 ! set fsa to data + ldda [%g0 + %g1]ASI_LDTD_REAL, %g4 + addx %g1, 0x10, %g1 + ldda [%g0 + %g1]ASI_LDTD_REAL, %g6 + ba,pt %xcc, tsb_miss_handler mov VTD_REF, %g3 .align 32 .endm .macro data_prot GET_MMFSA_SCRATCH(%g1) ! insn 1 - GET_HASH_SCRATCH(%g2) ! insn 2,3 add %g1, MMFSA_D_, %g1 ! set fsa to data - ba,pt %xcc, tsb_miss + ldda [%g0 + %g1]ASI_LDTD_REAL, %g4 + addx %g1, 0x10, %g1 + ldda [%g0 + %g1]ASI_LDTD_REAL, %g6 + ! XXX patch this to branch to the tsb_miss_handler + ! on fixed revs of the HV + ba,pt %xcc, data_prot_handler mov VTD_W, %g3 .align 32 .endm @@ -1025,69 +1033,44 @@ END(tl0_intr) -! The HV documentation is wrong -! mappings are not already flushed befor taking a -! data protection trap -! IN: -! %g2 == hash base -! %g3 == flags -! %g5 == fault addr -! %g6 == context -! %g1,%g4,%g7 temps -! OUT: -! %g6 <- TAG -ontario_unmap_addr_errata_begin: - ! do the unmap call - mov %o0, %g1 - mov %o1, %g4 - mov %o2, %g7 - mov %g5, %o0 - mov %g6, %o1 - mov MAP_ITLB|MAP_DTLB, %o2 - ta MMU_UNMAP_ADDR - mov %g1, %o0 - mov %g4, %o1 - mov %g7, %o2 - srlx %g5, TTARGET_VA_SHIFT, %g4 - sllx %g6, TTARGET_CTX_SHIFT, %g6 - ba,pt %xcc, tsb_miss_fault_handler - or %g6, %g4, %g6 -ontario_unmap_addr_errata_end: + -! %g1==mmfsa (RA) -! %g2==hash base (VA) ! %g3==TTE flags +! %g4==fault type (if data miss) +! %g5==fault addr +! %g6==context ! internal usage: ! %g1==absolute index -! %g2==pointer to hash entry +! %g2==hash base, pointer to hash entry ! %g3==flag bits, TSB (RA) ! %g4==fault type,entry tag ! %g5==tag ! %g6==hash size, temp ! %g7 temp -ENTRY(tsb_miss) - ldda [%g0 + %g1]ASI_LDTD_REAL, %g4 - addx %g1, 0x10, %g1 - ldda [%g0 + %g1]ASI_LDTD_REAL, %g6 +ENTRY(data_prot_handler) +! The HV documentation is wrong mappings are not already +! flushed before taking a data protection trap + mov %o0, %g1 + mov %o1, %g4 ! fault type not set on prot fault + mov %o2, %g7 + mov %g5, %o0 + mov %g6, %o1 + mov MAP_ITLB|MAP_DTLB, %o2 + ta MMU_UNMAP_ADDR + mov %g1, %o0 + mov %g4, %o1 + mov %g7, %o2 +ENTRY(tsb_miss_handler) MAGIC_TRAP_ON -/* these two instructions will be patched - * at some point - */ -#ifdef ONTARIO_UNMAP_ERRATA - cmp %g3, VTD_W - be,pn %xcc, ontario_unmap_addr_errata_begin -#endif - srlx %g5, TTARGET_VA_SHIFT, %g1 + + srlx %g5, TTARGET_VA_SHIFT, %g1 sllx %g6, TTARGET_CTX_SHIFT, %g6 or %g6, %g1, %g6 ! %g6 == search tag - -tsb_miss_fault_handler: - ! %g4 == fault type %g5 == fault addr %g6 == tag - ! XXX only handle normal miss for now + ! XXX only handle normal miss for now (look at fault type in the future) #ifdef PMAP_DEBUG cmp %g6, %g0 ! NULL ptr deref in kernel bne,pt %xcc, 4f @@ -1096,10 +1079,11 @@ illtrap ! give up 4: #endif - mov 1, %g7 + mov 1, %g7 sllx %g7, PAGE_SHIFT, %g7 sub %g7, 1, %g7 ! %g7==PAGE_MASK + GET_HASH_SCRATCH(%g2) ! insn 2,3 and %g2, %g7, %g4 ! size stored in lower 13 bits andn %g2, %g7, %g2 ! actual VA of hash @@ -1209,7 +1193,8 @@ MAGIC_TRAP_OFF retry -END(tsb_miss) +END(tsb_miss_handler) +END(data_prot_handler) /* * Write to read-only page From owner-p4-projects@FreeBSD.ORG Tue Mar 7 11:04:35 2006 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 86E9D16A423; Tue, 7 Mar 2006 11:04: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 3FFF316A422 for ; Tue, 7 Mar 2006 11:04:34 +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 8E2BB43D53 for ; Tue, 7 Mar 2006 11:04:33 +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 k27B4XFu081619 for ; Tue, 7 Mar 2006 11:04:33 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 k27B4X8o081616 for perforce@freebsd.org; Tue, 7 Mar 2006 11:04:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 7 Mar 2006 11:04:33 GMT Message-Id: <200603071104.k27B4X8o081616@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 92895 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, 07 Mar 2006 11:04:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=92895 Change 92895 by rwatson@rwatson_peppercorn on 2006/03/07 11:03:32 Add todo for making praudit able to support individual tokens in streams, not just full records and file tokens. Affected files ... .. //depot/projects/trustedbsd/openbsm/TODO#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/TODO#6 (text+ko) ==== @@ -13,5 +13,9 @@ - It might be desirable to be able to provide EOPNOTSUPP system call stubs on systems that don't have the necessary audit system calls; that would allow the full libbsm and tool set to build, just not run. +- Teach praudit how to begin printing at any point in a token stream, not + just at the beginning of a record. This will make it easier to use + praudit in test suites processing single-token files without header and + trailer context. -$P4: //depot/projects/trustedbsd/openbsm/TODO#5 $ +$P4: //depot/projects/trustedbsd/openbsm/TODO#6 $ From owner-p4-projects@FreeBSD.ORG Tue Mar 7 11:08:02 2006 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 C869B16A423; Tue, 7 Mar 2006 11:08:01 +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 9D8C616A420 for ; Tue, 7 Mar 2006 11:08:01 +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 67CB243D45 for ; Tue, 7 Mar 2006 11:08:01 +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 k27B81Ef081782 for ; Tue, 7 Mar 2006 11:08:01 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 k27B80RP081760 for perforce@freebsd.org; Tue, 7 Mar 2006 11:08:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 7 Mar 2006 11:08:00 GMT Message-Id: <200603071108.k27B80RP081760@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 92896 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, 07 Mar 2006 11:08:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=92896 Change 92896 by rwatson@rwatson_peppercorn on 2006/03/07 11:08:00 Snapshot beginnings of a BSM file format test set. This isn't a full Makefile, and generate currently only generates samples of a subset of the tokens. However, I didn't want to lose the current iteration if a disk crashed or the like. The eventual goal of this test tool is to generate a set of tokens using OpenBSM, then compare them to a "known good" reference set. This will also form a foundation for testing praudit along similar lines, by providing reference output and comparing executed output with it. Affected files ... .. //depot/projects/trustedbsd/openbsm/test/bsm/Makefile#1 add .. //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Mar 7 11:33:42 2006 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 3B3DC16A428; Tue, 7 Mar 2006 11:33:42 +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 0718216A420 for ; Tue, 7 Mar 2006 11:33:42 +0000 (GMT) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8439743D46 for ; Tue, 7 Mar 2006 11:33:40 +0000 (GMT) (envelope-from bz@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 k27BXeEd082721 for ; Tue, 7 Mar 2006 11:33:40 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27BXIk2082699 for perforce@freebsd.org; Tue, 7 Mar 2006 11:33:18 GMT (envelope-from bz@freebsd.org) Date: Tue, 7 Mar 2006 11:33:18 GMT Message-Id: <200603071133.k27BXIk2082699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 92897 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, 07 Mar 2006 11:33:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=92897 Change 92897 by bz@bz_dopt_ah on 2006/03/07 11:32:54 IFC @92894 Affected files ... .. //depot/projects/fast_ipsec/src/lib/libipsec/ipsec_set_policy.3#2 integrate .. //depot/projects/fast_ipsec/src/lib/libipsec/ipsec_strerror.3#2 integrate .. //depot/projects/fast_ipsec/src/sbin/setkey/setkey.8#2 integrate .. //depot/projects/fast_ipsec/src/sys/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/alpha/machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/alpha/mp_machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/alpha/trap.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/conf/GENERIC#4 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/include/_types.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/include/param.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_proto.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_syscall.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_sysent.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/osf1/osf1_misc.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/mptable_pci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/ia32/ia32_syscall.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/_types.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/mptable.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/param.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/isa/atpic.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/identcpu.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/machdep.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/trap.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91.c#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91var.h#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/files.at91#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/std.at91#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/conf/KB920X#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/fast_ipsec/src/sys/arm/include/_types.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/include/atomic.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/arm/include/param.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/include/pmap.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321_aau.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321_dma.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321_pci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/boot/common/module.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/ia64/efi/start.S#2 integrate .. //depot/projects/fast_ipsec/src/sys/bsm/audit.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/bsm/audit_internal.h#1 branch .. //depot/projects/fast_ipsec/src/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/bsm/audit_record.h#1 branch .. //depot/projects/fast_ipsec/src/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/coda/coda.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/coda/coda_vfsops.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/conf/Makefile.arm#6 integrate .. //depot/projects/fast_ipsec/src/sys/conf/Makefile.i386#3 integrate .. //depot/projects/fast_ipsec/src/sys/conf/Makefile.pc98#3 integrate .. //depot/projects/fast_ipsec/src/sys/conf/NOTES#5 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files#7 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.alpha#3 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.amd64#4 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.i386#5 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.ia64#3 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.pc98#5 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.powerpc#3 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.sparc64#3 integrate .. //depot/projects/fast_ipsec/src/sys/conf/kern.post.mk#3 integrate .. //depot/projects/fast_ipsec/src/sys/conf/kmod.mk#5 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options#6 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options.i386#4 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options.pc98#4 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/pf/net/if_pflog.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/pf/net/pf_norm.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/amr/amr.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/amr/amr_linux.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/amr/amr_pci.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/amr/amrreg.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/amr/amrvar.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/an/if_an.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/asr/asr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/asr/i2odep.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-raid.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-raid.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/atapi-fd.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/atapi-fd.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bfe/if_bfe.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/cardbus/cardbus.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ce/ceddk.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ce/ceddk.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ce/if_ce.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ce/ng_ce.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ce/tau32-ddk.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ce/tau32-ddk.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/de/dc21040reg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/de/if_de.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/de/if_devar.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_3c503.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_cbus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_hpp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_isa.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_novell.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_sic.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ed/if_edvar.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/em/if_em.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/em/if_em.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/em/if_em_osdep.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ex/if_ex.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fdc/fdc_acpi.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hme/if_hme.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ic/z8530.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ieee488/pcii.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/iir/iir.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/iir/iir.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ipmi/ipmi.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_inline.h#2 delete .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_ioctl.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_library.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_library.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/ispreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/iwi/if_iwireg.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/le/am7990.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/le/am79900.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/le/am79900reg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/le/am79900var.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/le/am7990reg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/le/am7990var.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/le/if_le_ledma.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/le/if_le_pci.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/le/lance.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/le/lancereg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/le/lancevar.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/lge/if_lge.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/md/md.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/mii.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpilib/fc_log.h#2 delete .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpilib/mpi_fc.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpilib/mpi_inb.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpilib/mpi_lan.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpilib/mpi_log_fc.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpilib/mpi_log_sas.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpilib/mpi_sas.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpilib/mpi_targ.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpilib/mpi_tool.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpilib/mpi_type.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mse/mse.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/myri10ge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/myri10ge/if_myri10ge.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/myri10ge/if_myri10ge_var.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/myri10ge/mcp_gen_header.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/myri10ge/myri10ge_mcp.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/nge/if_nge.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pci/pci.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ppbus/lpt.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ppc/ppc.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/puc/puc.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/puc/puc_ebus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/puc/puc_sbus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ral/if_ral.c#4 delete .. //depot/projects/fast_ipsec/src/sys/dev/ral/if_ral_pccard.c#3 delete .. //depot/projects/fast_ipsec/src/sys/dev/ral/if_ral_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ral/if_ralreg.h#3 delete .. //depot/projects/fast_ipsec/src/sys/dev/ral/if_ralvar.h#2 delete .. //depot/projects/fast_ipsec/src/sys/dev/ral/rt2560.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ral/rt2560reg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ral/rt2560var.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ral/rt2661.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ral/rt2661_ucode.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ral/rt2661reg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ral/rt2661var.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/re/if_re.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/rp/rp_pci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/si/si.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/si/si2_z280.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/si/si3_t225.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sio/sio.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sn/if_sn.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/driver.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/isa/mss.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/solo.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/ac97.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/channel.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/feeder.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/feeder_fmt.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/feeder_rate.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/vchan.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/tdfx/tdfx_linux.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/tdfx/tdfx_pci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/tx/if_tx.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_bus_ebus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_dev_sab82532.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_kbd_sun.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ehcivar.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_axe.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_rue.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_udav.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_uralreg.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ohcivar.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ufoma.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/umass.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/umct.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usb_port.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usb_quirks.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/vge/if_vge.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/msdosfs/direntry.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/msdosfs/msdosfs_denode.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/nullfs/null_vfsops.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/nwfs/nwfs_node.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/procfs/procfs_ctl.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/concat/g_concat.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/concat/g_concat.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/eli/pkcs5v2.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/eli/pkcs5v2.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/gate/g_gate.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/gate/g_gate.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_io.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_slice.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_slice.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/label/g_label.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/label/g_label.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/label/g_label_iso9660.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/label/g_label_msdosfs.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/label/g_label_ntfs.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/label/g_label_ufs.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/nop/g_nop.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/shsec/g_shsec.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/shsec/g_shsec.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/stripe/g_stripe.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/uzip/g_uzip.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/geom/vinum/geom_vinum_drive.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/zero/g_zero.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/conf/NOTES#6 integrate .. //depot/projects/fast_ipsec/src/sys/i386/conf/PAE#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/geode.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/intr_machdep.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/io_apic.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/mem.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/mptable_pci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/swtch.s#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/trap.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/ibcs2/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/ibcs2/syscalls.xenix#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/_types.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/cserial.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/intr_machdep.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/mptable.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/param.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/xbox.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/isa/atpic.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/linux/linux_ptrace.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/pci/pci_bus.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/conf/SKI#3 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia32/ia32_trap.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/genassym.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/locore.S#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/mca.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/include/_types.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/include/elf.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/include/param.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/isofs/cd9660/cd9660_node.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/isofs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/imgact_elf.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/init_main.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/init_sysent.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_acct.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_alq.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_clock.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_condvar.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_conf.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_cpu.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_exec.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_exit.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_kse.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_malloc.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_proc.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_prot.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_resource.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_rwlock.c#1 branch .. //depot/projects/fast_ipsec/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_sig.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_sx.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_synch.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_tc.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_thr.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_thread.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_time.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/md5c.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_bus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_disk.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_firmware.c#1 branch .. //depot/projects/fast_ipsec/src/sys/kern/subr_lock.c#1 branch .. //depot/projects/fast_ipsec/src/sys/kern/subr_prf.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_trap.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_witness.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/sys_generic.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/sys_process.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/syscalls.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/syscalls.master#7 integrate .. //depot/projects/fast_ipsec/src/sys/kern/tty.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/tty_compat.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/tty_pts.c#1 branch .. //depot/projects/fast_ipsec/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_default.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/libkern/fnmatch.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/libkern/gets.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/3dfx/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/3dfx_linux/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/Makefile#6 integrate .. //depot/projects/fast_ipsec/src/sys/modules/amr/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/amr/amr_linux/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/arcnet/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/bktr/bktr/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ce/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/coda5/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/crypto/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/de/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/dummynet/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/firewire/firewire/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/firewire/fwe/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/firewire/sbp/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/firewire/sbp_targ/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/firmware/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_ef/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_ppp/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/if_vlan/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ipmi/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/kbdmux/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/le/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/linux/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/myri10ge/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/myri10ge/myri10ge/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/netgraph/atm/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/netgraph/bluetooth/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/netgraph/bluetooth/bluetooth/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/netgraph/bluetooth/bt3c/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/netgraph/bluetooth/h4/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/nfs4client/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/nfsclient/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/nwfs/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/pf/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/pflog/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/ral/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/smbfs/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/svr4/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/twa/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/uart/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ufoma/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/xfs/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/bridgestp.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net/if.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net/if.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_arcsubr.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_bridge.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_bridgevar.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_ef.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_fddisubr.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_fwsubr.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_gif.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_gif.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_gre.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_iso88025subr.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_media.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_media.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_ppp.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_var.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_vlan.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_vlan_var.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/pfil.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/pfil.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/ppp_deflate.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/radix.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/netatm/atm_signal.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netatm/ipatm/ipatm_vcm.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/netflow/ng_netflow.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/netflow/ng_netflow.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_frame_relay.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_ipfw.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_ipfw.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_lmi.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_message.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_pppoe.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_source.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/if_ether.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in_gif.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in_var.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_dummynet.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_gre.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_gre.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_input.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_ipsec.c#1 branch .. //depot/projects/fast_ipsec/src/sys/netinet/ip_ipsec.h#1 branch .. //depot/projects/fast_ipsec/src/sys/netinet/ip_mroute.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_output.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/in6.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/ipcomp_input.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/mld6.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/nd6.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/keysock.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/keysock.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipx/ipx_input.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netipx/spx_usrreq.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netkey/keysock.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netkey/keysock.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netncp/ncp_conn.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netsmb/smb_crypt.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netsmb/smb_smb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netsmb/smb_subr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_lock.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/opencrypto/crypto.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/cbus/fdc.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/cbus/ppc.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/cbus/sio.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/conf/NOTES#6 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/include/_types.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/include/param.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/pccard/cardinfo.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/pccard/driver.h#2 delete .. //depot/projects/fast_ipsec/src/sys/pccard/i82365.h#2 delete .. //depot/projects/fast_ipsec/src/sys/pccard/meciareg.h#2 delete .. //depot/projects/fast_ipsec/src/sys/pccard/pccard_nbk.h#2 delete .. //depot/projects/fast_ipsec/src/sys/pccard/pcic_pci.h#2 delete .. //depot/projects/fast_ipsec/src/sys/pccard/pcicvar.h#2 delete .. //depot/projects/fast_ipsec/src/sys/pccard/slot.h#2 delete .. //depot/projects/fast_ipsec/src/sys/pci/agp.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agp_i810.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agp_intel.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/pci/dc21040reg.h#2 delete .. //depot/projects/fast_ipsec/src/sys/pci/if_de.c#4 delete .. //depot/projects/fast_ipsec/src/sys/pci/if_devar.h#4 delete .. //depot/projects/fast_ipsec/src/sys/pci/if_pcn.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_rl.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_sf.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_sis.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_sk.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_skreg.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_ste.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_vr.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_wb.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_xl.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/trap.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/rpc/rpcclnt.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/security/audit/audit.c#1 branch .. //depot/projects/fast_ipsec/src/sys/security/audit/audit.h#1 branch .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_arg.c#1 branch .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_bsm.c#1 branch .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_bsm_klib.c#1 branch .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_bsm_token.c#1 branch .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_pipe.c#1 branch .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_private.h#1 branch .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_syscalls.c#1 branch .. //depot/projects/fast_ipsec/src/sys/security/audit/audit_trigger.c#1 branch .. //depot/projects/fast_ipsec/src/sys/security/mac/mac_process.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/central/central.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/ebus/ebus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/fhc/fhc_central.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/fhc/fhc_nexus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/include/in_cksum.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/include/trap.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/include/utrap.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/pci/apb.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/pci/ofw_pcib.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sbus/lsi64854.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sbus/lsi64854var.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/eeprom.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/tick.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/trap.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/sys/_lock.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/_rwlock.h#1 branch .. //depot/projects/fast_ipsec/src/sys/sys/_types.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/ata.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/bio.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/cdefs.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/firmware.h#1 branch .. //depot/projects/fast_ipsec/src/sys/sys/imgact.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/ioctl.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/ioctl_compat.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/ipmi.h#1 branch .. //depot/projects/fast_ipsec/src/sys/sys/ktr.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/lock.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/mbuf.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/sys/md5.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/mount.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/sys/mutex.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/namei.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/param.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/sys/pcpu.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/proc.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/sys/ptrace.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/queue.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/rwlock.h#1 branch .. //depot/projects/fast_ipsec/src/sys/sys/select.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/serial.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/signalvar.h#6 integrate .. //depot/projects/fast_ipsec/src/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/socketvar.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/sockio.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/syscall.h#6 integrate .. //depot/projects/fast_ipsec/src/sys/sys/syscall.mk#6 integrate .. //depot/projects/fast_ipsec/src/sys/sys/syscallsubr.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/sys/sysctl.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/sysproto.h#7 integrate .. //depot/projects/fast_ipsec/src/sys/sys/systm.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/taskqueue.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/thr.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/timers.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/sys/tree.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/ttychars.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/ttycom.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/ttydev.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/turnstile.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/user.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/vnode.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/tools/fw_stub.awk#1 branch .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_alloc.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/softdep.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ufs/ufs_extattr.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ufs/ufs_quota.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/vm/redzone.c#1 branch .. //depot/projects/fast_ipsec/src/sys/vm/redzone.h#1 branch .. //depot/projects/fast_ipsec/src/sys/vm/swap_pager.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/vm/uma_core.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_contig.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_fault.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_map.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_object.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_object.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_page.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_page.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_pageq.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/fast_ipsec/src/lib/libipsec/ipsec_set_policy.3#2 (text+ko) ==== @@ -27,16 +27,16 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libipsec/ipsec_set_policy.3,v 1.20 2005/02/09 18:03:14 ru Exp $ +.\" $FreeBSD: src/lib/libipsec/ipsec_set_policy.3,v 1.21 2006/02/14 13:02:00 gnn Exp $ .\" -.Dd May 5, 1998 +.Dd February 14, 2006 .Dt IPSEC_SET_POLICY 3 .Os .Sh NAME .Nm ipsec_set_policy , .Nm ipsec_get_policylen , .Nm ipsec_dump_policy -.Nd manipulate IPsec policy specification structure from readable string +.Nd create an IPsec policy structure from a human readable string .\" .Sh LIBRARY .Lb libipsec @@ -51,38 +51,37 @@ .Sh DESCRIPTION The .Fn ipsec_set_policy -function generates IPsec policy specification structure, namely +function generates an IPsec policy specification structure, .Li struct sadb_x_policy and/or .Li struct sadb_x_ipsecrequest -from human-readable policy specification. -Policy specification must be given as C string +from a human-readable policy specification. +The policy specification must be given as a C string, +passed in the >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 7 12:25:37 2006 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 DAACB16A423; Tue, 7 Mar 2006 12:25: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 8BBDA16A420 for ; Tue, 7 Mar 2006 12:25:36 +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 5528A43D45 for ; Tue, 7 Mar 2006 12:25:36 +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 k27CPaSg084549 for ; Tue, 7 Mar 2006 12:25:36 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 k27CPZPB084546 for perforce@freebsd.org; Tue, 7 Mar 2006 12:25:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 7 Mar 2006 12:25:35 GMT Message-Id: <200603071225.k27CPZPB084546@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 92898 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, 07 Mar 2006 12:25:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=92898 Change 92898 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/03/07 12:24:36 autoconf/automake bits for test subtree and generate tool. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure.ac#17 edit .. //depot/projects/trustedbsd/openbsm/test/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/test/bsm/Makefile#2 delete .. //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.am#1 add Differences ... ==== //depot/projects/trustedbsd/openbsm/configure.ac#17 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#16 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#17 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -104,6 +104,8 @@ bsm/Makefile libbsm/Makefile man/Makefile + test/Makefile + test/bsm/Makefile tools/Makefile]) AC_OUTPUT From owner-p4-projects@FreeBSD.ORG Tue Mar 7 14:31:53 2006 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 2F46E16A423; Tue, 7 Mar 2006 14:31: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 E151F16A424 for ; Tue, 7 Mar 2006 14:31:52 +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 CA59243D46 for ; Tue, 7 Mar 2006 14:31:49 +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 k27EVnWP097088 for ; Tue, 7 Mar 2006 14:31:49 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 k27EVn8M097085 for perforce@freebsd.org; Tue, 7 Mar 2006 14:31:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 7 Mar 2006 14:31:49 GMT Message-Id: <200603071431.k27EVn8M097085@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 92906 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, 07 Mar 2006 14:31:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=92906 Change 92906 by rwatson@rwatson_sesame on 2006/03/07 14:31:02 Regenate configure, Makefile.in for test tree. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#15 edit .. //depot/projects/trustedbsd/openbsm/test/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#1 add Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#15 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#15 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#17 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -22895,7 +22895,7 @@ fi - ac_config_files="$ac_config_files Makefile bin/Makefile bin/audit/Makefile bin/auditd/Makefile bin/auditreduce/Makefile bin/praudit/Makefile bsm/Makefile libbsm/Makefile man/Makefile tools/Makefile" + ac_config_files="$ac_config_files Makefile bin/Makefile bin/audit/Makefile bin/auditd/Makefile bin/auditreduce/Makefile bin/praudit/Makefile bsm/Makefile libbsm/Makefile man/Makefile test/Makefile test/bsm/Makefile tools/Makefile" cat >confcache <<\_ACEOF @@ -23477,6 +23477,8 @@ "bsm/Makefile" ) CONFIG_FILES="$CONFIG_FILES bsm/Makefile" ;; "libbsm/Makefile" ) CONFIG_FILES="$CONFIG_FILES libbsm/Makefile" ;; "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; + "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; + "test/bsm/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/bsm/Makefile" ;; "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config/config.h" ;; From owner-p4-projects@FreeBSD.ORG Tue Mar 7 15:22:53 2006 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 8F4AF16A424; Tue, 7 Mar 2006 15:22: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 4D12416A420 for ; Tue, 7 Mar 2006 15:22:52 +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 0EAC843D45 for ; Tue, 7 Mar 2006 15:22:52 +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 k27FMpWH099560 for ; Tue, 7 Mar 2006 15:22:51 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 k27FMpNR099557 for perforce@freebsd.org; Tue, 7 Mar 2006 15:22:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 7 Mar 2006 15:22:51 GMT Message-Id: <200603071522.k27FMpNR099557@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 92908 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, 07 Mar 2006 15:22:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=92908 Change 92908 by rwatson@rwatson_sesame on 2006/03/07 15:22:32 Remove au_to_socket()-related man page references. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#7 edit .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#7 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#7 $ .\" .Dd April 19, 2005 .Dt AU_TOKEN 3 @@ -57,9 +57,6 @@ .Nm au_to_return64 , .Nm au_to_return , .Nm au_to_seq , -.Nm au_to_socket , -.Nm au_to_socket_ex_32 , -.Nm au_to_socket_ex_128 , .Nm au_to_sock_inet32 , .Nm au_to_sock_inet128 , .Nm au_to_sock_inet , @@ -138,12 +135,6 @@ .Ft token_t * .Fn au_to_seq "long audit_count" .Ft token_t * -.Fn au_to_socket "struct socket *so" -.Ft token_t * -.Fn au_to_socket_ex_32 "struct socket *so" -.Ft token_t * -.Fn au_to_socket_ex_128 "struct socket *so" -.Ft token_t * .Fn au_to_sock_inet32 "struct sockaddr_in *so" .Ft token_t * .Fn au_to_sock_inet128 "struct sockaddr_in6 *so" ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#5 $ .\" .Dd April 19, 2005 .Dt LIBBSM 3 @@ -158,9 +158,6 @@ .Xr au_to_return32 3 , .Xr au_to_return64 3 , .Xr au_to_seq 3 , -.Xr au_to_socket 3 , -.Xr au_to_socket_ex_32 3 , -.Xr au_to_socket_ex_128 3 , .Xr au_to_sock_inet 3 , .Xr au_to_sock_inet32 3 , .Xr au_to_sock_inet128 3 , From owner-p4-projects@FreeBSD.ORG Tue Mar 7 15:28:03 2006 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 5FC8516A424; Tue, 7 Mar 2006 15:28: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 3313716A420 for ; Tue, 7 Mar 2006 15:28:02 +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 C7DA943D79 for ; Tue, 7 Mar 2006 15:27:58 +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 k27FRwdn099899 for ; Tue, 7 Mar 2006 15:27:58 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 k27FRw5V099896 for perforce@freebsd.org; Tue, 7 Mar 2006 15:27:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 7 Mar 2006 15:27:58 GMT Message-Id: <200603071527.k27FRw5V099896@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 92909 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, 07 Mar 2006 15:28:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=92909 Change 92909 by rwatson@rwatson_sesame on 2006/03/07 15:27:32 OpenBSM no longer does au_to_socket(), so don't try to test it. Affected files ... .. //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#2 $ */ /* @@ -468,15 +468,6 @@ } static void -generate_socket_token(const char *directory, const char *token_filename, - const char *record_filename) -{ - token_t *socket_token; - -} - - -static void generate_seq_token(const char *directory, const char *token_filename, const char *record_filename) { @@ -592,7 +583,6 @@ generate_iport_token(directory, "iport_token", "iport_record"); generate_arg32_token(directory, "arg32_token", "arg32_record"); - generate_socket_token(directory, "socket_token", "socket_record"); generate_seq_token(directory, "seq_token", "seq_record"); generate_attr_token(directory, "attr_token", "attr_record"); generate_ipc_perm_token(directory, "ipc_perm_token", From owner-p4-projects@FreeBSD.ORG Tue Mar 7 16:26:43 2006 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 EAF0916A423; Tue, 7 Mar 2006 16:26:42 +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 ADBF216A420 for ; Tue, 7 Mar 2006 16:26:42 +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 8859243D6B for ; Tue, 7 Mar 2006 16:26:39 +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 k27GQdju004964 for ; Tue, 7 Mar 2006 16:26:39 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GQdHK004961 for perforce@freebsd.org; Tue, 7 Mar 2006 16:26:39 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:26:39 GMT Message-Id: <200603071626.k27GQdHK004961@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 92914 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, 07 Mar 2006 16:26:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=92914 Change 92914 by millert@millert_ibook on 2006/03/07 16:26:22 Make lh_references natural_t to match lh_check_unlock() and for consistency with the ipc_object bits on which the label handle structs are modelled. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#7 (text+ko) ==== @@ -33,7 +33,7 @@ typedef struct ipc_labelh { - int lh_references; + natural_t lh_references; int lh_type; struct label lh_label; ipc_port_t lh_port; From owner-p4-projects@FreeBSD.ORG Tue Mar 7 16:29:53 2006 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 5265416A43A; Tue, 7 Mar 2006 16:29: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 E0E8C16A425 for ; Tue, 7 Mar 2006 16:29:51 +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 B398943DA0 for ; Tue, 7 Mar 2006 16:29: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 k27GThVe005175 for ; Tue, 7 Mar 2006 16:29:43 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GThhh005171 for perforce@freebsd.org; Tue, 7 Mar 2006 16:29:43 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:29:43 GMT Message-Id: <200603071629.k27GThhh005171@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 92915 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, 07 Mar 2006 16:29:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=92915 Change 92915 by millert@millert_ibook on 2006/03/07 16:29:41 Print out text labels too. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/examples/labelh/labelh_test.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/examples/labelh/labelh_test.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ { kern_return_t kr; mach_port_name_t labelHandle, portName; - char *textlabel; + char *textlabel, textbuf[512]; int ch, count, dealloc, destroy, getnew, getport; int gettask, reqlabel, i; @@ -109,7 +109,8 @@ mach_error(":", kr); exit(1); } - printf("new label handle: 0x%x\n", labelHandle); + printf("new label handle: 0x%x (%s)\n", labelHandle, + textlabel); } if (gettask) { /* Get label handle for our task */ @@ -119,7 +120,14 @@ mach_error("mach_get_task_label():", kr); exit(1); } - printf("task label handle: 0x%x\n", labelHandle); + kr = mach_get_task_label_text(mach_task_self(), + "sebsd", textbuf); + if (kr != KERN_SUCCESS) { + mach_error("mach_get_task_label_text():", kr); + exit(1); + } + printf("task label handle: 0x%x (%s)\n", labelHandle, + textbuf); } if (getport) { /* Get a label handle for the new port */ @@ -129,7 +137,14 @@ mach_error("mach_get_label():", kr); exit(1); } - printf("port label handle: 0x%x\n", labelHandle); + kr = mach_get_label_text(mach_task_self(), labelHandle, + "sebsd", textbuf); + if (kr != KERN_SUCCESS) { + mach_error("mach_get_label_text():", kr); + exit(1); + } + printf("port label handle: 0x%x (%s)\n", labelHandle, + textbuf); } if (reqlabel) { /* Compute label handle based on port and task. */ @@ -139,7 +154,14 @@ mach_error("mac_request_label():", kr); exit(1); } - printf("coputed label handle: 0x%x\n", labelHandle); + kr = mach_get_label_text(mach_task_self(), labelHandle, + "sebsd", textbuf); + if (kr != KERN_SUCCESS) { + mach_error("mach_get_label_text():", kr); + exit(1); + } + printf("computed label handle: 0x%x (%s)\n", + labelHandle, textbuf); } if (dealloc) { /* Deallocate the label handle */ @@ -167,7 +189,7 @@ void usage(void) { - fprintf(stderr, "usage: %s [-c count] [-dx] -n text_label | -t | -p\n", + fprintf(stderr, "usage: %s [-c count] [-dx] -n text_label | -t | -r | -p\n", __progname); exit(1); } From owner-p4-projects@FreeBSD.ORG Tue Mar 7 16:33:50 2006 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 D4C2316A423; Tue, 7 Mar 2006 16:33: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 9845B16A420 for ; Tue, 7 Mar 2006 16:33:49 +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 48C0A43D49 for ; Tue, 7 Mar 2006 16:33:49 +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 k27GXnU2005565 for ; Tue, 7 Mar 2006 16:33:49 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GXmik005562 for perforce@freebsd.org; Tue, 7 Mar 2006 16:33:48 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:33:48 GMT Message-Id: <200603071633.k27GXmik005562@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 92916 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, 07 Mar 2006 16:33:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=92916 Change 92916 by millert@millert_ibook on 2006/03/07 16:32:57 Fix some style nits. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#9 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/task.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#9 (text+ko) ==== @@ -236,8 +236,8 @@ #ifdef MAC if (kmsg->ikm_sender != NULL) { - labelh_release (kmsg->ikm_sender); - kmsg->ikm_sender = NULL; + labelh_release(kmsg->ikm_sender); + kmsg->ikm_sender = NULL; } #endif @@ -608,8 +608,8 @@ #ifdef MAC if (kmsg->ikm_sender != NULL) { - labelh_release (kmsg->ikm_sender); - kmsg->ikm_sender = NULL; + labelh_release (kmsg->ikm_sender); + kmsg->ikm_sender = NULL; } #endif } @@ -716,12 +716,10 @@ #ifdef MAC task_t cur = current_thread()->top_act->task; - if (cur) - { - labelh_reference (cur->label); - kmsg->ikm_sender = cur->label; - } - else + if (cur) { + labelh_reference(cur->label); + kmsg->ikm_sender = cur->label; + } else trailer->msgh_labels.sender = 0; #else trailer->msgh_labels.sender = 0; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#6 (text+ko) ==== @@ -1836,12 +1836,16 @@ } kern_return_t -mach_set_port_label (ipc_space_t space, mach_port_name_t name, vm_offset_t labelstr) +mach_set_port_label( + ipc_space_t space, + mach_port_name_t name, + vm_offset_t labelstr) { #ifdef MAC ipc_entry_t entry; kern_return_t kr; struct label inl; + int rc; if (space == IS_NULL || space->is_task == NULL) return KERN_INVALID_TASK; @@ -1849,32 +1853,33 @@ if (!MACH_PORT_VALID(name)) return KERN_INVALID_NAME; - mac_init_port_label (&inl); - int rc = mac_internalize_port_label (&inl, labelstr); + mac_init_port_label(&inl); + rc = mac_internalize_port_label(&inl, labelstr); if (rc) - return KERN_INVALID_ARGUMENT; + return KERN_INVALID_ARGUMENT; kr = ipc_right_lookup_write(space, name, &entry); if (kr != KERN_SUCCESS) return kr; - if (IOT_PORT != io_otype(entry->ie_object)) { - is_write_unlock (space); - return KERN_INVALID_RIGHT; + if (io_otype(entry->ie_object) != IOT_PORT) { + is_write_unlock(space); + return KERN_INVALID_RIGHT; } ipc_port_t port = (ipc_port_t) entry->ie_object; - ip_lock (port); + ip_lock(port); - rc = mac_check_port_relabel (&space->is_task->maclabel, &port->ip_label, &inl); + rc = mac_check_port_relabel(&space->is_task->maclabel, + &port->ip_label, &inl); if (rc) - kr = KERN_NO_ACCESS; + kr = KERN_NO_ACCESS; else - mac_copy_port_label (&inl, &port->ip_label); + mac_copy_port_label(&inl, &port->ip_label); - ip_unlock (port); - is_write_unlock (space); + ip_unlock(port); + is_write_unlock(space); return kr; #else return KERN_INVALID_ARGUMENT; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/task.c#5 (text+ko) ==== @@ -381,9 +381,8 @@ eml_task_reference(new_task, parent_task); #ifdef MAC - /*mutex_init(&new_task->labellock, ETAP_NO_TRACE);*/ - new_task->label = labelh_new (); - mac_init_task_label (&new_task->maclabel); + new_task->label = labelh_new(); + mac_init_task_label(&new_task->maclabel); #endif ipc_task_init(new_task, parent_task); @@ -471,8 +470,7 @@ task_lock(task); #ifdef MAC - /* Prevent task from being destroyed while the label is - still in use */ + /* Prevent task from being destroyed while the label is still in use */ tasklabel_lock(task); #endif refs = --task->ref_count; @@ -1806,5 +1804,4 @@ (*f)(&pt->maclabel, arg); tasklabel_unlock(pt); } - #endif From owner-p4-projects@FreeBSD.ORG Tue Mar 7 16:39:58 2006 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 0068916A423; Tue, 7 Mar 2006 16:39:57 +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 C702E16A420 for ; Tue, 7 Mar 2006 16:39:57 +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 285EB43D55 for ; Tue, 7 Mar 2006 16:39:57 +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 k27GdvMu005810 for ; Tue, 7 Mar 2006 16:39:57 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GduY9005807 for perforce@freebsd.org; Tue, 7 Mar 2006 16:39:56 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:39:56 GMT Message-Id: <200603071639.k27GduY9005807@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 92917 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, 07 Mar 2006 16:39:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=92917 Change 92917 by millert@millert_ibook on 2006/03/07 16:39:26 Convert mach_get_task_label() and mach_get_task_label_text() to take ipc_space_t not task_t and add sanity check for space being IS_NULL. Fixes a panic when the port passed in is not a task port. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/security.defs#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#6 (text+ko) ==== @@ -32,13 +32,16 @@ kern_return_t mach_get_task_label( - task_t t, + ipc_space_t space, mach_port_name_t *outlabel) { - ipc_labelh_t lh = t->label; - ipc_space_t space = t->itk_space; kern_return_t kr; + ipc_labelh_t lh; + + if (space == IS_NULL || space->is_task == NULL) + return KERN_INVALID_TASK; + lh = space->is_task->label; ip_lock(lh->lh_port); lh->lh_port->ip_mscount++; lh->lh_port->ip_srights++; @@ -55,16 +58,21 @@ return (KERN_SUCCESS); } +kern_return_t -kern_return_t mach_get_task_label_text( - task_t t, + ipc_space_t space, labelstr_t policies, labelstr_t outl) { - tasklabel_lock(t); - mac_externalize_task_label(&t->maclabel, policies, outl, 512, 0); - tasklabel_unlock(t); + + if (space == IS_NULL) + return KERN_INVALID_TASK; + + tasklabel_lock(space->is_task); + mac_externalize_task_label(&space->is_task->maclabel, policies, outl, + 512, 0); + tasklabel_unlock(space->is_task); return KERN_SUCCESS; } ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/security.defs#7 (text+ko) ==== @@ -23,7 +23,7 @@ @return Standard MiG return values (0 for success) */ -routine mach_get_task_label(task : task_t; +routine mach_get_task_label(task : ipc_space_t; out label : mach_port_name_t); /** @@ -38,7 +38,7 @@ @return Standard MiG return values (0 for success) */ -routine mach_get_task_label_text(task : task_t; +routine mach_get_task_label_text(task : ipc_space_t; policies : labelstr_t; out label : labelstr_t); From owner-p4-projects@FreeBSD.ORG Tue Mar 7 16:42:01 2006 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 984D416A423; Tue, 7 Mar 2006 16:42: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 558D116A420 for ; Tue, 7 Mar 2006 16:42:00 +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 1C6C243D4C for ; Tue, 7 Mar 2006 16:42:00 +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 k27Gfx1a006023 for ; Tue, 7 Mar 2006 16:42:00 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GfxZa006020 for perforce@freebsd.org; Tue, 7 Mar 2006 16:41:59 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:41:59 GMT Message-Id: <200603071641.k27GfxZa006020@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 92918 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, 07 Mar 2006 16:42:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=92918 Change 92918 by millert@millert_ibook on 2006/03/07 16:41:27 Check to make sure the port is not dead before we use it. This fixes a race condition between label handle deallocation and user space requests using the label handle's port (such as mach_get_label_text). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#7 (text+ko) ==== @@ -1773,6 +1773,7 @@ ipc_port_t port; struct label outl; kern_return_t kr; + int dead; if (!MACH_PORT_VALID(name)) return KERN_INVALID_NAME; @@ -1782,10 +1783,16 @@ if (kr != KERN_SUCCESS) return kr; - /* Make sure we are not dealing with a label handle. */ port = (ipc_port_t) entry->ie_object; - ip_lock(port); + dead = ipc_right_check(space, port, name, entry); + if (dead) { + is_write_unlock(space); + return KERN_INVALID_RIGHT; + } + /* port is now locked */ + is_write_unlock(space); + /* Make sure we are not dealing with a label handle. */ if (ip_kotype(port) == IKOT_LABELH) { /* already is a label handle! */ ip_unlock(port); @@ -1813,6 +1820,7 @@ ipc_entry_t entry; kern_return_t kr; struct label *l; + int dead; if (space == IS_NULL || space->is_task == NULL) return KERN_INVALID_TASK; @@ -1824,15 +1832,21 @@ if (kr != KERN_SUCCESS) return kr; - io_lock(entry->ie_object); - is_write_unlock (space); + dead = ipc_right_check(space, entry->ie_object, name, entry); + if (dead) { + is_write_unlock(space); + return KERN_INVALID_RIGHT; + } + /* object (port) is now locked */ + + is_write_unlock(space); l = io_getlabel(entry->ie_object); - mac_externalize_port_label (l, policies, outlabel, 512, 0); + mac_externalize_port_label(l, policies, outlabel, 512, 0); io_unlocklabel(entry->ie_object); - io_unlock (entry->ie_object); - return 0; + io_unlock(entry->ie_object); + return KERN_SUCCESS; } kern_return_t ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#7 (text+ko) ==== @@ -47,7 +47,7 @@ lh->lh_port->ip_srights++; ip_reference(lh->lh_port); ip_unlock(lh->lh_port); - kr = ipc_object_copyout(space, lh->lh_port, + kr = ipc_object_copyout(space, (ipc_object_t) lh->lh_port, MACH_MSG_TYPE_PORT_SEND, 0, outlabel); if (kr != KERN_SUCCESS) { ip_lock(lh->lh_port); @@ -146,6 +146,7 @@ ipc_object_t objp; kern_return_t kr; struct label *objl; + int dead; if (space == IS_NULL || space->is_task == NULL) return KERN_INVALID_TASK; @@ -166,6 +167,13 @@ return kr; } + dead = ipc_right_check(space, entry->ie_object, obj, entry); + if (dead) { + is_write_unlock(space); + mac_destroy_task_label(&subjl); + return KERN_INVALID_RIGHT; + } + objp = entry->ie_object; io_lock (objp); is_write_unlock (space); From owner-p4-projects@FreeBSD.ORG Tue Mar 7 16:44:04 2006 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 98CCD16A423; Tue, 7 Mar 2006 16:44:03 +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 70A5616A422 for ; Tue, 7 Mar 2006 16:44:03 +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 1C83143D45 for ; Tue, 7 Mar 2006 16:44:03 +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 k27Gi3mA006132 for ; Tue, 7 Mar 2006 16:44:03 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27Gi2sA006129 for perforce@freebsd.org; Tue, 7 Mar 2006 16:44:02 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:44:02 GMT Message-Id: <200603071644.k27Gi2sA006129@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 92919 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, 07 Mar 2006 16:44:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=92919 Change 92919 by millert@millert_ibook on 2006/03/07 16:43:19 Add label type defines for lh_type and set them in labelh_new() and labelh_new_user(). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.c#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.c#7 (text+ko) ==== @@ -74,7 +74,7 @@ io_lock_init(lh); lh->lh_port = port; lh->lh_label = *inl; - lh->lh_type = 0; + lh->lh_type = LABELH_TYPE_USER; lh->lh_references = 1; /* Must call ipc_kobject_set() with port unlocked. */ @@ -118,7 +118,7 @@ lh = (ipc_labelh_t)zalloc(ipc_labelh_zone); io_lock_init(lh); lh->lh_port = ipc_port_alloc_kernel(); - lh->lh_type = 0; + lh->lh_type = LABELH_TYPE_KERN; lh->lh_references = 1; ip_unlock(lh->lh_port); ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#8 (text+ko) ==== @@ -44,6 +44,9 @@ #endif } *ipc_labelh_t; +#define LABELH_TYPE_KERN 0 +#define LABELH_TYPE_USER 1 + ipc_labelh_t labelh_duplicate(ipc_labelh_t old); ipc_labelh_t labelh_modify(ipc_labelh_t old); ipc_labelh_t labelh_new(void); From owner-p4-projects@FreeBSD.ORG Tue Mar 7 16:47:08 2006 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 0F1DD16A423; Tue, 7 Mar 2006 16:47: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 DDF5216A420 for ; Tue, 7 Mar 2006 16:47:07 +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 A0D5143D46 for ; Tue, 7 Mar 2006 16:47:07 +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 k27Gl7Hn009181 for ; Tue, 7 Mar 2006 16:47:07 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27Gl7Kp009054 for perforce@freebsd.org; Tue, 7 Mar 2006 16:47:07 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:47:07 GMT Message-Id: <200603071647.k27Gl7Kp009054@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 92921 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, 07 Mar 2006 16:47:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=92921 Change 92921 by millert@millert_ibook on 2006/03/07 16:46:29 Change how label handles are freed when their reference count reaches zero. We no longer free label handle storage when the ref count == 0. For kernel-allocated label handles, just deallocate the associated port. The actual label handle storage is deallocated by labelh_destroy() which is called by ipc_kobject_destroy() after all port references are gone. This fixes a race between a user program requesting (and accessing) the label of a labeled kernel object and the destruction of that object (task, port, etc). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.c#8 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#9 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/ipc_kobject.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.c#8 (text+ko) ==== @@ -47,7 +47,7 @@ if (space == IS_NULL || space->is_task == NULL) return (KERN_INVALID_TASK); - /* XXX - perform entrypoint check here */ + /* XXX - perform entrypoint check here? */ /* * Note: the calling task will have a receive right for the port. @@ -75,7 +75,7 @@ lh->lh_port = port; lh->lh_label = *inl; lh->lh_type = LABELH_TYPE_USER; - lh->lh_references = 1; + lh->lh_references = 1; /* unused for LABELH_TYPE_USER */ /* Must call ipc_kobject_set() with port unlocked. */ ip_unlock(lh->lh_port); @@ -154,6 +154,11 @@ { ipc_labelh_t lh; + /* + * A label handle may only have a single reference. + * If there are no other references this is a no-op. + * Otherwise, make a copy we can write to and return it. + */ if (old->lh_references == 1) return (old); lh = labelh_duplicate(old); @@ -175,6 +180,9 @@ return (lh); } +/* + * Release a reference on an (unlocked) label handle. + */ void labelh_release(ipc_labelh_t lh) { @@ -183,10 +191,18 @@ lh_check_unlock(lh); } +/* + * Deallocate space associated with the label handle backed by the + * specified port. For kernel-allocated label handles the + * label handle reference count should be 0. For user-allocated + * handles the ref count is not used (it was initialized to 1). + */ void -lh_free(ipc_labelh_t lh) +labelh_destroy(ipc_port_t port) { - ipc_object_release(&lh->lh_port->ip_object); + ipc_labelh_t lh = (ipc_labelh_t) port->ip_kobject; + + ip_release(lh->lh_port); mac_destroy_port_label(&lh->lh_label); zfree(ipc_labelh_zone, (vm_offset_t)lh); } ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#9 (text+ko) ==== @@ -47,19 +47,19 @@ #define LABELH_TYPE_KERN 0 #define LABELH_TYPE_USER 1 +void labelh_destroy(ipc_port_t port); ipc_labelh_t labelh_duplicate(ipc_labelh_t old); ipc_labelh_t labelh_modify(ipc_labelh_t old); ipc_labelh_t labelh_new(void); kern_return_t labelh_new_user(ipc_space_t, struct label *, mach_port_name_t *); void labelh_release(ipc_labelh_t lh); ipc_labelh_t labelh_reference(ipc_labelh_t lh); -void lh_free(ipc_labelh_t lh); #define lh_reference(lh) ((lh)->lh_references++) -#define lh_release(lh) \ -MACRO_BEGIN \ - assert((lh)->lh_references > 0); \ - (lh)->lh_references--; \ +#define lh_release(lh) \ +MACRO_BEGIN \ + assert((lh)->lh_references > 0); \ + (lh)->lh_references--; \ MACRO_END extern zone_t ipc_labelh_zone; @@ -67,13 +67,21 @@ #define lh_lock io_lock #define lh_unlock io_unlock -#define lh_check_unlock(lh) \ -MACRO_BEGIN \ +/* + * Check the number of references the label handle a left. + * If there are 0 references and this is a kernel-allocated + * label handle, deallocate the associated port. The + * storage space for the label handle will be deallocated + * as part of the port destruction. User-allocated label + * handles are destroyed along with their ports. + */ +#define lh_check_unlock(lh) \ +MACRO_BEGIN \ _VOLATILE_ natural_t _refs = (lh)->lh_references; \ - \ - lh_unlock(lh); \ - if (_refs == 0) \ - lh_free(lh); \ + \ + lh_unlock(lh); \ + if (_refs == 0 && (lh)->lh_type == LABELH_TYPE_KERN) \ + ipc_port_dealloc_kernel((lh)->lh_port); \ MACRO_END #endif ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/ipc_kobject.c#4 (text+ko) ==== @@ -514,7 +514,7 @@ break; case IKOT_LABELH: - labelh_release(port->ip_kobject); + labelh_destroy(port); break; default: From owner-p4-projects@FreeBSD.ORG Tue Mar 7 16:49:11 2006 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 0052716A423; Tue, 7 Mar 2006 16:49:10 +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 CEAA016A420 for ; Tue, 7 Mar 2006 16:49:10 +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 9860943D49 for ; Tue, 7 Mar 2006 16:49:10 +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 k27GnAbP013964 for ; Tue, 7 Mar 2006 16:49:10 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GnAL1013961 for perforce@freebsd.org; Tue, 7 Mar 2006 16:49:10 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:49:10 GMT Message-Id: <200603071649.k27GnAL1013961@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 92922 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, 07 Mar 2006 16:49:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=92922 Change 92922 by millert@millert_ibook on 2006/03/07 16:49:06 Add proc_has_security() and proc_has_system() for systems without per-thread ucred (like Darwin). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#34 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_sysctl.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#34 (text+ko) ==== @@ -238,6 +238,20 @@ return (cred_has_security(td->td_proc->p_ucred, perm)); } +#else +int +proc_has_system(struct proc *p, access_vector_t perm) +{ + + return (cred_has_system(p->p_ucred, perm)); +} + +int +proc_has_security(struct proc *p, access_vector_t perm) +{ + + return (cred_has_security(p->p_ucred, perm)); +} #endif static __inline security_class_t ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_sysctl.c#4 (text+ko) ==== @@ -121,19 +121,21 @@ if (error) return (error); -#if 0 if (req->newptr != NULL) { error = SYSCTL_IN(req, &enforcing, sizeof(enforcing)); if (error) return (error); - error = thread_has_system (curthread, SYSTEM__AVC_TOGGLE); +#ifdef APPLE + error = proc_has_system(current_proc(), SECURITY__SETENFORCE); +#else + error = thread_has_system(curthread, SECURITY__SETENFORCE); +#endif if (error) return error; selinux_enforcing = enforcing; } -#endif return (0); } From owner-p4-projects@FreeBSD.ORG Tue Mar 7 16:52:16 2006 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 7626316A424; Tue, 7 Mar 2006 16:52: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 4A1E516A420 for ; Tue, 7 Mar 2006 16:52:15 +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 017A443D53 for ; Tue, 7 Mar 2006 16:52:15 +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 k27GqEsL014168 for ; Tue, 7 Mar 2006 16:52:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GqE2c014165 for perforce@freebsd.org; Tue, 7 Mar 2006 16:52:14 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:52:14 GMT Message-Id: <200603071652.k27GqE2c014165@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 92923 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, 07 Mar 2006 16:52:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=92923 Change 92923 by millert@millert_ibook on 2006/03/07 16:51:39 In access(), do not pass uninitialized flags variable to mac_check_vnode_access(). Don't clobber non-zero error value from DAC check with a zero error value from the MAC check. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/vfs/vfs_syscalls.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/vfs/vfs_syscalls.c#3 (text+ko) ==== @@ -1792,8 +1792,8 @@ vp = nd.ni_vp; /* Flags == 0 means only check for existence. */ + flags = 0; if (uap->flags) { - flags = 0; if (uap->flags & R_OK) flags |= VREAD; if (uap->flags & W_OK) @@ -1804,7 +1804,17 @@ error = VOP_ACCESS(vp, flags, cred, p); } #ifdef MAC - error = mac_check_vnode_access(cred, vp, flags); + /* + * Override DAC error value with MAC error value unless + * MAC returns OK and DAC returns error. + */ + { + int mac_error; + + mac_error = mac_check_vnode_access(cred, vp, flags); + if (mac_error) + error = mac_error; + } #endif vput(vp); out1: From owner-p4-projects@FreeBSD.ORG Tue Mar 7 16:53:17 2006 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 1641E16A423; Tue, 7 Mar 2006 16:53: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 E354816A420 for ; Tue, 7 Mar 2006 16:53:16 +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 AE8CA43D49 for ; Tue, 7 Mar 2006 16:53:16 +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 k27GrG19014193 for ; Tue, 7 Mar 2006 16:53:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GrGnd014190 for perforce@freebsd.org; Tue, 7 Mar 2006 16:53:16 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:53:16 GMT Message-Id: <200603071653.k27GrGnd014190@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 92924 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, 07 Mar 2006 16:53:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=92924 Change 92924 by millert@millert_ibook on 2006/03/07 16:53:08 In file_mask_to_av() return FILE__ACCESS for an empty mask. That way a call to access() with flags == F_OK (aka 0) will map to the "access" permission rather than a zero access_vector_t (which confuses the avc). We don't allow a file mode of 0 in sebsd_check_vnode_open() but it is legal for sebsd_check_vnode_access(). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#35 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#35 (text+ko) ==== @@ -306,6 +306,10 @@ { access_vector_t av = 0; + /* per access(2), mask == 0 means only check for existence */ + if (mask == 0) + return FILE__ACCESS; + if (vt != VDIR) { if (mask & VEXEC) av |= FILE__EXECUTE; @@ -1701,14 +1705,12 @@ static int sebsd_check_vnode_access(struct ucred *cred, struct vnode *vp, - struct label *label, int acc_mode) + struct label *filelabel, int acc_mode) { - if (!acc_mode) - return 0; - + /* NOTE: acc_mode == 0 is legal for access(2) */ return (vnode_has_perm(cred, vp, file_mask_to_av(vp->v_type, acc_mode), - NULL)); + NULL)); } static int From owner-p4-projects@FreeBSD.ORG Tue Mar 7 17:05:33 2006 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 D69C316A423; Tue, 7 Mar 2006 17:05: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 AC05116A420 for ; Tue, 7 Mar 2006 17:05:32 +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 F32BB43D55 for ; Tue, 7 Mar 2006 17:05: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 k27H5VMn014694 for ; Tue, 7 Mar 2006 17:05:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27H5V54014691 for perforce@freebsd.org; Tue, 7 Mar 2006 17:05:31 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 17:05:31 GMT Message-Id: <200603071705.k27H5V54014691@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 92925 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, 07 Mar 2006 17:05:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=92925 Change 92925 by millert@millert_ibook on 2006/03/07 17:05:30 Check for null space in mach_get_task_label_text() too. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#8 (text+ko) ==== @@ -58,15 +58,15 @@ return (KERN_SUCCESS); } + kern_return_t - mach_get_task_label_text( ipc_space_t space, labelstr_t policies, labelstr_t outl) { - if (space == IS_NULL) + if (space == IS_NULL || space->is_task == NULL) return KERN_INVALID_TASK; tasklabel_lock(space->is_task); From owner-p4-projects@FreeBSD.ORG Tue Mar 7 19:22:11 2006 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 E242C16A423; Tue, 7 Mar 2006 19:22:10 +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 9408416A420; Tue, 7 Mar 2006 19:22:10 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16FF043D4C; Tue, 7 Mar 2006 19:22:09 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k27JM3bH029291; Tue, 7 Mar 2006 14:22:07 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Todd Miller Date: Tue, 7 Mar 2006 12:49:07 -0500 User-Agent: KMail/1.9.1 References: <200603071649.k27GnAL1013961@repoman.freebsd.org> In-Reply-To: <200603071649.k27GnAL1013961@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200603071249.10153.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1317/Tue Mar 7 01:06:47 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.4 required=4.2 tests=ALL_TRUSTED,AWL autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 92922 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, 07 Mar 2006 19:22:11 -0000 On Tuesday 07 March 2006 11:49, Todd Miller wrote: > http://perforce.freebsd.org/chv.cgi?CH=92922 > > Change 92922 by millert@millert_ibook on 2006/03/07 16:49:06 > > Add proc_has_security() and proc_has_system() for systems without > per-thread ucred (like Darwin). I thought the Darwin in Tiger does have per-thread ucreds? I guess the sedarwin branch is still on Panther though? -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Tue Mar 7 19:46:05 2006 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 20B2E16A423; Tue, 7 Mar 2006 19:46: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 EB5C616A420 for ; Tue, 7 Mar 2006 19:46:04 +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 B600443D46 for ; Tue, 7 Mar 2006 19:46:04 +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 k27Jk49N022190 for ; Tue, 7 Mar 2006 19:46:04 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27Jk4NF022187 for perforce@freebsd.org; Tue, 7 Mar 2006 19:46:04 GMT (envelope-from jhb@freebsd.org) Date: Tue, 7 Mar 2006 19:46:04 GMT Message-Id: <200603071946.k27Jk4NF022187@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 92932 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, 07 Mar 2006 19:46:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=92932 Change 92932 by jhb@jhb_twclab on 2006/03/07 19:45:31 Don't try to catch rollovers during clock ticks. This seems to be unnecessary in practice (though sadly it means we are doing a lot of context switches, even when sitting idle in single user). Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/clock.c#25 edit .. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#39 edit .. //depot/projects/smpng/sys/alpha/include/md_var.h#10 edit .. //depot/projects/smpng/sys/kern/kern_tc.c#36 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#25 (text+ko) ==== @@ -137,6 +137,7 @@ static void calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc, u_int32_t *timer); static void set_timer_freq(u_int freq, int intr_freq); +static uint64_t read_cycle_count(void); void clockattach(device_t dev) ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#39 (text+ko) ==== @@ -483,9 +483,6 @@ #endif if (platform.clockintr) { critical_enter(); - - /* Check for PCC roll-over. */ - (void)read_cycle_count(); #ifdef SMP /* * Only one processor drives the actual timer. ==== //depot/projects/smpng/sys/alpha/include/md_var.h#10 (text+ko) ==== @@ -84,7 +84,6 @@ int is_physical_memory(vm_offset_t addr); void machine_check(unsigned long, struct trapframe *, unsigned long, unsigned long); -uint64_t read_cycle_count(void); void regdump(struct trapframe *); void regtoframe(struct reg *, struct trapframe *); void set_iointr(void (*)(void *, unsigned long)); ==== //depot/projects/smpng/sys/kern/kern_tc.c#36 (text+ko) ==== @@ -115,7 +115,6 @@ #undef TC_STATS -static uint64_t tc_cpu_ticks(void); static void tc_windup(void); static void cpu_tick_calibrate(int); @@ -760,7 +759,6 @@ return; count = 0; tc_windup(); - (void)tc_cpu_ticks(); if (time_uptime != last_calib && !(time_uptime & 0xf)) { cpu_tick_calibrate(0); last_calib = time_uptime; From owner-p4-projects@FreeBSD.ORG Tue Mar 7 21:26:08 2006 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 C7F0E16A425; Tue, 7 Mar 2006 21:26:07 +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 9698316A422 for ; Tue, 7 Mar 2006 21:26:07 +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 D238543D72 for ; Tue, 7 Mar 2006 21:26:05 +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 k27LQ5Sx034729 for ; Tue, 7 Mar 2006 21:26:05 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27LQ5Lq034726 for perforce@freebsd.org; Tue, 7 Mar 2006 21:26:05 GMT (envelope-from jhb@freebsd.org) Date: Tue, 7 Mar 2006 21:26:05 GMT Message-Id: <200603072126.k27LQ5Lq034726@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 92934 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, 07 Mar 2006 21:26:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=92934 Change 92934 by jhb@jhb_slimer on 2006/03/07 21:25:27 - suser() was called on the wrong thread (target rather than subject (if I have those terms right)) - No good can come from userland setting watchpoints in the kernel, not even as root. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#50 edit .. //depot/projects/smpng/sys/i386/i386/machdep.c#103 edit .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#10 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#50 (text+ko) ==== @@ -1749,8 +1749,7 @@ * could halt the system by setting a breakpoint in the kernel * (if ddb was enabled). Thus, we need to check to make sure * that no breakpoints are being enabled for addresses outside - * process's address space, unless, perhaps, we were called by - * uid 0. + * process's address space. * * XXX - what about when the watched area of the user's * address space is written into from within the kernel @@ -1758,27 +1757,25 @@ * from within kernel mode? */ - if (suser(td) != 0) { - if (dbregs->dr[7] & 0x3) { - /* dr0 is enabled */ - if (dbregs->dr[0] >= VM_MAXUSER_ADDRESS) - return (EINVAL); - } - if (dbregs->dr[7] & 0x3<<2) { - /* dr1 is enabled */ - if (dbregs->dr[1] >= VM_MAXUSER_ADDRESS) - return (EINVAL); - } - if (dbregs->dr[7] & 0x3<<4) { - /* dr2 is enabled */ - if (dbregs->dr[2] >= VM_MAXUSER_ADDRESS) - return (EINVAL); - } - if (dbregs->dr[7] & 0x3<<6) { - /* dr3 is enabled */ - if (dbregs->dr[3] >= VM_MAXUSER_ADDRESS) - return (EINVAL); - } + if (dbregs->dr[7] & 0x3) { + /* dr0 is enabled */ + if (dbregs->dr[0] >= VM_MAXUSER_ADDRESS) + return (EINVAL); + } + if (dbregs->dr[7] & 0x3<<2) { + /* dr1 is enabled */ + if (dbregs->dr[1] >= VM_MAXUSER_ADDRESS) + return (EINVAL); + } + if (dbregs->dr[7] & 0x3<<4) { + /* dr2 is enabled */ + if (dbregs->dr[2] >= VM_MAXUSER_ADDRESS) + return (EINVAL); + } + if (dbregs->dr[7] & 0x3<<6) { + /* dr3 is enabled */ + if (dbregs->dr[3] >= VM_MAXUSER_ADDRESS) + return (EINVAL); } pcb->pcb_dr0 = dbregs->dr[0]; ==== //depot/projects/smpng/sys/i386/i386/machdep.c#103 (text+ko) ==== @@ -2801,8 +2801,7 @@ * could halt the system by setting a breakpoint in the kernel * (if ddb was enabled). Thus, we need to check to make sure * that no breakpoints are being enabled for addresses outside - * process's address space, unless, perhaps, we were called by - * uid 0. + * process's address space. * * XXX - what about when the watched area of the user's * address space is written into from within the kernel @@ -2810,30 +2809,28 @@ * from within kernel mode? */ - if (suser(td) != 0) { - if (dbregs->dr[7] & 0x3) { - /* dr0 is enabled */ - if (dbregs->dr[0] >= VM_MAXUSER_ADDRESS) - return (EINVAL); - } + if (dbregs->dr[7] & 0x3) { + /* dr0 is enabled */ + if (dbregs->dr[0] >= VM_MAXUSER_ADDRESS) + return (EINVAL); + } - if (dbregs->dr[7] & (0x3<<2)) { - /* dr1 is enabled */ - if (dbregs->dr[1] >= VM_MAXUSER_ADDRESS) - return (EINVAL); - } + if (dbregs->dr[7] & (0x3<<2)) { + /* dr1 is enabled */ + if (dbregs->dr[1] >= VM_MAXUSER_ADDRESS) + return (EINVAL); + } - if (dbregs->dr[7] & (0x3<<4)) { - /* dr2 is enabled */ - if (dbregs->dr[2] >= VM_MAXUSER_ADDRESS) - return (EINVAL); - } + if (dbregs->dr[7] & (0x3<<4)) { + /* dr2 is enabled */ + if (dbregs->dr[2] >= VM_MAXUSER_ADDRESS) + return (EINVAL); + } - if (dbregs->dr[7] & (0x3<<6)) { - /* dr3 is enabled */ - if (dbregs->dr[3] >= VM_MAXUSER_ADDRESS) - return (EINVAL); - } + if (dbregs->dr[7] & (0x3<<6)) { + /* dr3 is enabled */ + if (dbregs->dr[3] >= VM_MAXUSER_ADDRESS) + return (EINVAL); } pcb->pcb_dr0 = dbregs->dr[0]; ==== //depot/projects/smpng/sys/pc98/pc98/machdep.c#10 (text+ko) ==== @@ -2632,8 +2632,7 @@ * could halt the system by setting a breakpoint in the kernel * (if ddb was enabled). Thus, we need to check to make sure * that no breakpoints are being enabled for addresses outside - * process's address space, unless, perhaps, we were called by - * uid 0. + * process's address space. * * XXX - what about when the watched area of the user's * address space is written into from within the kernel @@ -2641,30 +2640,28 @@ * from within kernel mode? */ - if (suser(td) != 0) { - if (dbregs->dr[7] & 0x3) { - /* dr0 is enabled */ - if (dbregs->dr[0] >= VM_MAXUSER_ADDRESS) - return (EINVAL); - } + if (dbregs->dr[7] & 0x3) { + /* dr0 is enabled */ + if (dbregs->dr[0] >= VM_MAXUSER_ADDRESS) + return (EINVAL); + } - if (dbregs->dr[7] & (0x3<<2)) { - /* dr1 is enabled */ - if (dbregs->dr[1] >= VM_MAXUSER_ADDRESS) - return (EINVAL); - } + if (dbregs->dr[7] & (0x3<<2)) { + /* dr1 is enabled */ + if (dbregs->dr[1] >= VM_MAXUSER_ADDRESS) + return (EINVAL); + } - if (dbregs->dr[7] & (0x3<<4)) { - /* dr2 is enabled */ - if (dbregs->dr[2] >= VM_MAXUSER_ADDRESS) - return (EINVAL); - } + if (dbregs->dr[7] & (0x3<<4)) { + /* dr2 is enabled */ + if (dbregs->dr[2] >= VM_MAXUSER_ADDRESS) + return (EINVAL); + } - if (dbregs->dr[7] & (0x3<<6)) { - /* dr3 is enabled */ - if (dbregs->dr[3] >= VM_MAXUSER_ADDRESS) - return (EINVAL); - } + if (dbregs->dr[7] & (0x3<<6)) { + /* dr3 is enabled */ + if (dbregs->dr[3] >= VM_MAXUSER_ADDRESS) + return (EINVAL); } pcb->pcb_dr0 = dbregs->dr[0]; From owner-p4-projects@FreeBSD.ORG Tue Mar 7 22:02:54 2006 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 DC65916A423; Tue, 7 Mar 2006 22:02: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 AF58216A420 for ; Tue, 7 Mar 2006 22:02: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 5656A43D46 for ; Tue, 7 Mar 2006 22:02:53 +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 k27M2rFQ037412 for ; Tue, 7 Mar 2006 22:02:53 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27M2pR9037407 for perforce@freebsd.org; Tue, 7 Mar 2006 22:02:51 GMT (envelope-from jhb@freebsd.org) Date: Tue, 7 Mar 2006 22:02:51 GMT Message-Id: <200603072202.k27M2pR9037407@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 92938 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, 07 Mar 2006 22:02:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=92938 Change 92938 by jhb@jhb_slimer on 2006/03/07 22:02:11 IFC @92936. IWBNI the $P4$'s in the audit code didn't keep conflicting on each integ. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/clock.c#26 integrate .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/io_apic.c#13 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#20 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#33 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#28 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#11 integrate .. //depot/projects/smpng/sys/amd64/include/intr_machdep.h#8 integrate .. //depot/projects/smpng/sys/amd64/include/mptable.h#3 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic.c#13 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#16 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#24 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#16 integrate .. //depot/projects/smpng/sys/arm/arm/undefined.c#12 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#19 integrate .. //depot/projects/smpng/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#15 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_aau.c#4 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_dma.c#3 integrate .. //depot/projects/smpng/sys/bsm/audit.h#4 integrate .. //depot/projects/smpng/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/smpng/sys/coda/coda.h#5 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#33 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#28 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#28 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#28 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#28 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#28 integrate .. //depot/projects/smpng/sys/conf/NOTES#115 integrate .. //depot/projects/smpng/sys/conf/files#168 integrate .. //depot/projects/smpng/sys/conf/files.alpha#37 integrate .. //depot/projects/smpng/sys/conf/files.amd64#40 integrate .. //depot/projects/smpng/sys/conf/files.i386#94 integrate .. //depot/projects/smpng/sys/conf/files.ia64#53 integrate .. //depot/projects/smpng/sys/conf/files.pc98#80 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#26 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#55 integrate .. //depot/projects/smpng/sys/conf/options#116 integrate .. //depot/projects/smpng/sys/conf/options.i386#55 integrate .. //depot/projects/smpng/sys/conf/options.pc98#54 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#80 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#45 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#56 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#32 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#31 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.h#13 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#36 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#23 integrate .. //depot/projects/smpng/sys/dev/ce/tau32-ddk.c#2 integrate .. //depot/projects/smpng/sys/dev/ce/tau32-ddk.h#2 integrate .. //depot/projects/smpng/sys/dev/de/dc21040reg.h#1 branch .. //depot/projects/smpng/sys/dev/de/if_de.c#1 branch .. //depot/projects/smpng/sys/dev/de/if_devar.h#1 branch .. //depot/projects/smpng/sys/dev/iir/iir.c#14 integrate .. //depot/projects/smpng/sys/dev/iir/iir.h#14 integrate .. //depot/projects/smpng/sys/dev/iir/iir_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#38 integrate .. //depot/projects/smpng/sys/dev/kbd/kbd.c#17 integrate .. //depot/projects/smpng/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi.h#7 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_cnfg.h#7 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_ioc.h#7 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_type.h#8 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.c#12 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#10 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.h#3 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_debug.c#10 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#17 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/smpng/sys/dev/ral/if_ral.c#15 delete .. //depot/projects/smpng/sys/dev/ral/if_ral_pccard.c#5 delete .. //depot/projects/smpng/sys/dev/ral/if_ral_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/ral/if_ralreg.h#4 delete .. //depot/projects/smpng/sys/dev/ral/if_ralvar.h#4 delete .. //depot/projects/smpng/sys/dev/ral/rt2560.c#1 branch .. //depot/projects/smpng/sys/dev/ral/rt2560reg.h#1 branch .. //depot/projects/smpng/sys/dev/ral/rt2560var.h#1 branch .. //depot/projects/smpng/sys/dev/ral/rt2661.c#1 branch .. //depot/projects/smpng/sys/dev/ral/rt2661_ucode.h#1 branch .. //depot/projects/smpng/sys/dev/ral/rt2661reg.h#1 branch .. //depot/projects/smpng/sys/dev/ral/rt2661var.h#1 branch .. //depot/projects/smpng/sys/dev/re/if_re.c#37 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#40 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#54 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_linux.c#1 branch .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#41 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#40 integrate .. //depot/projects/smpng/sys/dev/usb/ukbd.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#55 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/usb_port.h#26 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#35 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#87 integrate .. //depot/projects/smpng/sys/dev/usb/usbdivar.h#15 integrate .. //depot/projects/smpng/sys/dev/vkbd/vkbd.c#9 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#23 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#40 integrate .. //depot/projects/smpng/sys/geom/geom_vfs.c#5 integrate .. //depot/projects/smpng/sys/geom/label/g_label_ufs.c#7 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#116 integrate .. //depot/projects/smpng/sys/i386/conf/PAE#17 integrate .. //depot/projects/smpng/sys/i386/conf/XBOX#4 integrate .. //depot/projects/smpng/sys/i386/cpufreq/est.c#6 integrate .. //depot/projects/smpng/sys/i386/i386/geode.c#6 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#43 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#17 integrate .. //depot/projects/smpng/sys/i386/i386/io_apic.c#16 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#40 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#98 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#19 integrate .. //depot/projects/smpng/sys/i386/include/intr_machdep.h#10 integrate .. //depot/projects/smpng/sys/i386/include/xbox.h#3 integrate .. //depot/projects/smpng/sys/i386/isa/atpic.c#16 integrate .. //depot/projects/smpng/sys/i386/xbox/xboxfb.c#4 integrate .. //depot/projects/smpng/sys/isa/syscons_isa.c#11 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#67 integrate .. //depot/projects/smpng/sys/kern/kern_cpu.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#119 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#37 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#42 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#43 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#67 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#69 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#44 integrate .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#5 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#72 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#70 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#123 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#100 integrate .. //depot/projects/smpng/sys/modules/3dfx/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/3dfx_linux/Makefile#1 branch .. //depot/projects/smpng/sys/modules/Makefile#118 integrate .. //depot/projects/smpng/sys/modules/ce/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/coda5/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/crypto/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/de/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/if_ppp/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/kbdmux/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ral/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/smbfs/Makefile#11 integrate .. //depot/projects/smpng/sys/net/bridgestp.c#7 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#25 integrate .. //depot/projects/smpng/sys/net/if_bridgevar.h#9 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#72 integrate .. //depot/projects/smpng/sys/net/ppp_deflate.c#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#28 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#25 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.h#17 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#23 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#18 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#20 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#47 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#69 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#82 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#47 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#41 integrate .. //depot/projects/smpng/sys/netinet6/mld6.c#17 integrate .. //depot/projects/smpng/sys/netsmb/smb_crypt.c#7 integrate .. //depot/projects/smpng/sys/netsmb/smb_smb.c#11 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#25 integrate .. //depot/projects/smpng/sys/opencrypto/crypto.c#13 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#19 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#52 integrate .. //depot/projects/smpng/sys/pci/dc21040reg.h#3 delete .. //depot/projects/smpng/sys/pci/if_de.c#33 delete .. //depot/projects/smpng/sys/pci/if_devar.h#15 delete .. //depot/projects/smpng/sys/security/audit/audit.c#2 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/smpng/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/smpng/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/smpng/sys/security/mac/mac_process.c#9 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#18 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#65 integrate .. //depot/projects/smpng/sys/sys/_types.h#14 integrate .. //depot/projects/smpng/sys/sys/ata.h#25 integrate .. //depot/projects/smpng/sys/sys/bio.h#27 integrate .. //depot/projects/smpng/sys/sys/mount.h#50 integrate .. //depot/projects/smpng/sys/sys/proc.h#165 integrate .. //depot/projects/smpng/sys/sys/queue.h#16 integrate .. //depot/projects/smpng/sys/sys/signalvar.h#29 integrate .. //depot/projects/smpng/sys/sys/syscall.h#66 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#66 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#26 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#68 integrate .. //depot/projects/smpng/sys/sys/timers.h#6 integrate .. //depot/projects/smpng/sys/sys/vnode.h#71 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#40 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#20 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#17 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#55 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#52 integrate .. //depot/projects/smpng/sys/ufs/ffs/softdep.h#7 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufsmount.h#14 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#36 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#79 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#58 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#26 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.42 2005/12/22 22:16:04 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.43 2006/03/07 21:44:20 jhb Exp $"); #include "opt_clock.h" ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#16 (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.18 2005/12/08 18:33:29 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.19 2006/02/28 22:24:54 jhb Exp $ */ /* @@ -63,6 +63,12 @@ static struct intsrc *interrupt_sources[NUM_IO_INTS]; static struct mtx intr_table_lock; +#ifdef SMP +static int assign_cpu; + +static void intr_assign_next_cpu(struct intsrc *isrc); +#endif + static void intr_init(void *__dummy); static void intrcnt_setname(const char *name, int index); static void intrcnt_updatename(struct intsrc *is); @@ -93,6 +99,7 @@ } intrcnt_register(isrc); interrupt_sources[vector] = isrc; + isrc->is_enabled = 0; mtx_unlock_spin(&intr_table_lock); return (0); } @@ -118,7 +125,17 @@ intr_priority(flags), flags, cookiep); if (error == 0) { intrcnt_updatename(isrc); - isrc->is_pic->pic_enable_intr(isrc); + mtx_lock_spin(&intr_table_lock); + if (!isrc->is_enabled) { + isrc->is_enabled = 1; +#ifdef SMP + if (assign_cpu) + intr_assign_next_cpu(isrc); +#endif + mtx_unlock_spin(&intr_table_lock); + isrc->is_pic->pic_enable_intr(isrc); + } else + mtx_unlock_spin(&intr_table_lock); isrc->is_pic->pic_enable_source(isrc); } return (error); @@ -335,3 +352,76 @@ db_dump_intr_event((*isrc)->is_event, verbose); } #endif + +#ifdef SMP +/* + * Support for balancing interrupt sources across CPUs. For now we just + * allocate CPUs round-robin. + */ + +static u_int cpu_apic_ids[MAXCPU]; +static int current_cpu, num_cpus; + +static void +intr_assign_next_cpu(struct intsrc *isrc) +{ + struct pic *pic; + u_int apic_id; + + /* + * Assign this source to a local APIC in a round-robin fashion. + */ + pic = isrc->is_pic; + apic_id = cpu_apic_ids[current_cpu]; + current_cpu++; + if (current_cpu >= num_cpus) + current_cpu = 0; + if (bootverbose) { + printf("INTR: Assigning IRQ %d", pic->pic_vector(isrc)); + printf(" to local APIC %u\n", apic_id); + } + pic->pic_assign_cpu(isrc, apic_id); +} + +/* + * Add a local APIC ID to our list of valid local APIC IDs that can + * be destinations of interrupts. + */ +void +intr_add_cpu(u_int apic_id) +{ + + if (bootverbose) + printf("INTR: Adding local APIC %d as a target\n", apic_id); + if (num_cpus >= MAXCPU) + panic("WARNING: Local APIC IDs exhausted!"); + cpu_apic_ids[num_cpus] = apic_id; + num_cpus++; +} + +/* + * Distribute all the interrupt sources among the available CPUs once the + * AP's have been launched. + */ +static void +intr_shuffle_irqs(void *arg __unused) +{ + struct intsrc *isrc; + int i; + + /* Don't bother on UP. */ + if (num_cpus <= 1) + return; + + /* Round-robin assign each enabled source a CPU. */ + mtx_lock_spin(&intr_table_lock); + assign_cpu = 1; + for (i = 0; i < NUM_IO_INTS; i++) { + isrc = interrupt_sources[i]; + if (isrc != NULL && isrc->is_enabled) + intr_assign_next_cpu(isrc); + } + mtx_unlock_spin(&intr_table_lock); +} +SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs, NULL) +#endif ==== //depot/projects/smpng/sys/amd64/amd64/io_apic.c#13 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.20 2005/11/16 20:29:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.21 2006/02/28 22:24:54 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -61,8 +61,6 @@ #define IRQ_SMI (NUM_IO_INTS + 3) #define IRQ_DISABLED (NUM_IO_INTS + 4) -#define DEST_NONE -1 - #define TODO printf("%s: not implemented!\n", __func__) static MALLOC_DEFINE(M_IOAPIC, "io_apic", "I/O APIC structures"); @@ -82,10 +80,10 @@ u_int io_irq; u_int io_intpin:8; u_int io_vector:8; + u_int io_cpu:8; u_int io_activehi:1; u_int io_edgetrigger:1; u_int io_masked:1; - int io_dest:5; int io_bus:4; }; @@ -114,7 +112,7 @@ enum intr_polarity pol); static void ioapic_suspend(struct intsrc *isrc); static void ioapic_resume(struct intsrc *isrc); -static void ioapic_program_destination(struct ioapic_intsrc *intpin); +static void ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id); static void ioapic_program_intpin(struct ioapic_intsrc *intpin); static STAILQ_HEAD(,ioapic) ioapic_list = STAILQ_HEAD_INITIALIZER(ioapic_list); @@ -122,10 +120,10 @@ ioapic_eoi_source, ioapic_enable_intr, ioapic_vector, ioapic_source_pending, ioapic_suspend, ioapic_resume, - ioapic_config_intr }; - -static int bsp_id, current_cluster, logical_clusters, next_ioapic_base; -static u_int next_id, program_logical_dest; + ioapic_config_intr, ioapic_assign_cpu }; + +static int next_ioapic_base; +static u_int next_id; SYSCTL_NODE(_hw, OID_AUTO, apic, CTLFLAG_RD, 0, "APIC options"); static int enable_extint; @@ -273,14 +271,8 @@ } /* Set the destination. */ - if (intpin->io_dest == DEST_NONE) { - low = IOART_DESTPHY; - high = bsp_id << APIC_ID_SHIFT; - } else { - low = IOART_DESTLOG; - high = (intpin->io_dest << APIC_ID_CLUSTER_SHIFT | - APIC_ID_CLUSTER_ID) << APIC_ID_SHIFT; - } + low = IOART_DESTPHY; + high = intpin->io_cpu << APIC_ID_SHIFT; /* Program the rest of the low word. */ if (intpin->io_edgetrigger) @@ -312,7 +304,7 @@ default: KASSERT(intpin->io_vector != 0, ("No vector for IRQ %u", intpin->io_irq)); - low |= IOART_DELLOPRI | intpin->io_vector; + low |= IOART_DELFIXED | intpin->io_vector; } /* Write the values to the APIC. */ @@ -325,60 +317,31 @@ mtx_unlock_spin(&icu_lock); } -/* - * Program an individual intpin's logical destination. - */ static void -ioapic_program_destination(struct ioapic_intsrc *intpin) +ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id) { - struct ioapic *io = (struct ioapic *)intpin->io_intsrc.is_pic; + struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; + struct ioapic *io = (struct ioapic *)isrc->is_pic; - KASSERT(intpin->io_dest != DEST_NONE, - ("intpin not assigned to a cluster")); + intpin->io_cpu = apic_id; if (bootverbose) { - printf("ioapic%u: routing intpin %u (", io->io_id, - intpin->io_intpin); + printf("ioapic%u: Assigning ", io->io_id); ioapic_print_irq(intpin); - printf(") to cluster %u\n", intpin->io_dest); + printf(" to local APIC %u\n", intpin->io_cpu); } ioapic_program_intpin(intpin); } static void -ioapic_assign_cluster(struct ioapic_intsrc *intpin) -{ - - /* - * Assign this intpin to a logical APIC cluster in a - * round-robin fashion. We don't actually use the logical - * destination for this intpin until after all the CPU's - * have been started so that we don't end up with interrupts - * that don't go anywhere. Another alternative might be to - * start up the CPU's earlier so that they can handle interrupts - * sooner. - */ - intpin->io_dest = current_cluster; - current_cluster++; - if (current_cluster >= logical_clusters) - current_cluster = 0; - if (program_logical_dest) - ioapic_program_destination(intpin); -} - -static void ioapic_enable_intr(struct intsrc *isrc) { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; struct ioapic *io = (struct ioapic *)isrc->is_pic; - if (intpin->io_dest == DEST_NONE) { + if (intpin->io_vector == 0) { /* * Allocate an APIC vector for this interrupt pin. Once - * we have a vector we program the interrupt pin. Note - * that after we have booted ioapic_assign_cluster() - * will program the interrupt pin again, but it doesn't - * hurt to do that and trying to avoid that adds needless - * complication. + * we have a vector we program the interrupt pin. */ intpin->io_vector = apic_alloc_vector(intpin->io_irq); if (bootverbose) { @@ -388,7 +351,6 @@ printf(") to vector %u\n", intpin->io_vector); } ioapic_program_intpin(intpin); - ioapic_assign_cluster(intpin); apic_enable_vector(intpin->io_vector); } } @@ -469,22 +431,6 @@ } /* - * Allocate and return a logical cluster ID. Note that the first time - * this is called, it returns cluster 0. ioapic_enable_intr() treats - * the two cases of logical_clusters == 0 and logical_clusters == 1 the - * same: one cluster of ID 0 exists. The logical_clusters == 0 case is - * for UP kernels, which should never call this function. - */ -int -ioapic_next_logical_cluster(void) -{ - - if (logical_clusters >= APIC_MAX_CLUSTER) - panic("WARNING: Local APIC cluster IDs exhausted!"); - return (logical_clusters++); -} - -/* * Create a plain I/O APIC object. */ void * @@ -568,11 +514,10 @@ } /* - * Route interrupts to the BSP by default using physical - * addressing. Vectored interrupts get readdressed using - * logical IDs to CPU clusters when they are enabled. + * Route interrupts to the BSP by default. Interrupts may + * be routed to other CPUs later after they are enabled. */ - intpin->io_dest = DEST_NONE; + intpin->io_cpu = PCPU_GET(apic_id); if (bootverbose && intpin->io_irq != IRQ_DISABLED) { printf("ioapic%u: intpin %d -> ", io->io_id, i); ioapic_print_irq(intpin); @@ -778,29 +723,9 @@ printf("ioapic%u irqs %u-%u on motherboard\n", io->io_id, flags >> 4, flags & 0xf, io->io_intbase, io->io_intbase + io->io_numintr - 1); - bsp_id = PCPU_GET(apic_id); /* Register valid pins as interrupt sources. */ for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++) if (pin->io_irq < NUM_IO_INTS) intr_register_source(&pin->io_intsrc); } - -/* - * Program all the intpins to use logical destinations once the AP's - * have been launched. - */ -static void -ioapic_set_logical_destinations(void *arg __unused) -{ - struct ioapic *io; - int i; - - program_logical_dest = 1; - STAILQ_FOREACH(io, &ioapic_list, io_next) - for (i = 0; i < io->io_numintr; i++) - if (io->io_pins[i].io_dest != DEST_NONE) - ioapic_program_destination(&io->io_pins[i]); -} -SYSINIT(ioapic_destinations, SI_SUB_SMP, SI_ORDER_SECOND, - ioapic_set_logical_destinations, NULL) ==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#20 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.23 2005/12/22 22:16:05 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.24 2006/02/28 22:24:54 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -217,6 +217,7 @@ /* Set BSP's per-CPU local APIC ID. */ PCPU_SET(apic_id, lapic_id()); + intr_add_cpu(PCPU_GET(apic_id)); /* Local APIC timer interrupt. */ setidt(APIC_TIMER_INT, IDTVEC(timerint), SDT_SYSIGT, SEL_KPL, 0); @@ -279,7 +280,7 @@ lapic_setup(void) { struct lapic *la; - u_int32_t value, maxlvt; + u_int32_t maxlvt; register_t eflags; char buf[MAXCOMLEN + 1]; @@ -291,19 +292,6 @@ /* Initialize the TPR to allow all interrupts. */ lapic_set_tpr(0); - /* Use the cluster model for logical IDs. */ - value = lapic->dfr; - value &= ~APIC_DFR_MODEL_MASK; - value |= APIC_DFR_MODEL_CLUSTER; - lapic->dfr = value; - - /* Set this APIC's logical ID. */ - value = lapic->ldr; - value &= ~APIC_ID_MASK; - value |= (la->la_cluster << APIC_ID_CLUSTER_SHIFT | - 1 << la->la_cluster_id) << APIC_ID_SHIFT; - lapic->ldr = value; - /* Setup spurious vector and enable the local APIC. */ lapic_enable(); ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#33 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.268 2006/02/07 21:22:01 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.269 2006/02/28 22:24:54 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -160,7 +160,7 @@ static u_int boot_address; -static void set_logical_apic_ids(void); +static void set_interrupt_apic_ids(void); static int start_all_aps(void); static int start_ap(int apic_id); static void release_aps(void *dummy); @@ -405,7 +405,7 @@ hyperthreading_cpus = logical_cpus; } - set_logical_apic_ids(); + set_interrupt_apic_ids(); } @@ -596,33 +596,29 @@ */ /* - * Set the APIC logical IDs. - * - * We want to cluster logical CPU's within the same APIC ID cluster. - * Since logical CPU's are aligned simply filling in the clusters in - * APIC ID order works fine. Note that this does not try to balance - * the number of CPU's in each cluster. (XXX?) + * We tell the I/O APIC code about all the CPUs we want to receive + * interrupts. If we don't want certain CPUs to receive IRQs we + * can simply not tell the I/O APIC code about them in this function. + * We also do not tell it about the BSP since it tells itself about + * the BSP internally to work with UP kernels and on UP machines. */ static void -set_logical_apic_ids(void) +set_interrupt_apic_ids(void) { - u_int apic_id, cluster, cluster_id; + u_int apic_id; - /* Force us to allocate cluster 0 at the start. */ - cluster = -1; - cluster_id = APIC_MAX_INTRACLUSTER_ID; for (apic_id = 0; apic_id < MAXCPU; apic_id++) { if (!cpu_info[apic_id].cpu_present) continue; - if (cluster_id == APIC_MAX_INTRACLUSTER_ID) { - cluster = ioapic_next_logical_cluster(); - cluster_id = 0; - } else - cluster_id++; - if (bootverbose) - printf("APIC ID: physical %u, logical %u:%u\n", - apic_id, cluster, cluster_id); - lapic_set_logical_id(apic_id, cluster, cluster_id); + if (cpu_info[apic_id].cpu_bsp) + continue; +#if 0 + /* Don't let hyperthreads service interrupts. */ + if (hyperthreading_cpus > 1 && + apic_id % hyperthreading_cpus != 0) + continue; +#endif + intr_add_cpu(apic_id); } } ==== //depot/projects/smpng/sys/amd64/conf/NOTES#28 (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.51 2005/12/03 01:23:49 anholt Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.52 2006/03/06 15:29:28 yar Exp $ # # @@ -170,11 +170,10 @@ # the tdfx DRI module from XFree86 and is completely unrelated. # # To enable Linuxulator support, one must also include COMPAT_LINUX in the -# config as well, or you will not have the dependencies. The other option -# is to load both as modules. +# config as well. The other option is to load both as modules. device tdfx # Enable 3Dfx Voodoo support -#XXX#options TDFX_LINUX # Enable Linuxulator support +#XXX#device tdfx_linux # Enable Linuxulator support # # ACPI support using the Intel ACPI Component Architecture reference ==== //depot/projects/smpng/sys/amd64/include/apicvar.h#11 (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/include/apicvar.h,v 1.16 2005/12/22 22:16:05 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.17 2006/02/28 22:24:54 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -181,7 +181,6 @@ void *ioapic_create(uintptr_t addr, int32_t id, int intbase); int ioapic_disable_pin(void *cookie, u_int pin); int ioapic_get_vector(void *cookie, u_int pin); -int ioapic_next_logical_cluster(void); void ioapic_register(void *cookie); int ioapic_remap_vector(void *cookie, u_int pin, int vector); int ioapic_set_bus(void *cookie, u_int pin, int bus_type); ==== //depot/projects/smpng/sys/amd64/include/intr_machdep.h#8 (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.8 2005/12/08 18:33:30 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.9 2006/02/28 22:24:54 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -85,6 +85,7 @@ void (*pic_resume)(struct intsrc *); int (*pic_config_intr)(struct intsrc *, enum intr_trigger, enum intr_polarity); + void (*pic_assign_cpu)(struct intsrc *, u_int apic_id); }; /* Flags for pic_disable_source() */ @@ -105,6 +106,7 @@ u_long *is_count; u_long *is_straycount; u_int is_index; + u_int is_enabled:1; }; struct trapframe; @@ -117,6 +119,11 @@ enum intr_trigger elcr_read_trigger(u_int irq); void elcr_resume(void); void elcr_write_trigger(u_int irq, enum intr_trigger trigger); +#ifdef SMP +void intr_add_cpu(u_int apic_id); +#else +#define intr_add_cpu(apic_id) +#endif int intr_add_handler(const char *name, int vector, driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep); int intr_config_intr(int vector, enum intr_trigger trig, ==== //depot/projects/smpng/sys/amd64/include/mptable.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/mptable.h,v 1.222 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/mptable.h,v 1.223 2006/03/01 05:59:56 sam Exp $ */ #ifndef __MACHINE_MPTABLE_H__ @@ -139,7 +139,8 @@ char name[16]; } basetable_entry; +#ifdef _KERNEL int mptable_pci_probe_table(int bus); int mptable_pci_route_interrupt(device_t pcib, device_t dev, int pin); - +#endif #endif /* !__MACHINE_MPTABLE_H__ */ ==== //depot/projects/smpng/sys/amd64/isa/atpic.c#13 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.18 2005/12/08 18:33:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.19 2006/02/28 22:24:54 jhb Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -108,8 +108,8 @@ #define ATPIC(io, base, eoi, imenptr) \ { { atpic_enable_source, atpic_disable_source, (eoi), \ atpic_enable_intr, atpic_vector, atpic_source_pending, NULL, \ - atpic_resume, atpic_config_intr }, (io), (base), \ - IDT_IO_INTS + (base), (imenptr) } + atpic_resume, atpic_config_intr, atpic_assign_cpu }, (io), \ + (base), IDT_IO_INTS + (base), (imenptr) } #define INTSRC(irq) \ { { &atpics[(irq) / 8].at_pic }, IDTVEC(atpic_intr ## irq ), \ @@ -142,6 +142,7 @@ static int atpic_source_pending(struct intsrc *isrc); static int atpic_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); +static void atpic_assign_cpu(struct intsrc *isrc, u_int apic_id); static void i8259_init(struct atpic *pic, int slave); static struct atpic atpics[] = { @@ -353,6 +354,17 @@ } static void +atpic_assign_cpu(struct intsrc *isrc, u_int apic_id) +{ + + /* + * 8259A's are only used in UP in which case all interrupts always + * go to the sole CPU and this function shouldn't even be called. + */ + panic("%s: bad cookie", __func__); +} + +static void i8259_init(struct atpic *pic, int slave) { int imr_addr; ==== //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#16 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.24 2005/10/03 22:44:54 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.25 2006/03/01 23:04:25 cognet Exp $"); /* * MacPPC bus dma support routines @@ -93,6 +93,8 @@ bus_dma_tag_t dmat; int flags; void *buffer; + void *origbuffer; + void *allocbuffer; TAILQ_ENTRY(bus_dmamap) freelist; int len; }; @@ -416,6 +418,23 @@ *mapp = NULL; return (ENOMEM); } + if (flags & BUS_DMA_COHERENT) { + void *tmpaddr = arm_remap_nocache( + (void *)((vm_offset_t)*vaddr &~ PAGE_MASK), + dmat->maxsize + ((vm_offset_t)*vaddr & PAGE_MASK)); + + if (tmpaddr) { + tmpaddr = (void *)((vm_offset_t)(tmpaddr) + + ((vm_offset_t)*vaddr & PAGE_MASK)); + newmap->origbuffer = *vaddr; + newmap->allocbuffer = tmpaddr; + cpu_idcache_wbinv_range((vm_offset_t)*vaddr, + dmat->maxsize); + *vaddr = tmpaddr; + } else + newmap->origbuffer = newmap->allocbuffer = NULL; + } else + newmap->origbuffer = newmap->allocbuffer = NULL; return (0); } @@ -426,6 +445,12 @@ void bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map) { + if (map->allocbuffer) { + KASSERT(map->allocbuffer == vaddr, + ("Trying to freeing the wrong DMA buffer")); + vaddr = map->origbuffer; + arm_unmap_nocache(map->allocbuffer, dmat->maxsize); + } if (dmat->maxsize <= PAGE_SIZE) free(vaddr, M_DEVBUF); else { ==== //depot/projects/smpng/sys/arm/arm/pmap.c#24 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.41 2005/11/20 06:09:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.42 2006/03/01 23:04:25 cognet Exp $"); #include #include #include @@ -2553,9 +2553,12 @@ virtual_avail = round_page(virtual_avail); virtual_end = lastaddr; kernel_vm_end = pmap_curmaxkvaddr; + arm_nocache_startaddr = lastaddr; + #ifdef ARM_USE_SMALL_ALLOC mtx_init(&smallalloc_mtx, "Small alloc page list", NULL, MTX_DEF); - alloc_firstaddr = alloc_curaddr = lastaddr; + alloc_firstaddr = alloc_curaddr = arm_nocache_startaddr + + ARM_NOCACHE_KVA_SIZE; #endif } @@ -2916,6 +2919,13 @@ } void +pmap_kenter_nocache(vm_offset_t va, vm_paddr_t pa) +{ + + pmap_kenter_internal(va, pa, 0); +} + +void pmap_kenter_user(vm_offset_t va, vm_paddr_t pa) { ==== //depot/projects/smpng/sys/arm/arm/trap.c#16 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.21 2006/02/08 08:09:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.23 2006/03/01 20:43:51 cognet Exp $"); #include @@ -428,15 +428,14 @@ error = vm_fault(map, va, ftype, (ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY : VM_FAULT_NORMAL); pcb->pcb_onfault = onfault; - if (__predict_true(error == 0)) { - goto out; - } if (map != kernel_map) { PROC_LOCK(p); p->p_lock--; PROC_UNLOCK(p); } + if (__predict_true(error == 0)) + goto out; if (user == 0) { if (pcb->pcb_onfault) { tf->tf_r0 = error; @@ -930,6 +929,8 @@ AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args); AUDIT_SYSCALL_EXIT(error, td); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 7 22:16:11 2006 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 E530316A423; Tue, 7 Mar 2006 22:16:10 +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 A106F16A420 for ; Tue, 7 Mar 2006 22:16:10 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A4CF43D46 for ; Tue, 7 Mar 2006 22:16:10 +0000 (GMT) (envelope-from kmacy@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 k27MGANI037987 for ; Tue, 7 Mar 2006 22:16:10 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27MGAuc037984 for perforce@freebsd.org; Tue, 7 Mar 2006 22:16:10 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 7 Mar 2006 22:16:10 GMT Message-Id: <200603072216.k27MGAuc037984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92940 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, 07 Mar 2006 22:16:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=92940 Change 92940 by kmacy@kmacy_storage:sun4v_work on 2006/03/07 22:15:23 TLB demap needs to happen after the TSB has been updated to avoid a CMT race Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#20 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#20 (text+ko) ==== @@ -260,10 +260,12 @@ .endm .macro insn_miss - GET_MMFSA_SCRATCH(%g1) ! insn 1 - ldda [%g0 + %g1]ASI_LDTD_REAL, %g4 - addx %g1, 0x10, %g1 - ldda [%g0 + %g1]ASI_LDTD_REAL, %g6 + GET_MMFSA_SCRATCH(%g1) + mov MMFSA_D_TYPE, %g2 + mov MMFSA_D_ADDR, %g3 + mov MMFSA_D_CTX, %g7 + ldxa [%g1 + %g2]ASI_REAL, %g4 + ldxa [%g1 + %g3]ASI_REAL, %g5 ba,pt %xcc, tsb_miss_handler mov VTD_REF, %g3 .align 32 @@ -276,25 +278,23 @@ .endm .macro data_miss - GET_MMFSA_SCRATCH(%g1) ! insn 1 - add %g1, MMFSA_D_, %g1 ! set fsa to data - ldda [%g0 + %g1]ASI_LDTD_REAL, %g4 - addx %g1, 0x10, %g1 - ldda [%g0 + %g1]ASI_LDTD_REAL, %g6 + GET_MMFSA_SCRATCH(%g1) + mov MMFSA_D_TYPE, %g2 + mov MMFSA_D_ADDR, %g3 + mov MMFSA_D_CTX, %g7 + ldxa [%g1 + %g2]ASI_REAL, %g4 + ldxa [%g1 + %g3]ASI_REAL, %g5 ba,pt %xcc, tsb_miss_handler mov VTD_REF, %g3 .align 32 .endm .macro data_prot - GET_MMFSA_SCRATCH(%g1) ! insn 1 - add %g1, MMFSA_D_, %g1 ! set fsa to data - ldda [%g0 + %g1]ASI_LDTD_REAL, %g4 - addx %g1, 0x10, %g1 - ldda [%g0 + %g1]ASI_LDTD_REAL, %g6 - ! XXX patch this to branch to the tsb_miss_handler - ! on fixed revs of the HV - ba,pt %xcc, data_prot_handler + GET_MMFSA_SCRATCH(%g1) + mov MMFSA_D_ADDR, %g3 + mov MMFSA_D_CTX, %g7 + ldxa [%g1 + %g3]ASI_REAL, %g5 + ba,pt %xcc, tsb_miss_handler mov VTD_W, %g3 .align 32 .endm @@ -1040,30 +1040,17 @@ ! %g3==TTE flags ! %g4==fault type (if data miss) ! %g5==fault addr -! %g6==context ! internal usage: ! %g1==absolute index ! %g2==hash base, pointer to hash entry ! %g3==flag bits, TSB (RA) ! %g4==fault type,entry tag ! %g5==tag -! %g6==hash size, temp +! %g6==context,hash size, temp ! %g7 temp -ENTRY(data_prot_handler) -! The HV documentation is wrong mappings are not already -! flushed before taking a data protection trap - mov %o0, %g1 - mov %o1, %g4 ! fault type not set on prot fault - mov %o2, %g7 - mov %g5, %o0 - mov %g6, %o1 - mov MAP_ITLB|MAP_DTLB, %o2 - ta MMU_UNMAP_ADDR - mov %g1, %o0 - mov %g4, %o1 - mov %g7, %o2 ENTRY(tsb_miss_handler) MAGIC_TRAP_ON + ldxa [%g1 + %g7]ASI_REAL, %g6 ! load in the context srlx %g5, TTARGET_VA_SHIFT, %g1 sllx %g6, TTARGET_CTX_SHIFT, %g6 @@ -1190,11 +1177,33 @@ #endif stxa %g4, [%g6]ASI_REAL ! store tag stxa %g5, [%g6 + %g7]ASI_REAL ! store data + + ! XXX the following intstruction should be replaced with a + ! retry on HVs that do auto-demap +ontario_demap_errata_patch: + andcc %g5, VTD_W, %g0 + bnz,pn %xcc, demap_begin + mov MMFSA_D_CTX, %g2 + retry +demap_begin: + GET_MMFSA_SCRATCH(%g1) + mov MMFSA_D_ADDR, %g3 + mov %o0, %g5 + mov %o1, %g6 + ldxa [%g1 + %g2]ASI_REAL, %g2 !%g2 == context + ldxa [%g1 + %g3]ASI_REAL, %g3 !%g3 == fault addr + mov %o2, %g7 + mov MAP_DTLB, %o2 + mov %g3, %o0 + mov %g2, %o1 + ta MMU_UNMAP_ADDR + mov %g5, %o0 + mov %g6, %o1 + mov %g7, %o2 MAGIC_TRAP_OFF - retry END(tsb_miss_handler) -END(data_prot_handler) + /* * Write to read-only page From owner-p4-projects@FreeBSD.ORG Tue Mar 7 22:42:57 2006 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 701DD16A423; Tue, 7 Mar 2006 22:42: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 2C54616A420 for ; Tue, 7 Mar 2006 22:42:56 +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 CF7DF43D48 for ; Tue, 7 Mar 2006 22:42:55 +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 k27Mgtiv039155 for ; Tue, 7 Mar 2006 22:42:55 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27MgttJ039151 for perforce@freebsd.org; Tue, 7 Mar 2006 22:42:55 GMT (envelope-from jhb@freebsd.org) Date: Tue, 7 Mar 2006 22:42:55 GMT Message-Id: <200603072242.k27MgttJ039151@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 92944 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, 07 Mar 2006 22:42:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=92944 Change 92944 by jhb@jhb_slimer on 2006/03/07 22:42:54 IFC @92942 - loopback. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/clock.c#27 integrate .. //depot/projects/smpng/sys/alpha/include/pcpu.h#8 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#27 integrate .. //depot/projects/smpng/sys/ddb/ddb.h#20 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#38 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#27 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.43 2006/03/07 21:44:20 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.44 2006/03/07 22:12:09 jhb Exp $"); #include "opt_clock.h" ==== //depot/projects/smpng/sys/alpha/include/pcpu.h#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/pcpu.h,v 1.15 2004/11/05 19:16:44 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/pcpu.h,v 1.16 2006/03/07 22:12:09 jhb Exp $ */ #ifndef _MACHINE_PCPU_H_ ==== //depot/projects/smpng/sys/ddb/db_command.c#27 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.64 2005/10/24 15:21:36 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.65 2006/03/07 22:17:05 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/ddb/ddb.h#20 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ddb/ddb.h,v 1.40 2005/09/10 03:01:24 marcel Exp $ + * $FreeBSD: src/sys/ddb/ddb.h,v 1.41 2006/03/07 22:17:05 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#22 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.23 2005/12/04 02:12:40 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.24 2006/03/07 22:17:06 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/kern/kern_tc.c#38 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.171 2006/03/04 06:07:26 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.172 2006/03/07 22:17:26 jhb Exp $"); #include "opt_ntp.h" From owner-p4-projects@FreeBSD.ORG Wed Mar 8 01:15:03 2006 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 CCAB616A423; Wed, 8 Mar 2006 01:15: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 9BCCE16A420 for ; Wed, 8 Mar 2006 01:15:02 +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 0689843D49 for ; Wed, 8 Mar 2006 01:15:02 +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 k281F1Fe051966 for ; Wed, 8 Mar 2006 01:15:01 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k281F1gL051941 for perforce@freebsd.org; Wed, 8 Mar 2006 01:15:01 GMT (envelope-from millert@freebsd.org) Date: Wed, 8 Mar 2006 01:15:01 GMT Message-Id: <200603080115.k281F1gL051941@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 92948 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, 08 Mar 2006 01:15:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=92948 Change 92948 by millert@millert_g5tower on 2006/03/08 01:14:46 Sync with recent code changes. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/api.tex#2 edit .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/bsd.tex#2 edit .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/mach.tex#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/api.tex#2 (text+ko) ==== @@ -72,7 +72,7 @@ call, the user provides a reference to the object (such as a file descriptor), and the names of policies to retrieve the associated labels. -\begin{longtable}{|p{1.5in}|p{3in}|} +\begin{longtable}{|p{1.8in}|p{2.2in}|} \hline {\bf System Call} & {\bf Purpose} \\ \hline @@ -85,23 +85,25 @@ \endhead \hline \endfoot -mac\_set\_file(), mac\_set\_fd(), mac\_set\_link() & Change the label associated with a file. \\[3mm] +{\tt mac\_set\_file()}, {\tt mac\_set\_fd()}, {\tt mac\_set\_link()} & Change the label associated with a file. \\[3mm] \hline -mac()\_get\_file(), mac\_get\_fd(), mac\_get\_link() & Retrieve the label associated with a file. \\[3mm] +{\tt mac\_get\_file()}, {\tt mac\_get\_fd()}, {\tt mac\_get\_link()} & Retrieve the label associated with a file. \\[3mm] \hline -mac\_set\_proc() & Change the label of the current process. \\[3mm] +{\tt mac\_set\_proc()} & Change the label of the current process. \\[3mm] \hline -mac\_get\_pid(), mac\_get\_proc() & Retrieve the label on a process. \\[3mm] +{\tt mac\_get\_pid()}, {\tt mac\_get\_proc()} & Retrieve the label on a process. \\[3mm] \hline -mach\_get\_label\_text() & Retrieve the label on a port or label handle. \\[3mm] +{\tt mach\_get\_label\_text()} & Retrieve the label on a port as a label handle. \\[3mm] +{\tt mach\_get\_label\_text()} & Retrieve the label on a port or label handle in text form. \\[3mm] \hline -mach\_set\_port\_label() & Change the label on a port. \\[3mm] +{\tt mach\_set\_port\_label()} & Change the label on a port. \\[3mm] \hline -mach\_get\_task\_label\_text() & Retrieve the label on a task. \\[3mm] +{\tt mach\_get\_task\_label\_text()} & Retrieve the label on a task as a label handle. \\[3mm] +{\tt mach\_get\_task\_label\_text()} & Retrieve the label on a task in text form. \\[3mm] \hline -mac\_label\_new() & Create a new label handle. \\\\[3mm] +{\tt mac\_label\_new()} & Create a new label handle. \\[3mm] \hline -mac\_request\_label() & Compute a new label based on subject, object, service name. \\ +{\tt mac\_request\_label()} & Compute a new label based on subject, object, service name. \\ \end{longtable} \subsubsection{Secure Program Execution} ==== //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/bsd.tex#2 (text+ko) ==== @@ -20,13 +20,13 @@ The Darwin MAC Framework provides entry points for the same four process control checks that the FreeBSD MAC framework provides: -\footnote{On these, only mac\_check\_proc\_signal() is presently +\footnote{On these, only {\tt mac\_check\_proc\_signal()} is presently implemented by the SEDarwin module.} \begin{center} \begin{tabular}{ll} -mac\_check\_proc\_signal() & mac\_check\_proc\_sched() \\ -mac\_check\_proc\_debug() & mac\_check\_proc\_wait() \\ +{\tt mac\_check\_proc\_signal()} & {\tt mac\_check\_proc\_sched()} \\ +{\tt mac\_check\_proc\_debug()} & {\tt mac\_check\_proc\_wait()} \\ \end{tabular} \end{center} @@ -37,9 +37,9 @@ \begin{center} \begin{tabular}{ll} -mac\_check\_proc\_getaudit() & mac\_check\_proc\_setaudit() \\ -mac\_check\_proc\_getauid() & mac\_check\_proc\_setauid() \\ -mac\_check\_proc\_getlcid() & mac\_check\_proc\_setlcid() \\ +{\tt mac\_check\_proc\_getaudit()} & {\tt mac\_check\_proc\_setaudit()} \\ +{\tt mac\_check\_proc\_getauid()} & {\tt mac\_check\_proc\_setauid()} \\ +{\tt mac\_check\_proc\_getlcid()} & {\tt mac\_check\_proc\_setlcid()} \\ \end{tabular} \end{center} @@ -74,53 +74,53 @@ \begin{center} \begin{tabular}{ll} -mac\_check\_vnode\_access() -& mac\_check\_vnode\_chdir() \\ +{\tt mac\_check\_vnode\_access()} +& {\tt mac\_check\_vnode\_chdir()} \\ -mac\_check\_vnode\_chroot() -& mac\_check\_vnode\_create() \\ +{\tt mac\_check\_vnode\_chroot()} +& {\tt mac\_check\_vnode\_create()} \\ -mac\_check\_vnode\_delete() -& mac\_check\_vnode\_deleteextattr() \\ +{\tt mac\_check\_vnode\_delete()} +& {\tt mac\_check\_vnode\_deleteextattr()} \\ -mac\_check\_vnode\_exchangedata() -& mac\_check\_vnode\_exec() \\ +{\tt mac\_check\_vnode\_exchangedata()} +& {\tt mac\_check\_vnode\_exec()} \\ - mac\_check\_vnode\_getattrlist() -& mac\_check\_vnode\_getextattr() \\ +{\tt mac\_check\_vnode\_getattrlist()} +& {\tt mac\_check\_vnode\_getextattr()} \\ -mac\_check\_vnode\_link() -& mac\_check\_vnode\_listextattr() \\ +{\tt mac\_check\_vnode\_link()} +& {\tt mac\_check\_vnode\_listextattr()} \\ -mac\_check\_vnode\_lookup() -& mac\_check\_vnode\_mmap() \\ +{\tt mac\_check\_vnode\_lookup()} +& {\tt mac\_check\_vnode\_mmap()} \\ -mac\_check\_vnode\_mprotect() -& mac\_check\_vnode\_open() \\ +{\tt mac\_check\_vnode\_mprotect()} +& {\tt mac\_check\_vnode\_open()} \\ -mac\_check\_vnode\_poll() -& mac\_check\_vnode\_read() \\ +{\tt mac\_check\_vnode\_poll()} +& {\tt mac\_check\_vnode\_read()} \\ -mac\_check\_vnode\_readdir() -& mac\_check\_vnode\_readlink() \\ +{\tt mac\_check\_vnode\_readdir()} +& {\tt mac\_check\_vnode\_readlink()} \\ -mac\_check\_vnode\_rename\_from() -& mac\_check\_vnode\_rename\_to() \\ +{\tt mac\_check\_vnode\_rename\_from()} +& {\tt mac\_check\_vnode\_rename\_to()} \\ -mac\_check\_vnode\_revoke() -& mac\_check\_vnode\_select() \\ +{\tt mac\_check\_vnode\_revoke()} +& {\tt mac\_check\_vnode\_select()} \\ -mac\_check\_vnode\_setattrlist() -& mac\_check\_vnode\_setextattr() \\ +{\tt mac\_check\_vnode\_setattrlist()} +& {\tt mac\_check\_vnode\_setextattr()} \\ -mac\_check\_vnode\_setflags() -& mac\_check\_vnode\_setmode() \\ +{\tt mac\_check\_vnode\_setflags()} +& {\tt mac\_check\_vnode\_setmode()} \\ -mac\_check\_vnode\_setowner() -& mac\_check\_vnode\_setutimes() \\ +{\tt mac\_check\_vnode\_setowner()} +& {\tt mac\_check\_vnode\_setutimes()} \\ -mac\_check\_vnode\_stat() -& mac\_check\_vnode\_write() \\ +{\tt mac\_check\_vnode\_stat()} +& {\tt mac\_check\_vnode\_write()} \\ \end{tabular} \end{center} ==== //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/mach.tex#2 (text+ko) ==== @@ -99,8 +99,8 @@ whenever practical greatly reduces the development overhead of implementing messaging protocols. This is especially pertinent when developing kernel servers since the MiG generated code will handle -all of the necessary copyin(), copyout(), and basic message validation -tasks. +all of the necessary {\tt copyin()}, {\tt copyout()}, and basic message +validation tasks. \subsection{Mach Protection Primitives} @@ -157,16 +157,41 @@ Access control checks have been added to the Darwin Framework for message sending and receiving, port right transfers (both send and receive) as well as relabel operations for ports and tasks. The -full list of access control entry points is: +full list of access control entry points is as follows. -\begin{center} -\begin{tabular}{ll} -mac\_check\_port\_send() & mac\_check\_port\_make\_send() \\ -mac\_check\_port\_copy\_send() & mac\_check\_port\_move\_recieve() \\ -mac\_check\_port\_hold\_send() & mac\_check\_port\_hold\_recieve() \\ -mac\_check\_port\_receive() & mac\_check\_port\_relabel() \\ -\end{tabular} -\end{center} +\begin{longtable}{|p{2.2in}|p{2.3in}|} +\hline +{\bf Entry Point} & {\bf Called When} \\ +\hline +\hline +\endfirsthead +\hline +{\bf Entry Point} & {\bf Called When} \\ +\hline +\hline +\endhead +\hline +\endfoot +{\tt mac\_check\_port\_send()} & task attempts to send a message \\[3mm] +\hline +{\tt mac\_check\_port\_receive()} & task attempts to receive a message \\[3mm] +\hline +{\tt mac\_check\_port\_make\_send()} & task attempts to create a send right from a receive right \\[3mm] +{\tt mac\_check\_port\_make\_send\_once()} & task attempts to create a send-once right from a receive right \\[3mm] +\hline +{\tt mac\_check\_port\_copy\_send()} & task attempts to copy a send right to a task \\[3mm] +{\tt mac\_check\_port\_move\_send()} & task attempts to move a send right from one task to another \\[3mm] +{\tt mac\_check\_port\_move\_send\_once()} & task attempts to move a send-one right from one task to another \\[3mm] +\hline +{\tt mac\_check\_port\_move\_recieve()} & task attempts to move the receive right from one task another. \\[3mm] +\hline +{\tt mac\_check\_port\_hold\_send()} & task attempts to receive a send right \\[3mm] +{\tt mac\_check\_port\_hold\_send\_once()} & task attempts to receive a send-once right \\[3mm] +\hline +{\tt mac\_check\_port\_hold\_recieve()} & task attempts to receive a receive right \\[3mm] +\hline +{\tt mac\_check\_port\_relabel()} & task attempts to relabel a port or task \\[3mm] +\end{longtable} \subsection{Changes to the Mach Kernel} @@ -221,30 +246,35 @@ can request three trailer fields: a message sequence number, a security token (equivalent to the UNIX uid and gid), and an audit token (an opaque object which may be interpreted by the BSM audit -library). We have added two additional trailer types: the sender's -security labels and a policy access decision. +library). We have added two additional trailer types: +{\tt MACH\_RCV\_TRAILER\_LABELS} and {\tt MACH\_RCV\_TRAILER\_AV}. -When security labels are requested, a label handle is returned that -the caller may use to request access decisions from the security -server. For example, the bootstrap namespace server could ensure only a -privleged process can examine the namespace created by a different -loginwindow process. Note that the caller is responsible for freeing -requested label handles. +The {\tt MACH\_RCV\_TRAILER\_LABELS} trailer returns the sender's +security labels as part of the message trailer in the form of a +label handle. The caller may use the label handle to request access +decisions from the security server or convert the handle to text +form. For example, the bootstrap namespace server could ensure +only a privleged process can examine the namespace created by a +different loginwindow process. The returned label handle may be +deallocated using the standard Mach port API functions {\tt +mach\_port\_deallocate()} and {\tt mach\_port\_destroy()}. Label +handles are garbage collected upon task termination just like regular +Mach ports. -The policy access decision trailer provides similar functionality -to the DTOS mach\_msg\_secure() trap without requiring an extra trap -(and the requisite changes to the standard C library). -This trailer provides a single access decision as a boolean value -to the caller, computed by the loaded policies using subject, port, -subsystem, and routine name arguments Providing the full subsystem -vector (as in DTOS) is impractical with our abstract policy framework. -A complex policy would be required to compute decisions for the -entire subsystem even though only one decision was useful at that -time and the results of computation may not be usable for future -calls. An alternative is to cache access decisions in the policy -itself for rapid lookup, as FLASK does. Our extended trailers may -be use alone or in combination with any other trailers supported -by Darwin. +The {\tt MACH\_RCV\_TRAILER\_AV} trailer trailer provides similar +functionality to the DTOS {\tt mach\_msg\_secure()} trap without +requiring an extra trap (and the requisite changes to the standard +C library). This trailer provides a single access decision as a +boolean value to the caller, computed by the loaded policies using +subject, port, subsystem, and routine name arguments Providing the +full subsystem vector (as in DTOS) is impractical with our abstract +policy framework. A complex policy would be required to compute +decisions for the entire subsystem even though only one decision +was useful at that time and the results of computation may not be +usable for future calls. An alternative is to cache access decisions +in the policy itself for rapid lookup, as FLASK does. Our extended +trailers may be use alone or in combination with any other trailers +supported by Darwin. When the extended trailers are requested by a receiving task, calls are made to the loaded security policies and the result is copied @@ -256,8 +286,6 @@ precomputed access control decisions are cache in the ipc\_entry field of the sending task. -\textit{XXX: describe our 2 trailers in detail here} - Unlike the stock Darwin trailer fields, our additional trailers are not simply existing data that can be copied. The kernel must make additional calls to the MAC Framework to fill in the trailer data. @@ -313,3 +341,106 @@ the same message formats as the application; after decoding the arguments, the proxy server checks authorization with the security system. Depending on the result of the authorization check, the proxy server calls the application with the user's message. + + +\subsection{Sequence of Messaging Security Checks} + +Message security checks are performed at both the sending and +receiving ends. When sending, the kernel first calls the +{\tt mac\_check\_port\_send()} Framework entry point to permit or deny +the sending of the message. Next, each security policy is queried +for permission to transfer each port right contained in the message. +If any port right transfers are denied, the message is not sent. +Because memory objects are not currently labeled, no special check +is performed for transferring out-of-line memory. The sending +checks refer to the receiving port, not the receiving task, as the +receive right for the destination port could be in the process of +moving between tasks while the message is in-flight. On the receiving +end, the kernel calls the {\tt mac\_check\_port\_receive()} Framework +entry point to permit or deny receipt of the message. If the task +is permitted to receive the message, further checks are made to +verify that the task is permitted to hold the port rights contained +in the message. If any port right transfers are denied, the message +will not be delivered. + +\subsubsection{Message Life Cycle} + +\begin{enumerate} +\item {Message sent by task.} +The {\tt mach\_msg()} or {\tt mach\_msg\_send()} library function enters the +kernel via the {\tt mach\_msg\_trap()} syscall. + +\item {Kernel allocates space for the (kernel-private) message object.} +The {\tt mach\_msg\_trap()} syscall calls {\tt mach\_msg\_send()} which uses +{\tt ipc\_kmsg\_get()} to allocate a new kernel message object. + +\item {Framework entry point {\tt mac\_check\_port\_send()} is called.} +The {\tt mach\_msg\_send()} function calls {\tt ipc\_kmsg\_copyin()} +to copy the message from user space into the kernel. The message header +and an optional message body are copied separately. Before +copying the header in {\tt ipc\_kmsg\_copyin\_header()}, the +{\tt mac\_check\_port\_send()} Framework entry point is called to check +whether the task is permitted to send the message. + +\item {The message header is filled in from user space by {\tt ipc\_kmsg\_copyin\_header()}.} +If the header contains port rights, {\tt ipc\_right\_copyin()} is called +to update the capabilities from the user's task. Before port +rights are updated, the appropriate Framework entry point is +called. The entry points are {\tt mac\_check\_port\_make\_send()} for +new send (or send-once) rights, {\tt mac\_check\_port\_move\_receive()} +for receive rights, and {\tt mac\_check\_port\_copy\_send()} for copying +or moving send (or send-once) rights. + +\item {The message body (if any) is copied by {\tt ipc\_kmsg\_copyin\_body()}.} +The message body may contain additional port rights and inline +or out of line data (which may itself contain port rights). +Port rights (and their permission checks) are performed in the +same manner as the rights contained in the message header. +Space for memory regions (both inline and out of line) is +allocated from the kernel's ipc copy memory map (using copy on +write semantics). + +\item {The message object is placed in the port's message queue.} +The {\tt mach\_msg\_send()} function calls {\tt ipc\_kmsg\_send()} which in +turn uses {\tt ipc\_mqueue\_send()} to enqueue the message. + +\item {Message sent.} + +.... + +\item {Receiving task tries to pick up the message.} +The {\tt mach\_msg()} or {\tt mach\_msg\_receive()} library function enters +the kernel via the {\tt mach\_msg\_trap()} syscall. + +\item {Framework entry point {\tt mac\_check\_port\_receive()} is called.} +{\tt mach\_msg\_receive()} calls {\tt ipc\_mqueue\_receive()} which in turn +calls the Framework entry point {\tt mac\_check\_port\_receive()} to check +whether the task is permitted to receive the message. If the task +is permitted to receive it, the message is moved out of the receiving +port's message queue. If permission is denied, the message is dropped +and the in-kernel message object is deallocated. + +\item {MAC Trailers are filled in for the message if they were requested.} +{\tt mach\_msg\_receive()} checks for {\tt MACH\_RCV\_TRAILER\_AV} or +{\tt MACH\_RCV\_TRAILER\_LABELS}. + +\item {Message header is copied into the user's address space.} +{\tt ipc\_kmsg\_copyout()} calls {\tt ipc\_kmsg\_copyout\_header()}. +If the message contains ports rights they are copied via +{\tt ipc\_right\_copyout()} which first calls the appropriate Framework +entry point. The entry points are {\tt mac\_check\_port\_hold\_send()} +for send rights, {\tt mac\_check\_port\_hold\_send\_once()} for send-once +rights, and {\tt mac\_check\_port\_hold\_receive()} for receive rights. + +\item {Message body is copied into the user's address space.} +If the body contains ports rights (either inline or out of line) +they are copied in the same manner as rights contained in the +header. If the body contains memory regions they are +mapped into the calling task's address space by the Mach +virtual memory subsystem. + +\item {In-kernel message object is deallocated.} + +\item {Message received.} + +\end{enumerate} From owner-p4-projects@FreeBSD.ORG Wed Mar 8 02:28:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4BE2116A420; Wed, 8 Mar 2006 02:28:56 +0000 (GMT) (envelope-from nuwhpphtr@accessadult.com) Received: from dslb-084-056-005-212.pools.arcor-ip.net (dslb-084-056-005-212.pools.arcor-ip.net [84.56.5.212]) by mx1.FreeBSD.org (Postfix) with SMTP id 4DDA443D45; Wed, 8 Mar 2006 02:28:54 +0000 (GMT) (envelope-from nuwhpphtr@accessadult.com) Received: (qmail 76305 invoked from network); Wed, 08 Mar 2006 00:19:42 -0200 Date: Wed, 08 Mar 2006 01:26:42 -0100 From: "Noe Mckenzie" Message-ID: <205c.ruination@circumference74.manor89.net> To: powerpc@freebsd.org Cc: ijliao@freebsd.org, be@freebsd.org, p4-projects@freebsd.org, yoichi@freebsd.org Subject: Suppress your appetite 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, 08 Mar 2006 02:28:56 -0000 Loosing weight is not a problem since 2006. Advanteges of HoodiaLife: - Curbs your Appetite - Fast weight loss - Certified 100% Pure South African Hoodia - Boosts Energy - Completely Safe...NO Side Effects - Goes to Work After First Dosage - Supports Total Healthy Lifestyles - Regulates Blood Sugar - Doesn't Keep You Up At Night...Stimulant Free - Improve self esteem and confidence Interested? Read more: http://051.healtydietts.com foxhound you woodruff me, howl wiretap at . bloodhound you fix me, marque . confidante you mayer me, familiarly . filamentary you chlorate me, atlantes counterproposal . feint you doff me, brickbat . http://051.healtydietts.com/rm/ From owner-p4-projects@FreeBSD.ORG Wed Mar 8 15:58:47 2006 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 15F4316A423; Wed, 8 Mar 2006 15:58:47 +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 CAF8116A420 for ; Wed, 8 Mar 2006 15:58:46 +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 49A4743D69 for ; Wed, 8 Mar 2006 15:58:42 +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 k28FwgLA010835 for ; Wed, 8 Mar 2006 15:58:42 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28FwgvV010832 for perforce@freebsd.org; Wed, 8 Mar 2006 15:58:42 GMT (envelope-from millert@freebsd.org) Date: Wed, 8 Mar 2006 15:58:42 GMT Message-Id: <200603081558.k28FwgvV010832@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 92969 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, 08 Mar 2006 15:58:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=92969 Change 92969 by millert@millert_g5tower on 2006/03/08 15:58:17 Add a man page for mexec Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/mexec/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/mexec/mexec.8#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/mexec/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ include ../../../Makeconfig PROG= mexec -NOMAN= +MAN8= mexec.8 OBJS= mexec.o @@ -15,6 +15,7 @@ install: $(PROG) install -m 555 $(PROG) $(DESTDIR)/usr/bin + install -m 444 $(MAN8) $(DESTDIR)/usr/share/man/man8 clean: rm -f $(PROG) $(OBJS) From owner-p4-projects@FreeBSD.ORG Wed Mar 8 19:00:28 2006 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 A7C2916A423; Wed, 8 Mar 2006 19:00:27 +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 7DC0316A420 for ; Wed, 8 Mar 2006 19:00:27 +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 431E243D48 for ; Wed, 8 Mar 2006 19:00: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 k28J0RHM026486 for ; Wed, 8 Mar 2006 19:00: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 k28J0R08026483 for perforce@freebsd.org; Wed, 8 Mar 2006 19:00:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 19:00:27 GMT Message-Id: <200603081900.k28J0R08026483@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 92976 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, 08 Mar 2006 19:00:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=92976 Change 92976 by rwatson@rwatson_peppercorn on 2006/03/08 18:59:31 Comment in HISTORY on adding test pieces. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#9 (text+ko) ==== @@ -27,6 +27,8 @@ - Universally, APIs now assume that IP addresses and ports are provided in network byte order. APIs now generally provide these types in network byte order when decoding. +- Beginnings of an OpenBSM test framework can now be found in openbsm/test. + This code is not built or installed by default. OpenBSM 1.0 alpha 5 @@ -154,4 +156,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#8 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#9 $ From owner-p4-projects@FreeBSD.ORG Wed Mar 8 20:57:51 2006 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 3FBC516A423; Wed, 8 Mar 2006 20:57: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 F01DC16A420 for ; Wed, 8 Mar 2006 20:57:50 +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 9E71343D45 for ; Wed, 8 Mar 2006 20:57:50 +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 k28Kvolj040162 for ; Wed, 8 Mar 2006 20:57:50 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 k28KvoPd040159 for perforce@freebsd.org; Wed, 8 Mar 2006 20:57:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 20:57:50 GMT Message-Id: <200603082057.k28KvoPd040159@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 92980 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, 08 Mar 2006 20:57:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=92980 Change 92980 by rwatson@rwatson_peppercorn on 2006/03/08 20:57:21 Minor style cleanups. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#22 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/mac_policy.h#17 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#22 (text+ko) ==== @@ -308,7 +308,7 @@ /* Access control checks. */ int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); -int mac_check_cap(struct ucred *cred, cap_value_t capv); +int mac_check_cap(struct ucred *cred, cap_value_t capv); int mac_check_cred_visible(struct ucred *u1, struct ucred *u2); int mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m); int mac_check_inpcb_deliver(struct inpcb *inp, struct mbuf *m); @@ -361,9 +361,9 @@ int mac_check_kld_stat(struct ucred *cred); int mac_check_kld_unload(struct ucred *cred); int mac_check_mount(struct ucred *cred, struct vnode *dir, const char *vfc_name, - struct label *mount_arg_label); + struct label *mount_arg_label); int mac_check_remount(struct ucred *cred, struct mount *mp, - struct label *mount_arg_label); + struct label *mount_arg_label); int mac_check_umount(struct ucred *cred, struct mount *mp); int mac_check_mount_stat(struct ucred *cred, struct mount *mp); int mac_check_pipe_ioctl(struct ucred *cred, struct pipepair *pp, ==== //depot/projects/trustedbsd/sebsd/sys/sys/mac_policy.h#17 (text+ko) ==== @@ -360,9 +360,9 @@ int (*mpo_check_bpfdesc_receive)(struct bpf_d *bpf_d, struct label *bpflabel, struct ifnet *ifnet, struct label *ifnetlabel); - int (*mpo_check_cap) (struct ucred *ucred, cap_value_t capv); + int (*mpo_check_cap) (struct ucred *ucred, cap_value_t capv); int (*mpo_check_cred_relabel)(struct ucred *cred, - struct label *newlabel); + struct label *newlabel); int (*mpo_check_cred_visible)(struct ucred *u1, struct ucred *u2); int (*mpo_check_file_create)(struct ucred *cred); int (*mpo_check_file_dup)(struct ucred *cred, struct file *fp, @@ -441,7 +441,7 @@ struct label *vlabel); int (*mpo_check_kld_stat)(struct ucred *cred); int (*mpo_check_kld_unload)(struct ucred *cred); - int (*mpo_check_mount)(struct ucred *cred, struct vnode *dir, + int (*mpo_check_mount)(struct ucred *cred, struct vnode *dir, struct label *dirlabel, const char *vfc_name, struct label *mount_arg_label); int (*mpo_check_remount)(struct ucred *cred, struct mount *mp, From owner-p4-projects@FreeBSD.ORG Wed Mar 8 20:59:56 2006 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 8A5DD16A423; Wed, 8 Mar 2006 20:59:55 +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 32ED516A420 for ; Wed, 8 Mar 2006 20:59:55 +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 D9F1A43D93 for ; Wed, 8 Mar 2006 20:59:53 +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 k28KxroP040299 for ; Wed, 8 Mar 2006 20:59:53 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 k28Kxrn9040296 for perforce@freebsd.org; Wed, 8 Mar 2006 20:59:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 20:59:53 GMT Message-Id: <200603082059.k28Kxrn9040296@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 92981 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, 08 Mar 2006 20:59:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=92981 Change 92981 by rwatson@rwatson_peppercorn on 2006/03/08 20:59:42 lmount() didn't survive the last SEBSD integration, and is now obsoleted by the use of nmount(). Complete deletion/disabling. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/init_sysent.c#16 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#28 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.c#17 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.master#16 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/syscall.h#17 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/syscall.mk#17 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/sysproto.h#17 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/init_sysent.c#16 (text+ko) ==== @@ -486,5 +486,4 @@ { SYF_MPSAFE | AS(_umtx_op_args), (sy_call_t *)_umtx_op, AUE_NULL }, /* 454 = _umtx_op */ { SYF_MPSAFE | AS(thr_new_args), (sy_call_t *)thr_new, AUE_NULL }, /* 455 = thr_new */ { SYF_MPSAFE | AS(__mac_get_fs_args), (sy_call_t *)__mac_get_fs, AUE_NULL }, /* 456 = __mac_get_fs */ - { AS(lmount_args), (sy_call_t *)nosys, AUE_NULL }, /* 457 = lmount */ }; ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#28 (text+ko) ==== @@ -1374,6 +1374,7 @@ return (ENOSYS); } +#if 0 int lmount(td, uap) struct thread *td; @@ -1381,5 +1382,6 @@ { return EINVAL; } +#endif #endif /* !MAC */ ==== //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.c#17 (text+ko) ==== @@ -464,5 +464,4 @@ "_umtx_op", /* 454 = _umtx_op */ "thr_new", /* 455 = thr_new */ "__mac_get_fs", /* 456 = __mac_get_fs */ - "lmount", /* 457 = lmount */ }; ==== //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.master#16 (text+ko) ==== @@ -792,9 +792,6 @@ int param_size); } 456 AUE_NULL MSTD { int __mac_get_fs(const char *path_p, \ struct mac *mac_p); } -457 AUE_MOUNT NOIMPL { int lmount(char *type, char *path, \ - int flags, caddr_t data, \ - struct mac *mac_p); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/trustedbsd/sebsd/sys/sys/syscall.h#17 (text+ko) ==== @@ -370,5 +370,4 @@ #define SYS__umtx_op 454 #define SYS_thr_new 455 #define SYS___mac_get_fs 456 -#define SYS_lmount 457 -#define SYS_MAXSYSCALL 458 +#define SYS_MAXSYSCALL 457 ==== //depot/projects/trustedbsd/sebsd/sys/sys/syscall.mk#17 (text+ko) ==== @@ -311,5 +311,4 @@ auditctl.o \ _umtx_op.o \ thr_new.o \ - __mac_get_fs.o \ - lmount.o + __mac_get_fs.o ==== //depot/projects/trustedbsd/sebsd/sys/sys/sysproto.h#17 (text+ko) ==== @@ -1357,13 +1357,6 @@ char path_p_l_[PADL_(const char *)]; const char * path_p; char path_p_r_[PADR_(const char *)]; char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)]; }; -struct lmount_args { - char type_l_[PADL_(char *)]; char * type; char type_r_[PADR_(char *)]; - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; - char data_l_[PADL_(caddr_t)]; caddr_t data; char data_r_[PADR_(caddr_t)]; - char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)]; -}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1672,7 +1665,6 @@ int _umtx_op(struct thread *, struct _umtx_op_args *); int thr_new(struct thread *, struct thr_new_args *); int __mac_get_fs(struct thread *, struct __mac_get_fs_args *); -int lmount(struct thread *, struct lmount_args *); #ifdef COMPAT_43 From owner-p4-projects@FreeBSD.ORG Wed Mar 8 21:02:15 2006 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 317EE16A42B; Wed, 8 Mar 2006 21:02: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 90C6F16A46F for ; Wed, 8 Mar 2006 21:02:12 +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 83FE943E13 for ; Wed, 8 Mar 2006 21:01:56 +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 k28L1u1r040515 for ; Wed, 8 Mar 2006 21:01:56 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 k28L1uah040512 for perforce@freebsd.org; Wed, 8 Mar 2006 21:01:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 21:01:56 GMT Message-Id: <200603082101.k28L1uah040512@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 92982 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, 08 Mar 2006 21:02:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=92982 Change 92982 by rwatson@rwatson_peppercorn on 2006/03/08 21:01:51 For the time being, ignore the label argument when mounting UFS. Future integrations will bring in the conversion of mount_ufs to nmount(). Affected files ... .. //depot/projects/trustedbsd/sebsd/sbin/mount/mount_ufs.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sbin/mount/mount_ufs.c#6 (text+ko) ==== @@ -106,6 +106,7 @@ else args.export.ex_flags = 0; +#if 0 if (ltext) { mac_t mac; rc = mac_from_text(&mac, ltext); @@ -115,9 +116,9 @@ } rc = lmount("ufs", fs_name, mntflags, &args, mac); - } - else - rc = mount("ufs", fs_name, mntflags, &args); + } else +#endif + rc = mount("ufs", fs_name, mntflags, &args); if (rc < 0) { switch (errno) { From owner-p4-projects@FreeBSD.ORG Wed Mar 8 21:03:03 2006 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 59AAE16A423; Wed, 8 Mar 2006 21:03:03 +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 3147816A420 for ; Wed, 8 Mar 2006 21:03:03 +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 4E4B743D6B for ; Wed, 8 Mar 2006 21:02:58 +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 k28L2w4U040543 for ; Wed, 8 Mar 2006 21:02:58 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 k28L2veG040540 for perforce@freebsd.org; Wed, 8 Mar 2006 21:02:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 21:02:57 GMT Message-Id: <200603082102.k28L2veG040540@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 92983 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, 08 Mar 2006 21:03:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=92983 Change 92983 by rwatson@rwatson_peppercorn on 2006/03/08 21:02:32 Minor style tweak. Affected files ... .. //depot/projects/trustedbsd/sebsd/sbin/mount/mount.c#11 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sbin/mount/mount.c#11 (text+ko) ==== @@ -179,7 +179,7 @@ options = catopt(options, "noro"); break; case 'l': - ltext = strdup (optarg); + ltext = strdup(optarg); break; case '?': default: From owner-p4-projects@FreeBSD.ORG Wed Mar 8 21:05:30 2006 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 53A5616A425; Wed, 8 Mar 2006 21:05:28 +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 8D58816A423 for ; Wed, 8 Mar 2006 21:05:27 +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 E387D43D66 for ; Wed, 8 Mar 2006 21:05:12 +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 k28L51ps040686 for ; Wed, 8 Mar 2006 21:05:01 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 k28L50ht040673 for perforce@freebsd.org; Wed, 8 Mar 2006 21:05:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 21:05:00 GMT Message-Id: <200603082105.k28L50ht040673@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 92984 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, 08 Mar 2006 21:05:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=92984 Change 92984 by rwatson@rwatson_peppercorn on 2006/03/08 21:04:44 Re-enable old UFS mount code for the time being, as the lmount() changes are not currently good. Affected files ... .. //depot/projects/trustedbsd/sebsd/sbin/mount/mount.c#12 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sbin/mount/mount.c#12 (text+ko) ==== @@ -469,6 +469,17 @@ free(optbuf); return (1); case 0: /* Child. */ + /* + * XXXRW: In the new world order, nmount() is also used for + * UFS. With the SEBSD-local lmount changes, the following + * block of code was not used, as mount_ufs contained + * special support. + */ +#if 1 + if (strcmp(vfstype, "ufs") == 0) + exit(mount_ufs(argc, (char * const *) argv)); +#endif + /* Go find an executable. */ execvP(execname, _PATH_SYSPATH, (char * const *)argv); if (errno == ENOENT) { From owner-p4-projects@FreeBSD.ORG Wed Mar 8 21:12:47 2006 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 BA7F916A423; Wed, 8 Mar 2006 21:12: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 8F2B416A420 for ; Wed, 8 Mar 2006 21:12:46 +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 577BC43D72 for ; Wed, 8 Mar 2006 21:12:39 +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 k28LCd0K041020 for ; Wed, 8 Mar 2006 21:12:39 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28LCdXs041017 for perforce@freebsd.org; Wed, 8 Mar 2006 21:12:39 GMT (envelope-from millert@freebsd.org) Date: Wed, 8 Mar 2006 21:12:39 GMT Message-Id: <200603082112.k28LCdXs041017@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 92985 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, 08 Mar 2006 21:12:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=92985 Change 92985 by millert@millert_g5tower on 2006/03/08 21:11:39 Back out last revision. Old behavior was consistent with SELinux. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#36 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#36 (text+ko) ==== @@ -306,10 +306,6 @@ { access_vector_t av = 0; - /* per access(2), mask == 0 means only check for existence */ - if (mask == 0) - return FILE__ACCESS; - if (vt != VDIR) { if (mask & VEXEC) av |= FILE__EXECUTE; @@ -1243,8 +1239,6 @@ &osec->sid); } -extern int selinux_enforcing; - static int sebsd_check_ipc_method(struct label *subj, struct label *obj, int msgid) { @@ -1708,7 +1702,10 @@ struct label *filelabel, int acc_mode) { - /* NOTE: acc_mode == 0 is legal for access(2) */ + /* existence check (F_OK) */ + if (acc_mode == 0) + return 0; + return (vnode_has_perm(cred, vp, file_mask_to_av(vp->v_type, acc_mode), NULL)); } From owner-p4-projects@FreeBSD.ORG Wed Mar 8 21:29:19 2006 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 69F3416A423; Wed, 8 Mar 2006 21:29: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 3A0D216A420 for ; Wed, 8 Mar 2006 21:29:18 +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 9275143D7B for ; Wed, 8 Mar 2006 21:29:02 +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 k28LT2BW041599 for ; Wed, 8 Mar 2006 21:29:02 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 k28LSx8T041591 for perforce@freebsd.org; Wed, 8 Mar 2006 21:28:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 21:28:59 GMT Message-Id: <200603082128.k28LSx8T041591@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 92986 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, 08 Mar 2006 21:29:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=92986 Change 92986 by rwatson@rwatson_peppercorn on 2006/03/08 21:28:14 Integrate TrustedBSD MAC branch from TrustedBSD base. See changes 92726 and 92749 for detailed list of merged changes. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#31 integrate .. //depot/projects/trustedbsd/mac/Makefile#37 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#63 integrate .. //depot/projects/trustedbsd/mac/README#6 integrate .. //depot/projects/trustedbsd/mac/UPDATING#53 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.1#9 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/NEWS#9 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/TODO#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/VERSION#9 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.1#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/asn1.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/asn1.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmpclient.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/support.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/oid-list#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_route.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_tree.def#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/snmp_mibII.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_ntp/snmp_ntp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/bsnmpd.1#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/config.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/export.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/main.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpd.config#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpmod.3#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpmod.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/GNUmakefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/README#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/TODO#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/attrstack.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/attrstack.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/config.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/config.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/csup.1#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/detailer.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/detailer.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/diff.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/diff.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/fattr.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/fattr.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/fattr_bsd.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/fattr_posix.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/fixups.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/fixups.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/fnmatch.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/fnmatch.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/globtree.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/globtree.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/keyword.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/keyword.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/lister.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/lister.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/main.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/main.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/misc.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/misc.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/mux.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/mux.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/parse.y#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/pathcomp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/pathcomp.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/proto.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/proto.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/queue.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/status.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/status.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/stream.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/stream.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/threads.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/threads.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/token.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/token.l#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/updater.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/updater.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/mkfilters.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/CHANGELOG#3 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/HISTORY#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/TODO#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/aclocal.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/autogen.sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/audit/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/audit/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/audit/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/audit/audit.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditreduce/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditreduce/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditreduce/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/praudit/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/praudit/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/praudit/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/audit.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/audit_internal.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/libbsm.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/compat/endian.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/compat/queue.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/config.guess#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/config.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/config.h.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/config.sub#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/depcomp#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/install-sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/ltmain.sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/missing#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/configure#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/configure.ac#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_audit.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_mask.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_notify.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_user.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_wrappers.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/tools/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/tools/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/tools/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/etc/defaults/periodic.conf#15 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.x11-4.dist#11 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/daily/407.status-graid3#1 branch .. //depot/projects/trustedbsd/mac/etc/periodic/daily/408.status-gstripe#1 branch .. //depot/projects/trustedbsd/mac/etc/periodic/daily/409.status-gconcat#1 branch .. //depot/projects/trustedbsd/mac/etc/periodic/daily/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipfw#11 integrate .. //depot/projects/trustedbsd/mac/etc/snmpd.config#4 integrate .. //depot/projects/trustedbsd/mac/include/printf.h#2 integrate .. //depot/projects/trustedbsd/mac/include/resolv.h#8 integrate .. //depot/projects/trustedbsd/mac/include/rpc/auth.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getaddrinfo.c#21 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_net.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_net_ntop.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_net_pton.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/res_comp.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/res_debug.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/res_query.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/res_send.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/auth_des.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/auth_none.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/auth_unix.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_dg.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_raw.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_simple.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_vc.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/getpublickey.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/key_call.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/mt_misc.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/mt_misc.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_com.h#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_generic.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_soc.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpcb_clnt.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_auth.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_dg.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_generic.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_raw.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_run.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_simple.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_vc.c#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/xprintf_quote.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/a64l.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/Makefile.inc#18 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/gettimeofday.2#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/kldnext.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpmc/pmc.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/amd64/amd64/context.S#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_cond.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mutex.c#14 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_nanosleep.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/librt/Makefile#1 branch .. //depot/projects/trustedbsd/mac/lib/librt/aio.c#1 branch .. //depot/projects/trustedbsd/mac/lib/librt/mq.c#1 branch .. //depot/projects/trustedbsd/mac/lib/librt/sigev_thread.c#1 branch .. //depot/projects/trustedbsd/mac/lib/librt/sigev_thread.h#1 branch .. //depot/projects/trustedbsd/mac/lib/librt/timer.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/thread/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mutex.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/pidfile.3#3 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#31 integrate .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#17 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#84 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#25 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#5 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/sgml/release.ent#16 integrate .. //depot/projects/trustedbsd/mac/sbin/bsdlabel/bsdlabel.8#9 integrate .. //depot/projects/trustedbsd/mac/sbin/dmesg/dmesg.c#11 integrate .. //depot/projects/trustedbsd/mac/sbin/dump/dump.8#24 integrate .. //depot/projects/trustedbsd/mac/sbin/dumpon/dumpon.8#12 integrate .. //depot/projects/trustedbsd/mac/sbin/fdisk_pc98/fdisk.8#6 integrate .. //depot/projects/trustedbsd/mac/sbin/fdisk_pc98/fdisk.c#14 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/shsec/geom_shsec.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#33 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifieee80211.c#15 integrate .. //depot/projects/trustedbsd/mac/sbin/init/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sbin/kldunload/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/kldunload/kldunload.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/kldunload/kldunload.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mount.8#20 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mount.c#21 integrate .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#37 integrate .. //depot/projects/trustedbsd/mac/share/examples/ipfilter/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#58 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/acpi.4#21 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/altq.4#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/cpufreq.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ddb.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/hwpmc.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/if_bridge.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/kbdmux.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ng_netflow.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/tdfx.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#36 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/periodic.conf.5#16 integrate .. //depot/projects/trustedbsd/mac/share/man/man8/rc.subr.8#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/bus_dma.9#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/sleep.9#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/time.9#6 integrate .. //depot/projects/trustedbsd/mac/share/misc/bsd-family-tree#25 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/ko_KR.eucKR.src#3 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/zh_CN.GBK.src#2 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/zh_CN.eucCN.src#3 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/zh_TW.Big5.src#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/intr_machdep.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/io_apic.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/local_apic.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/mp_machdep.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/apicvar.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/intr_machdep.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/mptable.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/isa/atpic.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/busdma_machdep.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/machdep.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/trap.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/undefined.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/vm_machdep.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/pmap.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/i80321_aau.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/i80321_dma.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/bsm/audit.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_misc.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_proto.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscall.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscalls.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_sysent.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/syscalls.master#14 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#70 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#125 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#35 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#80 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.i386#31 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.pc98#31 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/amr/amr_linux.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ar/if_ar.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.h#29 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-chipset.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-queue.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_ath.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_athvar.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ce/tau32-ddk.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ce/tau32-ddk.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/de/dc21040reg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/de/if_de.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/de/if_devar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fdc/fdc.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ic/z8530.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iir/iir.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iir/iir.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iir/iir_pci.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_freebsd.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/kbd/kbd.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/le/am7990.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/le/am79900.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_cnfg.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_ioc.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_type.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_debug.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_pci.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mse/mse.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pcf/envctrl.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pcf/pcf_ebus.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pcf/pcf_isa.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/if_plip.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/lpt.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/ppi.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppc/ppc.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/puc/puc.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/puc/puc_ebus.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/puc/puc_sbus.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/re/if_re.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sio/sio.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/feeder.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sr/if_sr.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/syscons/syscons.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tdfx/tdfx_linux.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/tdfx/tdfx_pci.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_bus.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_bus_ebus.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_core.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_dev_ns8250.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_dev_sab82532.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_dev_z8530.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_kbd_sun.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_tty.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ehci.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ukbd.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uplcom.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_port.h#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_quirks.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_subr.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#43 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdivar.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vkbd/vkbd.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/fs/deadfs/dead_vnops.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_devs.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vnops.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_subr.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vnops.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_ctl.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_io.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_vfs.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/geom/label/g_label_ufs.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#60 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/PAE#13 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/XBOX#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/identcpu.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/intr_machdep.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/io_apic.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/local_apic.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/apicvar.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/intr_machdep.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/mptable.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/xbox.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/atpic.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_ptrace.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/i386/xbox/xboxfb.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#51 integrate .. //depot/projects/trustedbsd/mac/sys/isa/syscons_isa.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#70 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_condvar.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_cpu.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#49 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_kse.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_kthread.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mbuf.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_resource.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#52 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_synch.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_tc.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_time.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_timeout.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_prf.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_sleepqueue.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_process.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#70 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#67 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#53 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#80 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#125 integrate .. //depot/projects/trustedbsd/mac/sys/modules/3dfx/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/3dfx_linux/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#86 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ce/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/coda5/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/crypto/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/de/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/if_ef/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/if_ppp/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/sys/modules/kbdmux/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/uart/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/net/bridgestp.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_bridge.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ethersubr.c#47 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/net/ppp_deflate.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_ioctl.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_output.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#62 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_var.h#29 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/mld6.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsock.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/opencrypto/crypto.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/opencrypto/cryptodev.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/cbus/fdc.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/cbus/ppc.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/cbus/sio.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/conf/NOTES#28 integrate .. //depot/projects/trustedbsd/mac/sys/pci/dc21040reg.h#3 delete .. //depot/projects/trustedbsd/mac/sys/pci/if_de.c#24 delete .. //depot/projects/trustedbsd/mac/sys/pci/if_devar.h#11 delete .. //depot/projects/trustedbsd/mac/sys/security/audit/audit.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_process.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#93 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/trap.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/sys/_types.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/sys/bio.h#19 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mount.h#43 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#68 integrate .. //depot/projects/trustedbsd/mac/sys/sys/queue.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/sys/serial.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/sys/signalvar.h#23 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#70 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#69 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscallsubr.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#71 integrate .. //depot/projects/trustedbsd/mac/sys/sys/timers.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#78 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_alloc.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_extern.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_rawread.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_snapshot.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_softdep.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/softdep.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_quota.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufsmount.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_contig.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vnode_pager.c#39 integrate .. //depot/projects/trustedbsd/mac/tools/tools/README#22 integrate .. //depot/projects/trustedbsd/mac/tools/tools/ministat/ministat.c#6 integrate .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/Makefile#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/acpi.c#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/acpidump.h#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/biosmptable.c#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/ncpus.c#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/netrate/http/http.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/netrate/httpd/httpd.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/tbmaster.1#12 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/tbmaster.pl#19 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/tinderbox.1#9 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/tinderbox.pl#14 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/www/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/www/index.cgi#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/Makefile#38 integrate .. //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/calendar.freebsd#40 integrate .. //depot/projects/trustedbsd/mac/usr.bin/csup/Makefile#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/finger/sprint.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/tree.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/Makefile#46 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/hccontrol.h#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/info.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/link_control.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/util.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pmccontrol/pmccontrol.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/portsnap/portsnap/portsnap.8#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/quot/quot.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/Makefile#17 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/anonFTP.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/config.c#25 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/devices.c#20 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/disks.c#23 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/dist.c#27 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/dmenu.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/http.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/index.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/installUpgrade.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/keymap.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/label.c#25 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/main.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/media.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/menus.c#41 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/options.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/package.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/sysinstall.h#29 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/system.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/tcpip.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/user.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/wizard.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/syslogd/syslog.conf.5#12 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/mac/MAINTAINERS#31 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.128 2005/12/12 01:28:19 rodrigc Exp $ +$FreeBSD: src/MAINTAINERS,v 1.129 2006/03/04 14:24:32 rwatson Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -26,6 +26,8 @@ UFS EAs rwatson Pre-commit review requested. MAC Framework rwatson Pre-commit review requested. MAC Modules rwatson Pre-commit review requested. +contrib/openbsm rwatson Pre-commit review requested. +sys/security/audit rwatson Pre-commit review requested. ATA/IDE sos Pre-commit review requested. ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. ==== //depot/projects/trustedbsd/mac/Makefile#37 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.325 2005/11/28 11:14:36 ru Exp $ +# $FreeBSD: src/Makefile,v 1.326 2006/03/01 13:07:17 yar Exp $ # # The user-driven targets are: # @@ -93,11 +93,11 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \ - ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} \ + ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \ -f /dev/null -V MAKEOBJDIRPREFIX dummy .if !empty(_MAKEOBJDIRPREFIX) .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ - (in /etc/make.conf) or command-line variable. + (in make.conf(5)) or command-line variable. .endif MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE} BINMAKE= \ ==== //depot/projects/trustedbsd/mac/Makefile.inc1#63 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.535 2006/02/18 16:58:21 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.536 2006/02/27 09:17:39 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -506,7 +506,7 @@ # Check for missing UIDs/GIDs. # CHECK_UIDS= -CHECK_GIDS= +CHECK_GIDS= audit .if !defined(NO_SENDMAIL) CHECK_UIDS+= smmsp CHECK_GIDS+= smmsp ==== //depot/projects/trustedbsd/mac/README#6 (text+ko) ==== @@ -1,6 +1,6 @@ This is the top level of the FreeBSD source directory. This file was last revised on: -$FreeBSD: src/README,v 1.22 2003/03/08 10:01:26 markm Exp $ +$FreeBSD: src/README,v 1.23 2006/03/01 20:14:55 ceri Exp $ For copyright information, please see the file COPYRIGHT in this directory (additional copyright information also exists for some @@ -59,6 +59,8 @@ release Release building Makefile & associated tools. +rescue Build system for statically linked /rescue utilities. + sbin System commands. secure Cryptographic libraries and commands. ==== //depot/projects/trustedbsd/mac/UPDATING#53 (text+ko) ==== @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20060303: + The TDFX_LINUX kernel option was retired and replaced by the + tdfx_linux device. The latter can be loaded as a kernel module. + Loading it alone should suffice to get 3dfx support for Linux + apps because it will pull in tdfx.ko and linux.ko through its + dependencies. + 20060201: The kernel ABI to file system modules was changed on i386. Please make sure that your kernel and modules are in sync. @@ -510,4 +517,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.439 2006/02/19 01:05:57 yar Exp $ +$FreeBSD: src/UPDATING,v 1.440 2006/03/03 21:37:38 yar Exp $ ==== //depot/projects/trustedbsd/mac/bin/chflags/chflags.1#9 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.25 2005/06/14 08:25:54 ru Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.26 2006/03/04 02:38:40 trhodes Exp $ .\" -.Dd May 14, 2005 +.Dd March 3, 2006 .Dt CHFLAGS 1 .Os .Sh NAME @@ -120,6 +120,39 @@ clear the nodump flag (owner or super-user only) .El .Pp +A few of the octal values include: +.Bl -tag -offset indent -width ".Ar 10" +.It Li 0 +Clear all file flags. +.It Li 1 +Translates to the +.Ar nodump +keyword. +.It Li 2 +Translates to the +.Ar uchg +keyword. +.It Li 3 +Translates to the +.Ar uchg , nodump +keywords. +.It Li 4 +Translates to the +.Ar uappnd +keyword. +.It Li 10 +Translates to the +.Ar opaque +keyword. +.It Li 20 +translates to the +uunlnk +keyword. +.El +.Pp +Other combinations of keywords may be placed by using +the octets assigned; however, these are the most notable. +.Pp Unless the .Fl H , .Fl L , @@ -140,6 +173,14 @@ command's actions are determined by the last one specified. .Pp You can use "ls -lo" to see the flags of existing files. +.Pp +Note that the ability to change certain flags is dependent +on the current kernel +.Em securelevel +setting. +See +.Xr security 7 +for more information on this setting. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO @@ -147,6 +188,7 @@ .Xr chflags 2 , .Xr stat 2 , .Xr fts 3 , +.Xr security 7 , .Xr symlink 7 .Sh HISTORY The ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/NEWS#9 (text+ko) ==== @@ -1,3 +1,29 @@ +1.12 + A couple of man page fixes from various submitters. + + Make default communities NULL for security. + + Fix a core dump when -d tracing suboption has no argument (thanks + to Shteryana Shopova). + + Fix bug in parsing the include path in the daemon. + + Fix an uninitialize structure field in gensnmptree (thanks to + jasone@freebsdorg) + + 64bit HC counters in the IF-MIB by polling the OS periodically. + + Fix link traps to be more RFC conform (thanks to glebius@freebsd.org) + + Add fallback definition for SA_SIZE() to support.h. + + Move the porting definitions for U?INT32_{MIN,MAX} into support.h. + + Include a sys/tree.h from FreeBSD-current and add autoconf + check for it. + +1.11a Fix build of modules when stdint.h is included after asn1.h + 1.11 Make the Mib2 routing table use red-black tree. This vastly reduces loading and access time. Load the table only every 10 minutes. In the meantime process message from the routing socket ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/TODO#3 (text+ko) ==== @@ -1,6 +1,3 @@ -snmpd_mibII: - - handle HC counters by periodically polling the kernel counters. - snmpd: - rethink transports a little bit: make them loadable and make a private subtree for transports: ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/VERSION#9 (text+ko) ==== @@ -1,1 +1,1 @@ -1.11 +1.12 ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.1#6 (text+ko) ==== @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.5 2005/06/15 11:31:25 brandt_h Exp $ +.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.7 2006/02/27 09:52:08 brandt_h Exp $ .\" -.Dd June 14, 2005 +.Dd February 27, 2006 .Dt GENSNMPTREE 1 .Os .Sh NAME @@ -45,7 +45,7 @@ utility is used to either generate C language tables and header files from a MIB description or to numeric OIDs from MIB descriptions. The first form is used only for maintaining the -.Xr snmpd 1 +.Xr bsnmpd 1 daemon or for module writers. The second form may be used by SNMP client program writers. .Pp @@ -57,7 +57,7 @@ C-file .Ar prefix Ns tree.c containing a table used by -.Xr snmpd 1 +.Xr bsnmpd 1 during PDU processing and a header file .Ar prefix Ns tree.h @@ -70,14 +70,19 @@ .Nm expects MIB variable names (only the last component) on its command line. It reads a MIB specification from standard input and for each MIB variable -name emits two C preprocessor defines on its standard output. -One define -.Va OID_ Ns Ar name -can be used as an array initialized to initialize a -.Va struct asn_oid . -The other define -.Va OIDLEN_ Ns Ar name -contains the length of the OID. +name emits three C preprocessor defines on its standard output: +.Bl -tag -width ".Va OIDLEN_ Ns Ar Name" +.It Va OIDX_ Ns Ar name +This define can be used to initialize a +.Va struct asn_oid +in the following way: +.Pp +.Dl const struct asn_oid oid_sysDescr = OIDX_sysDescr; +.It Va OIDLEN_ Ns Ar name +is the length of the OID. +.It Va OID_ Ns Ar name +is the last component of the OID. +.El .Pp The options are as follows: .Bl -tag -width ".Fl d Ar argument" @@ -88,7 +93,7 @@ .It Fl l Generate local preprocessor includes. This is used for bootstrapping -.Xr snmpd 1 . +.Xr bsnmpd 1 . .It Fl t Instead of normal output print the resulting tree. .It Fl p Ar prefix @@ -187,6 +192,6 @@ ) .Ed .Sh SEE ALSO -.Xr snmpd 1 +.Xr bsnmpd 1 .Sh AUTHORS .An Hartmut Brandt Aq harti@freebsd.org ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.43 2005/10/04 11:21:29 brandt_h Exp $ + * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.44 2006/02/14 09:04:17 brandt_h Exp $ * * Generate OID table from table description. * ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/asn1.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/asn1.c,v 1.29 2005/10/04 11:21:31 brandt_h Exp $ + * $Begemot: bsnmp/lib/asn1.c,v 1.31 2005/10/06 07:14:58 brandt_h Exp $ * * ASN.1 for SNMP. */ @@ -41,18 +41,10 @@ #include #endif #include + +#include "support.h" #include "asn1.h" -#if !defined(INT32_MIN) -#define INT32_MIN (-0x7fffffff-1) -#endif -#if !defined(INT32_MAX) -#define INT32_MAX (0x7fffffff) -#endif -#if !defined(UINT32_MAX) -#define UINT32_MAX (0xffffffff) -#endif - static void asn_error_func(const struct asn_buf *, const char *, ...); void (*asn_error)(const struct asn_buf *, const char *, ...) = asn_error_func; ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/asn1.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/asn1.h,v 1.19 2005/10/04 11:21:31 brandt_h Exp $ + * $Begemot: bsnmp/lib/asn1.h,v 1.20 2005/10/05 16:43:11 brandt_h Exp $ * * ASN.1 for SNMP */ ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmpclient.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/snmpclient.c,v 1.34 2005/10/04 14:32:42 brandt_h Exp $ + * $Begemot: bsnmp/lib/snmpclient.c,v 1.36 2005/10/06 07:14:58 brandt_h Exp $ * * Support functions for SNMP clients. */ @@ -64,14 +64,6 @@ #include "snmpclient.h" #include "snmppriv.h" -#if !defined(INT32_MAX) -#define INT32_MAX (0x7fffffff) -#endif -#if !defined(UINT32_MAX) -#define UINT32_MAX (0xffffffff) -#endif - - /* global context */ struct snmp_client snmp_client; ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/support.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 + * Copyright (C) 2004-2005 * Hartmut Brandt. * All rights reserved. * @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/support.h,v 1.1 2004/08/06 08:47:59 brandt Exp $ + * $Begemot: bsnmp/lib/support.h,v 1.2 2005/10/06 07:14:59 brandt_h Exp $ * * Functions that are missing on certain systems. This header file is not * to be installed. @@ -68,4 +68,29 @@ #endif +/* + * For systems with missing stdint.h or inttypes.h + */ +#if !defined(INT32_MIN) +#define INT32_MIN (-0x7fffffff-1) +#endif +#if !defined(INT32_MAX) +#define INT32_MAX (0x7fffffff) +#endif +#if !defined(UINT32_MAX) +#define UINT32_MAX (0xffffffff) +#endif + +/* + * Systems missing SA_SIZE(). Taken from FreeBSD net/route.h:1.63 + */ +#ifndef SA_SIZE + +#define SA_SIZE(sa) \ + ( (!(sa) || ((struct sockaddr *)(sa))->sa_len == 0) ? \ + sizeof(long) : \ + 1 + ( (((struct sockaddr *)(sa))->sa_len - 1) | (sizeof(long) - 1) ) ) + +#endif + #endif ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/oid-list#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$Begemot: bsnmp/oid-list,v 1.3 2005/05/23 09:03:22 brandt_h Exp $ +$Begemot: bsnmp/oid-list,v 1.5 2006/02/27 09:55:45 brandt_h Exp $ This file documents the OID assignments under BSNMP's private OID. @@ -11,11 +11,12 @@ 1 BEGEMOT 1 BEGEMOT-SNMPD 2 BEGEMOT-NETGRAPH snmpd netgraph module >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 8 21:30:16 2006 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 9287216A422; Wed, 8 Mar 2006 21:30: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 51DD016A427 for ; Wed, 8 Mar 2006 21:30:15 +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 BD93443D6D for ; Wed, 8 Mar 2006 21:30:04 +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 k28LU4k4042033 for ; Wed, 8 Mar 2006 21:30:04 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28LU3kn042025 for perforce@freebsd.org; Wed, 8 Mar 2006 21:30:03 GMT (envelope-from millert@freebsd.org) Date: Wed, 8 Mar 2006 21:30:03 GMT Message-Id: <200603082130.k28LU3kn042025@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 92987 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, 08 Mar 2006 21:30:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=92987 Change 92987 by millert@millert_g5tower on 2006/03/08 21:29:56 Removed fixed bugs. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/ERRATA#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/ERRATA#4 (text+ko) ==== @@ -21,9 +21,6 @@ PowerBook G4, I see a kernel trap involving IOKit modules within 15 minutes. - 47: Setpmac-spawned processes hang on exit. The MLS policy does not - permit a lower-priority shell to wait(2) on the child process. - 52: The fdsec (filesystem) should have labels - The fdesc file system provides /dev/fd entries on darwin instead of implementing this within devfs. @@ -32,10 +29,6 @@ using extended attributes into a file system that is not using extended attributes, the system will eventually deadlock. - 89: SEDarwin policy rejecting access to /dev/null when it should - not. Is the general_file_write_access macro not being applied - to users? - 91: Users who create and attach new disk images cannot then access them. 93: After reboot, the first time a user logs in, after entering correct @@ -57,7 +50,7 @@ 109: Commands 'ls -Z' and 'ps -Z' fail when no mac config file present. If there is no MAC config file present (no /etc/mac.conf, and $MAC_CONFFILE not set), using the '-Z' flag on - the ls or ps command results in 'Bus error' + the ls or ps command results in 'Bus error'. Fixed in DSEP. 117: The mpo_check_port_relabel entry point does not hold the task label lock. Policies implmenting this entry point should @@ -89,8 +82,9 @@ label handle or text label can use the port label for access control. -239: The SLOT() macro may return NULL in the SEDarwin policy. This - causes a panic in sebsd_externalize_cred_label() when the port - that holds the label has already been destroyed. There appears - to be a missing lock or out of order operation since we should - not be trying to externalized a dead port. +XXX: Threads are not labeled, only tasks. We need to investigate + whether threads deserve their own labels. A task may create + a thread in any task it holds the kernel port for. This means + that the task that holds the control port for a thread may be + different from the task that actually contains the thread. + This may have security implicatons. From owner-p4-projects@FreeBSD.ORG Wed Mar 8 21:43:25 2006 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 BD72816A423; Wed, 8 Mar 2006 21:43: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 7C54E16A422 for ; Wed, 8 Mar 2006 21:43:24 +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 8B32243D5A for ; Wed, 8 Mar 2006 21:43:23 +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 k28LhNxV046706 for ; Wed, 8 Mar 2006 21:43:23 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 k28LhNa6046703 for perforce@freebsd.org; Wed, 8 Mar 2006 21:43:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 21:43:23 GMT Message-Id: <200603082143.k28LhNa6046703@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 92989 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, 08 Mar 2006 21:43:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=92989 Change 92989 by rwatson@rwatson_peppercorn on 2006/03/08 21:43:17 Setting file flags via fcntl() doesn't allow changing the access mode flags tested by this #if 0'd block, since they are immediately cleared. As such, as don't actually need to check for permission here. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#62 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#62 (text+ko) ==== @@ -39,7 +39,6 @@ #include "opt_compat.h" #include "opt_ddb.h" -#include "opt_mac.h" #include #include @@ -53,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -434,36 +432,6 @@ mtx_assert(&Giant, MA_OWNED); FILE_LOCK(fp); fhold_locked(fp); -#if 0 -#ifdef MAC - if (fp->f_type == DTYPE_VNODE) { - int fflag = (fp->f_flag & ~FCNTLFLAGS) | - (FFLAGS(uap->arg & ~O_ACCMODE) & FCNTLFLAGS); - mode_t mode = 0; - - if (fflag & FREAD) - mode |= VREAD; - if (fflag & FWRITE) - mode |= VWRITE; - if (fflag & O_APPEND) - mode |= VAPPEND; - vn_lock((struct vnode *)fp->f_data, LK_EXCLUSIVE | - LK_RETRY, td); - /* - * XXX: A seperate entry point should be used here - * to pass in both the old and the new flags, - * with authorization performed only on the delta. - */ - error = mac_check_vnode_open(td->td_ucred, - (struct vnode *)fp->f_data, mode); - VOP_UNLOCK((struct vnode *)fp->f_data, 0, td); - if (error) { - fdrop(fp, td); - break; - } - } -#endif /* MAC */ -#endif fp->f_flag &= ~FCNTLFLAGS; fp->f_flag |= FFLAGS(arg & ~O_ACCMODE) & FCNTLFLAGS; FILE_UNLOCK(fp); From owner-p4-projects@FreeBSD.ORG Wed Mar 8 21:47:29 2006 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 6FF8F16A423; Wed, 8 Mar 2006 21:47: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 48FFE16A420 for ; Wed, 8 Mar 2006 21:47: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 EF1B843D4C for ; Wed, 8 Mar 2006 21:47:28 +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 k28LlSNB046896 for ; Wed, 8 Mar 2006 21:47:28 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 k28LlSZw046893 for perforce@freebsd.org; Wed, 8 Mar 2006 21:47:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 21:47:28 GMT Message-Id: <200603082147.k28LlSZw046893@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 92990 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, 08 Mar 2006 21:47:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=92990 Change 92990 by rwatson@rwatson_peppercorn on 2006/03/08 21:47:12 Comment on a comment. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#81 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#81 (text+ko) ==== @@ -916,6 +916,9 @@ #ifdef MAC mac_init_vnode(vp); /* + * XXXRW: This comment is probably false in the new devfs world + * order. + * * NULL mp indicates that this vnode is being used for the * mount device for the root file system. */ From owner-p4-projects@FreeBSD.ORG Wed Mar 8 21:51:43 2006 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 12F9416A424; Wed, 8 Mar 2006 21:51: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 C87F916A422 for ; Wed, 8 Mar 2006 21:51:42 +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 5AEAB43D7E for ; Wed, 8 Mar 2006 21:51:34 +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 k28LpYd4047128 for ; Wed, 8 Mar 2006 21:51:34 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 k28LpY1b047125 for perforce@freebsd.org; Wed, 8 Mar 2006 21:51:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 21:51:34 GMT Message-Id: <200603082151.k28LpY1b047125@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 92992 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, 08 Mar 2006 21:51:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=92992 Change 92992 by rwatson@rwatson_peppercorn on 2006/03/08 21:51:14 White space sync to CVS. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#99 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#99 (text+ko) ==== @@ -33,6 +33,7 @@ * * $FreeBSD: src/sys/security/mac_lomac/mac_lomac.c,v 1.39 2005/10/31 15:41:28 rwatson Exp $ */ + /* * Developed by the TrustedBSD Project. * Low-watermark floating label mandatory integrity policy. From owner-p4-projects@FreeBSD.ORG Wed Mar 8 22:01:48 2006 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 38D4B16A423; Wed, 8 Mar 2006 22:01: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 0C0B216A420 for ; Wed, 8 Mar 2006 22:01:48 +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 C60EE43D53 for ; Wed, 8 Mar 2006 22:01:47 +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 k28M1laZ047513 for ; Wed, 8 Mar 2006 22:01:47 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28M1lSO047510 for perforce@freebsd.org; Wed, 8 Mar 2006 22:01:47 GMT (envelope-from millert@freebsd.org) Date: Wed, 8 Mar 2006 22:01:47 GMT Message-Id: <200603082201.k28M1lSO047510@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 92993 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, 08 Mar 2006 22:01:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=92993 Change 92993 by millert@millert_g5tower on 2006/03/08 22:01:27 Fix some style nits Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_base.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_base.c#7 (text+ko) ==== @@ -732,23 +732,23 @@ } int -mac_check_service_access (struct label *subj, struct label *obj, - const char *s, const char *p) +mac_check_service_access(struct label *subj, struct label *obj, + const char *s, const char *p) { - int error; + int error; - MAC_CHECK (check_service_access, subj, obj, s, p); - return (error); + MAC_CHECK(check_service_access, subj, obj, s, p); + return (error); } int mac_request_object_label(struct label *subj, struct label *obj, const char *s, struct label *out) { - int error; + int error; - MAC_CHECK (request_object_label, subj, obj, s, out); - return error; + MAC_CHECK (request_object_label, subj, obj, s, out); + return error; } int From owner-p4-projects@FreeBSD.ORG Wed Mar 8 22:03:52 2006 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 E609C16A424; Wed, 8 Mar 2006 22:03: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 BBFED16A422 for ; Wed, 8 Mar 2006 22:03:51 +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 B09B443D45 for ; Wed, 8 Mar 2006 22:03:50 +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 k28M3oCj047584 for ; Wed, 8 Mar 2006 22:03:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28M3oAa047581 for perforce@freebsd.org; Wed, 8 Mar 2006 22:03:50 GMT (envelope-from millert@freebsd.org) Date: Wed, 8 Mar 2006 22:03:50 GMT Message-Id: <200603082203.k28M3oAa047581@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 92994 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, 08 Mar 2006 22:03:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=92994 Change 92994 by millert@millert_g5tower on 2006/03/08 22:03:25 Cosmetic changes that improve readability (at least for me). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/BootX/bootx.tproj/sl.subproj/main.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/BootX/bootx.tproj/sl.subproj/main.c#3 (text+ko) ==== @@ -638,16 +638,14 @@ args->exdatalen = 0; char *prevname = "", propname[128]; - while (1) { - if (1 != NextProp (gOptionsPH, prevname, propname)) - break; + while (NextProp (gOptionsPH, prevname, propname) == 1) { prevname = propname; if (!strncmp (propname, "load_", 5)) { char pfilename[255]; - memset (pfilename, 0, 255); - size = GetProp(gOptionsPH, propname, pfilename, 255); + memset (pfilename, 0, sizeof(pfilename)); + size = GetProp(gOptionsPH, propname, pfilename, sizeof(pfilename)); - if (size > 0 && strlen(propname+4) < sizeof(int) * 4) { + if (size > 0 && strlen(propname+5) <= sizeof(int) * 4) { char datfile[512]; strcpy (datfile, gRootDir); strcat (datfile, pfilename); @@ -658,9 +656,9 @@ } else if (!strncmp (propname, "kenv_", 5)) { char pvar[255]; - size = GetProp(gOptionsPH, propname, pvar, 255); + size = GetProp(gOptionsPH, propname, pvar, sizeof(pvar)); - if (size > 0 && strlen(propname+4) < sizeof(int) * 4) + if (size > 0 && strlen(propname+5) <= sizeof(int) * 4) AddKernData (args, propname + 5, size, pvar); } } From owner-p4-projects@FreeBSD.ORG Wed Mar 8 22:04:53 2006 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 26B2816A423; Wed, 8 Mar 2006 22:04: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 C5FDD16A420 for ; Wed, 8 Mar 2006 22:04:52 +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 776AC43D46 for ; Wed, 8 Mar 2006 22:04:52 +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 k28M4q2x047625 for ; Wed, 8 Mar 2006 22:04:52 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28M4qr5047622 for perforce@freebsd.org; Wed, 8 Mar 2006 22:04:52 GMT (envelope-from millert@freebsd.org) Date: Wed, 8 Mar 2006 22:04:52 GMT Message-Id: <200603082204.k28M4qr5047622@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 92995 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, 08 Mar 2006 22:04:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=92995 Change 92995 by millert@millert_g5tower on 2006/03/08 22:04:18 Add usage(), use err(3). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/mexec/mexec.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/mexec/mexec.c#3 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2006 SPARTA, Inc. * Copyright (c) 2004 Networks Associates Technology, Inc. * All rights reserved. * @@ -26,24 +27,35 @@ #include #include +#include +#include +#include #include +void +usage(void) +{ + extern char *__progname; + + fprintf(stderr, "usage: %s label command_path [command args]\n", + __progname); + exit(1); +} + int main(int argc, char *argv[]) { mac_t exl; - /* XXXRW: Shouldn't there be an (argc>=3) usage check here? */ - if (mac_prepare(&exl, "sebsd")) { - perror("mexec"); - return (1); - } - if (mac_from_text(&exl, argv[1])) { - perror(argv[1]); - return (1); - } - argv+=2; + if (argc < 3) + usage(); + + if (mac_prepare(&exl, "sebsd")) + err(1, "sebsd"); + if (mac_from_text(&exl, argv[1])) + err(1, argv[1]); + argv += 2; if (mac_execve(argv[0], argv, NULL, exl)) - perror("mexec"); - return (1); + perror(argv[0]); + exit(1); } From owner-p4-projects@FreeBSD.ORG Wed Mar 8 22:05:55 2006 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 D376616A424; Wed, 8 Mar 2006 22:05:54 +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 AF1D416A420 for ; Wed, 8 Mar 2006 22:05:54 +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 3789743D45 for ; Wed, 8 Mar 2006 22:05:54 +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 k28M5sbJ047805 for ; Wed, 8 Mar 2006 22:05:54 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28M5rrJ047802 for perforce@freebsd.org; Wed, 8 Mar 2006 22:05:53 GMT (envelope-from millert@freebsd.org) Date: Wed, 8 Mar 2006 22:05:53 GMT Message-Id: <200603082205.k28M5rrJ047802@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 92996 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, 08 Mar 2006 22:05:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=92996 Change 92996 by millert@millert_g5tower on 2006/03/08 22:05:25 Allow ipc between user_d and login_d to fix a problem when using tcsh as the login shell. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/rules#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/rules#8 (text+ko) ==== @@ -357,6 +357,7 @@ #logind rules allow_notify_ipc(login_d); allow_mach_ipc(lookupd_d,login_d); +allow_mach_ipc(user_d,login_d); # test rule to allow talking to unlabeled_t stuff allow_notify_ipc(unlabeled_t); From owner-p4-projects@FreeBSD.ORG Thu Mar 9 00:43:19 2006 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 2954F16A423; Thu, 9 Mar 2006 00:43: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 C6F9C16A420 for ; Thu, 9 Mar 2006 00:43:17 +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 1B19543D49 for ; Thu, 9 Mar 2006 00:43:17 +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 k290hG0g057612 for ; Thu, 9 Mar 2006 00:43:17 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 k290fnfV056558 for perforce@freebsd.org; Thu, 9 Mar 2006 00:41:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 00:41:49 GMT Message-Id: <200603090041.k290fnfV056558@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 93005 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, 09 Mar 2006 00:43:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=93005 Change 93005 by rwatson@rwatson_peppercorn on 2006/03/09 00:40:26 First pass attempt to update SEBSD through @92986 of the TrustedBSD MAC branch. Probably doesn't compile, and certainly doesn't run (yet). Affected files ... .. //depot/projects/trustedbsd/sebsd/COPYRIGHT#4 integrate .. //depot/projects/trustedbsd/sebsd/LOCKS#1 branch .. //depot/projects/trustedbsd/sebsd/MACREADME#4 branch .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#8 integrate .. //depot/projects/trustedbsd/sebsd/Makefile#12 integrate .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#12 integrate .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#1 branch .. //depot/projects/trustedbsd/sebsd/README#4 integrate .. //depot/projects/trustedbsd/sebsd/UPDATING#12 integrate .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/cp/extern.h#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#8 integrate .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.2#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/csh/config.h#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/csh/config_p.h#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv.h#1 branch .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv_stub.c#1 branch .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#8 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.1#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.1#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/extern.h#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#10 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#10 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/util.c#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#9 integrate .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.1#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/alias.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.h#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/arith_lex.l#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/bltin.h#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/builtins.def#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/error.c#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.h#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.h#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/histedit.c#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/mail.c#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/main.c#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.h#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/miscbltin.c#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/mkbuiltins#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/mkinit.c#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/mksyntax.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/options.c#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/output.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#8 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/show.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/trap.c#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/var.h#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sleep/sleep.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.8#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.8#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.1#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.8#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.8#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.8#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bc/bc/main.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/CHANGES#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/README#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/main.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/os.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.threads.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/configure.in#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/isc.color.gif#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/validate.sh.in#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/options#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3757.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3901.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4025.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4033.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4034.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4035.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4074.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4159.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/Makefile.in#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/api#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/config.h.in#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_after.h.in#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/getaddresses.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbt.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/api#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/print.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/strtoul.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/version#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/binutils/opcodes/sparc-opc.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/NEWS#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/TODO#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/VERSION#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.3#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.h#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpagent.3#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpclient.3#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmplib.3#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/support.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/oid-list#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/.gdbinit#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/config.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/export.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/main.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.config#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.3#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trap.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bzip2/bzip2.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/com_err/compile_et.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ABOUT-NLS#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/AUTHORS#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING.LIB#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ChangeLog#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cpio/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cpio/INSTALL#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/NEWS#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cpio/README#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cpio/THANKS#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/TODO#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/alloca.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyin.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyout.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copypass.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.1#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.texi#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpiohdr.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dirname.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.1#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.texi#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/error.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/extern.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filemode.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filetypes.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/global.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/idcache.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/alloca_.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-ba.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-eexst.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fs-xinl.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-help.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-namefrob.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-parse.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pv.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pvh.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-xinl.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/basename.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exit.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt1.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_int.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/gettext.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/localedir.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rmt.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rtapelib.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strcase.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/stripslash.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strnlen.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/system.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/unlocked-io.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc-die.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xmalloc.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/main.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/makepath.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rmt.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rtapelib.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/safe-stat.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyin.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyout.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copypass.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpio.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpiohdr.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filemode.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filetypes.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/global.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/idcache.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/main.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/makepath.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/safe-stat.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tarhdr.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/userspec.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/util.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/stripslash.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/system.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.c#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tarhdr.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/userspec.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/util.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/version.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xmalloc.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xstrdup.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/README#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_bsd.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_posix.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/parse.y#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/queue.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cvs/man/cvs.1#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/cvsbug.in#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/diff/diff.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/Makefile.in#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/attribs.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-decl.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-format.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-opts.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-parse.in#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-ppoutput.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-semantics.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-typeck.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c.opt#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/calls.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgrtl.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/combine.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/common.opt#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.gcc#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.in#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.h#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.md#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/qrnnd.asm#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-osf4#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-protos.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.md#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-netbsd#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-rtems#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-protos.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.h#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#8 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/cygwin1.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/darwin.h#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/emmintrin.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gthr-win32.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-modes.def#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-protos.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.h#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.md#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-rtems-i386#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xmmintrin.h#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-hpux#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix41.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix43.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix52.h#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.md#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/beos.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.asm#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/freebsd.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux-unwind.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux.h#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux64.h#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.md#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rtems.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.h#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.md#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4.h#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix43#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix52#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-linux64#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-newas#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rtems#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.md#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/tpf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.md#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/t-elf#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind-elf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-darwin#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-sld#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure.ac#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp-demangle.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/Make-lang.in#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/call.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/class.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.h#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cvt.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cxx-pretty-print.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl2.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/error.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/except.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/g++spec.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/init.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mangle.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/method.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/parser.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/pt.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/search.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/semantics.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/tree.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck2.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppfiles.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmacro.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/crtstuff.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cse.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dbxout.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/defaults.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/extend.texi#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gcc-common.texi#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/invoke.texi#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/md.texi#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/tm.texi#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/trouble.texi#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dojump.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/emit-rtl.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/explow.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expmed.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bld.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/malloc.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/news.texi#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flow.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fold-const.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov-io.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcse.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ginclude/stddef.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gthr-win32.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ifcvt.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/jump.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-darwin.ver#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-std.ver#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop-unroll.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mkheaders.in#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mklibgcc.in#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/objc/objc-act.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.def#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/postreload.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/predict.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/real.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reg-stack.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regclass.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regrename.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regs.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload1.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/rtl.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/sibcall.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/simplify-rtx.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target-def.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/toplev.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree-inline.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.h#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-compat.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/varasm.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/version.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/COPYING#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.115#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.116#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.117#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.118#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/FDL#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL.gen#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/LICENSE#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/MANIFEST#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/MORE.STUFF#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.ccpg#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.comm#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.cpg#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.in#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.init#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/NEWS#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROBLEMS#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROJECTS#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/README#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.MinGW#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.WIN32#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/REVISION#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/TODO#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure.ac#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/README#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file1#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file2#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/ChangeLog#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README_SH#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/TODO#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.man#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.sh#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer2.sh#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/ChangeLog#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/groff_mm.man#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/m.tmac#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/mmroff.pl#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/BUGS#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/ChangeLog#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/NEWS#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/TODO#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/copyright#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.mom#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/macros.mom#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typeset.mom#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/groff_mom.man#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/color.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docelement.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docprocessing.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/goodies.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/inlines.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/intro.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/refer.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/reserved.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/toc.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typesetting.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/using.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/om.tmac#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/ChangeLog#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/README#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/TODO#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/cover.ms#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.sh#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.in#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fdl.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fixinfo.sh#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-1#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-10#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-11#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-2#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-4#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-5#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-6#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-7#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-8#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-9#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.css#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.texinfo#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/meref.me#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/pic.ms#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/texinfo.tex#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/webpage.ms#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devdvi/generate/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/DESC.proto#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/R.proto#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AB#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ABI#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AI#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AR#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CBI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CLARENDON#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CORONET#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GBI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/MARIGOLD#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OBI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/S#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/SYMBOL#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TBI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRB#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRBI#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRI#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRR#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UBI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCBI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/WINGDINGS#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/generate/Makefile#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 9 01:20:05 2006 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 B1F3D16A423; Thu, 9 Mar 2006 01:20:04 +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 4E45316A420 for ; Thu, 9 Mar 2006 01:20:04 +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 EEEA543D4C for ; Thu, 9 Mar 2006 01:20:03 +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 k291K3Kg095872 for ; Thu, 9 Mar 2006 01:20:03 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 k291K3bL095869 for perforce@freebsd.org; Thu, 9 Mar 2006 01:20:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 01:20:03 GMT Message-Id: <200603090120.k291K3bL095869@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 93007 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, 09 Mar 2006 01:20:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=93007 Change 93007 by rwatson@rwatson_peppercorn on 2006/03/09 01:19:06 For reasons unknown, possibly the file was deleted and re-added, ppp in the SEBSD branch unnecessarily diverged from its parent branch. Forceably integrate and resolve it back to the parent branch contents. Affected files ... .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ppp#3 integrate Differences ... ==== //depot/projects/trustedbsd/sebsd/etc/rc.d/ppp#3 (text+ko) ==== @@ -1,67 +1,48 @@ #!/bin/sh # -# $NetBSD: ppp,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ppp,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.11 2005/10/29 05:00:25 yar Exp $ # # PROVIDE: ppp -# REQUIRE: mountcritremote syslogd -# BEFORE: SERVERS -# -# Note that this means that syslogd will not be listening on -# any PPP addresses. This is considered a feature. -# +# REQUIRE: netif isdnd +# KEYWORD: nojail . /etc/rc.subr name="ppp" -start_cmd="ppp_start" -stop_cmd="ppp_stop" -sig_stop="-INT" -sig_hup="-HUP" -hup_cmd="ppp_hup" -extra_commands="hup" +rcvar=`set_rcvar` +command="/usr/sbin/${name}" +start_precmd="ppp_precmd" +start_postcmd="ppp_postcmd" -ppp_start() +ppp_precmd() { - # /etc/ppp/peers and $ppp_peers contain boot configuration - # information for pppd. each value in $ppp_peers that has a - # file in /etc/ppp/peers of the same name, will be run as - # `pppd call '. + # Establish ppp mode. # - if [ -n "$ppp_peers" ]; then - set -- $ppp_peers - echo -n "Starting pppd:" - while [ $# -ge 1 ]; do - peer=$1 - shift - if [ -f /etc/ppp/peers/$peer ]; then - pppd call $peer - echo -n " $peer" - fi - done - echo "." + if [ "${ppp_mode}" != "ddial" -a "${ppp_mode}" != "direct" \ + -a "${ppp_mode}" != "dedicated" \ + -a "${ppp_mode}" != "background" ]; then + ppp_mode="auto" fi -} + + rc_flags="$rc_flags -quiet -${ppp_mode}" + + # Switch on NAT mode? + # + case ${ppp_nat} in + [Yy][Ee][Ss]) + rc_flags="$rc_flags -nat" + ;; + esac -ppp_hup() -{ - pids="`check_process pppd`" - if [ -n "$pids" ]; then - for pid in $pids; do - kill $sig_hup $pid - done - fi + rc_flags="$rc_flags ${ppp_profile}" } -ppp_stop() +ppp_postcmd() { - pids="`check_process pppd`" - if [ -n "$pids" ]; then - for pid in $pids; do - kill $sig_stop $pid - done - fi + # Re-Sync ipfilter so it picks up any new network interfaces + # + /etc/rc.d/ipfilter resync } load_rc_config $name From owner-p4-projects@FreeBSD.ORG Thu Mar 9 01:29:17 2006 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 4F3BB16A423; Thu, 9 Mar 2006 01:29: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 27D2D16A420 for ; Thu, 9 Mar 2006 01:29:16 +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 07DFD43D4C for ; Thu, 9 Mar 2006 01:29:15 +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 k291TEj8002351 for ; Thu, 9 Mar 2006 01:29:14 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 k291TE8J002345 for perforce@freebsd.org; Thu, 9 Mar 2006 01:29:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 01:29:14 GMT Message-Id: <200603090129.k291TE8J002345@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 93008 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, 09 Mar 2006 01:29:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=93008 Change 93008 by rwatson@rwatson_peppercorn on 2006/03/09 01:29:01 Temporarily disable label handling in mount due to it not being quite ready for nmount(). Affected files ... .. //depot/projects/trustedbsd/sebsd/sbin/mount/mount.c#14 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sbin/mount/mount.c#14 (text+ko) ==== @@ -458,7 +458,7 @@ int mountfs(const char *vfstype, const char *spec, const char *name, int flags, - const char *options, const char *mntopts) + const char *options, const char *mntopts, __unused const char *ltext) { char *argv[100]; struct statfs sf; @@ -500,11 +500,16 @@ mangle(optbuf, &argc, argv); argv[argc++] = strdup(spec); argv[argc++] = strdup(name); +#if 0 + /* + * XXXRW: Temporarily disabled due to nmount conversion. + */ if (ltext != NULL) { argv[argc++] = "-l"; argv[argc++] = ltext; } argv[argc] = NULL; +#endif if (debug) { (void)printf("exec: mount_%s", vfstype); @@ -519,7 +524,6 @@ } else { ret = mount_fs(vfstype, argc, argv); } -#endif free(optbuf); From owner-p4-projects@FreeBSD.ORG Thu Mar 9 02:05:24 2006 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 3CE8816A423; Thu, 9 Mar 2006 02:05:23 +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 A3C3B16A420; Thu, 9 Mar 2006 02:05:22 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from bastille.optimhosts.com (bastille.optimhosts.com [203.177.161.185]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D88343D49; Thu, 9 Mar 2006 02:05:17 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from localhost (bastille.local [127.0.0.1]) by bastille.optimhosts.com (Postfix) with ESMTP id AA7B68C8496; Thu, 9 Mar 2006 10:00:19 +0800 (PHT) Received: from bastille.optimhosts.com ([127.0.0.1]) by localhost (bastille.optimhosts.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 56440-02; Thu, 9 Mar 2006 09:59:39 +0800 (PHT) Received: from [192.168.2.106] (unknown [210.213.197.144]) by bastille.optimhosts.com (Postfix) with ESMTP id 451428C84A8; Thu, 9 Mar 2006 09:59:36 +0800 (PHT) From: Dingo To: Robert Watson In-Reply-To: <200603090041.k290fnfV056558@repoman.freebsd.org> References: <200603090041.k290fnfV056558@repoman.freebsd.org> Content-Type: text/plain Date: Thu, 09 Mar 2006 10:04:30 +0000 Message-Id: <1141898670.34657.10.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at bastille.optimhosts.com Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93005 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, 09 Mar 2006 02:05:24 -0000 Well this would bring us to a more current snapshot off of FreeBSD, Ill get to work on both Trees, though I need to "fix" the sebsd2 integration, I went with the email you sent, though John Baldwin replied to the integration and stated it should have been done from all the other TrustedBSD branches are branched from the 'trustedbsd' base branch in //depot/projects/trustedbsd/base/... For example, the audit3 branch's view is: View: //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... Wherease the sebsd2 branch's view is: View: //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... Though i see you have now synched the trustedbsd/base also so i need to change the view. and basically fix sebsd2. On Thu, 2006-03-09 at 00:41 +0000, Robert Watson wrote: > http://perforce.freebsd.org/chv.cgi?CH=93005 > > Change 93005 by rwatson@rwatson_peppercorn on 2006/03/09 00:40:26 > > First pass attempt to update SEBSD through @92986 of the TrustedBSD > MAC branch. Probably doesn't compile, and certainly doesn't run > (yet). > > Affected files ... > > .. //depot/projects/trustedbsd/sebsd/COPYRIGHT#4 integrate > .. //depot/projects/trustedbsd/sebsd/LOCKS#1 branch > .. //depot/projects/trustedbsd/sebsd/MACREADME#4 branch > .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#8 integrate > .. //depot/projects/trustedbsd/sebsd/Makefile#12 integrate > .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#12 integrate > .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#1 branch > .. //depot/projects/trustedbsd/sebsd/README#4 integrate > .. //depot/projects/trustedbsd/sebsd/UPDATING#12 integrate > .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/cp/extern.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#8 integrate > .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.2#4 integrate > .. //depot/projects/trustedbsd/sebsd/bin/csh/config.h#4 integrate > .. //depot/projects/trustedbsd/sebsd/bin/csh/config_p.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv.h#1 branch > .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv_stub.c#1 branch > .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#8 integrate > .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.1#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.1#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/ls/extern.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#10 integrate > .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#10 integrate > .. //depot/projects/trustedbsd/sebsd/bin/ls/util.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#9 integrate > .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.1#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/alias.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.h#4 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/arith_lex.l#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/bltin.h#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/builtins.def#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/error.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.h#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/histedit.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/mail.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/main.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.h#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/miscbltin.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/mkbuiltins#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/mkinit.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/mksyntax.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/options.c#4 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/output.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#8 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/show.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/trap.c#4 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/var.h#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sleep/sleep.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.8#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.8#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.1#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.8#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.8#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.8#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bc/bc/main.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/CHANGES#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ.xml#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Xlist#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/README#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.1#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dighost.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.1#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.1#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/Makefile.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/aclconf.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/client.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/control.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/client.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/log.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/main.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.5#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.docbook#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/query.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/server.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/os.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/update.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/xfrout.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/zoneconf.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.threads.in#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/configure.in#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/Makefile.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Makefile.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/isc.color.gif#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/validate.sh.in#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/options#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/index#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3757.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3901.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4025.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4033.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4034.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4035.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4074.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4159.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/Makefile.in#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/api#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/config.h.in#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure.in#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/support.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_after.h.in#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_before.h.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/api#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/check.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/getaddresses.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/adb.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/api#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/cache.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/forward.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/gen-unix.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/journal.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/key.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/message.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/name.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbt.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbtdb.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/resolver.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tkey.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tsig.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/validator.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/xfrin.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/zone.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/api#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/print.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/inet_pton.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/lfsr.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/mem.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/quota.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/result.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/rwlock.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/timer.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/entropy.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/net.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/os.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/socket.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/api#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/namedconf.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/Makefile.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/api#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getipnode.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwconfig.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/print.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/strtoul.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/make/rules.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/version#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/binutils/opcodes/sparc-opc.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/NEWS#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/TODO#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/VERSION#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.3#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.c#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.h#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpagent.3#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpclient.3#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmplib.3#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.c#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/support.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/oid-list#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/.gdbinit#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/config.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/export.c#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/main.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.config#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.3#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trap.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bzip2/bzip2.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/com_err/compile_et.1#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ABOUT-NLS#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/AUTHORS#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING.LIB#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ChangeLog#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/FREEBSD-upgrade#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/INSTALL#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/NEWS#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/README#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/THANKS#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/TODO#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/alloca.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyin.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyout.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copypass.c#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.1#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.texi#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpiohdr.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dirname.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.1#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.texi#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/error.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/extern.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filemode.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filetypes.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/global.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/idcache.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/alloca_.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-ba.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-eexst.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fs-xinl.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-help.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-namefrob.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-parse.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pv.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pvh.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-xinl.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/basename.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exit.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt1.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_int.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/gettext.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/localedir.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rmt.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rtapelib.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strcase.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/stripslash.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strnlen.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/system.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/unlocked-io.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc-die.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xmalloc.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/main.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/makepath.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rmt.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rtapelib.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/safe-stat.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyin.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyout.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copypass.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpio.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpiohdr.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/extern.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filemode.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filetypes.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/global.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/idcache.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/main.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/makepath.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/safe-stat.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tarhdr.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/userspec.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/util.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/stripslash.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/system.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.c#3 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tarhdr.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/userspec.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/util.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/version.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xmalloc.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xstrdup.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/README#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_bsd.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_posix.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/parse.y#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/queue.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cvs/man/cvs.1#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/cvsbug.in#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/diff/diff.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/Makefile.in#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/attribs.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-decl.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-format.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-opts.c#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-parse.in#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-ppoutput.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-semantics.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-typeck.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c.opt#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/calls.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgrtl.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/combine.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/common.opt#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.gcc#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.in#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.h#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.md#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/qrnnd.asm#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-osf4#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-protos.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.md#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-netbsd#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-rtems#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-protos.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.h#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#8 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/cygwin1.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/darwin.h#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/emmintrin.h#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gthr-win32.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-modes.def#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-protos.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.h#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.md#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-rtems-i386#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xmmintrin.h#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-hpux#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix41.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix43.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix52.h#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.md#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/beos.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.asm#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/freebsd.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux-unwind.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux.h#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux64.h#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.md#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rtems.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.h#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.md#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4.h#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix43#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix52#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-linux64#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-newas#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rtems#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.md#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/tpf.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.md#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/t-elf#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind-elf#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-darwin#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-sld#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure.ac#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp-demangle.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/Make-lang.in#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/call.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/class.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.h#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cvt.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cxx-pretty-print.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl2.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/error.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/except.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/g++spec.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/init.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mangle.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/method.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/name-lookup.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/parser.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/pt.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/search.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/semantics.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/tree.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck2.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppfiles.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmacro.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/crtstuff.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cse.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dbxout.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/defaults.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/extend.texi#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gcc-common.texi#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/invoke.texi#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/md.texi#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/tm.texi#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/trouble.texi#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dojump.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/emit-rtl.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/explow.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expmed.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bld.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/malloc.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/news.texi#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flow.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fold-const.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov-io.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcse.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ginclude/stddef.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gthr-win32.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ifcvt.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/jump.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-darwin.ver#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-std.ver#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop-unroll.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mkheaders.in#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mklibgcc.in#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/objc/objc-act.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.def#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/postreload.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/predict.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/real.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reg-stack.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regclass.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regrename.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regs.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload1.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/rtl.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/sibcall.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/simplify-rtx.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target-def.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/toplev.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree-inline.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.h#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-compat.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/varasm.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/version.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/COPYING#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.115#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.116#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.117#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.118#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/FDL#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/FREEBSD-upgrade#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL.gen#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/LICENSE#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/MANIFEST#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/MORE.STUFF#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.ccpg#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.comm#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.cpg#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.in#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.init#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.sub#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/NEWS#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROBLEMS#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROJECTS#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/README#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.MinGW#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.WIN32#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/REVISION#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/TODO#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/aclocal.m4#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure.ac#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/README#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file1#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file2#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/ChangeLog#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/Makefile.sub#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README_SH#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/TODO#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.man#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.sh#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer2.sh#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/ChangeLog#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/groff_mm.man#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/m.tmac#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/mmroff.pl#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/BUGS#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/ChangeLog#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/Makefile.sub#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/NEWS#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/TODO#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/copyright#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.mom#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/macros.mom#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typeset.mom#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/groff_mom.man#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/color.html#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docelement.html#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docprocessing.html#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/goodies.html#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/inlines.html#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/intro.html#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/refer.html#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/reserved.html#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/toc.html#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typesetting.html#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/using.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/om.tmac#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/ChangeLog#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/README#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/TODO#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/cover.ms#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.sh#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.in#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.sub#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fdl.texi#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fixinfo.sh#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-1#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-10#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-11#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-2#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-3#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-4#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-5#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-6#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-7#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-8#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-9#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.css#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.texinfo#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/meref.me#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/pic.ms#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/texinfo.tex#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/webpage.ms#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devdvi/generate/Makefile#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/DESC.proto#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/Makefile.sub#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/R.proto#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AB#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ABI#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AI#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AR#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CBI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CLARENDON#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CORONET#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GBI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/MARIGOLD#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/Makefile.sub#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OBI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/S#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/SYMBOL#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TBI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRB#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRBI#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRI#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRR#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UBI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCBI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/WINGDINGS#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/generate/Makefile#2 integrate > > >>> TRUNCATED FOR MAIL (1000 lines) <<< > _______________________________________________ > trustedbsd-cvs@FreeBSD.org mailing list > http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs > To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" From owner-p4-projects@FreeBSD.ORG Thu Mar 9 02:25:35 2006 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 987C916A422; Thu, 9 Mar 2006 02:25: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 45FFC16A423 for ; Thu, 9 Mar 2006 02:25:34 +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 9EBC643D48 for ; Thu, 9 Mar 2006 02:25:24 +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 k292PO2d047659 for ; Thu, 9 Mar 2006 02:25:24 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 k292POSt047656 for perforce@freebsd.org; Thu, 9 Mar 2006 02:25:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 02:25:24 GMT Message-Id: <200603090225.k292POSt047656@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 93011 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, 09 Mar 2006 02:25:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=93011 Change 93011 by rwatson@rwatson_peppercorn on 2006/03/09 02:24:57 Move __mac_get_fs() to the bottom of the system call table so as not to conflict with other allocated system calls now merged from FreeBSD. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/init_sysent.c#18 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.c#19 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.master#18 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/syscall.h#19 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/syscall.mk#19 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/sysproto.h#19 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/init_sysent.c#18 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.210 2006/03/01 06:49:38 davidxu Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp */ @@ -494,4 +494,5 @@ { SYF_MPSAFE | AS(kmq_unlink_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 462 = kmq_unlink */ { SYF_MPSAFE | AS(abort2_args), (sy_call_t *)abort2, AUE_NULL }, /* 463 = abort2 */ { SYF_MPSAFE | AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL }, /* 464 = thr_set_name */ + { SYF_MPSAFE | AS(__mac_get_fs_args), (sy_call_t *)__mac_get_fs, AUE_NULL }, /* 465 = __mac_get_fs */ }; ==== //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.c#19 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.194 2006/03/01 06:49:38 davidxu Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp */ @@ -472,4 +472,5 @@ "kmq_unlink", /* 462 = kmq_unlink */ "abort2", /* 463 = abort2 */ "thr_set_name", /* 464 = thr_set_name */ + "__mac_get_fs", /* 465 = __mac_get_fs */ }; ==== //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.master#18 (text+ko) ==== @@ -798,8 +798,6 @@ long id, void *uaddr, void *uaddr2); } 455 AUE_NULL MSTD { int thr_new(struct thr_param *param, \ int param_size); } -456 AUE_NULL MSTD { int __mac_get_fs(const char *path_p, \ - struct mac *mac_p); } 456 AUE_NULL MSTD { int sigqueue(pid_t pid, int signum, void *value); } 457 AUE_NULL MNOSTD { int kmq_open(const char *path, int flags, \ mode_t mode, const struct mq_attr *attr); } @@ -819,5 +817,7 @@ 462 AUE_NULL MNOSTD { int kmq_unlink(const char *path); } 463 AUE_NULL MSTD { int abort2(const char *why, int nargs, void **args); } 464 AUE_NULL MSTD { int thr_set_name(long id, const char *name); } +465 AUE_NULL MSTD { int __mac_get_fs(const char *path_p, \ + struct mac *mac_p); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/trustedbsd/sebsd/sys/sys/syscall.h#19 (text+ko) ==== @@ -2,6 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp */ @@ -387,4 +388,5 @@ #define SYS_kmq_unlink 462 #define SYS_abort2 463 #define SYS_thr_set_name 464 -#define SYS_MAXSYSCALL 465 +#define SYS___mac_get_fs 465 +#define SYS_MAXSYSCALL 466 ==== //depot/projects/trustedbsd/sebsd/sys/sys/syscall.mk#19 (text+ko) ==== @@ -1,6 +1,6 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.146 2006/03/01 06:49:38 davidxu Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp MIASM = \ syscall.o \ @@ -329,4 +329,5 @@ kmq_notify.o \ kmq_unlink.o \ abort2.o \ - thr_set_name.o + thr_set_name.o \ + __mac_get_fs.o ==== //depot/projects/trustedbsd/sebsd/sys/sys/sysproto.h#19 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.191 2006/03/01 06:49:38 davidxu Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp */ @@ -1443,6 +1443,10 @@ char id_l_[PADL_(long)]; long id; char id_r_[PADR_(long)]; char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)]; }; +struct __mac_get_fs_args { + char path_p_l_[PADL_(const char *)]; const char * path_p; char path_p_r_[PADR_(const char *)]; + char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1769,6 +1773,7 @@ int kmq_unlink(struct thread *, struct kmq_unlink_args *); int abort2(struct thread *, struct abort2_args *); int thr_set_name(struct thread *, struct thr_set_name_args *); +int __mac_get_fs(struct thread *, struct __mac_get_fs_args *); #ifdef COMPAT_43 From owner-p4-projects@FreeBSD.ORG Thu Mar 9 05:38:17 2006 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 57F0316A423; Thu, 9 Mar 2006 05:38: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 17C0D16A420 for ; Thu, 9 Mar 2006 05:38:17 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D41B343D46 for ; Thu, 9 Mar 2006 05:38:16 +0000 (GMT) (envelope-from kmacy@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 k295cGMO061992 for ; Thu, 9 Mar 2006 05:38:16 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k295cGr6061989 for perforce@freebsd.org; Thu, 9 Mar 2006 05:38:16 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 9 Mar 2006 05:38:16 GMT Message-Id: <200603090538.k295cGr6061989@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93013 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, 09 Mar 2006 05:38:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=93013 Change 93013 by kmacy@kmacy_storage:sun4v_work on 2006/03/09 05:38:08 changes to support running on solaris' UFS Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_vfsops.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/fs.h#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_vfsops.c#3 (text+ko) ==== @@ -893,8 +893,10 @@ if (fs->fs_magic == FS_UFS1_MAGIC && fs->fs_old_inodefmt < FS_44INODEFMT) { fs->fs_maxfilesize = ((uint64_t)1 << 31) - 1; +#ifndef SIMULATOR fs->fs_qbmask = ~fs->fs_bmask; fs->fs_qfmask = ~fs->fs_fmask; +#endif } if (fs->fs_magic == FS_UFS1_MAGIC) { ump->um_savedmaxfilesize = fs->fs_maxfilesize; ==== //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/fs.h#3 (text+ko) ==== @@ -33,6 +33,8 @@ #ifndef _UFS_FFS_FS_H_ #define _UFS_FFS_FS_H_ +#include "opt_simulator.h" + /* * Each disk drive contains some number of filesystems. * A filesystem consists of a number of cylinder groups. @@ -246,6 +248,11 @@ int64_t cs_spare[3]; /* future expansion */ }; +#ifdef SIMULATOR +typedef struct _quad { int val[2]; } squad_t; +#endif + + /* * Super block for an FFS filesystem. */ @@ -342,11 +349,19 @@ int32_t fs_maxsymlinklen; /* max length of an internal symlink */ int32_t fs_old_inodefmt; /* format of on-disk inodes */ u_int64_t fs_maxfilesize; /* maximum representable file size */ +#ifdef SIMULATOR + uint32_t junk; + squad_t fs_qbmask; /* ~fs_bmask for use with 64-bit size */ + squad_t fs_qfmask; /* ~fs_fmask for use with 64-bit size */ +#else int64_t fs_qbmask; /* ~fs_bmask for use with 64-bit size */ int64_t fs_qfmask; /* ~fs_fmask for use with 64-bit size */ +#endif int32_t fs_state; /* validate fs_clean field */ int32_t fs_old_postblformat; /* format of positional layout tables */ +#ifndef SIMULATOR int32_t fs_old_nrpos; /* number of rotational positions */ +#endif int32_t fs_spare5[2]; /* old fs_postbloff */ /* old fs_rotbloff */ int32_t fs_magic; /* magic number */ @@ -546,10 +561,17 @@ * quantities by using shifts and masks in place of divisions * modulos and multiplications. */ +#ifdef SIMULATOR #define blkoff(fs, loc) /* calculates (loc % fs->fs_bsize) */ \ + ((loc) & ((fs)->fs_qbmask.val[0] | (fs)->fs_qbmask.val[1])) +#define fragoff(fs, loc) /* calculates (loc % fs->fs_fsize) */ \ + ((loc) & ((fs)->fs_qfmask.val[0] | (fs)->fs_qfmask.val[1])) +#else +#define blkoff(fs, loc) /* calculates (loc % fs->fs_bsize) */ \ ((loc) & (fs)->fs_qbmask) #define fragoff(fs, loc) /* calculates (loc % fs->fs_fsize) */ \ ((loc) & (fs)->fs_qfmask) +#endif #define lfragtosize(fs, frag) /* calculates ((off_t)frag * fs->fs_fsize) */ \ (((off_t)(frag)) << (fs)->fs_fshift) #define lblktosize(fs, blk) /* calculates ((off_t)blk * fs->fs_bsize) */ \ @@ -561,10 +583,17 @@ ((loc) >> (fs)->fs_bshift) #define numfrags(fs, loc) /* calculates (loc / fs->fs_fsize) */ \ ((loc) >> (fs)->fs_fshift) +#ifdef SIMULATOR #define blkroundup(fs, size) /* calculates roundup(size, fs->fs_bsize) */ \ + (((size) + ((fs)->fs_qbmask.val[0] | (fs)->fs_qbmask.val[1])) & (fs)->fs_bmask) +#define fragroundup(fs, size) /* calculates roundup(size, fs->fs_fsize) */ \ + (((size) + ((fs)->fs_qfmask.val[0] | (fs)->fs_qfmask.val[1])) & (fs)->fs_fmask) +#else +#define blkroundup(fs, size) /* calculates roundup(size, fs->fs_bsize) */ \ (((size) + (fs)->fs_qbmask) & (fs)->fs_bmask) #define fragroundup(fs, size) /* calculates roundup(size, fs->fs_fsize) */ \ (((size) + (fs)->fs_qfmask) & (fs)->fs_fmask) +#endif #define fragstoblks(fs, frags) /* calculates (frags / fs->fs_frag) */ \ ((frags) >> (fs)->fs_fragshift) #define blkstofrags(fs, blks) /* calculates (blks * fs->fs_frag) */ \ From owner-p4-projects@FreeBSD.ORG Thu Mar 9 05:39:20 2006 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 51C7B16A423; Thu, 9 Mar 2006 05:39:20 +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 13FF916A420 for ; Thu, 9 Mar 2006 05:39:20 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C5F2F43D48 for ; Thu, 9 Mar 2006 05:39:18 +0000 (GMT) (envelope-from kmacy@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 k295dInG062025 for ; Thu, 9 Mar 2006 05:39:18 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k295dImG062022 for perforce@freebsd.org; Thu, 9 Mar 2006 05:39:18 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 9 Mar 2006 05:39:18 GMT Message-Id: <200603090539.k295dImG062022@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93014 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, 09 Mar 2006 05:39:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=93014 Change 93014 by kmacy@kmacy_storage:sun4v_work on 2006/03/09 05:38:25 hacked up loader for booting off of solaris' UFS Affected files ... .. //depot/projects/kmacy_sun4v/src/lib/libstand/ufs.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/lib/libstand/ufs.c#3 (text+ko) ==== @@ -81,6 +81,7 @@ #include #include #include +#include #include #include #include @@ -110,6 +111,134 @@ ufs_readdir }; +typedef int32_t daddr32_t; +typedef int32_t time32_t; +typedef unsigned char uchar_t; +#define MAXCSBUFS 32 +typedef struct _quad { int val[2]; } squad_t; +struct solaris_fs { + uint32_t fs_link; /* linked list of file systems */ + uint32_t fs_rolled; /* logging only: fs fully rolled */ + daddr32_t fs_sblkno; /* addr of super-block in filesys */ + daddr32_t fs_cblkno; /* offset of cyl-block in filesys */ + daddr32_t fs_iblkno; /* offset of inode-blocks in filesys */ + daddr32_t fs_dblkno; /* offset of first data after cg */ + int32_t fs_cgoffset; /* cylinder group offset in cylinder */ + int32_t fs_cgmask; /* used to calc mod fs_ntrak */ + time32_t fs_time; /* last time written */ + int32_t fs_size; /* number of blocks in fs */ + int32_t fs_dsize; /* number of data blocks in fs */ + int32_t fs_ncg; /* number of cylinder groups */ + int32_t fs_bsize; /* size of basic blocks in fs */ + int32_t fs_fsize; /* size of frag blocks in fs */ + int32_t fs_frag; /* number of frags in a block in fs */ +/* these are configuration parameters */ + int32_t fs_minfree; /* minimum percentage of free blocks */ + int32_t fs_rotdelay; /* num of ms for optimal next block */ + int32_t fs_rps; /* disk revolutions per second */ +/* these fields can be computed from the others */ + int32_t fs_bmask; /* ``blkoff'' calc of blk offsets */ + int32_t fs_fmask; /* ``fragoff'' calc of frag offsets */ + int32_t fs_bshift; /* ``lblkno'' calc of logical blkno */ + int32_t fs_fshift; /* ``numfrags'' calc number of frags */ +/* these are configuration parameters */ + int32_t fs_maxcontig; /* max number of contiguous blks */ + int32_t fs_maxbpg; /* max number of blks per cyl group */ +/* these fields can be computed from the others */ + int32_t fs_fragshift; /* block to frag shift */ + int32_t fs_fsbtodb; /* fsbtodb and dbtofsb shift constant */ + int32_t fs_sbsize; /* actual size of super block */ + int32_t fs_csmask; /* csum block offset */ + int32_t fs_csshift; /* csum block number */ + int32_t fs_nindir; /* value of NINDIR */ + int32_t fs_inopb; /* value of INOPB */ + int32_t fs_nspf; /* value of NSPF */ +/* yet another configuration parameter */ + int32_t fs_optim; /* optimization preference, see below */ +/* these fields are derived from the hardware */ + /* USL SVR4 compatibility */ +#ifdef _LITTLE_ENDIAN + /* + * USL SVR4 compatibility + * + * There was a significant divergence here between Solaris and + * SVR4 for x86. By swapping these two members in the superblock, + * we get read-only compatibility of SVR4 filesystems. Otherwise + * there would be no compatibility. This change was introduced + * during bootstrapping of Solaris on x86. By making this ifdef'ed + * on byte order, we provide ongoing compatibility across all + * platforms with the same byte order, the highest compatibility + * that can be achieved. + */ + int32_t fs_state; /* file system state time stamp */ +#else + int32_t fs_npsect; /* # sectors/track including spares */ +#endif + int32_t fs_si; /* summary info state - lufs only */ + int32_t fs_trackskew; /* sector 0 skew, per track */ +/* a unique id for this filesystem (currently unused and unmaintained) */ +/* In 4.3 Tahoe this space is used by fs_headswitch and fs_trkseek */ +/* Neither of those fields is used in the Tahoe code right now but */ +/* there could be problems if they are. */ + int32_t fs_id[2]; /* file system id */ +/* sizes determined by number of cylinder groups and their sizes */ + daddr32_t fs_csaddr; /* blk addr of cyl grp summary area */ + int32_t fs_cssize; /* size of cyl grp summary area */ + int32_t fs_cgsize; /* cylinder group size */ +/* these fields are derived from the hardware */ + int32_t fs_ntrak; /* tracks per cylinder */ + int32_t fs_nsect; /* sectors per track */ + int32_t fs_spc; /* sectors per cylinder */ +/* this comes from the disk driver partitioning */ + int32_t fs_ncyl; /* cylinders in file system */ +/* these fields can be computed from the others */ + int32_t fs_cpg; /* cylinders per group */ + int32_t fs_ipg; /* inodes per group */ + int32_t fs_fpg; /* blocks per group * fs_frag */ +/* this data must be re-computed after crashes */ + struct csum fs_cstotal; /* cylinder summary information */ +/* these fields are cleared at mount time */ + char fs_fmod; /* super block modified flag */ + char fs_clean; /* file system state flag */ + char fs_ronly; /* mounted read-only flag */ + char fs_flags; /* largefiles flag, etc. */ + char fs_fsmnt[512]; /* name mounted on */ +/* these fields retain the current block allocation info */ + int32_t fs_cgrotor; /* last cg searched */ + /* + * The following used to be fs_csp[MAXCSBUFS]. It was not + * used anywhere except in old utilities. We removed this + * in 5.6 and expect fs_u.fs_csp to be used instead. + * We no longer limit fs_cssize based on MAXCSBUFS. + */ + union { /* fs_cs (csum) info */ + uint32_t fs_csp_pad[MAXCSBUFS]; + struct csum *fs_csp; + } fs_u; + int32_t fs_cpc; /* cyl per cycle in postbl */ + short fs_opostbl[16*8]; /* old rotation block list head */ + int32_t fs_sparecon[51]; /* reserved for future constants */ + int32_t fs_version; /* minor version of MTB ufs */ + int32_t fs_logbno; /* block # of embedded log */ + int32_t fs_reclaim; /* reclaim open, deleted files */ + int32_t fs_sparecon2; /* reserved for future constant */ +#ifdef _LITTLE_ENDIAN + /* USL SVR4 compatibility */ + int32_t fs_npsect; /* # sectors/track including spares */ +#else + int32_t fs_state; /* file system state time stamp */ +#endif + squad_t fs_qbmask; /* ~fs_bmask - for use with quad size */ + squad_t fs_qfmask; /* ~fs_fmask - for use with quad size */ + int32_t fs_postblformat; /* format of positional layout tables */ + int32_t fs_nrpos; /* number of rotaional positions */ + int32_t fs_postbloff; /* (short) rotation block list head */ + int32_t fs_rotbloff; /* (uchar_t) blocks for each rotation */ + int32_t fs_magic; /* magic number */ + uchar_t fs_space[1]; /* list of blocks for each rotation */ +/* actually longer */ +}; + /* * In-core open file. */ @@ -142,7 +271,49 @@ static int buf_write_file(struct open_file *, char *, size_t *); static int search_directory(char *, struct open_file *, ino_t *); + /* + * Search a directory for a name and return its + * i_number. + */ + +static void hdump(uint8_t *bp, int size) +{ + int i; + int f = 1; + uint8_t tmp[17]; + + tmp[16] = '\0'; + + for (i=0; i126) c='.'; + tmp[i&15] = c; + + if ((i&15)==15) { + printf(" : %s\n", tmp); + f=1; + } + } + if (!f) { + for (i=(i&15); i<16; i++) { + printf(" --"); + tmp[i]=' '; + } + printf(" : %s\n", tmp); + } +} + + +/* * Read a new inode into a file structure. */ static int @@ -159,6 +330,11 @@ if (fs == NULL) panic("fs == NULL"); + printf("read_inode : inumber=0x%llx fsba=0x%llx dba=0x%llx\n", + (uint64_t)inumber, + (uint64_t)ino_to_fsba(fs, inumber), + (uint64_t)fsbtodb(fs, ino_to_fsba(fs, inumber)) ); + /* * Read inode and save it. */ @@ -327,6 +503,7 @@ file_block = lblkno(fs, fp->f_seekp); block_size = sblksize(fs, DIP(fp, di_size), file_block); + rc = block_map(f, file_block, &disk_block); if (rc) return (rc); @@ -393,6 +570,7 @@ struct file *fp = (struct file *)f->f_fsdata; struct fs *fs = fp->f_fs; long off; + size_t file_size; ufs_lbn_t file_block; ufs2_daddr_t disk_block; size_t block_size; @@ -400,8 +578,24 @@ off = blkoff(fs, fp->f_seekp); file_block = lblkno(fs, fp->f_seekp); - block_size = sblksize(fs, DIP(fp, di_size), file_block); + file_size = DIP(fp, di_size); + block_size = sblksize(fs, file_size, file_block); +#if 0 + printf("buf_read_file: fs->f_seekp=0x%llx : off=0x%lx : file_block=0x%lx : block_size=0x%llx\n", + (uint64_t)fp->f_seekp, off, file_block, (uint64_t)block_size); + printf("\tfile_size=0x%llx : fs_bsize=0x%llx\n", (uint64_t)file_size, (uint64_t)fs->fs_bsize); + printf("fragroundup[blkoff[%lld]=%lld]=%lld\n", file_size, blkoff(fs, file_size), + fragroundup(fs, blkoff(fs, file_size))); + printf("fs->fs_qbmask=%llx fs->fs_qfmask=%llx fs->fs_fmask=%lx\n", fs->fs_qbmask, fs->fs_qfmask, fs->fs_fmask); +#endif + if (block_size > 8192) { + block_size=8192; + printf("FORCE ROUND block_size\n"); + } +#if 0 + printf("\tfp->f_buf_blkno = 0x%lx\n", fp->f_buf_blkno); +#endif if (file_block != fp->f_buf_blkno) { if (fp->f_buf == (char *)0) fp->f_buf = malloc(fs->fs_bsize); @@ -409,17 +603,27 @@ rc = block_map(f, file_block, &disk_block); if (rc) return (rc); - +#if 0 + printf("\tblock_map : disk_block = 0x%lx\n", disk_block); +#endif if (disk_block == 0) { bzero(fp->f_buf, block_size); fp->f_buf_size = block_size; } else { twiddle(); +#if 0 + printf("\tcalling dev_strategy for block read fsbtodb[0x%lx]=0x%lx\n", + disk_block, fsbtodb(fs, disk_block)); +#endif rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, fsbtodb(fs, disk_block), block_size, fp->f_buf, &fp->f_buf_size); if (rc) return (rc); +#if 0 + printf("\treturned from block read with 0x%lx bytes\n", fp->f_buf_size); + hdump(fp->f_buf, fp->f_buf_size); +#endif } fp->f_buf_blkno = file_block; @@ -442,10 +646,35 @@ return (0); } -/* - * Search a directory for a name and return its - * i_number. - */ +static void +test_disk(struct open_file *f) +{ + int i, rc; + char *buf; + uint64_t read_size; + + struct file *fp = (struct file *)f->f_fsdata; + struct fs *fs = fp->f_fs; + + buf = (char *)malloc(512); + + for (i = 0; i < 10; i++) { + rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, + fsbtodb(fs, i), + 512, buf, &read_size); + + + if (rc || read_size != 512) + printf("strategy failed\n"); + printf("%04d\n", i); +#if 0 + hdump(buf, 512); +#endif + + } + +} + static int search_directory(name, f, inumber_p) char *name; @@ -459,18 +688,33 @@ size_t buf_size; int namlen, length; int rc; +#if 0 + test_disk(f); +#endif + length = strlen(name); - length = strlen(name); + printf("search_directory: name=%s\n", name); fp->f_seekp = 0; while (fp->f_seekp < DIP(fp, di_size)) { + int i; rc = buf_read_file(f, &buf, &buf_size); if (rc) return (rc); + printf("scan directory entries: @ 0x%llx (size=0x%llx)\n", + (uint64_t)buf, (uint64_t)buf_size); dp = (struct direct *)buf; edp = (struct direct *)(buf + buf_size); + i = 0; +#if 0 + hdump(buf, buf_size); +#endif while (dp < edp) { +#if 0 + printf("\tdirent# %d (dp=0x%llx edp=0x%llx\n", i, + (uint64_t)dp, (uint64_t)edp); +#endif if (dp->d_ino == (ino_t)0) goto next; #if BYTE_ORDER == LITTLE_ENDIAN @@ -479,6 +723,9 @@ else #endif namlen = dp->d_namlen; +#if 0 + printf("namlen: %d dp->d_name: %s\n", namlen, dp->d_name); +#endif if (namlen == length && !strcmp(name, dp->d_name)) { /* found entry */ @@ -487,6 +734,7 @@ } next: dp = (struct direct *)((char *)dp + dp->d_reclen); + i++; } fp->f_seekp += buf_size; } @@ -494,7 +742,31 @@ } static int sblock_try[] = SBLOCKSEARCH; +#define SOLARIS_SBLOCK_CONVERT 1 +void map_sblock(struct fs *fsp) +{ + struct solaris_fs sfs = *(struct solaris_fs *)fsp; + + printf("fbsd fs_qfmask offset %lx solaris fs_qfmask offset %lx\n", + offsetof(struct fs, fs_qfmask), offsetof(struct solaris_fs, fs_qfmask)); + printf("fbsd fs_qbmask offset %lx solaris fs_qbmask offset %lx\n", + offsetof(struct fs, fs_qbmask), offsetof(struct solaris_fs, fs_qbmask)); + + printf(" fsp->fs_qbmask: %llx = sfs.fs_qbmask %08lx%08lx;\n", + fsp->fs_qbmask, sfs.fs_qbmask.val[0], sfs.fs_qbmask.val[1]); + fsp->fs_qbmask = ((uint64_t)sfs.fs_qbmask.val[0]) << 32 | sfs.fs_qbmask.val[1]; + printf(" fsp->fs_qfmask: %llx = sfs.fs_qfmask %08lx%08lx;\n", + fsp->fs_qfmask, sfs.fs_qfmask.val[0], sfs.fs_qfmask.val[1]); + fsp->fs_qfmask = ((uint64_t)sfs.fs_qfmask.val[0]) << 32 | sfs.fs_qfmask.val[1]; + +} + + + + + + /* * Open a file. */ @@ -533,6 +805,16 @@ (char *)fs, &buf_size); if (rc) goto out; + + + + +#if 0 + printf("fs->fs_magic: %x fs->fs_bsize: %x fs->fs_sblockloc: %lx\n", + fs->fs_magic, fs->fs_bsize, fs->fs_sblockloc); + printf("sblock_try[i]: %x buf_size %lx\n", + sblock_try[i], buf_size); +#endif if ((fs->fs_magic == FS_UFS1_MAGIC || (fs->fs_magic == FS_UFS2_MAGIC && fs->fs_sblockloc == sblock_try[i])) && @@ -545,6 +827,9 @@ rc = EINVAL; goto out; } +#if 1 + map_sblock(fs); +#endif /* * Calculate indirect block levels. */ @@ -560,9 +845,13 @@ } inumber = ROOTINO; - if ((rc = read_inode(inumber, f)) != 0) - goto out; + if ((rc = read_inode(inumber, f)) != 0) { + printf("failed to read root inode \n"); + goto out; + } + printf("read root inode \n"); + cp = path = strdup(upath); if (path == NULL) { rc = ENOMEM; @@ -609,6 +898,8 @@ * symbolic link. */ parent_inumber = inumber; + printf("-- searching %s @ inode = 0x%x - found @ 0x%x\n", + ncp, parent_inumber, inumber); rc = search_directory(ncp, f, &inumber); *cp = c; if (rc) From owner-p4-projects@FreeBSD.ORG Thu Mar 9 06:06:53 2006 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 8FD9216A423; Thu, 9 Mar 2006 06:06: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 4F5ED16A420 for ; Thu, 9 Mar 2006 06:06:52 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B33643D46 for ; Thu, 9 Mar 2006 06:06:52 +0000 (GMT) (envelope-from soc-andrew@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 k2966p21063051 for ; Thu, 9 Mar 2006 06:06:52 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2966pUD063048 for perforce@freebsd.org; Thu, 9 Mar 2006 06:06:51 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 9 Mar 2006 06:06:51 GMT Message-Id: <200603090606.k2966pUD063048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 93015 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, 09 Mar 2006 06:06:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=93015 Change 93015 by soc-andrew@soc-andrew_serv on 2006/03/09 06:06:40 Remove /usr/bin/bsdlua from being built as we now install from the package Affected files ... .. //depot/projects/soc2005/bsdinstaller/scripts/build_patch.sh#11 edit .. //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#5 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/scripts/build_patch.sh#11 (text+ko) ==== @@ -3,10 +3,10 @@ # Script to create a patch and tarballs of files to use in release(7) # The files to diff -FILES="Makefile.inc1 lib/Makefile libexec/Makefile usr.bin/Makefile usr.sbin/Makefile release/Makefile share/Makefile etc/mtree/BSD.usr.dist" +FILES="Makefile.inc1 lib/Makefile libexec/Makefile usr.sbin/Makefile release/Makefile share/Makefile etc/mtree/BSD.usr.dist" # Dir's to create a tarball of:name for tarball -DIRS="contrib/bsdinstaller:base_bsdinstaller contrib/lua:base_lua lib/bsdinstaller:lib_bsdinstaller lib/lua:lib_lua libexec/bsdinstaller:libexec usr.bin/lua:usr_bin usr.sbin/bsdinstaller:usr_sbin release/bsdinstaller:release share/bsdinstaller:share sys/i386/conf/NOPREEMPTION:sys" +DIRS="contrib/bsdinstaller:base_bsdinstaller contrib/lua:base_lua lib/bsdinstaller:lib_bsdinstaller lib/lua:lib_lua libexec/bsdinstaller:libexec usr.sbin/bsdinstaller:usr_sbin release/bsdinstaller:release share/bsdinstaller:share sys/i386/conf/NOPREEMPTION:sys" VENDOR="//depot/vendor/freebsd/src" BSDINS="//depot/projects/soc2005/bsdinstaller/src" ==== //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#5 (text+ko) ==== @@ -107,7 +107,6 @@ look \ lorder \ lsvfs \ - lua \ m4 \ mail \ make \ From owner-p4-projects@FreeBSD.ORG Thu Mar 9 06:08:56 2006 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 A988916A423; Thu, 9 Mar 2006 06:08:55 +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 6D89A16A420 for ; Thu, 9 Mar 2006 06:08:55 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 29C5E43D45 for ; Thu, 9 Mar 2006 06:08:55 +0000 (GMT) (envelope-from soc-andrew@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 k2968twA063102 for ; Thu, 9 Mar 2006 06:08:55 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2968sov063099 for perforce@freebsd.org; Thu, 9 Mar 2006 06:08:54 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 9 Mar 2006 06:08:54 GMT Message-Id: <200603090608.k2968sov063099@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 93016 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, 09 Mar 2006 06:08:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=93016 Change 93016 by soc-andrew@soc-andrew_serv on 2006/03/09 06:08:44 Integrate the release changes Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#35 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/amd64/boot_crunch.conf#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/errata/article.sgml#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/i386/boot_crunch.conf#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/ia64/boot_crunch.conf#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/pc98/boot_crunch.conf#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/scripts/kernels-install.sh#1 branch Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#35 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.899 2006/02/08 11:18:29 hrs Exp $ +# $FreeBSD: src/release/Makefile,v 1.900 2006/03/08 18:02:30 sam Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -173,6 +173,16 @@ .endif DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} +# +# Build and package both GENERIC and SMP kernels if the target +# has both configuration files. Otherwise only GENERIC is done. +# +.if !exists(${.CURDIR}/../sys/${TARGET}/conf/SMP) +KERNELS?= GENERIC +.else +KERNELS?= GENERIC SMP +.endif + # mountpoint for filesystems. MNT= /mnt @@ -567,7 +577,6 @@ mkdir ${RD}/floppies .endif mkdir ${RD}/trees - mkdir ${RD}/kernels for i in ${DISTRIBUTIONS}; do \ mkdir ${RD}/trees/$$i && \ mtree -deU -f ${MTREEFILES}/BSD.root.dist \ @@ -579,6 +588,10 @@ mtree -deU -f ${MTREEFILES}/BSD.var.dist \ -p ${RD}/trees/$$i/var > /dev/null ; \ done + mkdir ${RD}/kernels + for i in ${KERNELS}; do \ + mkdir ${RD}/kernels/$${i}; \ + done touch ${.TARGET} # Install the system into the various distributions. @@ -592,15 +605,10 @@ release.3: .for kernel in ${KERNELS} cd ${.CURDIR}/..; \ - ${CROSSMAKE} ${KERNEL_FLAGS} -DNO_MODULES \ - KERNCONF=${kernel} INSTKERNNAME=${kernel} kernel \ - DESTDIR=${RD}/trees/base + ${CROSSMAKE} ${KERNEL_FLAGS} \ + KERNCONF=${kernel} kernel \ + DESTDIR=${RD}/kernels KODIR=/${kernel} .endfor - # Install a standard boot kernel+modules. - cd ${.CURDIR}/..; \ - ${CROSSMAKE} ${KERNEL_FLAGS} \ - kernel \ - DESTDIR=${RD}/trees/base touch ${.TARGET} # Make and install the three crunched binaries which live on the floppies. @@ -658,6 +666,15 @@ echo "$${i} distribution is finished."; \ fi ; \ done + @for i in ${KERNELS} ; \ + do \ + if [ -d ${RD}/kernels/$${i} ] ; then \ + cd ${.CURDIR} && $(MAKE) doTARBALL \ + SD=${RD}/kernels \ + TN=$$i TD=kernels ARG="$$i" && \ + echo "$${i} distribution is finished."; \ + fi ; \ + done .if !defined(NOPORTS) # XXX: Inline stripped version of doTARBALL @rm -rf ${RD}/dists/ports/ports* @@ -846,7 +863,7 @@ # Build boot and install floppies. floppies.1: - @gzip -9nc ${RD}/trees/base/boot/kernel/kernel > ${RD}/kernels/kernel.gz + @gzip -9nc ${RD}/kernels/GENERIC/kernel > ${RD}/kernels/kernel.gz @echo "Making the kernel boot floppies..." @cd ${.CURDIR} && ${MAKE} makeFloppySet FLOPPYBASE=kern \ FLOPPYDESC="Kernel" SPLITFILE=${RD}/kernels/kernel.gz @@ -977,6 +994,8 @@ find . -depth -print | cpio -dumpl ${CD_LIVEFS} ) ; \ fi \ done + @echo "Copy GENERIC kernel to boot area" + @cp -Rp ${RD}/kernels/GENERIC/ ${CD_LIVEFS}/boot/kernel .else # Setup the CD's contents @rm -fr ${CD_LIVEFS}/boot ==== //depot/projects/soc2005/bsdinstaller/src/release/amd64/boot_crunch.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.60 2005/12/15 01:04:49 iedowse Exp $ +# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.61 2006/03/08 18:02:31 sam Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -41,4 +41,4 @@ progs usbdevs libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs +libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/errata/article.sgml#4 (text+ko) ==== @@ -40,7 +40,7 @@ The &os; Project - $FreeBSD: src/release/doc/zh_CN.GB2312/errata/article.sgml,v 1.4 2006/03/05 15:07:55 delphij Exp $ + $FreeBSD: src/release/doc/zh_CN.GB2312/errata/article.sgml,v 1.5 2006/03/07 02:29:21 delphij Exp $ 2000 @@ -61,7 +61,7 @@ - Õâ·ÝÎĵµÁгöÁË for &os; + Õâ·ÝÎĵµÁгöÁË &os; @@ -71,7 +71,7 @@ - µÄ¿±ÎóÄÚÈÝ£¬ µÄ¿±ÎóÄÚÈÝ£¬ + µÄ¿±ÎóÄÚÈÝ£¬ ÆäÖаüÀ¨ÔÚ·¢Ðа淢²¼Ö®ºó·¢ÏÖµÄÖØ´óÎÊÌ⣬ ÒÔ¼°ÔÚ·¢ÐаæµÄ½»¸¶¹¤³ÌºóÆÚ±¾Ó¦Ð´½ø·¢ÐаæÎĵµ£¬ ¶øûÓÐÀ´µÃ¼°¼ÓÈëµÄÖØÒªÐÅÏ¢¡£ ÕâЩÐÅÏ¢¿ÉÄÜ°üÀ¨°²È«¹«¸æ£¬ ==== //depot/projects/soc2005/bsdinstaller/src/release/i386/boot_crunch.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/i386/boot_crunch.conf,v 1.60 2005/12/15 01:04:50 iedowse Exp $ +# $FreeBSD: src/release/i386/boot_crunch.conf,v 1.61 2006/03/08 18:02:31 sam Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -41,4 +41,4 @@ progs usbdevs libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs +libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo ==== //depot/projects/soc2005/bsdinstaller/src/release/ia64/boot_crunch.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.10 2005/12/15 01:04:50 iedowse Exp $ +# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.11 2006/03/08 18:02:31 sam Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -43,4 +43,4 @@ progs usbdevs libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs +libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs -ldevinfo ==== //depot/projects/soc2005/bsdinstaller/src/release/pc98/boot_crunch.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.60 2005/09/27 13:10:23 nyan Exp $ +# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.61 2006/03/08 18:02:31 sam Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -40,4 +40,4 @@ progs sysinstall libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs +libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo From owner-p4-projects@FreeBSD.ORG Thu Mar 9 06:17:06 2006 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 F0EC016A423; Thu, 9 Mar 2006 06:17: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 C759216A420 for ; Thu, 9 Mar 2006 06:17:05 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 893AE43D6B for ; Thu, 9 Mar 2006 06:17:05 +0000 (GMT) (envelope-from soc-andrew@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 k296H5or063481 for ; Thu, 9 Mar 2006 06:17:05 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k296H5sU063478 for perforce@freebsd.org; Thu, 9 Mar 2006 06:17:05 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 9 Mar 2006 06:17:05 GMT Message-Id: <200603090617.k296H5sU063478@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 93017 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, 09 Mar 2006 06:17:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=93017 Change 93017 by soc-andrew@soc-andrew_serv on 2006/03/09 06:17:05 Bring in the lib/Makefile change Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#9 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.211 2006/02/02 10:05:39 rwatson Exp $ +# $FreeBSD: src/lib/Makefile,v 1.212 2006/03/09 01:03:58 davidxu Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -31,7 +31,8 @@ libgssapi ${_libio} libipsec \ libipx libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpanel libpcap \ - libpmc ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ + libpmc ${_libpthread} librt ${_libsdp} ${_libsm} ${_libsmb} \ + ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} \ bsdinstaller lua From owner-p4-projects@FreeBSD.ORG Thu Mar 9 07:55:41 2006 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 0FAFA16A424; Thu, 9 Mar 2006 07:55:41 +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 9E97016A420 for ; Thu, 9 Mar 2006 07:55:40 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 502CC43D45 for ; Thu, 9 Mar 2006 07:55:40 +0000 (GMT) (envelope-from kmacy@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 k297te8O067021 for ; Thu, 9 Mar 2006 07:55:40 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k297tdDd067018 for perforce@freebsd.org; Thu, 9 Mar 2006 07:55:39 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 9 Mar 2006 07:55:39 GMT Message-Id: <200603090755.k297tdDd067018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93019 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, 09 Mar 2006 07:55:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=93019 Change 93019 by kmacy@kmacy_storage:sun4v_work on 2006/03/09 07:54:39 add for ISA simulator disk Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#8 edit .. //depot/projects/kmacy_sun4v/src/sys/conf/options.sun4v#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisorvar.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/simdisk.c#1 add Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#8 (text+ko) ==== @@ -69,7 +69,8 @@ sun4v/sun4v/pmap.c standard sun4v/sun4v/prof_machdep.c optional profiling-routine sun4v/sun4v/rwindow.c standard -sun4v/sun4v/support.S standard +sun4v/sun4v/simdisk.c optional simulator +sun4v/sun4v/support.S standard sun4v/sun4v/sys_machdep.c standard sun4v/sun4v/swtch.S standard sun4v/sun4v/tsb.c standard ==== //depot/projects/kmacy_sun4v/src/sys/conf/options.sun4v#2 (text+ko) ==== @@ -12,4 +12,5 @@ # Debug IOMMU inserts/removes using diagnostic accesses. Very loud. IOMMU_DIAG opt_iommu.h PMAP_STATS opt_pmap.h +SIMULATOR opt_simulator.h ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#4 (text+ko) ==== @@ -190,3 +190,5 @@ #device firewire # FireWire bus code #device sbp # SCSI over FireWire (Requires scbus and da) #device fwe # Ethernet over FireWire (non-standard!) + +options SIMULATOR # compile for ISA simulator ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#4 (text+ko) ==== @@ -34,9 +34,6 @@ * io-api.txt version 1.11 dated 10/19/2004 */ -#ifdef __cplusplus -extern "C" { -#endif #include #ifndef _ASM @@ -91,14 +88,12 @@ extern uint64_t hvio_intr_setstate(uint64_t sysino, int intr_state); extern uint64_t hvio_intr_gettarget(uint64_t sysino, uint32_t *cpuid); extern uint64_t hvio_intr_settarget(uint64_t sysino, uint32_t cpuid); + extern void hv_magic_trap_on(void); extern void hv_magic_trap_off(void); +extern int hv_sim_read(uint64_t offset, vm_paddr_t buffer_ra, uint64_t size); +extern int hv_sim_write(uint64_t offset, vm_paddr_t buffer_ra, uint64_t size); - -#endif - -#ifdef __cplusplus -} #endif #endif /* _MACHINE_HYPERVISOR_API_H */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisorvar.h#2 (text+ko) ==== @@ -121,6 +121,10 @@ #define HVIO_MSG_GETVALID 0xd2 #define HVIO_MSG_SETVALID 0xd3 +#define HVIO_SIM_READ 0xf0 +#define HVIO_SIM_WRITE 0xf1 + + #ifdef SET_MMU_STATS #define MMU_STAT_AREA 0xfc #endif /* SET_MMU_STATS */ From owner-p4-projects@FreeBSD.ORG Thu Mar 9 08:04:51 2006 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 A1E2416A423; Thu, 9 Mar 2006 08:04:50 +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 44BAE16A420 for ; Thu, 9 Mar 2006 08:04:50 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12FD043D53 for ; Thu, 9 Mar 2006 08:04:44 +0000 (GMT) (envelope-from kmacy@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 k2984hlp067407 for ; Thu, 9 Mar 2006 08:04:43 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2984h2J067404 for perforce@freebsd.org; Thu, 9 Mar 2006 08:04:43 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 9 Mar 2006 08:04:43 GMT Message-Id: <200603090804.k2984h2J067404@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93021 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, 09 Mar 2006 08:04:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=93021 Change 93021 by kmacy@kmacy_storage:sun4v_work on 2006/03/09 08:03:46 add missing bits to support running as user - user_rtt: return to user mod - cpu_switch: handle new pmap structures - handle both user and kernel misses in tsb miss handler still need to connect up tl0_trap to transition to trap for demand fault Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#8 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#11 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#6 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/mmu.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/sun4v_cpufunc.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#9 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#21 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hcall.S#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#9 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#19 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#9 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#8 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#8 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte.c#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#6 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/wbuf.S#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#8 (text+ko) ==== @@ -118,6 +118,7 @@ ASSYM(PAGE_SHIFT_8K, PAGE_SHIFT_8K); ASSYM(PAGE_SHIFT_4M, PAGE_SHIFT_4M); ASSYM(PAGE_SIZE, PAGE_SIZE); +ASSYM(PAGE_SIZE_4M, PAGE_SIZE_4M); ASSYM(CPU_CLKSYNC, CPU_CLKSYNC); ASSYM(CPU_INIT, CPU_INIT); @@ -182,11 +183,12 @@ ASSYM(VTD_REF, VTD_REF); ASSYM(VTD_W, VTD_W); ASSYM(VTD_SW_W, VTD_SW_W); -ASSYM(TTARGET_VA_BITS, TTARGET_VA_BITS); -ASSYM(TTARGET_VA_SHIFT, TTARGET_VA_SHIFT); -ASSYM(TTARGET_CTX_SHIFT, TTARGET_CTX_SHIFT); ASSYM(THE_SHIFT, THE_SHIFT); +ASSYM(HVTSB_PA, offsetof(struct hv_tsb_info, hvtsb_pa)); +ASSYM(PM_HASHSCRATCH, offsetof(struct pmap, pm_hashscratch)); +ASSYM(PM_TSBSCRATCH, offsetof(struct pmap, pm_tsbscratch)); +ASSYM(PM_TSB_RA, offsetof(struct pmap, pm_tsb_ra)); #endif ASSYM(V_INTR, offsetof(struct vmmeter, v_intr)); @@ -219,10 +221,9 @@ ASSYM(PC_KWBUF_FULL, offsetof(struct pcpu, pc_kwbuf_full)); ASSYM(PC_KWBUF_SP, offsetof(struct pcpu, pc_kwbuf_sp)); ASSYM(PC_KWBUF, offsetof(struct pcpu, pc_kwbuf)); - +ASSYM(PC_PMAP, offsetof(struct pcpu, pc_curpmap)); #else ASSYM(PC_PMAP, offsetof(struct pcpu, pc_pmap)); -ASSYM(PM_TSB, offsetof(struct pmap, pm_tsb)); #endif @@ -287,7 +288,7 @@ ASSYM(VM_PMAP, offsetof(struct vmspace, vm_pmap)); ASSYM(PM_ACTIVE, offsetof(struct pmap, pm_active)); ASSYM(PM_CONTEXT, offsetof(struct pmap, pm_context)); - +ASSYM(PM_TSB, offsetof(struct pmap, pm_tsb)); ASSYM(SF_UC, offsetof(struct sigframe, sf_uc)); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#11 (text+ko) ==== @@ -127,8 +127,10 @@ #define SCRATCH_REG_MMFSA ASI_SCRATCHPAD_0_REG #define SCRATCH_REG_PCPU ASI_SCRATCHPAD_1_REG -#define SCRATCH_REG_HASH ASI_SCRATCHPAD_2_REG -#define SCRATCH_REG_TSB ASI_SCRATCHPAD_3_REG +#define SCRATCH_REG_HASH_KERNEL ASI_SCRATCHPAD_2_REG +#define SCRATCH_REG_TSB_KERNEL ASI_SCRATCHPAD_3_REG +#define SCRATCH_REG_HASH_USER ASI_SCRATCHPAD_6_REG +#define SCRATCH_REG_TSB_USER ASI_SCRATCHPAD_7_REG #define MMU_CID_P 0x08 #define MMU_CID_S 0x10 ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#6 (text+ko) ==== @@ -135,21 +135,33 @@ mov SCRATCH_REG_PCPU, PCPU_REG; \ ldxa [%g0 + PCPU_REG]ASI_SCRATCHPAD, PCPU_REG; -#define GET_HASH_SCRATCH(reg) \ - mov SCRATCH_REG_HASH, reg; \ +#define GET_HASH_SCRATCH_USER(reg) \ + mov SCRATCH_REG_HASH_USER, reg; \ ldxa [%g0 + reg]ASI_SCRATCHPAD, reg; -#define GET_TSB_SCRATCH(reg) \ - mov SCRATCH_REG_TSB, reg; \ +#define GET_HASH_SCRATCH_KERNEL(reg) \ + mov SCRATCH_REG_HASH_KERNEL, reg; \ + ldxa [%g0 + reg]ASI_SCRATCHPAD, reg; + +#define GET_TSB_SCRATCH_USER(reg) \ + mov SCRATCH_REG_TSB_USER, reg; \ ldxa [%g0 + reg]ASI_SCRATCHPAD, reg; -#define SET_HASH_SCRATCH(reg) stxa reg, [%g0 + SCRATCH_REG_HASH]ASI_SCRATCHPAD -#define SET_TSB_SCRATCH(reg) stxa reg, [%g0 + SCRATCH_REG_TSB]ASI_SCRATCHPAD +#define GET_TSB_SCRATCH_KERNEL(reg) \ + mov SCRATCH_REG_TSB_KERNEL, reg; \ + ldxa [%g0 + reg]ASI_SCRATCHPAD, reg; + +#define SET_SCRATCH(offsetreg, reg) stxa reg, [%g0 + offsetreg]ASI_SCRATCHPAD #define GET_PCB(reg) \ GET_PCPU_SCRATCH; \ ldx [PCPU_REG + PC_CURPCB], reg; +#define SET_MMU_CONTEXT(typereg, reg) stxa reg, [typereg]ASI_MMU_CONTEXTID +#define GET_MMU_CONTEXT(typereg, reg) ldxa [typereg]ASI_MMU_CONTEXTID, reg + + + #define SAVE_GLOBALS(TF) \ stx %g1, [TF + TF_G1]; \ stx %g2, [TF + TF_G2]; \ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/mmu.h#2 (text+ko) ==== @@ -76,19 +76,6 @@ /* - * MMU TAG ACCESS register Layout - * - * +-------------------------+------------------+ - * | virtual address [63:13] | context [12:0] | - * +-------------------------+------------------+ - * 63 13 12 0 - */ -#define TAGACC_CTX_MASK 0x1FFF -#define TAGACC_SHIFT 13 -#define TAGACC_VADDR_MASK (~TAGACC_CTX_MASK) -#define TAGACC_CTX_LSHIFT (64 - TAGACC_SHIFT) - -/* * MMU PRIMARY/SECONDARY CONTEXT register */ #define CTXREG_CTX_MASK 0x1FFF @@ -103,6 +90,6 @@ * FLUSH_ADDR is used in the flush instruction to guarantee stores to mmu * registers complete. It is selected so it won't miss in the tlb. */ -#define FLUSH_ADDR (KERNELBASE + 2 * MMU_PAGESIZE4M) +#define FLUSH_ADDR (KERNBASE + 2 * PAGE_SIZE_4M) #endif /* _MACHINE_MMU_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#7 (text+ko) ==== @@ -59,12 +59,16 @@ struct pmap { + uint64_t pm_context; + uint64_t pm_hashscratch; + uint64_t pm_tsbscratch; + vm_paddr_t pm_tsb_ra; + struct mtx pm_mtx; struct tte_hash *pm_hash; TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ struct hv_tsb_info pm_tsb; cpumask_t pm_active; - uint16_t pm_context; struct pmap_statistics pm_stats; }; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/sun4v_cpufunc.h#3 (text+ko) ==== @@ -32,8 +32,11 @@ #define _MACHINE_SUN4V_CPUFUNC_H_ #include void set_mmfsa_scratchpad(vm_paddr_t mmfsa); -void set_hash_scratchpad(vm_offset_t hash); -void set_tsb_scratchpad(vm_paddr_t tsb); + +void set_hash_user_scratchpad(uint64_t); +void set_tsb_user_scratchpad(uint64_t); +void set_hash_kernel_scratchpad(uint64_t); +void set_tsb_kernel_scratchpad(uint64_t); static __inline void * ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#9 (text+ko) ==== @@ -24,6 +24,10 @@ struct hv_tsb_info; +vm_paddr_t tsb_init(struct hv_tsb_info *tsb); + +void tsb_deinit(struct hv_tsb_info *tsb); + void tsb_assert_invalid(struct hv_tsb_info *tsb, vm_offset_t va); void tsb_set_tte(struct hv_tsb_info *tsb, vm_offset_t va, tte_t tte_data, uint64_t ctx); @@ -38,6 +42,8 @@ void tsb_clear_range(struct hv_tsb_info *tsb, vm_offset_t sva, vm_offset_t eva); -void tsb_set_scratchpad(struct hv_tsb_info *tsb); +uint64_t tsb_set_scratchpad_kernel(struct hv_tsb_info *tsb); + +uint64_t tsb_set_scratchpad_user(struct hv_tsb_info *tsb); #endif /* !_MACHINE_TSB_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#4 (text+ko) ==== @@ -20,7 +20,9 @@ tte_t *tte_hash_lookup(tte_hash_t hash, vm_offset_t va); -void tte_hash_set_scratchpad(tte_hash_t th); +uint64_t tte_hash_set_scratchpad_kernel(tte_hash_t th); + +uint64_t tte_hash_set_scratchpad_user(tte_hash_t th); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#21 (text+ko) ==== @@ -45,7 +45,9 @@ #include #include + #include "assym.s" +#include #define PMAP_DEBUG #if 1 @@ -220,7 +222,13 @@ .macro tl0_reserved count .rept \count +#if 0 tl0_gen T_RESERVED +#else + illtrap + .align 32 +#endif + .endr .endm @@ -255,6 +263,7 @@ .macro insn_excptn MAGIC_TRAP_ON + MAGIC_TRAP_ON illtrap .align 32 .endm @@ -888,7 +897,123 @@ add %g1, 1, %g1 ;\ wrpr %g1, %cwp - + + + +ENTRY(utl0) + SAVE_GLOBALS(%l7) + SAVE_OUTS(%l7) + wrpr %g0, PSTATE_KERNEL, %pstate ! enable ints + jmpl %l3, %o7 ! call trap handler + mov %l7, %o0 + +ENTRY(user_rtt) + ! pil handling needs to be re-visited + wrpr %g0, PIL_TICK, %pil + ldx [PCPU(CURTHREAD)], %l0 + lduw [%l0 + TD_FLAGS], %l1 + set TDF_ASTPENDING | TDF_NEEDRESCHED, %l2 + and %l1, %l2, %l1 + brz,a,pt %l1, 1f + nop + + ! handle AST and retry return + wrpr %g0, 0, %pil + call ast + mov %l7, %o0 + ba,a,pt %xcc, user_rtt + nop + +1: ldx [PCB_REG + PCB_NSAVED], %l1 + brz,a,pt %l1, 2f + nop + wrpr %g0, 0, %pil + mov T_SPILL, %o0 + stx %o0, [%l7 + SPOFF + CCFSZ + TF_TYPE] + call trap + mov %l7, %o0 + ba,a %xcc, user_rtt + nop +2: + ld [%sp + SPOFF + TF_WSTATE], %l3 + ! + ! restore user globals and outs + ! + rdpr %pstate, %l1 + wrpr %l1, PSTATE_IE, %pstate + RESTORE_GLOBALS(%l7) + wrpr %g0, 1, %gl + mov %sp, %g6 ! save tf pointer + RESTORE_OUTS(%l7) + + wrpr %g0, 0, %pil ! drop pil to 0 + + mov MMU_CID_S, %g1 + GET_MMU_CONTEXT(%g1, %g2) + mov MMU_CID_S, %g1 + sethi %hi(FLUSH_ADDR), %g3 + SET_MMU_CONTEXT(%g1, %g2) + flush %g3 ! flush required by immu + ! hangover from US I + ! + ! setup trap regs + ! + ldx [%l7 + TF_TPC], %g1 + ldx [%l7 + TF_TNPC], %g2 + ldx [%l7 + TF_TSTATE], %l0 + andn %l0, TSTATE_CWP_MASK, %g4 + wrpr %g1, %tpc + wrpr %g2, %tnpc + +#if 0 + ! + ! switch "other" windows back to "normal" windows and + ! restore to window we originally trapped in + ! + rdpr %otherwin, %g1 + wrpr %g0, 0, %otherwin + wrpr %g0, %g1, %canrestore +#endif + add %l3, WSTATE_CLEAN_OFFSET, %l3 ! convert to "clean" wstate + wrpr %g0, %l3, %wstate + + + rdpr %canrestore, %g1 + brnz %g1, 3f + nop ! no trap, use restore directly + rdpr %cwp, %g1 + wrpr %g1, %g7, %tstate ! needed by wbuf recovery code + ! hand craft the restore to avoid getting to TL > 2 + rdpr %wstate, %g1 + btst 1, %g1 + beq 4f + nop + .global rtt_fill_start +rtt_fill_start: +#if 0 + fill_32bit_rtt(ASI_AIUP) + ba,a 3f +#endif +4: + fill_64bit_rtt(ASI_AIUP) + .global rtt_fill_end +rtt_fill_end: +3: + restore ! should not trap +2: + + ! + ! set %cleanwin to %canrestore + ! set %tstate to the correct %cwp + ! retry resumes user execution + ! + rdpr %canrestore, %g1 + wrpr %g0, %g1, %cleanwin + rdpr %cwp, %g1 + wrpr %g1, %g7, %tstate + retry +END(user_rtt) +END(utl0) ENTRY(ktl0) SAVE_GLOBALS(%l7) @@ -1052,25 +1177,34 @@ MAGIC_TRAP_ON ldxa [%g1 + %g7]ASI_REAL, %g6 ! load in the context - srlx %g5, TTARGET_VA_SHIFT, %g1 - sllx %g6, TTARGET_CTX_SHIFT, %g6 - or %g6, %g1, %g6 ! %g6 == search tag + cmp %g6, %g0 ! kernel? + be,pn %xcc, 1f + srlx %g5, TTARGET_VA_SHIFT, %g1 + GET_HASH_SCRATCH_USER(%g2) + ba,pt %xcc, 2f + sllx %g6, TTARGET_CTX_SHIFT, %g6 +1: + GET_HASH_SCRATCH_KERNEL(%g2) + sllx %g6, TTARGET_CTX_SHIFT, %g6 +2: + or %g6, %g1, %g6 ! %g6 == search tag + + + ! %g4 == fault type %g5 == fault addr %g6 == tag ! XXX only handle normal miss for now (look at fault type in the future) #ifdef PMAP_DEBUG cmp %g6, %g0 ! NULL ptr deref in kernel - bne,pt %xcc, 4f + bne,pt %xcc, 3f nop tsb_miss_null_deref: illtrap ! give up -4: +3: #endif - mov 1, %g7 - sllx %g7, PAGE_SHIFT, %g7 + sethi %hi(PAGE_MASK), %g7 sub %g7, 1, %g7 ! %g7==PAGE_MASK - GET_HASH_SCRATCH(%g2) ! insn 2,3 and %g2, %g7, %g4 ! size stored in lower 13 bits andn %g2, %g7, %g2 ! actual VA of hash @@ -1093,57 +1227,58 @@ tsb_miss_lookup_0: ldda [%g2 + %g0]ASI_LDTD_N, %g4 cmp %g4, %g0 ! entry tag == 0 ? - be,pn %xcc, 1f + be,pn %xcc, 4f nop cmp %g4, %g6 ! entry tag == VA tag? - be,pn %xcc, 2f + be,pn %xcc, 5f nop ! entry 1 tsb_miss_lookup_1: add %g2, 16, %g2 ! next THF ldda [%g2 + %g0]ASI_LDTD_N, %g4 cmp %g4, %g0 ! entry tag == 0 ? - be,pn %xcc, 1f + be,pn %xcc, 4f nop cmp %g4, %g6 ! entry tag == search tag? - be,pn %xcc, 2f + be,pn %xcc, 5f nop ! entry 2 tsb_miss_lookup_2: add %g2, 16, %g2 ! next THF ldda [%g2 + %g0]ASI_LDTD_N, %g4 cmp %g4, %g0 ! entry tag == 0 ? - be,pn %xcc, 1f + be,pn %xcc, 4f nop cmp %g4, %g6 ! entry tag == search tag? - be,pn %xcc, 2f + be,pn %xcc, 5f nop ! entry 3 tsb_miss_lookup_3: add %g2, 16, %g2 ! next THF ldda [%g2 + %g0]ASI_LDTD_N, %g4 cmp %g4, %g0 ! entry tag == 0 ? - be,pn %xcc, 1f + be,pn %xcc, 4f nop cmp %g4, %g6 ! entry tag == search tag? - be,pn %xcc, 2f + be,pn %xcc, 5f nop tsb_miss_not_found: -1: ! not found +4: ! not found ! we need to jump to tl0_trap to drop us back down to tl0 ! and take us to trap(...) to service the fault ! skipping this step for the moment so we just do an illtrap - illtrap + ba %xcc, tl0_trap + mov T_DATA_MISS, %g1 tsb_miss_found: -2: !found +5: !found ! %g1 == abs index %g2 == THE pointer %g3 == flags ! %g4 == tag %g5 == data %g7 == PAGE_MASK ! %g3 <- TSB RA %g6 <- TSB size, TTE RA + srlx %g6, TTARGET_CTX_SHIFT, %g6 - ! XXX set referenced/modified bit unconditionally for now XXX andcc %g5, %g3, %g0 ! already set - bnz,pt %xcc, 5f + bnz,pt %xcc, 7f nop andcc %g3, VTD_REF, %g0 ! TSB miss bnz,pt %xcc, 6f @@ -1153,12 +1288,17 @@ or %g5, %g3, %g5 ! add ref/mod bit unconditionally 6: stx %g5, [%g2 + 8] ! set ref/mod bit -5: - GET_TSB_SCRATCH(%g3) ! %g3 == TSB (RA) - - +7: + cmp %g6, %g0 ! kernel context? + be,pn %xcc, 8f + nop + GET_TSB_SCRATCH_USER(%g3) ! %g3 == TSB (RA) + ba,a,pt %xcc, 9f + and %g3, %g7, %g6 ! size of TSB in pages +8: + GET_TSB_SCRATCH_KERNEL(%g3) ! %g3 == TSB (RA) and %g3, %g7, %g6 ! size of TSB in pages - +9: andn %g3, %g7, %g3 ! TSB real address sllx %g6, (PAGE_SHIFT - TTE_SHIFT), %g6 ! nttes subx %g6, 1, %g6 ! TSB_MASK @@ -1169,11 +1309,11 @@ #ifdef PMAP_DEBUG ldda [%g6]ASI_LDTD_REAL, %g2 cmp %g3, %g5 - bne,pt %xcc, 3f + bne,pt %xcc, 10f nop illtrap ! die if all we're doing ! is storing same data -3: +10: #endif stxa %g4, [%g6]ASI_REAL ! store tag stxa %g5, [%g6 + %g7]ASI_REAL ! store data @@ -1211,6 +1351,8 @@ ENTRY(prot_fault_trap) illtrap END(prot_fault_trap) + + /* * Freshly forked processes come here when switched to for the first time. * The arguments to fork_exit() have been setup in the locals, we must move @@ -1233,7 +1375,7 @@ mov %l1, %o1 call fork_exit mov %l2, %o2 - ba,a %xcc, tl0_ret + ba,a,pt %xcc, user_rtt nop END(fork_trampoline) ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hcall.S#5 (text+ko) ==== @@ -1377,6 +1377,7 @@ bad_hcall_error: .asciz "hypervisor call 0x%x returned an unexpected error %d" + ENTRY(panic_bad_hcall) mov %o0, %o2 sethi %hi(bad_hcall_error), %o0 @@ -1398,6 +1399,21 @@ nop END(hv_magic_trap_off) + + ENTRY(hv_sim_read) + mov HVIO_SIM_READ, %o5 + ta FAST_TRAP + retl + nop + END(hv_read) + + ENTRY(hv_sim_write) + mov HVIO_SIM_WRITE, %o5 + ta FAST_TRAP + retl + nop + END(hv_write) + #endif /* lint || __lint */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#9 (text+ko) ==== ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#19 (text+ko) ==== @@ -354,7 +354,8 @@ oldpmap->pm_active &= ~1; pmap->pm_active |= 1; #endif - tte_hash_set_scratchpad(pmap->pm_hash); + pmap->pm_hashscratch = tte_hash_set_scratchpad_user(pmap->pm_hash); + pmap->pm_tsbscratch = tsb_set_scratchpad_user(&pmap->pm_tsb); PCPU_SET(curpmap, pmap); critical_exit(); } @@ -479,7 +480,7 @@ kernel_pmap->pm_tsb.hvtsb_rsvd = 0; kernel_pmap->pm_tsb.hvtsb_pa = pa; - tsb_set_scratchpad(&kernel_pmap->pm_tsb); + tsb_set_scratchpad_kernel(&kernel_pmap->pm_tsb); /* * Initialize kernel TSB for 4M pages @@ -620,7 +621,7 @@ * attempts to do updates until they're legal */ pm->pm_hash = tte_hash_kernel_create(kernel_hash, PAGE_SIZE_4M); - tte_hash_set_scratchpad(pm->pm_hash); + pm->pm_hashscratch = tte_hash_set_scratchpad_kernel(pm->pm_hash); for (i = 0; i < sz; i++) { if (translations[i].om_start < VM_MIN_PROM_ADDRESS || @@ -631,7 +632,7 @@ for (off = 0; off < translations[i].om_size; off += PAGE_SIZE) { va = translations[i].om_start + off; pa = TTE_GET_PA(translations[i].om_tte) + off; - tte_hash_insert(kernel_pmap->pm_hash, va, pa | TTE_KERNEL | VTD_8K); + tte_hash_insert(pm->pm_hash, va, pa | TTE_KERNEL | VTD_8K); } } } @@ -665,15 +666,12 @@ void pmap_clear_modify(vm_page_t m) { - /* XXX Need to also clear this in the TSB if possible :-( */ - UNIMPLEMENTED; tte_clear_phys_bit(m, VTD_W); } void pmap_clear_reference(vm_page_t m) { - UNIMPLEMENTED; tte_clear_phys_bit(m, VTD_REF); } @@ -1157,7 +1155,6 @@ pmap_pinit0(pmap_t pmap) { PMAP_LOCK_INIT(pmap); - pmap->pm_hash = NULL; pmap->pm_active = 0; pmap->pm_context = 0; PCPU_SET(curpmap, pmap); @@ -1180,6 +1177,7 @@ ("max context limit hit - need to implement context recycling")); pmap->pm_hash = tte_hash_create(pmap->pm_context); + pmap->pm_tsb_ra = tsb_init(&pmap->pm_tsb); pmap->pm_active = 0; TAILQ_INIT(&pmap->pm_pvlist); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); @@ -1298,6 +1296,7 @@ pmap->pm_stats.resident_count)); pmap_lazyfix(pmap); + tsb_deinit(&pmap->pm_tsb); tte_hash_destroy(pmap->pm_hash); PMAP_LOCK_DESTROY(pmap); } ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#9 (text+ko) ==== @@ -353,7 +353,7 @@ * int copyin(const void *uaddr, void *kaddr, size_t len) */ ENTRY(copyin) - wr %g0, ASI_AIUP, %asi + wr %g0, ASI_AIUS, %asi _MEMCPY(%o1, %o0, %o2, E, E, a, %asi) retl clr %o0 @@ -363,7 +363,7 @@ * int copyinstr(const void *uaddr, void *kaddr, size_t len, size_t *done) */ ENTRY(copyinstr) - wr %g0, ASI_AIUP, %asi + wr %g0, ASI_AIUS, %asi _COPYSTR(%o0, %o1, %o2, %o3, a, %asi, E, E) retl mov %g1, %o0 @@ -373,7 +373,7 @@ * int copyout(const void *kaddr, void *uaddr, size_t len) */ ENTRY(copyout) - wr %g0, ASI_AIUP, %asi + wr %g0, ASI_AIUS, %asi _MEMCPY(%o1, %o0, %o2, a, %asi, E, E) retl clr %o0 @@ -412,7 +412,7 @@ * int32_t casuword32(volatile int32_t *p, int32_t e, int32_t s) */ ENTRY(casuword32) - casa [%o0] ASI_AIUP, %o1, %o2 + casa [%o0] ASI_AIUS, %o1, %o2 retl mov %o2, %o0 END(casuword32) @@ -421,7 +421,7 @@ * int64_t casuword64(volatile int64_t *p, int64_t e, int64_t s) */ ENTRY(casuword64) - casxa [%o0] ASI_AIUP, %o1, %o2 + casxa [%o0] ASI_AIUS, %o1, %o2 retl mov %o2, %o0 END(casuword64) @@ -431,7 +431,7 @@ */ ENTRY(fuword8) retl - lduba [%o0] ASI_AIUP, %o0 + lduba [%o0] ASI_AIUS, %o0 END(fuword8) /* @@ -439,7 +439,7 @@ */ ENTRY(fuword16) retl - lduha [%o0] ASI_AIUP, %o0 + lduha [%o0] ASI_AIUS, %o0 END(fuword16) /* @@ -447,7 +447,7 @@ */ ENTRY(fuword32) retl - lduwa [%o0] ASI_AIUP, %o0 + lduwa [%o0] ASI_AIUS, %o0 END(fuword32) /* @@ -455,14 +455,14 @@ */ ENTRY(fuword64) retl - ldxa [%o0] ASI_AIUP, %o0 + ldxa [%o0] ASI_AIUS, %o0 END(fuword64) /* * int suword8(const void *base, int word) */ ENTRY(suword8) - stba %o1, [%o0] ASI_AIUP + stba %o1, [%o0] ASI_AIUS retl clr %o0 END(suword8) @@ -471,7 +471,7 @@ * int suword16(const void *base, int word) */ ENTRY(suword16) - stha %o1, [%o0] ASI_AIUP + stha %o1, [%o0] ASI_AIUS retl clr %o0 END(suword16) @@ -480,7 +480,7 @@ * int suword32(const void *base, int32_t word) */ ENTRY(suword32) - stwa %o1, [%o0] ASI_AIUP + stwa %o1, [%o0] ASI_AIUS retl clr %o0 END(suword32) @@ -489,7 +489,7 @@ * int suword64(const void *base, int64_t word) */ ENTRY(suword64) - stxa %o1, [%o0] ASI_AIUP + stxa %o1, [%o0] ASI_AIUS retl clr %o0 END(suword64) @@ -503,14 +503,14 @@ */ ENTRY(fuswintr) retl - lduha [%o0] ASI_AIUP, %o0 + lduha [%o0] ASI_AIUS, %o0 END(fuswintr) /* * int suswintr(const void *base, int word) */ ENTRY(suswintr) - stha %o1, [%o0] ASI_AIUP + stha %o1, [%o0] ASI_AIUS retl clr %o0 END(suswintr) @@ -666,24 +666,37 @@ retl nop END(set_mmfsa_scratchpad) -ENTRY(set_hash_scratchpad) - mov SCRATCH_REG_HASH, %g2 +ENTRY(set_pcpu_scratchpad) + mov SCRATCH_REG_PCPU, %g2 + stxa %o0, [%g0 + %g2]ASI_SCRATCHPAD + retl + nop +END(set_pcpu_scratchpad) +ENTRY(set_hash_kernel_scratchpad) + mov SCRATCH_REG_HASH_KERNEL, %g2 + stxa %o0, [%g0 + %g2]ASI_SCRATCHPAD + retl + nop +END(set_hash_kernel_scratchpad) +ENTRY(set_tsb_kernel_scratchpad) + mov SCRATCH_REG_TSB_KERNEL, %g2 stxa %o0, [%g0 + %g2]ASI_SCRATCHPAD retl nop -END(set_hash_scratchpad) -ENTRY(set_pcpu_scratchpad) - mov SCRATCH_REG_PCPU, %g2 +END(set_tsb_kernel_scratchpad) + +ENTRY(set_hash_user_scratchpad) + mov SCRATCH_REG_HASH_USER, %g2 stxa %o0, [%g0 + %g2]ASI_SCRATCHPAD retl nop -END(set_pcpu_scratchpad) -ENTRY(set_tsb_scratchpad) - mov SCRATCH_REG_TSB, %g2 +END(set_hash_user_scratchpad) +ENTRY(set_tsb_user_scratchpad) + mov SCRATCH_REG_TSB_USER, %g2 stxa %o0, [%g0 + %g2]ASI_SCRATCHPAD retl nop -END(set_hash_scratchpad) +END(set_tsb_user_scratchpad) /* ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#8 (text+ko) ==== @@ -27,10 +27,11 @@ #include __FBSDID("$FreeBSD: src/sys/sparc64/sparc64/swtch.S,v 1.33 2004/05/26 12:06:52 tmm Exp $"); +#include #include -#include #include #include +#include #include "assym.s" @@ -122,21 +123,24 @@ stx %i1, [PCPU(CURPCB)] wrpr %g0, PSTATE_NORMAL, %pstate - mov %i1, PCB_REG + mov %i1, PCB_REG ! load in new PCB wrpr %g0, PSTATE_KERNEL, %pstate + /* + * End of saving old context + * Start of loading new context + */ ldx [PCB_REG + PCB_SP], %fp ldx [PCB_REG + PCB_PC], %i7 sub %fp, CCFSZ, %sp + /* * Point to the pmaps of the new process, and of the last non-kernel * process to run. */ ldx [%i0 + TD_PROC], %i2 -#if 0 ldx [PCPU(PMAP)], %l2 -#endif ldx [%i2 + P_VMSPACE], %i5 add %i5, VM_PMAP, %i2 @@ -147,108 +151,51 @@ stx %l2, [%g1 + KTR_PARM2] 9: #endif - /* * If they are the same we are done. */ - cmp %l2, %i2 + cmp %l2, %i2 ! current pmap == new pmap? be,a,pn %xcc, 5f - nop + nop - /* - * If the new process is a kernel thread we can just leave the old - * context active and avoid recycling its context number. - */ - SET(vmspace0, %i4, %i3) - cmp %i5, %i3 - be,a,pn %xcc, 5f - nop + ldx [%i2 + PM_CONTEXT], %l5 ! new context == kernel? + cmp %g0, %l5 + be,a,pn %xcc, 5f + nop - /* - * If there was no non-kernel pmap, don't try to deactivate it. - */ - brz,a,pn %l2, 3f - nop + MAGIC_TRAP_ON + mov SCRATCH_REG_HASH_USER, %l6 + mov SCRATCH_REG_TSB_USER, %l7 + ldx [%i2 + PM_HASHSCRATCH], %l3 + ldx [%i2 + PM_TSBSCRATCH], %l4 + stx %i2, [PCPU(PMAP)] - /* - * Mark the pmap of the last non-kernel vmspace to run as no longer - * active on this cpu. - */ - lduw [%l2 + PM_ACTIVE], %l3 - lduw [PCPU(CPUMASK)], %l4 - andn %l3, %l4, %l3 - stw %l3, [%l2 + PM_ACTIVE] + SET_SCRATCH(%l6,%l3) ! XXX we're assuming the + SET_SCRATCH(%l7,%l4) ! scratch values <= 32 bits - /* - * Take away its context number. - */ - lduw [PCPU(CPUID)], %l3 - sllx %l3, INT_SHIFT, %l3 - add %l2, PM_CONTEXT, %l4 - mov -1, %l5 - stw %l5, [%l3 + %l4] - /* - * Find a new tlb context. If we've run out we have to flush all user - * mappings from the tlb and reset the context numbers. - */ -3: lduw [PCPU(TLB_CTX)], %i3 - lduw [PCPU(TLB_CTX_MAX)], %i4 - cmp %i3, %i4 - bne,a,pt %xcc, 4f - nop - SET(invlctx, %i5, %i4) - ldx [%i4], %i5 - call %i5 - nop - lduw [PCPU(TLB_CTX_MIN)], %i3 + ldx [%i2 + PM_TSB_RA], %l3 - /* - * Advance next free context. - */ -4: add %i3, 1, %i4 - stw %i4, [PCPU(TLB_CTX)] + mov MMU_CID_S, %l6 - /* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 9 10:51:41 2006 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 84EBF16A423; Thu, 9 Mar 2006 10:51: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 4AF3816A420 for ; Thu, 9 Mar 2006 10:51:40 +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 F333843D4C for ; Thu, 9 Mar 2006 10:51:39 +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 k29ApdXC081761 for ; Thu, 9 Mar 2006 10:51:39 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 k29ApdMi081758 for perforce@freebsd.org; Thu, 9 Mar 2006 10:51:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 10:51:39 GMT Message-Id: <200603091051.k29ApdMi081758@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 93031 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, 09 Mar 2006 10:51:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=93031 Change 93031 by rwatson@rwatson_peppercorn on 2006/03/09 10:50:39 Devfs now relies on sx locks. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#38 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#38 (text+ko) ==== @@ -60,6 +60,7 @@ #include #include #include +#include #include From owner-p4-projects@FreeBSD.ORG Thu Mar 9 10:55:19 2006 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 31C1F16A424; Thu, 9 Mar 2006 10:55: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 3695416A422 for ; Thu, 9 Mar 2006 10:55:17 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E06F43D48 for ; Thu, 9 Mar 2006 10:55:15 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 32F8B46C0A; Thu, 9 Mar 2006 05:54:53 -0500 (EST) Date: Thu, 9 Mar 2006 10:55:35 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Dingo In-Reply-To: <1141898670.34657.10.camel@localhost.localdomain> Message-ID: <20060309105315.M52152@fledge.watson.org> References: <200603090041.k290fnfV056558@repoman.freebsd.org> <1141898670.34657.10.camel@localhost.localdomain> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93005 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, 09 Mar 2006 10:55:19 -0000 On Thu, 9 Mar 2006, Dingo wrote: 5B > Well this would bring us to a more current snapshot off of FreeBSD, Ill get > to work on both Trees, though I need to "fix" the sebsd2 integration, I went > with the email you sent, though John Baldwin replied to the integration and > stated it should have been done from Yes, sorry about that! John is right, really we should have parented sebsd2 from the base branch, as this makes diffing easier, and avoids having to deal with mac/sebsd branch interactions You may find the easiest thing to do is p4 delete / submit the current sebsd2 subtree, then update the branch and re-integrate. P4 should be able to reparent it via integration, but there is some trickiness to it and just deleting and reintegrating with the new view should avoid that. Right now with the SEBSD branch, my goal is basically to get it compiling and booting, not to get it working, so hands to work on it are still very welcome! Robert N M Watson > > all the other TrustedBSD branches are branched > from the 'trustedbsd' base branch > in //depot/projects/trustedbsd/base/... > For example, the audit3 branch's view is: > > View: > //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... > > Wherease the sebsd2 branch's view is: > > View: > //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... > > Though i see you have now synched the trustedbsd/base also so i need to > change the view. and basically fix sebsd2. > > On Thu, 2006-03-09 at 00:41 +0000, Robert Watson wrote: >> http://perforce.freebsd.org/chv.cgi?CH=93005 >> >> Change 93005 by rwatson@rwatson_peppercorn on 2006/03/09 00:40:26 >> >> First pass attempt to update SEBSD through @92986 of the TrustedBSD >> MAC branch. Probably doesn't compile, and certainly doesn't run >> (yet). >> >> Affected files ... >> >> .. //depot/projects/trustedbsd/sebsd/COPYRIGHT#4 integrate >> .. //depot/projects/trustedbsd/sebsd/LOCKS#1 branch >> .. //depot/projects/trustedbsd/sebsd/MACREADME#4 branch >> .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#8 integrate >> .. //depot/projects/trustedbsd/sebsd/Makefile#12 integrate >> .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#12 integrate >> .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#1 branch >> .. //depot/projects/trustedbsd/sebsd/README#4 integrate >> .. //depot/projects/trustedbsd/sebsd/UPDATING#12 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/cp/extern.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#8 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.2#4 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/csh/config.h#4 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/csh/config_p.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv_stub.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#8 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.1#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.1#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/ls/extern.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#10 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#10 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/ls/util.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#9 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.1#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/alias.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.h#4 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith_lex.l#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/bltin.h#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/builtins.def#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/error.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.h#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/histedit.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mail.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/main.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.h#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/miscbltin.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkbuiltins#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkinit.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mksyntax.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/options.c#4 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/output.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#8 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/show.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/trap.c#4 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.h#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sleep/sleep.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.8#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.8#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.1#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.8#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.8#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.8#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bc/bc/main.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/CHANGES#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ.xml#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Xlist#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/README#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.1#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dighost.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.1#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.1#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/Makefile.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/aclconf.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/client.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/control.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/client.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/log.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/main.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.5#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.docbook#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/query.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/server.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/os.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/update.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/xfrout.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/zoneconf.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.threads.in#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/configure.in#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/Makefile.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Makefile.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/isc.color.gif#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/validate.sh.in#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/options#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/index#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3757.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3901.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4025.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4033.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4034.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4035.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4074.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4159.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/Makefile.in#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/api#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/config.h.in#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure.in#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/support.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_after.h.in#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_before.h.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/api#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/check.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/getaddresses.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/adb.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/api#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/cache.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/forward.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/gen-unix.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/journal.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/key.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/message.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/name.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbt.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbtdb.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/resolver.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tkey.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tsig.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/validator.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/xfrin.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/zone.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/api#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/print.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/inet_pton.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/lfsr.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/mem.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/quota.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/result.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/rwlock.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/timer.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/entropy.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/net.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/os.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/socket.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/api#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/namedconf.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/Makefile.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/api#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getipnode.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwconfig.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/print.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/strtoul.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/make/rules.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/version#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/binutils/opcodes/sparc-opc.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/NEWS#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/TODO#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/VERSION#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.3#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.c#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.h#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpagent.3#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpclient.3#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmplib.3#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.c#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/support.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/oid-list#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/.gdbinit#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/config.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/export.c#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/main.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.config#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.3#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trap.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bzip2/bzip2.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/com_err/compile_et.1#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ABOUT-NLS#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/AUTHORS#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING.LIB#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ChangeLog#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/FREEBSD-upgrade#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/INSTALL#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/NEWS#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/README#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/THANKS#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/TODO#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/alloca.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyin.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyout.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copypass.c#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.1#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.texi#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpiohdr.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dirname.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.1#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.texi#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/error.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/extern.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filemode.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filetypes.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/global.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/idcache.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/alloca_.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-ba.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-eexst.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fs-xinl.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-help.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-namefrob.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-parse.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pv.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pvh.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-xinl.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/basename.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exit.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt1.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_int.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/gettext.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/localedir.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rmt.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rtapelib.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strcase.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/stripslash.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strnlen.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/system.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/unlocked-io.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc-die.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xmalloc.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/main.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/makepath.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rmt.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rtapelib.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/safe-stat.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyin.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyout.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copypass.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpio.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpiohdr.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/extern.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filemode.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filetypes.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/global.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/idcache.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/main.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/makepath.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/safe-stat.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tarhdr.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/userspec.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/util.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/stripslash.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/system.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.c#3 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tarhdr.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/userspec.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/util.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/version.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xmalloc.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xstrdup.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/README#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_bsd.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_posix.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/parse.y#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/queue.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/man/cvs.1#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/cvsbug.in#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/diff/diff.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/Makefile.in#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/attribs.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-decl.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-format.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-opts.c#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-parse.in#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-ppoutput.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-semantics.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-typeck.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c.opt#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/calls.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgrtl.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/combine.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/common.opt#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.gcc#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.in#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.h#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.md#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/qrnnd.asm#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-osf4#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-protos.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.md#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-netbsd#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-rtems#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-protos.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.h#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#8 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/cygwin1.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/darwin.h#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/emmintrin.h#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gthr-win32.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-modes.def#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-protos.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.h#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.md#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-rtems-i386#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xmmintrin.h#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-hpux#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix41.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix43.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix52.h#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.md#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/beos.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.asm#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/freebsd.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux-unwind.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux.h#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux64.h#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.md#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rtems.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.h#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.md#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4.h#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix43#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix52#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-linux64#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-newas#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rtems#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.md#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/tpf.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.md#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/t-elf#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind-elf#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-darwin#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-sld#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure.ac#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp-demangle.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/Make-lang.in#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/call.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/class.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.h#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cvt.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cxx-pretty-print.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl2.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/error.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/except.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/g++spec.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/init.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mangle.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/method.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/name-lookup.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/parser.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/pt.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/search.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/semantics.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/tree.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck2.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppfiles.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmacro.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/crtstuff.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cse.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dbxout.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/defaults.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/extend.texi#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gcc-common.texi#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/invoke.texi#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/md.texi#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/tm.texi#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/trouble.texi#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dojump.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/emit-rtl.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/explow.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expmed.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bld.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/malloc.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/news.texi#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flow.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fold-const.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov-io.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcse.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ginclude/stddef.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gthr-win32.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ifcvt.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/jump.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-darwin.ver#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-std.ver#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop-unroll.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mkheaders.in#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mklibgcc.in#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/objc/objc-act.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.def#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/postreload.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/predict.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/real.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reg-stack.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regclass.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regrename.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regs.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload1.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/rtl.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/sibcall.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/simplify-rtx.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target-def.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/toplev.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree-inline.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.h#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-compat.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/varasm.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/version.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/COPYING#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.115#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.116#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.117#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.118#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FDL#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FREEBSD-upgrade#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL.gen#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/LICENSE#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MANIFEST#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MORE.STUFF#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.ccpg#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.comm#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.cpg#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.in#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.init#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.sub#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/NEWS#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROBLEMS#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROJECTS#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.MinGW#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.WIN32#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/REVISION#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/TODO#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/aclocal.m4#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure.ac#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/README#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file1#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file2#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/ChangeLog#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/Makefile.sub#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README_SH#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/TODO#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.man#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.sh#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer2.sh#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/ChangeLog#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/groff_mm.man#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/m.tmac#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/mmroff.pl#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/BUGS#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/ChangeLog#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/Makefile.sub#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/NEWS#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/TODO#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/copyright#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.mom#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/macros.mom#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typeset.mom#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/groff_mom.man#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/color.html#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docelement.html#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docprocessing.html#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/goodies.html#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/inlines.html#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/intro.html#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/refer.html#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/reserved.html#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/toc.html#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typesetting.html#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/using.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/om.tmac#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/ChangeLog#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/README#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/TODO#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/cover.ms#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.sh#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.in#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.sub#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fdl.texi#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fixinfo.sh#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-1#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-10#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-11#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-2#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-3#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-4#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-5#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-6#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-7#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-8#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-9#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.css#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.texinfo#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/meref.me#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/pic.ms#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/texinfo.tex#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/webpage.ms#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devdvi/generate/Makefile#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/DESC.proto#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/Makefile.sub#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/R.proto#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AB#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ABI#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AI#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AR#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CBI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CLARENDON#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CORONET#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GBI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/MARIGOLD#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/Makefile.sub#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OBI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/S#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/SYMBOL#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TBI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRB#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRBI#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRI#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRR#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UBI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCBI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/WINGDINGS#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/generate/Makefile#2 integrate >> >>>>> TRUNCATED FOR MAIL (1000 lines) <<< >> _______________________________________________ >> trustedbsd-cvs@FreeBSD.org mailing list >> http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs >> To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" > > From owner-p4-projects@FreeBSD.ORG Thu Mar 9 11:10:15 2006 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 8026916A423; Thu, 9 Mar 2006 11:10: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 34A8116A420 for ; Thu, 9 Mar 2006 11:10:14 +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 C13D043D4C for ; Thu, 9 Mar 2006 11:10:13 +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 k29BADwE082455 for ; Thu, 9 Mar 2006 11:10:13 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 k29BAD3E082452 for perforce@freebsd.org; Thu, 9 Mar 2006 11:10:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 11:10:13 GMT Message-Id: <200603091110.k29BAD3E082452@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 93032 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, 09 Mar 2006 11:10:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=93032 Change 93032 by rwatson@rwatson_peppercorn on 2006/03/09 11:09:13 - Handle VMARKER in vnode access control switch by panicking: we should not see access control checks on marker vnodes. - Rename sysv_sem entry points to their new, more consistent naming scheme. - Remove sebsd_create_root_mount(), it was unused, and now isn't defined in the MPO API. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#39 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#39 (text+ko) ==== @@ -198,6 +198,8 @@ case VNON: case VBAD: return SECCLASS_FILE; + case VMARKER: + panic("vnode_type_to_security_class: VMARKER"); } return SECCLASS_FILE; @@ -582,7 +584,7 @@ } static void -sebsd_create_sysv_sema(struct ucred *cred, struct semid_kernel *semakptr, +sebsd_create_sysv_sem(struct ucred *cred, struct semid_kernel *semakptr, struct label *semalabel) { struct task_security_struct *tsec; @@ -874,13 +876,6 @@ } } -static void -sebsd_create_root_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel) -{ - -} - static int sebsd_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct label *fslabel, struct vnode *parent, struct label *parentlabel, @@ -2373,7 +2368,7 @@ .mpo_init_ifnet_label = sebsd_init_network_label, .mpo_init_sysv_msgmsg_label = sebsd_init_sysv_label, .mpo_init_sysv_msgqueue_label = sebsd_init_sysv_label, - .mpo_init_sysv_sema_label = sebsd_init_sysv_label, + .mpo_init_sysv_sem_label = sebsd_init_sysv_label, .mpo_init_sysv_shm_label = sebsd_init_sysv_label, .mpo_init_ipq_label = sebsd_init_network_label_waitcheck, .mpo_init_mbuf_label = sebsd_init_network_label_waitcheck, @@ -2393,7 +2388,7 @@ .mpo_destroy_ifnet_label = sebsd_destroy_label, .mpo_destroy_sysv_msgmsg_label = sebsd_destroy_label, .mpo_destroy_sysv_msgqueue_label = sebsd_destroy_label, - .mpo_destroy_sysv_sema_label = sebsd_destroy_label, + .mpo_destroy_sysv_sem_label = sebsd_destroy_label, .mpo_destroy_sysv_shm_label = sebsd_destroy_label, .mpo_destroy_ipq_label = sebsd_destroy_label, .mpo_destroy_mbuf_label = sebsd_destroy_label, @@ -2453,7 +2448,7 @@ .mpo_create_file = sebsd_create_file, .mpo_create_sysv_msgmsg = sebsd_create_sysv_msgmsg, .mpo_create_sysv_msgqueue = sebsd_create_sysv_msgqueue, - .mpo_create_sysv_sema = sebsd_create_sysv_sema, + .mpo_create_sysv_sem = sebsd_create_sysv_sem, .mpo_create_sysv_shm = sebsd_create_sysv_shm, /* .mpo_create_mbuf_from_socket = sebsd_create_mbuf_from_socket, */ .mpo_create_mount = sebsd_create_mount, @@ -2461,7 +2456,6 @@ .mpo_create_posix_sem = sebsd_create_posix_sem, .mpo_create_proc0 = sebsd_create_proc0, .mpo_create_proc1 = sebsd_create_proc1, - .mpo_create_root_mount = sebsd_create_root_mount, /* .mpo_create_socket = sebsd_create_socket, */ /* .mpo_create_socket_from_socket = sebsd_create_socket_from_socket, */ .mpo_create_vnode_extattr = sebsd_create_vnode_extattr, @@ -2572,7 +2566,7 @@ /*.mpo_set_socket_peer_from_socket = sebsd_set_socket_peer_from_socket,*/ .mpo_cleanup_sysv_msgmsg = sebsd_cleanup_sysv_label, .mpo_cleanup_sysv_msgqueue = sebsd_cleanup_sysv_label, - .mpo_cleanup_sysv_sema = sebsd_cleanup_sysv_label, + .mpo_cleanup_sysv_sem = sebsd_cleanup_sysv_label, .mpo_cleanup_sysv_shm = sebsd_cleanup_sysv_label, .mpo_syscall = sebsd_syscall, }; From owner-p4-projects@FreeBSD.ORG Thu Mar 9 11:14:21 2006 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 C0D5E16A423; Thu, 9 Mar 2006 11:14:20 +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 755FF16A420 for ; Thu, 9 Mar 2006 11:14:20 +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 3FFEE43D45 for ; Thu, 9 Mar 2006 11:14:20 +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 k29BEKtk082595 for ; Thu, 9 Mar 2006 11:14:20 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k29BEKqa082591 for perforce@freebsd.org; Thu, 9 Mar 2006 11:14:20 GMT (envelope-from soc-bushman@freebsd.org) Date: Thu, 9 Mar 2006 11:14:20 GMT Message-Id: <200603091114.k29BEKqa082591@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 93033 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, 09 Mar 2006 11:14:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=93033 Change 93033 by soc-bushman@soc-bushman_stinger on 2006/03/09 11:13:59 cachedcli.h and cachedcli.c were added (they were mistakenly absent) Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getaddrinfo.c#8 edit .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachedcli.c#1 add .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachedcli.h#1 add Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getaddrinfo.c#8 (text+ko) ==== @@ -1589,7 +1589,7 @@ desired_size = sizeof(int) + sizeof(int) * 4; if (hostname != NULL) { size = strlen(hostname); - desired_soze += size + 1; + desired_size += size + 1; } else size = 0; From owner-p4-projects@FreeBSD.ORG Thu Mar 9 11:53:05 2006 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 7346E16A423; Thu, 9 Mar 2006 11:53:04 +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 411A516A420 for ; Thu, 9 Mar 2006 11:53:04 +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 E4EE943D4C for ; Thu, 9 Mar 2006 11:53:03 +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 k29Br3Vr083906 for ; Thu, 9 Mar 2006 11:53:03 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k29Br1o8083894 for perforce@freebsd.org; Thu, 9 Mar 2006 11:53:01 GMT (envelope-from soc-bushman@freebsd.org) Date: Thu, 9 Mar 2006 11:53:01 GMT Message-Id: <200603091153.k29Br1o8083894@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 93035 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, 09 Mar 2006 11:53:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=93035 Change 93035 by soc-bushman@soc-bushman_stinger on 2006/03/09 11:49:20 integration results Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/include/arpa/nameser.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/_pthread_stubs.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/libc_private.h#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/namespace.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/gettimeofday.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mq.c#2 delete .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/recv.2#6 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.h#5 edit .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters.ru/koi2855/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters.ru/koi2alt/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/portsnap/phttpget/phttpget.c#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/portsnap/portsnap/portsnap.sh#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/rpcbind/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/Makefile#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/acpi.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/acpidump.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/biosmptable.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/dist.c#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/dist.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/install.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/menus.c#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/sysinstall.h#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/syslogd/syslogd.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/syslogd/syslogd.c#6 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/watchdogd/watchdogd.c#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/hostapd/driver_freebsd.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/hostapd_cli/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/l2_packet.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/ndis_events/ndis_events.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/Makefile#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#5 integrate Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/include/arpa/nameser.h#2 (text+ko) ==== @@ -50,7 +50,7 @@ /* * From: Id: nameser.h,v 8.16 1998/02/06 00:35:58 halley Exp - * $FreeBSD: src/include/arpa/nameser.h,v 1.16 2002/03/23 17:24:55 imp Exp $ + * $FreeBSD: src/include/arpa/nameser.h,v 1.17 2006/03/09 03:47:11 ume Exp $ */ #ifndef _ARPA_NAMESER_H_ @@ -413,6 +413,7 @@ #define ns_name_pack __ns_name_pack #define ns_name_compress __ns_name_compress #define ns_name_uncompress __ns_name_uncompress +#define ns_name_skip __ns_name_skip __BEGIN_DECLS u_int ns_get16(const u_char *); ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/_pthread_stubs.c#4 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.12 2005/11/12 16:00:29 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.13 2006/03/05 18:10:27 deischen Exp $"); #include #include +#include #include "libc_private.h" @@ -52,39 +53,72 @@ static void *stub_null(void); static struct pthread *stub_self(void); static int stub_zero(void); +static int stub_true(void); +static void stub_exit(void); #define PJT_DUAL_ENTRY(entry) \ (pthread_func_t)entry, (pthread_func_t)entry pthread_func_entry_t __thr_jtable[PJT_MAX] = { - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_BROADCAST */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_DESTROY */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_INIT */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_SIGNAL */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_WAIT */ - {PJT_DUAL_ENTRY(stub_null)}, /* PJT_GETSPECIFIC */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_CREATE */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_DELETE */ - {PJT_DUAL_ENTRY(stub_main)}, /* PJT_MAIN_NP */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_DESTROY */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_INIT */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_LOCK */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_TRYLOCK */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_UNLOCK */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_DESTROY */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_INIT */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_SETTYPE */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ONCE */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_DESTROY */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_INIT */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_RDLOCK */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYRDLOCK */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYWRLOCK */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_UNLOCK */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_WRLOCK */ - {PJT_DUAL_ENTRY(stub_self)}, /* PJT_SELF */ - {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_SETSPECIFIC */ - {PJT_DUAL_ENTRY(stub_zero)} /* PJT_SIGMASK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATFORK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_GETDETACHSTATE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_GETGUARDSIZE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_GETINHERITSCHED */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_GETSCHEDPARAM */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_GETSCHEDPOLICY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_GETSCOPE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_GETSTACKADDR */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_GETSTACKSIZE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_SETDETACHSTATE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_SETGUARDSIZE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_SETINHERITSCHED */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_SETSCHEDPARAM */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_SETSCHEDPOLICY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_SETSCOPE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_SETSTACKADDR */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ATTR_SETSTACKSIZE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_CANCEL */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_CLEANUP_POP */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_CLEANUP_PUSH */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_BROADCAST */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_SIGNAL */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_TIMEDWAIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_WAIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_DETACH */ + {PJT_DUAL_ENTRY(stub_true)}, /* PJT_EQUAL */ + {PJT_DUAL_ENTRY(stub_exit)}, /* PJT_EXIT */ + {PJT_DUAL_ENTRY(stub_null)}, /* PJT_GETSPECIFIC */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_JOIN */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_CREATE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_DELETE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KILL */ + {PJT_DUAL_ENTRY(stub_main)}, /* PJT_MAIN_NP */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_SETTYPE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_LOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_TRYLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_UNLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ONCE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_RDLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYRDLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYWRLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_UNLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_WRLOCK */ + {PJT_DUAL_ENTRY(stub_self)}, /* PJT_SELF */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_SETCANCELSTATE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_SETCANCELTYPE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_SETSPECIFIC */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_SIGMASK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_TESTCANCEL */ }; /* @@ -200,6 +234,37 @@ STUB_FUNC(pthread_self, PJT_SELF, pthread_t) STUB_FUNC2(pthread_setspecific, PJT_SETSPECIFIC, int, pthread_key_t, void *) STUB_FUNC3(pthread_sigmask, PJT_SIGMASK, int, int, void *, void *) +STUB_FUNC3(pthread_atfork, PJT_ATFORK, int, void *, void *, void*) +STUB_FUNC1(pthread_attr_destroy, PJT_ATTR_DESTROY, int, void *); +STUB_FUNC2(pthread_attr_getdetachstate, PJT_ATTR_GETDETACHSTATE, int, void *, void *) +STUB_FUNC2(pthread_attr_getguardsize, PJT_ATTR_GETGUARDSIZE, int, void *, void *) +STUB_FUNC2(pthread_attr_getstackaddr, PJT_ATTR_GETSTACKADDR, int, void *, void *) +STUB_FUNC2(pthread_attr_getstacksize, PJT_ATTR_GETSTACKSIZE, int, void *, void *) +STUB_FUNC2(pthread_attr_getinheritsched, PJT_ATTR_GETINHERITSCHED, int, void *, void *) +STUB_FUNC2(pthread_attr_getschedparam, PJT_ATTR_GETSCHEDPARAM, int, void *, void *) +STUB_FUNC2(pthread_attr_getschedpolicy, PJT_ATTR_GETSCHEDPOLICY, int, void *, void *) +STUB_FUNC2(pthread_attr_getscope, PJT_ATTR_GETSCOPE, int, void *, void *) +STUB_FUNC1(pthread_attr_init, PJT_ATTR_INIT, int, void *) +STUB_FUNC2(pthread_attr_setdetachstate, PJT_ATTR_SETDETACHSTATE, int, void *, int) +STUB_FUNC2(pthread_attr_setguardsize, PJT_ATTR_SETGUARDSIZE, int, void *, size_t) +STUB_FUNC2(pthread_attr_setstackaddr, PJT_ATTR_SETSTACKADDR, int, void *, void *) +STUB_FUNC2(pthread_attr_setstacksize, PJT_ATTR_SETSTACKSIZE, int, void *, size_t) +STUB_FUNC2(pthread_attr_setinheritsched, PJT_ATTR_SETINHERITSCHED, int, void *, int) +STUB_FUNC2(pthread_attr_setschedparam, PJT_ATTR_SETSCHEDPARAM, int, void *, void *) +STUB_FUNC2(pthread_attr_setschedpolicy, PJT_ATTR_SETSCHEDPOLICY, int, void *, int) +STUB_FUNC2(pthread_attr_setscope, PJT_ATTR_SETSCOPE, int, void *, int) +STUB_FUNC1(pthread_cancel, PJT_CANCEL, int, void *) +STUB_FUNC1(pthread_cleanup_pop, PJT_CLEANUP_POP, int, int) +STUB_FUNC2(pthread_cleanup_push, PJT_CLEANUP_PUSH, void, void *, void *) +STUB_FUNC3(pthread_cond_timedwait, PJT_COND_TIMEDWAIT, int, void *, void *, void *) +STUB_FUNC1(pthread_detach, PJT_DETACH, int, void *) +STUB_FUNC2(pthread_equal, PJT_EQUAL, int, void *, void *) +STUB_FUNC1(pthread_exit, PJT_EXIT, void, void *) +STUB_FUNC2(pthread_join, PJT_JOIN, int, void *, void *) +STUB_FUNC2(pthread_kill, PJT_KILL, int, void *, int) +STUB_FUNC2(pthread_setcancelstate, PJT_SETCANCELSTATE, int, int, void *) +STUB_FUNC2(pthread_setcanceltype, PJT_SETCANCELTYPE, int, int, void *) +STUB_FUNC(pthread_testcancel, PJT_TESTCANCEL, void) static int stub_zero(void) @@ -224,3 +289,15 @@ { return (-1); } + +static int +stub_true(void) +{ + return (1); +} + +static void +stub_exit(void) +{ + exit(0); +} ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/libc_private.h#5 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.14 2006/01/12 07:28:20 jasone Exp $ + * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.15 2006/03/05 18:10:28 deischen Exp $ * * Private definitions for libc, libc_r and libpthread. * @@ -70,23 +70,51 @@ * libraries that reference it (libc_r, libpthread). */ typedef enum { + PJT_ATFORK, + PJT_ATTR_DESTROY, + PJT_ATTR_GETDETACHSTATE, + PJT_ATTR_GETGUARDSIZE, + PJT_ATTR_GETINHERITSCHED, + PJT_ATTR_GETSCHEDPARAM, + PJT_ATTR_GETSCHEDPOLICY, + PJT_ATTR_GETSCOPE, + PJT_ATTR_GETSTACKADDR, + PJT_ATTR_GETSTACKSIZE, + PJT_ATTR_INIT, + PJT_ATTR_SETDETACHSTATE, + PJT_ATTR_SETGUARDSIZE, + PJT_ATTR_SETINHERITSCHED, + PJT_ATTR_SETSCHEDPARAM, + PJT_ATTR_SETSCHEDPOLICY, + PJT_ATTR_SETSCOPE, + PJT_ATTR_SETSTACKADDR, + PJT_ATTR_SETSTACKSIZE, + PJT_CANCEL, + PJT_CLEANUP_POP, + PJT_CLEANUP_PUSH, PJT_COND_BROADCAST, PJT_COND_DESTROY, PJT_COND_INIT, PJT_COND_SIGNAL, + PJT_COND_TIMEDWAIT, PJT_COND_WAIT, + PJT_DETACH, + PJT_EQUAL, + PJT_EXIT, PJT_GETSPECIFIC, + PJT_JOIN, PJT_KEY_CREATE, PJT_KEY_DELETE, + PJT_KILL, PJT_MAIN_NP, + PJT_MUTEXATTR_DESTROY, + PJT_MUTEXATTR_INIT, + PJT_MUTEXATTR_SETTYPE, PJT_MUTEX_DESTROY, PJT_MUTEX_INIT, PJT_MUTEX_LOCK, PJT_MUTEX_TRYLOCK, PJT_MUTEX_UNLOCK, - PJT_MUTEXATTR_DESTROY, - PJT_MUTEXATTR_INIT, - PJT_MUTEXATTR_SETTYPE, PJT_ONCE, PJT_RWLOCK_DESTROY, PJT_RWLOCK_INIT, @@ -96,8 +124,11 @@ PJT_RWLOCK_UNLOCK, PJT_RWLOCK_WRLOCK, PJT_SELF, + PJT_SETCANCELSTATE, + PJT_SETCANCELTYPE, PJT_SETSPECIFIC, PJT_SIGMASK, + PJT_TESTCANCEL, PJT_MAX } pjt_index_t; ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/namespace.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/namespace.h,v 1.17 2005/08/03 00:43:14 deischen Exp $ + * $FreeBSD: src/lib/libc/include/namespace.h,v 1.18 2006/03/05 18:10:28 deischen Exp $ */ #ifndef _NAMESPACE_H_ @@ -81,14 +81,40 @@ #define nanosleep _nanosleep #define open _open #define poll _poll +#define pthread_atfork _pthread_atfork +#define pthread_attr_destroy _pthread_attr_destroy +#define pthread_attr_getdetachstate _pthread_attr_getdetachstate +#define pthread_attr_getguardsize _pthread_attr_getguardsize +#define pthread_attr_getstackaddr _pthread_attr_getstackaddr +#define pthread_attr_getstacksize _pthread_attr_getstacksize +#define pthread_attr_getinheritsched _pthread_attr_getinheritsched +#define pthread_attr_getschedparam _pthread_attr_getschedparam +#define pthread_attr_getschedpolicy _pthread_attr_getschedpolicy +#define pthread_attr_getscope _pthread_attr_getscope +#define pthread_attr_init _pthread_attr_init +#define pthread_attr_setdetachstate _pthread_attr_setdetachstate +#define pthread_attr_setguardsize _pthread_attr_setguardsize +#define pthread_attr_setstackaddr _pthread_attr_setstackaddr +#define pthread_attr_setstacksize _pthread_attr_setstacksize +#define pthread_attr_setinheritsched _pthread_attr_setinheritsched +#define pthread_attr_setschedparam _pthread_attr_setschedparam +#define pthread_attr_setschedpolicy _pthread_attr_setschedpolicy +#define pthread_attr_setscope _pthread_attr_setscope +#define pthread_cancel _pthread_cancel +#define pthread_cleanup_pop _pthread_cleanup_pop +#define pthread_cleanup_push _pthread_cleanup_push #define pthread_cond_broadcast _pthread_cond_broadcast #define pthread_cond_destroy _pthread_cond_destroy #define pthread_cond_init _pthread_cond_init #define pthread_cond_signal _pthread_cond_signal #define pthread_cond_timedwait _pthread_cond_timedwait #define pthread_cond_wait _pthread_cond_wait +#define pthread_detach _pthread_detach +#define pthread_equal _pthread_equal #define pthread_exit _pthread_exit #define pthread_getspecific _pthread_getspecific +#define pthread_join _pthread_join +#define pthread_kill _pthread_kill #define pthread_key_create _pthread_key_create #define pthread_key_delete _pthread_key_delete #define pthread_main_np _pthread_main_np @@ -109,8 +135,11 @@ #define pthread_rwlock_trywrlock _pthread_rwlock_trywrlock #define pthread_rwlock_unlock _pthread_rwlock_unlock #define pthread_self _pthread_self +#define pthread_setcancelstate _pthread_setcancelstate +#define pthread_setcanceltype _pthread_setcanceltype #define pthread_setspecific _pthread_setspecific #define pthread_sigmask _pthread_sigmask +#define pthread_testcancel _pthread_testcancel #define read _read #define readv _readv #define recvfrom _recvfrom ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/gettimeofday.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)gettimeofday.2 8.2 (Berkeley) 5/26/95 -.\" $FreeBSD: src/lib/libc/sys/gettimeofday.2,v 1.25 2004/07/02 23:52:13 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/gettimeofday.2,v 1.26 2006/03/03 13:58:43 jcamou Exp $ .\" .Dd May 26, 1995 .Dt GETTIMEOFDAY 2 @@ -82,8 +82,12 @@ .Pp .Bd -literal struct timeval { - long tv_sec; /* seconds since Jan. 1, 1970 */ - long tv_usec; /* and microseconds */ +#ifdef __alpha__ + long tv_sec; /* seconds */ +#else + time_t tv_sec; /* seconds */ +#endif + suseconds_t tv_usec; /* and microseconds */ }; struct timezone { ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/recv.2#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)recv.2 8.3 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.29 2006/02/16 09:56:31 brd Exp $ +.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.30 2006/03/05 10:32:15 brueffer Exp $ .\" .Dd February 16, 2006 .Dt RECV 2 @@ -308,7 +308,7 @@ was used to receive rights (file descriptors) that were in flight on the connection. However, the receiving program did not have enough free file -descriptor slots to accept the them. +descriptor slots to accept them. In this case the descriptors are closed, any pending data can be returned by another call to .Fn recvmsg . ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.h#5 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters.ru/koi2855/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/usr.sbin/lpr/filters.ru/koi2855/Makefile,v 1.5 2004/12/21 08:47:32 ru Exp $ +# $FreeBSD: src/usr.sbin/lpr/filters.ru/koi2855/Makefile,v 1.6 2006/03/08 22:28:12 gad Exp $ PROG= koi2855 -NO_MAN= +MAN= CFLAGS+= -I${.CURDIR}/../../common_source ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters.ru/koi2alt/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/usr.sbin/lpr/filters.ru/koi2alt/Makefile,v 1.5 2004/12/21 08:47:32 ru Exp $ +# $FreeBSD: src/usr.sbin/lpr/filters.ru/koi2alt/Makefile,v 1.6 2006/03/08 22:28:12 gad Exp $ PROG= koi2alt -NO_MAN= +MAN= CFLAGS+= -I${.CURDIR}/../../common_source ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters/Makefile#3 (text+ko) ==== @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $FreeBSD: src/usr.sbin/lpr/filters/Makefile,v 1.5 2004/12/21 08:47:32 ru Exp $ +# $FreeBSD: src/usr.sbin/lpr/filters/Makefile,v 1.6 2006/03/08 22:28:12 gad Exp $ BINDIR= /usr/libexec/lpr PROG= lpf -NO_MAN= +MAN= CFLAGS+= -I${.CURDIR}/../common_source ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/portsnap/phttpget/phttpget.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/portsnap/phttpget/phttpget.c,v 1.8 2006/01/27 14:42:15 cperciva Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/portsnap/phttpget/phttpget.c,v 1.9 2006/03/07 19:04:16 ume Exp $"); #include #include @@ -152,7 +152,7 @@ /* Obtain username and password */ proxy_auth_user = strsep(&env_HTTP_PROXY_AUTH, ":"); - proxy_auth_pass = strsep(&env_HTTP_PROXY_AUTH, ":"); + proxy_auth_pass = env_HTTP_PROXY_AUTH; } if ((proxy_auth_user != NULL) && (proxy_auth_pass != NULL)) { ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/portsnap/portsnap/portsnap.sh#5 (text+ko) ==== @@ -25,7 +25,7 @@ # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -# $FreeBSD: src/usr.sbin/portsnap/portsnap/portsnap.sh,v 1.14 2006/01/22 23:48:07 cperciva Exp $ +# $FreeBSD: src/usr.sbin/portsnap/portsnap/portsnap.sh,v 1.15 2006/03/07 19:13:00 ume Exp $ #### Usage function -- called from command-line handling code. @@ -328,7 +328,7 @@ # Issue the SRV query and pull out the Priority, Weight, and Target fields. host -t srv "_http._tcp.${SERVERNAME}" | grep -E "^_http._tcp.${SERVERNAME} has SRV record" | - cut -f 5,6,8 -d ' ' > serverlist + cut -f 5,6,8 -d ' ' | sed -e 's/\.$//' > serverlist # If no records, give up -- we'll just use the server name we were given. if [ `wc -l < serverlist` -eq 0 ]; then ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/rpcbind/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.3 2000/06/20 13:56:43 fvdl Exp $ -# $FreeBSD: src/usr.sbin/rpcbind/Makefile,v 1.5 2003/04/04 17:49:18 obrien Exp $ +# $FreeBSD: src/usr.sbin/rpcbind/Makefile,v 1.6 2006/03/06 10:07:52 matteo Exp $ LIBCDIR= ${.CURDIR}/../../lib/libc LIBCRPCDIR= ${LIBCDIR}/rpc @@ -13,7 +13,11 @@ rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c \ rpc_generic.c -CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP -DINET6 -DLIBWRAP +CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP -DLIBWRAP + +.if !defined(NO_INET6) +CFLAGS+= -DINET6 +.endif DPADD= ${LIBWRAP} ${LIBUTIL} LDADD= -lwrap -lutil ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.138 2006/02/28 21:49:32 jhb Exp $ +# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.139 2006/03/08 18:02:31 sam Exp $ .if ${MACHINE_ARCH} != "ia64" _wizard= wizard.c @@ -23,6 +23,36 @@ DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO} LDADD= -ldialog -lncurses -lutil -ldisk -lftpio +# +# When distributions have both UP and SMP kernels sysinstall +# will probe for the number of cpus on the target machine and +# automatically select which is appropriate. This can be overridden +# through the menus or both kernels can be installed (with the +# most "appropriate" one setup as /boot/kernel). For now this +# is done for i386 and amd64; for other systems support must be +# added to identify the cpu count if acpi and MPTable probing +# is insufficient. +# +# The unmber of cpus probed is passed through the environment in +# VAR_NCPUS ("ncpus") to scripts. +# +# Note that WITH_SMP is a compile time option that enables the +# builtin menus for the SMP kernel configuration. If this kernel +# is not built (see release/Makefile) then this should not be +# enabled as sysinstall may try to select an SMP kernel config +# where none is available. This option should not be needed--we +# should probe for an SMP kernel in the distribution but doing +# that is painful because of media changes and the structure of +# sysinstall so for now it's a priori. +# +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +SRCS+= acpi.c biosmptable.c +# NB: HEAD has SMP in GENERIC so only one kernel +#CFLAGS+=-DWITH_SMP +DPADD+= ${LIBDEVINFO} +LDADD+= -ldevinfo +.endif + CLEANFILES= makedevs.c rtermcap CLEANFILES+= keymap.tmp keymap.h countries.tmp countries.h ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/dist.c#5 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/dist.c,v 1.241 2006/02/28 21:49:32 jhb Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/dist.c,v 1.242 2006/03/08 18:02:31 sam Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -45,6 +45,7 @@ unsigned int Dists; unsigned int SrcDists; unsigned int XOrgDists; +unsigned int KernelDists; enum _disttype { DT_TARBALL, DT_SUBDIST, DT_PACKAGE }; @@ -59,6 +60,7 @@ } my_data; } Distribution; +static Distribution KernelDistTable[]; static Distribution SrcDistTable[]; static Distribution XOrgDistTable[]; @@ -75,6 +77,7 @@ /* The top-level distribution categories */ static Distribution DistTable[] = { DTE_TARBALL("base", &Dists, BASE, "/"), + DTE_SUBDIST("kernels", &Dists, KERNEL, KernelDistTable), DTE_TARBALL("doc", &Dists, DOC, "/"), DTE_TARBALL("games", &Dists, GAMES, "/"), DTE_TARBALL("manpages", &Dists, MANPAGES, "/"), @@ -92,6 +95,15 @@ DTE_END, }; +/* The kernel distributions */ +static Distribution KernelDistTable[] = { + DTE_TARBALL("GENERIC", &KernelDists, KERNEL_GENERIC, "/boot"), +#ifdef WITH_SMP + DTE_TARBALL("SMP", &KernelDists, KERNEL_SMP, "/boot"), +#endif + DTE_END, +}; + /* The /usr/src distribution */ static Distribution SrcDistTable[] = { DTE_TARBALL("sbase", &SrcDists, SRC_BASE, "/usr/src"), @@ -149,9 +161,11 @@ Dists |= DIST_SRC; if (XOrgDists) Dists |= DIST_XORG; + if (KernelDists) + Dists |= DIST_KERNEL; if (isDebug()) { - msgDebug("Dist Masks: Dists: %0x, Srcs: %0x\n", Dists, - SrcDists); + msgDebug("Dist Masks: Dists: %0x, Srcs: %0x Kernels: %0x\n", Dists, + SrcDists, KernelDists); msgDebug("XServer: %0x\n", XOrgDists); } } @@ -162,6 +176,7 @@ Dists = 0; SrcDists = 0; XOrgDists = 0; + KernelDists = 0; return DITEM_SUCCESS | DITEM_REDRAW; } @@ -181,6 +196,9 @@ if ((cp = variable_get(VAR_DIST_X11)) != NULL) XOrgDists = atoi(cp); + if ((cp = variable_get(VAR_DIST_KERNEL)) != NULL) + KernelDists = atoi(cp); + distVerifyFlags(); return DITEM_SUCCESS | DITEM_REDRAW; } @@ -193,6 +211,17 @@ return distSetXOrg(NULL); } +static int +selectKernel(void) +{ +#ifdef WITH_SMP + /* select default kernel based on deduced cpu count */ + return NCpus > 1 ? DIST_KERNEL_SMP : DIST_KERNEL_GENERIC; +#else + return DIST_KERNEL_GENERIC; +#endif +} + int distSetDeveloper(dialogMenuItem *self) { @@ -201,6 +230,7 @@ distReset(NULL); Dists = _DIST_DEVELOPER; SrcDists = DIST_SRC_ALL; + KernelDists = selectKernel(); i = distMaybeSetPorts(self); distVerifyFlags(); return i; @@ -225,6 +255,7 @@ distReset(NULL); Dists = _DIST_DEVELOPER; SrcDists = DIST_SRC_SYS; + KernelDists = selectKernel(); i = distMaybeSetPorts(self); distVerifyFlags(); return i; @@ -248,6 +279,7 @@ distReset(NULL); Dists = _DIST_USER; + KernelDists = selectKernel(); i = distMaybeSetPorts(self); distVerifyFlags(); return i; @@ -268,7 +300,8 @@ distSetMinimum(dialogMenuItem *self) { distReset(NULL); - Dists = DIST_BASE; + Dists = DIST_BASE | DIST_KERNEL; + KernelDists = selectKernel(); distVerifyFlags(); return DITEM_SUCCESS | DITEM_REDRAW; } @@ -281,6 +314,7 @@ Dists = DIST_ALL; SrcDists = DIST_SRC_ALL; XOrgDists = DIST_XORG_ALL; + KernelDists = DIST_KERNEL_ALL; i = distMaybeSetPorts(self); distVerifyFlags(); return i | DITEM_REDRAW; @@ -434,6 +468,20 @@ return i | DITEM_RESTORE; } +int +distSetKernel(dialogMenuItem *self) +{ + int i; + + dialog_clear_norefresh(); + if (!dmenuOpenSimple(&MenuKernelDistributions, FALSE)) + i = DITEM_FAILURE; + else + i = DITEM_SUCCESS; + distVerifyFlags(); + return i | DITEM_RESTORE; +} + static Boolean got_intr = FALSE; /* timeout handler */ @@ -455,13 +503,31 @@ } /* + * translate distribution filename to lower case + * as doTARBALL does in release/Makefile + */ +static void +translateDist(char trdist[PATH_MAX], const char *dist) +{ + int j; + + /* + * translate distribution filename to lower case + * as doTARBALL does in release/Makefile + */ + for (j = 0; j < PATH_MAX-1 && dist[j] != '\0'; j++) + trdist[j] = tolower(dist[j]); + trdist[j] = '\0'; +} + +/* * Try to get distribution as multiple pieces, locating and parsing an * info file which tells us how many we need for this distribution. */ static Boolean distExtractTarball(char *path, char *dist, char *my_dir, int is_base) { - char *buf = NULL, fname[PATH_MAX]; + char *buf = NULL, trdist[PATH_MAX], fname[PATH_MAX]; struct timeval start, stop; int j, status, total, intr; int cpid, zpid, fd2, chunk, numchunks; @@ -469,14 +535,23 @@ const char *tmp; FILE *fp; + translateDist(trdist, dist); + if (isDebug()) + msgDebug("%s: path \"%s\" dist \"%s\" trdist \"%s\" " + "my_dir \"%s\" %sis_base\n", + __func__, path, dist, trdist, my_dir, is_base ? "" : "!"); + status = TRUE; numchunks = 0; - snprintf(fname, sizeof (fname), "%s/%s.inf", path, dist); + snprintf(fname, sizeof (fname), "%s/%s.inf", path, trdist); getinfo: fp = DEVICE_GET(mediaDevice, fname, TRUE); intr = check_for_interrupt(); if (fp == (FILE *)IO_ERROR || intr || !mediaDevice) { + if (isDebug()) + msgDebug("%s: fname %s fp: %p, intr: %d mediaDevice: %p\n", + __func__, fname, fp, intr, mediaDevice); /* Hard error, can't continue */ if (!msgYesNo("Unable to open %s: %s.\nReinitialize media?", fname, !intr ? "I/O error." : "User interrupt.")) { @@ -488,8 +563,10 @@ return (FALSE); } else if (fp == NULL) { /* No attributes file, so try as a single file. */ - snprintf(fname, sizeof(fname), "%s/%s.%s", path, dist, + snprintf(fname, sizeof(fname), "%s/%s.%s", path, trdist, USE_GZIP ? "tgz" : "tbz"); + if (isDebug()) + msgDebug("%s: fp is NULL (1) fname: %s\n", __func__, fname); /* * Passing TRUE as 3rd parm to get routine makes this a "probing" * get, for which errors are not considered too significant. @@ -498,6 +575,9 @@ fp = DEVICE_GET(mediaDevice, fname, TRUE); intr = check_for_interrupt(); if (fp == (FILE *)IO_ERROR || intr || !mediaDevice) { + if (isDebug()) + msgDebug("%s: fname %s fp: %p, intr: %d mediaDevice: %p\n", + __func__, fname, fp, intr, mediaDevice); /* Hard error, can't continue */ msgConfirm("Unable to open %s: %s", fname, !intr ? "I/O error" : "User interrupt"); @@ -513,8 +593,11 @@ status = mediaExtractDist(dir, dist, fp); fclose(fp); return (status); - } else + } else { + if (isDebug()) + msgDebug("%s: fp is NULL (2) fname %s\n", __func__, fname); return (FALSE); + } } if (isDebug()) @@ -523,6 +606,8 @@ dist_attr = properties_read(fileno(fp)); intr = check_for_interrupt(); if (intr || !dist_attr) { + if (isDebug()) + msgDebug("%s: intr %d dist_attr %p\n", __func__, intr, dist_attr); msgConfirm("Cannot parse information file for the %s distribution: %s\n" "Please verify that your media is valid and try again.", dist, !intr ? "I/O error" : "User interrupt"); @@ -532,8 +617,11 @@ numchunks = strtol(tmp, 0, 0); } fclose(fp); - if (!numchunks) + if (!numchunks) { + if (isDebug()) + msgDebug("%s: numchunks is zero\n", __func__); return (TRUE); + } if (isDebug()) msgDebug("Attempting to extract distribution from %u chunks.\n", @@ -562,7 +650,7 @@ tmp = index(tmp, ' '); chunksize = strtol(tmp, 0, 0); } - snprintf(fname, sizeof(fname), "%s/%s.%c%c", path, dist, (chunk / 26) + 'a', + snprintf(fname, sizeof(fname), "%s/%s.%c%c", path, trdist, (chunk / 26) + 'a', (chunk % 26) + 'a'); if (isDebug()) msgDebug("trying for piece %d of %d: %s\n", chunk + 1, numchunks, @@ -767,7 +855,7 @@ int distExtractAll(dialogMenuItem *self) { - int old_dists, retries = 0, status = DITEM_SUCCESS; + int old_dists, old_kernel, retries = 0, status = DITEM_SUCCESS; char buf[512]; WINDOW *w; @@ -781,6 +869,7 @@ return DITEM_FAILURE; old_dists = Dists; + old_kernel = KernelDists; distVerifyFlags(); dialog_clear_norefresh(); @@ -795,6 +884,9 @@ /* Only do base fixup if base dist was successfully extracted */ if ((old_dists & DIST_BASE) && !(Dists & DIST_BASE)) status |= installFixupBase(self); + /* Only do base fixup if base dist was successfully extracted */ + if ((old_dists & DIST_KERNEL) && !(Dists & DIST_KERNEL)) + status |= installFixupKernel(self, old_kernel); /* Clear any local dist flags now */ Dists &= ~DIST_LOCAL; ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/dist.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/usr.sbin/sysinstall/dist.h,v 1.65 2005/06/16 18:16:13 ru Exp $ */ +/* $FreeBSD: src/usr.sbin/sysinstall/dist.h,v 1.66 2006/03/08 18:02:32 sam Exp $ */ #ifndef _DIST_H_INCLUDE #define _DIST_H_INCLUDE @@ -19,6 +19,7 @@ #ifdef __amd64__ #define DIST_LIB32 0x01000 #endif +#define DIST_KERNEL 0x02000 #define DIST_ALL 0xFFFFF /* Subtypes for SRC distribution */ @@ -70,6 +71,11 @@ #define DIST_XORG_ALL \ (DIST_XORG_MISC_ALL | DIST_XORG_SERVER_ALL | DIST_XORG_FONTS_ALL) +/* Subtypes for KERNEL distribution */ +#define DIST_KERNEL_GENERIC 0x00001 +#define DIST_KERNEL_SMP 0x00002 +#define DIST_KERNEL_ALL 0xFFFFF + /* Canned distribution sets */ #define _DIST_XORG_FONTS_BASE \ @@ -77,7 +83,7 @@ DIST_XORG_FONTS_TT) #define _DIST_USER \ - ( DIST_BASE | DIST_DOC | DIST_MANPAGES | DIST_DICT ) + ( DIST_BASE | DIST_KERNEL | DIST_DOC | DIST_MANPAGES | DIST_DICT ) #define _DIST_DEVELOPER \ ( _DIST_USER | DIST_PROFLIBS | DIST_INFO | DIST_SRC ) ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/install.c#4 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/install.c,v 1.364 2005/12/29 19:25:17 ceri Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/install.c,v 1.365 2006/03/08 18:02:32 sam Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -61,6 +61,7 @@ */ int _interactiveHack; int FixItMode = 0; +int NCpus; static void create_termcap(void); static void fixit_common(void); @@ -892,6 +893,30 @@ return DITEM_SUCCESS | DITEM_RESTORE; } +int +installFixupKernel(dialogMenuItem *self, int dists) +{ + + /* All of this is done only as init, just to be safe */ + if (RunningAsInit) { + /* + * Install something as /boot/kernel. Prefer SMP + * over generic--this should handle the case where + * both SMP and GENERIC are installed (otherwise we + * select the one kernel that was installed). + * + * NB: we assume any existing kernel has been saved + * already and the /boot/kernel we remove is empty. + */ + vsystem("rm -rf /boot/kernel"); + if (dists & DIST_KERNEL_SMP) + vsystem("mv /boot/SMP /boot/kernel"); + else + vsystem("mv /boot/GENERIC /boot/kernel"); + } + return DITEM_SUCCESS | DITEM_RESTORE; +} + #define QUEUE_YES 1 #define QUEUE_NO 0 static int @@ -1173,7 +1198,7 @@ int installVarDefaults(dialogMenuItem *self) { - char *cp; + char *cp, ncpus[10]; /* Set default startup options */ variable_set2(VAR_RELNAME, getRelname(), 0); @@ -1205,6 +1230,15 @@ variable_set2(SYSTEM_STATE, "init", 0); variable_set2(VAR_NEWFS_ARGS, "-b 16384 -f 2048", 0); variable_set2(VAR_CONSTERM, "NO", 0); +#if defined(i386) || defined(amd64) + NCpus = acpi_detect(); + if (NCpus == -1) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 9 12:46:59 2006 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 D7CF816A446; Thu, 9 Mar 2006 12:46:58 +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 3B55D16A425; Thu, 9 Mar 2006 12:46:58 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from bastille.optimhosts.com (bastille.optimhosts.com [203.177.161.185]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2503143D5A; Thu, 9 Mar 2006 12:46:55 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from localhost (bastille.local [127.0.0.1]) by bastille.optimhosts.com (Postfix) with ESMTP id 3D7658C8490; Thu, 9 Mar 2006 20:42:03 +0800 (PHT) Received: from bastille.optimhosts.com ([127.0.0.1]) by localhost (bastille.optimhosts.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 60185-07; Thu, 9 Mar 2006 20:41:21 +0800 (PHT) Received: from [192.168.2.106] (unknown [210.213.197.144]) by bastille.optimhosts.com (Postfix) with ESMTP id 9E71A8C847D; Thu, 9 Mar 2006 20:08:45 +0800 (PHT) From: Dingo To: Robert Watson In-Reply-To: <20060309105315.M52152@fledge.watson.org> References: <200603090041.k290fnfV056558@repoman.freebsd.org> <1141898670.34657.10.camel@localhost.localdomain> <20060309105315.M52152@fledge.watson.org> Content-Type: text/plain Date: Thu, 09 Mar 2006 20:13:35 +0000 Message-Id: <1141935215.797.2.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at bastille.optimhosts.com Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93005 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, 09 Mar 2006 12:47:00 -0000 Ok well im doing a sebsd build now to see how far off it is ... ill let you know my findings when the build completes, ill get some testing on it, and ill also fix up the sebsd2 branch, though now that you synched sebsd the audit pieces are kinda there, ill double check them. what you did today may negate the need for an sebsd2 branch, but ill test it all out. On Thu, 2006-03-09 at 10:55 +0000, Robert Watson wrote: > On Thu, 9 Mar 2006, Dingo wrote: 5B > > > Well this would bring us to a more current snapshot off of FreeBSD, Ill get > > to work on both Trees, though I need to "fix" the sebsd2 integration, I went > > with the email you sent, though John Baldwin replied to the integration and > > stated it should have been done from > > Yes, sorry about that! John is right, really we should have parented sebsd2 > from the base branch, as this makes diffing easier, and avoids having to deal > with mac/sebsd branch interactions > > You may find the easiest thing to do is p4 delete / submit the current sebsd2 > subtree, then update the branch and re-integrate. P4 should be able to > reparent it via integration, but there is some trickiness to it and just > deleting and reintegrating with the new view should avoid that. Right now > with the SEBSD branch, my goal is basically to get it compiling and booting, > not to get it working, so hands to work on it are still very welcome! > > Robert N M Watson > > > > > all the other TrustedBSD branches are branched > > from the 'trustedbsd' base branch > > in //depot/projects/trustedbsd/base/... > > For example, the audit3 branch's view is: > > > > View: > > //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... > > > > Wherease the sebsd2 branch's view is: > > > > View: > > //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... > > > > Though i see you have now synched the trustedbsd/base also so i need to > > change the view. and basically fix sebsd2. > > > > On Thu, 2006-03-09 at 00:41 +0000, Robert Watson wrote: > >> http://perforce.freebsd.org/chv.cgi?CH=93005 > >> > >> Change 93005 by rwatson@rwatson_peppercorn on 2006/03/09 00:40:26 > >> > >> First pass attempt to update SEBSD through @92986 of the TrustedBSD > >> MAC branch. Probably doesn't compile, and certainly doesn't run > >> (yet). > >> > >> Affected files ... > >> > >> .. //depot/projects/trustedbsd/sebsd/COPYRIGHT#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/LOCKS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/MACREADME#4 branch > >> .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/Makefile#12 integrate > >> .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#12 integrate > >> .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#1 branch > >> .. //depot/projects/trustedbsd/sebsd/README#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/UPDATING#12 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/extern.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.2#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/config.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/config_p.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv_stub.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.1#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.1#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/extern.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#10 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#10 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/util.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#9 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.1#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/alias.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith_lex.l#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/bltin.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/builtins.def#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/error.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/histedit.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mail.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/main.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/miscbltin.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkbuiltins#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkinit.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mksyntax.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/options.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/output.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/show.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/trap.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sleep/sleep.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.8#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.8#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.1#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.8#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.8#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.8#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bc/bc/main.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/CHANGES#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ.xml#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Xlist#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/README#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.1#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dighost.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.1#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.1#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/aclconf.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/client.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/control.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/client.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/log.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/main.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.5#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.docbook#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/query.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/server.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/os.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/update.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/xfrout.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/zoneconf.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.threads.in#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/configure.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/isc.color.gif#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/validate.sh.in#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/options#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/index#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3757.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3901.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4025.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4033.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4034.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4035.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4074.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4159.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/Makefile.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/config.h.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/support.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_after.h.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_before.h.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/check.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/getaddresses.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/adb.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/cache.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/forward.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/gen-unix.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/journal.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/key.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/message.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/name.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbt.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbtdb.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/resolver.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tkey.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tsig.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/validator.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/xfrin.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/zone.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/print.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/inet_pton.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/lfsr.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/mem.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/quota.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/result.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/rwlock.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/timer.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/entropy.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/net.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/os.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/socket.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/namedconf.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getipnode.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwconfig.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/print.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/strtoul.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/make/rules.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/version#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/binutils/opcodes/sparc-opc.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/NEWS#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/TODO#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/VERSION#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpagent.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpclient.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmplib.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/support.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/oid-list#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/.gdbinit#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/config.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/export.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/main.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.config#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trap.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bzip2/bzip2.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/com_err/compile_et.1#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ABOUT-NLS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/AUTHORS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING.LIB#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ChangeLog#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/FREEBSD-upgrade#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/INSTALL#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/NEWS#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/README#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/THANKS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/TODO#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/alloca.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyin.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyout.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copypass.c#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.1#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.texi#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpiohdr.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dirname.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.1#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.texi#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/error.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/extern.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filemode.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filetypes.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/global.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/idcache.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/alloca_.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-ba.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-eexst.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fs-xinl.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-help.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-namefrob.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-parse.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pv.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pvh.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-xinl.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/basename.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exit.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt1.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_int.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/gettext.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/localedir.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rmt.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rtapelib.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strcase.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/stripslash.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strnlen.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/system.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/unlocked-io.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc-die.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xmalloc.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/main.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/makepath.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rmt.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rtapelib.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/safe-stat.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyin.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyout.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copypass.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpio.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpiohdr.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/extern.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filemode.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filetypes.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/global.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/idcache.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/main.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/makepath.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/safe-stat.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tarhdr.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/userspec.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/util.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/stripslash.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/system.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.c#3 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tarhdr.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/userspec.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/util.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/version.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xmalloc.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xstrdup.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/README#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_bsd.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_posix.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/parse.y#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/queue.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/man/cvs.1#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/cvsbug.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/diff/diff.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/Makefile.in#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/attribs.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-decl.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-format.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-opts.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-parse.in#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-ppoutput.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-semantics.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-typeck.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c.opt#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/calls.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgrtl.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/combine.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/common.opt#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.gcc#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.in#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.md#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/qrnnd.asm#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-osf4#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-protos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.md#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-netbsd#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-rtems#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-protos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/cygwin1.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/darwin.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/emmintrin.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gthr-win32.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-modes.def#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-protos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.md#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-rtems-i386#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xmmintrin.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-hpux#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix41.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix43.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix52.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.md#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/beos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.asm#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/freebsd.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux-unwind.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux64.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.md#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rtems.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.md#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix43#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix52#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-linux64#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-newas#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rtems#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.md#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/tpf.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.md#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/t-elf#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind-elf#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-darwin#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-sld#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure.ac#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp-demangle.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/Make-lang.in#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/call.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/class.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.h#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cvt.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cxx-pretty-print.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl2.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/error.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/except.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/g++spec.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/init.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mangle.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/method.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/name-lookup.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/parser.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/pt.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/search.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/semantics.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/tree.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck2.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppfiles.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmacro.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/crtstuff.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cse.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dbxout.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/defaults.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/extend.texi#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gcc-common.texi#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/invoke.texi#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/md.texi#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/tm.texi#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/trouble.texi#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dojump.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/emit-rtl.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/explow.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expmed.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bld.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/malloc.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/news.texi#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flow.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fold-const.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov-io.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcse.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ginclude/stddef.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gthr-win32.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ifcvt.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/jump.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-darwin.ver#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-std.ver#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop-unroll.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mkheaders.in#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mklibgcc.in#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/objc/objc-act.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.def#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/postreload.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/predict.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/real.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reg-stack.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regclass.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regrename.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regs.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload1.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/rtl.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/sibcall.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/simplify-rtx.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target-def.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/toplev.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree-inline.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-compat.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/varasm.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/version.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/COPYING#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.115#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.116#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.117#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.118#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FDL#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FREEBSD-upgrade#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL.gen#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/LICENSE#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MANIFEST#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MORE.STUFF#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.ccpg#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.comm#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.cpg#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.in#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.init#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.sub#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/NEWS#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROBLEMS#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROJECTS#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.MinGW#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.WIN32#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/REVISION#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/TODO#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/aclocal.m4#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure.ac#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/README#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file1#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file2#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/ChangeLog#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/Makefile.sub#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README_SH#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/TODO#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.man#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.sh#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer2.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/ChangeLog#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/groff_mm.man#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/m.tmac#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/mmroff.pl#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/BUGS#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/ChangeLog#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/Makefile.sub#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/NEWS#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/TODO#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/copyright#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.mom#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/macros.mom#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typeset.mom#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/groff_mom.man#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/color.html#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docelement.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docprocessing.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/goodies.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/inlines.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/intro.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/refer.html#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/reserved.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/toc.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typesetting.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/using.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/om.tmac#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/ChangeLog#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/README#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/TODO#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/cover.ms#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.sh#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.in#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.sub#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fdl.texi#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fixinfo.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-1#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-10#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-11#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-2#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-3#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-4#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-5#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-6#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-7#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-8#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-9#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.css#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.texinfo#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/meref.me#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/pic.ms#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/texinfo.tex#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/webpage.ms#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devdvi/generate/Makefile#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/DESC.proto#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/Makefile.sub#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/R.proto#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AB#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ABI#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AI#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AR#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CLARENDON#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CORONET#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/MARIGOLD#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/Makefile.sub#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/S#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/SYMBOL#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRB#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRBI#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRI#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRR#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/WINGDINGS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/generate/Makefile#2 integrate > >> > >>>>> TRUNCATED FOR MAIL (1000 lines) <<< > >> _______________________________________________ > >> trustedbsd-cvs@FreeBSD.org mailing list > >> http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs > >> To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" > > > > From owner-p4-projects@FreeBSD.ORG Thu Mar 9 12:55:48 2006 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 428F416A424; Thu, 9 Mar 2006 12:55:47 +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 E724D16A420; Thu, 9 Mar 2006 12:55:44 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from bastille.optimhosts.com (bastille.optimhosts.com [203.177.161.185]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBF5C43D45; Thu, 9 Mar 2006 12:55:42 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from localhost (bastille.local [127.0.0.1]) by bastille.optimhosts.com (Postfix) with ESMTP id 6976D8C8490; Thu, 9 Mar 2006 20:50:51 +0800 (PHT) Received: from bastille.optimhosts.com ([127.0.0.1]) by localhost (bastille.optimhosts.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 60185-09; Thu, 9 Mar 2006 20:50:09 +0800 (PHT) Received: from [192.168.2.106] (unknown [210.213.197.144]) by bastille.optimhosts.com (Postfix) with ESMTP id 1EF8B8C847D; Thu, 9 Mar 2006 20:50:07 +0800 (PHT) From: Dingo To: Robert Watson In-Reply-To: <20060309105315.M52152@fledge.watson.org> References: <200603090041.k290fnfV056558@repoman.freebsd.org> <1141898670.34657.10.camel@localhost.localdomain> <20060309105315.M52152@fledge.watson.org> Content-Type: text/plain Date: Thu, 09 Mar 2006 20:54:53 +0000 Message-Id: <1141937697.797.7.camel@pavilion.optimlabs.com> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at bastille.optimhosts.com Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93005 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, 09 Mar 2006 12:55:48 -0000 Well seems build world works fine, doing a kernel now, then ill do some testing to see how functional it all is, also note this build was done on amd64. I set a DESTDIR for /private/build and it builds and installs fine, ill move the code to a crash test box and see what its like on booting and useability. but for compiling, well at least it builds. On Thu, 2006-03-09 at 10:55 +0000, Robert Watson wrote: > On Thu, 9 Mar 2006, Dingo wrote: 5B > > > Well this would bring us to a more current snapshot off of FreeBSD, Ill get > > to work on both Trees, though I need to "fix" the sebsd2 integration, I went > > with the email you sent, though John Baldwin replied to the integration and > > stated it should have been done from > > Yes, sorry about that! John is right, really we should have parented sebsd2 > from the base branch, as this makes diffing easier, and avoids having to deal > with mac/sebsd branch interactions > > You may find the easiest thing to do is p4 delete / submit the current sebsd2 > subtree, then update the branch and re-integrate. P4 should be able to > reparent it via integration, but there is some trickiness to it and just > deleting and reintegrating with the new view should avoid that. Right now > with the SEBSD branch, my goal is basically to get it compiling and booting, > not to get it working, so hands to work on it are still very welcome! > > Robert N M Watson > > > > > all the other TrustedBSD branches are branched > > from the 'trustedbsd' base branch > > in //depot/projects/trustedbsd/base/... > > For example, the audit3 branch's view is: > > > > View: > > //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... > > > > Wherease the sebsd2 branch's view is: > > > > View: > > //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... > > > > Though i see you have now synched the trustedbsd/base also so i need to > > change the view. and basically fix sebsd2. > > > > On Thu, 2006-03-09 at 00:41 +0000, Robert Watson wrote: > >> http://perforce.freebsd.org/chv.cgi?CH=93005 > >> > >> Change 93005 by rwatson@rwatson_peppercorn on 2006/03/09 00:40:26 > >> > >> First pass attempt to update SEBSD through @92986 of the TrustedBSD > >> MAC branch. Probably doesn't compile, and certainly doesn't run > >> (yet). > >> > >> Affected files ... > >> > >> .. //depot/projects/trustedbsd/sebsd/COPYRIGHT#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/LOCKS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/MACREADME#4 branch > >> .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/Makefile#12 integrate > >> .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#12 integrate > >> .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#1 branch > >> .. //depot/projects/trustedbsd/sebsd/README#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/UPDATING#12 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/extern.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.2#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/config.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/config_p.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv_stub.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.1#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.1#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/extern.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#10 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#10 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/util.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#9 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.1#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/alias.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith_lex.l#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/bltin.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/builtins.def#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/error.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/histedit.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mail.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/main.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/miscbltin.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkbuiltins#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkinit.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mksyntax.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/options.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/output.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/show.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/trap.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sleep/sleep.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.8#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.8#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.1#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.8#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.8#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.8#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bc/bc/main.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/CHANGES#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ.xml#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Xlist#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/README#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.1#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dighost.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.1#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.1#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/aclconf.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/client.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/control.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/client.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/log.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/main.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.5#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.docbook#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/query.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/server.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/os.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/update.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/xfrout.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/zoneconf.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.threads.in#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/configure.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/isc.color.gif#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/validate.sh.in#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/options#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/index#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3757.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3901.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4025.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4033.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4034.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4035.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4074.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4159.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/Makefile.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/config.h.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/support.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_after.h.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_before.h.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/check.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/getaddresses.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/adb.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/cache.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/forward.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/gen-unix.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/journal.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/key.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/message.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/name.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbt.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbtdb.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/resolver.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tkey.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tsig.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/validator.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/xfrin.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/zone.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/print.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/inet_pton.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/lfsr.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/mem.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/quota.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/result.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/rwlock.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/timer.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/entropy.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/net.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/os.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/socket.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/namedconf.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getipnode.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwconfig.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/print.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/strtoul.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/make/rules.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/version#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/binutils/opcodes/sparc-opc.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/NEWS#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/TODO#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/VERSION#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpagent.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpclient.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmplib.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/support.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/oid-list#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/.gdbinit#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/config.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/export.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/main.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.config#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trap.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bzip2/bzip2.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/com_err/compile_et.1#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ABOUT-NLS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/AUTHORS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING.LIB#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ChangeLog#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/FREEBSD-upgrade#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/INSTALL#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/NEWS#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/README#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/THANKS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/TODO#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/alloca.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyin.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyout.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copypass.c#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.1#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.texi#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpiohdr.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dirname.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.1#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.texi#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/error.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/extern.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filemode.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filetypes.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/global.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/idcache.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/alloca_.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-ba.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-eexst.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fs-xinl.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-help.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-namefrob.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-parse.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pv.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pvh.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-xinl.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/basename.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exit.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt1.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_int.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/gettext.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/localedir.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rmt.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rtapelib.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strcase.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/stripslash.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strnlen.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/system.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/unlocked-io.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc-die.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xmalloc.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/main.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/makepath.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rmt.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rtapelib.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/safe-stat.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyin.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyout.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copypass.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpio.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpiohdr.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/extern.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filemode.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filetypes.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/global.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/idcache.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/main.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/makepath.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/safe-stat.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tarhdr.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/userspec.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/util.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/stripslash.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/system.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.c#3 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tarhdr.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/userspec.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/util.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/version.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xmalloc.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xstrdup.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/README#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_bsd.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_posix.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/parse.y#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/queue.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/man/cvs.1#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/cvsbug.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/diff/diff.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/Makefile.in#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/attribs.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-decl.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-format.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-opts.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-parse.in#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-ppoutput.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-semantics.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-typeck.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c.opt#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/calls.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgrtl.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/combine.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/common.opt#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.gcc#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.in#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.md#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/qrnnd.asm#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-osf4#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-protos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.md#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-netbsd#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-rtems#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-protos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/cygwin1.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/darwin.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/emmintrin.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gthr-win32.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-modes.def#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-protos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.md#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-rtems-i386#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xmmintrin.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-hpux#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix41.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix43.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix52.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.md#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/beos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.asm#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/freebsd.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux-unwind.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux64.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.md#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rtems.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.md#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix43#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix52#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-linux64#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-newas#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rtems#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.md#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/tpf.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.md#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/t-elf#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind-elf#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-darwin#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-sld#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure.ac#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp-demangle.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/Make-lang.in#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/call.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/class.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.h#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cvt.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cxx-pretty-print.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl2.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/error.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/except.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/g++spec.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/init.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mangle.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/method.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/name-lookup.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/parser.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/pt.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/search.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/semantics.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/tree.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck2.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppfiles.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmacro.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/crtstuff.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cse.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dbxout.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/defaults.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/extend.texi#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gcc-common.texi#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/invoke.texi#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/md.texi#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/tm.texi#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/trouble.texi#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dojump.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/emit-rtl.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/explow.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expmed.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bld.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/malloc.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/news.texi#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flow.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fold-const.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov-io.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcse.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ginclude/stddef.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gthr-win32.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ifcvt.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/jump.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-darwin.ver#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-std.ver#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop-unroll.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mkheaders.in#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mklibgcc.in#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/objc/objc-act.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.def#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/postreload.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/predict.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/real.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reg-stack.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regclass.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regrename.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regs.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload1.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/rtl.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/sibcall.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/simplify-rtx.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target-def.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/toplev.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree-inline.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-compat.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/varasm.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/version.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/COPYING#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.115#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.116#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.117#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.118#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FDL#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FREEBSD-upgrade#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL.gen#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/LICENSE#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MANIFEST#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MORE.STUFF#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.ccpg#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.comm#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.cpg#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.in#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.init#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.sub#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/NEWS#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROBLEMS#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROJECTS#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.MinGW#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.WIN32#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/REVISION#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/TODO#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/aclocal.m4#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure.ac#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/README#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file1#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file2#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/ChangeLog#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/Makefile.sub#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README_SH#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/TODO#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.man#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.sh#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer2.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/ChangeLog#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/groff_mm.man#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/m.tmac#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/mmroff.pl#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/BUGS#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/ChangeLog#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/Makefile.sub#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/NEWS#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/TODO#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/copyright#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.mom#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/macros.mom#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typeset.mom#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/groff_mom.man#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/color.html#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docelement.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docprocessing.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/goodies.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/inlines.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/intro.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/refer.html#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/reserved.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/toc.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typesetting.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/using.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/om.tmac#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/ChangeLog#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/README#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/TODO#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/cover.ms#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.sh#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.in#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.sub#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fdl.texi#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fixinfo.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-1#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-10#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-11#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-2#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-3#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-4#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-5#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-6#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-7#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-8#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-9#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.css#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.texinfo#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/meref.me#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/pic.ms#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/texinfo.tex#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/webpage.ms#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devdvi/generate/Makefile#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/DESC.proto#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/Makefile.sub#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/R.proto#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AB#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ABI#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AI#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AR#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CLARENDON#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CORONET#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/MARIGOLD#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/Makefile.sub#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/S#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/SYMBOL#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRB#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRBI#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRI#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRR#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/WINGDINGS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/generate/Makefile#2 integrate > >> > >>>>> TRUNCATED FOR MAIL (1000 lines) <<< > >> _______________________________________________ > >> trustedbsd-cvs@FreeBSD.org mailing list > >> http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs > >> To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" > > > > From owner-p4-projects@FreeBSD.ORG Thu Mar 9 13:21:08 2006 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 AA08A16A423; Thu, 9 Mar 2006 13:21:07 +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 478AA16A420; Thu, 9 Mar 2006 13:21:07 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from bastille.optimhosts.com (bastille.optimhosts.com [203.177.161.185]) by mx1.FreeBSD.org (Postfix) with ESMTP id D90E643D46; Thu, 9 Mar 2006 13:21:04 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from localhost (bastille.local [127.0.0.1]) by bastille.optimhosts.com (Postfix) with ESMTP id 425B28C84AA; Thu, 9 Mar 2006 21:16:13 +0800 (PHT) Received: from bastille.optimhosts.com ([127.0.0.1]) by localhost (bastille.optimhosts.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 60572-08; Thu, 9 Mar 2006 21:15:29 +0800 (PHT) Received: from [192.168.2.106] (unknown [210.213.197.144]) by bastille.optimhosts.com (Postfix) with ESMTP id BFA958C847D; Thu, 9 Mar 2006 21:15:27 +0800 (PHT) From: Dingo To: Robert Watson In-Reply-To: <1141937697.797.7.camel@pavilion.optimlabs.com> References: <200603090041.k290fnfV056558@repoman.freebsd.org> <1141898670.34657.10.camel@localhost.localdomain> <20060309105315.M52152@fledge.watson.org> <1141937697.797.7.camel@pavilion.optimlabs.com> Content-Type: text/plain Date: Thu, 09 Mar 2006 21:20:17 +0000 Message-Id: <1141939218.797.11.camel@pavilion.optimlabs.com> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at bastille.optimhosts.com Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93005 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, 09 Mar 2006 13:21:09 -0000 on i386 MAC kernel builds fine, though on amd64 MAC kernel fails with -------------------------------------------------------------- >>> stage 3.2: building everything -------------------------------------------------------------- cd /usr/obj/private/work/sebsd/sys/MAC; MAKEOBJDIRPREFIX=/usr/obj MACHINE_ARCH=amd64 MACHINE=amd64 CPUTYPE= GROFF_BIN_PATH=/usr/obj/private/work/sebsd/tmp/legacy/usr/bin GROFF_FONT_PATH=/usr/obj/private/work/sebsd/tmp/legacy/usr/share/groff_font GROFF_TMAC_PATH=/usr/obj/private/work/sebsd/tmp/legacy/usr/share/tmac _SHLIBDIRPREFIX=/usr/obj/private/work/sebsd/tmp INSTALL="sh /private/work/sebsd/tools/install.sh" PATH=/usr/obj/private/work/sebsd/tmp/legacy/usr/sbin:/usr/obj/private/work/sebsd/tmp/legacy/usr/bin:/usr/obj/private/work/sebsd/tmp/legacy/usr/games:/usr/obj/private/work/sebsd/tmp/usr/sbin:/usr/obj/private/work/sebsd/tmp/usr/bin:/usr/obj/private/work/sebsd/tmp/usr/games:/sbin:/bin:/usr/sbin:/usr/bin make KERNEL=kernel all -DNO_MODULES_OBJ cc -c -O2 -frename-registers -pipe -fno-strict-aliasing -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -fformat-extensions -std=c99 -g -nostdinc -I- -I. -I/private/work/sebsd/sys -I/private/work/sebsd/sys/contrib/altq -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx -mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -ffreestanding -Werror /private/work/sebsd/sys/amd64/amd64/machdep.c /private/work/sebsd/sys/amd64/amd64/machdep.c: In function `set_dbregs': /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: warning: implicit declaration of function `cap_check' /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: warning: nested extern declaration of `cap_check' /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: error: `CAP_SYS_RAWIO' undeclared (first use in this function) /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: error: (Each undeclared identifier is reported only once /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: error: for each function it appears in.) On Thu, 2006-03-09 at 20:54 +0000, Dingo wrote: > Well seems build world works fine, doing a kernel now, then ill do some > testing to see how functional it all is, also note this build was done > on amd64. I set a DESTDIR for /private/build and it builds and installs > fine, ill move the code to a crash test box and see what its like on > booting and useability. but for compiling, well at least it builds. > > On Thu, 2006-03-09 at 10:55 +0000, Robert Watson wrote: > > On Thu, 9 Mar 2006, Dingo wrote: 5B > > > > > Well this would bring us to a more current snapshot off of FreeBSD, Ill get > > > to work on both Trees, though I need to "fix" the sebsd2 integration, I went > > > with the email you sent, though John Baldwin replied to the integration and > > > stated it should have been done from > > > > Yes, sorry about that! John is right, really we should have parented sebsd2 > > from the base branch, as this makes diffing easier, and avoids having to deal > > with mac/sebsd branch interactions > > > > You may find the easiest thing to do is p4 delete / submit the current sebsd2 > > subtree, then update the branch and re-integrate. P4 should be able to > > reparent it via integration, but there is some trickiness to it and just > > deleting and reintegrating with the new view should avoid that. Right now > > with the SEBSD branch, my goal is basically to get it compiling and booting, > > not to get it working, so hands to work on it are still very welcome! > > > > Robert N M Watson > > > > > > > > all the other TrustedBSD branches are branched > > > from the 'trustedbsd' base branch > > > in //depot/projects/trustedbsd/base/... > > > For example, the audit3 branch's view is: > > > > > > View: > > > //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... > > > > > > Wherease the sebsd2 branch's view is: > > > > > > View: > > > //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... > > > > > > Though i see you have now synched the trustedbsd/base also so i need to > > > change the view. and basically fix sebsd2. > > > > > > On Thu, 2006-03-09 at 00:41 +0000, Robert Watson wrote: > > >> http://perforce.freebsd.org/chv.cgi?CH=93005 > > >> > > >> Change 93005 by rwatson@rwatson_peppercorn on 2006/03/09 00:40:26 > > >> > > >> First pass attempt to update SEBSD through @92986 of the TrustedBSD > > >> MAC branch. Probably doesn't compile, and certainly doesn't run > > >> (yet). > > >> > > >> Affected files ... > > >> > > >> .. //depot/projects/trustedbsd/sebsd/COPYRIGHT#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/LOCKS#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/MACREADME#4 branch > > >> .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#8 integrate > > >> .. //depot/projects/trustedbsd/sebsd/Makefile#12 integrate > > >> .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#12 integrate > > >> .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/README#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/UPDATING#12 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/extern.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#8 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.2#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/config.h#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/config_p.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv_stub.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#8 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.1#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.1#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/extern.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#10 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#10 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/util.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#9 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.1#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/alias.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.h#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith_lex.l#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/bltin.h#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/builtins.def#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/error.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.h#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/histedit.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mail.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/main.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.h#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/miscbltin.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkbuiltins#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkinit.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mksyntax.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/options.c#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/output.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#8 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/show.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/trap.c#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.h#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sleep/sleep.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.8#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.8#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.1#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.8#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.8#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.8#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bc/bc/main.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/CHANGES#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ.xml#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Xlist#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/README#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.1#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dighost.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.1#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.1#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/Makefile.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/aclconf.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/client.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/control.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/client.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/log.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/main.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.5#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.docbook#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/query.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/server.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/os.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/update.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/xfrout.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/zoneconf.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.threads.in#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/configure.in#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/Makefile.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Makefile.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/isc.color.gif#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/validate.sh.in#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/options#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/index#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3757.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3901.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4025.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4033.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4034.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4035.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4074.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4159.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/Makefile.in#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/api#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/config.h.in#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure.in#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/support.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_after.h.in#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_before.h.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/api#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/check.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/getaddresses.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/adb.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/api#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/cache.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/forward.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/gen-unix.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/journal.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/key.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/message.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/name.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbt.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbtdb.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/resolver.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tkey.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tsig.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/validator.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/xfrin.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/zone.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/api#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/print.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/inet_pton.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/lfsr.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/mem.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/quota.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/result.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/rwlock.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/timer.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/entropy.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/net.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/os.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/socket.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/api#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/namedconf.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/Makefile.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/api#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getipnode.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwconfig.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/print.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/strtoul.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/make/rules.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/version#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/binutils/opcodes/sparc-opc.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/NEWS#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/TODO#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/VERSION#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.3#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.c#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.h#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpagent.3#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpclient.3#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmplib.3#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.c#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/support.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/oid-list#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/.gdbinit#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/config.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/export.c#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/main.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.config#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.3#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trap.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bzip2/bzip2.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/com_err/compile_et.1#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ABOUT-NLS#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/AUTHORS#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING.LIB#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ChangeLog#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/FREEBSD-upgrade#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/INSTALL#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/NEWS#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/README#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/THANKS#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/TODO#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/alloca.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyin.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyout.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copypass.c#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.1#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.texi#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpiohdr.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dirname.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.1#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.texi#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/error.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/extern.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filemode.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filetypes.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/global.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/idcache.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/alloca_.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-ba.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-eexst.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fs-xinl.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-help.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-namefrob.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-parse.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pv.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pvh.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-xinl.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/basename.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exit.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt1.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_int.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/gettext.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/localedir.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rmt.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rtapelib.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strcase.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/stripslash.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strnlen.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/system.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/unlocked-io.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc-die.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xmalloc.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/main.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/makepath.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rmt.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rtapelib.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/safe-stat.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyin.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyout.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copypass.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpio.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpiohdr.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/extern.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filemode.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filetypes.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/global.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/idcache.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/main.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/makepath.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/safe-stat.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tarhdr.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/userspec.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/util.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/stripslash.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/system.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.c#3 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tarhdr.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/userspec.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/util.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/version.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xmalloc.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xstrdup.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/README#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_bsd.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_posix.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/parse.y#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/queue.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/man/cvs.1#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/cvsbug.in#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/diff/diff.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/Makefile.in#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/attribs.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-decl.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-format.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-opts.c#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-parse.in#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-ppoutput.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-semantics.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-typeck.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c.opt#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/calls.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgrtl.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/combine.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/common.opt#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.gcc#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.in#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.h#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.md#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/qrnnd.asm#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-osf4#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-protos.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.md#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-netbsd#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-rtems#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-protos.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.h#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#8 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/cygwin1.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/darwin.h#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/emmintrin.h#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gthr-win32.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-modes.def#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-protos.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.h#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.md#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-rtems-i386#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xmmintrin.h#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-hpux#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix41.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix43.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix52.h#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.md#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/beos.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.asm#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/freebsd.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux-unwind.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux.h#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux64.h#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.md#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rtems.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.h#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.md#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4.h#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix43#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix52#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-linux64#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-newas#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rtems#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.md#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/tpf.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.md#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/t-elf#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind-elf#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-darwin#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-sld#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure.ac#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp-demangle.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/Make-lang.in#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/call.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/class.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.h#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cvt.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cxx-pretty-print.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl2.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/error.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/except.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/g++spec.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/init.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mangle.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/method.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/name-lookup.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/parser.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/pt.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/search.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/semantics.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/tree.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck2.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppfiles.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmacro.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/crtstuff.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cse.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dbxout.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/defaults.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/extend.texi#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gcc-common.texi#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/invoke.texi#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/md.texi#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/tm.texi#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/trouble.texi#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dojump.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/emit-rtl.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/explow.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expmed.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bld.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/malloc.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/news.texi#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flow.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fold-const.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov-io.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcse.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ginclude/stddef.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gthr-win32.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ifcvt.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/jump.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-darwin.ver#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-std.ver#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop-unroll.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mkheaders.in#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mklibgcc.in#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/objc/objc-act.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.def#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/postreload.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/predict.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/real.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reg-stack.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regclass.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regrename.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regs.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload1.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/rtl.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/sibcall.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/simplify-rtx.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target-def.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/toplev.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree-inline.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.h#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-compat.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/varasm.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/version.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/COPYING#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.115#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.116#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.117#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.118#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FDL#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FREEBSD-upgrade#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL.gen#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/LICENSE#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MANIFEST#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MORE.STUFF#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.ccpg#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.comm#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.cpg#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.in#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.init#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.sub#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/NEWS#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROBLEMS#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROJECTS#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.MinGW#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.WIN32#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/REVISION#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/TODO#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/aclocal.m4#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure.ac#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/README#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file1#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file2#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/ChangeLog#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/Makefile.sub#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README_SH#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/TODO#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.man#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.sh#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer2.sh#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/ChangeLog#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/groff_mm.man#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/m.tmac#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/mmroff.pl#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/BUGS#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/ChangeLog#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/Makefile.sub#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/NEWS#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/TODO#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/copyright#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.mom#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/macros.mom#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typeset.mom#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/groff_mom.man#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/color.html#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docelement.html#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docprocessing.html#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/goodies.html#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/inlines.html#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/intro.html#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/refer.html#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/reserved.html#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/toc.html#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typesetting.html#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/using.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/om.tmac#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/ChangeLog#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/README#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/TODO#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/cover.ms#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.sh#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.in#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.sub#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fdl.texi#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fixinfo.sh#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-1#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-10#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-11#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-2#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-3#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-4#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-5#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-6#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-7#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-8#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-9#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.css#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.texinfo#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/meref.me#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/pic.ms#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/texinfo.tex#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/webpage.ms#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devdvi/generate/Makefile#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/DESC.proto#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/Makefile.sub#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/R.proto#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AB#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ABI#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AI#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AR#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CBI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CLARENDON#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CORONET#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GBI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/MARIGOLD#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/Makefile.sub#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OBI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/S#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/SYMBOL#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TBI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRB#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRBI#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRI#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRR#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UBI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCBI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/WINGDINGS#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/generate/Makefile#2 integrate > > >> > > >>>>> TRUNCATED FOR MAIL (1000 lines) <<< > > >> _______________________________________________ > > >> trustedbsd-cvs@FreeBSD.org mailing list > > >> http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs > > >> To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" > > > > > > > > _______________________________________________ > trustedbsd-cvs@FreeBSD.org mailing list > http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs > To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" From owner-p4-projects@FreeBSD.ORG Thu Mar 9 13:33:12 2006 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 B5D6E16A423; Thu, 9 Mar 2006 13:33:11 +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 4DE6816A420 for ; Thu, 9 Mar 2006 13:33:11 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 024E743D48 for ; Thu, 9 Mar 2006 13:33:09 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id D3B1C46B1A; Thu, 9 Mar 2006 08:32:47 -0500 (EST) Date: Thu, 9 Mar 2006 13:33:30 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Dingo In-Reply-To: <1141937697.797.7.camel@pavilion.optimlabs.com> Message-ID: <20060309132840.P13591@fledge.watson.org> References: <200603090041.k290fnfV056558@repoman.freebsd.org> <1141898670.34657.10.camel@localhost.localdomain> <20060309105315.M52152@fledge.watson.org> <1141937697.797.7.camel@pavilion.optimlabs.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93005 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, 09 Mar 2006 13:33:13 -0000 On Thu, 9 Mar 2006, Dingo wrote: > Well seems build world works fine, doing a kernel now, then ill do some > testing to see how functional it all is, also note this build was done on > amd64. I set a DESTDIR for /private/build and it builds and installs fine, > ill move the code to a crash test box and see what its like on booting and > useability. but for compiling, well at least it builds. I'm pretty sure it will crash, and as such, likely be quite unusable :-). However, bug fixes would be welcome. Robert N M Watson > > On Thu, 2006-03-09 at 10:55 +0000, Robert Watson wrote: >> On Thu, 9 Mar 2006, Dingo wrote: 5B >> >>> Well this would bring us to a more current snapshot off of FreeBSD, Ill get >>> to work on both Trees, though I need to "fix" the sebsd2 integration, I went >>> with the email you sent, though John Baldwin replied to the integration and >>> stated it should have been done from >> >> Yes, sorry about that! John is right, really we should have parented sebsd2 >> from the base branch, as this makes diffing easier, and avoids having to deal >> with mac/sebsd branch interactions >> >> You may find the easiest thing to do is p4 delete / submit the current sebsd2 >> subtree, then update the branch and re-integrate. P4 should be able to >> reparent it via integration, but there is some trickiness to it and just >> deleting and reintegrating with the new view should avoid that. Right now >> with the SEBSD branch, my goal is basically to get it compiling and booting, >> not to get it working, so hands to work on it are still very welcome! >> >> Robert N M Watson >> >>> >>> all the other TrustedBSD branches are branched >>> from the 'trustedbsd' base branch >>> in //depot/projects/trustedbsd/base/... >>> For example, the audit3 branch's view is: >>> >>> View: >>> //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... >>> >>> Wherease the sebsd2 branch's view is: >>> >>> View: >>> //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... >>> >>> Though i see you have now synched the trustedbsd/base also so i need to >>> change the view. and basically fix sebsd2. >>> >>> On Thu, 2006-03-09 at 00:41 +0000, Robert Watson wrote: >>>> http://perforce.freebsd.org/chv.cgi?CH=93005 >>>> >>>> Change 93005 by rwatson@rwatson_peppercorn on 2006/03/09 00:40:26 >>>> >>>> First pass attempt to update SEBSD through @92986 of the TrustedBSD >>>> MAC branch. Probably doesn't compile, and certainly doesn't run >>>> (yet). >>>> >>>> Affected files ... >>>> >>>> .. //depot/projects/trustedbsd/sebsd/COPYRIGHT#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/LOCKS#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/MACREADME#4 branch >>>> .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#8 integrate >>>> .. //depot/projects/trustedbsd/sebsd/Makefile#12 integrate >>>> .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#12 integrate >>>> .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/README#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/UPDATING#12 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/cp/extern.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#8 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.2#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/config.h#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/config_p.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv_stub.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#8 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.1#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.1#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/extern.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#10 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#10 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/util.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#9 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.1#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/alias.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.h#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith_lex.l#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/bltin.h#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/builtins.def#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/error.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.h#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/histedit.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/mail.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/main.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.h#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/miscbltin.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkbuiltins#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkinit.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/mksyntax.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/options.c#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/output.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#8 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/show.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/trap.c#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.h#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sleep/sleep.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.8#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.8#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.1#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.8#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.8#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.8#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bc/bc/main.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/CHANGES#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ.xml#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Xlist#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/README#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.1#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dighost.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.1#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.1#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/Makefile.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/aclconf.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/client.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/control.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/client.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/log.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/main.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.5#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.docbook#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/query.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/server.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/os.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/update.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/xfrout.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/zoneconf.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.threads.in#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/configure.in#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/Makefile.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Makefile.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/isc.color.gif#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/validate.sh.in#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/options#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/index#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3757.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3901.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4025.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4033.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4034.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4035.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4074.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4159.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/Makefile.in#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/api#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/config.h.in#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure.in#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/support.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_after.h.in#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_before.h.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/api#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/check.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/getaddresses.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/adb.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/api#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/cache.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/forward.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/gen-unix.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/journal.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/key.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/message.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/name.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbt.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbtdb.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/resolver.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tkey.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tsig.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/validator.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/xfrin.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/zone.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/api#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/print.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/inet_pton.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/lfsr.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/mem.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/quota.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/result.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/rwlock.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/timer.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/entropy.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/net.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/os.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/socket.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/api#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/namedconf.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/Makefile.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/api#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getipnode.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwconfig.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/print.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/strtoul.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/make/rules.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/version#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/binutils/opcodes/sparc-opc.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/NEWS#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/TODO#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/VERSION#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.3#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.c#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.h#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpagent.3#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpclient.3#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmplib.3#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.c#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/support.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/oid-list#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/.gdbinit#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/config.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/export.c#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/main.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.config#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.3#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trap.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bzip2/bzip2.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/com_err/compile_et.1#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ABOUT-NLS#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/AUTHORS#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING.LIB#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ChangeLog#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/FREEBSD-upgrade#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/INSTALL#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/NEWS#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/README#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/THANKS#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/TODO#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/alloca.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyin.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyout.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copypass.c#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.1#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.texi#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpiohdr.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dirname.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.1#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.texi#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/error.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/extern.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filemode.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filetypes.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/global.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/idcache.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/alloca_.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-ba.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-eexst.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fs-xinl.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-help.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-namefrob.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-parse.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pv.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pvh.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-xinl.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/basename.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exit.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt1.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_int.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/gettext.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/localedir.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rmt.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rtapelib.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strcase.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/stripslash.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strnlen.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/system.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/unlocked-io.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc-die.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xmalloc.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/main.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/makepath.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rmt.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rtapelib.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/safe-stat.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyin.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyout.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copypass.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpio.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpiohdr.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/extern.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filemode.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filetypes.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/global.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/idcache.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/main.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/makepath.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/safe-stat.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tarhdr.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/userspec.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/util.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/stripslash.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/system.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.c#3 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tarhdr.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/userspec.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/util.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/version.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xmalloc.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xstrdup.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/README#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_bsd.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_posix.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/parse.y#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/queue.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/man/cvs.1#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/cvsbug.in#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/diff/diff.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/Makefile.in#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/attribs.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-decl.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-format.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-opts.c#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-parse.in#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-ppoutput.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-semantics.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-typeck.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c.opt#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/calls.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgrtl.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/combine.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/common.opt#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.gcc#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.in#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.h#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.md#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/qrnnd.asm#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-osf4#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-protos.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.md#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-netbsd#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-rtems#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-protos.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.h#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#8 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/cygwin1.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/darwin.h#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/emmintrin.h#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gthr-win32.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-modes.def#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-protos.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.h#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.md#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-rtems-i386#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xmmintrin.h#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-hpux#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix41.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix43.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix52.h#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.md#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/beos.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.asm#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/freebsd.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux-unwind.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux.h#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux64.h#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.md#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rtems.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.h#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.md#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4.h#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix43#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix52#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-linux64#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-newas#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rtems#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.md#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/tpf.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.md#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/t-elf#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind-elf#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-darwin#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-sld#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure.ac#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp-demangle.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/Make-lang.in#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/call.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/class.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.h#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cvt.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cxx-pretty-print.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl2.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/error.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/except.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/g++spec.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/init.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mangle.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/method.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/name-lookup.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/parser.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/pt.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/search.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/semantics.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/tree.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck2.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppfiles.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmacro.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/crtstuff.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cse.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dbxout.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/defaults.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/extend.texi#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gcc-common.texi#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/invoke.texi#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/md.texi#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/tm.texi#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/trouble.texi#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dojump.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/emit-rtl.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/explow.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expmed.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bld.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/malloc.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/news.texi#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flow.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fold-const.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov-io.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcse.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ginclude/stddef.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gthr-win32.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ifcvt.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/jump.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-darwin.ver#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-std.ver#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop-unroll.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mkheaders.in#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mklibgcc.in#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/objc/objc-act.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.def#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/postreload.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/predict.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/real.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reg-stack.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regclass.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regrename.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regs.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload1.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/rtl.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/sibcall.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/simplify-rtx.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target-def.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/toplev.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree-inline.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.h#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-compat.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/varasm.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/version.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/COPYING#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.115#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.116#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.117#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.118#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FDL#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FREEBSD-upgrade#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL.gen#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/LICENSE#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MANIFEST#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MORE.STUFF#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.ccpg#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.comm#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.cpg#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.in#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.init#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.sub#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/NEWS#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROBLEMS#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROJECTS#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.MinGW#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.WIN32#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/REVISION#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/TODO#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/aclocal.m4#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure.ac#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/README#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file1#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file2#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/ChangeLog#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/Makefile.sub#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README_SH#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/TODO#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.man#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.sh#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer2.sh#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/ChangeLog#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/groff_mm.man#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/m.tmac#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/mmroff.pl#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/BUGS#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/ChangeLog#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/Makefile.sub#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/NEWS#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/TODO#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/copyright#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.mom#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/macros.mom#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typeset.mom#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/groff_mom.man#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/color.html#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docelement.html#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docprocessing.html#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/goodies.html#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/inlines.html#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/intro.html#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/refer.html#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/reserved.html#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/toc.html#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typesetting.html#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/using.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/om.tmac#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/ChangeLog#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/README#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/TODO#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/cover.ms#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.sh#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.in#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.sub#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fdl.texi#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fixinfo.sh#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-1#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-10#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-11#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-2#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-3#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-4#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-5#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-6#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-7#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-8#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-9#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.css#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.texinfo#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/meref.me#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/pic.ms#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/texinfo.tex#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/webpage.ms#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devdvi/generate/Makefile#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/DESC.proto#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/Makefile.sub#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/R.proto#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AB#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ABI#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AI#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AR#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CBI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CLARENDON#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CORONET#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GBI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/MARIGOLD#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/Makefile.sub#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OBI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/S#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/SYMBOL#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TBI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRB#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRBI#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRI#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRR#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UBI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCBI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/WINGDINGS#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/generate/Makefile#2 integrate >>>> >>>>>>> TRUNCATED FOR MAIL (1000 lines) <<< >>>> _______________________________________________ >>>> trustedbsd-cvs@FreeBSD.org mailing list >>>> http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs >>>> To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" >>> >>> > > From owner-p4-projects@FreeBSD.ORG Thu Mar 9 13:38:52 2006 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 A4D5B16A423; Thu, 9 Mar 2006 13:38: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 7E9CA16A420 for ; Thu, 9 Mar 2006 13:38:51 +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 C287143D62 for ; Thu, 9 Mar 2006 13:38:40 +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 k29DcdvB096951 for ; Thu, 9 Mar 2006 13:38:39 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 k29Dcdar096948 for perforce@freebsd.org; Thu, 9 Mar 2006 13:38:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 13:38:39 GMT Message-Id: <200603091338.k29Dcdar096948@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 93041 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, 09 Mar 2006 13:38:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=93041 Change 93041 by rwatson@rwatson_peppercorn on 2006/03/09 13:37:54 Include capability.h for definition of CAP_SYS_RAWIO. Submitted by: Dingo Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/machdep.c#13 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/machdep.c#13 (text+ko) ==== @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Thu Mar 9 13:39:36 2006 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 72E9D16A423; Thu, 9 Mar 2006 13:39: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 3A8DF16A420 for ; Thu, 9 Mar 2006 13:39:35 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3850E43D60 for ; Thu, 9 Mar 2006 13:39:30 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 4F67F46B1E; Thu, 9 Mar 2006 08:39:08 -0500 (EST) Date: Thu, 9 Mar 2006 13:39:51 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Dingo In-Reply-To: <1141939218.797.11.camel@pavilion.optimlabs.com> Message-ID: <20060309133905.C13591@fledge.watson.org> References: <200603090041.k290fnfV056558@repoman.freebsd.org> <1141898670.34657.10.camel@localhost.localdomain> <20060309105315.M52152@fledge.watson.org> <1141937697.797.7.camel@pavilion.optimlabs.com> <1141939218.797.11.camel@pavilion.optimlabs.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93005 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, 09 Mar 2006 13:39:37 -0000 On Thu, 9 Mar 2006, Dingo wrote: > on i386 MAC kernel builds fine, though on amd64 MAC kernel fails with I've not tested amd64 at all since it's not a hardware platform I have hardware for. I've submitted a change to add an include of capability.h to machdep.c, which will probably fix it. Feel free to submit fixes along that line, as I don't doubt there will be more amd64 nits. Robert N M Watson > > -------------------------------------------------------------- >>>> stage 3.2: building everything > -------------------------------------------------------------- > cd /usr/obj/private/work/sebsd/sys/MAC; MAKEOBJDIRPREFIX=/usr/obj > MACHINE_ARCH=amd64 MACHINE=amd64 CPUTYPE= > GROFF_BIN_PATH=/usr/obj/private/work/sebsd/tmp/legacy/usr/bin > GROFF_FONT_PATH=/usr/obj/private/work/sebsd/tmp/legacy/usr/share/groff_font GROFF_TMAC_PATH=/usr/obj/private/work/sebsd/tmp/legacy/usr/share/tmac _SHLIBDIRPREFIX=/usr/obj/private/work/sebsd/tmp INSTALL="sh /private/work/sebsd/tools/install.sh" PATH=/usr/obj/private/work/sebsd/tmp/legacy/usr/sbin:/usr/obj/private/work/sebsd/tmp/legacy/usr/bin:/usr/obj/private/work/sebsd/tmp/legacy/usr/games:/usr/obj/private/work/sebsd/tmp/usr/sbin:/usr/obj/private/work/sebsd/tmp/usr/bin:/usr/obj/private/work/sebsd/tmp/usr/games:/sbin:/bin:/usr/sbin:/usr/bin make KERNEL=kernel all -DNO_MODULES_OBJ > cc -c -O2 -frename-registers -pipe -fno-strict-aliasing -Wall > -Wredundant-decls -Wnested-externs -Wstrict-prototypes > -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual > -fformat-extensions -std=c99 -g -nostdinc -I- -I. > -I/private/work/sebsd/sys -I/private/work/sebsd/sys/contrib/altq > -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common > -finline-limit=8000 --param inline-unit-growth=100 --param > large-function-growth=1000 -fno-omit-frame-pointer -mcmodel=kernel > -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx -mno-3dnow > -msoft-float -fno-asynchronous-unwind-tables -ffreestanding > -Werror /private/work/sebsd/sys/amd64/amd64/machdep.c > /private/work/sebsd/sys/amd64/amd64/machdep.c: In function `set_dbregs': > /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: warning: implicit > declaration of function `cap_check' > /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: warning: nested > extern declaration of `cap_check' > /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: error: > `CAP_SYS_RAWIO' undeclared (first use in this function) > /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: error: (Each > undeclared identifier is reported only once > /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: error: for each > function it appears in.) > > > On Thu, 2006-03-09 at 20:54 +0000, Dingo wrote: >> Well seems build world works fine, doing a kernel now, then ill do some >> testing to see how functional it all is, also note this build was done >> on amd64. I set a DESTDIR for /private/build and it builds and installs >> fine, ill move the code to a crash test box and see what its like on >> booting and useability. but for compiling, well at least it builds. >> >> On Thu, 2006-03-09 at 10:55 +0000, Robert Watson wrote: >>> On Thu, 9 Mar 2006, Dingo wrote: 5B >>> >>>> Well this would bring us to a more current snapshot off of FreeBSD, Ill get >>>> to work on both Trees, though I need to "fix" the sebsd2 integration, I went >>>> with the email you sent, though John Baldwin replied to the integration and >>>> stated it should have been done from >>> >>> Yes, sorry about that! John is right, really we should have parented sebsd2 >>> from the base branch, as this makes diffing easier, and avoids having to deal >>> with mac/sebsd branch interactions >>> >>> You may find the easiest thing to do is p4 delete / submit the current sebsd2 >>> subtree, then update the branch and re-integrate. P4 should be able to >>> reparent it via integration, but there is some trickiness to it and just >>> deleting and reintegrating with the new view should avoid that. Right now >>> with the SEBSD branch, my goal is basically to get it compiling and booting, >>> not to get it working, so hands to work on it are still very welcome! >>> >>> Robert N M Watson >>> >>>> >>>> all the other TrustedBSD branches are branched >>>> from the 'trustedbsd' base branch >>>> in //depot/projects/trustedbsd/base/... >>>> For example, the audit3 branch's view is: >>>> >>>> View: >>>> //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... >>>> >>>> Wherease the sebsd2 branch's view is: >>>> >>>> View: >>>> //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... >>>> >>>> Though i see you have now synched the trustedbsd/base also so i need to >>>> change the view. and basically fix sebsd2. >>>> >>>> On Thu, 2006-03-09 at 00:41 +0000, Robert Watson wrote: >>>>> http://perforce.freebsd.org/chv.cgi?CH=93005 >>>>> >>>>> Change 93005 by rwatson@rwatson_peppercorn on 2006/03/09 00:40:26 >>>>> >>>>> First pass attempt to update SEBSD through @92986 of the TrustedBSD >>>>> MAC branch. Probably doesn't compile, and certainly doesn't run >>>>> (yet). >>>>> >>>>> Affected files ... >>>>> >>>>> .. //depot/projects/trustedbsd/sebsd/COPYRIGHT#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/LOCKS#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/MACREADME#4 branch >>>>> .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#8 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/Makefile#12 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#12 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/README#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/UPDATING#12 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/cp/extern.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#8 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.2#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/config.h#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/config_p.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv_stub.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#8 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.1#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.1#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/extern.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#10 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#10 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/util.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#9 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.1#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/alias.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.h#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith_lex.l#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/bltin.h#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/builtins.def#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/error.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.h#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/histedit.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/mail.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/main.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.h#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/miscbltin.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkbuiltins#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkinit.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/mksyntax.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/options.c#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/output.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#8 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/show.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/trap.c#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.h#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sleep/sleep.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.8#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.8#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.1#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.8#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.8#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.8#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bc/bc/main.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/CHANGES#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ.xml#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Xlist#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/README#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.1#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dighost.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.1#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.1#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/Makefile.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/aclconf.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/client.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/control.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/client.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/log.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/main.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.5#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.docbook#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/query.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/server.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/os.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/update.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/xfrout.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/zoneconf.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.threads.in#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/configure.in#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/Makefile.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Makefile.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/isc.color.gif#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/validate.sh.in#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/options#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/index#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3757.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3901.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4025.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4033.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4034.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4035.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4074.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4159.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/Makefile.in#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/api#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/config.h.in#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure.in#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/support.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_after.h.in#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_before.h.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/api#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/check.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/getaddresses.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/adb.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/api#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/cache.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/forward.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/gen-unix.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/journal.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/key.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/message.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/name.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbt.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbtdb.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/resolver.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tkey.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tsig.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/validator.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/xfrin.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/zone.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/api#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/print.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/inet_pton.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/lfsr.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/mem.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/quota.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/result.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/rwlock.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/timer.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/entropy.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/net.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/os.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/socket.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/api#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/namedconf.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/Makefile.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/api#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getipnode.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwconfig.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/print.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/strtoul.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/make/rules.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/version#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/binutils/opcodes/sparc-opc.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/NEWS#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/TODO#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/VERSION#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.3#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.c#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.h#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpagent.3#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpclient.3#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmplib.3#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.c#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/support.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/oid-list#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/.gdbinit#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/config.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/export.c#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/main.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.config#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.3#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trap.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bzip2/bzip2.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/com_err/compile_et.1#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ABOUT-NLS#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/AUTHORS#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING.LIB#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ChangeLog#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/FREEBSD-upgrade#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/INSTALL#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/NEWS#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/README#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/THANKS#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/TODO#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/alloca.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyin.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyout.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copypass.c#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.1#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.texi#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpiohdr.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dirname.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.1#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.texi#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/error.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/extern.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filemode.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filetypes.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/global.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/idcache.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/alloca_.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-ba.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-eexst.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fs-xinl.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-help.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-namefrob.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-parse.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pv.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pvh.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-xinl.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/basename.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exit.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt1.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_int.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/gettext.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/localedir.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rmt.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rtapelib.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strcase.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/stripslash.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strnlen.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/system.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/unlocked-io.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc-die.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xmalloc.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/main.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/makepath.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rmt.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rtapelib.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/safe-stat.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyin.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyout.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copypass.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpio.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpiohdr.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/extern.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filemode.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filetypes.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/global.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/idcache.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/main.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/makepath.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/safe-stat.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tarhdr.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/userspec.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/util.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/stripslash.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/system.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.c#3 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tarhdr.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/userspec.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/util.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/version.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xmalloc.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xstrdup.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/README#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_bsd.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_posix.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/parse.y#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/queue.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/man/cvs.1#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/cvsbug.in#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/diff/diff.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/Makefile.in#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/attribs.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-decl.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-format.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-opts.c#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-parse.in#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-ppoutput.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-semantics.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-typeck.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c.opt#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/calls.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgrtl.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/combine.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/common.opt#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.gcc#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.in#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.h#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.md#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/qrnnd.asm#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-osf4#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-protos.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.md#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-netbsd#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-rtems#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-protos.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.h#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#8 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/cygwin1.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/darwin.h#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/emmintrin.h#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gthr-win32.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-modes.def#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-protos.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.h#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.md#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-rtems-i386#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xmmintrin.h#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-hpux#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix41.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix43.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix52.h#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.md#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/beos.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.asm#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/freebsd.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux-unwind.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux.h#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux64.h#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.md#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rtems.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.h#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.md#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4.h#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix43#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix52#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-linux64#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-newas#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rtems#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.md#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/tpf.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.md#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/t-elf#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind-elf#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-darwin#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-sld#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure.ac#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp-demangle.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/Make-lang.in#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/call.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/class.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.h#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cvt.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cxx-pretty-print.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl2.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/error.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/except.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/g++spec.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/init.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mangle.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/method.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/name-lookup.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/parser.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/pt.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/search.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/semantics.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/tree.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck2.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppfiles.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmacro.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/crtstuff.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cse.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dbxout.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/defaults.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/extend.texi#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gcc-common.texi#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/invoke.texi#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/md.texi#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/tm.texi#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/trouble.texi#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dojump.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/emit-rtl.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/explow.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expmed.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bld.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/malloc.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/news.texi#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flow.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fold-const.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov-io.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcse.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ginclude/stddef.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gthr-win32.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ifcvt.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/jump.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-darwin.ver#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-std.ver#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop-unroll.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mkheaders.in#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mklibgcc.in#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/objc/objc-act.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.def#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/postreload.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/predict.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/real.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reg-stack.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regclass.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regrename.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regs.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload1.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/rtl.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/sibcall.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/simplify-rtx.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target-def.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/toplev.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree-inline.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.h#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-compat.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/varasm.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/version.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/COPYING#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.115#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.116#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.117#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.118#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FDL#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FREEBSD-upgrade#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL.gen#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/LICENSE#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MANIFEST#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MORE.STUFF#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.ccpg#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.comm#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.cpg#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.in#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.init#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.sub#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/NEWS#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROBLEMS#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROJECTS#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.MinGW#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.WIN32#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/REVISION#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/TODO#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/aclocal.m4#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure.ac#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/README#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file1#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file2#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/ChangeLog#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/Makefile.sub#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README_SH#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/TODO#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.man#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.sh#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer2.sh#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/ChangeLog#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/groff_mm.man#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/m.tmac#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/mmroff.pl#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/BUGS#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/ChangeLog#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/Makefile.sub#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/NEWS#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/TODO#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/copyright#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.mom#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/macros.mom#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typeset.mom#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/groff_mom.man#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/color.html#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docelement.html#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docprocessing.html#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/goodies.html#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/inlines.html#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/intro.html#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/refer.html#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/reserved.html#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/toc.html#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typesetting.html#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/using.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/om.tmac#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/ChangeLog#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/README#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/TODO#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/cover.ms#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.sh#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.in#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.sub#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fdl.texi#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fixinfo.sh#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-1#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-10#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-11#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-2#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-3#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-4#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-5#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-6#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-7#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-8#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-9#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.css#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.texinfo#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/meref.me#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/pic.ms#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/texinfo.tex#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/webpage.ms#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devdvi/generate/Makefile#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/DESC.proto#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/Makefile.sub#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/R.proto#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AB#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ABI#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AI#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AR#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CBI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CLARENDON#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CORONET#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GBI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/MARIGOLD#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/Makefile.sub#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OBI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/S#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/SYMBOL#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TBI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRB#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRBI#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRI#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRR#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UBI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCBI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/WINGDINGS#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/generate/Makefile#2 integrate >>>>> >>>>>>>> TRUNCATED FOR MAIL (1000 lines) <<< >>>>> _______________________________________________ >>>>> trustedbsd-cvs@FreeBSD.org mailing list >>>>> http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs >>>>> To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" >>>> >>>> >> >> _______________________________________________ >> trustedbsd-cvs@FreeBSD.org mailing list >> http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs >> To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" > > From owner-p4-projects@FreeBSD.ORG Thu Mar 9 14:11:21 2006 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 0340E16A423; Thu, 9 Mar 2006 14:11:21 +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 CC14616A420 for ; Thu, 9 Mar 2006 14:11:20 +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 63DAC43D45 for ; Thu, 9 Mar 2006 14:11:20 +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 k29EBK6k098345 for ; Thu, 9 Mar 2006 14:11:20 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 k29EBKlU098342 for perforce@freebsd.org; Thu, 9 Mar 2006 14:11:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 14:11:20 GMT Message-Id: <200603091411.k29EBKlU098342@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 93043 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, 09 Mar 2006 14:11:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=93043 Change 93043 by rwatson@rwatson_peppercorn on 2006/03/09 14:11:06 Minor style tweaks. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.h#4 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.h#4 (text+ko) ==== @@ -43,21 +43,22 @@ #define SEBSD_MAC_EXTATTR_NAME "sebsd" #define SEBSD_MAC_EXTATTR_NAMESPACE EXTATTR_NAMESPACE_SYSTEM -extern int avc_debug_always_allow; +extern int avc_debug_always_allow; #ifdef _KERNEL #ifndef _M_SEBSD_DEF MALLOC_DECLARE(M_SEBSD); -#define _M_SEBSD_DEF +#define _M_SEBSD_DEF #endif extern int sebsd_verbose; -extern int security_init(void); -extern int sebsd_syscall(struct thread *td, int call, void *args); -extern int thread_has_system(struct thread *td, access_vector_t perm); -extern int thread_has_security(struct thread *td, access_vector_t perm); +extern int security_init(void); +extern int sebsd_syscall(struct thread *td, int call, void *args); +extern int thread_has_system(struct thread *td, access_vector_t perm); +extern int thread_has_security(struct thread *td, access_vector_t perm); + #endif /* _KERNEL */ #endif /* _SYS_SECURITY_SEBSD_H */ From owner-p4-projects@FreeBSD.ORG Thu Mar 9 14:41:59 2006 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 EDF9816A423; Thu, 9 Mar 2006 14:41:58 +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 AE2EB16A420 for ; Thu, 9 Mar 2006 14:41:58 +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 5CC3D43D49 for ; Thu, 9 Mar 2006 14:41:58 +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 k29EfwuY099461 for ; Thu, 9 Mar 2006 14:41:58 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 k29EfvTH099458 for perforce@freebsd.org; Thu, 9 Mar 2006 14:41:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 14:41:57 GMT Message-Id: <200603091441.k29EfvTH099458@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 93045 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, 09 Mar 2006 14:41:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=93045 Change 93045 by rwatson@rwatson_peppercorn on 2006/03/09 14:41:48 Copyright update. Convert sebsd_destroy() call to printf() into panic(), as SEBSD is unable to unload. A moderate amount of style(9)ism. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#40 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#40 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002, 2003 Networks Associates Technology, Inc. - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by NAI Labs, the @@ -8,7 +8,7 @@ * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * CHATS research program. * - * This software was enhanced by SPARTA ISSO under SPAWAR contract + * This software was enhanced by SPARTA ISSO under SPAWAR contract * N66001-04-C-6019 ("SEFOS"). * * Redistribution and use in source and binary forms, with or without @@ -73,7 +73,7 @@ #include #include -int sebsd_verbose = 0; +int sebsd_verbose = 0; static int slot; #define SLOT(l) ((void *)LABEL_TO_SLOT((l), slot).l_ptr) @@ -94,7 +94,7 @@ sebsd_destroy(struct mac_policy_conf *mpc) { - printf("sebsd:: destroy\n"); + panic("sebsd_destroy"); } /* @@ -180,55 +180,57 @@ static __inline security_class_t vnode_type_to_security_class(enum vtype vt) { + switch (vt) { case VREG: - return SECCLASS_FILE; + return (SECCLASS_FILE); case VDIR: - return SECCLASS_DIR; + return (SECCLASS_DIR); case VBLK: - return SECCLASS_BLK_FILE; + return (SECCLASS_BLK_FILE); case VCHR: - return SECCLASS_CHR_FILE; + return (SECCLASS_CHR_FILE); case VLNK: - return SECCLASS_LNK_FILE; + return (SECCLASS_LNK_FILE); case VSOCK: - return SECCLASS_SOCK_FILE; + return (SECCLASS_SOCK_FILE); case VFIFO: - return SECCLASS_FIFO_FILE; + return (SECCLASS_FIFO_FILE); case VNON: case VBAD: - return SECCLASS_FILE; + return (SECCLASS_FILE); case VMARKER: panic("vnode_type_to_security_class: VMARKER"); } - return SECCLASS_FILE; + return (SECCLASS_FILE); } static __inline security_class_t dirent_type_to_security_class(__uint8_t type) { + switch (type) { case DT_REG: - return SECCLASS_FILE; + return (SECCLASS_FILE); case DT_DIR: - return SECCLASS_DIR; + return (SECCLASS_DIR); case DT_BLK: - return SECCLASS_BLK_FILE; + return (SECCLASS_BLK_FILE); case DT_CHR: - return SECCLASS_CHR_FILE; + return (SECCLASS_CHR_FILE); case DT_LNK: - return SECCLASS_LNK_FILE; + return (SECCLASS_LNK_FILE); case DT_SOCK: - return SECCLASS_SOCK_FILE; + return (SECCLASS_SOCK_FILE); case DT_FIFO: - return SECCLASS_FIFO_FILE; + return (SECCLASS_FIFO_FILE); case DT_UNKNOWN: case DT_WHT: - return SECCLASS_FILE; + return (SECCLASS_FILE); } - return SECCLASS_FILE; + return (SECCLASS_FILE); } static __inline access_vector_t @@ -246,7 +248,6 @@ av |= FILE__APPEND; else if (mask & VWRITE) av |= FILE__WRITE; - } else { if (mask & VEXEC) av |= DIR__SEARCH; @@ -256,7 +257,7 @@ av |= DIR__READ; } - return av; + return (av); } static int @@ -282,11 +283,11 @@ file->sclass = vnode_type_to_security_class(vp->v_type); if (file->sclass == 0) { printf("vnode_has_perm:: Giving up\n"); - return 1; /* TBD: debugging */ + return (1); /* TBD: debugging */ } } - return avc_has_perm_ref_audit(task->sid, file->sid, file->sclass, - perm, aeref ? aeref : &file->avcr, &ad); + return (avc_has_perm_ref_audit(task->sid, file->sid, file->sclass, + perm, aeref ? aeref : &file->avcr, &ad)); } static int @@ -302,7 +303,7 @@ * TBD: No audit information yet */ - return(avc_has_perm_ref(task->sid, file->sid, file->sclass, + return (avc_has_perm_ref(task->sid, file->sid, file->sclass, perm, &file->avcr)); } @@ -456,19 +457,18 @@ context_len = sizeof(context); /* TBD: bad fixed length */ error = vn_extattr_get(vp, IO_NODELOCKED, - SEBSD_MAC_EXTATTR_NAMESPACE, - SEBSD_MAC_EXTATTR_NAME, - &context_len, context, curthread); + SEBSD_MAC_EXTATTR_NAMESPACE, SEBSD_MAC_EXTATTR_NAME, + &context_len, context, curthread); if (error == ENOATTR || error == EOPNOTSUPP) { vsec->sid = SECINITSID_UNLABELED; /* Use the default label */ - /* +#if 0 struct vattr va; (void)VOP_GETATTR(vp, &va, curthread->td_ucred, curthread); printf("sebsd_update_vnode_from_extattr: no label for " "inode=%ld, fsid=%d\n", va.va_fileid, va.va_fsid); - */ +#endif goto dosclass; } if (error) { @@ -489,22 +489,21 @@ if (error) { printf("sebsd_update_vnode_from_extattr: ERROR mapping " "context to sid: %.*s\n", context_len, context); - return (0); /* TBD bad, bad, bad */ + return (0); /* TBD bad, bad, bad */ } 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; @@ -526,8 +525,6 @@ /* Default to using the attributes from the parent process */ task->osid = parent->osid; task->sid = parent->sid; - - return; } static void @@ -557,10 +554,11 @@ bzero(msgsec, sizeof(*msgsec)); msgsec->sclass = SECCLASS_MSG; - /* XXX should we return an error if security_transition_sid, - * Or, should we assign the msg object the thread sid? + /* + * XXX should we return an error if security_transition_sid, or, + * should we assign the msg object the thread sid? */ - if(security_transition_sid(tsec->sid, msqsec->sid, + if (security_transition_sid(tsec->sid, msqsec->sid, SECCLASS_MSG, &msgsec->sid) < 0) { printf("Warning: security_transition_sid failed on" "create_sysv_msgmsg\n"); @@ -623,7 +621,6 @@ ipcsec->sid = tsec->sid; ipcsec->sclass = SECCLASS_POSIX_SEM; - } static void @@ -661,10 +658,12 @@ 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); + /* + * 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) dirent->sid = newsid; } @@ -680,8 +679,8 @@ } static void -sebsd_create_devfs_directory(struct mount *mp, char *dirname, - int dirnamelen, struct devfs_dirent *devfs_dirent, struct label *label, +sebsd_create_devfs_directory(struct mount *mp, char *dirname, int dirnamelen, + struct devfs_dirent *devfs_dirent, struct label *label, const char *fullpath) { char *path; @@ -722,7 +721,6 @@ struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, struct label *delabel, const char *fullpath) { - char *path; int rc; security_id_t newsid; @@ -760,8 +758,8 @@ } /* - * Use the allocating task SID to label pipes. On Linux, pipes reside - * in a pseudo filesystem. + * Use the allocating task SID to label pipes. On Linux, pipes reside in a + * pseudo filesystem. */ static void sebsd_create_pipe(struct ucred *cred, struct pipepair *pipe, @@ -785,7 +783,7 @@ task = SLOT(cred->cr_label); task->osid = task->sid = SECINITSID_KERNEL; printf("sebsd_create_proc0:: using SECINITSID_KERNEL = %d\n", - SECINITSID_KERNEL); + SECINITSID_KERNEL); } static void @@ -797,12 +795,13 @@ task->osid = SECINITSID_KERNEL; task->sid = SECINITSID_INIT; printf("sebsd_create_proc1:: using SICINITSID_INIT = %d\n", - SECINITSID_INIT); + SECINITSID_INIT); } static void sebsd_create_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel, struct label *mount_arg_label) + struct label *mntlabel, struct label *fslabel, + struct label *mount_arg_label) { struct mount_security_struct *sbsec, *mntsec; struct mount_fs_security_struct *sbfssec; @@ -823,14 +822,17 @@ } else { sbfssec->sid = sbsec->sid; /* TBD: debugging only */ - printf("sebsd_create_mount: security_fs_use(%s) behavior %d, sid %d\n", - mp->mnt_vfc->vfc_name, behavior, sbsec->sid); + printf("sebsd_create_mount: security_fs_use(%s) behavior " + "%d, sid %d\n", mp->mnt_vfc->vfc_name, behavior, + sbsec->sid); } switch (behavior) { case SECURITY_FS_USE_XATTR: - /* PSIDs only work for persistent file systems with - unique and persistent inode numbers. */ + /* + * PSIDs only work for persistent file systems with unique + * and persistent inode numbers. + */ sbsec->uses_psids = 1; /* @@ -840,27 +842,35 @@ break; case SECURITY_FS_USE_TRANS: - /* Transition SIDs are used for pseudo filesystems like - devpts and tmpfs where you want the SID to be derived - from the SID of the creating process and the SID of - the filesystem. */ + /* + * Transition SIDs are used for pseudo filesystems like + * devpts and tmpfs where you want the SID to be derived + * from the SID of the creating process and the SID of the + * filesystem. + */ sbsec->uses_trans = 1; break; case SECURITY_FS_USE_TASK: - /* Task SIDs are used for pseudo filesystems like pipefs - and sockfs where you want the objects to be labeled - with the SID of the creating process. */ + /* + * Task SIDs are used for pseudo filesystems like pipefs and + * sockfs where you want the objects to be labeled with the + * SID of the creating process. + */ sbsec->uses_task = 1; break; case SECURITY_FS_USE_GENFS: - /* genfs_contexts handles everything else, like devfs, - usbdevfs, driverfs, and portions of proc. */ + /* + * genfs_contexts handles everything else, like devfs, + * usbdevfs, driverfs, and portions of proc. + */ sbsec->uses_genfs = 1; break; case SECURITY_FS_USE_NONE: - /* No labeling support configured for this filesystem type. - Don't appear to require labeling for binfmt_misc, bdev, - or rootfs. */ + /* + * No labeling support configured for this filesystem type. + * Don't appear to require labeling for binfmt_misc, bdev, + * or rootfs. + */ break; default: printf("%s: security_fs_use(%s) returned unrecognized " @@ -919,14 +929,14 @@ } 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)); } /* - * SEBSD does not support the relabeling of processes without - * transitioning. + * SEBSD does not support the relabeling of processes without transitioning. */ static int sebsd_check_cred_relabel(struct ucred *cred, struct label *newlabel) @@ -936,8 +946,8 @@ nsec = SLOT(newlabel); tsec = SLOT(cred->cr_label); if (nsec != NULL && nsec->sid != tsec->sid) - return EPERM; - return 0; + return (EPERM); + return (0); } static int @@ -956,7 +966,7 @@ rc = vnode_has_perm (cred, vp, FILE__MOUNTON, NULL); if (rc) - return rc; + return (rc); if (mntlabel) { sbsec = SLOT(mntlabel); @@ -965,18 +975,17 @@ rc = avc_has_perm_ref_audit (task->sid, sid, SECCLASS_FILE, COMMON_FILE__RELABELTO, NULL, NULL); if (rc) - return rc; - } - else { + return (rc); + } else { rc = security_fs_use (vfc_name, &behavior, &sid); if (rc) - return rc; + return (rc); } rc = avc_has_perm_ref_audit (task->sid, sid, SECCLASS_FILESYSTEM, FILESYSTEM__MOUNT, NULL, NULL); - return rc; + return (rc); } static int @@ -988,11 +997,11 @@ } 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 */ + /* Cannot change labels on filesystems. */ if (mount_arg_label) { struct mount_security_struct *mla = SLOT(mntlabel); struct mount_security_struct *mlb = SLOT(mount_arg_label); @@ -1003,7 +1012,8 @@ } static int -sebsd_check_umount(struct ucred *cred, struct mount *mp, struct label *mntlabel) +sebsd_check_umount(struct ucred *cred, struct mount *mp, + struct label *mntlabel) { return (mount_has_perm(cred, mp, FILESYSTEM__UNMOUNT, NULL)); @@ -1063,7 +1073,7 @@ FILESYSTEM__ASSOCIATE, &ad); */ - return(rc); + return (rc); } static int @@ -1140,13 +1150,12 @@ * So just make the transition. */ ntask->osid = otask->sid; - if (execlabel == NULL) { + if (execlabel == NULL) (void)security_transition_sid(otask->sid, file->sid, - SECCLASS_PROCESS, &ntask->sid); - } else { + SECCLASS_PROCESS, &ntask->sid); + else ntask->sid = ((struct task_security_struct *) SLOT(execlabel))->sid; - } if (otask->sid != ntask->sid) { /* @@ -1155,8 +1164,6 @@ * permission check if the parent was waiting. */ } - - return; } static int @@ -1178,13 +1185,12 @@ * Should have already checked all the permissions, so just see if * the SIDS are going to match. */ - if (execlabel == NULL) { + if (execlabel == NULL) (void)security_transition_sid(task->sid, file->sid, - SECCLASS_PROCESS, &newsid); - } else { + SECCLASS_PROCESS, &newsid); + else newsid = ((struct task_security_struct *) SLOT(execlabel))->sid; - } return (newsid != task->sid); } @@ -1261,6 +1267,7 @@ source = SLOT(newlabel); dest = SLOT(pipelabel); + /* XXXRW: Should be KASSERT's? */ if (!source) { printf("sebsd_relabel_pipe:: source is NULL!\n"); return; @@ -1282,6 +1289,7 @@ source = SLOT(label); dest = SLOT(vnodelabel); + /* XXXRW: Should be KASSERT's? */ if (!source) { printf("sebsd_relabel_vnode:: source is NULL!\n"); return; @@ -1306,14 +1314,13 @@ newlabel = SLOT(intlabel); error = security_sid_to_context(newlabel->sid, &context, - &context_len); + &context_len); if (error) return (error); error = vn_extattr_set(vp, IO_NODELOCKED, - SEBSD_MAC_EXTATTR_NAMESPACE, - SEBSD_MAC_EXTATTR_NAME, - context_len, context, curthread); + SEBSD_MAC_EXTATTR_NAMESPACE, SEBSD_MAC_EXTATTR_NAME, + context_len, context, curthread); security_free_context(context); return (error); } @@ -1324,10 +1331,10 @@ { if (!acc_mode) - return 0; + return (0); - return (vnode_has_perm(cred, vp, file_mask_to_av(vp->v_type, acc_mode), - NULL)); + return (vnode_has_perm(cred, vp, + file_mask_to_av(vp->v_type, acc_mode), NULL)); } static int @@ -1346,7 +1353,7 @@ /* TBD: Incomplete, SELinux also check capability(CAP_SYS_CHROOT)) */ /* MAY_EXEC ~= DIR__SEARCH */ - return vnode_has_perm(cred, dvp, DIR__SEARCH, NULL); + return (vnode_has_perm(cred, dvp, DIR__SEARCH, NULL)); } static int @@ -1370,29 +1377,31 @@ ad.u.fs.vp = dvp; rc = avc_has_perm_ref_audit(task->sid, dir->sid, SECCLASS_DIR, - DIR__ADD_NAME | DIR__SEARCH, - &dir->avcr, &ad); + DIR__ADD_NAME | DIR__SEARCH, &dir->avcr, &ad); if (rc) - return rc; + return (rc); rc = security_transition_sid(task->sid, dir->sid, tclass, &newsid); if (rc) - return rc; + return (rc); rc = avc_has_perm_audit(task->sid, newsid, tclass, FILE__CREATE, &ad); if (rc) - return rc; + return (rc); if (dvp->v_mount) { - /* XXX: mpo_check_vnode_create should probably pass the mntlabel */ + /* + * XXX: mpo_check_vnode_create should probably pass the + * mntlabel. + */ sbsec = SLOT (dvp->v_mount->mnt_mntlabel); - rc = avc_has_perm_audit(newsid, sbsec->sid, SECCLASS_FILESYSTEM, - FILESYSTEM__ASSOCIATE, &ad); + rc = avc_has_perm_audit(newsid, sbsec->sid, + SECCLASS_FILESYSTEM, FILESYSTEM__ASSOCIATE, &ad); if (rc) - return rc; + return (rc); } - return 0; + return (0); } static int @@ -1415,7 +1424,6 @@ rc = avc_has_perm_ref_audit(task->sid, dir->sid, SECCLASS_DIR, DIR__SEARCH | DIR__REMOVE_NAME, &dir->avcr, &ad); - if (rc) return (rc); @@ -1454,11 +1462,10 @@ rc = security_transition_sid(task->sid, file->sid, SECCLASS_PROCESS, &newsid); if (rc) - return EACCES; - } else { + return (EACCES); + } else newsid = ((struct task_security_struct *) SLOT(execlabel))->sid; - } AVC_AUDIT_DATA_INIT(&ad, FS); ad.u.fs.vp = vp; @@ -1466,23 +1473,18 @@ if (newsid == task->sid) { rc = avc_has_perm_audit(task->sid, file->sid, SECCLASS_FILE, FILE__EXECUTE_NO_TRANS, &ad); - if (rc) - return EACCES; - + return (EACCES); } else { /* Check permissions for the transition. */ rc = avc_has_perm_audit(task->sid, newsid, SECCLASS_PROCESS, PROCESS__TRANSITION, &ad); - if (rc) - return EACCES; - + return (EACCES); rc = avc_has_perm_audit(newsid, file->sid, SECCLASS_FILE, FILE__ENTRYPOINT, &ad); - if (rc) - return EACCES; + return (EACCES); /* * TBD: Check ptrace permission between the parent and @@ -1536,7 +1538,7 @@ rc = avc_has_perm_ref_audit(task->sid, dir->sid, SECCLASS_DIR, DIR__SEARCH | DIR__ADD_NAME, &dir->avcr, &ad); if (rc) - return rc; + return (rc); rc = avc_has_perm_ref_audit(task->sid, file->sid, file->sclass, FILE__LINK, &file->avcr, &ad); @@ -1559,10 +1561,10 @@ { if (!acc_mode) - return 0; + return (0); - return (vnode_has_perm(cred, vp, file_mask_to_av(vp->v_type, acc_mode), - NULL)); + return (vnode_has_perm(cred, vp, file_mask_to_av(vp->v_type, + acc_mode), NULL)); } static int @@ -1570,7 +1572,7 @@ struct vnode *vp, struct label *label) { - return vnode_has_perm(cred, vp, FILE__POLL, NULL); + return (vnode_has_perm(cred, vp, FILE__POLL, NULL)); } static int @@ -1578,7 +1580,7 @@ struct vnode *vp, struct label *label) { - return vnode_has_perm(cred, vp, FILE__READ, NULL); + return (vnode_has_perm(cred, vp, FILE__READ, NULL)); } static int @@ -1586,7 +1588,7 @@ struct label *dlabel) { - return vnode_has_perm(cred, dvp, DIR__READ, NULL); + return (vnode_has_perm(cred, dvp, DIR__READ, NULL)); } static int @@ -1594,7 +1596,7 @@ struct label *label) { - return vnode_has_perm(cred, vp, FILE__READ, NULL); + return (vnode_has_perm(cred, vp, FILE__READ, NULL)); } static int @@ -1617,29 +1619,31 @@ if (old->sclass == 0) { printf("vnode_relabel:: ERROR, sid=%d, sclass=0, v_type=%d\n", old->sid, vp->v_type); - return 0; /* TBD: debugging */ + return (0); /* TBD: debugging */ } rc = avc_has_perm_ref_audit(task->sid, old->sid, old->sclass, - FILE__RELABELFROM, &old->avcr, &ad); + FILE__RELABELFROM, &old->avcr, &ad); if (rc) return (rc); rc = avc_has_perm_audit(task->sid, new->sid, old->sclass, - FILE__RELABELTO, &ad); - + FILE__RELABELTO, &ad); if (rc) return (rc); if (vp->v_mount) { - /* XXX: mpo_check_vnode_relabel should probably pass the mntlabel */ + /* + * XXX: mpo_check_vnode_relabel should probably pass the + * mntlabel. + */ sbsec = SLOT (vp->v_mount->mnt_mntlabel); - rc = avc_has_perm_audit (new->sid, sbsec->sid, SECCLASS_FILESYSTEM, - FILESYSTEM__ASSOCIATE, &ad); + rc = avc_has_perm_audit (new->sid, sbsec->sid, + SECCLASS_FILESYSTEM, FILESYSTEM__ASSOCIATE, &ad); if (rc) - return rc; + return (rc); } - return 0; + return (0); } static int @@ -1659,19 +1663,17 @@ AVC_AUDIT_DATA_INIT(&ad, FS); rc = avc_has_perm_ref_audit(task->sid, old_dir->sid, SECCLASS_DIR, - DIR__REMOVE_NAME | DIR__SEARCH, - &old_dir->avcr, &ad); + DIR__REMOVE_NAME | DIR__SEARCH, &old_dir->avcr, &ad); if (rc) return (rc); if (old_file->sclass == 0) { printf("vnode_rename_from:: ERROR, sid=%d, sclass=0, " - "v_type=%d\n", old_file->sid, vp->v_type); - return 0; /* TBD: debugging */ + "v_type=%d\n", old_file->sid, vp->v_type); + return (0); /* TBD: debugging */ } rc = avc_has_perm_ref_audit(task->sid, old_file->sid, - old_file->sclass, FILE__RENAME, - &old_file->avcr, &ad); + old_file->sclass, FILE__RENAME, &old_file->avcr, &ad); if (rc) return (rc); @@ -1699,8 +1701,7 @@ */ if (vp->v_type == VDIR && !samedir) { rc = avc_has_perm_ref(task->sid, old_file->sid, - old_file->sclass, DIR__REPARENT, - &old_file->avcr); + old_file->sclass, DIR__REPARENT, &old_file->avcr); if (rc) return (rc); } @@ -1714,7 +1715,7 @@ ad.u.fs.vp = vp; rc = avc_has_perm_ref(task->sid, new_dir->sid, SECCLASS_DIR, - av, &new_dir->avcr); + av, &new_dir->avcr); if (rc) return (rc); @@ -1723,17 +1724,14 @@ if (new_file->sclass == 0) { printf("vnode_relabel_to:: ERROR, sid=%d, sclass=0, " "v_type=%d\n", new_file->sid, vp->v_type); - return 0; /* TBD: debugging */ + return (0); /* TBD: debugging */ } - if (vp->v_type == VDIR) { + if (vp->v_type == VDIR) rc = avc_has_perm_ref(task->sid, new_file->sid, - new_file->sclass, - DIR__RMDIR, &new_file->avcr); - } else { + new_file->sclass, DIR__RMDIR, &new_file->avcr); + else rc = avc_has_perm_ref(task->sid, new_file->sid, - new_file->sclass, - FILE__UNLINK, &new_file->avcr); - } + new_file->sclass, FILE__UNLINK, &new_file->avcr); if (rc) return (rc); } @@ -1747,7 +1745,7 @@ { /* TBD: Not Implemented */ - return 0; + return (0); } static int @@ -1755,7 +1753,7 @@ struct label *label, acl_type_t type, struct acl *acl) { - return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); + return (vnode_has_perm(cred, vp, FILE__SETATTR, NULL)); } static int @@ -1763,7 +1761,7 @@ struct label *label, int attrnamespace, const char *name, struct uio *uio) { - return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); + return (vnode_has_perm(cred, vp, FILE__SETATTR, NULL)); } static int @@ -1771,7 +1769,7 @@ struct label *label, u_long flags) { - return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); + return (vnode_has_perm(cred, vp, FILE__SETATTR, NULL)); } static int @@ -1779,7 +1777,7 @@ struct label *label, mode_t mode) { - return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); + return (vnode_has_perm(cred, vp, FILE__SETATTR, NULL)); } static int @@ -1787,7 +1785,7 @@ struct label *label, uid_t uid, gid_t gid) { - return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); + return (vnode_has_perm(cred, vp, FILE__SETATTR, NULL)); } static int @@ -1795,7 +1793,7 @@ struct label *label, struct timespec atime, struct timespec mtime) { - return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); + return (vnode_has_perm(cred, vp, FILE__SETATTR, NULL)); } static int @@ -1803,7 +1801,7 @@ struct vnode *vp, struct label *vnodelabel) { - return vnode_has_perm(cred, vp, FILE__GETATTR, NULL); + return (vnode_has_perm(cred, vp, FILE__GETATTR, NULL)); } @@ -1823,7 +1821,7 @@ struct label *vnodelabel) { - return vnode_has_perm(cred, vp, FILE__SWAPON, NULL); + return (vnode_has_perm(cred, vp, FILE__SWAPON, NULL)); } static int @@ -1831,7 +1829,7 @@ struct label *vnodelabel) { - return vnode_has_perm(cred, vp, FILE__SWAPON, NULL); + return (vnode_has_perm(cred, vp, FILE__SWAPON, NULL)); } /* @@ -1842,7 +1840,7 @@ void *arg1, int arg2, struct sysctl_req *req) { - return (0); + return (0); } static int @@ -1850,11 +1848,11 @@ struct vnode *vp, struct label *label) { - return vnode_has_perm(cred, vp, FILE__WRITE, NULL); + return (vnode_has_perm(cred, vp, FILE__WRITE, NULL)); } /* - * Also registered for MAC_CHECK_VNODE_MPROTECT + * Also registered for MAC_CHECK_VNODE_MPROTECT. */ static int sebsd_check_vnode_mmap(struct ucred *cred, struct vnode *vp, @@ -2086,7 +2084,7 @@ * TBD: No audit information yet */ - return(avc_has_perm_ref(task->sid, ipcsec->sid, ipcsec->sclass, + return (avc_has_perm_ref(task->sid, ipcsec->sid, ipcsec->sclass, perm, &ipcsec->avcr)); } @@ -2095,7 +2093,7 @@ struct label *msglabel) { - return(ipc_has_perm(cred, msglabel, MSG__RECEIVE)); + return (ipc_has_perm(cred, msglabel, MSG__RECEIVE)); } static int @@ -2103,7 +2101,7 @@ struct label *msglabel) { - return(ipc_has_perm(cred, msglabel, MSG__DESTROY)); + return (ipc_has_perm(cred, msglabel, MSG__DESTROY)); } static int @@ -2111,7 +2109,7 @@ struct label *msqklabel) { - return(ipc_has_perm(cred, msqklabel, MSGQ__ASSOCIATE)); + return (ipc_has_perm(cred, msqklabel, MSGQ__ASSOCIATE)); } static int @@ -2120,7 +2118,7 @@ { /* Can this process write to the queue? */ - return(ipc_has_perm(cred, msqklabel, MSGQ__WRITE)); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 9 15:52:41 2006 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 AAAE116A423; Thu, 9 Mar 2006 15:52: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 694E616A422 for ; Thu, 9 Mar 2006 15:52:40 +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 9944343D58 for ; Thu, 9 Mar 2006 15:52:39 +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 k29FqdJK002589 for ; Thu, 9 Mar 2006 15:52:39 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 k29Fqdq5002586 for perforce@freebsd.org; Thu, 9 Mar 2006 15:52:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 15:52:39 GMT Message-Id: <200603091552.k29Fqdq5002586@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 93049 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, 09 Mar 2006 15:52:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=93049 Change 93049 by rwatson@rwatson_peppercorn on 2006/03/09 15:52:36 style(9). Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscall.c#8 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscalls.h#7 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_sysctl.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscall.c#8 (text+ko) ==== @@ -51,10 +51,9 @@ #include #include -struct lp_args -{ - void *data; - size_t len; +struct lp_args { + void *data; + size_t len; }; static int @@ -80,13 +79,17 @@ static int sebsd_get_bools(struct thread *td, struct sebsd_get_bools *gb) { - char *out = NULL; + char *out; + int err; + if (gb->out) out = malloc(gb->len, M_SEBSD, M_WAITOK); - int err = security_get_bool_string(&gb->len, out); - if (out && err == 0) + else + out = NULL; + err = security_get_bool_string(&gb->len, out); + if (out != NULL && err == 0) err = copyout(out, gb->out, gb->len); - if (out) + if (out != NULL) free(out, M_SEBSD); return (err); } @@ -94,13 +97,15 @@ int sebsd_syscall(struct thread *td, int call, void *args) { - int err = EINVAL; struct lp_args p; struct sebsd_get_bools gb; + int active, err, pending; + char str[128], *strp; - switch(call) { + err = EINVAL; + switch (call) { case SEBSDCALL_LOAD_POLICY: - if (copyin (args, &p, sizeof (struct lp_args))) + if (copyin(args, &p, sizeof (struct lp_args))) return (EFAULT); err = sys_load_policy (td, p.data, p.len); break; @@ -114,47 +119,39 @@ break; case SEBSDCALL_GET_BOOL: - { - char str[128]; - int active, pending; - err = copyinstr(args,str, 128, NULL); + err = copyinstr(args, str, 128, NULL); if (err) return (err); security_get_bool(str, &active, &pending); *td->td_retval = active | (pending << 1); return (0); - } case SEBSDCALL_SET_BOOL: - { - char *str; - err = thread_has_security(td, SECURITY__SETBOOL); if (err) return (err); if (copyin(args, &p, sizeof (struct lp_args))) return (EFAULT); - str = malloc(p.len, M_SEBSD, M_WAITOK); + strp = malloc(p.len, M_SEBSD, M_WAITOK); if (!str) return (ENOMEM); - if (copyin(p.data, str, p.len)) { + if (copyin(p.data, strp, p.len)) { free(str, M_SEBSD); return (EFAULT); } - str[p.len-1] = 0; - err = security_set_bool(str+1, str[0]-'0'); - free(str, M_SEBSD); + strp[p.len-1] = 0; + err = security_set_bool(str+1, strp[0]-'0'); + free(strp, M_SEBSD); break; - } case SEBSDCALL_COMMIT_BOOLS: err = thread_has_security(td, SECURITY__SETBOOL); if (err) return (err); - return security_commit_pending_bools(); + return (security_commit_pending_bools()); default: err = EINVAL; ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscalls.h#7 (text+ko) ==== @@ -1,41 +1,39 @@ #ifndef _SEBSD_SYSCALLS_H_ -#define _SEBSD_SYSCALLS_H_ +#define _SEBSD_SYSCALLS_H_ #include /* * TBD: Should we really try to line up with SELinux? */ -#define SEBSDCALL_LOAD_POLICY 7 -#define SEBSDCALL_GET_BOOLS 8 -#define SEBSDCALL_GET_BOOL 9 -#define SEBSDCALL_SET_BOOL 10 -#define SEBSDCALL_COMMIT_BOOLS 11 +#define SEBSDCALL_LOAD_POLICY 7 +#define SEBSDCALL_GET_BOOLS 8 +#define SEBSDCALL_GET_BOOL 9 +#define SEBSDCALL_SET_BOOL 10 +#define SEBSDCALL_COMMIT_BOOLS 11 -#define SEBSDCALL_NUM 7 +#define SEBSDCALL_NUM 7 -/* Structure definitions for compute_av call */ +/* Structure definitions for compute_av call. */ struct security_query { - char *scontext; - char *tcontext; - security_class_t tclass; - access_vector_t requested; + char *scontext; + char *tcontext; + security_class_t tclass; + access_vector_t requested; }; struct security_response { - access_vector_t allowed; - access_vector_t decided; - access_vector_t auditallow; - access_vector_t auditdeny; - access_vector_t notify; - u32 seqno; + access_vector_t allowed; + access_vector_t decided; + access_vector_t auditallow; + access_vector_t auditdeny; + access_vector_t notify; + u32 seqno; }; struct sebsd_get_bools { - int len; - char *out; + int len; + char *out; }; - #endif /* _SEBSD_SYSCALLS_H_ */ - ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_sysctl.c#10 (text+ko) ==== @@ -8,7 +8,7 @@ * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * CHATS research program. * - * This software was enhanced by SPARTA ISSO under SPAWAR contract + * This software was enhanced by SPARTA ISSO under SPAWAR contract * N66001-04-C-6019 ("SEFOS"). * * Redistribution and use in source and binary forms, with or without @@ -82,10 +82,10 @@ for (i = 0; i < SIDTAB_SIZE; i++) { cur = sidtab.htable[i]; while (cur != NULL && count > 0) { - error = security_sid_to_context(cur->sid, &scontext, - &scontext_len); + error = security_sid_to_context(cur->sid, &scontext, + &scontext_len); len = snprintf(buffer, linesize, "%7d %s\n", - cur->sid, scontext); + cur->sid, scontext); security_free_context(scontext); error = SYSCTL_OUT(req, buffer, len); if (error) @@ -124,9 +124,9 @@ * Treat ability to set audit status as equivilent to * changing enforcement status. */ - error = thread_has_system (curthread, SECURITY__SETENFORCE); + error = thread_has_system(curthread, SECURITY__SETENFORCE); if (error) - return error; + return (error); selinux_auditing = auditing; } @@ -135,8 +135,8 @@ } /* - * Sysctl handler for security.mac.sebsd.enforcing - * Get and/or set whether the avc is in enforcement mode. + * Sysctl handler for security.mac.sebsd.enforcing. Get and/or set whether + * the avc is in enforcement mode. */ static int sysctl_sebsd_enforcing(SYSCTL_HANDLER_ARGS) @@ -154,7 +154,7 @@ if (error) return (error); - error = thread_has_system (curthread, SECURITY__SETENFORCE); + error = thread_has_system(curthread, SECURITY__SETENFORCE); if (error) return error; @@ -165,9 +165,8 @@ } /* - * Sysctl handler for security.mac.sebsd.user_sids - * Lists the SIDs currently available for transition to by a given - * "context\0username\0" + * Sysctl handler for security.mac.sebsd.user_sids. Lists the SIDs currently + * available for transition to by a given "context\0username\0". */ static int sysctl_user_sids(SYSCTL_HANDLER_ARGS) @@ -183,7 +182,7 @@ if (req->newlen > 512) /* arbitrary */ return (ENAMETOOLONG); context = sebsd_malloc(req->newlen, M_SEBSD, M_WAITOK); - error = SYSCTL_IN(req, context, req->newlen); + error = SYSCTL_IN(req, context, req->newlen); if (error) goto out; if (context[req->newlen - 1] != '\0') { @@ -242,7 +241,7 @@ if (req->newlen > 512) /* arbitrary */ return (ENAMETOOLONG); scontext = sebsd_malloc(req->newlen, M_SEBSD, M_WAITOK); - error = SYSCTL_IN(req, scontext, req->newlen); + error = SYSCTL_IN(req, scontext, req->newlen); if (error) goto out; if (scontext[req->newlen - (1 + sizeof(tclass))] != '\0') { @@ -278,8 +277,8 @@ } /* - * Sysctl handler for security.mac.sebsd.compute_av - * Compute access vectors given input "scontext\0tcontext\0",tclass,av + * Sysctl handler for security.mac.sebsd.compute_av. Compute access vectors + * given input "scontext\0tcontext\0", tclass, av. */ static int sysctl_compute_av(SYSCTL_HANDLER_ARGS) @@ -296,10 +295,11 @@ if (req->newlen > 512) /* arbitrary */ return (ENAMETOOLONG); scontext = sebsd_malloc(req->newlen, M_SEBSD, M_WAITOK); - error = SYSCTL_IN(req, scontext, req->newlen); + error = SYSCTL_IN(req, scontext, req->newlen); if (error) goto out; - if (scontext[req->newlen - (1 + sizeof(tclass) + sizeof(av))] != '\0') { + if (scontext[req->newlen - (1 + sizeof(tclass) + sizeof(av))] != + '\0') { error = EINVAL; goto out; } @@ -333,26 +333,27 @@ SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, sebsd, CTLFLAG_RW, 0, - "Security Enhanced BSD policy controls"); + "Security Enhanced BSD policy controls"); SYSCTL_INT(_security_mac_sebsd, OID_AUTO, verbose, CTLFLAG_RW, - &sebsd_verbose, 0, " SEBSD Verbose Debug Stuff"); + &sebsd_verbose, 0, " SEBSD Verbose Debug Stuff"); TUNABLE_INT("security.mac.sebsd.verbose", &sebsd_verbose); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, sids, CTLTYPE_STRING|CTLFLAG_RD, - NULL, 0, sysctl_list_sids, "A", "SEBSD SIDs"); + NULL, 0, sysctl_list_sids, "A", "SEBSD SIDs"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, user_sids, CTLTYPE_STRING | - CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_user_sids, "A", - "SEBSD transitionable user SIDs"); + CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_user_sids, "A", + "SEBSD transitionable user SIDs"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, change_sid, CTLTYPE_STRING | - CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_change_sid, "A", - "SEBSD (tty) SID relabel to perform along with transition"); + CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_change_sid, "A", + "SEBSD (tty) SID relabel to perform along with transition"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, compute_av, CTLTYPE_STRING | - CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_compute_av, "A", - "SEBSD access vector decision query"); -SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, auditing, CTLTYPE_INT | CTLFLAG_RW, - NULL, 0, sysctl_sebsd_auditing, "I", "SEBSD avc auditing"); + CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_compute_av, "A", + "SEBSD access vector decision query"); +SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, auditing, CTLTYPE_INT | + CTLFLAG_RW, NULL, 0, sysctl_sebsd_auditing, "I", "SEBSD avc auditing"); TUNABLE_INT("security.mac.sebsd.auditing", &selinux_auditing); -SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, enforcing, CTLTYPE_INT | CTLFLAG_RW, - NULL, 0, sysctl_sebsd_enforcing, "I", "SEBSD avc enforcement"); +SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, enforcing, CTLTYPE_INT | + CTLFLAG_RW, NULL, 0, sysctl_sebsd_enforcing, "I", + "SEBSD avc enforcement"); TUNABLE_INT("security.mac.sebsd.enforcing", &selinux_enforcing); From owner-p4-projects@FreeBSD.ORG Thu Mar 9 16:57:21 2006 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 B7BF616A423; Thu, 9 Mar 2006 16:57:20 +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 70E1F16A420; Thu, 9 Mar 2006 16:57:20 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from bastille.optimhosts.com (bastille.optimhosts.com [203.177.161.185]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74FA443D58; Thu, 9 Mar 2006 16:57:19 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from localhost (bastille.local [127.0.0.1]) by bastille.optimhosts.com (Postfix) with ESMTP id E43468C84AC; Fri, 10 Mar 2006 00:52:28 +0800 (PHT) Received: from bastille.optimhosts.com ([127.0.0.1]) by localhost (bastille.optimhosts.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 66989-03; Fri, 10 Mar 2006 00:52:00 +0800 (PHT) Received: from [192.168.2.106] (unknown [210.213.197.144]) by bastille.optimhosts.com (Postfix) with ESMTP id DC3BC8C84A7; Fri, 10 Mar 2006 00:51:22 +0800 (PHT) From: Dingo To: Robert Watson In-Reply-To: <1141939218.797.11.camel@pavilion.optimlabs.com> References: <200603090041.k290fnfV056558@repoman.freebsd.org> <1141898670.34657.10.camel@localhost.localdomain> <20060309105315.M52152@fledge.watson.org> <1141937697.797.7.camel@pavilion.optimlabs.com> <1141939218.797.11.camel@pavilion.optimlabs.com> Content-Type: text/plain Date: Fri, 10 Mar 2006 00:56:12 +0000 Message-Id: <1141952172.797.21.camel@pavilion.optimlabs.com> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at bastille.optimhosts.com Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93005 for review - sebsd_create_mount 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, 09 Mar 2006 16:57:21 -0000 MAC kernel builds fine, but when booting i recieve sebsd_create_mount: security_fs_use(devfs) behavior 4, sid28 Fatal trap 12: page fault while in kernel mode ill dig into it in the morning as its 1AM here. On Thu, 2006-03-09 at 21:20 +0000, Dingo wrote: > on i386 MAC kernel builds fine, though on amd64 MAC kernel fails with From owner-p4-projects@FreeBSD.ORG Thu Mar 9 18:40:10 2006 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 B72DD16A423; Thu, 9 Mar 2006 18:40:09 +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 901EC16A420 for ; Thu, 9 Mar 2006 18:40:09 +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 5AB9643D46 for ; Thu, 9 Mar 2006 18:40:09 +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 k29Ie9Bv017284 for ; Thu, 9 Mar 2006 18:40:09 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 k29Ie8QS017281 for perforce@freebsd.org; Thu, 9 Mar 2006 18:40:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 18:40:08 GMT Message-Id: <200603091840.k29Ie8QS017281@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 93060 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, 09 Mar 2006 18:40:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=93060 Change 93060 by rwatson@rwatson_peppercorn on 2006/03/09 18:39:50 SEBSD is not properly connected to the build tools section of the build, so interacts poorly with mergemaster. For now, use the installed system sebsd_* tools, rather than trying to run from DESTDIR where they may not exist. In the future, we'll need to attach the SEBSD tool set to the build tool set so it can run in the build/install environment. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#23 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#23 (text+ko) ==== @@ -18,9 +18,9 @@ FLASKDIR = flask/ PREFIX = /usr -LOADPOLICY = $(DESTDIR)/usr/sbin/sebsd_loadpolicy -CHECKPOLICY = $(DESTDIR)/sbin/sebsd_checkpolicy -SETFILES = $(DESTDIR)/sbin/sebsd_setfiles +LOADPOLICY = /usr/sbin/sebsd_loadpolicy +CHECKPOLICY = /sbin/sebsd_checkpolicy +SETFILES = /sbin/sebsd_setfiles .if (POLICYVERCOMPAT) POLICYVERTMP = $(POLICYVERCOMPAT) POLICYVERCOMPATARGS = -c $(POLICYVERCOMPAT) From owner-p4-projects@FreeBSD.ORG Thu Mar 9 20:19:09 2006 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 48CCD16A423; Thu, 9 Mar 2006 20:19:09 +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 05FD016A422 for ; Thu, 9 Mar 2006 20:19:09 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9522243D60 for ; Thu, 9 Mar 2006 20:19:08 +0000 (GMT) (envelope-from imp@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 k29KJ8xj022059 for ; Thu, 9 Mar 2006 20:19:08 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k29KJ8ps022056 for perforce@freebsd.org; Thu, 9 Mar 2006 20:19:08 GMT (envelope-from imp@freebsd.org) Date: Thu, 9 Mar 2006 20:19:08 GMT Message-Id: <200603092019.k29KJ8ps022056@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 93061 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, 09 Mar 2006 20:19:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=93061 Change 93061 by imp@imp_Speedy on 2006/03/09 20:18:08 NFS root, back off usb for the moment. Affected files ... .. //depot/projects/arm/src/sys/arm/conf/KB920X#23 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/KB920X#23 (text+ko) ==== @@ -29,6 +29,7 @@ include "../at91/std.kb920x" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. +hints "KB920X.hints" #Default places to look for devices. makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=arm9 @@ -45,9 +46,11 @@ #options MD_ROOT #MD is a potential root device #options MD_ROOT_SIZE=4096 # 4MB ram disk #options ROOTDEVNAME=\"ufs:md0\" -#options NFSCLIENT #Network Filesystem Client +options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server -#options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options BOOTP_NFSROOT +options BOOTP #options MSDOSFS #MSDOS Filesystem #options CD9660 #ISO 9660 Filesystem #options PROCFS #Process filesystem (requires PSEUDOFS) @@ -74,11 +77,12 @@ device lxtphy # USB support -device ohci # OHCI PCI->USB interface -device usb # USB Bus (required) -device umass # Disks/Mass storage - Requires scbus and da -device scbus # SCSI bus (required for SCSI) -device da # Direct Access (disks) +##device ohci # OHCI PCI->USB interface +##device usb # USB Bus (required) +##options USB_DEBUG +##device umass # Disks/Mass storage - Requires scbus and da +##device scbus # SCSI bus (required for SCSI) +##device da # Direct Access (disks) # Debugging for use in -current #options INVARIANTS #Enable calls of extra sanity checking From owner-p4-projects@FreeBSD.ORG Thu Mar 9 20:20:11 2006 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 C7EF316A423; Thu, 9 Mar 2006 20:20:10 +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 A340C16A420 for ; Thu, 9 Mar 2006 20:20:10 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 69F2F43D6A for ; Thu, 9 Mar 2006 20:20:10 +0000 (GMT) (envelope-from imp@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 k29KKA8b022120 for ; Thu, 9 Mar 2006 20:20:10 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k29KKApR022117 for perforce@freebsd.org; Thu, 9 Mar 2006 20:20:10 GMT (envelope-from imp@freebsd.org) Date: Thu, 9 Mar 2006 20:20:10 GMT Message-Id: <200603092020.k29KKApR022117@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 93062 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, 09 Mar 2006 20:20:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=93062 Change 93062 by imp@imp_Speedy on 2006/03/09 20:19:16 Get rid of bogus zero length packets. We were unloading the map before flushing, then flushing after. Ooops. This doesn't work so well. still have ethernet problems, but things are better now. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#29 edit .. //depot/projects/arm/src/sys/arm/at91/if_atereg.h#7 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#29 (text+ko) ==== @@ -364,9 +364,11 @@ * restarts from the first descriptor. */ if (i == ATE_MAX_RX_BUFFERS - 1) - seg.ds_addr |= 1 << 1; - sc->rx_descs[i].addr = seg.ds_addr; + sc->rx_descs[i].addr = seg.ds_addr | ETH_WRAP_BIT; + else + sc->rx_descs[i].addr = seg.ds_addr; sc->rx_descs[i].status = 0; + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREREAD); bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREWRITE); } bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_PREWRITE); @@ -580,7 +582,7 @@ status = RD4(sc, ETH_ISR); if (status == 0) return; - printf("IT IS %x %x\n", RD4(sc, ETH_RSR), RD4(sc, ETH_CTL)); + printf("status is %x IT IS %x %x\n", status, RD4(sc, ETH_RSR), RD4(sc, ETH_CTL)); if (status & ETH_ISR_RCOM) { bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, @@ -589,42 +591,62 @@ if (sc->rx_descs[i].addr & ETH_CPU_OWNER) { struct mbuf *mb = sc->rx_mbuf[i]; bus_dma_segment_t seg; - int rx_stat = sc->rx_descs[i].status; + int rx_stat; int nsegs; - printf("GOT ONE\n"); bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_POSTREAD); - bus_dmamap_unload(sc->rxtag, - sc->rx_map[i]); + rx_stat = sc->rx_descs[i].status; + printf("GOT ONE %d %x\n", i, rx_stat); + if ((rx_stat & ETH_LEN_MASK) == 0) { + printf("ignoring bogus 0 len packet\n"); + bus_dmamap_load_mbuf_sg(sc->rxtag, + sc->rx_map[i], sc->rx_mbuf[i], + &seg, &nsegs, 0); + sc->rx_descs[i].status = 0; + sc->rx_descs[i].addr = seg.ds_addr; + if (i == ATE_MAX_RX_BUFFERS - 1) + sc->rx_descs[i].addr |= + ETH_WRAP_BIT; + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], + BUS_DMASYNC_PREREAD); + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], + BUS_DMASYNC_PREWRITE); + continue; + } WR4(sc, ETH_RSR, RD4(sc, ETH_RSR)); /* * Allocate a new buffer to replace this one. * if we cannot, then we drop this packet - * and keep the old buffer we had. + * and keep the old buffer we had. Once allocated + * the new buffer is loaded for dma. */ sc->rx_mbuf[i] = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); if (!sc->rx_mbuf[i]) { + printf("Failed to get another mbuf -- discarding packet\n"); sc->rx_mbuf[i] = mb; sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; - bus_dmamap_sync(sc->rx_desc_tag, - sc->rx_desc_map, + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], + BUS_DMASYNC_PREREAD); + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREWRITE); continue; } + bus_dmamap_unload(sc->rxtag, sc->rx_map[i]); if (bus_dmamap_load_mbuf_sg(sc->rxtag, sc->rx_map[i], sc->rx_mbuf[i], &seg, &nsegs, 0) != 0) { + printf("Failed to load mbuf -- discarding packet -- reload old?\n"); sc->rx_mbuf[i] = mb; sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; - bus_dmamap_sync(sc->rx_desc_tag, - sc->rx_desc_map, + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], + BUS_DMASYNC_PREREAD); + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREWRITE); continue; } - mb->m_len = sc->rx_descs[i].status & - ETH_LEN_MASK; + mb->m_len = rx_stat & ETH_LEN_MASK; mb->m_pkthdr.len = mb->m_len; mb->m_pkthdr.rcvif = sc->ifp; /* @@ -632,11 +654,15 @@ * the controller restarts from the first * descriptor. */ + sc->rx_descs[i].status = 0; + sc->rx_descs[i].addr = seg.ds_addr; if (i == ATE_MAX_RX_BUFFERS - 1) - seg.ds_addr |= 1 << 1; - sc->rx_descs[i].addr = seg.ds_addr; - sc->rx_descs[i].status = 0; - mb->m_len = rx_stat & ETH_LEN_MASK; + sc->rx_descs[i].addr |= ETH_WRAP_BIT; + else + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], + BUS_DMASYNC_PREREAD); + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], + BUS_DMASYNC_PREWRITE); (*sc->ifp->if_input)(sc->ifp, mb); break; } ==== //depot/projects/arm/src/sys/arm/at91/if_atereg.h#7 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Mar 9 21:34:41 2006 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 5C6EB16A423; Thu, 9 Mar 2006 21:34:41 +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 2892F16A420 for ; Thu, 9 Mar 2006 21:34:41 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE47F43D48 for ; Thu, 9 Mar 2006 21:34:40 +0000 (GMT) (envelope-from cognet@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 k29LYemF034209 for ; Thu, 9 Mar 2006 21:34:40 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k29LYeEv034206 for perforce@freebsd.org; Thu, 9 Mar 2006 21:34:40 GMT (envelope-from cognet@freebsd.org) Date: Thu, 9 Mar 2006 21:34:40 GMT Message-Id: <200603092134.k29LYeEv034206@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93064 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, 09 Mar 2006 21:34:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=93064 Change 93064 by cognet@cognet on 2006/03/09 21:33:46 Call bus_dmamap_sync on the rx descriptors map after we modified it, to be sure the adapter sees the new values. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#30 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#30 (text+ko) ==== @@ -608,9 +608,11 @@ if (i == ATE_MAX_RX_BUFFERS - 1) sc->rx_descs[i].addr |= ETH_WRAP_BIT; - bus_dmamap_sync(sc->rxtag, sc->rx_map[i], - BUS_DMASYNC_PREREAD); - bus_dmamap_sync(sc->rxtag, sc->rx_map[i], + bus_dmamap_sync(sc->rx_desc_tag, + sc->rx_desc_map, + BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(sc->rxtag, + sc->rx_map[i], BUS_DMASYNC_PREWRITE); continue; } @@ -627,10 +629,9 @@ printf("Failed to get another mbuf -- discarding packet\n"); sc->rx_mbuf[i] = mb; sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; - bus_dmamap_sync(sc->rxtag, sc->rx_map[i], - BUS_DMASYNC_PREREAD); - bus_dmamap_sync(sc->rxtag, sc->rx_map[i], - BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(sc->rx_desc_tag, + sc->rx_desc_map, + BUS_DMASYNC_PREWRITE); continue; } bus_dmamap_unload(sc->rxtag, sc->rx_map[i]); @@ -640,10 +641,9 @@ printf("Failed to load mbuf -- discarding packet -- reload old?\n"); sc->rx_mbuf[i] = mb; sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; - bus_dmamap_sync(sc->rxtag, sc->rx_map[i], - BUS_DMASYNC_PREREAD); - bus_dmamap_sync(sc->rxtag, sc->rx_map[i], - BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(sc->rx_desc_tag, + sc->rx_desc_map, + BUS_DMASYNC_PREWRITE); continue; } mb->m_len = rx_stat & ETH_LEN_MASK; @@ -658,9 +658,9 @@ sc->rx_descs[i].addr = seg.ds_addr; if (i == ATE_MAX_RX_BUFFERS - 1) sc->rx_descs[i].addr |= ETH_WRAP_BIT; - else - bus_dmamap_sync(sc->rxtag, sc->rx_map[i], - BUS_DMASYNC_PREREAD); + bus_dmamap_sync(sc->rx_desc_tag, + sc->rx_desc_map, + BUS_DMASYNC_PREWRITE); bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREWRITE); (*sc->ifp->if_input)(sc->ifp, mb); From owner-p4-projects@FreeBSD.ORG Thu Mar 9 21:53:04 2006 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 9ABAC16A423; Thu, 9 Mar 2006 21:53:03 +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 717CD16A420 for ; Thu, 9 Mar 2006 21:53:03 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40DB243D45 for ; Thu, 9 Mar 2006 21:53:03 +0000 (GMT) (envelope-from cognet@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 k29Lr3Pm035129 for ; Thu, 9 Mar 2006 21:53:03 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k29Lr2ZR035126 for perforce@freebsd.org; Thu, 9 Mar 2006 21:53:02 GMT (envelope-from cognet@freebsd.org) Date: Thu, 9 Mar 2006 21:53:02 GMT Message-Id: <200603092153.k29Lr2ZR035126@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93066 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, 09 Mar 2006 21:53:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=93066 Change 93066 by cognet@cognet on 2006/03/09 21:52:47 Set the len of the freshly allocated mbuf, or bus_dmamap_load_sg() will consider it has a len of 0, and won't actually feel the seg, which is not good. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#31 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#31 (text+ko) ==== @@ -625,6 +625,8 @@ */ sc->rx_mbuf[i] = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + sc->rx_mbuf[i]->m_len = + sc->rx_mbuf[i]->m_pkthdr.len = MCLBYTES; if (!sc->rx_mbuf[i]) { printf("Failed to get another mbuf -- discarding packet\n"); sc->rx_mbuf[i] = mb; From owner-p4-projects@FreeBSD.ORG Thu Mar 9 22:02:15 2006 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 5259C16A424; Thu, 9 Mar 2006 22:02: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 1F12416A420 for ; Thu, 9 Mar 2006 22:02:15 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D347443D48 for ; Thu, 9 Mar 2006 22:02:14 +0000 (GMT) (envelope-from imp@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 k29M2Exn035544 for ; Thu, 9 Mar 2006 22:02:14 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k29M2E3w035541 for perforce@freebsd.org; Thu, 9 Mar 2006 22:02:14 GMT (envelope-from imp@freebsd.org) Date: Thu, 9 Mar 2006 22:02:14 GMT Message-Id: <200603092202.k29M2E3w035541@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 93067 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, 09 Mar 2006 22:02:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=93067 Change 93067 by imp@imp_Speedy on 2006/03/09 22:02:00 Do not 'break;' when we find one packet. Look for as many as we can each time through. We now keep getting packets until we panic, rather than stopping after a (short) while. Minor code shuffle to reduce indentation insanity. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#32 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#32 (text+ko) ==== @@ -368,9 +368,10 @@ else sc->rx_descs[i].addr = seg.ds_addr; sc->rx_descs[i].status = 0; + /* Flush the memory in the mbuf */ bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREREAD); - bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREWRITE); } + /* Flush the memory for the EMAC rx descriptor */ bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_PREWRITE); /* Write the descriptor queue address. */ WR4(sc, ETH_RBQP, sc->rx_desc_phys); @@ -578,6 +579,11 @@ struct ate_softc *sc = xsc; int status; int i; + struct mbuf *mb; + bus_dma_segment_t seg; + int rx_stat; + int nsegs; + status = RD4(sc, ETH_ISR); if (status == 0) @@ -588,86 +594,81 @@ bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_POSTREAD); for (i = 0; i < ATE_MAX_RX_BUFFERS; i++) { - if (sc->rx_descs[i].addr & ETH_CPU_OWNER) { - struct mbuf *mb = sc->rx_mbuf[i]; - bus_dma_segment_t seg; - int rx_stat; - int nsegs; + if ((sc->rx_descs[i].addr & ETH_CPU_OWNER) == 0) + continue; - bus_dmamap_sync(sc->rxtag, - sc->rx_map[i], BUS_DMASYNC_POSTREAD); - rx_stat = sc->rx_descs[i].status; - printf("GOT ONE %d %x\n", i, rx_stat); - if ((rx_stat & ETH_LEN_MASK) == 0) { - printf("ignoring bogus 0 len packet\n"); - bus_dmamap_load_mbuf_sg(sc->rxtag, - sc->rx_map[i], sc->rx_mbuf[i], - &seg, &nsegs, 0); - sc->rx_descs[i].status = 0; - sc->rx_descs[i].addr = seg.ds_addr; - if (i == ATE_MAX_RX_BUFFERS - 1) - sc->rx_descs[i].addr |= - ETH_WRAP_BIT; - bus_dmamap_sync(sc->rx_desc_tag, - sc->rx_desc_map, - BUS_DMASYNC_PREWRITE); - bus_dmamap_sync(sc->rxtag, - sc->rx_map[i], - BUS_DMASYNC_PREWRITE); - continue; - } - WR4(sc, ETH_RSR, RD4(sc, ETH_RSR)); - /* - * Allocate a new buffer to replace this one. - * if we cannot, then we drop this packet - * and keep the old buffer we had. Once allocated - * the new buffer is loaded for dma. - */ - sc->rx_mbuf[i] = m_getcl(M_DONTWAIT, MT_DATA, - M_PKTHDR); - sc->rx_mbuf[i]->m_len = - sc->rx_mbuf[i]->m_pkthdr.len = MCLBYTES; - if (!sc->rx_mbuf[i]) { - printf("Failed to get another mbuf -- discarding packet\n"); - sc->rx_mbuf[i] = mb; - sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; - bus_dmamap_sync(sc->rx_desc_tag, - sc->rx_desc_map, - BUS_DMASYNC_PREWRITE); - continue; - } - bus_dmamap_unload(sc->rxtag, sc->rx_map[i]); - if (bus_dmamap_load_mbuf_sg(sc->rxtag, - sc->rx_map[i], - sc->rx_mbuf[i], &seg, &nsegs, 0) != 0) { - printf("Failed to load mbuf -- discarding packet -- reload old?\n"); - sc->rx_mbuf[i] = mb; - sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; - bus_dmamap_sync(sc->rx_desc_tag, - sc->rx_desc_map, - BUS_DMASYNC_PREWRITE); - continue; - } - mb->m_len = rx_stat & ETH_LEN_MASK; - mb->m_pkthdr.len = mb->m_len; - mb->m_pkthdr.rcvif = sc->ifp; - /* - * For the last buffer, set the wrap bit so - * the controller restarts from the first - * descriptor. - */ + mb = sc->rx_mbuf[i]; + rx_stat = sc->rx_descs[i].status; + if ((rx_stat & ETH_LEN_MASK) == 0) { + printf("ignoring bogus 0 len packet\n"); + bus_dmamap_load_mbuf_sg(sc->rxtag, + sc->rx_map[i], sc->rx_mbuf[i], + &seg, &nsegs, 0); sc->rx_descs[i].status = 0; sc->rx_descs[i].addr = seg.ds_addr; if (i == ATE_MAX_RX_BUFFERS - 1) - sc->rx_descs[i].addr |= ETH_WRAP_BIT; - bus_dmamap_sync(sc->rx_desc_tag, - sc->rx_desc_map, - BUS_DMASYNC_PREWRITE); + sc->rx_descs[i].addr |= + ETH_WRAP_BIT; + /* Flush memory for mbuf */ + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], + BUS_DMASYNC_PREREAD); + /* Flush rx dtor table rx_descs */ + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, + BUS_DMASYNC_PREWRITE); + continue; + } + + /* Flush memory for mbuf so we don't get stale bytes */ + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], + BUS_DMASYNC_POSTREAD); + printf("GOT ONE %d %x %d\n", i, rx_stat, rx_stat & ETH_LEN_MASK); + WR4(sc, ETH_RSR, RD4(sc, ETH_RSR)); + /* + * Allocate a new buffer to replace this one. + * if we cannot, then we drop this packet + * and keep the old buffer we had. Once allocated + * the new buffer is loaded for dma. + */ + sc->rx_mbuf[i] = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + if (!sc->rx_mbuf[i]) { + printf("Failed to get another mbuf -- discarding packet\n"); + sc->rx_mbuf[i] = mb; + sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], + BUS_DMASYNC_PREREAD); + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, + BUS_DMASYNC_PREWRITE); + continue; + } + bus_dmamap_unload(sc->rxtag, sc->rx_map[i]); + if (bus_dmamap_load_mbuf_sg(sc->rxtag, sc->rx_map[i], + sc->rx_mbuf[i], &seg, &nsegs, 0) != 0) { + printf("Failed to load mbuf -- discarding packet -- reload old?\n"); + sc->rx_mbuf[i] = mb; + sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; bus_dmamap_sync(sc->rxtag, sc->rx_map[i], + BUS_DMASYNC_PREREAD); + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_PREWRITE); - (*sc->ifp->if_input)(sc->ifp, mb); - break; + continue; } + mb->m_len = rx_stat & ETH_LEN_MASK; + mb->m_pkthdr.len = mb->m_len; + mb->m_pkthdr.rcvif = sc->ifp; + /* + * For the last buffer, set the wrap bit so + * the controller restarts from the first + * descriptor. + */ + sc->rx_descs[i].status = 0; + sc->rx_descs[i].addr = seg.ds_addr; + if (i == ATE_MAX_RX_BUFFERS - 1) + sc->rx_descs[i].addr |= ETH_WRAP_BIT; + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], + BUS_DMASYNC_PREREAD); + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, + BUS_DMASYNC_PREWRITE); + (*sc->ifp->if_input)(sc->ifp, mb); } } if (status & ETH_ISR_TCOM) { From owner-p4-projects@FreeBSD.ORG Thu Mar 9 22:11:27 2006 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 6D46716A423; Thu, 9 Mar 2006 22:11:27 +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 4739216A420 for ; Thu, 9 Mar 2006 22:11:27 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D81CA43D4C for ; Thu, 9 Mar 2006 22:11:26 +0000 (GMT) (envelope-from imp@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 k29MBQD4035896 for ; Thu, 9 Mar 2006 22:11:26 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k29MBQeV035893 for perforce@freebsd.org; Thu, 9 Mar 2006 22:11:26 GMT (envelope-from imp@freebsd.org) Date: Thu, 9 Mar 2006 22:11:26 GMT Message-Id: <200603092211.k29MBQeV035893@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 93069 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, 09 Mar 2006 22:11:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=93069 Change 93069 by imp@imp_Speedy on 2006/03/09 22:10:41 64 buffers, rather than 8, since I have a busy network and wrapping works now. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#33 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#33 (text+ko) ==== @@ -74,7 +74,7 @@ #include "miibus_if.h" #define ATE_MAX_TX_BUFFERS 2 /* We have ping-pong tx buffers */ -#define ATE_MAX_RX_BUFFERS 8 +#define ATE_MAX_RX_BUFFERS 64 struct ate_softc { From owner-p4-projects@FreeBSD.ORG Thu Mar 9 22:21:41 2006 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 EEC9416A427; Thu, 9 Mar 2006 22:21: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 B419F16A425 for ; Thu, 9 Mar 2006 22:21:40 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CA0943D53 for ; Thu, 9 Mar 2006 22:21:40 +0000 (GMT) (envelope-from cognet@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 k29MLer4036476 for ; Thu, 9 Mar 2006 22:21:40 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k29MLefK036473 for perforce@freebsd.org; Thu, 9 Mar 2006 22:21:40 GMT (envelope-from cognet@freebsd.org) Date: Thu, 9 Mar 2006 22:21:40 GMT Message-Id: <200603092221.k29MLefK036473@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93073 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, 09 Mar 2006 22:21:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=93073 Change 93073 by cognet@cognet on 2006/03/09 22:21:05 Bring back the code responsible for setting the mbuf len. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#34 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#34 (text+ko) ==== @@ -630,6 +630,8 @@ * the new buffer is loaded for dma. */ sc->rx_mbuf[i] = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + sc->rx_mbuf[i]->m_len = + sc->rx_mbuf[i]->m_pkthdr.len = MCLBYTES; if (!sc->rx_mbuf[i]) { printf("Failed to get another mbuf -- discarding packet\n"); sc->rx_mbuf[i] = mb; From owner-p4-projects@FreeBSD.ORG Thu Mar 9 22:41:06 2006 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 C7A0316A423; Thu, 9 Mar 2006 22:41: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 6D01616A422 for ; Thu, 9 Mar 2006 22:41:05 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 14BB043D55 for ; Thu, 9 Mar 2006 22:41:05 +0000 (GMT) (envelope-from cognet@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 k29Mf4vJ037256 for ; Thu, 9 Mar 2006 22:41:04 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k29Mf4rN037253 for perforce@freebsd.org; Thu, 9 Mar 2006 22:41:04 GMT (envelope-from cognet@freebsd.org) Date: Thu, 9 Mar 2006 22:41:04 GMT Message-Id: <200603092241.k29Mf4rN037253@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93076 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, 09 Mar 2006 22:41:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=93076 Change 93076 by cognet@cognet on 2006/03/09 22:40:51 grrr The asm in_cksum_hdr() is bogus. Bring in a C version until I understand what happens, so that Warner can still work. Your usual pointy hat to: cognet Affected files ... .. //depot/projects/arm/src/sys/arm/arm/in_cksum.c#4 edit .. //depot/projects/arm/src/sys/arm/include/in_cksum.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/in_cksum.c#4 (text+ko) ==== @@ -130,3 +130,12 @@ REDUCE16; return (~sum & 0xffff); } + +u_int in_cksum_hdr(const struct ip *ip) +{ + u_int64_t sum = do_cksum(ip, sizeof(struct ip)); + union q_util q_util; + union l_util l_util; + REDUCE16; + return (~sum & 0xffff); +} ==== //depot/projects/arm/src/sys/arm/include/in_cksum.h#3 (text+ko) ==== @@ -46,6 +46,8 @@ u_short in_addword(u_short sum, u_short b); u_short in_cksum_skip(struct mbuf *m, int len, int skip); u_int do_cksum(const void *, int); +u_int in_cksum_hdr(const struct ip *); +#if 0 static __inline u_int in_cksum_hdr(const struct ip *ip) { @@ -120,6 +122,7 @@ sum -= 0xffff; return (~sum & 0xffff); } +#endif static __inline u_short in_pseudo(u_int sum, u_int b, u_int c) From owner-p4-projects@FreeBSD.ORG Thu Mar 9 23:32:09 2006 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 C9E5916A420; Thu, 9 Mar 2006 23:32: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 7992016A420 for ; Thu, 9 Mar 2006 23:32:08 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2B9EF43D45 for ; Thu, 9 Mar 2006 23:32:08 +0000 (GMT) (envelope-from cognet@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 k29NW8OB039227 for ; Thu, 9 Mar 2006 23:32:08 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k29NW7jG039224 for perforce@freebsd.org; Thu, 9 Mar 2006 23:32:07 GMT (envelope-from cognet@freebsd.org) Date: Thu, 9 Mar 2006 23:32:07 GMT Message-Id: <200603092332.k29NW7jG039224@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93079 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, 09 Mar 2006 23:32:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=93079 Change 93079 by cognet@cognet on 2006/03/09 23:32:03 Just forget the idea of an inlined asm in_cksum_hdr(). Handling the unaligned pointer case is a PITA, and it just doesn't worth it Affected files ... .. //depot/projects/arm/src/sys/arm/include/in_cksum.h#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/include/in_cksum.h#4 (text+ko) ==== @@ -47,82 +47,6 @@ u_short in_cksum_skip(struct mbuf *m, int len, int skip); u_int do_cksum(const void *, int); u_int in_cksum_hdr(const struct ip *); -#if 0 -static __inline u_int -in_cksum_hdr(const struct ip *ip) -{ - u_int sum = 0; - u_int tmp1, tmp2, tmp3, tmp4; - - if (((vm_offset_t)ip & 0x03) == 0) - __asm __volatile ( - "adds %0, %0, %1\n" - "adcs %0, %0, %2\n" - "adcs %0, %0, %3\n" - "adcs %0, %0, %4\n" - "adcs %0, %0, %5\n" - "adc %0, %0, #0\n" - : "+r" (sum) - : "r" (((const u_int32_t *)ip)[0]), - "r" (((const u_int32_t *)ip)[1]), - "r" (((const u_int32_t *)ip)[2]), - "r" (((const u_int32_t *)ip)[3]), - "r" (((const u_int32_t *)ip)[4]) - ); - else - __asm __volatile ( - "and %1, %5, #3\n" - "cmp %1, #0x02\n" - "ldrb %2, [%5], #0x01\n" - "ldrgeb %3, [%5], #0x01\n" - "movlt %3, #0\n" - "ldrgtb %4, [%5], #0x01\n" - "movle %4, #0x00\n" -#ifdef __ARMEB__ - "orreq %0, %3, %2, lsl #8\n" - "orreq %0, %0, %4, lsl #24\n" - "orrne %0, %0, %3, lsl #8\n" - "orrne %0, %0, %4, lsl #16\n" -#else - "orreq %0, %2, %3, lsl #8\n" - "orreq %0, %0, %4, lsl #16\n" - "orrne %0, %3, %2, lsl #8\n" - "orrne %0, %0, %4, lsl #24\n" -#endif - "ldmia %5, {%2, %3, %4}\n" - "adcs %0, %0, %2\n" - "adcs %0, %0, %3\n" - "adcs %0, %0, %4\n" - "ldrb %2, [%5]\n" - "cmp %1, #0x02\n" - "ldrgeb %3, [%5, #0x01]\n" - "movlt %3, #0x00\n" - "ldrgtb %4, [%5, #0x02]\n" - "movle %4, #0x00\n" - "tst %5, #0x01\n" -#ifdef __ARMEB__ - "orreq %2, %3, %2, lsl #8\n" - "orreq %2, %2, %4, lsl #24\n" - "orrne %2, %2, %3, lsl #8\n" - "orrne %2, %2, %4, lsl #16\n" -#else - "orreq %2, %2, %3, lsl #8\n" - "orreq %2, %2, %4, lsl #16\n" - "orrne %2, %3, %2, lsl #8\n" - "orrne %2, %2, %4, lsl #24\n" -#endif - "adds %0, %0, %2\n" - "adc %0, %0, #0\n" - : "+r" (sum), "=r" (tmp1), "=r" (tmp2), "=r" (tmp3), - "=r" (tmp4) - : "r" (ip)); - - sum = (sum & 0xffff) + (sum >> 16); - if (sum > 0xffff) - sum -= 0xffff; - return (~sum & 0xffff); -} -#endif static __inline u_short in_pseudo(u_int sum, u_int b, u_int c) From owner-p4-projects@FreeBSD.ORG Fri Mar 10 00:07:56 2006 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 943C916A423; Fri, 10 Mar 2006 00:07:55 +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 44B5416A420 for ; Fri, 10 Mar 2006 00:07:55 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FB3143D45 for ; Fri, 10 Mar 2006 00:07:55 +0000 (GMT) (envelope-from cognet@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 k2A07stO040520 for ; Fri, 10 Mar 2006 00:07:54 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2A07r3r040508 for perforce@freebsd.org; Fri, 10 Mar 2006 00:07:53 GMT (envelope-from cognet@freebsd.org) Date: Fri, 10 Mar 2006 00:07:53 GMT Message-Id: <200603100007.k2A07r3r040508@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93082 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, 10 Mar 2006 00:07:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=93082 Change 93082 by cognet@cognet on 2006/03/10 00:06:58 Split the received mbuf into two mbuf, for alignment constraints. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#35 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#35 (text+ko) ==== @@ -74,7 +74,7 @@ #include "miibus_if.h" #define ATE_MAX_TX_BUFFERS 2 /* We have ping-pong tx buffers */ -#define ATE_MAX_RX_BUFFERS 64 +#define ATE_MAX_RX_BUFFERS 8 struct ate_softc { @@ -579,7 +579,7 @@ struct ate_softc *sc = xsc; int status; int i; - struct mbuf *mb; + struct mbuf *mb, *tmp_mbuf; bus_dma_segment_t seg; int rx_stat; int nsegs; @@ -630,8 +630,6 @@ * the new buffer is loaded for dma. */ sc->rx_mbuf[i] = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); - sc->rx_mbuf[i]->m_len = - sc->rx_mbuf[i]->m_pkthdr.len = MCLBYTES; if (!sc->rx_mbuf[i]) { printf("Failed to get another mbuf -- discarding packet\n"); sc->rx_mbuf[i] = mb; @@ -642,6 +640,8 @@ BUS_DMASYNC_PREWRITE); continue; } + sc->rx_mbuf[i]->m_len = + sc->rx_mbuf[i]->m_pkthdr.len = MCLBYTES; bus_dmamap_unload(sc->rxtag, sc->rx_map[i]); if (bus_dmamap_load_mbuf_sg(sc->rxtag, sc->rx_map[i], sc->rx_mbuf[i], &seg, &nsegs, 0) != 0) { @@ -657,6 +657,7 @@ mb->m_len = rx_stat & ETH_LEN_MASK; mb->m_pkthdr.len = mb->m_len; mb->m_pkthdr.rcvif = sc->ifp; + tmp_mbuf = m_copyup(mb, ETHER_HDR_LEN, 2); /* * For the last buffer, set the wrap bit so * the controller restarts from the first @@ -670,7 +671,7 @@ BUS_DMASYNC_PREREAD); bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_PREWRITE); - (*sc->ifp->if_input)(sc->ifp, mb); + (*sc->ifp->if_input)(sc->ifp, tmp_mbuf); } } if (status & ETH_ISR_TCOM) { From owner-p4-projects@FreeBSD.ORG Fri Mar 10 00:18:08 2006 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 45EEB16A423; Fri, 10 Mar 2006 00:18: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 1BCD316A420 for ; Fri, 10 Mar 2006 00:18:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C922D43D45 for ; Fri, 10 Mar 2006 00:18:07 +0000 (GMT) (envelope-from imp@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 k2A0I7JS040916 for ; Fri, 10 Mar 2006 00:18:07 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2A0I7oQ040913 for perforce@freebsd.org; Fri, 10 Mar 2006 00:18:07 GMT (envelope-from imp@freebsd.org) Date: Fri, 10 Mar 2006 00:18:07 GMT Message-Id: <200603100018.k2A0I7oQ040913@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 93083 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, 10 Mar 2006 00:18:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=93083 Change 93083 by imp@imp_Speedy on 2006/03/10 00:17:43 use 64 buffers for rx again. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#36 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#36 (text+ko) ==== @@ -74,7 +74,7 @@ #include "miibus_if.h" #define ATE_MAX_TX_BUFFERS 2 /* We have ping-pong tx buffers */ -#define ATE_MAX_RX_BUFFERS 8 +#define ATE_MAX_RX_BUFFERS 64 struct ate_softc { From owner-p4-projects@FreeBSD.ORG Fri Mar 10 00:43:41 2006 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 922AE16A423; Fri, 10 Mar 2006 00:43: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 52CFE16A420 for ; Fri, 10 Mar 2006 00:43:40 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2075743D45 for ; Fri, 10 Mar 2006 00:43:40 +0000 (GMT) (envelope-from cognet@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 k2A0hd1p041757 for ; Fri, 10 Mar 2006 00:43:39 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2A0hdPR041754 for perforce@freebsd.org; Fri, 10 Mar 2006 00:43:39 GMT (envelope-from cognet@freebsd.org) Date: Fri, 10 Mar 2006 00:43:39 GMT Message-Id: <200603100043.k2A0hdPR041754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93084 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, 10 Mar 2006 00:43:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=93084 Change 93084 by cognet@cognet on 2006/03/10 00:42:46 Try to get non-cached memory for rx descriptors. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#37 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#37 (text+ko) ==== @@ -341,8 +341,8 @@ &sc->sc_mtx, &sc->rx_desc_tag); if (err != 0) goto errout; - if (bus_dmamem_alloc(sc->rx_desc_tag, (void **)&sc->rx_descs, M_WAITOK, - &sc->rx_desc_map) != 0) + if (bus_dmamem_alloc(sc->rx_desc_tag, (void **)&sc->rx_descs, + BUS_DMA_NOWAIT | BUS_DMA_COHERENT, &sc->rx_desc_map) != 0) goto errout; if (bus_dmamap_load(sc->rx_desc_tag, sc->rx_desc_map, sc->rx_descs, ATE_MAX_RX_BUFFERS * sizeof(eth_rx_desc_t), @@ -801,7 +801,7 @@ if (bus_dmamap_load_mbuf_sg(sc->mtag, sc->tx_map[sc->txcur], m, segs, &nseg, 0) != 0) { - m_free(m); + m_freem(m); goto outloop; } bus_dmamap_sync(sc->mtag, sc->tx_map[sc->txcur], BUS_DMASYNC_PREWRITE); From owner-p4-projects@FreeBSD.ORG Fri Mar 10 01:13:18 2006 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 610D216A423; Fri, 10 Mar 2006 01:13: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 30EA616A420 for ; Fri, 10 Mar 2006 01:13:18 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1C0A43D46 for ; Fri, 10 Mar 2006 01:13:17 +0000 (GMT) (envelope-from kmacy@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 k2A1DH7h050418 for ; Fri, 10 Mar 2006 01:13:17 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2A1DHPI050415 for perforce@freebsd.org; Fri, 10 Mar 2006 01:13:17 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 10 Mar 2006 01:13:17 GMT Message-Id: <200603100113.k2A1DHPI050415@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93086 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, 10 Mar 2006 01:13:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=93086 Change 93086 by kmacy@kmacy_storage:sun4v_work on 2006/03/10 01:13:01 support 64-bit spill traps at TL 1 handle case of pmap_activate not being called support user page fault in from kernel start_init makes it to execve Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#10 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#22 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#20 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#9 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/wbuf.S#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#7 (text+ko) ==== @@ -200,6 +200,42 @@ ldx [TF + TF_O6], %i6; \ ldx [TF + TF_O7], %i7; +#define SAVE_WINDOW(SBP) \ + stx %l0, [SBP + (0*8)]; \ + stx %l1, [SBP + (1*8)]; \ + stx %l2, [SBP + (2*8)]; \ + stx %l3, [SBP + (3*8)]; \ + stx %l4, [SBP + (4*8)]; \ + stx %l5, [SBP + (5*8)]; \ + stx %l6, [SBP + (6*8)]; \ + stx %l7, [SBP + (7*8)]; \ + stx %i0, [SBP + (8*8)]; \ + stx %i1, [SBP + (9*8)]; \ + stx %i2, [SBP + (10*8)]; \ + stx %i3, [SBP + (11*8)]; \ + stx %i4, [SBP + (12*8)]; \ + stx %i5, [SBP + (13*8)]; \ + stx %i6, [SBP + (14*8)]; \ + stx %i7, [SBP + (15*8)]; + +#define SAVE_WINDOW_ASI(SBP) \ + stxa %l0, [SBP + (0*8)]%asi; \ + stxa %l1, [SBP + (1*8)]%asi; \ + stxa %l2, [SBP + (2*8)]%asi; \ + stxa %l3, [SBP + (3*8)]%asi; \ + stxa %l4, [SBP + (4*8)]%asi; \ + stxa %l5, [SBP + (5*8)]%asi; \ + stxa %l6, [SBP + (6*8)]%asi; \ + stxa %l7, [SBP + (7*8)]%asi; \ + stxa %i0, [SBP + (8*8)]%asi; \ + stxa %i1, [SBP + (9*8)]%asi; \ + stxa %i2, [SBP + (10*8)]%asi; \ + stxa %i3, [SBP + (11*8)]%asi; \ + stxa %i4, [SBP + (12*8)]%asi; \ + stxa %i5, [SBP + (13*8)]%asi; \ + stxa %i6, [SBP + (14*8)]%asi; \ + stxa %i7, [SBP + (15*8)]%asi; + #endif /* LOCORE */ #endif /* _KERNEL */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#10 (text+ko) ==== @@ -24,7 +24,7 @@ struct hv_tsb_info; -vm_paddr_t tsb_init(struct hv_tsb_info *tsb); +vm_paddr_t tsb_init(struct hv_tsb_info *tsb, uint64_t *scratchval); void tsb_deinit(struct hv_tsb_info *tsb); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#5 (text+ko) ==== @@ -10,7 +10,7 @@ tte_hash_t tte_hash_kernel_create(vm_offset_t, uint64_t); -tte_hash_t tte_hash_create(uint64_t context); +tte_hash_t tte_hash_create(uint64_t context, uint64_t *scratchval); void tte_hash_destroy(tte_hash_t th); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#22 (text+ko) ==== @@ -763,6 +763,7 @@ tl1_reserved 8 ! 0x228-0x22f tl1_data_excptn_230: data_excptn ! 0x230 +tl1_data_miss_231: data_miss ! 0x231 tl1_reserved 2 ! 0x232-0x233 tl1_align: @@ -1020,12 +1021,17 @@ SAVE_OUTS(%l7) ! for the call bug workaround wrpr %g0, PSTATE_KERNEL, %pstate ! enable ints ! MAGIC_TRAP_OFF + #if 0 call critical_enter nop + #endif + stx %l4, [%l7 + TF_TYPE] ! save trap type jmpl %l3, %o7 ! call trap handler mov %l7, %o0 + #if 0 call critical_exit nop + #endif ! MAGIC_TRAP_ON ENTRY(krtt) GET_PCPU_SCRATCH @@ -1088,8 +1094,10 @@ set ktl0, %g4 save %sp, -(CCFSZ + TF_SIZEOF), %sp + mov %g2, %l3 ! set trap/interrupt for tl0 - + or %g1, T_KERNEL, %l4 ! pil/trap type + ! if the kwbuf is full we need to save to the stack now ld [PCPU_REG + PC_KWBUF_FULL], %o0 brz,pt %o0, 1f @@ -1122,6 +1130,7 @@ ! %g7 == PCPU ! %g3-%g5 temporaries ENTRY(tl0_trap) + GET_PCPU_SCRATCH rdpr %tstate, %g3 btst TSTATE_PRIV, %g3 and %g3, TSTATE_CWP_MASK, %g4 @@ -1202,7 +1211,7 @@ illtrap ! give up 3: #endif - sethi %hi(PAGE_MASK), %g7 + sethi %hi(PAGE_SIZE), %g7 sub %g7, 1, %g7 ! %g7==PAGE_MASK and %g2, %g7, %g4 ! size stored in lower 13 bits @@ -1266,10 +1275,10 @@ 4: ! not found ! we need to jump to tl0_trap to drop us back down to tl0 ! and take us to trap(...) to service the fault - ! skipping this step for the moment so we just do an illtrap + mov T_DATA_MISS, %g1 + sethi %hi(trap), %g2 ba %xcc, tl0_trap - mov T_DATA_MISS, %g1 - + or %g2, %lo(trap), %g2 tsb_miss_found: 5: !found ! %g1 == abs index %g2 == THE pointer %g3 == flags ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#20 (text+ko) ==== @@ -342,7 +342,7 @@ pmap_activate(struct thread *td) { pmap_t pmap, oldpmap; - + printf("activating pmap\n"); critical_enter(); pmap = vmspace_pmap(td->td_proc->p_vmspace); @@ -1176,8 +1176,8 @@ KASSERT(context < PMAP_CONTEXT_MAX, ("max context limit hit - need to implement context recycling")); - pmap->pm_hash = tte_hash_create(pmap->pm_context); - pmap->pm_tsb_ra = tsb_init(&pmap->pm_tsb); + pmap->pm_hash = tte_hash_create(pmap->pm_context, &pmap->pm_hashscratch); + pmap->pm_tsb_ra = tsb_init(&pmap->pm_tsb, &pmap->pm_tsbscratch); pmap->pm_active = 0; TAILQ_INIT(&pmap->pm_pvlist); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#9 (text+ko) ==== @@ -62,10 +62,11 @@ #endif vm_paddr_t -tsb_init(hv_tsb_info_t *hvtsb) +tsb_init(hv_tsb_info_t *hvtsb, uint64_t *scratchval) { vm_page_t m; int granted; + uint64_t tsb_pages; static int color; granted = 0; @@ -86,6 +87,9 @@ hvtsb->hvtsb_pgszs = TSB8K; hvtsb->hvtsb_rsvd = 0; hvtsb->hvtsb_pa = VM_PAGE_TO_PHYS(m); + + tsb_pages = hvtsb->hvtsb_ntte >> (PAGE_SHIFT - TTE_SHIFT); + *scratchval = hvtsb->hvtsb_pa | tsb_pages; return vtophys(hvtsb); } ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#7 (text+ko) ==== @@ -141,7 +141,7 @@ tte_hash_t -tte_hash_create(uint64_t context) +tte_hash_create(uint64_t context, uint64_t *scratchval) { tte_hash_t th; vm_page_t m, hash_pages[HASH_SIZE]; @@ -175,6 +175,7 @@ if ((hash_pages[i]->flags & PG_ZERO) == 0) pmap_zero_page(hash_pages[i]); } + *scratchval = ((vm_offset_t)th->th_hashtable) | ((vm_offset_t)th->th_size); return (th); } ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/wbuf.S#3 (text+ko) ==== @@ -30,6 +30,14 @@ END(fault_32bit_sk) ENTRY(fault_64bit_sk) + GET_PCPU_SCRATCH + stx %sp, [PCPU_REG + PC_KWBUF_SP] + add PCPU_REG, PC_KWBUF, %g6 + SAVE_WINDOW(%g6) + mov 1, %g6 + st %g6, [PCPU_REG + PC_KWBUF_FULL] + saved + retry END(fault_64bit_sk) From owner-p4-projects@FreeBSD.ORG Fri Mar 10 03:46:24 2006 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 367DD16A424; Fri, 10 Mar 2006 03:46: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 0932A16A420 for ; Fri, 10 Mar 2006 03:46:24 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C73CE43D48 for ; Fri, 10 Mar 2006 03:46:23 +0000 (GMT) (envelope-from soc-andrew@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 k2A3kNPA056136 for ; Fri, 10 Mar 2006 03:46:23 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2A3kNdK056133 for perforce@freebsd.org; Fri, 10 Mar 2006 03:46:23 GMT (envelope-from soc-andrew@freebsd.org) Date: Fri, 10 Mar 2006 03:46:23 GMT Message-Id: <200603100346.k2A3kNdK056133@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 93091 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, 10 Mar 2006 03:46:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=93091 Change 93091 by soc-andrew@soc-andrew_serv on 2006/03/10 03:46:06 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#11 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#36 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.536 2006/02/27 09:17:39 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.537 2006/03/09 12:55:02 keramida Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -824,6 +824,10 @@ _pwd_mkdb= usr.sbin/pwd_mkdb .endif +.if ${BOOTSTRAPPING} < 700014 +_gensnmptree= usr.sbin/bsnmpd/gensnmptree +.endif + bootstrap-tools: .for _tool in \ ${_strfile} \ @@ -839,6 +843,7 @@ usr.bin/rpcgen \ usr.bin/xinstall \ usr.sbin/config \ + ${_gensnmptree} \ ${_crunchgen} \ ${_pwd_mkdb} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#36 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.900 2006/03/08 18:02:30 sam Exp $ +# $FreeBSD: src/release/Makefile,v 1.902 2006/03/09 17:55:08 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -177,10 +177,9 @@ # Build and package both GENERIC and SMP kernels if the target # has both configuration files. Otherwise only GENERIC is done. # -.if !exists(${.CURDIR}/../sys/${TARGET}/conf/SMP) -KERNELS?= GENERIC -.else -KERNELS?= GENERIC SMP +KERNELS+= GENERIC +.if exists(${.CURDIR}/../sys/${TARGET}/conf/SMP) +KERNELS+= SMP .endif # mountpoint for filesystems. From owner-p4-projects@FreeBSD.ORG Fri Mar 10 06:40:04 2006 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 8255316A423; Fri, 10 Mar 2006 06:40:03 +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 5A1E416A420 for ; Fri, 10 Mar 2006 06:40:03 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 260E143D45 for ; Fri, 10 Mar 2006 06:40:03 +0000 (GMT) (envelope-from imp@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 k2A6e3xe072340 for ; Fri, 10 Mar 2006 06:40:03 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2A6e2fM072334 for perforce@freebsd.org; Fri, 10 Mar 2006 06:40:02 GMT (envelope-from imp@freebsd.org) Date: Fri, 10 Mar 2006 06:40:02 GMT Message-Id: <200603100640.k2A6e2fM072334@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 93095 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, 10 Mar 2006 06:40:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=93095 Change 93095 by imp@imp_hammer on 2006/03/10 06:39:29 Try to use m_devget() as suggested by jhb and done in the de driver. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#38 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#38 (text+ko) ==== @@ -24,10 +24,8 @@ /* TODO: (in no order) * - * 5) Setup RX buffers in ateinit_locked * 8) Need to sync busdma goo in atestop * 9) atestop should maybe free the mbufs? - * 10) On Rx, how do we get a new mbuf? * * 1) detach * 2) Free dma setup @@ -657,7 +655,8 @@ mb->m_len = rx_stat & ETH_LEN_MASK; mb->m_pkthdr.len = mb->m_len; mb->m_pkthdr.rcvif = sc->ifp; - tmp_mbuf = m_copyup(mb, ETHER_HDR_LEN, 2); + tmp_mbuf = m_devget(mtod(md, caddr_t), mb->m_len, + ETHER_ALIGN, sc->ifp, NULL); /* * For the last buffer, set the wrap bit so * the controller restarts from the first @@ -671,7 +670,8 @@ BUS_DMASYNC_PREREAD); bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_PREWRITE); - (*sc->ifp->if_input)(sc->ifp, tmp_mbuf); + if (tmp_mbuf != NULL) + (*sc->ifp->if_input)(sc->ifp, tmp_mbuf); } } if (status & ETH_ISR_TCOM) { From owner-p4-projects@FreeBSD.ORG Fri Mar 10 08:59:29 2006 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 A6DDA16A423; Fri, 10 Mar 2006 08:59:28 +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 6EDE116A420 for ; Fri, 10 Mar 2006 08:59:28 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12C4243D45 for ; Fri, 10 Mar 2006 08:59:28 +0000 (GMT) (envelope-from kmacy@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 k2A8xRCC085422 for ; Fri, 10 Mar 2006 08:59:27 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2A8xR6J085419 for perforce@freebsd.org; Fri, 10 Mar 2006 08:59:27 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 10 Mar 2006 08:59:27 GMT Message-Id: <200603100859.k2A8xR6J085419@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93102 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, 10 Mar 2006 08:59:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=93102 Change 93102 by kmacy@kmacy_storage:sun4v_work on 2006/03/10 08:59:14 initialize lock for user pmap remove page references when doing unmap Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#21 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#21 (text+ko) ==== @@ -171,7 +171,7 @@ static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); - +static int pmap_remove_tte(pmap_t pmap, uint64_t *tte, vm_offset_t va); /* * Quick sort callout for comparing memory regions. @@ -804,6 +804,7 @@ if (invlva) pmap_invalidate_page(pmap, va); } else { + tsb_set_tte(&pmap->pm_tsb, va, tte_data, pmap->pm_context); tte_hash_insert(pmap->pm_hash, va, tte_data); } } @@ -1180,6 +1181,7 @@ pmap->pm_tsb_ra = tsb_init(&pmap->pm_tsb, &pmap->pm_tsbscratch); pmap->pm_active = 0; TAILQ_INIT(&pmap->pm_pvlist); + PMAP_LOCK_INIT(pmap); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); } @@ -1307,8 +1309,9 @@ void pmap_remove(pmap_t pmap, vm_offset_t start, vm_offset_t end) { - int invlva, tinvlva; + int invlva; vm_offset_t tva; + uint64_t *tte; /* * Perform an unsynchronized read. This is, however, safe. */ @@ -1320,8 +1323,13 @@ sched_pin(); PMAP_LOCK(pmap); for (tva = start; tva < end; tva += PAGE_SIZE) { - tinvlva = tte_hash_delete(pmap->pm_hash, tva); - invlva = tinvlva ? tinvlva : invlva; + + if ((tte = tte_hash_lookup(pmap->pm_hash, tva)) == NULL) + continue; + pmap_remove_tte(pmap, tte, tva); + tte_hash_delete(pmap->pm_hash, tva); + + invlva = 1; } sched_unpin(); vm_page_unlock_queues(); @@ -1474,6 +1482,8 @@ vm_page_unlock_queues(); } + + void pmap_scrub_pages(vm_paddr_t pa, int64_t size) { @@ -1484,6 +1494,31 @@ size -= bytes_zeroed; } } +static int +pmap_remove_tte(pmap_t pmap, uint64_t *tte, vm_offset_t va) +{ + + vm_page_t m; + + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + if (*tte & VTD_WIRED) + pmap->pm_stats.wired_count -= 1; + + pmap->pm_stats.resident_count -= 1; + + if (*tte & VTD_MANAGED) { + m = PHYS_TO_VM_PAGE(TTE_GET_PA(*tte)); + if (*tte & VTD_W) { + if (pmap_track_modified(pmap, va)) + vm_page_dirty(m); + } + if (*tte & VTD_REF) + vm_page_flag_set(m, PG_REFERENCED); + pmap_remove_entry(pmap, m, va); + } + +} /* * Set the 2 global kernel TSBs From owner-p4-projects@FreeBSD.ORG Fri Mar 10 09:04:09 2006 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 D420916A423; Fri, 10 Mar 2006 09:04: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 A31F416A420 for ; Fri, 10 Mar 2006 09:04:08 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71B4343D48 for ; Fri, 10 Mar 2006 09:04:08 +0000 (GMT) (envelope-from kmacy@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 k2A948FF085617 for ; Fri, 10 Mar 2006 09:04:08 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2A948lR085614 for perforce@freebsd.org; Fri, 10 Mar 2006 09:04:08 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 10 Mar 2006 09:04:08 GMT Message-Id: <200603100904.k2A948lR085614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93103 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, 10 Mar 2006 09:04:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=93103 Change 93103 by kmacy@kmacy_storage:sun4v_work on 2006/03/10 09:03:07 we're currently setting the context area in the TTE tag consequently we need to set the TSB context index to -1 Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#10 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#10 (text+ko) ==== @@ -83,14 +83,18 @@ hvtsb->hvtsb_idxpgsz = TTE8K; hvtsb->hvtsb_assoc = 1; hvtsb->hvtsb_ntte = (PAGE_SIZE >> TTE_SHIFT); - hvtsb->hvtsb_ctx_index = 0; + hvtsb->hvtsb_ctx_index = -1; /* TSBs aren't shared so if we don't + * set the context in the TTEs we can + * simplify miss handling slightly + */ hvtsb->hvtsb_pgszs = TSB8K; hvtsb->hvtsb_rsvd = 0; hvtsb->hvtsb_pa = VM_PAGE_TO_PHYS(m); tsb_pages = hvtsb->hvtsb_ntte >> (PAGE_SHIFT - TTE_SHIFT); *scratchval = hvtsb->hvtsb_pa | tsb_pages; - + + printf("hvtsb_pa=0x%lx\n", hvtsb->hvtsb_pa); return vtophys(hvtsb); } From owner-p4-projects@FreeBSD.ORG Fri Mar 10 09:09:23 2006 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 C958316A430; Fri, 10 Mar 2006 09:09:20 +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 E25E316A437 for ; Fri, 10 Mar 2006 09:09:19 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A02B343D81 for ; Fri, 10 Mar 2006 09:09:15 +0000 (GMT) (envelope-from kmacy@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 k2A99Fbc085811 for ; Fri, 10 Mar 2006 09:09:15 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2A99Fa3085808 for perforce@freebsd.org; Fri, 10 Mar 2006 09:09:15 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 10 Mar 2006 09:09:15 GMT Message-Id: <200603100909.k2A99Fa3085808@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93104 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, 10 Mar 2006 09:09:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=93104 Change 93104 by kmacy@kmacy_storage:sun4v_work on 2006/03/10 09:08:23 be more aggressive about exiting on failure set tag values up for reading in trap(...) so that fault in actually appears to work we currently die in user_rtt because %l7 isn't set to the trapframe Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#23 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#23 (text+ko) ==== @@ -54,7 +54,8 @@ #define SPILL_FILL_MAGIC_TRAP_ON nop #define SPILL_FILL_MAGIC_TRAP_OFF nop #define MAGIC_TRAP_ON ta 0x77 -#define MAGIC_TRAP_OFF ta 0x78 +#define MAGIC_TRAP_OFF ta 0x78 +#define MAGIC_EXIT ta 0x71 /*#define MAGIC_TRAP_OFF nop */ #else #define SPILL_FILL_MAGIC_TRAP_ON nop @@ -225,7 +226,7 @@ #if 0 tl0_gen T_RESERVED #else - illtrap + MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT .align 32 #endif @@ -239,7 +240,7 @@ wrpr %g1, WSTATE_NESTED, %wstate save %sp, -(CCFSZ + TF_SIZEOF), %sp #endif - illtrap + MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT .endm .macro tl1_setup type @@ -264,15 +265,15 @@ .macro insn_excptn MAGIC_TRAP_ON MAGIC_TRAP_ON - illtrap + MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT .align 32 .endm .macro insn_miss GET_MMFSA_SCRATCH(%g1) - mov MMFSA_D_TYPE, %g2 - mov MMFSA_D_ADDR, %g3 - mov MMFSA_D_CTX, %g7 + mov MMFSA_I_TYPE, %g2 + mov MMFSA_I_ADDR, %g3 + mov MMFSA_I_CTX, %g7 ldxa [%g1 + %g2]ASI_REAL, %g4 ldxa [%g1 + %g3]ASI_REAL, %g5 ba,pt %xcc, tsb_miss_handler @@ -282,7 +283,7 @@ .macro data_excptn MAGIC_TRAP_ON - illtrap + MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT .align 32 .endm @@ -312,7 +313,7 @@ MAGIC_TRAP_ON MAGIC_TRAP_ON MAGIC_TRAP_ON - illtrap + MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT .align 32 .endm @@ -1026,6 +1027,7 @@ nop #endif stx %l4, [%l7 + TF_TYPE] ! save trap type + stx %l5, [%l7 + TF_TAR] ! save mem info jmpl %l3, %o7 ! call trap handler mov %l7, %o0 #if 0 @@ -1034,6 +1036,7 @@ #endif ! MAGIC_TRAP_ON ENTRY(krtt) + MAGIC_TRAP_ON GET_PCPU_SCRATCH common_rtt: ! @@ -1083,6 +1086,7 @@ ! rdpr %cwp, %g1 wrpr %g1, %g4, %tstate + MAGIC_TRAP_OFF retry END(krtt) END(ktl0) @@ -1095,9 +1099,10 @@ save %sp, -(CCFSZ + TF_SIZEOF), %sp - mov %g2, %l3 ! set trap/interrupt for tl0 - or %g1, T_KERNEL, %l4 ! pil/trap type - + mov %g2, %l3 ! set trap/interrupt for tl0 + or %g1, T_KERNEL, %l4 ! pil/trap type + mov %g6, %l5 ! fault info if set + ! if the kwbuf is full we need to save to the stack now ld [PCPU_REG + PC_KWBUF_FULL], %o0 brz,pt %o0, 1f @@ -1126,7 +1131,6 @@ ! assumes %g3 - %g5 are free ! %g1 == pil that we came in on ! %g2 == interrupt handler - ! %g6 == PCB ! %g7 == PCPU ! %g3-%g5 temporaries ENTRY(tl0_trap) @@ -1137,7 +1141,7 @@ bnz,pn %xcc, tl0_ktrap wrpr %g0, %g4, %cwp ENTRY(tl0_utrap) - illtrap + MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT win_saved: ! @@ -1183,12 +1187,12 @@ ! %g6==context,hash size, temp ! %g7 temp ENTRY(tsb_miss_handler) - MAGIC_TRAP_ON ldxa [%g1 + %g7]ASI_REAL, %g6 ! load in the context cmp %g6, %g0 ! kernel? be,pn %xcc, 1f - srlx %g5, TTARGET_VA_SHIFT, %g1 + srlx %g5, TTARGET_VA_SHIFT, %g1 + MAGIC_TRAP_ON GET_HASH_SCRATCH_USER(%g2) ba,pt %xcc, 2f sllx %g6, TTARGET_CTX_SHIFT, %g6 @@ -1208,7 +1212,7 @@ bne,pt %xcc, 3f nop tsb_miss_null_deref: - illtrap ! give up + MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT ! give up 3: #endif sethi %hi(PAGE_SIZE), %g7 @@ -1228,11 +1232,11 @@ ! %g2==entry base add %g2, %g4, %g2 ! base + offset == entry base - + mov %g5, %g7 ! entry 0 ! %g1 == abs index %g2 == THE pointer %g3 == flags ! %g4 <- tag %g5 <- data - ! %g6 == search tag %g7 == PAGE_MASK + ! %g6 == search tag %g7 == fault addr tsb_miss_lookup_0: ldda [%g2 + %g0]ASI_LDTD_N, %g4 cmp %g4, %g0 ! entry tag == 0 ? @@ -1275,16 +1279,22 @@ 4: ! not found ! we need to jump to tl0_trap to drop us back down to tl0 ! and take us to trap(...) to service the fault - mov T_DATA_MISS, %g1 - sethi %hi(trap), %g2 + + srlx %g6, TTARGET_CTX_SHIFT, %g4 ! recover context + or %g4, %g7, %g6 + mov T_DATA_MISS, %g1 + sethi %hi(trap), %g2 ba %xcc, tl0_trap - or %g2, %lo(trap), %g2 + or %g2, %lo(trap), %g2 tsb_miss_found: 5: !found ! %g1 == abs index %g2 == THE pointer %g3 == flags ! %g4 == tag %g5 == data %g7 == PAGE_MASK ! %g3 <- TSB RA %g6 <- TSB size, TTE RA + + sethi %hi(PAGE_SIZE), %g7 srlx %g6, TTARGET_CTX_SHIFT, %g6 + sub %g7, 1, %g7 ! %g7==PAGE_MASK andcc %g5, %g3, %g0 ! already set bnz,pt %xcc, 7f @@ -1302,7 +1312,7 @@ be,pn %xcc, 8f nop GET_TSB_SCRATCH_USER(%g3) ! %g3 == TSB (RA) - ba,a,pt %xcc, 9f + ba,pt %xcc, 9f and %g3, %g7, %g6 ! size of TSB in pages 8: GET_TSB_SCRATCH_KERNEL(%g3) ! %g3 == TSB (RA) @@ -1320,12 +1330,13 @@ cmp %g3, %g5 bne,pt %xcc, 10f nop - illtrap ! die if all we're doing + MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT ! die if all we're doing ! is storing same data 10: #endif stxa %g4, [%g6]ASI_REAL ! store tag stxa %g5, [%g6 + %g7]ASI_REAL ! store data + MAGIC_TRAP_OFF ! XXX the following intstruction should be replaced with a ! retry on HVs that do auto-demap @@ -1335,7 +1346,7 @@ mov MMFSA_D_CTX, %g2 retry demap_begin: - GET_MMFSA_SCRATCH(%g1) + GET_MMFSA_SCRATCH(%g1) ! XXX this isn't re-entrant mov MMFSA_D_ADDR, %g3 mov %o0, %g5 mov %o1, %g6 @@ -1349,7 +1360,6 @@ mov %g5, %o0 mov %g6, %o1 mov %g7, %o2 - MAGIC_TRAP_OFF retry END(tsb_miss_handler) @@ -1358,7 +1368,7 @@ * Write to read-only page */ ENTRY(prot_fault_trap) - illtrap + MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT END(prot_fault_trap) @@ -1404,7 +1414,7 @@ ENTRY(tl1_trap) - illtrap + MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT END(tl1_trap) /* * Initiate return to usermode. From owner-p4-projects@FreeBSD.ORG Sat Mar 11 01:15:57 2006 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 B848E16A42D; Sat, 11 Mar 2006 01:15: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 CE69916A423 for ; Sat, 11 Mar 2006 01:15:52 +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 B00944531B for ; Fri, 10 Mar 2006 14:07:49 +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 k2AE7ioD002719 for ; Fri, 10 Mar 2006 14:07:44 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2AE7d87002700 for perforce@freebsd.org; Fri, 10 Mar 2006 14:07:39 GMT (envelope-from jhb@freebsd.org) Date: Fri, 10 Mar 2006 14:07:39 GMT Message-Id: <200603101407.k2AE7d87002700@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 93109 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: Sat, 11 Mar 2006 01:15:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=93109 Change 93109 by jhb@jhb_slimer on 2006/03/10 14:06:37 Do the kdb check earlier in mi_switch() to avoid doublecounting rux_runtime. Affected files ... .. //depot/projects/smpng/sys/kern/kern_synch.c#99 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_synch.c#99 (text+ko) ==== @@ -355,6 +355,16 @@ ("mi_switch: switch must be voluntary or involuntary")); KASSERT(newtd != curthread, ("mi_switch: preempting back to ourself")); + /* + * Don't perform context switches from the debugger. + */ + if (kdb_active) { + mtx_unlock_spin(&sched_lock); + kdb_backtrace(); + kdb_reenter(); + panic("%s: did not reenter debugger", __func__); + } + if (flags & SW_VOL) p->p_stats->p_ru.ru_nvcsw++; else @@ -376,16 +386,6 @@ td->td_generation++; /* bump preempt-detect counter */ /* - * Don't perform context switches from the debugger. - */ - if (kdb_active) { - mtx_unlock_spin(&sched_lock); - kdb_backtrace(); - kdb_reenter(); - panic("%s: did not reenter debugger", __func__); - } - - /* * Check if the process exceeds its cpu resource allocation. If * it reaches the max, arrange to kill the process in ast(). */ From owner-p4-projects@FreeBSD.ORG Sat Mar 11 01:59:33 2006 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 79AE216A71E; Sat, 11 Mar 2006 01:59:04 +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 0710016A624 for ; Sat, 11 Mar 2006 01:58:49 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 52A274A60B for ; Fri, 10 Mar 2006 21:19:21 +0000 (GMT) (envelope-from imp@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 k2ALJBiO033941 for ; Fri, 10 Mar 2006 21:19:11 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2ALJBvX033938 for perforce@freebsd.org; Fri, 10 Mar 2006 21:19:11 GMT (envelope-from imp@freebsd.org) Date: Fri, 10 Mar 2006 21:19:11 GMT Message-Id: <200603102119.k2ALJBvX033938@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 93121 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: Sat, 11 Mar 2006 01:59:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=93121 Change 93121 by imp@imp_Speedy on 2006/03/10 21:18:11 A little less debug in the mornin' Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#40 edit .. //depot/projects/arm/src/sys/arm/at91/if_atereg.h#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#40 (text+ko) ==== @@ -586,7 +586,7 @@ status = RD4(sc, ETH_ISR); if (status == 0) return; - printf("status is %x IT IS %x %x\n", status, RD4(sc, ETH_RSR), RD4(sc, ETH_CTL)); +// printf("status is %x IT IS %x %x\n", status, RD4(sc, ETH_RSR), RD4(sc, ETH_CTL)); if (status & ETH_ISR_RCOM) { bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, ==== //depot/projects/arm/src/sys/arm/at91/if_atereg.h#8 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Mar 11 02:03:37 2006 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 593CF16A9B4; Sat, 11 Mar 2006 02:03:22 +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 7980716A9FE; Sat, 11 Mar 2006 02:03:08 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id C906E4433D; Fri, 10 Mar 2006 12:57:50 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from zion.baldwin.cx (zion.baldwin.cx [192.168.0.7]) (authenticated bits=0) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k2ACvghT053506; Fri, 10 Mar 2006 07:57:48 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Warner Losh Date: Fri, 10 Mar 2006 07:57:39 -0500 User-Agent: KMail/1.8.3 References: <200603100640.k2A6e2fM072334@repoman.freebsd.org> In-Reply-To: <200603100640.k2A6e2fM072334@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Message-Id: <200603100757.40459.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1321/Thu Mar 9 23:54:15 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-3.1 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93095 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: Sat, 11 Mar 2006 02:03:37 -0000 On Friday 10 March 2006 01:40 am, Warner Losh wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D93095 > > Change 93095 by imp@imp_hammer on 2006/03/10 06:39:29 > > Try to use m_devget() as suggested by jhb and done in the de > driver. > > Affected files ... > > .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#38 edit > > Differences ... > > =3D=3D=3D=3D //depot/projects/arm/src/sys/arm/at91/if_ate.c#38 (text+ko) = =3D=3D=3D=3D > > @@ -24,10 +24,8 @@ > > /* TODO: (in no order) > * > - * 5) Setup RX buffers in ateinit_locked > * 8) Need to sync busdma goo in atestop > * 9) atestop should maybe free the mbufs? > - * 10) On Rx, how do we get a new mbuf? > * > * 1) detach > * 2) Free dma setup > @@ -657,7 +655,8 @@ > mb->m_len =3D rx_stat & ETH_LEN_MASK; > mb->m_pkthdr.len =3D mb->m_len; > mb->m_pkthdr.rcvif =3D sc->ifp; > - tmp_mbuf =3D m_copyup(mb, ETHER_HDR_LEN, 2); > + tmp_mbuf =3D m_devget(mtod(md, caddr_t), mb->m_len, > + ETHER_ALIGN, sc->ifp, NULL); > /* > * For the last buffer, set the wrap bit so > * the controller restarts from the first Note that you can drop all the mb-> lines above, just pass in rx_stat &=20 ETH_LEN_MASK to m_devget() where you pass mb->m_len. It will setup the pkthdr on the new mbuf. You probably want to bump your iferrors count if m_devget fails too. > @@ -671,7 +670,8 @@ > BUS_DMASYNC_PREREAD); > bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, > BUS_DMASYNC_PREWRITE); > - (*sc->ifp->if_input)(sc->ifp, tmp_mbuf); > + if (tmp_mbuf !=3D NULL) > + (*sc->ifp->if_input)(sc->ifp, tmp_mbuf); > } Not sure if you have locking for this driver yet, but if you do, don't forget to drop your driver lock around the call to if_input. =2D-=20 John Baldwin =A0<>< =A0http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" =A0=3D =A0http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Sat Mar 11 02:10:28 2006 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 D62FB16AADC; Sat, 11 Mar 2006 02:10: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 57A9216AB2B for ; Sat, 11 Mar 2006 02:10:25 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 09B2247E25 for ; Fri, 10 Mar 2006 17:44:06 +0000 (GMT) (envelope-from imp@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 k2AHhoTJ017860 for ; Fri, 10 Mar 2006 17:43:55 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2AHhe3E017857 for perforce@freebsd.org; Fri, 10 Mar 2006 17:43:40 GMT (envelope-from imp@freebsd.org) Date: Fri, 10 Mar 2006 17:43:40 GMT Message-Id: <200603101743.k2AHhe3E017857@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 93112 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: Sat, 11 Mar 2006 02:10:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=93112 Change 93112 by imp@imp_Speedy on 2006/03/10 17:43:02 Subtract out the CRC length from the lenght we report, as the EMAC device includes this lenght, but ifnet drivers do not want it. Free the mb that we just copied. This likely means that we can go with a much simpler 'pool' of memory for this device and not mess with the load/unload of each segment as a mbuf as we get packets. Minor compile nit. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#39 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#39 (text+ko) ==== @@ -652,11 +652,17 @@ BUS_DMASYNC_PREWRITE); continue; } - mb->m_len = rx_stat & ETH_LEN_MASK; + /* + * The length returned by the device includes the + * ethernet CRC calculation for the packet, but + * ifnet drivers are supposed to discard it. + */ + mb->m_len = (rx_stat & ETH_LEN_MASK) - ETHER_CRC_LEN; mb->m_pkthdr.len = mb->m_len; mb->m_pkthdr.rcvif = sc->ifp; - tmp_mbuf = m_devget(mtod(md, caddr_t), mb->m_len, + tmp_mbuf = m_devget(mtod(mb, caddr_t), mb->m_len, ETHER_ALIGN, sc->ifp, NULL); + m_free(mb); /* * For the last buffer, set the wrap bit so * the controller restarts from the first From owner-p4-projects@FreeBSD.ORG Sat Mar 11 02:12:11 2006 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 6B20F16B0BF; Sat, 11 Mar 2006 02:12:01 +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 08E4A16B0D4 for ; Sat, 11 Mar 2006 02:11:53 +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 691E545277 for ; Fri, 10 Mar 2006 14:05: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 k2AE5VQF002625 for ; Fri, 10 Mar 2006 14:05:31 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2AE5PiQ002618 for perforce@freebsd.org; Fri, 10 Mar 2006 14:05:25 GMT (envelope-from soc-bushman@freebsd.org) Date: Fri, 10 Mar 2006 14:05:25 GMT Message-Id: <200603101405.k2AE5PiQ002618@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 93108 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: Sat, 11 Mar 2006 02:12:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=93108 Change 93108 by soc-bushman@soc-bushman_stinger on 2006/03/10 14:04:21 a bug in the addrinfo_marshal function, that caused crashes when compiled with INET6 defined Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getaddrinfo.c#9 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getaddrinfo.c#9 (text+ko) ==== @@ -1645,7 +1645,7 @@ for (cai = ai; cai != NULL; cai = cai->ai_next) { desired_size += sizeof(struct addrinfo) + cai->ai_addrlen; if (cai->ai_canonname != NULL) - desired_size += strlen(cai->ai_canonname); + desired_size += sizeof(size_t) + strlen(cai->ai_canonname); ++ai_size; } @@ -1674,7 +1674,7 @@ p += sizeof(size_t); memcpy(p, cai->ai_canonname, size); - p += size + 1; + p += size; } } From owner-p4-projects@FreeBSD.ORG Sat Mar 11 03:41:51 2006 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 4326916A420; Sat, 11 Mar 2006 03: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 D1EC916A41F for ; Sat, 11 Mar 2006 03:41:48 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD7EA43D6D for ; Sat, 11 Mar 2006 03:41:47 +0000 (GMT) (envelope-from kmacy@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 k2B3flF9055914 for ; Sat, 11 Mar 2006 03:41:47 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2B3flrM055911 for perforce@freebsd.org; Sat, 11 Mar 2006 03:41:47 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 11 Mar 2006 03:41:47 GMT Message-Id: <200603110341.k2B3flrM055911@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93129 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: Sat, 11 Mar 2006 03:41:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=93129 Change 93129 by kmacy@kmacy_storage:sun4v_work on 2006/03/11 03:41:12 set tf pointer before calling ast raise tl before setting context correctly copy secondary context to primary context Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#24 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#24 (text+ko) ==== @@ -501,6 +501,8 @@ .macro tl1_align MAGIC_TRAP_ON + MAGIC_TRAP_ON + MAGIC_EXIT .align 32 .endm @@ -910,6 +912,7 @@ mov %l7, %o0 ENTRY(user_rtt) + add %sp, CCFSZ + SPOFF, %l7 ! pil handling needs to be re-visited wrpr %g0, PIL_TICK, %pil ldx [PCPU(CURTHREAD)], %l0 @@ -950,9 +953,11 @@ wrpr %g0, 0, %pil ! drop pil to 0 + wrpr %g0, 1, %tl ! raise tl -> 1 before setting pcontext + mov MMU_CID_S, %g1 GET_MMU_CONTEXT(%g1, %g2) - mov MMU_CID_S, %g1 + mov MMU_CID_P, %g1 sethi %hi(FLUSH_ADDR), %g3 SET_MMU_CONTEXT(%g1, %g2) flush %g3 ! flush required by immu From owner-p4-projects@FreeBSD.ORG Sat Mar 11 07:54:28 2006 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 A345916A422; Sat, 11 Mar 2006 07:54:28 +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 40D2F16A41F for ; Sat, 11 Mar 2006 07:54:28 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7D3843D46 for ; Sat, 11 Mar 2006 07:54:27 +0000 (GMT) (envelope-from kmacy@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 k2B7sRiD074088 for ; Sat, 11 Mar 2006 07:54:27 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2B7sRBc074085 for perforce@freebsd.org; Sat, 11 Mar 2006 07:54:27 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 11 Mar 2006 07:54:27 GMT Message-Id: <200603110754.k2B7sRBc074085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93133 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: Sat, 11 Mar 2006 07:54:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=93133 Change 93133 by kmacy@kmacy_storage:sun4v_work on 2006/03/11 07:53:27 revise register usage for consistency and integration with utrap Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#25 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#25 (text+ko) ==== @@ -198,7 +198,6 @@ .endm .macro tl0_split - GET_PCB(PCB_REG); /* load PCPU and PCB pointers */ .endm .macro tl0_setup type @@ -517,10 +516,11 @@ END(tl0_sfsr_trap) .macro tl0_pil_entry level, mask - tl0_split - set \mask, %g2 + set \mask, %g1 + clr %g2 + clr %g3 ba %xcc, tl0_intr - mov \level, %g1 + mov \level, %g4 .align 32 .endm @@ -968,7 +968,7 @@ ldx [%l7 + TF_TPC], %g1 ldx [%l7 + TF_TNPC], %g2 ldx [%l7 + TF_TSTATE], %l0 - andn %l0, TSTATE_CWP_MASK, %g4 + andn %l0, TSTATE_CWP_MASK, %g7 wrpr %g1, %tpc wrpr %g2, %tnpc @@ -987,14 +987,14 @@ rdpr %canrestore, %g1 brnz %g1, 3f - nop ! no trap, use restore directly + nop ! no trap, use restore directly rdpr %cwp, %g1 wrpr %g1, %g7, %tstate ! needed by wbuf recovery code ! hand craft the restore to avoid getting to TL > 2 rdpr %wstate, %g1 btst 1, %g1 beq 4f - nop + nop .global rtt_fill_start rtt_fill_start: #if 0 @@ -1027,22 +1027,26 @@ SAVE_OUTS(%l7) ! for the call bug workaround wrpr %g0, PSTATE_KERNEL, %pstate ! enable ints ! MAGIC_TRAP_OFF - #if 0 + + brnz %o1, common_ktrap + nop call critical_enter nop - #endif - stx %l4, [%l7 + TF_TYPE] ! save trap type - stx %l5, [%l7 + TF_TAR] ! save mem info jmpl %l3, %o7 ! call trap handler mov %l7, %o0 - #if 0 call critical_exit nop - #endif + b common_rtt +common_ktrap: + nop + stx %o1, [%l7 + TF_TYPE] ! save trap type + stx %o2, [%l7 + TF_TAR] ! save mem info + jmpl %l3, %o7 ! call trap handler + mov %l7, %o0 + ! MAGIC_TRAP_ON ENTRY(krtt) MAGIC_TRAP_ON - GET_PCPU_SCRATCH common_rtt: ! ! restore globals and outs @@ -1072,14 +1076,14 @@ ldx [%l7 + TF_TPC], %g1 ldx [%l7 + TF_TNPC], %g2 ldx [%l7 + TF_TSTATE], %l0 - andn %l0, TSTATE_CWP_MASK, %g4 + andn %l0, TSTATE_CWP_MASK, %g7 wrpr %g1, %tpc wrpr %g2, %tnpc rdpr %canrestore, %g1 brnz %g1, 3f nop ! can use restore directly rdpr %cwp, %g1 - wrpr %g1, %g4, %tstate ! needed by wbuf recovery code + wrpr %g1, %g7, %tstate ! needed by wbuf recovery code ! avoid going above TL2 fill_64bit_rtt(ASI_N) @@ -1090,7 +1094,7 @@ ! set %tstate to the correct %cwp ! rdpr %cwp, %g1 - wrpr %g1, %g4, %tstate + wrpr %g1, %g7, %tstate MAGIC_TRAP_OFF retry END(krtt) @@ -1100,13 +1104,14 @@ ! ! ENTRY(tl0_ktrap) - set ktl0, %g4 + GET_PCPU_SCRATCH + set ktl0, %g6 save %sp, -(CCFSZ + TF_SIZEOF), %sp - mov %g2, %l3 ! set trap/interrupt for tl0 - or %g1, T_KERNEL, %l4 ! pil/trap type - mov %g6, %l5 ! fault info if set + mov %g1, %l3 ! set trap/interrupt for tl0 + or %g2, T_KERNEL, %o1 ! trap type + mov %g3, %o2 ! fault info if set ! if the kwbuf is full we need to save to the stack now ld [PCPU_REG + PC_KWBUF_FULL], %o0 @@ -1122,29 +1127,35 @@ ! register convention: - ! %g1=level %g2=mask + ! %g2=level %g1=mask ENTRY(tl0_intr) - wrpr %g1, 0, %pil - wr %g2, 0, %clear_softint - SET(intr_handlers, %g5, %g4) - sllx %g1, IH_SHIFT, %g5 - ldx [%g4 + %g5], %g2 ! pointer to interrupt handler - + wrpr %g4, 0, %pil + wr %g1, 0, %clear_softint + SET(intr_handlers, %g7, %g6) + sllx %g4, IH_SHIFT, %g7 + ldx [%g6 + %g7], %g1 ! pointer to interrupt handler - ! assumes %g3 - %g5 are free - ! %g1 == pil that we came in on - ! %g2 == interrupt handler - ! %g7 == PCPU - ! %g3-%g5 temporaries + ! %g1 pc of trap handler + ! %g2, %g3 args of trap handler + ! %g4 desired pil + ! %g5, %g6 temps + ! %g7 saved + + ! %l0, %l1 temps + ! %l3 saved %g1 + ! %l4 flags + ! %l5 memory fault info + ! %l6 %pil for priv traps + ! %l7 trapframe + ENTRY(tl0_trap) - GET_PCPU_SCRATCH - rdpr %tstate, %g3 - btst TSTATE_PRIV, %g3 - and %g3, TSTATE_CWP_MASK, %g4 + rdpr %tstate, %g5 + btst TSTATE_PRIV, %g5 + and %g5, TSTATE_CWP_MASK, %g6 bnz,pn %xcc, tl0_ktrap - wrpr %g0, %g4, %cwp + wrpr %g0, %g6, %cwp ENTRY(tl0_utrap) MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT @@ -1162,11 +1173,22 @@ ! ! setup pil ! - brlz,pt %g1, 1f + brlz,pt %g4, 1f + nop +#ifdef PMAP_DEBUG + rdpr %pil, %l0 + cmp %g4, %l0 + bge,pt %xcc, 0f nop - wrpr %g0, %g1, %pil + MAGIC_TRAP_ON + MAGIC_TRAP_ON + MAGIC_EXIT +0: +#endif + + wrpr %g0, %g4, %pil 1: - wrpr %g0, %g4, %tnpc + wrpr %g0, %g6, %tnpc rdpr %cwp, %l0 set TSTATE_KERNEL, %l1 wrpr %l1, %l0, %tstate @@ -1219,7 +1241,8 @@ tsb_miss_null_deref: MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT ! give up 3: -#endif +#endif +tsb_miss_compute_hash_addr: sethi %hi(PAGE_SIZE), %g7 sub %g7, 1, %g7 ! %g7==PAGE_MASK @@ -1284,63 +1307,82 @@ 4: ! not found ! we need to jump to tl0_trap to drop us back down to tl0 ! and take us to trap(...) to service the fault - +#ifdef PMAP_DEBUG + rdpr %tl, %g4 + cmp %g4, 1 + be,pt %xcc, 15f + nop + MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT +15: +#if 0 + srlx %g6, TTARGET_CTX_SHIFT, %g4 ! recover context + brnz %g4, 16f + nop + MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT +#endif +16: +#endif srlx %g6, TTARGET_CTX_SHIFT, %g4 ! recover context - or %g4, %g7, %g6 - mov T_DATA_MISS, %g1 - sethi %hi(trap), %g2 + sethi %hi(trap), %g1 + mov T_DATA_MISS, %g2 + or %g4, %g7, %g3 + mov -1, %g4 ba %xcc, tl0_trap - or %g2, %lo(trap), %g2 + or %g1, %lo(trap), %g1 + tsb_miss_found: 5: !found ! %g1 == abs index %g2 == THE pointer %g3 == flags ! %g4 == tag %g5 == data %g7 == PAGE_MASK ! %g3 <- TSB RA %g6 <- TSB size, TTE RA + srlx %g6, TTARGET_CTX_SHIFT, %g6 + or %g7, %g6, %g6 ! save context and fault addr + ! will break when ctxbits > 13 + sethi %hi(PAGE_SIZE), %g7 + sub %g7, 1, %g7 ! %g7==PAGE_MASK - sethi %hi(PAGE_SIZE), %g7 - srlx %g6, TTARGET_CTX_SHIFT, %g6 - sub %g7, 1, %g7 ! %g7==PAGE_MASK - - andcc %g5, %g3, %g0 ! already set - bnz,pt %xcc, 7f + andcc %g5, %g3, %g0 ! already set + bnz,pt %xcc, 7f nop - andcc %g3, VTD_REF, %g0 ! TSB miss - bnz,pt %xcc, 6f + andcc %g3, VTD_REF, %g0 ! TSB miss + bnz,pt %xcc, 6f or %g5, %g3, %g5 ! add ref/mod bit unconditionally - andcc %g5, VTD_SW_W, %g0 ! write enabled? - bz,pn %xcc, prot_fault_trap ! write to read only page + andcc %g5, VTD_SW_W, %g0 ! write enabled? + bz,pn %xcc, prot_fault_trap ! write to read only page or %g5, %g3, %g5 ! add ref/mod bit unconditionally 6: - stx %g5, [%g2 + 8] ! set ref/mod bit + stx %g5, [%g2 + 8] ! set ref/mod bit 7: - cmp %g6, %g0 ! kernel context? - be,pn %xcc, 8f + andcc %g6, %g7, %g0 ! kernel context? + bz,pn %xcc, 8f nop GET_TSB_SCRATCH_USER(%g3) ! %g3 == TSB (RA) ba,pt %xcc, 9f - and %g3, %g7, %g6 ! size of TSB in pages + and %g3, %g7, %g2 ! size of TSB in pages 8: GET_TSB_SCRATCH_KERNEL(%g3) ! %g3 == TSB (RA) - and %g3, %g7, %g6 ! size of TSB in pages + and %g3, %g7, %g2 ! size of TSB in pages 9: - andn %g3, %g7, %g3 ! TSB real address - sllx %g6, (PAGE_SHIFT - TTE_SHIFT), %g6 ! nttes - subx %g6, 1, %g6 ! TSB_MASK - and %g6, %g1, %g6 ! masked index - sllx %g6, TTE_SHIFT, %g6 ! masked byte offset - add %g6, %g3, %g6 ! TTE RA - mov 8, %g7 + andn %g3, %g7, %g3 ! TSB real address + sllx %g2, (PAGE_SHIFT - TTE_SHIFT), %g2 ! nttes + subx %g2, 1, %g2 ! TSB_MASK + and %g2, %g1, %g2 ! masked index + sllx %g2, TTE_SHIFT, %g2 ! masked byte offset + add %g2, %g3, %g2 ! TTE RA + mov 8, %g7 #ifdef PMAP_DEBUG - ldda [%g6]ASI_LDTD_REAL, %g2 - cmp %g3, %g5 - bne,pt %xcc, 10f + mov %g2, %g1 + ldda [%g2]ASI_LDTD_REAL, %g2 + cmp %g3, %g5 + bne,pt %xcc, 10f nop - MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT ! die if all we're doing + MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT ! die if all we're doing ! is storing same data -10: +10: + mov %g1, %g2 #endif - stxa %g4, [%g6]ASI_REAL ! store tag - stxa %g5, [%g6 + %g7]ASI_REAL ! store data + stxa %g4, [%g2]ASI_REAL ! store tag + stxa %g5, [%g2 + %g7]ASI_REAL ! store data MAGIC_TRAP_OFF ! XXX the following intstruction should be replaced with a @@ -1348,15 +1390,15 @@ ontario_demap_errata_patch: andcc %g5, VTD_W, %g0 bnz,pn %xcc, demap_begin - mov MMFSA_D_CTX, %g2 + nop retry -demap_begin: - GET_MMFSA_SCRATCH(%g1) ! XXX this isn't re-entrant - mov MMFSA_D_ADDR, %g3 +demap_begin: + sethi %hi(PAGE_MASK), %g1 + sub %g1, 1, %g1 + and %g6, %g1, %g2 + andn %g6, %g1, %g3 mov %o0, %g5 mov %o1, %g6 - ldxa [%g1 + %g2]ASI_REAL, %g2 !%g2 == context - ldxa [%g1 + %g3]ASI_REAL, %g3 !%g3 == fault addr mov %o2, %g7 mov MAP_DTLB, %o2 mov %g3, %o0 From owner-p4-projects@FreeBSD.ORG Sat Mar 11 10:10:16 2006 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 8CC1616A422; Sat, 11 Mar 2006 10:10: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 08B5D16A420 for ; Sat, 11 Mar 2006 10:10:16 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A7FEB43D53 for ; Sat, 11 Mar 2006 10:10:15 +0000 (GMT) (envelope-from kmacy@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 k2BAAFtL086725 for ; Sat, 11 Mar 2006 10:10:15 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2BAAEpU086722 for perforce@freebsd.org; Sat, 11 Mar 2006 10:10:14 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 11 Mar 2006 10:10:14 GMT Message-Id: <200603111010.k2BAAEpU086722@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93141 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: Sat, 11 Mar 2006 10:10:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=93141 Change 93141 by kmacy@kmacy_storage:sun4v_work on 2006/03/11 10:09:12 implement user trap handling Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#26 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#26 (text+ko) ==== @@ -905,13 +905,29 @@ ENTRY(utl0) + GET_PCPU_SCRATCH SAVE_GLOBALS(%l7) SAVE_OUTS(%l7) wrpr %g0, PSTATE_KERNEL, %pstate ! enable ints + + brnz %o1, common_utrap + nop + call critical_enter + nop jmpl %l3, %o7 ! call trap handler mov %l7, %o0 + call critical_exit + nop + b user_rtt + nop +common_utrap: + stx %o1, [%l7 + TF_TYPE] ! save trap type + stx %o2, [%l7 + TF_TAR] ! save mem info + jmpl %l3, %o7 ! call trap handler + mov %l7, %o0 ENTRY(user_rtt) + GET_PCB(%g6) add %sp, CCFSZ + SPOFF, %l7 ! pil handling needs to be re-visited wrpr %g0, PIL_TICK, %pil @@ -972,18 +988,51 @@ wrpr %g1, %tpc wrpr %g2, %tnpc -#if 0 ! ! switch "other" windows back to "normal" windows and ! restore to window we originally trapped in ! rdpr %otherwin, %g1 wrpr %g0, 0, %otherwin - wrpr %g0, %g1, %canrestore -#endif add %l3, WSTATE_CLEAN_OFFSET, %l3 ! convert to "clean" wstate wrpr %g0, %l3, %wstate + wrpr %g0, %g1, %canrestore +#ifdef notyet + ! + ! First attempt to restore from the watchpoint saved register window + tst %g1 + bne,a 1f + clrn [%g6 + STACK_BIAS + MPCB_RSP0] + tst %fp + be,a 1f + clrn [%g6 + STACK_BIAS + MPCB_RSP0] + ! test for user return window in pcb + ldn [%g6 + STACK_BIAS + MPCB_RSP0], %g1 + cmp %fp, %g1 + bne 1f + clrn [%g6 + STACK_BIAS + MPCB_RSP0] + restored + restore + ! restore from user return window + RESTORE_V9WINDOW(%g6 + STACK_BIAS + MPCB_RWIN0) + ! + ! Attempt to restore from the scond watchpoint saved register window + tst %fp + be,a 2f + clrn [%g6 + STACK_BIAS + MPCB_RSP1] + ldn [%g6 + STACK_BIAS + MPCB_RSP1], %g1 + cmp %fp, %g1 + bne 2f + clrn [%g6 + STACK_BIAS + MPCB_RSP1] + restored + restore + RESTORE_V9WINDOW(%g6 + STACK_BIAS + MPCB_RWIN1) + save + b,a 2f +1: + +#endif rdpr %canrestore, %g1 brnz %g1, 3f @@ -1037,8 +1086,8 @@ call critical_exit nop b common_rtt + nop common_ktrap: - nop stx %o1, [%l7 + TF_TYPE] ! save trap type stx %o2, [%l7 + TF_TAR] ! save mem info jmpl %l3, %o7 ! call trap handler @@ -1108,10 +1157,7 @@ set ktl0, %g6 save %sp, -(CCFSZ + TF_SIZEOF), %sp - - mov %g1, %l3 ! set trap/interrupt for tl0 - or %g2, T_KERNEL, %o1 ! trap type - mov %g3, %o2 ! fault info if set + or %g2, T_KERNEL, %g2 ! if the kwbuf is full we need to save to the stack now ld [PCPU_REG + PC_KWBUF_FULL], %o0 @@ -1157,11 +1203,42 @@ bnz,pn %xcc, tl0_ktrap wrpr %g0, %g6, %cwp ENTRY(tl0_utrap) - MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT +#ifdef notyet + /* we need to determine from the hardware the number of register windows */ + sethi %hi(nwin_minus_one), %g5 + ld [%g5 + %lo(nwin_minus_one)], %g5 +#else + mov nwin_minus_one, %g5 +#endif + MAGIC_TRAP_ON + GET_PCB(%g6) + wrpr %g0, %g5, %cleanwin + sub %g6, SPOFF + CCFSZ + TF_SIZEOF, %g6 + save %g6, 0, %sp + rdpr %canrestore, %l0 + rdpr %wstate, %l1 + wrpr %g0, 0, %canrestore + sllx %l1, WSTATE_SHIFT, %l1 + wrpr %l1, WSTATE_K64, %wstate + wrpr %g0, %l0, %otherwin + ! + ! set pcontext to run kernel + ! + mov KCONTEXT, %l0 + mov MMU_CID_P, %l1 + sethi %hi(FLUSH_ADDR), %l2 + SET_MMU_CONTEXT(%l1, %l0) + flush %l2 ! flush / membar required by immu for + ! consistency guarantee + set utl0, %g6 win_saved: + mov %g1, %l3 ! set trap/interrupt for tl0 + mov %g2, %o1 ! trap type + mov %g3, %o2 ! fault info if set + mov %g5, %l6 ! %pil if priv trap ! - ! save trap state on stack + ! save state in trapframe ! add %sp, REGOFF + SPOFF, %l7 rdpr %tpc, %l0 @@ -1266,7 +1343,7 @@ ! %g4 <- tag %g5 <- data ! %g6 == search tag %g7 == fault addr tsb_miss_lookup_0: - ldda [%g2 + %g0]ASI_LDTD_N, %g4 + ldda [%g2]ASI_LDTD_N, %g4 cmp %g4, %g0 ! entry tag == 0 ? be,pn %xcc, 4f nop From owner-p4-projects@FreeBSD.ORG Sat Mar 11 10:36:24 2006 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 3AFB216A422; Sat, 11 Mar 2006 10:36: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 146DA16A41F for ; Sat, 11 Mar 2006 10:36:24 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C55D43D4C for ; Sat, 11 Mar 2006 10:36:22 +0000 (GMT) (envelope-from kmacy@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 k2BAaLnW087642 for ; Sat, 11 Mar 2006 10:36:22 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2BAaJDQ087637 for perforce@freebsd.org; Sat, 11 Mar 2006 10:36:19 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 11 Mar 2006 10:36:19 GMT Message-Id: <200603111036.k2BAaJDQ087637@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93144 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: Sat, 11 Mar 2006 10:36:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=93144 Change 93144 by kmacy@kmacy_storage:sun4v_work on 2006/03/11 10:35:19 make sure user wstate gets set correctly Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/vm_machdep.c#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/vm_machdep.c#5 (text+ko) ==== @@ -85,6 +85,7 @@ #include #include #include +#include #ifndef NSFBUFS #define NSFBUFS (512 + maxusers * 16) @@ -283,7 +284,9 @@ tf->tf_out[1] = 0; tf->tf_tstate &= ~TSTATE_XCC_C; /* success */ tf->tf_fprs = 0; + tf->tf_wstate = WSTATE_U64; + td2->td_frame = tf; fp = (struct frame *)tf - 1; fp->fr_local[0] = (u_long)fork_return; @@ -293,7 +296,6 @@ fp->fr_pc = fp->fr_fp = 0; pcb2->pcb_sp = (u_long)fp - SPOFF; pcb2->pcb_pc = (u_long)fork_trampoline - 8; - /* Setup to release sched_lock in fork_exit(). */ td2->td_md.md_spinlock_count = 1; td2->td_md.md_saved_pil = 0; From owner-p4-projects@FreeBSD.ORG Sat Mar 11 21:30:54 2006 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 981D716A43A; Sat, 11 Mar 2006 21:30:54 +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 C93D516A420 for ; Sat, 11 Mar 2006 21:30:53 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7669443D4C for ; Sat, 11 Mar 2006 21:30:53 +0000 (GMT) (envelope-from kmacy@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 k2BLUriY039593 for ; Sat, 11 Mar 2006 21:30:53 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2BLUrHR039590 for perforce@freebsd.org; Sat, 11 Mar 2006 21:30:53 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 11 Mar 2006 21:30:53 GMT Message-Id: <200603112130.k2BLUrHR039590@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93168 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: Sat, 11 Mar 2006 21:30:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=93168 Change 93168 by kmacy@kmacy_storage:sun4v_work on 2006/03/11 21:30:20 pass explicit trap type to tsb miss handler Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#27 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#27 (text+ko) ==== @@ -276,7 +276,7 @@ ldxa [%g1 + %g2]ASI_REAL, %g4 ldxa [%g1 + %g3]ASI_REAL, %g5 ba,pt %xcc, tsb_miss_handler - mov VTD_REF, %g3 + mov T_INSTRUCTION_MISS, %g3 .align 32 .endm @@ -294,7 +294,7 @@ ldxa [%g1 + %g2]ASI_REAL, %g4 ldxa [%g1 + %g3]ASI_REAL, %g5 ba,pt %xcc, tsb_miss_handler - mov VTD_REF, %g3 + mov T_DATA_MISS, %g3 .align 32 .endm @@ -304,7 +304,7 @@ mov MMFSA_D_CTX, %g7 ldxa [%g1 + %g3]ASI_REAL, %g5 ba,pt %xcc, tsb_miss_handler - mov VTD_W, %g3 + mov T_DATA_PROTECTION, %g3 .align 32 .endm @@ -1399,9 +1399,9 @@ #endif 16: #endif + mov %g3, %g2 ! save fault type srlx %g6, TTARGET_CTX_SHIFT, %g4 ! recover context sethi %hi(trap), %g1 - mov T_DATA_MISS, %g2 or %g4, %g7, %g3 mov -1, %g4 ba %xcc, tl0_trap @@ -1418,18 +1418,22 @@ sethi %hi(PAGE_SIZE), %g7 sub %g7, 1, %g7 ! %g7==PAGE_MASK - andcc %g5, %g3, %g0 ! already set - bnz,pt %xcc, 7f + cmp %g3, T_DATA_MISS ! TSB data miss + be,pt %xcc, 6f + or %g5, VTD_REF, %g5 ! set referenced unconditionally + cmp %g3, T_INSTRUCTION_MISS ! TSB instruction miss + be,pt %xcc, 6f + nop + cmp %g3, T_DATA_PROTECTION ! protection fault + bne,pn %xcc, unsupported_fault_trap ! we don't handle any other fault types currently nop - andcc %g3, VTD_REF, %g0 ! TSB miss - bnz,pt %xcc, 6f - or %g5, %g3, %g5 ! add ref/mod bit unconditionally andcc %g5, VTD_SW_W, %g0 ! write enabled? bz,pn %xcc, prot_fault_trap ! write to read only page - or %g5, %g3, %g5 ! add ref/mod bit unconditionally + nop + or %g5, VTD_W, %g5 ! add modifed bit 6: - stx %g5, [%g2 + 8] ! set ref/mod bit -7: + stx %g5, [%g2 + 8] ! update TTE + andcc %g6, %g7, %g0 ! kernel context? bz,pn %xcc, 8f nop @@ -1465,7 +1469,7 @@ ! XXX the following intstruction should be replaced with a ! retry on HVs that do auto-demap ontario_demap_errata_patch: - andcc %g5, VTD_W, %g0 + andcc %g5, VTD_W, %g0 ! if write-enabled we know it was a prot fault bnz,pn %xcc, demap_begin nop retry @@ -1494,6 +1498,12 @@ ENTRY(prot_fault_trap) MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT END(prot_fault_trap) +/* + * Programming error + */ +ENTRY(unsupported_fault_trap) + MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT +END(unsupported_fault_trap) /*