From owner-p4-projects@FreeBSD.ORG Mon Nov 7 15:25:23 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B0AF16A421; Mon, 7 Nov 2005 15:25: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 2AD1616A41F for ; Mon, 7 Nov 2005 15:25:23 +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 DEFF643D48 for ; Mon, 7 Nov 2005 15:25:22 +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 jA7FPMdV096641 for ; Mon, 7 Nov 2005 15:25:22 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA7FPMcA096638 for perforce@freebsd.org; Mon, 7 Nov 2005 15:25:22 GMT (envelope-from millert@freebsd.org) Date: Mon, 7 Nov 2005 15:25:22 GMT Message-Id: <200511071525.jA7FPMcA096638@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 86418 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, 07 Nov 2005 15:25:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=86418 Change 86418 by millert@millert_ibook on 2005/11/07 15:24:50 style(9) cleanup Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#5 (text+ko) ==== @@ -68,25 +68,25 @@ int sebsd_check_ipc_method1(int subj, int obj, int msgid) { - struct msgid_classinfo *mcl = hashtab_search(msgid2class, &msgid); - int i; + struct msgid_classinfo *mcl; + struct av_decision ad; + access_vector_t perms; + int cl; /* * Return allowed for messages in an unknown subsystem. * Instead, we probably should make a check against a * new permission to be added to mach_port for this purpose. */ - if (!mcl) + mcl = hashtab_search(msgid2class, &msgid); + if (mcl == NULL) return 0; - struct av_decision avd; - int cl = (msgid-mcl->baseid) / (8*sizeof(access_vector_t)); - access_vector_t perms; - + cl = msgid-mcl->baseid / (8 * sizeof(access_vector_t)); if (cl >= mcl->nclasses) - return (1); /* bad message, access denied */ + return (1); /* bad message, access denied */ perms = (access_vector_t)1 << - (msgid - mcl->baseid - cl * 8 * sizeof(access_vector_t)); - return avc_has_perm_audit(subj, obj, mcl->classes[cl], perms, &avd); + (msgid - mcl->baseid - (cl * 8 * sizeof(access_vector_t))); + return avc_has_perm_audit(subj, obj, mcl->classes[cl], perms, &ad); } From owner-p4-projects@FreeBSD.ORG Mon Nov 7 15:28:28 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 821FC16A421; Mon, 7 Nov 2005 15:28: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 4587416A41F for ; Mon, 7 Nov 2005 15:28:27 +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 1471543D5A for ; Mon, 7 Nov 2005 15:28:27 +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 jA7FSQgS096784 for ; Mon, 7 Nov 2005 15:28:26 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA7FSQO4096781 for perforce@freebsd.org; Mon, 7 Nov 2005 15:28:26 GMT (envelope-from millert@freebsd.org) Date: Mon, 7 Nov 2005 15:28:26 GMT Message-Id: <200511071528.jA7FSQO4096781@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 86419 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, 07 Nov 2005 15:28:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=86419 Change 86419 by millert@millert_ibook on 2005/11/07 15:27:50 Use printk, not printf for consistency Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#6 (text+ko) ==== @@ -619,11 +619,11 @@ curthread->td_ucred, curthread)) { #endif - printf(" inode=%ld, mountpoint=%s, ", + printk(" inode=%ld, mountpoint=%s, ", va.va_fileid, vp->v_mount->mnt_stat.f_mntonname); } else { - printf(" fs/inode info not available"); + printk(" fs/inode info not available"); } } break; From owner-p4-projects@FreeBSD.ORG Mon Nov 7 15:29:29 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BECC16A421; Mon, 7 Nov 2005 15:29: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 ECFE516A41F for ; Mon, 7 Nov 2005 15:29:28 +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 BA75243D45 for ; Mon, 7 Nov 2005 15:29:28 +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 jA7FTSda096846 for ; Mon, 7 Nov 2005 15:29:28 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA7FTSHU096843 for perforce@freebsd.org; Mon, 7 Nov 2005 15:29:28 GMT (envelope-from millert@freebsd.org) Date: Mon, 7 Nov 2005 15:29:28 GMT Message-Id: <200511071529.jA7FTSHU096843@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 86420 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, 07 Nov 2005 15:29:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=86420 Change 86420 by millert@millert_ibook on 2005/11/07 15:29:26 Don't try to deref curproc if it is NULL Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#7 (text+ko) ==== @@ -555,9 +555,10 @@ struct av_decision *avd, int result, struct avc_audit_data *a) { #ifdef __APPLE__ - struct proc *curproc = current_proc(); + struct proc *tsk = current_proc(); +#else + struct proc *tsk = curproc; #endif - struct proc *tsk = curproc; access_vector_t denied, audited; denied = requested & ~avd->allowed; @@ -608,11 +609,10 @@ struct vnode *vp = a->u.fs.vp; struct vattr va; #ifdef __APPLE__ - struct proc *curproc = current_proc(); - if (/*VOP_ISLOCKED(vp) &&*/ + if (tsk && /*VOP_ISLOCKED(vp) &&*/ !VOP_GETATTR(vp, &va, - curproc->p_ucred, - curproc)) { + tsk->p_ucred, + tsk)) { #else if (VOP_ISLOCKED(vp, curthread) && !VOP_GETATTR(vp, &va, From owner-p4-projects@FreeBSD.ORG Mon Nov 7 15:31:32 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 387A616A422; Mon, 7 Nov 2005 15:31: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 0F0CF16A41F for ; Mon, 7 Nov 2005 15:31: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 B7B4D43D45 for ; Mon, 7 Nov 2005 15:31: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 jA7FVV0P097018 for ; Mon, 7 Nov 2005 15:31:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA7FVVfL097015 for perforce@freebsd.org; Mon, 7 Nov 2005 15:31:31 GMT (envelope-from millert@freebsd.org) Date: Mon, 7 Nov 2005 15:31:31 GMT Message-Id: <200511071531.jA7FVVfL097015@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 86421 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, 07 Nov 2005 15:31:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=86421 Change 86421 by millert@millert_ibook on 2005/11/07 15:30:32 Enable audit rate limiting on darwin Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#8 (text+ko) ==== @@ -75,6 +75,7 @@ #ifdef __APPLE__ static mutex_t *avc_lock; static mutex_t *avc_log_lock; +uint64_t avc_msg_cost, avc_msg_burst; #else static struct mtx avc_lock; static struct mtx avc_log_lock; @@ -229,6 +230,8 @@ #ifdef __APPLE__ avc_lock = mutex_alloc(ETAP_NO_TRACE); avc_log_lock = mutex_alloc(ETAP_NO_TRACE); + nanoseconds_to_absolutetime(5000000000ULL, &avc_msg_cost); + avc_msg_burst = 10 * avc_msg_cost; #else mtx_init(&avc_lock, "SEBSD AVC", NULL, MTX_DEF); mtx_init(&avc_log_lock, "SEBSD message lock", NULL, MTX_DEF); @@ -469,13 +472,17 @@ printk(" %s=%d", name2, ntohs(port)); } -#if 0 +#ifdef __APPLE__ +#define AVC_MSG_COST avc_msg_cost +#define AVC_MSG_BURST avc_msg_burst +#else /* * Copied from net/core/utils.c:net_ratelimit and modified for * use by the AVC audit facility. */ #define AVC_MSG_COST 5*HZ #define AVC_MSG_BURST 10*5*HZ +#endif /* * This enforces a rate limit: not more than one kernel message @@ -483,12 +490,26 @@ */ static int avc_ratelimit(void) { +#ifdef __APPLE__ + static mutex_t *ratelimit_lock; + static uint64_t toks; + static uint64_t last_msg; + static int missed, rc = 0; + uint64_t now; + + now = mach_absolute_time(); + if (ratelimit_lock == NULL) { + ratelimit_lock = mutex_alloc(ETAP_NO_TRACE); + toks = avc_msg_burst; + } +#else static spinlock_t ratelimit_lock = SPIN_LOCK_UNLOCKED; - static unsigned long toks = 10*5*HZ; + static unsigned long toks = AVC_MSG_BURST; static unsigned long last_msg; static int missed, rc = 0; unsigned long flags; unsigned long now = jiffies; +#endif spin_lock_irqsave(&ratelimit_lock, flags); toks += now - last_msg; @@ -522,15 +543,6 @@ } } -#else - -static inline int check_avc_ratelimit(void) -{ - return 1; -} - -#endif - /** * avc_audit - Audit the granting or denial of permissions. * @ssid: source security identifier From owner-p4-projects@FreeBSD.ORG Mon Nov 7 15:36:39 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E168216A421; Mon, 7 Nov 2005 15:36:38 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A186D16A41F for ; Mon, 7 Nov 2005 15:36:38 +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 58E8A43D45 for ; Mon, 7 Nov 2005 15:36:38 +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 jA7FacpH097276 for ; Mon, 7 Nov 2005 15:36:38 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA7FacYv097273 for perforce@freebsd.org; Mon, 7 Nov 2005 15:36:38 GMT (envelope-from millert@freebsd.org) Date: Mon, 7 Nov 2005 15:36:38 GMT Message-Id: <200511071536.jA7FacYv097273@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 86422 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, 07 Nov 2005 15:36:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=86422 Change 86422 by millert@millert_ibook on 2005/11/07 15:36:04 Minor style nit Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.c#7 (text+ko) ==== @@ -1001,10 +1001,10 @@ struct label *io_getlabel (ipc_object_t objp) { + ipc_port_t port = (ipc_port_t) objp; + assert(io_otype(objp) == IOT_PORT); - ipc_port_t port = (ipc_port_t) objp; - if (ip_kotype(port) == IKOT_LABELH) return &((ipc_labelh_t) port->ip_kobject)->lh_label; else From owner-p4-projects@FreeBSD.ORG Mon Nov 7 19:23:16 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A898D16A421; Mon, 7 Nov 2005 19:23: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 7E37D16A41F for ; Mon, 7 Nov 2005 19:23:15 +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 DB37643D6E for ; Mon, 7 Nov 2005 19:23:14 +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 jA7JNEkm013883 for ; Mon, 7 Nov 2005 19:23:14 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA7JNE9X013879 for perforce@freebsd.org; Mon, 7 Nov 2005 19:23:14 GMT (envelope-from peter@freebsd.org) Date: Mon, 7 Nov 2005 19:23:14 GMT Message-Id: <200511071923.jA7JNE9X013879@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 86432 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, 07 Nov 2005 19:23:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=86432 Change 86432 by peter@peter_daintree on 2005/11/07 19:23:07 IFC @86430 Affected files ... .. //depot/projects/hammer/etc/rc.d/ppp#3 branch .. //depot/projects/hammer/sys/boot/i386/loader/loader.rc#4 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Nov 7 19:23:21 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBFCE16A424; Mon, 7 Nov 2005 19:23: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 9386016A41F for ; Mon, 7 Nov 2005 19:23: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 90BF843D64 for ; Mon, 7 Nov 2005 19:23:14 +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 jA7JNEZZ013876 for ; Mon, 7 Nov 2005 19:23:14 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA7JNESt013873 for perforce@freebsd.org; Mon, 7 Nov 2005 19:23:14 GMT (envelope-from peter@freebsd.org) Date: Mon, 7 Nov 2005 19:23:14 GMT Message-Id: <200511071923.jA7JNESt013873@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 86431 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, 07 Nov 2005 19:23:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=86431 Change 86431 by peter@peter_daintree on 2005/11/07 19:22:18 IFC @86424 Affected files ... .. //depot/projects/hammer/Makefile.inc1#106 integrate .. //depot/projects/hammer/lib/bind/bind/Makefile#4 integrate .. //depot/projects/hammer/lib/bind/bind9/Makefile#4 integrate .. //depot/projects/hammer/lib/bind/dns/Makefile#5 integrate .. //depot/projects/hammer/lib/bind/isc/Makefile#5 integrate .. //depot/projects/hammer/lib/bind/isccc/Makefile#4 integrate .. //depot/projects/hammer/lib/bind/isccfg/Makefile#4 integrate .. //depot/projects/hammer/lib/bind/lwres/Makefile#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_platform.h#13 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#7 integrate .. //depot/projects/hammer/lib/libarchive/configure.ac.in#8 integrate .. //depot/projects/hammer/lib/msun/Makefile#30 integrate .. //depot/projects/hammer/lib/msun/man/ieee_test.3#3 integrate .. //depot/projects/hammer/lib/msun/man/ilogb.3#2 integrate .. //depot/projects/hammer/lib/msun/man/math.3#13 integrate .. //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#5 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_fujitsu.4#4 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#31 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#43 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#82 integrate .. //depot/projects/hammer/sys/arm/arm/machdep.c#15 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#27 integrate .. //depot/projects/hammer/sys/arm/include/pmap.h#13 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#37 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#25 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#24 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#17 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#37 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rscalc.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsmisc.c#7 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#25 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#25 integrate .. //depot/projects/hammer/sys/dev/amr/amr_cam.c#13 integrate .. //depot/projects/hammer/sys/dev/amr/amr_pci.c#19 integrate .. //depot/projects/hammer/sys/dev/amr/amrvar.h#16 integrate .. //depot/projects/hammer/sys/dev/fb/boot_font.c#5 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#45 integrate .. //depot/projects/hammer/sys/dev/puc/puc.c#18 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#22 integrate .. //depot/projects/hammer/sys/dev/sound/isa/mss.c#16 integrate .. //depot/projects/hammer/sys/dev/sound/pci/als4000.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/ubser.c#13 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#41 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#43 integrate .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#23 integrate .. //depot/projects/hammer/sys/kern/kern_mbuf.c#11 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#34 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#31 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#39 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#46 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#20 integrate .. //depot/projects/hammer/tools/regression/sigqueue/Makefile#1 branch .. //depot/projects/hammer/tools/regression/sigqueue/sigqtest1/Makefile#1 branch .. //depot/projects/hammer/tools/regression/sigqueue/sigqtest1/sigqtest1.c#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/pkill/pgrep-t.t#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/pkill/pkill-t.t#2 integrate .. //depot/projects/hammer/tools/sched/schedgraph.py#3 integrate .. //depot/projects/hammer/tools/tools/aac/aac_checkq.c#2 integrate .. //depot/projects/hammer/usr.bin/fstat/fstat.c#17 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#19 integrate .. //depot/projects/hammer/usr.sbin/config/configvers.h#8 integrate .. //depot/projects/hammer/usr.sbin/powerd/powerd.8#6 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#106 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.514 2005/11/03 08:56:39 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.515 2005/11/07 15:03:04 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -493,6 +493,18 @@ SPECIAL_INSTALLCHECKS= # +# Require DESTDIR to be set if installing for a different architecture. +# +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} +SPECIAL_INSTALLCHECKS+= installcheck_DESTDIR +installcheck_DESTDIR: +.if !defined(DESTDIR) || empty(DESTDIR) + @echo "ERROR: Please set DESTDIR!"; \ + false +.endif +.endif + +# # installcheck # # Checks to be sure system is ready for installworld ==== //depot/projects/hammer/lib/bind/bind/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/bind/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $ +# $FreeBSD: src/lib/bind/bind/Makefile,v 1.5 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -62,9 +62,6 @@ res_mkquery.c res_mkupdate.c res_query.c \ res_send.c res_sendsigned.c res_update.c -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - #.if defined(WITH_BIND_LIBS) #INCS= ${SRCDIR}/include/isc/assertions.h \ # ${SRCDIR}/include/isc/ctl.h \ ==== //depot/projects/hammer/lib/bind/bind9/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/bind9/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $ +# $FreeBSD: src/lib/bind/bind9/Makefile,v 1.5 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -14,9 +14,6 @@ CFLAGS+= -I${SRCDIR}/include -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - .if defined(WITH_BIND_LIBS) INCS= ${SRCDIR}/include/bind9/check.h \ ${SRCDIR}/include/bind9/getaddresses.h \ ==== //depot/projects/hammer/lib/bind/dns/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/dns/Makefile,v 1.5 2005/03/17 08:35:21 dougb Exp $ +# $FreeBSD: src/lib/bind/dns/Makefile,v 1.6 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -37,8 +37,8 @@ CFLAGS+= -I${SRCDIR}/include/dst -I${SRCDIR}/include -I${SRCDIR} CFLAGS+= -I${.CURDIR} -DPADD= ${CRYPTO_DPADD} ${PTHREAD_DPADD} -LDADD= ${CRYPTO_LDADD} ${PTHREAD_LDADD} +DPADD= ${CRYPTO_DPADD} +LDADD= ${CRYPTO_LDADD} .if defined(WITH_BIND_LIBS) DNSINCS= ${SRCDIR}/include/dns/acl.h \ ==== //depot/projects/hammer/lib/bind/isc/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/isc/Makefile,v 1.5 2005/07/25 14:44:09 des Exp $ +# $FreeBSD: src/lib/bind/isc/Makefile,v 1.6 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -38,9 +38,6 @@ CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/nothreads/include CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - .if defined(WITH_BIND_LIBS) INCS= ${SRCDIR}/include/isc/app.h \ ${SRCDIR}/include/isc/assertions.h \ ==== //depot/projects/hammer/lib/bind/isccc/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/isccc/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $ +# $FreeBSD: src/lib/bind/isccc/Makefile,v 1.5 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -16,9 +16,6 @@ CFLAGS+= -I${SRCDIR}/include -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - .if defined(WITH_BIND_LIBS) INCS= ${SRCDIR}/include/isccc/alist.h \ ${SRCDIR}/include/isccc/base64.h \ ==== //depot/projects/hammer/lib/bind/isccfg/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/isccfg/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $ +# $FreeBSD: src/lib/bind/isccfg/Makefile,v 1.5 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -14,9 +14,6 @@ CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - .if defined(WITH_BIND_LIBS) INCS= ${SRCDIR}/include/isccfg/cfg.h \ ${SRCDIR}/include/isccfg/grammar.h \ ==== //depot/projects/hammer/lib/bind/lwres/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/lwres/Makefile,v 1.7 2004/10/24 15:32:30 ru Exp $ +# $FreeBSD: src/lib/bind/lwres/Makefile,v 1.8 2005/11/07 15:22:35 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -24,9 +24,6 @@ CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include CFLAGS+= -I${.CURDIR} -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - .if defined(WITH_BIND_LIBS) MAN= lwres.3 lwres_buffer.3 lwres_config.3 lwres_context.3 \ lwres_gabn.3 lwres_gai_strerror.3 lwres_getaddrinfo.3 \ ==== //depot/projects/hammer/lib/libarchive/archive_platform.h#13 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.18 2005/10/12 03:28:38 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.19 2005/11/06 23:38:01 kientzle Exp $ */ /* @@ -93,6 +93,7 @@ #define HAVE_SYS_TIME_H 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_WAIT_H 1 +#define HAVE_TIMEGM 1 #define HAVE_UNISTD_H 1 #define HAVE_WCHAR_H 1 #define HAVE_ZLIB_H 1 ==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.10 2005/09/24 21:15:00 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.11 2005/11/06 23:38:01 kientzle Exp $"); #include @@ -179,6 +179,7 @@ struct archive_entry *); static const char *build_pathname(struct archive_string *, struct file_info *); static void dump_isodirrec(FILE *, const struct iso9660_directory_record *); +static time_t time_from_tm(struct tm *); static time_t isodate17(const void *); static time_t isodate7(const void *); static int isPVD(struct iso9660 *, const char *); @@ -950,6 +951,7 @@ struct tm tm; const unsigned char *v = (const unsigned char *)p; int offset; + memset(&tm, 0, sizeof(tm)); tm.tm_year = v[0]; tm.tm_mon = v[1] - 1; tm.tm_mday = v[2]; @@ -962,7 +964,7 @@ tm.tm_hour -= offset / 4; tm.tm_min -= (offset % 4) * 15; } - return (timegm(&tm)); + return (time_from_tm(&tm)); } static time_t @@ -971,6 +973,7 @@ struct tm tm; const unsigned char *v = (const unsigned char *)p; int offset; + memset(&tm, 0, sizeof(tm)); tm.tm_year = (v[0] - '0') * 1000 + (v[1] - '0') * 100 + (v[2] - '0') * 10 + (v[3] - '0') - 1900; @@ -985,7 +988,44 @@ tm.tm_hour -= offset / 4; tm.tm_min -= (offset % 4) * 15; } - return (timegm(&tm)); + return (time_from_tm(&tm)); +} + +/* + * timegm() converts a struct tm to a time_t, except it isn't standard, + * so I provide my own function here that (ideally) is just a wrapper + * for timegm(). + */ +static time_t +time_from_tm(struct tm *t) +{ +#if HAVE_TIMEGM + return (timegm(t)); +#else + /* + * Unfortunately, timegm() isn't standard. The standard + * mktime() function is a close match, except that it uses + * local timezone instead of GMT. Close enough for now. + * Note that it is not possible to emulate timegm() using + * standard interfaces: + * * ANSI C90 does not even guarantee that time_t is + * an arithmetic type, so time adjustments can only be + * done by manipulating struct tm elements. You cannot + * portably calculate time_t values. + * * POSIX does promise that time_t is an arithmetic type + * measured in seconds, so you can do time_t calculations + * while remaining POSIX-compliant. + * * Neither ANSI nor POSIX provides an easy way to measure + * the timezone offset, so you can't adjust mktime() to + * work like timegm(). + * * POSIX does not promise that the epoch begins in 1970, + * so you can't write a portable timegm() function from + * scratch. + */ + time_t result = mktime(t); + /* TODO: Find a way to improve this approximation to timegm(). */ + return result; +#endif } static const char * ==== //depot/projects/hammer/lib/libarchive/configure.ac.in#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/configure.ac.in,v 1.8 2005/10/13 05:51:38 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/configure.ac.in,v 1.9 2005/11/06 23:38:01 kientzle Exp $ #Process this file with autoconf to produce a configure script. AC_INIT(libarchive, @VERSION@, kientzle@freebsd.org) @@ -79,7 +79,7 @@ AC_CHECK_FUNCS([acl_create_entry acl_init acl_set_fd acl_set_fd_np acl_set_file]) AC_CHECK_FUNCS([chflags fchdir fchflags fchmod fchown futimes]) AC_CHECK_FUNCS([lchflags lchmod lchown lutimes memmove]) -AC_CHECK_FUNCS([memset mkdir mkfifo strchr strdup strerror strrchr]) +AC_CHECK_FUNCS([memset mkdir mkfifo strchr strdup strerror strrchr timegm]) # MacOS has an acl.h that isn't POSIX. It can be detected by # checking for ACL_USER ==== //depot/projects/hammer/lib/msun/Makefile#30 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: src/lib/msun/Makefile,v 1.72 2005/07/22 17:19:05 kensmith Exp $ +# $FreeBSD: src/lib/msun/Makefile,v 1.74 2005/11/06 17:59:40 bde Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -36,7 +36,7 @@ e_log.c e_log10.c e_log10f.c e_logf.c e_pow.c e_powf.c e_rem_pio2.c \ e_rem_pio2f.c e_remainder.c e_remainderf.c e_scalb.c e_scalbf.c \ e_sinh.c e_sinhf.c e_sqrt.c e_sqrtf.c fenv.c \ - k_cos.c k_cosf.c k_rem_pio2.c k_rem_pio2f.c k_sin.c k_sinf.c \ + k_cos.c k_cosf.c k_rem_pio2.c k_sin.c k_sinf.c \ k_tan.c k_tanf.c \ s_asinh.c s_asinhf.c s_atan.c s_atanf.c s_cbrt.c s_cbrtf.c \ s_ceil.c s_ceilf.c s_ceill.c \ @@ -129,10 +129,10 @@ fmax.3 fmin.3 fmax.3 fminf.3 fmax.3 fminl.3 MLINKS+=fmod.3 fmodf.3 MLINKS+=hypot.3 cabs.3 hypot.3 cabsf.3 hypot.3 hypotf.3 -MLINKS+=ieee_test.3 logb.3 ieee_test.3 logbf.3 MLINKS+=ieee_test.3 scalb.3 ieee_test.3 scalbf.3 MLINKS+=ieee_test.3 significand.3 ieee_test.3 significandf.3 -MLINKS+=ilogb.3 ilogbf.3 ilogb.3 ilogbl.3 +MLINKS+=ilogb.3 ilogbf.3 ilogb.3 ilogbl.3 \ + ilogb.3 logb.3 ilogb.3 logbf.3 MLINKS+=j0.3 j1.3 j0.3 jn.3 j0.3 y0.3 j0.3 y1.3 j0.3 y1f.3 j0.3 yn.3 MLINKS+=j0.3 j0f.3 j0.3 j1f.3 j0.3 jnf.3 j0.3 y0f.3 j0.3 ynf.3 MLINKS+=lgamma.3 gamma.3 lgamma.3 gammaf.3 lgamma.3 lgammaf.3 lgamma.3 tgamma.3 ==== //depot/projects/hammer/lib/msun/man/ieee_test.3#3 (text+ko) ==== @@ -30,14 +30,12 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)ieee.3 6.4 (Berkeley) 5/6/91 -.\" $FreeBSD: src/lib/msun/man/ieee_test.3,v 1.11 2004/06/12 04:40:47 das Exp $ +.\" $FreeBSD: src/lib/msun/man/ieee_test.3,v 1.12 2005/11/06 12:18:27 bde Exp $ .\" -.Dd March 10, 1994 +.Dd Nov 6, 2005 .Dt IEEE_TEST 3 .Os .Sh NAME -.Nm logb , -.Nm logbf , .Nm scalb , .Nm scalbf , .Nm significand , @@ -48,10 +46,6 @@ .Sh SYNOPSIS .In math.h .Ft double -.Fn logb "double x" -.Ft float -.Fn logbf "float x" -.Ft double .Fn scalb "double x" "double n" .Ft float .Fn scalbf "float x" "float n" @@ -64,18 +58,6 @@ .St -ieee754 . Their use is not otherwise recommended. .Pp -.Fn logb x -and -.Fn logbf x -return -.Fa x Ns 's exponent -.Fa n , -a signed integer converted to double\-precision floating\-point. -.Fn logb \*(Pm\*(If -= +\*(If; -.Fn logb 0 -= -\*(If with a division by zero exception. -.Pp .Fn scalb x n and .Fn scalbf x n ==== //depot/projects/hammer/lib/msun/man/ilogb.3#2 (text+ko) ==== @@ -30,15 +30,17 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)ieee.3 6.4 (Berkeley) 5/6/91 -.\" $FreeBSD: src/lib/msun/man/ilogb.3,v 1.1 2005/01/27 05:46:16 das Exp $ +.\" $FreeBSD: src/lib/msun/man/ilogb.3,v 1.2 2005/11/06 12:18:27 bde Exp $ .\" -.Dd January 26, 2005 +.Dd Nov 6, 2005 .Dt ILOGB 3 .Os .Sh NAME .Nm ilogb , .Nm ilogbf , -.Nm ilogbl +.Nm ilogbl , +.Nm logb , +.Nm logbf .Nd extract exponent .Sh LIBRARY .Lb libm @@ -50,24 +52,40 @@ .Fn ilogbf "float x" .Ft int .Fn ilogbl "long double x" +.Ft double +.Fn logb "double x" +.Ft float +.Fn logbf "float x" .Sh DESCRIPTION .Fn ilogb , .Fn ilogbf and .Fn ilogbl return -.Fa x Ns 's exponent, +.Fa x Ns 's exponent in integer format. .Fn ilogb \*(Pm\*(If returns .Dv INT_MAX , .Fn ilogb \*(Pm\*(Na returns -.Dv FP_ILOGBNAN +.Dv FP_ILOGBNAN , and .Fn ilogb 0 returns .Dv FP_ILOGB0 . +.Pp +.Fn logb x +and +.Fn logbf x +return +.Fa x Ns 's exponent +in floating\-point format with the same precision as +.Fa x . +.Fn logb \*(Pm\*(If +returns +\*(If, and +.Fn logb 0 +returns -\*(If with a division by zero exception. .Sh SEE ALSO .Xr frexp 3 , .Xr ieee 3 , @@ -77,19 +95,33 @@ The .Fn ilogb , .Fn ilogbf , +.Fn ilogbl , +.Fn logb and -.Fn ilogbl +.Fn logbf routines conform to .St -isoC-99 . -They provide functionality similar to the Logb function recommended by +.Fn logb +and +.Fn logbf +implement the logb function recommended by .St -ieee754 . .Sh HISTORY The +.Fn logb +function appeared in +.Bx 4.3 . +The .Fn ilogb +function appeared in +.Fx 1.1.5 . +The +.Fn ilogbf and -.Fn ilogbf +.Fn logbf functions appeared in -.Bx 4.3 -and -.Fx 2.0 , -respectively. +.Fx 2.0 . +The +.Fn ilogbl +function appeared in +.Fx 5.4 . ==== //depot/projects/hammer/lib/msun/man/math.3#13 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)math.3 6.10 (Berkeley) 5/6/91 -.\" $FreeBSD: src/lib/msun/man/math.3,v 1.25 2005/06/16 21:56:03 ru Exp $ +.\" $FreeBSD: src/lib/msun/man/math.3,v 1.26 2005/11/06 12:18:27 bde Exp $ .\" -.Dd April 5, 2005 +.Dd Nov 6, 2005 .Dt MATH 3 .Os .if n \{\ @@ -97,6 +97,7 @@ frexp extract exponent and mantissa ilogb extract exponent ldexp multiply by power of 2 +logb extract exponent scalbln adjust exponent scalbn adjust exponent .El ==== //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#5 (text+ko) ==== @@ -15,7 +15,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.14 2005/10/29 16:34:50 bde Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.15 2005/11/06 17:48:02 bde Exp $"; #endif /* __ieee754_rem_pio2f(x,y) @@ -55,6 +55,7 @@ half = 5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */ two24 = 1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */ invpio2 = 6.36619772367581382433e-01, /* 0x3FE45F30, 0x6DC9C883 */ +pio2 = 1.57079632679489655700e+00, /* 0x3FF921FB, 0x54442d18 */ pio2_1 = 1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */ pio2_1t = 6.07710050650619224932e-11; /* 0x3DD0B461, 0x1A626331 */ @@ -71,16 +72,45 @@ /* 33+53 bit pi is good enough for special and medium size cases */ if(ix<0x4016cbe4) { /* |x| < 3pi/4, special case with n=+-1 */ if(hx>0) { - z = x - pio2_1; - y[0] = z - pio2_1t; - y[1] = (z-y[0])-pio2_1t; - return 1; - } else { /* negative x */ - z = x + pio2_1; - y[0] = z + pio2_1t; - y[1] = (z-y[0])+pio2_1t; - return -1; + z = x - pio2; + n = 1; + } else { + z = x + pio2; + n = 3; + } + y[0] = z; + y[1] = z - y[0]; + return n; + } + if(ix<0x407b53d1) { /* |x| < 5*pi/4, special case with n=+-2 */ + if(hx>0) + z = x - 2*pio2; + else + z = x + 2*pio2; + y[0] = z; + y[1] = z - y[0]; + return 2; + } + if(ix<0x40afeddf) { /* |x| < 7*pi/4, special case with n=+-3 */ + if(hx>0) { + z = x - 3*pio2; + n = 3; + } else { + z = x + 3*pio2; + n = 1; } + y[0] = z; + y[1] = z - y[0]; + return n; + } + if(ix<0x40e231d6) { /* |x| < 9*pi/4, special case with n=+-4 */ + if(hx>0) + z = x - 4*pio2; + else + z = x + 4*pio2; + y[0] = z; + y[1] = z - y[0]; + return 0; } if(ix<=0x49490f80) { /* |x| ~<= 2^19*(pi/2), medium size */ t = fabsf(x); ==== //depot/projects/hammer/share/man/man4/man4.i386/acpi_fujitsu.4#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_fujitsu.4,v 1.3 2005/07/15 17:35:26 hrs Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_fujitsu.4,v 1.4 2005/11/06 00:41:41 philip Exp $ .\" .Dd March 20, 2005 .Dt ACPI_FUJITSU 4 i386 @@ -154,7 +154,7 @@ The .Nm driver was written by -.An Sean Bullington Aq sean@stalker.org , +.An Sean Bullington Aq shegget@gmail.com , .An Anish Mistry Aq mistry.7@osu.edu , and .An Marc Santcroos Aq marks@ripe.net . ==== //depot/projects/hammer/sys/alpha/conf/GENERIC#31 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.188 2005/09/24 16:47:34 wilko Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.189 2005/11/05 19:48:53 marcel Exp $ machine alpha cpu EV4 @@ -143,8 +143,9 @@ device mcclock # MC146818 real time clock device -# Serial (COM) ports (required) +# Serial (COM) ports device sio # 8250, 16[45]50 based serial ports +device uart # Generic UART driver # Parallel port device ppc @@ -155,7 +156,7 @@ # If you've got a "dumb" serial or parallel PCI card that is # supported by the puc(4) glue driver, uncomment the following -# line to enable it (connects to the sio and/or ppc drivers): +# line to enable it (connects to sio, uart and/or ppc drivers): #device puc # PCI Ethernet NICs. ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#43 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.18 2005/11/02 20:11:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.19 2005/11/04 23:02:28 peter Exp $"); #include "opt_atpic.h" #include "opt_isa.h" ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#82 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.445 2005/11/01 22:59:02 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.446 2005/11/05 19:48:53 marcel Exp $ machine amd64 cpu HAMMER @@ -164,6 +164,7 @@ # Serial (COM) ports device sio # 8250, 16[45]50 based serial ports +device uart # Generic UART driver # Parallel port device ppc @@ -175,7 +176,7 @@ # If you've got a "dumb" serial or parallel PCI card that is # supported by the puc(4) glue driver, uncomment the following -# line to enable it (connects to the sio and/or ppc drivers): +# line to enable it (connects to sio, uart and/or ppc drivers): #device puc # PCI Ethernet NICs. ==== //depot/projects/hammer/sys/arm/arm/machdep.c#15 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.18 2005/10/14 12:43:44 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.19 2005/11/06 16:10:28 cognet Exp $"); #include #include @@ -244,6 +244,7 @@ cpu_setup(""); identify_arm_cpu(); thread0.td_frame = (struct trapframe *)pcb->un_32.pcb32_sp - 1; + pmap_postinit(); #ifdef ARM_CACHE_LOCK_ENABLE pmap_kenter_user(ARM_TP_ADDRESS, ARM_TP_ADDRESS); arm_lock_cache_line(ARM_TP_ADDRESS); ==== //depot/projects/hammer/sys/arm/arm/pmap.c#27 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.39 2005/10/23 23:09:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.40 2005/11/06 16:10:28 cognet Exp $"); #include #include #include @@ -398,11 +398,6 @@ */ #define PV_BEEN_REFD(f) (((f) & PVF_REF) != 0) -/* - * Data for the pv entry allocation mechanism - */ -#define MINPV 2048 - #ifndef PMAP_SHPGPERPROC #define PMAP_SHPGPERPROC 200 #endif @@ -1949,6 +1944,7 @@ void pmap_init(void) { + int shpgperproc = PMAP_SHPGPERPROC; PDEBUG(1, printf("pmap_init: phys_start = %08x\n")); @@ -1957,12 +1953,24 @@ */ pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); - uma_prealloc(pvzone, MINPV); /* * Now it is safe to enable pv_table recording. */ PDEBUG(1, printf("pmap_init: done!\n")); + TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); + + pv_entry_max = shpgperproc * maxproc + vm_page_array_size; + pv_entry_high_water = 9 * (pv_entry_max / 10); + l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor, + NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); + l2table_zone = uma_zcreate("L2 Table", sizeof(struct l2_dtable), + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, + UMA_ZONE_VM | UMA_ZONE_NOFREE); + + uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); + uma_zone_set_obj(l2zone, &l2zone_obj, pv_entry_max); + } int @@ -2190,15 +2198,14 @@ return (rv); } -/* - * Initialize the address space (zone) for the pv_entries. Set a - * high water mark so that the system can recover from excessive - * numbers of pv entries. - */ +void +pmap_init2(void) +{ +} + void -pmap_init2() +pmap_postinit(void) { - int shpgperproc = PMAP_SHPGPERPROC; struct l2_bucket *l2b; struct l1_ttable *l1; pd_entry_t *pl1pt; @@ -2206,21 +2213,6 @@ vm_offset_t va, eva; u_int loop, needed; - TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - - pv_entry_max = shpgperproc * maxproc + vm_page_array_size; - pv_entry_high_water = 9 * (pv_entry_max / 10); - l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor, - NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); - uma_prealloc(l2zone, 4096); - l2table_zone = uma_zcreate("L2 Table", sizeof(struct l2_dtable), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, - UMA_ZONE_VM | UMA_ZONE_NOFREE); - uma_prealloc(l2table_zone, 1024); - - uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); - uma_zone_set_obj(l2zone, &l2zone_obj, pv_entry_max); - needed = (maxproc / PMAP_DOMAINS) + ((maxproc % PMAP_DOMAINS) ? 1 : 0); needed -= 1; l1 = malloc(sizeof(*l1) * needed, M_VMPMAP, M_WAITOK); @@ -3787,8 +3779,7 @@ pv_entry_t ret_value; pv_entry_count++; - if (pv_entry_high_water && - (pv_entry_count > pv_entry_high_water) && + if ((pv_entry_count > pv_entry_high_water) && (pmap_pagedaemon_waken == 0)) { pmap_pagedaemon_waken = 1; wakeup (&vm_pages_needed); ==== //depot/projects/hammer/sys/arm/include/pmap.h#13 (text+ko) ==== @@ -44,7 +44,7 @@ * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 * - * $FreeBSD: src/sys/arm/include/pmap.h,v 1.12 2005/10/04 16:29:31 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.13 2005/11/06 16:10:27 cognet Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -509,6 +509,8 @@ extern char *_tmppt; +void pmap_postinit(void); + #ifdef ARM_USE_SMALL_ALLOC void arm_add_smallalloc_pages(void *, void *, int, int); void arm_busy_pages(void); ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#37 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.46 2005/10/31 21:09:56 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.47 2005/11/06 18:12:43 ps Exp $"); #include "opt_compat.h" @@ -1033,7 +1033,7 @@ error = freebsd32_copyoutmsghdr(&msg, uap->msg); if (error == 0) - error = freebsd32_copyoutiov(iov, iov->iov_len, + error = freebsd32_copyoutiov(iov, m32.msg_iovlen, (struct iovec32 *)(uintptr_t)m32.msg_iov, EMSGSIZE); } free(iov, M_IOV); ==== //depot/projects/hammer/sys/compat/ndis/ndis_var.h#25 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.45 2005/11/02 18:01:04 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.46 2005/11/07 16:57:14 wpaul Exp $ */ #ifndef _NDIS_VAR_H_ @@ -1332,7 +1332,7 @@ typedef struct ndis_packet_pool ndis_packet_pool; /* mbuf ext type for NDIS */ -#define EXT_NDIS 0x999 +#define EXT_NDIS EXT_NET_DRV /* mtx type for NDIS */ #define MTX_NDIS_LOCK "NDIS lock" ==== //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#24 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.41 2005/10/26 06:52:57 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.42 2005/11/06 19:38:33 wpaul Exp $ */ #ifndef _NTOSKRNL_VAR_H_ @@ -1196,6 +1196,7 @@ #define STATUS_MUTANT_NOT_OWNED 0xC0000046 #define STATUS_INVALID_PARAMETER_2 0xC00000F0 #define STATUS_INSUFFICIENT_RESOURCES 0xC000009A +#define STATUS_NOT_FOUND 0xC0000225 #define STATUS_WAIT_0 0x00000000 ==== //depot/projects/hammer/sys/compat/ndis/subr_hal.c#17 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.26 2005/10/21 05:23:20 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.27 2005/11/06 19:38:33 wpaul Exp $"); #include #include @@ -78,6 +78,8 @@ static void READ_PORT_BUFFER_UCHAR(uint8_t *, uint8_t *, uint32_t); static uint64_t KeQueryPerformanceCounter(uint64_t *); +static void _KeLowerIrql(uint8_t); +static uint8_t KeRaiseIrqlToDpcLevel(void); static void dummy (void); #define NDIS_MAXCPUS 64 @@ -370,10 +372,6 @@ { uint8_t oldirql; - /* I am so going to hell for this. */ - if (KeGetCurrentIrql() > DISPATCH_LEVEL) - panic("IRQL_NOT_LESS_THAN_OR_EQUAL"); - KeRaiseIrql(DISPATCH_LEVEL, &oldirql); KeAcquireSpinLockAtDpcLevel(lock); @@ -416,13 +414,16 @@ uint8_t oldirql; oldirql = KeGetCurrentIrql(); - if (irql < oldirql) + + /* I am so going to hell for this. */ + if (oldirql > irql) panic("IRQL_NOT_LESS_THAN"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Nov 7 19:33:28 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4846816A422; Mon, 7 Nov 2005 19:33: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 EB77A16A420 for ; Mon, 7 Nov 2005 19:33:27 +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 B173B43D48 for ; Mon, 7 Nov 2005 19:33:27 +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 jA7JXRmY014273 for ; Mon, 7 Nov 2005 19:33:27 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA7JXRqn014270 for perforce@freebsd.org; Mon, 7 Nov 2005 19:33:27 GMT (envelope-from peter@freebsd.org) Date: Mon, 7 Nov 2005 19:33:27 GMT Message-Id: <200511071933.jA7JXRqn014270@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 86433 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, 07 Nov 2005 19:33:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=86433 Change 86433 by peter@peter_daintree on 2005/11/07 19:32:33 Pass interrupt vectors as an int rather than a void *. Use jhb's i386 spelling (vector rather than vec). Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#32 edit .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#60 edit .. //depot/projects/hammer/sys/amd64/include/apicvar.h#37 edit .. //depot/projects/hammer/sys/amd64/isa/atpic.c#51 edit .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#21 edit .. //depot/projects/hammer/sys/amd64/isa/icu.h#22 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#32 (text+ko) ==== @@ -107,7 +107,7 @@ jz 2f ; \ addl $(32 * index),%eax ; \ 1: ; \ - movq %rax, %rdi ; /* pass the IRQ */ \ + movl %eax, %edi ; /* pass the IRQ */ \ call lapic_handle_intr ; \ MEXITCOUNT ; \ jmp doreti ; \ ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#60 (text+ko) ==== @@ -607,14 +607,13 @@ } void -lapic_handle_intr(void *cookie, struct intrframe frame) +lapic_handle_intr(int vector, struct intrframe frame) { struct intsrc *isrc; - int vec = (uintptr_t)cookie; - if (vec == -1) + if (vector == -1) panic("Couldn't get vector from ISR!"); - isrc = intr_lookup_source(apic_idt_to_irq(vec)); + isrc = intr_lookup_source(apic_idt_to_irq(vector)); intr_execute_handlers(isrc, &frame); } ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#37 (text+ko) ==== @@ -201,7 +201,7 @@ void lapic_ipi_raw(register_t icrlo, u_int dest); void lapic_ipi_vectored(u_int vector, int dest); int lapic_ipi_wait(int delay); -void lapic_handle_intr(void *cookie, struct intrframe frame); +void lapic_handle_intr(int vector, struct intrframe frame); void lapic_handle_timer(struct clockframe frame); void lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id); int lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked); ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#51 (text+ko) ==== @@ -463,19 +463,18 @@ SYSINIT(atpic_init, SI_SUB_INTR, SI_ORDER_SECOND + 1, atpic_init, NULL) void -atpic_handle_intr(void *cookie, struct intrframe iframe) +atpic_handle_intr(u_int vector, struct intrframe iframe) { struct intsrc *isrc; - int vec = (uintptr_t)cookie; - KASSERT(vec < NUM_ISA_IRQS, ("unknown int %d\n", vec)); - isrc = &atintrs[vec].at_intsrc; + KASSERT(vec < NUM_ISA_IRQS, ("unknown int %d\n", vector)); + isrc = &atintrs[vector].at_intsrc; /* * If we don't have an event, see if this is a spurious * interrupt. */ - if (isrc->is_event == NULL && (vec == 7 || vec == 15)) { + if (isrc->is_event == NULL && (vector == 7 || vector == 15)) { int port, isr; /* ==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#21 (text+ko) ==== @@ -67,7 +67,7 @@ movq %r14,TF_R14(%rsp) ; \ movq %r15,TF_R15(%rsp) ; \ FAKE_MCOUNT(TF_RIP(%rsp)) ; \ - movq $irq_num, %rdi; /* pass the IRQ */ \ + movl $irq_num, %edi; /* pass the IRQ */ \ call atpic_handle_intr ; \ MEXITCOUNT ; \ jmp doreti ==== //depot/projects/hammer/sys/amd64/isa/icu.h#22 (text+ko) ==== @@ -43,7 +43,7 @@ #define ICU_IMR_OFFSET 1 -void atpic_handle_intr(void *cookie, struct intrframe iframe); +void atpic_handle_intr(u_int vector, struct intrframe iframe); void atpic_startup(void); #endif /* !_AMD64_ISA_ICU_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Nov 7 19:49:49 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D24116A421; Mon, 7 Nov 2005 19:49: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 74D6C16A41F for ; Mon, 7 Nov 2005 19:49:48 +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 4349243D45 for ; Mon, 7 Nov 2005 19:49:48 +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 jA7JnmHD014900 for ; Mon, 7 Nov 2005 19:49:48 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA7Jnlcx014897 for perforce@freebsd.org; Mon, 7 Nov 2005 19:49:47 GMT (envelope-from peter@freebsd.org) Date: Mon, 7 Nov 2005 19:49:47 GMT Message-Id: <200511071949.jA7Jnlcx014897@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 86435 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, 07 Nov 2005 19:49:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=86435 Change 86435 by peter@peter_daintree on 2005/11/07 19:49:21 Integ -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/trap.c#80 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#83 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#22 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#80 (text+ko) ==== @@ -167,6 +167,7 @@ PCPU_LAZY_INC(cnt.v_trap); type = frame.tf_trapno; +#ifdef SMP #ifdef STOP_NMI /* Handler for NMI IPIs used for stopping CPUs. */ if (type == T_NMI) { @@ -174,6 +175,7 @@ goto out; } #endif /* STOP_NMI */ +#endif /* SMP */ #ifdef KDB if (kdb_active) { ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#83 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#22 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Nov 7 21:45:14 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C176A16A421; Mon, 7 Nov 2005 21:45:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6966016A41F for ; Mon, 7 Nov 2005 21:45:13 +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 3B30243D6B for ; Mon, 7 Nov 2005 21:45: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 jA7Lj7iV026952 for ; Mon, 7 Nov 2005 21:45:07 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA7Lj66J026949 for perforce@freebsd.org; Mon, 7 Nov 2005 21:45:06 GMT (envelope-from millert@freebsd.org) Date: Mon, 7 Nov 2005 21:45:06 GMT Message-Id: <200511072145.jA7Lj66J026949@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 86437 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, 07 Nov 2005 21:45:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=86437 Change 86437 by millert@millert_ibook on 2005/11/07 21:44:18 fix typo introduced in previous rev Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#6 (text+ko) ==== @@ -82,7 +82,7 @@ if (mcl == NULL) return 0; - cl = msgid-mcl->baseid / (8 * sizeof(access_vector_t)); + cl = (msgid-mcl - >baseid) / (8 * sizeof(access_vector_t)); if (cl >= mcl->nclasses) return (1); /* bad message, access denied */ From owner-p4-projects@FreeBSD.ORG Mon Nov 7 22:22:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DAB516A423; Mon, 7 Nov 2005 22:22:12 +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 14E8516A420 for ; Mon, 7 Nov 2005 22:22:12 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8DD643DA4 for ; Mon, 7 Nov 2005 22:21:52 +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 jA7MLqe2028898 for ; Mon, 7 Nov 2005 22:21:52 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA7MLq4S028895 for perforce@freebsd.org; Mon, 7 Nov 2005 22:21:52 GMT (envelope-from peter@freebsd.org) Date: Mon, 7 Nov 2005 22:21:52 GMT Message-Id: <200511072221.jA7MLq4S028895@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 86440 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, 07 Nov 2005 22:22:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=86440 Change 86440 by peter@peter_daintree on 2005/11/07 22:21:39 IFC @86439 Affected files ... .. //depot/projects/hammer/sbin/kldconfig/kldconfig.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#66 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#28 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#21 integrate .. //depot/projects/hammer/sys/dev/si/sireg.h#3 integrate .. //depot/projects/hammer/usr.sbin/config/configvers.h#9 integrate Differences ... ==== //depot/projects/hammer/sbin/kldconfig/kldconfig.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/kldconfig/kldconfig.c,v 1.7 2005/02/10 09:19:29 ru Exp $"); +__FBSDID("$FreeBSD: src/sbin/kldconfig/kldconfig.c,v 1.8 2005/11/07 19:22:20 ru Exp $"); #include #include @@ -270,7 +270,7 @@ while ((p = strsep(&path, ";")) != NULL) if (!uniq) { - if (((pe = malloc(sizeof(pe))) == NULL) || + if (((pe = malloc(sizeof(*pe))) == NULL) || ((pe->path = strdup(p)) == NULL)) { errno = ENOMEM; err(1, "allocating path element"); ==== //depot/projects/hammer/sys/dev/acpica/acpi.c#66 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.217 2005/11/01 22:44:07 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.219 2005/11/07 21:52:06 jhb Exp $"); #include "opt_acpi.h" #include ==== //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#28 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.57 2005/09/11 18:39:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.58 2005/11/07 21:48:45 jhb Exp $"); #include "opt_acpi.h" #include @@ -96,6 +96,13 @@ if (entry->Source == NULL || entry->Source[0] == '\0') return; + /* + * In practice, we only see SourceIndex's of 0 out in the wild. + * When indices != 0 have been found, they've been bugs in the ASL. + */ + if (entry->SourceIndex != 0) + return; + /* Lookup the associated handle and device. */ pcib = (device_t)arg; if (ACPI_FAILURE(AcpiGetHandle(ACPI_ROOT_OBJECT, entry->Source, &handle))) @@ -236,8 +243,12 @@ /* * If source is empty/NULL, the source index is a global IRQ number * and it's hard-wired so we're done. + * + * XXX: If the source index is non-zero, ignore the source device and + * assume that this is a hard-wired entry. */ - if (prt->Source == NULL || prt->Source[0] == '\0') { + if (prt->Source == NULL || prt->Source[0] == '\0' || + prt->SourceIndex != 0) { if (bootverbose) device_printf(pcib, "slot %d INT%c hardwired to IRQ %d\n", pci_get_slot(dev), 'A' + pin, prt->SourceIndex); ==== //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#21 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.36 2005/11/01 22:44:07 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.38 2005/11/07 21:52:06 jhb Exp $"); #include "opt_acpi.h" #include ==== //depot/projects/hammer/sys/dev/si/sireg.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $FreeBSD: src/sys/dev/si/sireg.h,v 1.10 2005/01/06 01:43:14 imp Exp $ + * $FreeBSD: src/sys/dev/si/sireg.h,v 1.11 2005/11/07 21:53:58 jhb Exp $ */ /* @@ -62,14 +62,14 @@ #define SIEISAIOSIZE 0x100 /* XXX How many ports */ /* SI old PCI */ -#define SIPCIBADR 0x10 /* Which BADR to map in RAM */ +#define SIPCIBADR PCIR_BAR(0) /* Which BADR to map in RAM */ #define SIPCI_MEMSIZE 0x100000 /* Mapping size */ #define SIPCIRESET 0xc0001 /* 0 = Reset */ #define SIPCIINTCL 0x40001 /* 0 = clear int */ /* SI Jet PCI */ -#define SIJETSSIDREG 0x2c /* Is it an SX or RIO? */ -#define SIJETBADR 0x18 /* Which BADR to map in RAM */ +#define SIJETSSIDREG PCIR_SUBVEND_0 /* Is it an SX or RIO? */ +#define SIJETBADR PCIR_BAR(2) /* Which BADR to map in RAM */ /* SI Jet PCI & ISA */ #define SIJETIDBASE 0x7c00 /* ID ROM base */ #define SISPLXID 0x984d /* Specialix ID */ ==== //depot/projects/hammer/usr.sbin/config/configvers.h#9 (text+ko) ==== @@ -7,7 +7,7 @@ * libs or param.h/osreldate. * * It is the version number of the protocol between config(8) and the - * sys/conf/* Makefiles (the kernel build system). + * sys/conf/ Makefiles (the kernel build system). * * It is now also used to trap certain problems that the syntax parser cannot * detect. @@ -25,7 +25,7 @@ * The people that are inconvenienced by gratuitous bumps are developers * who run config by hand. * - * $FreeBSD: src/usr.sbin/config/configvers.h,v 1.39 2005/11/07 17:37:27 peter Exp $ + * $FreeBSD: src/usr.sbin/config/configvers.h,v 1.40 2005/11/07 18:45:46 rwatson Exp $ */ #define CONFIGVERS 600003 From owner-p4-projects@FreeBSD.ORG Tue Nov 8 04:23:09 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 787E916A41F; Tue, 8 Nov 2005 04:23: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 226F216A41F for ; Tue, 8 Nov 2005 04:23:08 +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 E39F043D45 for ; Tue, 8 Nov 2005 04:23:07 +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 jA84N7bm050339 for ; Tue, 8 Nov 2005 04:23:07 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA84N7Zk050336 for perforce@freebsd.org; Tue, 8 Nov 2005 04:23:07 GMT (envelope-from soc-andrew@freebsd.org) Date: Tue, 8 Nov 2005 04:23:07 GMT Message-Id: <200511080423.jA84N7Zk050336@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 86444 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, 08 Nov 2005 04:23:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=86444 Change 86444 by soc-andrew@soc-andrew_serv on 2005/11/08 04:23:06 Fix the build of liblua and libliblua Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/lib/lua/lua/Makefile#2 edit .. //depot/projects/soc2005/bsdinstaller/src/lib/lua/lualib/Makefile#2 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/lib/lua/lua/Makefile#2 (text+ko) ==== @@ -6,7 +6,7 @@ SHLIB_MAJOR=5 -.include <../Makefile.inc1> +.include <${.CURDIR}/../Makefile.inc1> .PATH: ${LUA_DIR}/src ==== //depot/projects/soc2005/bsdinstaller/src/lib/lua/lualib/Makefile#2 (text+ko) ==== @@ -6,7 +6,7 @@ SHLIB_MAJOR=5 CFLAGS+=-DUSE_DLOPEN=1 -.include <../Makefile.inc1> +.include <${.CURDIR}/../Makefile.inc1> .PATH: ${LUA_DIR}/src/lib From owner-p4-projects@FreeBSD.ORG Tue Nov 8 11:08:42 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C06EE16A421; Tue, 8 Nov 2005 11:08: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 4397A16A41F for ; Tue, 8 Nov 2005 11:08:41 +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 064CB43D46 for ; Tue, 8 Nov 2005 11:08:41 +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 jA8B8eKD080885 for ; Tue, 8 Nov 2005 11:08:40 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA8B8eDY080882 for perforce@freebsd.org; Tue, 8 Nov 2005 11:08:40 GMT (envelope-from soc-andrew@freebsd.org) Date: Tue, 8 Nov 2005 11:08:40 GMT Message-Id: <200511081108.jA8B8eDY080882@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 86454 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, 08 Nov 2005 11:08:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=86454 Change 86454 by soc-andrew@soc-andrew_serv on 2005/11/08 11:08:28 Merge all the source dists to a generic source option Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/conf/FreeBSD.lua#4 edit .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/430_select_dists.lua#2 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/conf/FreeBSD.lua#4 (text+ko) ==== @@ -27,26 +27,30 @@ { src = "compat22", dest = "/", install = "Y" }, { src = "compat3x", dest = "/", install = "Y" }, { src = "compat4x", dest = "/", install = "Y" }, - { src = "sbase", dest = "/usr/src", install = "Y" }, - { src = "scrypto", dest = "/usr/src", install = "Y" }, - { src = "setc", dest = "/usr/src", install = "Y" }, - { src = "sgames", dest = "/usr/src", install = "Y" }, - { src = "sbin", dest = "/usr/src", install = "Y" }, - { src = "scontrib", dest = "/usr/src", install = "Y" }, - { src = "skrb5", dest = "/usr/src", install = "Y" }, - { src = "slib", dest = "/usr/src", install = "Y" }, - { src = "slibexec", dest = "/usr/src", install = "Y" }, - { src = "sgnu", dest = "/usr/src", install = "Y" }, - { src = "sinclude", dest = "/usr/src", install = "Y" }, - { src = "ssbin", dest = "/usr/src", install = "Y" }, - { src = "ssecure", dest = "/usr/src", install = "Y" }, - { src = "sshare", dest = "/usr/src", install = "Y" }, - { src = "srelease", dest = "/usr/src", install = "Y" }, - { src = "srescue", dest = "/usr/src", install = "Y" }, - { src = "subin", dest = "/usr/src", install = "Y" }, - { src = "susbin", dest = "/usr/src", install = "Y" }, - { src = "ssys", dest = "/usr/src", install = "Y" }, - { src = "stools", dest = "/usr/src", install = "Y" } + { src = "source", dest = "/usr/src", install = "Y" } +} + +source_items = { + "sbase", + "scrypto", + "setc", + "sgames", + "sbin", + "scontrib", + "skrb5", + "slib", + "slibexec", + "sgnu", + "sinclude", + "ssbin", + "ssecure", + "sshare", + "srelease", + "srescue", + "subin", + "susbin", + "ssys", + "stools" } cmd_names = cmd_names + { ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/430_select_dists.lua#2 (text+ko) ==== @@ -57,26 +57,41 @@ end end + insert_source = function(table_source, table_new) + for item in table_source do + table.insert(table_new, { + src = table_source[item], + dest = "/usr/src" + }) + end + end + insert_item = function(tab_new, tab_orig, value) for item in tab_orig do if tab_orig[item].src == value then table.insert(tab_new, { - src = tab_orig[item].src, - dest = tab_orig[item].dest }) + src = tab_orig[item].src, + dest = tab_orig[item].dest + }) end end - end App.conf.install_items = {} + -- Populate App.conf.install_items with the dists to install for data in response.datasets do if response.datasets[data].install ~= "Y" then remove_item(App.conf.install_items_orig, response.datasets[data].dist) else - insert_item(App.conf.install_items, - App.conf.install_items_orig, - response.datasets[data].dist) + if response.datasets[data].dist == "source" then + insert_source(App.conf.source_items, + App.conf.install_items) + else + insert_item(App.conf.install_items, + App.conf.install_items_orig, + response.datasets[data].dist) + end end end return step:next() From owner-p4-projects@FreeBSD.ORG Tue Nov 8 11:44:10 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0AE816A421; Tue, 8 Nov 2005 11:44: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 3AD7316A41F; Tue, 8 Nov 2005 11:44:09 +0000 (GMT) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (arm132.internetdsl.tpnet.pl [83.17.198.132]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C3C843D68; Tue, 8 Nov 2005 11:44:02 +0000 (GMT) (envelope-from pjd@garage.freebsd.pl) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id C7CDF51CD1; Tue, 8 Nov 2005 12:44:00 +0100 (CET) Received: from localhost (pjd.wheel.pl [10.0.1.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 9396850F92; Tue, 8 Nov 2005 12:43:52 +0100 (CET) Date: Tue, 8 Nov 2005 12:43:43 +0100 From: Pawel Jakub Dawidek To: Todd Miller Message-ID: <20051108114343.GA10509@garage.freebsd.pl> References: <200511072145.jA7Lj66J026949@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="6TrnltStXW4iwmi0" Content-Disposition: inline In-Reply-To: <200511072145.jA7Lj66J026949@repoman.freebsd.org> X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 7.0-CURRENT i386 User-Agent: mutt-ng/devel-r535 (FreeBSD) X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-5.9 required=3.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.0.4 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 86437 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, 08 Nov 2005 11:44:10 -0000 --6TrnltStXW4iwmi0 Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Nov 07, 2005 at 09:45:06PM +0000, Todd Miller wrote: +> http://perforce.freebsd.org/chv.cgi?CH=3D86437 +>=20 +> Change 86437 by millert@millert_ibook on 2005/11/07 21:44:18 +>=20 +> fix typo introduced in previous rev +>=20 +> Affected files ... +>=20 +> .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_a= v.c#6 edit +>=20 +> Differences ... +>=20 +> =3D=3D=3D=3D //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin= /ss/mach_av.c#6 (text+ko) =3D=3D=3D=3D +>=20 +> @@ -82,7 +82,7 @@ +> if (mcl =3D=3D NULL) +> return 0; +> =20 +> - cl =3D msgid-mcl->baseid / (8 * sizeof(access_vector_t)); +> + cl =3D (msgid-mcl - >baseid) / (8 * sizeof(access_vector_t)); That's a hard to read line of code:) I think this is a bit easier: cl =3D (msgid - mcl->baseid) / (8 * sizeof(access_vector_t)); I suppose this was the plan, but you inserted spaces in the wrong place. --=20 Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --6TrnltStXW4iwmi0 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFDcI9uForvXbEpPzQRAmuuAJ9hdLuPHZYcCDe0qGL3Bup9AU72RgCggQwu nYuIEnMYE1yRTfUPTrap8Ew= =OWHF -----END PGP SIGNATURE----- --6TrnltStXW4iwmi0-- From owner-p4-projects@FreeBSD.ORG Tue Nov 8 14:26:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A73616A421; Tue, 8 Nov 2005 14:26:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC9E816A41F for ; Tue, 8 Nov 2005 14:26:12 +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 93DE343D46 for ; Tue, 8 Nov 2005 14:26:12 +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 jA8EQCqA097301 for ; Tue, 8 Nov 2005 14:26:12 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA8EQCXe097298 for perforce@freebsd.org; Tue, 8 Nov 2005 14:26:12 GMT (envelope-from millert@freebsd.org) Date: Tue, 8 Nov 2005 14:26:12 GMT Message-Id: <200511081426.jA8EQCXe097298@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 86459 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, 08 Nov 2005 14:26:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=86459 Change 86459 by millert@millert_ibook on 2005/11/08 14:25:33 Fix whitespace again. This is what I get for making the change by hand in multiple trees instead of just copying over changed files. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#7 (text+ko) ==== @@ -82,7 +82,7 @@ if (mcl == NULL) return 0; - cl = (msgid-mcl - >baseid) / (8 * sizeof(access_vector_t)); + cl = (msgid - mcl->baseid) / (8 * sizeof(access_vector_t)); if (cl >= mcl->nclasses) return (1); /* bad message, access denied */ From owner-p4-projects@FreeBSD.ORG Tue Nov 8 17:41:36 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2CF516A422; Tue, 8 Nov 2005 17:41: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 826E816A421 for ; Tue, 8 Nov 2005 17:41:35 +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 BD01D43D69 for ; Tue, 8 Nov 2005 17:41:30 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA8HfUD3018641 for ; Tue, 8 Nov 2005 17:41:30 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA8HfU0O018638 for perforce@freebsd.org; Tue, 8 Nov 2005 17:41:30 GMT (envelope-from jhb@freebsd.org) Date: Tue, 8 Nov 2005 17:41:30 GMT Message-Id: <200511081741.jA8HfU0O018638@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 86473 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, 08 Nov 2005 17:41:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=86473 Change 86473 by jhb@jhb_slimer on 2005/11/08 17:40:52 IFC @86472. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#34 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#74 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#51 integrate .. //depot/projects/smpng/sys/alpha/include/smp.h#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/io_apic.c#11 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#49 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#39 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#13 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#11 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#15 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#22 integrate .. //depot/projects/smpng/sys/arm/include/pcpu.h#3 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#13 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#29 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#29 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#13 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#25 integrate .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#21 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#19 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#37 integrate .. //depot/projects/smpng/sys/conf/Makefile.alpha#26 integrate .. //depot/projects/smpng/sys/conf/Makefile.amd64#13 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#14 integrate .. //depot/projects/smpng/sys/conf/Makefile.i386#24 integrate .. //depot/projects/smpng/sys/conf/Makefile.ia64#31 integrate .. //depot/projects/smpng/sys/conf/Makefile.pc98#23 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#32 integrate .. //depot/projects/smpng/sys/conf/Makefile.sparc64#27 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#24 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#23 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscalc.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmisc.c#11 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#41 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#89 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#33 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#29 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#34 integrate .. //depot/projects/smpng/sys/dev/amr/amr_cam.c#15 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#23 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#20 integrate .. //depot/projects/smpng/sys/dev/fb/boot_font.c#5 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#38 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbdevid.h#17 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#25 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#32 integrate .. //depot/projects/smpng/sys/dev/rp/rp.c#21 integrate .. //depot/projects/smpng/sys/dev/si/si_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/si/sireg.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#26 integrate .. //depot/projects/smpng/sys/dev/sound/pci/als4000.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#30 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/ubser.c#11 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#68 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#89 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#88 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#30 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#74 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#91 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#104 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#11 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#79 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#56 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#112 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#82 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#38 integrate .. //depot/projects/smpng/sys/kern/subr_kdb.c#16 integrate .. //depot/projects/smpng/sys/kern/subr_pcpu.c#8 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#40 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#63 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#51 integrate .. //depot/projects/smpng/sys/modules/i2c/controllers/viapm/Makefile#2 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#41 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#23 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#28 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.c#17 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#42 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#38 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#54 integrate .. //depot/projects/smpng/sys/powerpc/include/mmuvar.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/pmap.h#16 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#65 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mmu_if.m#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/mmu_oea.c#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#57 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap_dispatch.c#1 branch .. //depot/projects/smpng/sys/sparc64/include/smp.h#16 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#26 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#55 integrate .. //depot/projects/smpng/sys/sys/mount.h#44 integrate .. //depot/projects/smpng/sys/sys/proc.h#155 integrate .. //depot/projects/smpng/sys/sys/signal.h#21 integrate .. //depot/projects/smpng/sys/sys/signalvar.h#27 integrate .. //depot/projects/smpng/sys/sys/sysent.h#14 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#37 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#67 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#34 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.56 2005/04/04 21:53:51 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.57 2005/11/03 21:08:19 jhb Exp $"); #include "opt_kstack_pages.h" @@ -62,6 +62,7 @@ static struct mtx ap_boot_mtx; u_int64_t boot_cpu_id; +struct pcb stoppcbs[MAXCPU]; static void release_aps(void *dummy); static int smp_cpu_enabled(struct pcs *pcsp); @@ -543,11 +544,12 @@ case IPI_STOP: CTR0(KTR_SMP, "IPI_STOP"); - atomic_set_int(&stopped_cpus, cpumask); + savectx(&stoppcbs[PCPU_GET(cpuid)]); + atomic_set_acq_int(&stopped_cpus, cpumask); while ((started_cpus & cpumask) == 0) - alpha_mb(); - atomic_clear_int(&started_cpus, cpumask); - atomic_clear_int(&stopped_cpus, cpumask); + cpu_spinwait(); + atomic_clear_rel_int(&started_cpus, cpumask); + atomic_clear_rel_int(&stopped_cpus, cpumask); break; } } ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#74 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.182 2005/11/02 08:23:28 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.183 2005/11/04 18:03:23 alc Exp $"); #include #include @@ -186,8 +186,6 @@ #define PMAP_DIAGNOSTIC #endif -#define MINPV 2048 - #if 0 #define PMAP_DIAGNOSTIC #define PMAP_DEBUG @@ -572,28 +570,24 @@ void pmap_init(void) { + int shpgperproc = PMAP_SHPGPERPROC; /* - * init the pv free list + * Initialize the address space (zone) for the pv entries. Set a + * high water mark so that the system can recover from excessive + * numbers of pv entries. */ - pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, + pvzone = uma_zcreate("PV ENTRY", sizeof(struct pv_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); - uma_prealloc(pvzone, MINPV); + TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); + pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + pv_entry_high_water = 9 * (pv_entry_max / 10); } -/* - * Initialize the address space (zone) for the pv_entries. Set a - * high water mark so that the system can recover from excessive - * numbers of pv entries. - */ void pmap_init2() { - int shpgperproc = PMAP_SHPGPERPROC; - - TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + vm_page_array_size; - pv_entry_high_water = 9 * (pv_entry_max / 10); } @@ -1313,8 +1307,7 @@ get_pv_entry(void) { pv_entry_count++; - if (pv_entry_high_water && - (pv_entry_count > pv_entry_high_water) && + if ((pv_entry_count > pv_entry_high_water) && (pmap_pagedaemon_waken == 0)) { pmap_pagedaemon_waken = 1; wakeup (&vm_pages_needed); ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#51 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.188 2005/09/24 16:47:34 wilko Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.189 2005/11/05 19:48:53 marcel Exp $ machine alpha cpu EV4 @@ -143,8 +143,9 @@ device mcclock # MC146818 real time clock device -# Serial (COM) ports (required) +# Serial (COM) ports device sio # 8250, 16[45]50 based serial ports +device uart # Generic UART driver # Parallel port device ppc @@ -155,7 +156,7 @@ # If you've got a "dumb" serial or parallel PCI card that is # supported by the puc(4) glue driver, uncomment the following -# line to enable it (connects to the sio and/or ppc drivers): +# line to enable it (connects to sio, uart and/or ppc drivers): #device puc # PCI Ethernet NICs. ==== //depot/projects/smpng/sys/alpha/include/smp.h#6 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/alpha/include/smp.h,v 1.8 2005/01/05 20:05:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/smp.h,v 1.9 2005/11/03 21:08:19 jhb Exp $ * */ @@ -27,6 +27,7 @@ #ifndef LOCORE extern u_int64_t boot_cpu_id; +extern struct pcb stoppcbs[]; void ipi_selected(u_int cpus, u_int64_t ipi); void ipi_all(u_int64_t ipi); ==== //depot/projects/smpng/sys/amd64/amd64/io_apic.c#11 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.18 2005/11/02 20:11:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.19 2005/11/04 23:02:28 peter Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -65,7 +65,7 @@ #define TODO printf("%s: not implemented!\n", __func__) -static MALLOC_DEFINE(M_IOAPIC, "ioapic", "I/O APIC structures"); +static MALLOC_DEFINE(M_IOAPIC, "io_apic", "I/O APIC structures"); /* * I/O APIC interrupt source driver. Each pin is assigned an IRQ cookie ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#49 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.531 2005/10/31 21:25:33 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.532 2005/11/04 18:03:23 alc Exp $"); /* * Manages physical address maps. @@ -152,8 +152,6 @@ #define PMAP_DIAGNOSTIC #endif -#define MINPV 2048 - #if !defined(PMAP_DIAGNOSTIC) #define PMAP_INLINE __inline #else @@ -567,30 +565,25 @@ void pmap_init(void) { + int shpgperproc = PMAP_SHPGPERPROC; /* - * init the pv free list + * Initialize the address space (zone) for the pv entries. Set a + * high water mark so that the system can recover from excessive + * numbers of pv entries. */ - pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, + pvzone = uma_zcreate("PV ENTRY", sizeof(struct pv_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); - uma_prealloc(pvzone, MINPV); + TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); + pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + pv_entry_high_water = 9 * (pv_entry_max / 10); + uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); } -/* - * Initialize the address space (zone) for the pv_entries. Set a - * high water mark so that the system can recover from excessive - * numbers of pv entries. - */ void pmap_init2() { - int shpgperproc = PMAP_SHPGPERPROC; - - TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + vm_page_array_size; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); - pv_entry_high_water = 9 * (pv_entry_max / 10); - uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); } @@ -1442,8 +1435,7 @@ get_pv_entry(void) { pv_entry_count++; - if (pv_entry_high_water && - (pv_entry_count > pv_entry_high_water) && + if ((pv_entry_count > pv_entry_high_water) && (pmap_pagedaemon_waken == 0)) { pmap_pagedaemon_waken = 1; wakeup (&vm_pages_needed); ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#39 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.445 2005/11/01 22:59:02 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.446 2005/11/05 19:48:53 marcel Exp $ machine amd64 cpu HAMMER @@ -164,6 +164,7 @@ # Serial (COM) ports device sio # 8250, 16[45]50 based serial ports +device uart # Generic UART driver # Parallel port device ppc @@ -175,7 +176,7 @@ # If you've got a "dumb" serial or parallel PCI card that is # supported by the puc(4) glue driver, uncomment the following -# line to enable it (connects to the sio and/or ppc drivers): +# line to enable it (connects to sio, uart and/or ppc drivers): #device puc # PCI Ethernet NICs. ==== //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#13 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.12 2005/10/14 12:43:43 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.13 2005/11/04 20:32:26 ru Exp $"); #include "opt_compat.h" @@ -752,7 +752,7 @@ dst->si_uid = src->si_uid; dst->si_status = src->si_status; dst->si_addr = dst->si_addr; - dst->si_value.sigval_int = src->si_value.sigval_int; + dst->si_value.sigval_int = src->si_value.sival_int; dst->si_band = src->si_band; dst->__spare__[0] = src->si_trapno; } ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.11 2005/10/14 20:22:57 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.12 2005/11/02 21:18:07 ps Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -121,7 +121,7 @@ static void linux_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask); static void exec_linux_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings); -static void linux32_fixlimits(struct image_params *imgp); +static void linux32_fixlimits(struct proc *p); /* * Linux syscalls return negative errno's, we do positive and map them @@ -953,9 +953,8 @@ * XXX copied from ia32_sysvec.c. */ static void -linux32_fixlimits(struct image_params *imgp) +linux32_fixlimits(struct proc *p) { - struct proc *p = imgp->proc; struct plimit *oldlim, *newlim; if (linux32_maxdsiz == 0 && linux32_maxssiz == 0 && ==== //depot/projects/smpng/sys/arm/arm/machdep.c#15 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.18 2005/10/14 12:43:44 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.19 2005/11/06 16:10:28 cognet Exp $"); #include #include @@ -244,6 +244,7 @@ cpu_setup(""); identify_arm_cpu(); thread0.td_frame = (struct trapframe *)pcb->un_32.pcb32_sp - 1; + pmap_postinit(); #ifdef ARM_CACHE_LOCK_ENABLE pmap_kenter_user(ARM_TP_ADDRESS, ARM_TP_ADDRESS); arm_lock_cache_line(ARM_TP_ADDRESS); ==== //depot/projects/smpng/sys/arm/arm/pmap.c#22 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.39 2005/10/23 23:09:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.40 2005/11/06 16:10:28 cognet Exp $"); #include #include #include @@ -398,11 +398,6 @@ */ #define PV_BEEN_REFD(f) (((f) & PVF_REF) != 0) -/* - * Data for the pv entry allocation mechanism - */ -#define MINPV 2048 - #ifndef PMAP_SHPGPERPROC #define PMAP_SHPGPERPROC 200 #endif @@ -1949,6 +1944,7 @@ void pmap_init(void) { + int shpgperproc = PMAP_SHPGPERPROC; PDEBUG(1, printf("pmap_init: phys_start = %08x\n")); @@ -1957,12 +1953,24 @@ */ pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); - uma_prealloc(pvzone, MINPV); /* * Now it is safe to enable pv_table recording. */ PDEBUG(1, printf("pmap_init: done!\n")); + TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); + + pv_entry_max = shpgperproc * maxproc + vm_page_array_size; + pv_entry_high_water = 9 * (pv_entry_max / 10); + l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor, + NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); + l2table_zone = uma_zcreate("L2 Table", sizeof(struct l2_dtable), + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, + UMA_ZONE_VM | UMA_ZONE_NOFREE); + + uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); + uma_zone_set_obj(l2zone, &l2zone_obj, pv_entry_max); + } int @@ -2190,15 +2198,14 @@ return (rv); } -/* - * Initialize the address space (zone) for the pv_entries. Set a - * high water mark so that the system can recover from excessive - * numbers of pv entries. - */ +void +pmap_init2(void) +{ +} + void -pmap_init2() +pmap_postinit(void) { - int shpgperproc = PMAP_SHPGPERPROC; struct l2_bucket *l2b; struct l1_ttable *l1; pd_entry_t *pl1pt; @@ -2206,21 +2213,6 @@ vm_offset_t va, eva; u_int loop, needed; - TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - - pv_entry_max = shpgperproc * maxproc + vm_page_array_size; - pv_entry_high_water = 9 * (pv_entry_max / 10); - l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor, - NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); - uma_prealloc(l2zone, 4096); - l2table_zone = uma_zcreate("L2 Table", sizeof(struct l2_dtable), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, - UMA_ZONE_VM | UMA_ZONE_NOFREE); - uma_prealloc(l2table_zone, 1024); - - uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); - uma_zone_set_obj(l2zone, &l2zone_obj, pv_entry_max); - needed = (maxproc / PMAP_DOMAINS) + ((maxproc % PMAP_DOMAINS) ? 1 : 0); needed -= 1; l1 = malloc(sizeof(*l1) * needed, M_VMPMAP, M_WAITOK); @@ -3787,8 +3779,7 @@ pv_entry_t ret_value; pv_entry_count++; - if (pv_entry_high_water && - (pv_entry_count > pv_entry_high_water) && + if ((pv_entry_count > pv_entry_high_water) && (pmap_pagedaemon_waken == 0)) { pmap_pagedaemon_waken = 1; wakeup (&vm_pages_needed); ==== //depot/projects/smpng/sys/arm/include/pcpu.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27 - * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.2 2004/11/04 19:19:44 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.3 2005/11/08 13:01:29 cognet Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -32,7 +32,6 @@ #ifdef _KERNEL -#include #include #define ALT_STACK_SIZE 128 ==== //depot/projects/smpng/sys/arm/include/pmap.h#13 (text+ko) ==== @@ -44,7 +44,7 @@ * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 * - * $FreeBSD: src/sys/arm/include/pmap.h,v 1.12 2005/10/04 16:29:31 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.13 2005/11/06 16:10:27 cognet Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -509,6 +509,8 @@ extern char *_tmppt; +void pmap_postinit(void); + #ifdef ARM_USE_SMALL_ALLOC void arm_add_smallalloc_pages(void *, void *, int, int); void arm_busy_pages(void); ==== //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#29 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.78 2005/10/16 20:22:36 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.79 2005/11/03 07:35:36 ru Exp $"); #include #include @@ -67,7 +67,12 @@ /* 0x1f is reserved for log2(RB_BOOTINFO). */ /* pass: -a, -s, -r, -d, -c, -v, -h, -C, -g, -m, -p, -D */ -#define RBX_MASK 0x2011ffff +#define RBX_MASK (OPT_SET(RBX_ASKNAME) | OPT_SET(RBX_SINGLE) | \ + OPT_SET(RBX_DFLTROOT) | OPT_SET(RBX_KDB ) | \ + OPT_SET(RBX_CONFIG) | OPT_SET(RBX_VERBOSE) | \ + OPT_SET(RBX_SERIAL) | OPT_SET(RBX_CDROM) | \ + OPT_SET(RBX_GDB ) | OPT_SET(RBX_MUTE) | \ + OPT_SET(RBX_PAUSE) | OPT_SET(RBX_DUAL)) #define PATH_CONFIG "/boot.config" #define PATH_BOOT3 "/boot/loader" @@ -89,7 +94,8 @@ #define TYPE_MAXHARD TYPE_DA #define TYPE_FD 2 -#define OPT_CHECK(opt) ((opts >> (opt)) & 1) +#define OPT_SET(opt) (1 << (opt)) +#define OPT_CHECK(opt) ((opts) & OPT_SET(opt)) extern uint32_t _end; @@ -413,7 +419,7 @@ if (*(uint8_t *)PTOV(0x496) & 0x10) { cp = "yes"; } else { - opts |= 1 << RBX_DUAL | 1 << RBX_SERIAL; + opts |= OPT_SET(RBX_DUAL) | OPT_SET(RBX_SERIAL); cp = "no"; } printf("Keyboard: %s\n", cp); @@ -431,10 +437,10 @@ for (i = 0; c != optstr[i]; i++) if (i == NOPT - 1) return -1; - opts ^= 1 << flags[i]; + opts ^= OPT_SET(flags[i]); } - ioctrl = opts & 1 << RBX_DUAL ? (IO_SERIAL|IO_KEYBOARD) : - opts & 1 << RBX_SERIAL ? IO_SERIAL : IO_KEYBOARD; + ioctrl = OPT_CHECK(RBX_DUAL) ? (IO_SERIAL|IO_KEYBOARD) : + OPT_CHECK(RBX_SERIAL) ? IO_SERIAL : IO_KEYBOARD; if (ioctrl & IO_SERIAL) sio_init(115200 / comspeed); } else { ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#29 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.46 2005/10/31 21:09:56 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.47 2005/11/06 18:12:43 ps Exp $"); #include "opt_compat.h" @@ -1033,7 +1033,7 @@ error = freebsd32_copyoutmsghdr(&msg, uap->msg); if (error == 0) - error = freebsd32_copyoutiov(iov, iov->iov_len, + error = freebsd32_copyoutiov(iov, m32.msg_iovlen, (struct iovec32 *)(uintptr_t)m32.msg_iov, EMSGSIZE); } free(iov, M_IOV); ==== //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#13 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.20 2005/01/29 23:11:58 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.21 2005/11/02 21:18:07 ps Exp $"); #include "opt_compat.h" @@ -93,7 +93,7 @@ #endif static register_t *ia32_copyout_strings(struct image_params *imgp); -static void ia32_fixlimits(struct image_params *imgp); +static void ia32_fixlimits(struct proc *p); extern struct sysent freebsd32_sysent[]; @@ -278,9 +278,8 @@ SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, ""); static void -ia32_fixlimits(struct image_params *imgp) +ia32_fixlimits(struct proc *p) { - struct proc *p = imgp->proc; struct plimit *oldlim, *newlim; if (ia32_maxdsiz == 0 && ia32_maxssiz == 0 && ia32_maxvmem == 0) ==== //depot/projects/smpng/sys/compat/ndis/ndis_var.h#25 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.45 2005/11/02 18:01:04 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.46 2005/11/07 16:57:14 wpaul Exp $ */ #ifndef _NDIS_VAR_H_ @@ -1332,7 +1332,7 @@ typedef struct ndis_packet_pool ndis_packet_pool; /* mbuf ext type for NDIS */ -#define EXT_NDIS 0x999 +#define EXT_NDIS EXT_NET_DRV /* mtx type for NDIS */ #define MTX_NDIS_LOCK "NDIS lock" ==== //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#21 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.41 2005/10/26 06:52:57 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.42 2005/11/06 19:38:33 wpaul Exp $ */ #ifndef _NTOSKRNL_VAR_H_ @@ -1196,6 +1196,7 @@ #define STATUS_MUTANT_NOT_OWNED 0xC0000046 #define STATUS_INVALID_PARAMETER_2 0xC00000F0 #define STATUS_INSUFFICIENT_RESOURCES 0xC000009A +#define STATUS_NOT_FOUND 0xC0000225 #define STATUS_WAIT_0 0x00000000 ==== //depot/projects/smpng/sys/compat/ndis/subr_hal.c#19 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.26 2005/10/21 05:23:20 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.27 2005/11/06 19:38:33 wpaul Exp $"); #include #include @@ -78,6 +78,8 @@ static void READ_PORT_BUFFER_UCHAR(uint8_t *, uint8_t *, uint32_t); static uint64_t KeQueryPerformanceCounter(uint64_t *); +static void _KeLowerIrql(uint8_t); +static uint8_t KeRaiseIrqlToDpcLevel(void); static void dummy (void); #define NDIS_MAXCPUS 64 @@ -370,10 +372,6 @@ { uint8_t oldirql; - /* I am so going to hell for this. */ - if (KeGetCurrentIrql() > DISPATCH_LEVEL) - panic("IRQL_NOT_LESS_THAN_OR_EQUAL"); - KeRaiseIrql(DISPATCH_LEVEL, &oldirql); KeAcquireSpinLockAtDpcLevel(lock); @@ -416,13 +414,16 @@ uint8_t oldirql; oldirql = KeGetCurrentIrql(); - if (irql < oldirql) + + /* I am so going to hell for this. */ + if (oldirql > irql) panic("IRQL_NOT_LESS_THAN"); if (oldirql != DISPATCH_LEVEL) { sched_pin(); mtx_lock(&disp_lock[curthread->td_oncpu]); } +/*printf("RAISE IRQL: %d %d\n", irql, oldirql);*/ return(oldirql); } @@ -443,6 +444,23 @@ return; } +static uint8_t +KeRaiseIrqlToDpcLevel(void) +{ + uint8_t irql; + + KeRaiseIrql(DISPATCH_LEVEL, &irql); + return(irql); +} + +static void +_KeLowerIrql(oldirql) + uint8_t oldirql; +{ + KeLowerIrql(oldirql); + return; +} + static void dummy() { printf ("hal dummy called...\n"); @@ -469,6 +487,9 @@ IMPORT_SFUNC(KeQueryPerformanceCounter, 1), IMPORT_FFUNC(KfLowerIrql, 1), IMPORT_FFUNC(KfRaiseIrql, 1), + IMPORT_SFUNC(KeRaiseIrqlToDpcLevel, 0), +#undef KeLowerIrql + IMPORT_SFUNC_MAP(KeLowerIrql, _KeLowerIrql, 1), /* * This last entry is a catch-all for any function we haven't ==== //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#37 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.81 2005/11/02 18:01:04 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.82 2005/11/06 19:38:33 wpaul Exp $"); #include #include @@ -227,6 +227,10 @@ uint32_t, void *, uint8_t, void **, void **); static void ObfDereferenceObject(void *); static uint32_t ZwClose(ndis_handle); +static uint32_t WmiQueryTraceInformation(uint32_t, void *, uint32_t, + uint32_t, void *); +static uint32_t WmiTraceMessage(uint64_t, uint32_t, void *, uint16_t, ...); +static uint32_t IoWMIRegistrationControl(device_object *, uint32_t); static void *ntoskrnl_memset(void *, int, size_t); static char *ntoskrnl_strstr(char *, char *); static int ntoskrnl_toupper(int); @@ -3336,6 +3340,32 @@ return(STATUS_SUCCESS); } +static uint32_t +WmiQueryTraceInformation(traceclass, traceinfo, infolen, reqlen, buf) + uint32_t traceclass; + void *traceinfo; + uint32_t infolen; + uint32_t reqlen; + void *buf; +{ + return(STATUS_NOT_FOUND); +} + +static uint32_t +WmiTraceMessage(uint64_t loghandle, uint32_t messageflags, + void *guid, uint16_t messagenum, ...) +{ + return(STATUS_SUCCESS); +} + +static uint32_t +IoWMIRegistrationControl(dobj, action) + device_object *dobj; + uint32_t action; +{ + return(STATUS_SUCCESS); +} + /* * This is here just in case the thread returns without calling * PsTerminateSystemThread(). @@ -4215,6 +4245,9 @@ IMPORT_SFUNC(ZwClose, 1), IMPORT_SFUNC(PsCreateSystemThread, 7), IMPORT_SFUNC(PsTerminateSystemThread, 1), + IMPORT_SFUNC(IoWMIRegistrationControl, 2), + IMPORT_SFUNC(WmiQueryTraceInformation, 5), + IMPORT_CFUNC(WmiTraceMessage, 0), /* * This last entry is a catch-all for any function we haven't ==== //depot/projects/smpng/sys/conf/Makefile.alpha#26 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.alpha -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.alpha 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.136 2005/10/27 19:27:54 jhb Exp $ +# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.138 2005/11/04 04:14:49 imp Exp $ # # Makefile for FreeBSD # ==== //depot/projects/smpng/sys/conf/Makefile.amd64#13 (text+ko) ==== @@ -2,7 +2,7 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 -# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.18 2005/10/27 19:27:54 jhb Exp $ +# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.20 2005/11/04 04:14:49 imp Exp $ # # Makefile for FreeBSD # ==== //depot/projects/smpng/sys/conf/Makefile.arm#14 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.14 2005/10/27 19:27:54 jhb Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.16 2005/11/04 04:14:49 imp Exp $ # # Makefile for FreeBSD # ==== //depot/projects/smpng/sys/conf/Makefile.i386#24 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.i386,v 1.266 2005/10/27 19:27:54 jhb Exp $ +# $FreeBSD: src/sys/conf/Makefile.i386,v 1.268 2005/11/04 04:14:49 imp Exp $ # # Makefile for FreeBSD # ==== //depot/projects/smpng/sys/conf/Makefile.ia64#31 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.63 2005/10/27 19:27:54 jhb Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.65 2005/11/04 04:14:49 imp Exp $ # # Makefile for FreeBSD # ==== //depot/projects/smpng/sys/conf/Makefile.pc98#23 (text+ko) ==== @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.168 2005/10/27 19:27:54 jhb Exp $ +# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.170 2005/11/04 04:14:49 imp Exp $ # # Makefile for FreeBSD # ==== //depot/projects/smpng/sys/conf/Makefile.powerpc#32 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.powerpc -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.279 2005/10/27 19:27:54 jhb Exp $ +# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.281 2005/11/04 04:14:49 imp Exp $ # # Makefile for FreeBSD # >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 8 18:54:43 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1622116A421; Tue, 8 Nov 2005 18:54: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 AD07116A41F for ; Tue, 8 Nov 2005 18:54:42 +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 A9CEC43D49 for ; Tue, 8 Nov 2005 18:54:40 +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 jA8Isek6021862 for ; Tue, 8 Nov 2005 18:54:40 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA8IseiU021859 for perforce@freebsd.org; Tue, 8 Nov 2005 18:54:40 GMT (envelope-from jhb@freebsd.org) Date: Tue, 8 Nov 2005 18:54:40 GMT Message-Id: <200511081854.jA8IseiU021859@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 86477 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, 08 Nov 2005 18:54:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=86477 Change 86477 by jhb@jhb_slimer on 2005/11/08 18:54:13 IFC @86474 - loop back vfs_aio cleanups. Affected files ... .. //depot/projects/smpng/sys/kern/vfs_aio.c#64 integrate Differences ... ==== //depot/projects/smpng/sys/kern/vfs_aio.c#64 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.202 2005/11/04 09:39:17 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.203 2005/11/08 17:43:05 jhb Exp $"); #include #include @@ -189,7 +189,7 @@ int inputcharge; int outputcharge; struct buf *bp; /* Buffer pointer */ - struct proc *userproc; /* User process */ /* Not td! */ + struct proc *userproc; /* User process */ struct ucred *cred; /* Active credential when created */ struct file *fd_file; /* Pointer to file structure */ struct aio_liojob *lio; /* Optional lio job */ @@ -401,6 +401,9 @@ * XXX: no unloads by default, it's too dangerous. * perhaps we could do it if locked out callers and then * did an aio_proc_rundown() on each process. + * + * jhb: aio_proc_rundown() needs to run on curproc though, + * so I don't think that would fly. */ if (!unloadable) return (EOPNOTSUPP); @@ -413,6 +416,7 @@ aio_swake = NULL; EVENTHANDLER_DEREGISTER(process_exit, exit_tag); EVENTHANDLER_DEREGISTER(process_exec, exec_tag); + mtx_destroy(&aio_freeproc_mtx); p31b_setcfg(CTL_P1003_1B_AIO_LISTIO_MAX, -1); p31b_setcfg(CTL_P1003_1B_AIO_MAX, -1); p31b_setcfg(CTL_P1003_1B_AIO_PRIO_DELTA_MAX, -1); @@ -486,6 +490,8 @@ panic("aio_free_entry: freeing already free job"); p = aiocbe->userproc; + KASSERT(curthread->td_proc == p, + ("%s: called for non-curproc", __func__)); ki = p->p_aioinfo; lj = aiocbe->lio; if (ki == NULL) @@ -523,15 +529,30 @@ } /* aiocbe is going away, we need to destroy any knotes */ - /* XXXKSE Note the thread here is used to eventually find the - * owning process again, but it is also used to do a fo_close - * and that requires the thread. (but does it require the - * OWNING thread? (or maybe the running thread?) - * There is a semantic problem here... + + /* + * The thread argument here is used to find the owning process + * and is also passed to fo_close() which may pass it to various + * places such as devsw close() routines. Because of that, we + * need a thread pointer from the process owning the job that is + * persistent and won't disappear out from under us or move to + * another process. + * + * Currently, all the callers of this function call it to remove + * an aiocblist from the current process' job list either via a + * syscall or due to the current process calling exit() or + * execve(). Thus, we know that p == curproc. We also know that + * curthread can't exit since we are curthread. + * + * Therefore, we use curthread as the thread to pass to + * knlist_delete(). This does mean that it is possible for the + * thread pointer at close time to differ from the thread pointer + * at open time, but this is already true of file descriptors in + * a multithreaded process. */ if (lj) - knlist_delete(&lj->klist, FIRST_THREAD_IN_PROC(p), 0); /* XXXKSE */ - knlist_delete(&aiocbe->klist, FIRST_THREAD_IN_PROC(p), 0); /* XXXKSE */ + knlist_delete(&lj->klist, curthread, 0); + knlist_delete(&aiocbe->klist, curthread, 0); if ((ki->kaio_flags & KAIO_WAKEUP) || ((ki->kaio_flags & KAIO_RUNDOWN) && ((ki->kaio_buffer_count == 0) && (ki->kaio_queue_count == 0)))) { @@ -594,6 +615,8 @@ struct file *fp; struct socket *so; + KASSERT(curthread->td_proc == p, + ("%s: called on non-curproc", __func__)); ki = p->p_aioinfo; if (ki == NULL) return; @@ -612,9 +635,7 @@ * queues so they are cleaned up with any others. */ s = splnet(); - for (aiocbe = TAILQ_FIRST(&ki->kaio_sockqueue); aiocbe; aiocbe = - aiocbn) { - aiocbn = TAILQ_NEXT(aiocbe, plist); + TAILQ_FOREACH_SAFE(aiocbe, &ki->kaio_sockqueue, plist, aiocbn) { fp = aiocbe->fd_file; if (fp != NULL) { so = fp->f_data; @@ -635,16 +656,13 @@ splx(s); restart1: - for (aiocbe = TAILQ_FIRST(&ki->kaio_jobdone); aiocbe; aiocbe = aiocbn) { - aiocbn = TAILQ_NEXT(aiocbe, plist); + TAILQ_FOREACH_SAFE(aiocbe, &ki->kaio_jobdone, plist, aiocbn) { if (aio_free_entry(aiocbe)) goto restart1; } restart2: - for (aiocbe = TAILQ_FIRST(&ki->kaio_jobqueue); aiocbe; aiocbe = - aiocbn) { - aiocbn = TAILQ_NEXT(aiocbe, plist); + TAILQ_FOREACH_SAFE(aiocbe, &ki->kaio_jobqueue, plist, aiocbn) { if (aio_free_entry(aiocbe)) goto restart2; } @@ -665,8 +683,7 @@ restart4: s = splbio(); - for (aiocbe = TAILQ_FIRST(&ki->kaio_bufdone); aiocbe; aiocbe = aiocbn) { - aiocbn = TAILQ_NEXT(aiocbe, plist); + TAILQ_FOREACH_SAFE(aiocbe, &ki->kaio_bufdone, plist, aiocbn) { if (aio_free_entry(aiocbe)) { splx(s); goto restart4; @@ -684,8 +701,7 @@ TAILQ_FIRST(&ki->kaio_bufdone) != NULL) goto restart1; - for (lj = TAILQ_FIRST(&ki->kaio_liojoblist); lj; lj = ljn) { - ljn = TAILQ_NEXT(lj, lioj_list); + TAILQ_FOREACH_SAFE(lj, &ki->kaio_liojoblist, lioj_list, ljn) { if ((lj->lioj_buffer_count == 0) && (lj->lioj_queue_count == 0)) { TAILQ_REMOVE(&ki->kaio_liojoblist, lj, lioj_list); @@ -718,8 +734,7 @@ struct proc *userp; s = splnet(); - for (aiocbe = TAILQ_FIRST(&aio_jobs); aiocbe; aiocbe = - TAILQ_NEXT(aiocbe, list)) { + TAILQ_FOREACH(aiocbe, &aio_jobs, list) { userp = aiocbe->userproc; ki = userp->p_aioinfo; @@ -1328,8 +1343,7 @@ SOCKBUF_UNLOCK(&so->so_rcv); } - for (cb = TAILQ_FIRST(&so->so_aiojobq); cb; cb = cbn) { - cbn = TAILQ_NEXT(cb, list); + TAILQ_FOREACH_SAFE(cb, &so->so_aiojobq, list, cbn) { if (opcode == cb->uaiocb.aio_lio_opcode) { p = cb->userproc; ki = p->p_aioinfo; @@ -1345,7 +1359,7 @@ while (wakecount--) { mtx_lock(&aio_freeproc_mtx); - if ((aiop = TAILQ_FIRST(&aio_freeproc)) != 0) { + if ((aiop = TAILQ_FIRST(&aio_freeproc)) != NULL) { TAILQ_REMOVE(&aio_freeproc, aiop, list); aiop->aiothreadflags &= ~AIOP_FREE; wakeup(aiop->aiothread); @@ -1363,7 +1377,6 @@ int type, int oldsigev) { struct proc *p = td->td_proc; - struct filedesc *fdp; struct file *fp; unsigned int fd; struct socket *so; @@ -1418,34 +1431,25 @@ aiocbe->uaiocb.aio_lio_opcode = type; opcode = aiocbe->uaiocb.aio_lio_opcode; - /* Get the fd info for process. */ - fdp = p->p_fd; - - /* - * Range check file descriptor. - */ - FILEDESC_LOCK(fdp); + /* Fetch the file object for the specified file descriptor. */ fd = aiocbe->uaiocb.aio_fildes; - if (fd >= fdp->fd_nfiles) { - FILEDESC_UNLOCK(fdp); - uma_zfree(aiocb_zone, aiocbe); - if (type == 0) - suword(&job->_aiocb_private.error, EBADF); - return (EBADF); + switch (opcode) { + case LIO_WRITE: + error = fget_write(td, fd, &fp); + break; + case LIO_READ: + error = fget_read(td, fd, &fp); + break; + default: + error = fget(td, fd, &fp); } - - fp = aiocbe->fd_file = fdp->fd_ofiles[fd]; - if ((fp == NULL) || - ((opcode == LIO_WRITE) && ((fp->f_flag & FWRITE) == 0)) || - ((opcode == LIO_READ) && ((fp->f_flag & FREAD) == 0))) { - FILEDESC_UNLOCK(fdp); + if (error) { uma_zfree(aiocb_zone, aiocbe); if (type == 0) suword(&job->_aiocb_private.error, EBADF); return (EBADF); } - fhold(fp); - FILEDESC_UNLOCK(fdp); + aiocbe->fd_file = fp; if (aiocbe->uaiocb.aio_offset == -1LL) { error = EINVAL; @@ -1484,9 +1488,11 @@ kev.udata = aiocbe->uaiocb.aio_sigevent.sigev_value.sival_ptr; } else goto no_kqueue; - if ((u_int)kev.ident >= fdp->fd_nfiles || - (kq_fp = fdp->fd_ofiles[kev.ident]) == NULL || - (kq_fp->f_type != DTYPE_KQUEUE)) { + error = fget(td, (u_int)kev.ident, &kq_fp); + if (error) + goto aqueue_fail; + if (kq_fp->f_type != DTYPE_KQUEUE) { + fdrop(kq_fp, td); error = EBADF; goto aqueue_fail; } @@ -1496,6 +1502,7 @@ kev.flags = EV_ADD | EV_ENABLE | EV_FLAG1; kev.data = (intptr_t)aiocbe; error = kqueue_register(kq, &kev, td, 1); + fdrop(kq_fp, td); aqueue_fail: if (error) { fdrop(fp, td); @@ -1591,13 +1598,11 @@ ki->kaio_maxactive_count)) { num_aio_resv_start++; mtx_unlock(&aio_freeproc_mtx); - if ((error = aio_newproc()) == 0) { - mtx_lock(&aio_freeproc_mtx); - num_aio_resv_start--; - goto retryproc; - } + error = aio_newproc(); mtx_lock(&aio_freeproc_mtx); num_aio_resv_start--; + if (error) + goto retryproc; } mtx_unlock(&aio_freeproc_mtx); done: @@ -1657,8 +1662,7 @@ s = splbio(); /* aio_physwakeup */ - for (cb = TAILQ_FIRST(&ki->kaio_bufdone); cb; cb = ncb) { - ncb = TAILQ_NEXT(cb, plist); + TAILQ_FOREACH_SAFE(cb, &ki->kaio_bufdone, plist, ncb) { if (((intptr_t) cb->uaiocb._aiocb_private.kernelinfo) == jobref) { break; @@ -1766,8 +1770,7 @@ } s = splbio(); - for (cb = TAILQ_FIRST(&ki->kaio_bufdone); cb; cb = - TAILQ_NEXT(cb, plist)) { + TAILQ_FOREACH(cb, &ki->kaio_bufdone, plist) { for (i = 0; i < njoblist; i++) { if (((intptr_t) cb->uaiocb._aiocb_private.kernelinfo) == @@ -1814,7 +1817,6 @@ struct kaioinfo *ki; struct aiocblist *cbe, *cbn; struct file *fp; - struct filedesc *fdp; struct socket *so; struct proc *po; int s,error; @@ -1822,15 +1824,16 @@ int notcancelled=0; struct vnode *vp; - fdp = p->p_fd; - if ((u_int)uap->fd >= fdp->fd_nfiles || - (fp = fdp->fd_ofiles[uap->fd]) == NULL) - return (EBADF); + /* Lookup file object. */ + error = fget(td, (u_int)uap->fd, &fp); + if (error) + return (error); if (fp->f_type == DTYPE_VNODE) { vp = fp->f_vnode; if (vn_isdisk(vp,&error)) { + fdrop(fp, td); td->td_retval[0] = AIO_NOTCANCELED; return (0); } @@ -1839,8 +1842,7 @@ s = splnet(); - for (cbe = TAILQ_FIRST(&so->so_aiojobq); cbe; cbe = cbn) { - cbn = TAILQ_NEXT(cbe, list); + TAILQ_FOREACH_SAFE(cbe, &so->so_aiojobq, list, cbn) { if ((uap->aiocbp == NULL) || (uap->aiocbp == cbe->uuaiocb) ) { po = cbe->userproc; @@ -1873,17 +1875,17 @@ splx(s); if ((cancelled) && (uap->aiocbp)) { + fdrop(fp, td); td->td_retval[0] = AIO_CANCELED; return (0); } } - ki=p->p_aioinfo; + ki = p->p_aioinfo; if (ki == NULL) goto done; s = splnet(); - for (cbe = TAILQ_FIRST(&ki->kaio_jobqueue); cbe; cbe = cbn) { - cbn = TAILQ_NEXT(cbe, plist); + TAILQ_FOREACH_SAFE(cbe, &ki->kaio_jobqueue, plist, cbn) { if ((uap->fd == cbe->uaiocb.aio_fildes) && ((uap->aiocbp == NULL ) || @@ -1903,6 +1905,7 @@ } splx(s); done: + fdrop(fp, td); if (notcancelled) { td->td_retval[0] = AIO_NOTCANCELED; return (0); @@ -1950,8 +1953,7 @@ s = splnet(); - for (cb = TAILQ_FIRST(&ki->kaio_jobqueue); cb; cb = TAILQ_NEXT(cb, - plist)) { + TAILQ_FOREACH(cb, &ki->kaio_jobqueue, plist) { if (((intptr_t)cb->uaiocb._aiocb_private.kernelinfo) == jobref) { PROC_UNLOCK(p); @@ -1961,8 +1963,7 @@ } } - for (cb = TAILQ_FIRST(&ki->kaio_sockqueue); cb; cb = TAILQ_NEXT(cb, - plist)) { + TAILQ_FOREACH(cb, &ki->kaio_sockqueue, plist) { if (((intptr_t)cb->uaiocb._aiocb_private.kernelinfo) == jobref) { PROC_UNLOCK(p); @@ -1974,8 +1975,7 @@ splx(s); s = splbio(); - for (cb = TAILQ_FIRST(&ki->kaio_bufdone); cb; cb = TAILQ_NEXT(cb, - plist)) { + TAILQ_FOREACH(cb, &ki->kaio_bufdone, plist) { if (((intptr_t)cb->uaiocb._aiocb_private.kernelinfo) == jobref) { PROC_UNLOCK(p); @@ -1985,8 +1985,7 @@ } } - for (cb = TAILQ_FIRST(&ki->kaio_bufqueue); cb; cb = TAILQ_NEXT(cb, - plist)) { + TAILQ_FOREACH(cb, &ki->kaio_bufqueue, plist) { if (((intptr_t)cb->uaiocb._aiocb_private.kernelinfo) == jobref) { PROC_UNLOCK(p); @@ -2119,9 +2118,13 @@ kev.ident = lj->lioj_signal.sigev_notify_kqueue; kev.udata = lj->lioj_signal.sigev_value.sival_ptr; - if ((u_int)kev.ident >= p->p_fd->fd_nfiles || - (kq_fp = p->p_fd->fd_ofiles[kev.ident]) == NULL || - (kq_fp->f_type != DTYPE_KQUEUE)) { + error = fget(td, (u_int)kev.ident, &kq_fp); + if (error) { + uma_zfree(aiolio_zone, lj); + return (error); + } + if (kq_fp->f_type != DTYPE_KQUEUE) { + fdrop(kq_fp, td); uma_zfree(aiolio_zone, lj); return (EBADF); } @@ -2131,6 +2134,7 @@ kev.ident = (uintptr_t)lj; /* something unique */ kev.data = (intptr_t)lj; error = kqueue_register(kq, &kev, td, 1); + fdrop(kq_fp, td); if (error) { uma_zfree(aiolio_zone, lj); return (error); From owner-p4-projects@FreeBSD.ORG Tue Nov 8 20:20:41 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01A7D16A420; Tue, 8 Nov 2005 20:20: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 98FDF16A421 for ; Tue, 8 Nov 2005 20:20:40 +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 2308043D77 for ; Tue, 8 Nov 2005 20:20:36 +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 jA8KKZfT026174 for ; Tue, 8 Nov 2005 20:20:36 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA8KKZ5o026171 for perforce@freebsd.org; Tue, 8 Nov 2005 20:20:35 GMT (envelope-from millert@freebsd.org) Date: Tue, 8 Nov 2005 20:20:35 GMT Message-Id: <200511082020.jA8KKZ5o026171@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 86484 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, 08 Nov 2005 20:20:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=86484 Change 86484 by millert@millert_ibook on 2005/11/08 20:19:58 Don't pass uninitialized data from sebsd_check_ipc_method1() to avc_has_perm_audit() for the audit data. Just send in NULL. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#8 (text+ko) ==== @@ -69,7 +69,6 @@ sebsd_check_ipc_method1(int subj, int obj, int msgid) { struct msgid_classinfo *mcl; - struct av_decision ad; access_vector_t perms; int cl; @@ -88,5 +87,5 @@ perms = (access_vector_t)1 << (msgid - mcl->baseid - (cl * 8 * sizeof(access_vector_t))); - return avc_has_perm_audit(subj, obj, mcl->classes[cl], perms, &ad); + return avc_has_perm_audit(subj, obj, mcl->classes[cl], perms, NULL); } From owner-p4-projects@FreeBSD.ORG Tue Nov 8 20:37:58 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC74616A423; Tue, 8 Nov 2005 20:37: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 93F7D16A420 for ; Tue, 8 Nov 2005 20:37: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 60B0A43D46 for ; Tue, 8 Nov 2005 20:37: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 jA8KbvVB026879 for ; Tue, 8 Nov 2005 20:37:57 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA8Kbvsq026876 for perforce@freebsd.org; Tue, 8 Nov 2005 20:37:57 GMT (envelope-from millert@freebsd.org) Date: Tue, 8 Nov 2005 20:37:57 GMT Message-Id: <200511082037.jA8Kbvsq026876@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 86485 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, 08 Nov 2005 20:37:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=86485 Change 86485 by millert@millert_ibook on 2005/11/08 20:37:41 Revert to stock 10.3.8 ipc_entry.h. The IE_BITS_TYPE_MASK change was only needed for the 10.3.3 label handle implementation. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_entry.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_entry.h#3 (text+ko) ==== @@ -48,14 +48,8 @@ * the rights to redistribute these changes. */ /* - * NOTICE: This file was modified by McAfee Research in 2004 to introduce - * support for mandatory and extensible security protections. This notice - * is included in support of clause 2.2 (b) of the Apple Public License, - * Version 2.0. */ /* - */ -/* * File: ipc/ipc_entry.h * Author: Rich Draves * Date: 1989 @@ -120,7 +114,7 @@ #define IE_BITS_UREFS_MASK 0x0000ffff /* 16 bits of user-reference */ #define IE_BITS_UREFS(bits) ((bits) & IE_BITS_UREFS_MASK) -#define IE_BITS_TYPE_MASK 0x003f0000 /* 6 bits of capability type */ +#define IE_BITS_TYPE_MASK 0x001f0000 /* 5 bits of capability type */ #define IE_BITS_TYPE(bits) ((bits) & IE_BITS_TYPE_MASK) #define IE_BITS_COLLISION 0x00800000 /* 1 bit for collisions */ From owner-p4-projects@FreeBSD.ORG Tue Nov 8 21:44:31 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 708B616A421; Tue, 8 Nov 2005 21:44:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4246916A41F for ; Tue, 8 Nov 2005 21:44:30 +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 A9A5A43D66 for ; Tue, 8 Nov 2005 21:44:18 +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 jA8LiIvL037110 for ; Tue, 8 Nov 2005 21:44:18 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA8LiIV6037107 for perforce@freebsd.org; Tue, 8 Nov 2005 21:44:18 GMT (envelope-from peter@freebsd.org) Date: Tue, 8 Nov 2005 21:44:18 GMT Message-Id: <200511082144.jA8LiIV6037107@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 86488 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, 08 Nov 2005 21:44:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=86488 Change 86488 by peter@peter_daintree on 2005/11/08 21:43:50 IFC @86479 Affected files ... .. //depot/projects/hammer/etc/mtree/BSD.include.dist#36 integrate .. //depot/projects/hammer/lib/libarchive/archive.h.in#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#22 integrate .. //depot/projects/hammer/lib/libarchive/archive_private.h#20 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_compress.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#13 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#25 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#24 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ustar.c#11 integrate .. //depot/projects/hammer/sys/arm/include/pcpu.h#3 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#14 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#15 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#20 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbbdevid.h#12 integrate .. //depot/projects/hammer/sys/dev/rp/rp.c#19 integrate .. //depot/projects/hammer/sys/dev/si/si_pci.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#52 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#49 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#63 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#83 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#36 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#58 integrate .. //depot/projects/hammer/sys/modules/i2c/controllers/viapm/Makefile#2 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#16 integrate .. //depot/projects/hammer/sys/net/if_bridgevar.h#4 integrate .. //depot/projects/hammer/sys/net/if_clone.c#8 integrate .. //depot/projects/hammer/sys/net/if_clone.h#3 integrate .. //depot/projects/hammer/sys/net/if_disc.c#18 integrate .. //depot/projects/hammer/sys/net/if_faith.c#22 integrate .. //depot/projects/hammer/sys/net/if_gif.c#23 integrate .. //depot/projects/hammer/sys/net/if_gre.c#28 integrate .. //depot/projects/hammer/sys/net/if_ppp.c#24 integrate .. //depot/projects/hammer/sys/net/if_stf.c#23 integrate .. //depot/projects/hammer/sys/net/if_var.h#36 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#32 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#22 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#28 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#16 integrate .. //depot/projects/hammer/sys/powerpc/include/mmuvar.h#1 branch .. //depot/projects/hammer/sys/powerpc/include/pmap.h#10 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#39 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/mmu_if.m#1 branch .. //depot/projects/hammer/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap_dispatch.c#1 branch .. //depot/projects/hammer/sys/sys/mount.h#38 integrate .. //depot/projects/hammer/sys/sys/proc.h#90 integrate .. //depot/projects/hammer/sys/sys/signalvar.h#17 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#45 integrate .. //depot/projects/hammer/tools/regression/sigqueue/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/sigqueue/sigqtest2/Makefile#1 branch .. //depot/projects/hammer/tools/regression/sigqueue/sigqtest2/sigqtest2.c#1 branch .. //depot/projects/hammer/usr.sbin/pkg_install/create/create.h#5 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/main.c#5 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/perform.c#7 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/pkg_create.1#11 integrate Differences ... ==== //depot/projects/hammer/etc/mtree/BSD.include.dist#36 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.102 2005/10/03 07:09:40 scottl Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.103 2005/11/08 09:53:28 rwatson Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -48,8 +48,8 @@ .. iicbus .. - lmc - .. + lmc + .. ofw .. pbio ==== //depot/projects/hammer/lib/libarchive/archive.h.in#8 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.25 2005/10/13 05:51:38 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.26 2005/11/08 07:41:03 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -132,6 +132,10 @@ #define ARCHIVE_FORMAT_BASE_MASK 0xff0000U #define ARCHIVE_FORMAT_CPIO 0x10000 #define ARCHIVE_FORMAT_CPIO_POSIX (ARCHIVE_FORMAT_CPIO | 1) +#define ARCHIVE_FORMAT_CPIO_BIN_LE (ARCHIVE_FORMAT_CPIO | 2) +#define ARCHIVE_FORMAT_CPIO_BIN_BE (ARCHIVE_FORMAT_CPIO | 3) +#define ARCHIVE_FORMAT_CPIO_SVR4_NOCRC (ARCHIVE_FORMAT_CPIO | 4) +#define ARCHIVE_FORMAT_CPIO_SVR4_CRC (ARCHIVE_FORMAT_CPIO | 5) #define ARCHIVE_FORMAT_SHAR 0x20000 #define ARCHIVE_FORMAT_SHAR_BASE (ARCHIVE_FORMAT_SHAR | 1) #define ARCHIVE_FORMAT_SHAR_DUMP (ARCHIVE_FORMAT_SHAR | 2) ==== //depot/projects/hammer/lib/libarchive/archive_entry.c#22 (text+ko) ==== @@ -25,10 +25,17 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.32 2005/10/12 03:26:09 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.33 2005/11/08 03:52:42 kientzle Exp $"); #include #include +#ifdef MAJOR_IN_MKDEV +#include +#else +#ifdef MAJOR_IN_SYSMACROS +#include +#endif +#endif #ifdef HAVE_EXT2FS_EXT2_FS_H #include /* for Linux file flags */ #endif ==== //depot/projects/hammer/lib/libarchive/archive_private.h#20 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.20 2005/09/24 21:15:00 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.21 2005/11/08 07:44:39 kientzle Exp $ */ #ifndef ARCHIVE_PRIVATE_H_INCLUDED @@ -157,7 +157,7 @@ int (*read_data_skip)(struct archive *); int (*cleanup)(struct archive *); void *format_data; /* Format-specific data for readers. */ - } formats[4]; + } formats[8]; struct archive_format_descriptor *format; /* Active format. */ /* ==== //depot/projects/hammer/lib/libarchive/archive_read_support_compression_compress.c#4 (text+ko) ==== @@ -65,7 +65,7 @@ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_compress.c,v 1.3 2004/10/17 23:40:10 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_compress.c,v 1.4 2005/11/08 07:42:42 kientzle Exp $"); #include #include @@ -200,6 +200,7 @@ return (ARCHIVE_FATAL); } memset(state, 0, sizeof(*state)); + a->compression_data = state; state->uncompressed_buffer_size = 64 * 1024; state->uncompressed_buffer = malloc(state->uncompressed_buffer_size); @@ -217,12 +218,19 @@ state->avail_out = state->uncompressed_buffer_size; code = getbits(a, state, 8); - if (code != 037) + if (code != 037) /* This should be impossible. */ goto fatal; code = getbits(a, state, 8); - if (code != 0235) + if (code != 0235) { + /* This can happen if the library is receiving 1-byte + * blocks and gzip and compress are both enabled. + * You can't distinguish gzip and compress only from + * the first byte. */ + archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT, + "Compress signature did not match."); goto fatal; + } code = getbits(a, state, 8); state->maxcode_bits = code & 0x1f; @@ -242,8 +250,6 @@ state->suffix[code] = code; } next_code(a, state); - a->compression_data = state; - return (ARCHIVE_OK); fatal: @@ -331,17 +337,19 @@ finish(struct archive *a) { struct private_data *state; - int ret; + int ret = ARCHIVE_OK; state = a->compression_data; - ret = ARCHIVE_OK; - free(state->uncompressed_buffer); - free(state); + if (state != NULL) { + if (state->uncompressed_buffer != NULL) + free(state->uncompressed_buffer); + free(state); + } a->compression_data = NULL; if (a->client_closer != NULL) - (a->client_closer)(a, a->client_data); + ret = (a->client_closer)(a, a->client_data); return (ret); } ==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.14 2005/09/21 04:25:05 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.15 2005/11/08 07:41:03 kientzle Exp $"); #include @@ -317,9 +317,6 @@ const struct cpio_newc_header *header; size_t bytes; - a->archive_format = ARCHIVE_FORMAT_CPIO; - a->archive_format_name = "ASCII cpio (SVR4 with no CRC)"; - /* Read fixed-size portion of header. */ bytes = (a->compression_read_ahead)(a, &h, sizeof(struct cpio_newc_header)); if (bytes < sizeof(struct cpio_newc_header)) @@ -328,6 +325,17 @@ /* Parse out hex fields into struct stat. */ header = h; + + if (memcmp(header->c_magic, "070701", 6) == 0) { + a->archive_format = ARCHIVE_FORMAT_CPIO_SVR4_NOCRC; + a->archive_format_name = "ASCII cpio (SVR4 with no CRC)"; + } else if (memcmp(header->c_magic, "070702", 6) == 0) { + a->archive_format = ARCHIVE_FORMAT_CPIO_SVR4_CRC; + a->archive_format_name = "ASCII cpio (SVR4 with CRC)"; + } else { + /* TODO: Abort here? */ + } + st->st_ino = atol16(header->c_ino, sizeof(header->c_ino)); st->st_mode = atol16(header->c_mode, sizeof(header->c_mode)); st->st_uid = atol16(header->c_uid, sizeof(header->c_uid)); @@ -360,7 +368,7 @@ const struct cpio_odc_header *header; size_t bytes; - a->archive_format = ARCHIVE_FORMAT_CPIO; + a->archive_format = ARCHIVE_FORMAT_CPIO_POSIX; a->archive_format_name = "POSIX octet-oriented cpio"; /* Read fixed-size portion of header. */ @@ -404,7 +412,7 @@ const struct cpio_bin_header *header; size_t bytes; - a->archive_format = ARCHIVE_FORMAT_CPIO; + a->archive_format = ARCHIVE_FORMAT_CPIO_BIN_LE; a->archive_format_name = "cpio (little-endian binary)"; /* Read fixed-size portion of header. */ @@ -441,7 +449,7 @@ const struct cpio_bin_header *header; size_t bytes; - a->archive_format = ARCHIVE_FORMAT_CPIO; + a->archive_format = ARCHIVE_FORMAT_CPIO_BIN_BE; a->archive_format_name = "cpio (big-endian binary)"; /* Read fixed-size portion of header. */ ==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.11 2005/11/06 23:38:01 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.12 2005/11/08 07:41:03 kientzle Exp $"); #include @@ -302,10 +302,7 @@ iso9660 = *(a->pformat_data); - if (iso9660->seenRockridge) { - a->archive_format = ARCHIVE_FORMAT_ISO9660_ROCKRIDGE; - a->archive_format_name = "ISO9660 with Rockridge extensions"; - } else { + if (!a->archive_format) { a->archive_format = ARCHIVE_FORMAT_ISO9660; a->archive_format_name = "ISO9660"; } @@ -402,6 +399,12 @@ continue; child = parse_file_info(iso9660, file, dr); add_entry(iso9660, child); + if (iso9660->seenRockridge) { + a->archive_format = + ARCHIVE_FORMAT_ISO9660_ROCKRIDGE; + a->archive_format_name = + "ISO9660 with Rockridge extensions"; + } } } } ==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#25 (text+ko) ==== @@ -25,9 +25,16 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.38 2005/10/12 15:38:45 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.39 2005/11/08 03:52:42 kientzle Exp $"); #include +#ifdef MAJOR_IN_MKDEV +#include +#else +#ifdef MAJOR_IN_SYSMACROS +#include +#endif +#endif #include #include /* #include */ /* See archive_platform.h */ ==== //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#24 (text+ko) ==== @@ -25,9 +25,16 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.31 2005/10/12 03:26:09 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.32 2005/11/08 03:52:42 kientzle Exp $"); #include +#ifdef MAJOR_IN_MKDEV +#include +#else +#ifdef MAJOR_IN_SYSMACROS +#include +#endif +#endif #include #include #include ==== //depot/projects/hammer/lib/libarchive/archive_write_set_format_ustar.c#11 (text+ko) ==== @@ -25,9 +25,16 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ustar.c,v 1.13 2005/09/21 04:25:06 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ustar.c,v 1.14 2005/11/08 03:52:42 kientzle Exp $"); #include +#ifdef MAJOR_IN_MKDEV +#include +#else +#ifdef MAJOR_IN_SYSMACROS +#include +#endif +#endif #include #include #include ==== //depot/projects/hammer/sys/arm/include/pcpu.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27 - * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.2 2004/11/04 19:19:44 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.3 2005/11/08 13:01:29 cognet Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -32,7 +32,6 @@ #ifdef _KERNEL -#include #include #define ALT_STACK_SIZE 128 ==== //depot/projects/hammer/sys/conf/files.powerpc#14 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.44 2005/06/12 00:47:21 marcel Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.45 2005/11/08 06:48:08 grehan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -45,12 +45,14 @@ powerpc/powerpc/intr_machdep.c standard powerpc/powerpc/locore.S standard no-obj powerpc/powerpc/machdep.c standard +powerpc/powerpc/mmu_if.m standard +powerpc/powerpc/mmu_oea.c standard powerpc/powerpc/nexus.c standard powerpc/powerpc/ofwmagic.S standard powerpc/powerpc/ofw_machdep.c standard powerpc/powerpc/openpic.c standard powerpc/powerpc/pic_if.m standard -powerpc/powerpc/pmap.c standard +powerpc/powerpc/pmap_dispatch.c standard powerpc/powerpc/sc_machdep.c optional sc powerpc/powerpc/setjmp.S standard powerpc/powerpc/sigcode.S standard ==== //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#15 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.16 2005/10/12 19:52:15 thompsa Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.17 2005/11/08 20:08:33 thompsa Exp $ */ /* $OpenBSD: if_pflog.c,v 1.12 2004/05/19 17:50:51 dhartmei Exp $ */ /* @@ -369,9 +369,6 @@ case MOD_UNLOAD: if_clone_detach(&pflog_cloner); - while (!LIST_EMPTY(&pflog_list)) - ifc_simple_destroy(&pflog_cloner, - SCP2IFP(LIST_FIRST(&pflog_list))); break; default: ==== //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#20 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.24 2005/10/12 19:52:15 thompsa Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.25 2005/11/08 20:08:33 thompsa Exp $ */ /* $OpenBSD: if_pfsync.c,v 1.46 2005/02/20 15:58:38 mcbride Exp $ */ /* @@ -1851,9 +1851,6 @@ case MOD_UNLOAD: if_clone_detach(&pfsync_cloner); - while (!LIST_EMPTY(&pfsync_list)) - ifc_simple_destroy(&pfsync_cloner, - SCP2IFP(LIST_FIRST(&pfsync_list))); break; default: ==== //depot/projects/hammer/sys/dev/pccbb/pccbbdevid.h#12 (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/dev/pccbb/pccbbdevid.h,v 1.21 2005/09/29 20:41:04 imp Exp $ + * $FreeBSD: src/sys/dev/pccbb/pccbbdevid.h,v 1.22 2005/11/08 15:42:12 imp Exp $ */ /* Vendor/Device IDs */ @@ -30,12 +30,12 @@ #define PCIC_ID_CLPD6832 0x11101013ul #define PCIC_ID_CLPD6833 0x11131013ul #define PCIC_ID_CLPD6834 0x11121013ul -#define PCIC_ID_ENE_CB710 0x14111524ul -#define PCIC_ID_ENE_CB720 0x14211524ul /* ??? */ -#define PCIC_ID_ENE_CB1211 0x12111524ul /* ??? */ -#define PCIC_ID_ENE_CB1225 0x12251524ul /* ??? */ -#define PCIC_ID_ENE_CB1410 0x14101524ul -#define PCIC_ID_ENE_CB1420 0x14201524ul +#define PCIC_ID_ENE_CB710 0x14111524ul +#define PCIC_ID_ENE_CB720 0x14211524ul /* ??? */ +#define PCIC_ID_ENE_CB1211 0x12111524ul /* ??? */ +#define PCIC_ID_ENE_CB1225 0x12251524ul /* ??? */ +#define PCIC_ID_ENE_CB1410 0x14101524ul +#define PCIC_ID_ENE_CB1420 0x14201524ul #define PCIC_ID_INTEL_82092AA_0 0x12218086ul /* 16bit I/O */ #define PCIC_ID_INTEL_82092AA_1 0x12228086ul /* 16bit I/O */ #define PCIC_ID_OMEGA_82C094 0x1221119bul /* 16bit I/O */ @@ -47,12 +47,12 @@ #define PCIC_ID_OZ6912 0x69721217ul /* Also 6972 */ #define PCIC_ID_OZ6922 0x69251217ul #define PCIC_ID_OZ6933 0x69331217ul -#define PCIC_ID_OZ711EC1 0x71121217ul /* O2Micro 711EC1/M1 */ -#define PCIC_ID_OZ711E1 0x71131217ul /* O2Micro 711E1 */ +#define PCIC_ID_OZ711EC1 0x71121217ul /* O2Micro 711EC1/M1 */ +#define PCIC_ID_OZ711E1 0x71131217ul /* O2Micro 711E1 */ #define PCIC_ID_OZ711M1 0x71141217ul /* O2Micro 711M1 */ -#define PCIC_ID_OZ711E2 0x71e21217ul -#define PCIC_ID_OZ711M2 0x72121217ul -#define PCIC_ID_OZ711M3 0x72231217ul +#define PCIC_ID_OZ711E2 0x71e21217ul +#define PCIC_ID_OZ711M2 0x72121217ul +#define PCIC_ID_OZ711M3 0x72231217ul #define PCIC_ID_RICOH_RL5C465 0x04651180ul #define PCIC_ID_RICOH_RL5C466 0x04661180ul #define PCIC_ID_RICOH_RL5C475 0x04751180ul @@ -78,25 +78,25 @@ #define PCIC_ID_TI1421 0xac53104cul /* never sold */ #define PCIC_ID_TI1450 0xac1b104cul #define PCIC_ID_TI1451 0xac52104cul -#define PCIC_ID_TI1510 0xac56104cul -#define PCIC_ID_TI1515 0xac58104cul -#define PCIC_ID_TI1520 0xac55104cul -#define PCIC_ID_TI1530 0xac57104cul -#define PCIC_ID_TI1620 0xac54104cul +#define PCIC_ID_TI1510 0xac56104cul +#define PCIC_ID_TI1515 0xac58104cul +#define PCIC_ID_TI1520 0xac55104cul +#define PCIC_ID_TI1530 0xac57104cul +#define PCIC_ID_TI1620 0xac54104cul #define PCIC_ID_TI4410 0xac41104cul #define PCIC_ID_TI4450 0xac40104cul #define PCIC_ID_TI4451 0xac42104cul -#define PCIC_ID_TI4510 0xac44104cul -#define PCIC_ID_TI4520 0xac46104cul -#define PCIC_ID_TI6411 0x8031104cul /* PCI[67]x[12]1 */ -#define PCIC_ID_TI6420 0xac8d104cul /* PCI[67]x20 Smartcard dis */ -#define PCIC_ID_TI6420SC 0xac8e104cul /* PCI[67]x20 Smartcard en */ -#define PCIC_ID_TI7410 0xac49104cul -#define PCIC_ID_TI7510 0xac47104cul -#define PCIC_ID_TI7610 0xac48104cul -#define PCIC_ID_TI7610M 0xac4a104cul -#define PCIC_ID_TI7610SD 0xac4b104cul -#define PCIC_ID_TI7610MS 0xac4c104cul +#define PCIC_ID_TI4510 0xac44104cul +#define PCIC_ID_TI4520 0xac46104cul +#define PCIC_ID_TI6411 0x8031104cul /* PCI[67]x[12]1 */ +#define PCIC_ID_TI6420 0xac8d104cul /* PCI[67]x20 Smartcard dis */ +#define PCIC_ID_TI6420SC 0xac8e104cul /* PCI[67]x20 Smartcard en */ +#define PCIC_ID_TI7410 0xac49104cul +#define PCIC_ID_TI7510 0xac47104cul +#define PCIC_ID_TI7610 0xac48104cul +#define PCIC_ID_TI7610M 0xac4a104cul +#define PCIC_ID_TI7610SD 0xac4b104cul +#define PCIC_ID_TI7610MS 0xac4c104cul #define PCIC_ID_TOPIC95 0x06031179ul #define PCIC_ID_TOPIC95B 0x060a1179ul #define PCIC_ID_TOPIC97 0x060f1179ul ==== //depot/projects/hammer/sys/dev/rp/rp.c#19 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/rp/rp.c,v 1.69 2005/10/16 20:35:05 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/rp/rp.c,v 1.70 2005/11/08 15:33:39 jhb Exp $"); /* * rp.c - for RocketPort FreeBSD @@ -826,7 +826,7 @@ rp->rp_cts = (ChanStatus & CTS_ACT) != 0; line = (unit << 5) | (aiop << 3) | chan; rp_table(line) = rp; - ttycreate(tp, TS_CALLOUT, "R%r", port); + ttycreate(tp, TS_CALLOUT, "R%r%r", unit, port); } } ==== //depot/projects/hammer/sys/dev/si/si_pci.c#6 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/si/si_pci.c,v 1.7 2005/03/01 08:58:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/si/si_pci.c,v 1.8 2005/11/08 04:11:50 rodrigc Exp $"); #include #include @@ -33,6 +33,7 @@ #include #include +#include #include static int ==== //depot/projects/hammer/sys/kern/kern_exit.c#52 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.270 2005/11/01 17:13:05 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.272 2005/11/08 17:11:03 csjp Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -118,7 +118,7 @@ struct ucred *tracecred; #endif struct plimit *plim; - int refcnt; + int locked, refcnt; /* * Drop Giant if caller has it. Eventually we should warn about @@ -173,6 +173,11 @@ } p->p_flag |= P_WEXIT; + + PROC_LOCK(p->p_pptr); + sigqueue_take(p->p_ksi); + PROC_UNLOCK(p->p_pptr); + PROC_UNLOCK(p); /* Are we a task leader? */ @@ -298,13 +303,13 @@ vm_map_max(&vm->vm_map)); } - mtx_lock(&Giant); sx_xlock(&proctree_lock); if (SESS_LEADER(p)) { struct session *sp; sp = p->p_session; if (sp->s_ttyvp) { + locked = VFS_LOCK_GIANT(sp->s_ttyvp->v_mount); /* * Controlling process. * Signal foreground pgrp, @@ -350,6 +355,7 @@ * that the session once had a controlling terminal. * (for logging and informational purposes) */ + VFS_UNLOCK_GIANT(locked); } SESS_LOCK(p->p_session); sp->s_leader = NULL; @@ -358,7 +364,6 @@ fixjobc(p, p->p_pgrp, 0); sx_xunlock(&proctree_lock); (void)acct_process(td); - mtx_unlock(&Giant); #ifdef KTRACE /* * release trace file @@ -373,9 +378,9 @@ mtx_unlock(&ktrace_mtx); PROC_UNLOCK(p); if (tracevp != NULL) { - mtx_lock(&Giant); + locked = VFS_LOCK_GIANT(tracevp->v_mount); vrele(tracevp); - mtx_unlock(&Giant); + VFS_UNLOCK_GIANT(locked); } if (tracecred != NULL) crfree(tracecred); @@ -385,9 +390,9 @@ */ if ((vtmp = p->p_textvp) != NULL) { p->p_textvp = NULL; - mtx_lock(&Giant); + locked = VFS_LOCK_GIANT(vtmp->v_mount); vrele(vtmp); - mtx_unlock(&Giant); + VFS_UNLOCK_GIANT(locked); } /* @@ -480,8 +485,12 @@ if (p->p_pptr == initproc) psignal(p->p_pptr, SIGCHLD); - else if (p->p_sigparent != 0) - psignal(p->p_pptr, p->p_sigparent); + else if (p->p_sigparent != 0) { + if (p->p_sigparent == SIGCHLD) + childproc_exited(p); + else /* LINUX thread */ + psignal(p->p_pptr, p->p_sigparent); + } PROC_UNLOCK(p->p_pptr); /* @@ -659,6 +668,10 @@ calcru(p, &rusage->ru_utime, &rusage->ru_stime); } + PROC_LOCK(q); + sigqueue_take(p->p_ksi); + PROC_UNLOCK(q); + /* * If we got the child via a ptrace 'attach', * we need to give it back to the old parent. @@ -669,7 +682,7 @@ p->p_oppid = 0; proc_reparent(p, t); PROC_UNLOCK(p); - psignal(t, SIGCHLD); + tdsignal(t, NULL, SIGCHLD, p->p_ksi); wakeup(t); PROC_UNLOCK(t); sx_xunlock(&proctree_lock); @@ -751,6 +764,11 @@ if (status) *status = W_STOPCODE(p->p_xstat); PROC_UNLOCK(p); + + PROC_LOCK(q); + sigqueue_take(p->p_ksi); + PROC_UNLOCK(q); + return (0); } mtx_unlock_spin(&sched_lock); @@ -760,6 +778,10 @@ p->p_flag &= ~P_CONTINUED; PROC_UNLOCK(p); + PROC_LOCK(q); + sigqueue_take(p->p_ksi); + PROC_UNLOCK(q); + if (status) *status = SIGCONT; return (0); ==== //depot/projects/hammer/sys/kern/kern_proc.c#49 (text+ko) ==== @@ -27,11 +27,11 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.7 (Berkeley) 2/14/95 - * $FreeBSD: src/sys/kern/kern_proc.c,v 1.233 2005/10/24 20:15:23 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_proc.c,v 1.234 2005/11/08 09:09:26 davidxu Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.233 2005/10/24 20:15:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.234 2005/11/08 09:09:26 davidxu Exp $"); #include "opt_ktrace.h" #include "opt_kstack_pages.h" @@ -165,6 +165,8 @@ */ if (((p->p_flag & P_KTHREAD) != 0) && (td->td_altkstack != 0)) vm_thread_dispose_altkstack(td); + if (p->p_ksi != NULL) + KASSERT(! KSI_ONQ(p->p_ksi), ("SIGCHLD queue")); } /* @@ -204,6 +206,8 @@ ksegrp_free(FIRST_KSEGRP_IN_PROC(p)); thread_free(FIRST_THREAD_IN_PROC(p)); mtx_destroy(&p->p_mtx); + if (p->p_ksi != NULL) + ksiginfo_free(p->p_ksi); #else panic("proc reclaimed"); #endif ==== //depot/projects/hammer/sys/kern/kern_sig.c#63 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.311 2005/11/04 09:39:17 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.312 2005/11/08 09:09:26 davidxu Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -214,10 +214,15 @@ } ksiginfo_t * -ksiginfo_alloc(void) +ksiginfo_alloc(int wait) { + int flags; + + flags = M_ZERO; + if (! wait) + flags |= M_NOWAIT; if (ksiginfo_zone != NULL) - return ((ksiginfo_t *)uma_zalloc(ksiginfo_zone, M_NOWAIT | M_ZERO)); + return ((ksiginfo_t *)uma_zalloc(ksiginfo_zone, flags)); return (NULL); } @@ -291,7 +296,7 @@ struct proc *p; sigqueue_t *sq; - if ((sq = ksi->ksi_sigq) == NULL) + if (ksi == NULL || (sq = ksi->ksi_sigq) == NULL) return; p = sq->sq_proc; @@ -331,10 +336,10 @@ if (__predict_false(ksiginfo_zone == NULL)) goto out_set_bit; - if (p != NULL && p->p_pendingcnt > max_pending_per_proc) { + if (p != NULL && p->p_pendingcnt >= max_pending_per_proc) { signal_overflow++; ret = EAGAIN; - } else if ((ksi = ksiginfo_alloc()) == NULL) { + } else if ((ksi = ksiginfo_alloc(0)) == NULL) { signal_alloc_fail++; ret = EAGAIN; } else { @@ -2106,7 +2111,12 @@ return (ret); } sigqueue_delete_proc(p, SIGCONT); - p->p_flag &= ~P_CONTINUED; + if (p->p_flag & P_CONTINUED) { + p->p_flag &= ~P_CONTINUED; + PROC_LOCK(p->p_pptr); + sigqueue_take(p->p_ksi); + PROC_UNLOCK(p->p_pptr); + } } ret = sigqueue_add(sigqueue, sig, ksi); @@ -2174,7 +2184,10 @@ * Otherwise, process goes back to sleep state. */ p->p_flag &= ~P_STOPPED_SIG; - p->p_flag |= P_CONTINUED; + if (p->p_numthreads == p->p_suspcount) { + p->p_flag |= P_CONTINUED; + childproc_continued(p); + } if (action == SIG_DFL) { sigqueue_delete(sigqueue, sig); } else if (action == SIG_CATCH) { @@ -2249,12 +2262,19 @@ (td0->td_flags & TDF_SINTR) && !TD_IS_SUSPENDED(td0)) { thread_suspend_one(td0); - } else if (td != td0) { + } else { td0->td_flags |= TDF_ASTPENDING; } } - thread_stopped(p); if (p->p_numthreads == p->p_suspcount) { + /* + * only thread sending signal to another + * process can reach here, if thread is sending + * signal to its process, because thread does + * not suspend itself here, p_numthreads + * should never be equal to p_suspcount. + */ + thread_stopped(p); mtx_unlock_spin(&sched_lock); sigqueue_delete_proc(p, p->p_xstat); } else @@ -2646,7 +2666,9 @@ mtx_lock(&ps->ps_mtx); if ((ps->ps_flag & PS_NOCLDSTOP) == 0) { mtx_unlock(&ps->ps_mtx); - psignal(p->p_pptr, SIGCHLD); + childproc_stopped(p, + (p->p_flag & P_TRACED) ? + CLD_TRAPPED : CLD_STOPPED); } else mtx_unlock(&ps->ps_mtx); PROC_UNLOCK(p->p_pptr); @@ -2826,6 +2848,61 @@ /* NOTREACHED */ } +/* + * Send queued SIGCHLD to parent when child process is stopped + * or exited. + */ +void +childproc_stopped(struct proc *p, int reason) +{ + PROC_LOCK_ASSERT(p, MA_OWNED); + PROC_LOCK_ASSERT(p->p_pptr, MA_OWNED); + + if (p->p_ksi != NULL) { + p->p_ksi->ksi_signo = SIGCHLD; + p->p_ksi->ksi_code = reason; + p->p_ksi->ksi_status = p->p_xstat; + p->p_ksi->ksi_pid = p->p_pid; + p->p_ksi->ksi_uid = p->p_ucred->cr_ruid; + if (KSI_ONQ(p->p_ksi)) + return; + } + tdsignal(p->p_pptr, NULL, SIGCHLD, p->p_ksi); +} + +void +childproc_continued(struct proc *p) +{ + PROC_LOCK_ASSERT(p, MA_OWNED); + PROC_LOCK_ASSERT(p->p_pptr, MA_NOTOWNED); + + PROC_LOCK(p->p_pptr); + if (p->p_ksi != NULL) { + p->p_ksi->ksi_signo = SIGCHLD; + p->p_ksi->ksi_code = CLD_CONTINUED; + p->p_ksi->ksi_status = SIGCONT; + p->p_ksi->ksi_pid = p->p_pid; + p->p_ksi->ksi_uid = p->p_ucred->cr_ruid; + if (KSI_ONQ(p->p_ksi)) + return; + } + tdsignal(p->p_pptr, NULL, SIGCHLD, p->p_ksi); + PROC_UNLOCK(p->p_pptr); +} + +void +childproc_exited(struct proc *p) +{ + int reason; + + reason = CLD_EXITED; + if (WCOREDUMP(p->p_xstat)) + reason = CLD_DUMPED; + else if (WIFSIGNALED(p->p_xstat)) + reason = CLD_KILLED; + childproc_stopped(p, reason); +} + static char corefilename[MAXPATHLEN] = {"%N.core"}; SYSCTL_STRING(_kern, OID_AUTO, corefile, CTLFLAG_RW, corefilename, sizeof(corefilename), "process corefile name format string"); ==== //depot/projects/hammer/sys/kern/kern_thread.c#83 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.221 2005/11/03 01:34:08 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.222 2005/11/08 09:09:26 davidxu Exp $"); #include #include @@ -78,6 +78,12 @@ struct mtx kse_zombie_lock; MTX_SYSINIT(kse_zombie_lock, &kse_zombie_lock, "kse zombie lock", MTX_SPIN); +static int queue_sigchild = 0; +SYSCTL_DECL(_kern_sigqueue); +SYSCTL_INT(_kern_sigqueue, OID_AUTO, queue_sigchild, CTLFLAG_RD, + &queue_sigchild, 0, "queue SIGCHILD"); +TUNABLE_INT("kern.sigqueue.queue_sigchild", &queue_sigchild); + static int sysctl_kse_virtual_cpu(SYSCTL_HANDLER_ARGS) { @@ -278,6 +284,15 @@ TAILQ_INIT(&p->p_threads); /* all threads in proc */ TAILQ_INIT(&p->p_suspended); /* Threads suspended */ sigqueue_init(&p->p_sigqueue, p); + if (queue_sigchild) { + p->p_ksi = ksiginfo_alloc(1); + if (p->p_ksi != NULL) { + /* p_ksi may be null if ksiginfo zone is not ready */ + p->p_ksi->ksi_flags = KSI_EXT | KSI_INS; + } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 9 01:08:45 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 413AD16A421; Wed, 9 Nov 2005 01:08: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 F02F516A41F for ; Wed, 9 Nov 2005 01:08: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 BA9F043D45 for ; Wed, 9 Nov 2005 01:08: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 jA918ivj055143 for ; Wed, 9 Nov 2005 01:08:44 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA918iAn055140 for perforce@freebsd.org; Wed, 9 Nov 2005 01:08:44 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 9 Nov 2005 01:08:44 GMT Message-Id: <200511090108.jA918iAn055140@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 86498 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, 09 Nov 2005 01:08:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=86498 Change 86498 by soc-andrew@soc-andrew_serv on 2005/11/09 01:07:48 Allow the ports tree to be installed Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#4 edit .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/431_ports.lua#1 add .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/Makefile#5 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#4 (text+ko) ==== @@ -83,6 +83,18 @@ -- App.state.target:cmds_install_srcs(cmds, App.conf.install_items) + if App.conf.install_ports == true then + cmds:add{ + cmdline = "${root}${TAR} -x " .. + "-f ${root}usr/${uname}/ports/ports.tgz ".. + "-C ${root}${base}/usr", + replacements = { + base = base, + uname = posix.uname("%r") + } + } + end + -- -- Remove any databases that might have been copied over but -- will no longer be accurate, e.g. the installed-package database. ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/Makefile#5 (text+ko) ==== @@ -10,7 +10,7 @@ 900_reboot.lua main.lua # Local scripts -FILES+= 430_select_dists.lua +FILES+= 430_select_dists.lua 431_ports.lua FILESDIR= ${INST_DIR}/install From owner-p4-projects@FreeBSD.ORG Wed Nov 9 12:07:32 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C931516A421; Wed, 9 Nov 2005 12:07:31 +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 6B3ED16A41F for ; Wed, 9 Nov 2005 12:07:31 +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 E7D7C43D46 for ; Wed, 9 Nov 2005 12:07:30 +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 jA9C7Ugx029686 for ; Wed, 9 Nov 2005 12:07:30 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 jA9C74cX029321 for perforce@freebsd.org; Wed, 9 Nov 2005 12:07:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 9 Nov 2005 12:07:04 GMT Message-Id: <200511091207.jA9C74cX029321@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 86525 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, 09 Nov 2005 12:07:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=86525 Change 86525 by rwatson@rwatson_zoo on 2005/11/09 12:06:14 Integrate TrustedBSD base from FreeBSD CVS: - bsnmp update - groff update, including FSF address change - smbfs can set tcp/nb ports - pfsync in rc.conf - bluetooth in rc.conf - pccard becomes rc.d'd. - lmc driver - ppp-user -> ppp - setkey to /sbin - wpa_supplicant ndis support - now FreeBSD 7.x - pthread timers, process shared mutexes, timed join - libc_r not built by default any longer - libkvm fixes - lots of libm fixes - picobsd image uses if_bridge rather than options BRIDGE - IP_DONTFRAG - atomic_fetchadd - intr_event - general cleanup of interrupt path, fast interrupt sharing, fewer ithreads, etc. - realtime signal support: queueing, etc. - uprintf, tprintf acquire Giant - STOP_NMI not KDB_STOP_NMI; now default. - malloc type renaming - freebsd32 compatibility: uio, signal, clock work - More NDIS evil. - config 600003 - nocpu, DEFAULTS, etc. - ACPI update. - DDB alltrace, show malloc, show allpcpu, show uma. - aac, amr, ata, if_ed, if_sis, if_vr, if_wb, pcm updates. - if_cp, if_ct, if_cx style - if_txp, if_vx mpsafe - countless vfs-related bug fixes - device polling configured more using interface capability flags - some tty normalization - mandatory mbuf external storage refcounting using uma, MT_HEADER normalization. - solisten passes backlog to protocol - aio cleanup - net.isr.direct - netgraph topology mutex and queueing work - more IFF_NEEDSGIANT support for multicast - much neighbor discovery and ipv6 address tweakage - loop back mac_seeotheruids privileged exception - mac_process mpsafety for VM - all the other usual array of bug fixes, driver updates, doc cleanups, etc. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#33 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#65 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#3 integrate .. //depot/projects/trustedbsd/base/UPDATING#59 integrate .. //depot/projects/trustedbsd/base/bin/date/date.1#13 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.1#12 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.c#16 integrate .. //depot/projects/trustedbsd/base/bin/sh/eval.c#12 integrate .. //depot/projects/trustedbsd/base/bin/sh/exec.c#13 integrate .. //depot/projects/trustedbsd/base/bin/sh/exec.h#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/histedit.c#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/memalloc.c#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/memalloc.h#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/miscbltin.c#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/options.c#10 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#22 integrate .. //depot/projects/trustedbsd/base/contrib/bc/bc/main.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/NEWS#9 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/VERSION#9 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmpdef/gensnmpdef.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/bsnmpagent.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/bsnmpclient.3#8 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/bsnmplib.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpagent.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpclient.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/snmp_mibII.3#8 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_ntp/snmp_ntp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/.gdbinit#2 delete .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/bsnmpd.1#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/config.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/main.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpmod.3#8 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpmod.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/trans_udp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/trap.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/cpio/ABOUT-NLS#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/AUTHORS#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/COPYING#2 integrate .. //depot/projects/trustedbsd/base/contrib/cpio/COPYING.LIB#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/cpio/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/base/contrib/cpio/INSTALL#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/NEWS#2 integrate .. //depot/projects/trustedbsd/base/contrib/cpio/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/cpio/THANKS#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/TODO#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/alloca.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/copyin.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/copyout.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/copypass.c#3 delete .. //depot/projects/trustedbsd/base/contrib/cpio/cpio.1#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/cpio.h#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/cpio.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/cpiohdr.h#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/defer.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/defer.h#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/dirname.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/doc/cpio.1#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/doc/cpio.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/dstring.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/dstring.h#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/error.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/extern.h#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/filemode.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/filetypes.h#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/global.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/idcache.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/lib/alloca_.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/argp-ba.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/argp-eexst.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/argp-fmtstream.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/argp-fmtstream.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/argp-fs-xinl.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/argp-help.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/argp-namefrob.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/argp-parse.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/argp-pv.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/argp-pvh.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/argp-xinl.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/argp.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/basename.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/dirname.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/dirname.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/error.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/error.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/exit.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/exitfail.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/exitfail.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/full-write.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/full-write.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/getopt.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/getopt1.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/getopt_.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/getopt_int.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/gettext.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/localedir.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/mempcpy.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/mempcpy.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/rmt.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/rtapelib.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/safe-read.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/safe-read.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/safe-write.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/safe-write.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/savedir.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/savedir.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/strcase.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/strchrnul.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/strchrnul.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/stripslash.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/strndup.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/strndup.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/strnlen.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/system.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/unlocked-io.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/xalloc-die.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/xalloc.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/lib/xmalloc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/main.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/makepath.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/rmt.h#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/rtapelib.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/safe-stat.h#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/src/copyin.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/copyout.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/copypass.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/cpio.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/cpiohdr.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/defer.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/defer.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/dstring.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/dstring.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/extern.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/filemode.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/filetypes.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/global.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/idcache.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/main.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/makepath.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/safe-stat.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/tar.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/tar.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/tarhdr.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/userspec.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/src/util.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cpio/stripslash.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/system.h#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/tar.c#3 delete .. //depot/projects/trustedbsd/base/contrib/cpio/tar.h#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/tarhdr.h#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/userspec.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/util.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/version.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/xmalloc.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cpio/xstrdup.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/freebsd-spec.h#15 integrate .. //depot/projects/trustedbsd/base/contrib/groff/COPYING#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/ChangeLog.115#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/ChangeLog.116#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/ChangeLog.117#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/ChangeLog.118#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/FDL#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/INSTALL#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/INSTALL.gen#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/LICENSE#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/MANIFEST#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/MORE.STUFF#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/Makefile.ccpg#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/Makefile.comm#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/Makefile.cpg#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/Makefile.init#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/NEWS#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/PROBLEMS#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/PROJECTS#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/README.MinGW#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/README.WIN32#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/REVISION#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/TODO#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/configure#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/configure.ac#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/gdiffmk/README#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/gdiffmk/tests/file1#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/gdiffmk/tests/file2#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/groffer/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/groffer/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/groffer/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/groffer/README_SH#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/groffer/TODO#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/groffer/groffer.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/groffer/groffer.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/groffer/groffer2.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mm/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mm/groff_mm.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mm/m.tmac#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mm/mmroff.pl#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/BUGS#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/NEWS#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/TODO#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/copyright#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/examples/README.mom#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/examples/README.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/examples/elvis_syntax#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/examples/macros.mom#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/examples/typeset.mom#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/groff_mom.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/color.html#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/docelement.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/docprocessing.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/goodies.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/inlines.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/intro.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/refer.html#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/reserved.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/toc.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/typesetting.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/using.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/om.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/pdfmark/ChangeLog#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/pdfmark/README#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/pdfmark/TODO#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/pdfmark/cover.ms#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/pic2graph/pic2graph.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/fdl.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/fixinfo.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-1#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-10#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-11#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-2#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-3#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-4#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-5#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-6#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-7#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-8#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-9#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff.css#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff.texinfo#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/meref.me#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/pic.ms#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/texinfo.tex#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/webpage.ms#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/generate/Makefile#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devhtml/DESC.proto#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devhtml/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devhtml/R.proto#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/AB#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/ABI#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/AI#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/ALBB#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/ALBR#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/AOB#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/AOI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/AOR#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/AR#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/CB#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/CBI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/CI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/CLARENDON#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/CORONET#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/CR#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/GB#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/GBI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/GI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/GR#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/LGB#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/LGI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/LGR#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/MARIGOLD#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/OB#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/OBI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/OI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/OR#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/S#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/SYMBOL#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/TB#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/TBI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/TI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/TNRB#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/TNRBI#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/TNRI#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/TNRR#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/TR#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/UB#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/UBI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/UCB#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/UCBI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/UCI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/UCR#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/UI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/UR#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/WINGDINGS#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/generate/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/generate/special.awk#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/generate/special.map#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/generate/symbol.map#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/generate/text.map#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/generate/wingdings.map#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/AB#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/ABI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/AI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/AR#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/HB#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/HBI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/HI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/HNB#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/HNBI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/HNI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/HNR#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/HR#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/NB#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/NBI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/NI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/NR#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/PB#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/PBI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/PI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/PR#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/S#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/SS#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/TB#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/TBI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/TI#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/TR#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/generate/Makefile#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/generate/afmname#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/generate/textmap#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/prologue.ps#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/symbolmap#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devutf8/NOTES#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devutf8/R.proto#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/install-sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/man/ditroff.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/man/groff.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/man/groff_char.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/man/groff_diff.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/man/groff_font.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/man/groff_out.man#5 integrate .. //depot/projects/trustedbsd/base/contrib/groff/man/groff_tmac.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/man/roff.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/mkinstalldirs#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grodvi/dvi.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grodvi/grodvi.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/grohtml.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/html-table.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/html-table.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/html-text.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/html-text.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/html.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/output.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/post-html.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grolbp/lbp.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grolbp/lbp.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grolj4/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grolj4/grolj4.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grolj4/lj4.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grolj4/lj4_font.man#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grops/grops.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grops/ps.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grops/ps.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grops/psrm.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grotty/grotty.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grotty/tty.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/ChangeLog#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/DESC.in#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/Dvi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/Dvi.h#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/DviP.h#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/FontMap#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/GXditview.ad#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/Makefile.sub#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/Menu.h#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/README#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/TODO#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/ad2c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/device.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/device.h#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/draw.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/font.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/gray1.bm#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/gray2.bm#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/gray3.bm#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/gray4.bm#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/gray5.bm#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/gray6.bm#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/gray7.bm#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/gray8.bm#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/gxditview.man#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/lex.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/page.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/parse.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/xdit.bm#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/xdit_mask.bm#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/xditview/xditview.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/include/DviChar.h#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/include/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/XFontName.h#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/include/assert.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/cmap.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/color.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/config.hin#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/cset.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/device.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/driver.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/errarg.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/error.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/font.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/geometry.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/getopt_int.h#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/include/gettext.h#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/include/groff-getopt.h#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/include/html-strings.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/htmlhint.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/index.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/lib.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/macropath.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/nonposix.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/paper.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/posix.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/printer.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/ptable.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/refid.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/relocate.h#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/include/search.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/searchpath.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/stringclass.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/symbol.h#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/include/unicode.h#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libbib/common.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libbib/index.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libbib/linear.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libbib/map.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libbib/search.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libdriver/input.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libdriver/printer.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/assert.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/change_lf.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/cmap.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/color.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/cset.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/device.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/errarg.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/error.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/fatal.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/fmod.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/font.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/fontfile.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/geometry.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/getcwd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/glyphuni.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/htmlhint.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/hypot.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/iftoa.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/invalid.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/itoa.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/lf.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/macropath.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/matherr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/maxfilename.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/maxpathname.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/mksdir.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/mkstemp.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/nametoindex.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/new.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/paper.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/progname.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/progname.cpp#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/ptable.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/quotearg.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/relocate.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/searchpath.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/spawnvp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/strcasecmp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/strerror.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/string.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/strsave.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/strtol.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/symbol.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/tmpfile.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/tmpname.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/unicode.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/uniglyph.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/uniuni.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libxutil/DviChar.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libxutil/Makefile.sub#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libxutil/XFontName.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libxutil/xmalloc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/box.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/box.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/delim.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/eqn.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/eqn.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/eqn.y#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/lex.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/limit.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/list.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/main.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/mark.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/neqn.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/other.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/over.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/pbox.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/pile.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/script.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/special.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/sqrt.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/text.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/grn/gprint.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/grn/grn.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/grn/hdb.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/grn/hgraph.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/grn/hpoint.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/grn/main.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/html/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/html/pre-html.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/html/pre-html.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/html/pushback.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/html/pushback.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/TODO#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/common.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/common.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/lex.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/main.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/object.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/object.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/output.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/pic.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/pic.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/pic.y#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/position.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/tex.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/troff.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/command.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/command.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/label.y#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/ref.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/ref.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/refer.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/refer.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/refer.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/token.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/token.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/soelim/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/soelim/soelim.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/soelim/soelim.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/tbl/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/tbl/main.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/tbl/table.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/tbl/table.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/tbl/tbl.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/groff/groff.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/groff/groff.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/groff/pipeline.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/groff/pipeline.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/grog/grog.pl#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/grog/grog.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/nroff/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/nroff/nroff.man#5 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/nroff/nroff.sh#6 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/charinfo.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/column.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/dictionary.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/dictionary.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/div.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/div.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/env.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/env.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/glyphuni.cpp#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/hvunits.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/input.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/input.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/mtsm.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/mtsm.h#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/node.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/node.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/number.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/reg.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/reg.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/request.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/symbol.cpp#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/symbol.h#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/token.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/troff.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/troff.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/unicode.cpp#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/unicode.h#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/uniglyph.cpp#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/uniuni.cpp#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/addftinfo/addftinfo.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/addftinfo/guess.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/addftinfo/guess.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/afmtodit/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/afmtodit/afmtodit.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/afmtodit/afmtodit.pl#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/hpftodit/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/hpftodit/hpftodit.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/hpftodit/hpftodit.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/hpftodit/hpuni.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/indxbib/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/indxbib/indxbib.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/indxbib/signal.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/lkbib/lkbib.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/lkbib/lkbib.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/lookbib/lookbib.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/lookbib/lookbib.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/pfbtops/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/pfbtops/pfbtops.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/pfbtops/pfbtops.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/tfmtodit/tfmtodit.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/xtotroff/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/xtotroff/Makefile.sub#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/xtotroff/xtotroff.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/xtotroff/xtotroff.man#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/ChangeLog#4 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/DESC#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/Dvi.c#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/Dvi.h#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/DviChar.c#4 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/DviChar.h#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/DviP.h#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/FontMap#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/GXditview-ad.h#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/GXditview.ad#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/INSTALL#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/Imakefile.in#4 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/Menu.h#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/README#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/TODO#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/XFontName.c#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/XFontName.h#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/ad2c#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/device.c#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/device.h#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/draw.c#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/font.c#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/gray1.bm#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/gray2.bm#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/gray3.bm#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/gray4.bm#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/gray5.bm#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/gray6.bm#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/gray7.bm#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/gray8.bm#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/gxditview.man#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/lex.c#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/page.c#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/parse.c#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/xdit.bm#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/xdit_mask.bm#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/xditview.c#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/xtotroff.c#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/test-groff#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/test-groff.in#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/tmac/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/TODO#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/X.tmac#5 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/Xps.tmac#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/an-old.tmac#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/composite.tmac#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/devtag.tmac#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-common#17 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-ditroff#7 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-nroff#6 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-old.tmac#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-syms#10 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc.tmac#10 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/dvi.tmac#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/e.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/groff_man.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/groff_mdoc.man#14 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/groff_ms.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/groff_trace.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/groff_www.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/html.tmac#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/latin5.tmac#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/tmac/lbp.tmac#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/papersize.tmac#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/ps.tmac#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/s.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/trace.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/troffrc#9 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/troffrc-end#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/tty-char.tmac#6 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/tty.tmac#5 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/unicode.tmac#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/tmac/www.tmac#4 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pf.4#8 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pf.conf.5#7 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pfsync.4#8 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/include/netsmb/nb_lib.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/include/netsmb/smb_lib.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/ctx.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/nb.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/nb_net.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/nbns_rq.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/mount_smbfs/mount_smbfs.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/top/top.X#6 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver_ndis.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver_ndis.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver_ndis_.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s23_srvr.c#4 integrate .. //depot/projects/trustedbsd/base/etc/bluetooth/Makefile#2 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#48 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#32 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#40 integrate .. //depot/projects/trustedbsd/base/etc/netstart#7 integrate .. //depot/projects/trustedbsd/base/etc/pccard_ether#14 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#32 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/NETWORKING#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/archdep#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/devd#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/hcsecd#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/ike#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipfw#11 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipmon#11 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipsec#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/localpkg#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mountcritremote#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/named#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/newsyslog#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pf#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pflog#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pfsync#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/powerd#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ppp-user#8 delete .. //depot/projects/trustedbsd/base/etc/rc.d/routing#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/sdpd#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/sendmail#13 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/sshd#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ugidfw#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/wpa_supplicant#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.firewall6#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.initdiskless#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#22 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#44 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/limerick#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/freebsd-native.h#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cpio/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cpio/config.h#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/cpio/doc/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/diff/diff.1#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/main.c#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/grep.1#10 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/grep.c#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/search.c#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/font/Makefile.tty#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/font/devhtml/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/font/devlj4/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/devices/grolj4/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/devices/xditview/Makefile#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/include/config.h#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/libs/libgroff/Makefile#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/roff/troff/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/utils/hpftodit/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/Makefile#10 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/send-pr.sh#10 integrate .. //depot/projects/trustedbsd/base/include/Makefile#49 integrate .. //depot/projects/trustedbsd/base/include/pthread.h#11 integrate .. //depot/projects/trustedbsd/base/include/pthread_np.h#7 integrate .. //depot/projects/trustedbsd/base/include/signal.h#10 integrate .. //depot/projects/trustedbsd/base/include/time.h#9 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#39 integrate .. //depot/projects/trustedbsd/base/lib/csu/amd64/crt1.c#3 integrate .. //depot/projects/trustedbsd/base/lib/csu/i386-elf/crt1.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/COPYING#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#16 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.h#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_platform.h#12 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_iso9660.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/configure.ac.in#7 integrate .. //depot/projects/trustedbsd/base/lib/libbsnmp/libbsnmp/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/string/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/string/strlen.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gen/sem.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sendfile.2#10 integrate .. //depot/projects/trustedbsd/base/lib/libdevstat/devstat.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libedit/editline.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libedit/el.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libedit/makelist#5 integrate .. //depot/projects/trustedbsd/base/lib/libedit/map.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_amd64.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_arm.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_i386.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libnetgraph/debug.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ssh/Makefile#14 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ssh/pam_ssh.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/pthread.map#12 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/Makefile.inc#12 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_condattr_pshared.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mattr_pshared.c#1 branch .. //depot/projects/trustedbsd/base/lib/libstand/cd9660.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/Makefile#11 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/arm/arm/pthread_md.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/i386/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/pthread.map#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_create.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_exit.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_join.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutexattr.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#14 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_syscalls.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_timer.c#1 branch .. //depot/projects/trustedbsd/base/lib/libutil/trimdomain.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/Makefile#16 integrate .. //depot/projects/trustedbsd/base/lib/msun/i387/e_exp.S#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/man/ieee_test.3#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/man/ilogb.3#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/man/math.3#7 integrate .. //depot/projects/trustedbsd/base/lib/msun/man/remainder.3#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/e_rem_pio2f.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/k_cos.c#4 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/k_cosf.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/k_rem_pio2f.c#4 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/k_sin.c#4 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/k_sinf.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/k_tan.c#6 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/k_tanf.c#4 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/math_private.h#9 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_cos.c#4 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_cosf.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_sin.c#4 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_sinf.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_tan.c#4 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_tanf.c#3 integrate .. //depot/projects/trustedbsd/base/libexec/tcpd/Makefile#4 integrate .. //depot/projects/trustedbsd/base/release/Makefile#69 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#28 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#62 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#14 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#95 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#7 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/early-adopter/Makefile#2 delete .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/early-adopter/article.sgml#2 delete .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/errata/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#4 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#5 integrate .. //depot/projects/trustedbsd/base/release/pc98/boot_crunch.conf#10 integrate .. //depot/projects/trustedbsd/base/release/picobsd/bridge/PICOBSD#6 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/ns/ns.c#4 integrate .. //depot/projects/trustedbsd/base/release/scripts/package-split.py#4 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#32 integrate .. //depot/projects/trustedbsd/base/sbin/devd/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.cc#14 integrate .. //depot/projects/trustedbsd/base/sbin/fsdb/fsdb.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/mirror/geom_mirror.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/mirror/gmirror.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifbridge.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#33 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#27 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#14 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifvlan.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#40 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.c#12 integrate .. //depot/projects/trustedbsd/base/sbin/mount/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sbin/mount/extern.h#3 integrate .. //depot/projects/trustedbsd/base/sbin/mount/getmntopts.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.c#18 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount_ufs.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/mount_cd9660/mount_cd9660.8#11 integrate .. //depot/projects/trustedbsd/base/sbin/reboot/boot_i386.8#16 integrate .. //depot/projects/trustedbsd/base/sbin/restore/restore.8#15 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 9 15:11:22 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3A1B16A421; Wed, 9 Nov 2005 15: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 3442B16A41F for ; Wed, 9 Nov 2005 15:11:21 +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 7339843D48 for ; Wed, 9 Nov 2005 15: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 jA9FBKVS064575 for ; Wed, 9 Nov 2005 15: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 jA9FAXj2063753 for perforce@freebsd.org; Wed, 9 Nov 2005 15:10:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 9 Nov 2005 15:10:33 GMT Message-Id: <200511091510.jA9FAXj2063753@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 86531 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, 09 Nov 2005 15:11:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=86531 Change 86531 by rwatson@rwatson_zoo on 2005/11/09 15:09:41 Integrate TrustedBSD MAC branch from TrustedBSD base branch. See description in @86525 for details. One area of conflict between base tree changes and local changes is MAC support in devfs, which may not be quite right as of this integration. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#29 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#59 integrate .. //depot/projects/trustedbsd/mac/ObsoleteFiles.inc#2 integrate .. //depot/projects/trustedbsd/mac/UPDATING#50 integrate .. //depot/projects/trustedbsd/mac/bin/cp/cp.c#16 integrate .. //depot/projects/trustedbsd/mac/bin/cp/extern.h#9 integrate .. //depot/projects/trustedbsd/mac/bin/cp/utils.c#15 integrate .. //depot/projects/trustedbsd/mac/bin/csh/config_p.h#2 integrate .. //depot/projects/trustedbsd/mac/bin/date/date.1#12 integrate .. //depot/projects/trustedbsd/mac/bin/kenv/kenv.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/kenv/kenv.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#28 integrate .. //depot/projects/trustedbsd/mac/bin/mv/mv.c#15 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.1#11 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.c#16 integrate .. //depot/projects/trustedbsd/mac/bin/sh/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/alias.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/sh/arith.h#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/arith.y#8 integrate .. //depot/projects/trustedbsd/mac/bin/sh/arith_lex.l#7 integrate .. //depot/projects/trustedbsd/mac/bin/sh/bltin/bltin.h#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/eval.c#11 integrate .. //depot/projects/trustedbsd/mac/bin/sh/exec.c#12 integrate .. //depot/projects/trustedbsd/mac/bin/sh/exec.h#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/expand.c#15 integrate .. //depot/projects/trustedbsd/mac/bin/sh/histedit.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/sh/jobs.c#18 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mail.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/memalloc.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/memalloc.h#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/miscbltin.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mkbuiltins#8 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mkinit.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mksyntax.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/sh/options.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/sh/parser.c#15 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#21 integrate .. //depot/projects/trustedbsd/mac/bin/sh/show.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/trap.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/sh/var.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amd.8#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bc/bc/main.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/NEWS#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/VERSION#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/asn1.3#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/asn1.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/asn1.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/bsnmpagent.3#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/bsnmpclient.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/bsnmplib.3#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmpagent.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmpclient.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/snmp_mibII.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_ntp/snmp_ntp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/.gdbinit#2 delete .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/config.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/main.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpmod.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpmod.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/trans_udp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/trap.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cpio/ABOUT-NLS#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/AUTHORS#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/COPYING#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cpio/COPYING.LIB#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cpio/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cpio/INSTALL#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/NEWS#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cpio/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cpio/THANKS#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/TODO#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/alloca.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/copyin.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/copyout.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/copypass.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/cpio.1#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/cpio.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/cpio.texi#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/cpiohdr.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/defer.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/defer.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/dirname.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/doc/cpio.1#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/doc/cpio.texi#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/dstring.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/dstring.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/error.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/extern.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/filemode.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/filetypes.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/global.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/idcache.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/alloca_.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/argp-ba.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/argp-eexst.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/argp-fmtstream.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/argp-fmtstream.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/argp-fs-xinl.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/argp-help.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/argp-namefrob.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/argp-parse.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/argp-pv.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/argp-pvh.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/argp-xinl.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/argp.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/basename.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/dirname.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/dirname.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/error.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/error.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/exit.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/exitfail.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/exitfail.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/full-write.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/full-write.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/getopt.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/getopt1.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/getopt_.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/getopt_int.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/gettext.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/localedir.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/mempcpy.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/mempcpy.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/rmt.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/rtapelib.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/safe-read.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/safe-read.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/safe-write.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/safe-write.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/savedir.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/savedir.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/strcase.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/strchrnul.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/strchrnul.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/stripslash.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/strndup.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/strndup.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/strnlen.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/system.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/unlocked-io.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/xalloc-die.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/xalloc.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/lib/xmalloc.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/main.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/makepath.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/rmt.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/rtapelib.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/safe-stat.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/src/copyin.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/copyout.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/copypass.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/cpio.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/cpiohdr.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/defer.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/defer.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/dstring.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/dstring.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/extern.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/filemode.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/filetypes.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/global.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/idcache.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/main.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/makepath.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/safe-stat.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/tar.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/tar.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/tarhdr.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/userspec.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/src/util.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cpio/stripslash.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/system.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/tar.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/tar.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/tarhdr.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/userspec.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/util.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/version.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/xmalloc.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cpio/xstrdup.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/cvs/src/cvsbug.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-decl.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/freebsd-spec.h#13 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/COPYING#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/ChangeLog.115#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/ChangeLog.116#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/ChangeLog.117#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/ChangeLog.118#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/FDL#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/INSTALL#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/INSTALL.gen#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/LICENSE#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/MANIFEST#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/MORE.STUFF#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/Makefile.ccpg#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/Makefile.comm#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/Makefile.cpg#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/Makefile.init#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/Makefile.sub#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/NEWS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/PROBLEMS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/PROJECTS#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/README#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/README.MinGW#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/README.WIN32#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/REVISION#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/TODO#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/aclocal.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/configure#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/configure.ac#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/eqn2graph/eqn2graph.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/eqn2graph/eqn2graph.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/gdiffmk/README#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/gdiffmk/tests/file1#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/gdiffmk/tests/file2#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/groffer/ChangeLog#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/groffer/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/groffer/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/groffer/README_SH#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/groffer/TODO#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/groffer/groffer.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/groffer/groffer.sh#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/groffer/groffer2.sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mm/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mm/groff_mm.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mm/m.tmac#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mm/mmroff.pl#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/BUGS#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/ChangeLog#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/NEWS#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/TODO#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/copyright#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/examples/README.mom#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/examples/README.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/examples/elvis_syntax#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/examples/macros.mom#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/examples/typeset.mom#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/examples/typewrite.mom#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/groff_mom.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/appendices.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/color.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/cover.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/definitions.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/docelement.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/docprocessing.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/goodies.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/headfootpage.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/inlines.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/intro.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/letters.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/rectoverso.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/refer.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/reserved.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/toc.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/typemacdoc.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/typesetting.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/using.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/om.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/pdfmark/ChangeLog#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/pdfmark/README#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/pdfmark/TODO#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/pdfmark/cover.ms#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/pic2graph/pic2graph.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/pic2graph/pic2graph.sh#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/fdl.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/fixinfo.sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-10#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-11#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-2#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-4#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-5#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-6#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-7#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-8#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-9#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff.css#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff.texinfo#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/meref.me#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/pic.ms#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/texinfo.tex#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/webpage.ms#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/generate/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devhtml/DESC.proto#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devhtml/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devhtml/R.proto#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/AB#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/ABI#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/AI#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/ALBB#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/ALBR#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/AOB#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/AOI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/AOR#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/AR#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/CB#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/CBI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/CI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/CLARENDON#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/CORONET#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/CR#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/GB#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/GBI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/GI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/GR#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/LGB#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/LGI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/LGR#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/MARIGOLD#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/OB#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/OBI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/OI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/OR#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/S#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/SYMBOL#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/TB#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/TBI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/TI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/TNRB#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/TNRBI#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/TNRI#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/TNRR#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/TR#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/UB#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/UBI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/UCB#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/UCBI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/UCI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/UCR#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/UI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/UR#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/WINGDINGS#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/generate/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/generate/special.awk#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/generate/special.map#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/generate/symbol.map#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/generate/text.map#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/generate/wingdings.map#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/AB#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/ABI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/AI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/AR#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/HB#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/HBI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/HI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/HNB#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/HNBI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/HNI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/HNR#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/HR#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/NB#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/NBI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/NI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/NR#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/PB#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/PBI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/PI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/PR#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/S#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/SS#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/TB#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/TBI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/TI#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/TR#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/generate/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/generate/afmname#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/generate/textmap#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/prologue.ps#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/symbolmap#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devutf8/NOTES#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devutf8/R.proto#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/install-sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/man/ditroff.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/man/groff.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/man/groff_char.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/man/groff_diff.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/man/groff_font.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/man/groff_out.man#6 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/man/groff_tmac.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/man/roff.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/mkinstalldirs#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grodvi/dvi.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grodvi/grodvi.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/grohtml.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/html-table.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/html-table.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/html-text.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/html-text.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/html.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/output.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/post-html.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grolbp/lbp.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grolbp/lbp.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grolj4/Makefile.sub#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grolj4/grolj4.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grolj4/lj4.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grolj4/lj4_font.man#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grops/grops.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grops/ps.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grops/ps.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grops/psrm.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grotty/grotty.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grotty/tty.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/ChangeLog#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/DESC.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/Dvi.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/Dvi.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/DviP.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/FontMap#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/GXditview.ad#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/Makefile.sub#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/Menu.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/README#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/TODO#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/ad2c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/device.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/device.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/draw.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/font.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/gray1.bm#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/gray2.bm#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/gray3.bm#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/gray4.bm#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/gray5.bm#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/gray6.bm#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/gray7.bm#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/gray8.bm#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/gxditview.man#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/lex.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/page.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/parse.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/xdit.bm#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/xdit_mask.bm#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/xditview/xditview.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/DviChar.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/XFontName.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/assert.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/cmap.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/color.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/config.hin#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/cset.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/device.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/driver.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/errarg.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/error.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/font.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/geometry.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/getopt_int.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/gettext.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/groff-getopt.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/html-strings.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/htmlhint.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/index.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/lib.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/macropath.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/nonposix.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/paper.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/posix.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/printer.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/ptable.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/refid.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/relocate.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/search.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/searchpath.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/stringclass.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/symbol.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/unicode.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libbib/common.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libbib/index.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libbib/linear.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libbib/map.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libbib/search.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libdriver/input.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libdriver/printer.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/Makefile.sub#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/assert.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/change_lf.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/cmap.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/color.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/cset.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/device.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/errarg.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/error.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/fatal.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/fmod.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/font.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/fontfile.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/geometry.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/getcwd.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/glyphuni.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/htmlhint.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/hypot.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/iftoa.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/invalid.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/itoa.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/lf.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/macropath.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/matherr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/maxfilename.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/maxpathname.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/mksdir.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/mkstemp.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/nametoindex.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/new.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/paper.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/progname.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/progname.cpp#2 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/ptable.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/quotearg.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/relocate.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/searchpath.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/spawnvp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/strcasecmp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/strerror.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/string.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/strsave.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/strtol.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/symbol.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/tmpfile.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/tmpname.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/unicode.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/uniglyph.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/uniuni.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libxutil/DviChar.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libxutil/Makefile.sub#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libxutil/XFontName.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libxutil/xmalloc.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/Makefile.sub#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/box.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/box.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/delim.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/eqn.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/eqn.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/eqn.y#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/lex.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/limit.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/list.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/main.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/mark.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/neqn.sh#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/other.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/over.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/pbox.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/pile.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/script.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/special.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/sqrt.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/text.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/grn/gprint.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/grn/grn.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/grn/hdb.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/grn/hgraph.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/grn/hpoint.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/grn/main.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/html/Makefile.sub#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/html/pre-html.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/html/pre-html.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/html/pushback.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/html/pushback.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/TODO#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/common.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/common.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/lex.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/main.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/object.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/object.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/output.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/pic.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/pic.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/pic.y#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/position.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/tex.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/troff.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/command.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/command.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/label.y#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/ref.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/ref.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/refer.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/refer.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/refer.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/token.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/token.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/soelim/Makefile.sub#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/soelim/soelim.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/soelim/soelim.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/tbl/Makefile.sub#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/tbl/main.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/tbl/table.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/tbl/table.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/tbl/tbl.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/groff/groff.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/groff/groff.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/groff/pipeline.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/groff/pipeline.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/grog/grog.pl#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/grog/grog.sh#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/nroff/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/nroff/nroff.man#6 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/nroff/nroff.sh#7 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/Makefile.sub#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/charinfo.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/column.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/dictionary.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/dictionary.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/div.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/div.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/env.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/env.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/glyphuni.cpp#2 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/hvunits.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/input.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/input.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/mtsm.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/mtsm.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/node.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/node.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/number.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/reg.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/reg.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/request.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/symbol.cpp#2 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/symbol.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/token.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/troff.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/troff.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/unicode.cpp#2 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/unicode.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/uniglyph.cpp#2 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/uniuni.cpp#2 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/addftinfo/addftinfo.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/addftinfo/guess.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/addftinfo/guess.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/afmtodit/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/afmtodit/afmtodit.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/afmtodit/afmtodit.pl#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/hpftodit/Makefile.sub#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/hpftodit/hpftodit.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/hpftodit/hpftodit.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/hpftodit/hpuni.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/indxbib/Makefile.sub#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/indxbib/indxbib.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/indxbib/signal.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/lkbib/lkbib.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/lkbib/lkbib.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/lookbib/lookbib.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/lookbib/lookbib.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/pfbtops/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/pfbtops/pfbtops.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/pfbtops/pfbtops.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/tfmtodit/tfmtodit.cpp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/xtotroff/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/xtotroff/Makefile.sub#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/xtotroff/xtotroff.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/xtotroff/xtotroff.man#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/ChangeLog#5 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/DESC#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/Dvi.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/Dvi.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/DviChar.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/DviChar.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/DviP.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/FontMap#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/GXditview-ad.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/GXditview.ad#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/INSTALL#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/Imakefile.in#5 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/Menu.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/README#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/TODO#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/XFontName.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/XFontName.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/ad2c#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/device.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/device.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/draw.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/font.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/gray1.bm#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/gray2.bm#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/gray3.bm#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/gray4.bm#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/gray5.bm#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/gray6.bm#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/gray7.bm#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/gray8.bm#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/gxditview.man#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/lex.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/page.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/parse.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/xdit.bm#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/xdit_mask.bm#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/xditview.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/xtotroff.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/test-groff#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/test-groff.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/Makefile.sub#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/TODO#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/X.tmac#6 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/Xps.tmac#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/an-old.tmac#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/composite.tmac#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/devtag.tmac#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-common#15 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-ditroff#7 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-nroff#6 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-old.tmac#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-syms#10 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc.tmac#11 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/dvi.tmac#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/e.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/groff_man.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/groff_mdoc.man#14 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/groff_ms.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/groff_trace.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/groff_www.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/html.tmac#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/latin5.tmac#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/lbp.tmac#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/papersize.tmac#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/ps.tmac#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/s.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/trace.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/troffrc#10 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/troffrc-end#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/tty-char.tmac#7 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/tty.tmac#6 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/unicode.tmac#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/www.tmac#5 integrate .. //depot/projects/trustedbsd/mac/contrib/less/line.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/rawss7.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/nvi/docs/USD.doc/vi.ref/vi.ref#2 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/man/pf.4#6 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/man/pf.conf.5#6 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/man/pfsync.4#7 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/pflogd/pflogd.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/include/netsmb/nb_lib.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/include/netsmb/smb_lib.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/ctx.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/kiconv.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/mbuf.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/nb.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/nb_name.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/nb_net.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/nbns_rq.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/rap.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/mount_smbfs/mount_smbfs.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/smbutil/view.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/top/top.X#6 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/traceroute.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/driver_ndis.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/driver_ndis.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/driver_ndis_.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/CREDITS#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ChangeLog#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-tricks#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/LICENCE#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/Makefile.in#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README.privsep#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/WARNING.RNG#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/acconfig.h#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/acss.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/atomicio.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/atomicio.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/audit.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-chall.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-krb5.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.h#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-passwd.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-rh-rsa.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-rhosts.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-rsa.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-shadow.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-skey.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth.h#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth1.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-chall.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-gss.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-kbdint.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2.c#14 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/authfd.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/authfile.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/bufaux.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/canohost.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/channels.c#14 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/channels.h#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher-acss.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher-ctr.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/compat.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/config.guess#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/config.h#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/config.sub#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/configure.ac#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/defines.h#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/dns.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/entropy.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/gss-genr.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/gss-serv-krb5.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/gss-serv.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/hostfile.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/includes.h#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kex.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kex.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/key.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/log.h#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/loginrec.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/loginrec.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/mac.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/match.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/mdoc2man.awk#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/misc.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/misc.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/moduli.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.h#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/mpaux.c#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/mpaux.h#3 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/msg.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/myproposal.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-rfc2553.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getrrsetbyname.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/openbsd-compat.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/openssl-compat.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/openssl-compat.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-aix.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-aix.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-uw.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-uw.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/realpath.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strtoll.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strtonum.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/xcrypt.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/packet.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/packet.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/progressmeter.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.c#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.h#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/readpass.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/reexec.sh#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/test-exec.sh#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/scp.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.c#14 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.h#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/serverloop.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/session.c#23 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/session.h#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-client.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-client.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-server.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-add.1#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-add.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.1#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.c#14 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.1#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-rand-helper.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-rsa.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.1#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.c#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config#17 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config.5#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect1.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect2.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.8#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.c#15 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#18 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config.5#15 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshpty.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/tildexpand.c#5 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/ttymodes.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/version.h#17 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s23_srvr.c#4 integrate .. //depot/projects/trustedbsd/mac/etc/Makefile#45 integrate .. //depot/projects/trustedbsd/mac/etc/bluetooth/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#43 integrate .. //depot/projects/trustedbsd/mac/etc/etc.powerpc/ttys#3 integrate .. //depot/projects/trustedbsd/mac/etc/login.conf#17 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#38 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#37 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.var.dist#12 integrate .. //depot/projects/trustedbsd/mac/etc/namedb/named.conf#9 integrate .. //depot/projects/trustedbsd/mac/etc/netstart#7 integrate .. //depot/projects/trustedbsd/mac/etc/network.subr#9 integrate .. //depot/projects/trustedbsd/mac/etc/pccard_ether#12 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/550.ipfwlimit#8 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/security.functions#5 integrate .. //depot/projects/trustedbsd/mac/etc/portsnap.conf#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#28 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/NETWORKING#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/archdep#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/cleanvar#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/devd#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/dumpon#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/gbde#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/geli#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/geli2#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/hcsecd#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/ike#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipfw#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipmon#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipsec#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/jail#11 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/kerberos#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/localpkg#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mountcritremote#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mountd#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/named#12 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/netif#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/newsyslog#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pf#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pflog#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pfsync#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/powerd#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ppp-user#8 delete .. //depot/projects/trustedbsd/mac/etc/rc.d/routing#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/sdpd#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/sendmail#11 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/sshd#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ugidfw#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/wpa_supplicant#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.firewall6#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.initdiskless#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.subr#20 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#38 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2-o#12 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 10 01:38:18 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E609816A421; Thu, 10 Nov 2005 01: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 B7ABF16A41F for ; Thu, 10 Nov 2005 01:38: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 4F9D743D45 for ; Thu, 10 Nov 2005 01:38: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 jAA1cHGF029129 for ; Thu, 10 Nov 2005 01:38:17 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAA1cBaw029117 for perforce@freebsd.org; Thu, 10 Nov 2005 01:38:11 GMT (envelope-from peter@freebsd.org) Date: Thu, 10 Nov 2005 01:38:11 GMT Message-Id: <200511100138.jAA1cBaw029117@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 86564 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, 10 Nov 2005 01:38:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=86564 Change 86564 by peter@peter_daintree on 2005/11/10 01:37:55 IFC @86561 Affected files ... .. //depot/projects/hammer/bin/ls/ls.1#22 integrate .. //depot/projects/hammer/bin/ls/ls.c#15 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#33 integrate .. //depot/projects/hammer/share/examples/cvsup/ports-supfile#9 integrate .. //depot/projects/hammer/share/man/man4/twa.4#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#46 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#128 integrate .. //depot/projects/hammer/sys/conf/files#130 integrate .. //depot/projects/hammer/sys/conf/files.i386#65 integrate .. //depot/projects/hammer/sys/conf/options.i386#41 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#51 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#25 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.h#15 integrate .. //depot/projects/hammer/sys/dev/em/if_em_osdep.h#10 integrate .. //depot/projects/hammer/sys/dev/joy/joy.c#7 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#50 integrate .. //depot/projects/hammer/sys/dev/twa/tw_cl.h#2 integrate .. //depot/projects/hammer/sys/dev/twa/tw_cl_externs.h#2 integrate .. //depot/projects/hammer/sys/dev/twa/tw_cl_fwif.h#2 integrate .. //depot/projects/hammer/sys/dev/twa/tw_cl_fwimg.c#2 integrate .. //depot/projects/hammer/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/hammer/sys/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/hammer/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/hammer/sys/dev/twa/tw_cl_ioctl.h#2 integrate .. //depot/projects/hammer/sys/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/hammer/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/hammer/sys/dev/twa/tw_osl.h#2 integrate .. //depot/projects/hammer/sys/dev/twa/tw_osl_cam.c#5 integrate .. //depot/projects/hammer/sys/dev/twa/tw_osl_freebsd.c#4 integrate .. //depot/projects/hammer/sys/dev/twa/tw_osl_includes.h#3 integrate .. //depot/projects/hammer/sys/dev/twa/tw_osl_inline.h#1 branch .. //depot/projects/hammer/sys/dev/twa/tw_osl_share.h#4 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#41 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#79 integrate .. //depot/projects/hammer/sys/i386/conf/PAE#17 integrate .. //depot/projects/hammer/sys/i386/conf/XBOX#1 branch .. //depot/projects/hammer/sys/i386/i386/machdep.c#65 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#75 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#50 integrate .. //depot/projects/hammer/sys/i386/include/xbox.h#1 branch .. //depot/projects/hammer/sys/i386/isa/clock.c#29 integrate .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#24 integrate .. //depot/projects/hammer/sys/i386/xbox/pic16l.s#1 branch .. //depot/projects/hammer/sys/i386/xbox/xbox.c#1 branch .. //depot/projects/hammer/sys/i386/xbox/xboxfb.c#1 branch .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#49 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#52 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#64 integrate .. //depot/projects/hammer/sys/kern/subr_power.c#4 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#18 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#34 integrate .. //depot/projects/hammer/sys/kern/uipc_proto.c#4 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#37 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#59 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#96 integrate .. //depot/projects/hammer/sys/modules/Makefile#90 integrate .. //depot/projects/hammer/sys/modules/twa/Makefile#5 integrate .. //depot/projects/hammer/sys/net/if_gre.c#29 integrate .. //depot/projects/hammer/sys/net/if_stf.c#24 integrate .. //depot/projects/hammer/sys/net/rtsock.c#28 integrate .. //depot/projects/hammer/sys/netatalk/at_proto.c#4 integrate .. //depot/projects/hammer/sys/netatm/atm_proto.c#6 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket.c#12 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#25 integrate .. //depot/projects/hammer/sys/netgraph/ng_fec.c#18 integrate .. //depot/projects/hammer/sys/netgraph/ng_socket.c#21 integrate .. //depot/projects/hammer/sys/netinet/in_gif.c#13 integrate .. //depot/projects/hammer/sys/netinet/in_proto.c#18 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#31 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#29 integrate .. //depot/projects/hammer/sys/netinet6/in6_proto.c#13 integrate .. //depot/projects/hammer/sys/netipsec/keysock.c#9 integrate .. //depot/projects/hammer/sys/netipx/ipx_proto.c#6 integrate .. //depot/projects/hammer/sys/netkey/keysock.c#13 integrate .. //depot/projects/hammer/sys/netnatm/natm_proto.c#11 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#53 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#40 delete .. //depot/projects/hammer/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#42 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#37 integrate .. //depot/projects/hammer/sys/vm/pmap.h#22 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#35 integrate .. //depot/projects/hammer/tools/regression/sockets/unix_passfd/Makefile#1 branch .. //depot/projects/hammer/tools/regression/sockets/unix_passfd/unix_passfd.c#1 branch .. //depot/projects/hammer/usr.bin/netstat/if.c#12 integrate Differences ... ==== //depot/projects/hammer/bin/ls/ls.1#22 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.91 2005/09/06 20:14:39 rse Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.92 2005/11/10 00:02:32 mux Exp $ .\" .Dd September 6, 2005 .Dt LS 1 @@ -40,7 +40,7 @@ .Nd list directory contents .Sh SYNOPSIS .Nm -.Op Fl ABCFGHLPRSTWZabcdfghiklmnopqrstuwx1 +.Op Fl ABCFGHILPRSTWZabcdfghiklmnopqrstuwx1 .Op Ar .Sh DESCRIPTION For each operand that names a @@ -73,6 +73,8 @@ and .Pa .. . Always set for the super-user. +.Fl I +cancel this option. .It Fl B Force printing of non-printable characters (as defined by .Xr ctype 3 @@ -117,6 +119,12 @@ or .Fl l options are specified. +.It Fl I +This option cancels the +.Fl A +option. Usually used by super-user when +.Fl A +is not necessary. .It Fl L If argument is a symbolic link, list the file or directory the link references rather than the link itself. ==== //depot/projects/hammer/bin/ls/ls.c#15 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.80 2005/06/03 11:05:58 dd Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.81 2005/11/10 00:02:32 mux Exp $"); #include #include @@ -110,6 +110,8 @@ static int f_kblocks; /* print size in kilobytes */ static int f_listdir; /* list actual directory, not contents */ static int f_listdot; /* list files beginning with . */ +static int f_nolistdot; /* don't list files beginning with . */ +static int f_forcelistdot; /* force list files beginning with . */ int f_longform; /* long listing format */ int f_nonprint; /* show unprintables as ? */ static int f_nosort; /* don't sort output */ @@ -175,13 +177,9 @@ termwidth = atoi(p); } - /* Root is -A automatically. */ - if (!getuid()) - f_listdot = 1; - fts_options = FTS_PHYSICAL; while ((ch = getopt(argc, argv, - "1ABCFGHLPRSTWZabcdfghiklmnopqrstuwx")) != -1) { + "1ABCFGHILPRSTWZabcdfghiklmnopqrstuwx")) != -1) { switch (ch) { /* * The -1, -C, -x and -l options all override each other so @@ -243,10 +241,14 @@ break; case 'a': fts_options |= FTS_SEEDOT; - /* FALLTHROUGH */ + f_forcelistdot = 1; + break; case 'A': f_listdot = 1; break; + case 'I': + f_nolistdot = 1; + break; /* The -d option turns off the -R option. */ case 'd': f_listdir = 1; @@ -326,6 +328,10 @@ argc -= optind; argv += optind; + /* Root is -A automatically. */ + if (!getuid() && !f_nolistdot) + f_listdot = 1; + /* Enabling of colours is conditional on the environment. */ if (getenv("CLICOLOR") && (isatty(STDOUT_FILENO) || getenv("CLICOLOR_FORCE"))) @@ -490,7 +496,8 @@ break; case FTS_D: if (p->fts_level != FTS_ROOTLEVEL && - p->fts_name[0] == '.' && !f_listdot) + p->fts_name[0] == '.' && ((!f_listdot || + f_nolistdot) && !f_forcelistdot)) break; /* @@ -650,7 +657,8 @@ } } else { /* Only display dot file if -a/-A set. */ - if (cur->fts_name[0] == '.' && !f_listdot) { + if (cur->fts_name[0] == '.' && ((!f_listdot || + f_nolistdot) && !f_forcelistdot)) { cur->fts_number = NO_PRINT; continue; } ==== //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#33 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.70 2005/10/25 04:32:42 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.71 2005/11/09 22:05:41 brueffer Exp $ # # @@ -64,7 +64,6 @@ de i386,pc98,alpha,ia64,amd64 dpt i386,ia64,amd64 ed i386,pc98 -em i386,pc98,alpha,ia64,amd64 ep i386,pc98,amd64 esp sparc64 ex i386,amd64 ==== //depot/projects/hammer/share/examples/cvsup/ports-supfile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/cvsup/ports-supfile,v 1.33 2004/12/19 02:31:45 brueffer Exp $ +# $FreeBSD: src/share/examples/cvsup/ports-supfile,v 1.34 2005/11/09 10:14:07 pav Exp $ # # This file contains all of the "CVSup collections" that make up the # FreeBSD-current ports collection. @@ -110,6 +110,7 @@ #ports-misc #ports-multimedia #ports-net +#ports-net-im #ports-net-mgmt #ports-news #ports-palm ==== //depot/projects/hammer/share/man/man4/twa.4#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/twa.4,v 1.4 2005/02/27 13:14:28 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/twa.4,v 1.5 2005/11/09 00:23:54 vkashyap Exp $ .\" .Dd August 15, 2004 .Dt TWA 4 @@ -68,6 +68,16 @@ AMCC's 3ware 9500S-12 .It AMCC's 3ware 9500S-12MI +.It +AMCC's 3ware 9500SX-4LP +.It +AMCC's 3ware 9500SX-8LP +.It +AMCC's 3ware 9500SX-12 +.It +AMCC's 3ware 9500SX-12MI +.It +AMCC's 3ware 9500SX-16ML .El .Sh DIAGNOSTICS Whenever the driver encounters a command failure, it prints out an error code in ==== //depot/projects/hammer/sys/alpha/alpha/pmap.c#46 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.183 2005/11/04 18:03:23 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.184 2005/11/09 08:19:19 alc Exp $"); #include #include @@ -317,11 +317,9 @@ */ static uma_zone_t pvzone; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; -int pmap_pagedaemon_waken; static PMAP_INLINE void free_pv_entry(pv_entry_t pv); -static pv_entry_t get_pv_entry(void); -static pv_entry_t pv_entry_reclaim(pmap_t locked_pmap); +static pv_entry_t get_pv_entry(pmap_t locked_pmap); static void alpha_protection_init(void); static void pmap_changebit(vm_page_t m, int bit, boolean_t setem); @@ -1300,39 +1298,44 @@ /* * get a new pv_entry, allocating a block from the system * when needed. - * the memory allocation is performed bypassing the malloc code - * because of the possibility of allocations at interrupt time. */ static pv_entry_t -get_pv_entry(void) +get_pv_entry(pmap_t locked_pmap) { - pv_entry_count++; - if ((pv_entry_count > pv_entry_high_water) && - (pmap_pagedaemon_waken == 0)) { - pmap_pagedaemon_waken = 1; - wakeup (&vm_pages_needed); - } - return uma_zalloc(pvzone, M_NOWAIT); -} - -/* - * Reclaim a pv entry by removing a mapping to an inactive page. - */ -static pv_entry_t -pv_entry_reclaim(pmap_t locked_pmap) -{ + static const struct timeval printinterval = { 60, 0 }; + static struct timeval lastprint; + struct vpgqueues *vpq; pmap_t pmap; pt_entry_t *pte, tpte; - pv_entry_t pv; + pv_entry_t allocated_pv, next_pv, pv; vm_offset_t va; vm_page_t m; PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - TAILQ_FOREACH(m, &vm_page_queues[PQ_INACTIVE].pl, pageq) { + allocated_pv = uma_zalloc(pvzone, M_NOWAIT); + if (allocated_pv != NULL) { + pv_entry_count++; + if (pv_entry_count > pv_entry_high_water) + pagedaemon_wakeup(); + else + return (allocated_pv); + } + + /* + * Reclaim pv entries: At first, destroy mappings to inactive + * pages. After that, if a pv entry is still needed, destroy + * mappings to active pages. + */ + if (ratecheck(&lastprint, &printinterval)) + printf("Approaching the limit on PV entries, " + "increase the vm.pmap.shpgperproc tunable.\n"); + vpq = &vm_page_queues[PQ_INACTIVE]; +retry: + TAILQ_FOREACH(m, &vpq->pl, pageq) { if (m->hold_count || m->busy || (m->flags & PG_BUSY)) continue; - TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; pmap = pv->pv_pmap; if (pmap != locked_pmap && !PMAP_TRYLOCK(pmap)) @@ -1342,7 +1345,7 @@ tpte = *pte; *pte = 0; KASSERT((tpte & PG_W) == 0, - ("pv_entry_reclaim: wired pte %#lx", tpte)); + ("get_pv_entry: wired pte %#lx", tpte)); if ((tpte & PG_FOR) == 0) vm_page_flag_set(m, PG_REFERENCED); if ((tpte & PG_FOW) == 0) { @@ -1358,10 +1361,20 @@ pmap_unuse_pt(pmap, va, pv->pv_ptem); if (pmap != locked_pmap) PMAP_UNLOCK(pmap); - return (pv); + if (allocated_pv == NULL) + allocated_pv = pv; + else + free_pv_entry(pv); + } + } + if (allocated_pv == NULL) { + if (vpq == &vm_page_queues[PQ_INACTIVE]) { + vpq = &vm_page_queues[PQ_ACTIVE]; + goto retry; } + panic("get_pv_entry: increase the vm.pmap.shpgperproc tunable"); } - panic("pv_entry_reclaim: increase vm.pmap.shpgperproc"); + return (allocated_pv); } static int @@ -1408,9 +1421,7 @@ { pv_entry_t pv; - pv = get_pv_entry(); - if (pv == NULL) - pv = pv_entry_reclaim(pmap); + pv = get_pv_entry(pmap); pv->pv_va = va; pv->pv_pmap = pmap; pv->pv_ptem = mpte; ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#128 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.532 2005/11/04 18:03:23 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.533 2005/11/09 08:19:19 alc Exp $"); /* * Manages physical address maps. @@ -185,7 +185,6 @@ static uma_zone_t pvzone; static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; -int pmap_pagedaemon_waken; /* * All those kernel PT submaps that BSD is so fond of @@ -200,8 +199,7 @@ static caddr_t crashdumpmap; static PMAP_INLINE void free_pv_entry(pv_entry_t pv); -static pv_entry_t get_pv_entry(void); -static pv_entry_t pv_entry_reclaim(pmap_t locked_pmap); +static pv_entry_t get_pv_entry(pmap_t locked_pmap); static void pmap_clear_ptes(vm_page_t m, long bit); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, @@ -1428,40 +1426,45 @@ /* * get a new pv_entry, allocating a block from the system * when needed. - * the memory allocation is performed bypassing the malloc code - * because of the possibility of allocations at interrupt time. */ static pv_entry_t -get_pv_entry(void) +get_pv_entry(pmap_t locked_pmap) { - pv_entry_count++; - if ((pv_entry_count > pv_entry_high_water) && - (pmap_pagedaemon_waken == 0)) { - pmap_pagedaemon_waken = 1; - wakeup (&vm_pages_needed); - } - return uma_zalloc(pvzone, M_NOWAIT); -} - -/* - * Reclaim a pv entry by removing a mapping to an inactive page. - */ -static pv_entry_t -pv_entry_reclaim(pmap_t locked_pmap) -{ + static const struct timeval printinterval = { 60, 0 }; + static struct timeval lastprint; + struct vpgqueues *vpq; pd_entry_t ptepde; pmap_t pmap; pt_entry_t *pte, tpte; - pv_entry_t pv; + pv_entry_t allocated_pv, next_pv, pv; vm_offset_t va; vm_page_t m; PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - TAILQ_FOREACH(m, &vm_page_queues[PQ_INACTIVE].pl, pageq) { + allocated_pv = uma_zalloc(pvzone, M_NOWAIT); + if (allocated_pv != NULL) { + pv_entry_count++; + if (pv_entry_count > pv_entry_high_water) + pagedaemon_wakeup(); + else + return (allocated_pv); + } + + /* + * Reclaim pv entries: At first, destroy mappings to inactive + * pages. After that, if a pv entry is still needed, destroy + * mappings to active pages. + */ + if (ratecheck(&lastprint, &printinterval)) + printf("Approaching the limit on PV entries, " + "increase the vm.pmap.shpgperproc tunable.\n"); + vpq = &vm_page_queues[PQ_INACTIVE]; +retry: + TAILQ_FOREACH(m, &vpq->pl, pageq) { if (m->hold_count || m->busy || (m->flags & PG_BUSY)) continue; - TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; pmap = pv->pv_pmap; if (pmap != locked_pmap && !PMAP_TRYLOCK(pmap)) @@ -1470,12 +1473,12 @@ pte = pmap_pte_pde(pmap, va, &ptepde); tpte = pte_load_clear(pte); KASSERT((tpte & PG_W) == 0, - ("pv_entry_reclaim: wired pte %#lx", tpte)); + ("get_pv_entry: wired pte %#lx", tpte)); if (tpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); if (tpte & PG_M) { KASSERT((tpte & PG_RW), - ("pv_entry_reclaim: modified page not writable: va: %#lx, pte: %#lx", + ("get_pv_entry: modified page not writable: va: %#lx, pte: %#lx", va, tpte)); if (pmap_track_modified(va)) vm_page_dirty(m); @@ -1489,10 +1492,20 @@ pmap_unuse_pt(pmap, va, ptepde); if (pmap != locked_pmap) PMAP_UNLOCK(pmap); - return (pv); + if (allocated_pv == NULL) + allocated_pv = pv; + else + free_pv_entry(pv); } } - panic("pv_entry_reclaim: increase vm.pmap.shpgperproc"); + if (allocated_pv == NULL) { + if (vpq == &vm_page_queues[PQ_INACTIVE]) { + vpq = &vm_page_queues[PQ_ACTIVE]; + goto retry; + } + panic("get_pv_entry: increase the vm.pmap.shpgperproc tunable"); + } + return (allocated_pv); } static void @@ -1531,11 +1544,7 @@ { pv_entry_t pv; - pv = get_pv_entry(); - if (pv == NULL) { - pv_entry_count--; - pv = pv_entry_reclaim(pmap); - } + pv = get_pv_entry(pmap); pv->pv_va = va; pv->pv_pmap = pmap; ==== //depot/projects/hammer/sys/conf/files#130 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1063 2005/11/01 22:44:07 jkim Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1064 2005/11/08 22:51:42 vkashyap Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -937,8 +937,10 @@ compile-with "${NORMAL_C} -I$S/dev/twa" dev/twa/tw_cl_misc.c optional twa \ compile-with "${NORMAL_C} -I$S/dev/twa" -dev/twa/tw_osl_cam.c optional twa -dev/twa/tw_osl_freebsd.c optional twa +dev/twa/tw_osl_cam.c optional twa \ + compile-with "${NORMAL_C} -I$S/dev/twa" +dev/twa/tw_osl_freebsd.c optional twa \ + compile-with "${NORMAL_C} -I$S/dev/twa" dev/twe/twe.c optional twe dev/twe/twe_freebsd.c optional twe dev/tx/if_tx.c optional tx ==== //depot/projects/hammer/sys/conf/files.i386#65 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.542 2005/10/28 15:58:18 joerg Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.543 2005/11/09 03:55:39 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -462,3 +462,7 @@ pci/agp_nvidia.c optional agp pci/agp_sis.c optional agp pci/agp_via.c optional agp +i386/xbox/xbox.c optional xbox +i386/xbox/xboxfb.c optional xboxfb +dev/fb/boot_font.c optional xboxfb +i386/xbox/pic16l.s optional xbox ==== //depot/projects/hammer/sys/conf/options.i386#41 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.226 2005/10/24 21:04:18 jhb Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.227 2005/11/09 03:55:39 imp Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -163,3 +163,6 @@ # Debugging STOP_NMI opt_cpu.h NPX_DEBUG opt_npx.h + +# XBOX support in the kernel +XBOX opt_xbox.h ==== //depot/projects/hammer/sys/dev/em/if_em.c#51 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.82 2005/10/31 19:59:40 rwatson Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.84 2005/11/09 15:23:54 glebius Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -187,7 +187,7 @@ static int em_is_valid_ether_addr(u_int8_t *); static int em_sysctl_stats(SYSCTL_HANDLER_ARGS); static int em_sysctl_debug_info(SYSCTL_HANDLER_ARGS); -static u_int32_t em_fill_descriptors (u_int64_t address, +static u_int32_t em_fill_descriptors (bus_addr_t address, u_int32_t length, PDESC_ARRAY desc_array); static int em_sysctl_int_delay(SYSCTL_HANDLER_ARGS); @@ -663,6 +663,17 @@ break; case SIOCSIFMTU: IOCTL_DEBUGOUT("ioctl rcv'd: SIOCSIFMTU (Set Interface MTU)"); +#ifndef __NO_STRICT_ALIGNMENT + if (ifr->ifr_mtu > ETHERMTU) { + /* + * XXX + * Due to the limitation of DMA engine, it needs fix-up + * code for strict alignment architectures. Disable + * jumbo frame until we have better solutions. + */ + error = EINVAL; + } else +#endif if (ifr->ifr_mtu > MAX_JUMBO_FRAME_SIZE - ETHER_HDR_LEN || \ /* 82573 does not support jumbo frames */ (adapter->hw.mac_type == em_82573 && ifr->ifr_mtu > ETHERMTU) ) { @@ -785,7 +796,7 @@ printf("em%d: watchdog timeout -- resetting\n", adapter->unit); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - ifp->if_oerrors++; + adapter->watchdog_events++; em_init_locked(adapter); EM_UNLOCK(adapter); @@ -1008,7 +1019,7 @@ } if (reg_icr & E1000_ICR_RXO) { - log(LOG_WARNING, "%s: RX overrun\n", ifp->if_xname); + adapter->rx_overruns++; wantinit = 1; } } @@ -1158,7 +1169,6 @@ u_int32_t txd_upper; u_int32_t txd_lower, txd_used = 0, txd_saved = 0; int i, j, error; - u_int64_t address; struct mbuf *m_head; @@ -1268,15 +1278,12 @@ for (j = 0; j < nsegs; j++) { /* If adapter is 82544 and on PCIX bus */ if(adapter->pcix_82544) { - array_elements = 0; - address = htole64(segs[j].ds_addr); /* * Check the Address and Length combination and * split the data accordingly */ - array_elements = em_fill_descriptors(address, - htole32(segs[j].ds_len), - &desc_array); + array_elements = em_fill_descriptors(segs[j].ds_addr, + segs[j].ds_len, &desc_array); for (counter = 0; counter < array_elements; counter++) { if (txd_used == adapter->num_tx_desc_avail) { adapter->next_avail_tx_desc = txd_saved; @@ -1740,10 +1747,10 @@ static int em_allocate_pci_resources(struct adapter * adapter) { - int i, val, rid; + int val, rid; device_t dev = adapter->dev; - rid = EM_MMBA; + rid = PCIR_BAR(0); adapter->res_memory = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); if (!(adapter->res_memory)) { @@ -1760,16 +1767,21 @@ if (adapter->hw.mac_type > em_82543) { /* Figure our where our IO BAR is ? */ - rid = EM_MMBA; - for (i = 0; i < 5; i++) { + for (rid = PCIR_BAR(0); rid < PCIR_CIS;) { val = pci_read_config(dev, rid, 4); - if (val & 0x00000001) { + if (E1000_BAR_TYPE(val) == E1000_BAR_TYPE_IO) { adapter->io_rid = rid; break; } rid += 4; + /* check for 64bit BAR */ + if (E1000_BAR_MEM_TYPE(val) == E1000_BAR_MEM_TYPE_64BIT) + rid += 4; } - + if (rid >= PCIR_CIS) { + printf("em%d: Unable to locate IO BAR\n", adapter->unit); + return (ENXIO); + } adapter->res_ioport = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &adapter->io_rid, @@ -1779,9 +1791,11 @@ adapter->unit); return(ENXIO); } - - adapter->hw.io_base = - rman_get_start(adapter->res_ioport); + adapter->hw.io_base = 0; + adapter->osdep.io_bus_space_tag = + rman_get_bustag(adapter->res_ioport); + adapter->osdep.io_bus_space_handle = + rman_get_bushandle(adapter->res_ioport); } rid = 0x0; @@ -1819,7 +1833,7 @@ adapter->res_interrupt); } if (adapter->res_memory != NULL) { - bus_release_resource(dev, SYS_RES_MEMORY, EM_MMBA, + bus_release_resource(dev, SYS_RES_MEMORY, PCIR_BAR(0), adapter->res_memory); } @@ -2068,12 +2082,13 @@ goto fail_2; } + dma->dma_paddr = 0; r = bus_dmamap_load(dma->dma_tag, dma->dma_map, dma->dma_vaddr, size, em_dmamap_cb, &dma->dma_paddr, mapflags | BUS_DMA_NOWAIT); - if (r != 0) { + if (r != 0 || dma->dma_paddr == 0) { printf("em%d: em_dma_malloc: bus_dmamap_load failed; " "error %u\n", adapter->unit, r); goto fail_3; @@ -2475,10 +2490,11 @@ * Using memory from the mbuf cluster pool, invoke the * bus_dma machinery to arrange the memory mapping. */ + paddr = 0; error = bus_dmamap_load(adapter->rxtag, rx_buffer->map, mtod(mp, void *), mp->m_len, em_dmamap_cb, &paddr, 0); - if (error) { + if (error || paddr == 0) { m_free(mp); return(error); } @@ -2750,7 +2766,7 @@ (count != 0) && (ifp->if_drv_flags & IFF_DRV_RUNNING)) { struct mbuf *m = NULL; - + mp = adapter->rx_buffer_area[i].m_head; bus_dmamap_sync(adapter->rxtag, adapter->rx_buffer_area[i].map, BUS_DMASYNC_POSTREAD); @@ -2837,10 +2853,10 @@ em_receive_checksum(adapter, current_desc, adapter->fmp); if (current_desc->status & E1000_RXD_STAT_VP) - VLAN_INPUT_TAG(ifp, adapter->fmp, - (current_desc->special & - E1000_RXD_SPC_VLAN_MASK), - adapter->fmp = NULL); + VLAN_INPUT_TAG(ifp, adapter->fmp, + (le16toh(current_desc->special) & + E1000_RXD_SPC_VLAN_MASK), + adapter->fmp = NULL); m = adapter->fmp; adapter->fmp = NULL; @@ -3025,19 +3041,6 @@ return; } -uint32_t -em_io_read(struct em_hw *hw, unsigned long port) -{ - return(inl(port)); -} - -void -em_io_write(struct em_hw *hw, unsigned long port, uint32_t value) -{ - outl(port, value); - return; -} - /********************************************************************* * 82544 Coexistence issue workaround. * There are 2 issues. @@ -3057,7 +3060,7 @@ * *** *********************************************************************/ static u_int32_t -em_fill_descriptors (u_int64_t address, +em_fill_descriptors (bus_addr_t address, u_int32_t length, PDESC_ARRAY desc_array) { @@ -3190,7 +3193,8 @@ adapter->stats.mpc + adapter->stats.cexterr; /* Tx Errors */ - ifp->if_oerrors = adapter->stats.ecol + adapter->stats.latecol; + ifp->if_oerrors = adapter->stats.ecol + adapter->stats.latecol + + adapter->watchdog_events; } @@ -3269,6 +3273,9 @@ (long long)adapter->stats.algnerrc); printf("em%d: Carrier extension errors = %lld\n", unit, (long long)adapter->stats.cexterr); + printf("em%d: RX overruns = %ld\n", unit, adapter->rx_overruns); + printf("em%d: watchdog timeouts = %ld\n", unit, + adapter->watchdog_events); printf("em%d: XON Rcvd = %lld\n", unit, (long long)adapter->stats.xonrxc); ==== //depot/projects/hammer/sys/dev/em/if_em.h#25 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.35 2005/10/20 09:55:49 glebius Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.37 2005/11/09 15:23:54 glebius Exp $*/ #ifndef _EM_H_DEFINED_ #define _EM_H_DEFINED_ @@ -39,23 +39,27 @@ #include #include +#include +#include +#include #include -#include -#include #include -#include #include +#include #include #include -#include + +#include +#include +#include +#include +#include #include #include -#include #include #include -#include #include #include @@ -65,17 +69,8 @@ #include #include -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include #include @@ -391,6 +386,8 @@ unsigned long no_tx_desc_avail2; unsigned long no_tx_map_avail; unsigned long no_tx_dma_setup; + unsigned long watchdog_events; + unsigned long rx_overruns; /* Used in for 82547 10Mb Half workaround */ #define EM_PBA_BYTES_SHIFT 0xA ==== //depot/projects/hammer/sys/dev/em/if_em_hw.h#15 (text+ko) ==== @@ -31,7 +31,7 @@ *******************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em_hw.h,v 1.16 2005/10/20 08:46:43 glebius Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em_hw.h,v 1.17 2005/11/09 08:43:18 yongari Exp $*/ /* if_em_hw.h * Structures, enums, and macros for the MAC */ @@ -425,9 +425,7 @@ void em_read_pci_cfg(struct em_hw *hw, uint32_t reg, uint16_t * value); void em_write_pci_cfg(struct em_hw *hw, uint32_t reg, uint16_t * value); /* Port I/O is only supported on 82544 and newer */ -uint32_t em_io_read(struct em_hw *hw, unsigned long port); uint32_t em_read_reg_io(struct em_hw *hw, uint32_t offset); -void em_io_write(struct em_hw *hw, unsigned long port, uint32_t value); void em_write_reg_io(struct em_hw *hw, uint32_t offset, uint32_t value); int32_t em_config_dsp_after_link_change(struct em_hw *hw, boolean_t link_up); int32_t em_set_d3_lplu_state(struct em_hw *hw, boolean_t active); @@ -445,6 +443,15 @@ int32_t em_commit_shadow_ram(struct em_hw *hw); uint8_t em_arc_subsystem_valid(struct em_hw *hw); +#define E1000_BAR_TYPE(v) ((v) & E1000_BAR_TYPE_MASK) +#define E1000_BAR_TYPE_MASK 0x00000001 +#define E1000_BAR_TYPE_MEM 0x00000000 +#define E1000_BAR_TYPE_IO 0x00000001 +#define E1000_BAR_MEM_TYPE(v) ((v) & E1000_BAR_MEM_TYPE_MASK) +#define E1000_BAR_MEM_TYPE_MASK 0x00000006 +#define E1000_BAR_MEM_TYPE_32BIT 0x00000000 +#define E1000_BAR_MEM_TYPE_64BIT 0x00000004 + #define E1000_READ_REG_IO(a, reg) \ em_read_reg_io((a), E1000_##reg) #define E1000_WRITE_REG_IO(a, reg, val) \ ==== //depot/projects/hammer/sys/dev/em/if_em_osdep.h#10 (text+ko) ==== @@ -31,33 +31,25 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em_osdep.h,v 1.14 2005/05/26 23:32:02 tackerman Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em_osdep.h,v 1.15 2005/11/09 08:43:18 yongari Exp $*/ #ifndef _FREEBSD_OS_H_ #define _FREEBSD_OS_H_ #include -#include #include +#include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 10 01:44:26 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B284716A422; Thu, 10 Nov 2005 01:44: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 7C96F16A41F for ; Thu, 10 Nov 2005 01:44:25 +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 2C88B43D48 for ; Thu, 10 Nov 2005 01:44:25 +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 jAA1iPML029418 for ; Thu, 10 Nov 2005 01:44:25 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAA1iOa6029415 for perforce@freebsd.org; Thu, 10 Nov 2005 01:44:24 GMT (envelope-from peter@freebsd.org) Date: Thu, 10 Nov 2005 01:44:24 GMT Message-Id: <200511100144.jAA1iOa6029415@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 86565 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, 10 Nov 2005 01:44:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=86565 Change 86565 by peter@peter_daintree on 2005/11/10 01:44:13 Integrate -b i386_hammer (but leave out the XBOX stuff) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#146 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#84 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#86 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#48 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#23 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#146 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#84 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#86 (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.1210) +# (XXX from i386:NOTES,v 1.1211) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.47 2005/10/31 20:45:37 jhb Exp $ # ==== //depot/projects/hammer/sys/amd64/isa/clock.c#48 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#23 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Nov 10 11:42:47 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5596F16A422; Thu, 10 Nov 2005 11: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 DBC1F16A41F for ; Thu, 10 Nov 2005 11:42:46 +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 11EAB43D46 for ; Thu, 10 Nov 2005 11:42:46 +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 jAABgk1t072467 for ; Thu, 10 Nov 2005 11:42:46 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 jAABgdIi072412 for perforce@freebsd.org; Thu, 10 Nov 2005 11:42:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 10 Nov 2005 11:42:39 GMT Message-Id: <200511101142.jAABgdIi072412@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 86592 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, 10 Nov 2005 11:42:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=86592 Change 86592 by rwatson@rwatson_zoo on 2005/11/10 11:41:40 Further integrate TrustedBSD base from FreeBSD CVS in order to pick up some build fixes and files that required special integration flags: - lmc driver parts - libarchive fixes - if_em, twa driver updates - further mbuf memory tweaks - pmap updates for alpha, amd64, powerpc, ia64 - more NDIS magic - XBOX - file descriptor debugging - SIGCHLD now queued - sparse protocol and domain structure definitions - more aio fixes - mount error messages - cloning code maintains ifnet driver lists, so fewer drivers have to Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#66 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.1#29 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#26 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#33 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ppp#4 branch .. //depot/projects/trustedbsd/base/lib/bind/bind/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/bind/bind9/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/bind/dns/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/isc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/isccc/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/bind/isccfg/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/bind/lwres/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_private.h#12 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_compress.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_cpio.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_iso9660.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_ustar.c#8 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#8 integrate .. //depot/projects/trustedbsd/base/sbin/kldconfig/kldconfig.c#6 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/ports-supfile#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/lmc.4#4 branch .. //depot/projects/trustedbsd/base/share/man/man4/twa.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man8/rescue.8#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#45 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#23 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pcpu.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/loader/loader.rc#4 branch .. //depot/projects/trustedbsd/base/sys/compat/ndis/ndis_var.h#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_ntoskrnl.c#13 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#91 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#56 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.powerpc#18 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.i386#31 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pflog.c#11 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pfsync.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#46 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pcib.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_resource.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#45 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_osdep.h#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/joy/joy.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/lmc/if_lmc.c#9 branch .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbdevid.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#45 integrate .. //depot/projects/trustedbsd/base/sys/dev/rp/rp.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/si/si_pci.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/si/sireg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_cl.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_cl_externs.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_cl_fwif.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_cl_fwimg.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_cl_ioctl.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_osl.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_osl_cam.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_osl_freebsd.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_osl_includes.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_osl_inline.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_osl_share.h#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#40 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#61 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/PAE#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/XBOX#1 branch .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#53 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#58 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/vm_machdep.c#45 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/xbox.h#1 branch .. //depot/projects/trustedbsd/base/sys/i386/isa/clock.c#31 integrate .. //depot/projects/trustedbsd/base/sys/i386/pci/pci_cfgreg.c#25 integrate .. //depot/projects/trustedbsd/base/sys/i386/xbox/pic16l.s#1 branch .. //depot/projects/trustedbsd/base/sys/i386/xbox/xbox.c#1 branch .. //depot/projects/trustedbsd/base/sys/i386/xbox/xboxfb.c#1 branch .. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#49 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#59 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#45 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#49 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#47 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_power.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_sleepqueue.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_process.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_proto.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#46 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#40 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#68 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#69 integrate .. //depot/projects/trustedbsd/base/sys/modules/i2c/controllers/viapm/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/twa/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#6 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridgevar.h#3 integrate .. //depot/projects/trustedbsd/base/sys/net/if_clone.c#5 integrate .. //depot/projects/trustedbsd/base/sys/net/if_clone.h#3 integrate .. //depot/projects/trustedbsd/base/sys/net/if_disc.c#17 integrate .. //depot/projects/trustedbsd/base/sys/net/if_faith.c#26 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gif.c#29 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gre.c#22 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ppp.c#29 integrate .. //depot/projects/trustedbsd/base/sys/net/if_stf.c#27 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#35 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#29 integrate .. //depot/projects/trustedbsd/base/sys/net/rtsock.c#34 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/at_proto.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_proto.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_eiface.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_ether.c#19 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_fec.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_socket.c#22 integrate .. //depot/projects/trustedbsd/base/sys/netinet/if_ether.c#28 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_gif.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_proto.c#20 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_carp.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_divert.c#29 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_mroute.c#30 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_proto.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/keysock.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netipx/ipx_proto.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netkey/keysock.c#20 integrate .. //depot/projects/trustedbsd/base/sys/netnatm/natm_proto.c#13 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#29 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/mmuvar.h#1 branch .. //depot/projects/trustedbsd/base/sys/powerpc/include/pmap.h#12 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/machdep.c#35 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/mmu_if.m#1 branch .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/pmap.c#35 delete .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/pmap_dispatch.c#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#48 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#52 integrate .. //depot/projects/trustedbsd/base/sys/sys/ata.h#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#33 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#68 integrate .. //depot/projects/trustedbsd/base/sys/sys/signalvar.h#22 integrate .. //depot/projects/trustedbsd/base/sys/sys/wait.h#8 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_extattr.c#28 integrate .. //depot/projects/trustedbsd/base/sys/vm/pmap.h#27 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#54 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#36 integrate .. //depot/projects/trustedbsd/base/tools/regression/sigqueue/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sigqueue/sigqtest2/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sigqueue/sigqtest2/sigqtest2.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sockets/unix_passfd/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sockets/unix_passfd/unix_passfd.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/pkill/pgrep-t.t#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/pkill/pkill-t.t#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/if.c#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/configvers.h#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/create/create.h#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/create/main.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/create/perform.c#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/create/pkg_create.1#12 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#66 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.514 2005/11/03 08:56:39 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.515 2005/11/07 15:03:04 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -481,6 +481,18 @@ SPECIAL_INSTALLCHECKS= # +# Require DESTDIR to be set if installing for a different architecture. +# +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} +SPECIAL_INSTALLCHECKS+= installcheck_DESTDIR +installcheck_DESTDIR: +.if !defined(DESTDIR) || empty(DESTDIR) + @echo "ERROR: Please set DESTDIR!"; \ + false +.endif +.endif + +# # installcheck # # Checks to be sure system is ready for installworld ==== //depot/projects/trustedbsd/base/bin/ls/ls.1#29 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.91 2005/09/06 20:14:39 rse Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.92 2005/11/10 00:02:32 mux Exp $ .\" .Dd September 6, 2005 .Dt LS 1 @@ -40,7 +40,7 @@ .Nd list directory contents .Sh SYNOPSIS .Nm -.Op Fl ABCFGHLPRSTWZabcdfghiklmnopqrstuwx1 +.Op Fl ABCFGHILPRSTWZabcdfghiklmnopqrstuwx1 .Op Ar .Sh DESCRIPTION For each operand that names a @@ -73,6 +73,8 @@ and .Pa .. . Always set for the super-user. +.Fl I +cancel this option. .It Fl B Force printing of non-printable characters (as defined by .Xr ctype 3 @@ -117,6 +119,12 @@ or .Fl l options are specified. +.It Fl I +This option cancels the +.Fl A +option. Usually used by super-user when +.Fl A +is not necessary. .It Fl L If argument is a symbolic link, list the file or directory the link references rather than the link itself. ==== //depot/projects/trustedbsd/base/bin/ls/ls.c#26 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.80 2005/06/03 11:05:58 dd Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.81 2005/11/10 00:02:32 mux Exp $"); #include #include @@ -110,6 +110,8 @@ static int f_kblocks; /* print size in kilobytes */ static int f_listdir; /* list actual directory, not contents */ static int f_listdot; /* list files beginning with . */ +static int f_nolistdot; /* don't list files beginning with . */ +static int f_forcelistdot; /* force list files beginning with . */ int f_longform; /* long listing format */ int f_nonprint; /* show unprintables as ? */ static int f_nosort; /* don't sort output */ @@ -175,13 +177,9 @@ termwidth = atoi(p); } - /* Root is -A automatically. */ - if (!getuid()) - f_listdot = 1; - fts_options = FTS_PHYSICAL; while ((ch = getopt(argc, argv, - "1ABCFGHLPRSTWZabcdfghiklmnopqrstuwx")) != -1) { + "1ABCFGHILPRSTWZabcdfghiklmnopqrstuwx")) != -1) { switch (ch) { /* * The -1, -C, -x and -l options all override each other so @@ -243,10 +241,14 @@ break; case 'a': fts_options |= FTS_SEEDOT; - /* FALLTHROUGH */ + f_forcelistdot = 1; + break; case 'A': f_listdot = 1; break; + case 'I': + f_nolistdot = 1; + break; /* The -d option turns off the -R option. */ case 'd': f_listdir = 1; @@ -326,6 +328,10 @@ argc -= optind; argv += optind; + /* Root is -A automatically. */ + if (!getuid() && !f_nolistdot) + f_listdot = 1; + /* Enabling of colours is conditional on the environment. */ if (getenv("CLICOLOR") && (isatty(STDOUT_FILENO) || getenv("CLICOLOR_FORCE"))) @@ -490,7 +496,8 @@ break; case FTS_D: if (p->fts_level != FTS_ROOTLEVEL && - p->fts_name[0] == '.' && !f_listdot) + p->fts_name[0] == '.' && ((!f_listdot || + f_nolistdot) && !f_forcelistdot)) break; /* @@ -650,7 +657,8 @@ } } else { /* Only display dot file if -a/-A set. */ - if (cur->fts_name[0] == '.' && !f_listdot) { + if (cur->fts_name[0] == '.' && ((!f_listdot || + f_nolistdot) && !f_forcelistdot)) { cur->fts_number = NO_PRINT; continue; } ==== //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#33 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.102 2005/10/03 07:09:40 scottl Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.103 2005/11/08 09:53:28 rwatson Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -48,8 +48,8 @@ .. iicbus .. - lmc - .. + lmc + .. ofw .. pbio ==== //depot/projects/trustedbsd/base/lib/bind/bind/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/bind/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $ +# $FreeBSD: src/lib/bind/bind/Makefile,v 1.5 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -62,9 +62,6 @@ res_mkquery.c res_mkupdate.c res_query.c \ res_send.c res_sendsigned.c res_update.c -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - #.if defined(WITH_BIND_LIBS) #INCS= ${SRCDIR}/include/isc/assertions.h \ # ${SRCDIR}/include/isc/ctl.h \ ==== //depot/projects/trustedbsd/base/lib/bind/bind9/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/bind9/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $ +# $FreeBSD: src/lib/bind/bind9/Makefile,v 1.5 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -14,9 +14,6 @@ CFLAGS+= -I${SRCDIR}/include -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - .if defined(WITH_BIND_LIBS) INCS= ${SRCDIR}/include/bind9/check.h \ ${SRCDIR}/include/bind9/getaddresses.h \ ==== //depot/projects/trustedbsd/base/lib/bind/dns/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/dns/Makefile,v 1.5 2005/03/17 08:35:21 dougb Exp $ +# $FreeBSD: src/lib/bind/dns/Makefile,v 1.6 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -37,8 +37,8 @@ CFLAGS+= -I${SRCDIR}/include/dst -I${SRCDIR}/include -I${SRCDIR} CFLAGS+= -I${.CURDIR} -DPADD= ${CRYPTO_DPADD} ${PTHREAD_DPADD} -LDADD= ${CRYPTO_LDADD} ${PTHREAD_LDADD} +DPADD= ${CRYPTO_DPADD} +LDADD= ${CRYPTO_LDADD} .if defined(WITH_BIND_LIBS) DNSINCS= ${SRCDIR}/include/dns/acl.h \ ==== //depot/projects/trustedbsd/base/lib/bind/isc/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/isc/Makefile,v 1.5 2005/07/25 14:44:09 des Exp $ +# $FreeBSD: src/lib/bind/isc/Makefile,v 1.6 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -38,9 +38,6 @@ CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/nothreads/include CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - .if defined(WITH_BIND_LIBS) INCS= ${SRCDIR}/include/isc/app.h \ ${SRCDIR}/include/isc/assertions.h \ ==== //depot/projects/trustedbsd/base/lib/bind/isccc/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/isccc/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $ +# $FreeBSD: src/lib/bind/isccc/Makefile,v 1.5 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -16,9 +16,6 @@ CFLAGS+= -I${SRCDIR}/include -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - .if defined(WITH_BIND_LIBS) INCS= ${SRCDIR}/include/isccc/alist.h \ ${SRCDIR}/include/isccc/base64.h \ ==== //depot/projects/trustedbsd/base/lib/bind/isccfg/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/isccfg/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $ +# $FreeBSD: src/lib/bind/isccfg/Makefile,v 1.5 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -14,9 +14,6 @@ CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - .if defined(WITH_BIND_LIBS) INCS= ${SRCDIR}/include/isccfg/cfg.h \ ${SRCDIR}/include/isccfg/grammar.h \ ==== //depot/projects/trustedbsd/base/lib/bind/lwres/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/lwres/Makefile,v 1.7 2004/10/24 15:32:30 ru Exp $ +# $FreeBSD: src/lib/bind/lwres/Makefile,v 1.8 2005/11/07 15:22:35 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -24,9 +24,6 @@ CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include CFLAGS+= -I${.CURDIR} -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - .if defined(WITH_BIND_LIBS) MAN= lwres.3 lwres_buffer.3 lwres_config.3 lwres_context.3 \ lwres_gabn.3 lwres_gai_strerror.3 lwres_getaddrinfo.3 \ ==== //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#7 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.25 2005/10/13 05:51:38 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.26 2005/11/08 07:41:03 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -132,6 +132,10 @@ #define ARCHIVE_FORMAT_BASE_MASK 0xff0000U #define ARCHIVE_FORMAT_CPIO 0x10000 #define ARCHIVE_FORMAT_CPIO_POSIX (ARCHIVE_FORMAT_CPIO | 1) +#define ARCHIVE_FORMAT_CPIO_BIN_LE (ARCHIVE_FORMAT_CPIO | 2) +#define ARCHIVE_FORMAT_CPIO_BIN_BE (ARCHIVE_FORMAT_CPIO | 3) +#define ARCHIVE_FORMAT_CPIO_SVR4_NOCRC (ARCHIVE_FORMAT_CPIO | 4) +#define ARCHIVE_FORMAT_CPIO_SVR4_CRC (ARCHIVE_FORMAT_CPIO | 5) #define ARCHIVE_FORMAT_SHAR 0x20000 #define ARCHIVE_FORMAT_SHAR_BASE (ARCHIVE_FORMAT_SHAR | 1) #define ARCHIVE_FORMAT_SHAR_DUMP (ARCHIVE_FORMAT_SHAR | 2) ==== //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#14 (text+ko) ==== @@ -25,10 +25,17 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.32 2005/10/12 03:26:09 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.33 2005/11/08 03:52:42 kientzle Exp $"); #include #include +#ifdef MAJOR_IN_MKDEV +#include +#else +#ifdef MAJOR_IN_SYSMACROS +#include +#endif +#endif #ifdef HAVE_EXT2FS_EXT2_FS_H #include /* for Linux file flags */ #endif ==== //depot/projects/trustedbsd/base/lib/libarchive/archive_private.h#12 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.20 2005/09/24 21:15:00 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.21 2005/11/08 07:44:39 kientzle Exp $ */ #ifndef ARCHIVE_PRIVATE_H_INCLUDED @@ -157,7 +157,7 @@ int (*read_data_skip)(struct archive *); int (*cleanup)(struct archive *); void *format_data; /* Format-specific data for readers. */ - } formats[4]; + } formats[8]; struct archive_format_descriptor *format; /* Active format. */ /* ==== //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_compress.c#4 (text+ko) ==== @@ -65,7 +65,7 @@ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_compress.c,v 1.3 2004/10/17 23:40:10 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_compress.c,v 1.4 2005/11/08 07:42:42 kientzle Exp $"); #include #include @@ -200,6 +200,7 @@ return (ARCHIVE_FATAL); } memset(state, 0, sizeof(*state)); + a->compression_data = state; state->uncompressed_buffer_size = 64 * 1024; state->uncompressed_buffer = malloc(state->uncompressed_buffer_size); @@ -217,12 +218,19 @@ state->avail_out = state->uncompressed_buffer_size; code = getbits(a, state, 8); - if (code != 037) + if (code != 037) /* This should be impossible. */ goto fatal; code = getbits(a, state, 8); - if (code != 0235) + if (code != 0235) { + /* This can happen if the library is receiving 1-byte + * blocks and gzip and compress are both enabled. + * You can't distinguish gzip and compress only from + * the first byte. */ + archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT, + "Compress signature did not match."); goto fatal; + } code = getbits(a, state, 8); state->maxcode_bits = code & 0x1f; @@ -242,8 +250,6 @@ state->suffix[code] = code; } next_code(a, state); - a->compression_data = state; - return (ARCHIVE_OK); fatal: @@ -331,17 +337,19 @@ finish(struct archive *a) { struct private_data *state; - int ret; + int ret = ARCHIVE_OK; state = a->compression_data; - ret = ARCHIVE_OK; - free(state->uncompressed_buffer); - free(state); + if (state != NULL) { + if (state->uncompressed_buffer != NULL) + free(state->uncompressed_buffer); + free(state); + } a->compression_data = NULL; if (a->client_closer != NULL) - (a->client_closer)(a, a->client_data); + ret = (a->client_closer)(a, a->client_data); return (ret); } ==== //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_cpio.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.14 2005/09/21 04:25:05 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.15 2005/11/08 07:41:03 kientzle Exp $"); #include @@ -317,9 +317,6 @@ const struct cpio_newc_header *header; size_t bytes; - a->archive_format = ARCHIVE_FORMAT_CPIO; - a->archive_format_name = "ASCII cpio (SVR4 with no CRC)"; - /* Read fixed-size portion of header. */ bytes = (a->compression_read_ahead)(a, &h, sizeof(struct cpio_newc_header)); if (bytes < sizeof(struct cpio_newc_header)) @@ -328,6 +325,17 @@ /* Parse out hex fields into struct stat. */ header = h; + + if (memcmp(header->c_magic, "070701", 6) == 0) { + a->archive_format = ARCHIVE_FORMAT_CPIO_SVR4_NOCRC; + a->archive_format_name = "ASCII cpio (SVR4 with no CRC)"; + } else if (memcmp(header->c_magic, "070702", 6) == 0) { + a->archive_format = ARCHIVE_FORMAT_CPIO_SVR4_CRC; + a->archive_format_name = "ASCII cpio (SVR4 with CRC)"; + } else { + /* TODO: Abort here? */ + } + st->st_ino = atol16(header->c_ino, sizeof(header->c_ino)); st->st_mode = atol16(header->c_mode, sizeof(header->c_mode)); st->st_uid = atol16(header->c_uid, sizeof(header->c_uid)); @@ -360,7 +368,7 @@ const struct cpio_odc_header *header; size_t bytes; - a->archive_format = ARCHIVE_FORMAT_CPIO; + a->archive_format = ARCHIVE_FORMAT_CPIO_POSIX; a->archive_format_name = "POSIX octet-oriented cpio"; /* Read fixed-size portion of header. */ @@ -404,7 +412,7 @@ const struct cpio_bin_header *header; size_t bytes; - a->archive_format = ARCHIVE_FORMAT_CPIO; + a->archive_format = ARCHIVE_FORMAT_CPIO_BIN_LE; a->archive_format_name = "cpio (little-endian binary)"; /* Read fixed-size portion of header. */ @@ -441,7 +449,7 @@ const struct cpio_bin_header *header; size_t bytes; - a->archive_format = ARCHIVE_FORMAT_CPIO; + a->archive_format = ARCHIVE_FORMAT_CPIO_BIN_BE; a->archive_format_name = "cpio (big-endian binary)"; /* Read fixed-size portion of header. */ ==== //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_iso9660.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.11 2005/11/06 23:38:01 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.12 2005/11/08 07:41:03 kientzle Exp $"); #include @@ -302,10 +302,7 @@ iso9660 = *(a->pformat_data); - if (iso9660->seenRockridge) { - a->archive_format = ARCHIVE_FORMAT_ISO9660_ROCKRIDGE; - a->archive_format_name = "ISO9660 with Rockridge extensions"; - } else { + if (!a->archive_format) { a->archive_format = ARCHIVE_FORMAT_ISO9660; a->archive_format_name = "ISO9660"; } @@ -402,6 +399,12 @@ continue; child = parse_file_info(iso9660, file, dr); add_entry(iso9660, child); + if (iso9660->seenRockridge) { + a->archive_format = + ARCHIVE_FORMAT_ISO9660_ROCKRIDGE; + a->archive_format_name = + "ISO9660 with Rockridge extensions"; + } } } } ==== //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#13 (text+ko) ==== @@ -25,9 +25,16 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.38 2005/10/12 15:38:45 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.39 2005/11/08 03:52:42 kientzle Exp $"); #include +#ifdef MAJOR_IN_MKDEV +#include +#else +#ifdef MAJOR_IN_SYSMACROS +#include +#endif +#endif #include #include /* #include */ /* See archive_platform.h */ ==== //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#15 (text+ko) ==== @@ -25,9 +25,16 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.31 2005/10/12 03:26:09 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.32 2005/11/08 03:52:42 kientzle Exp $"); #include +#ifdef MAJOR_IN_MKDEV +#include +#else +#ifdef MAJOR_IN_SYSMACROS +#include +#endif +#endif #include #include #include ==== //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_ustar.c#8 (text+ko) ==== @@ -25,9 +25,16 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ustar.c,v 1.13 2005/09/21 04:25:06 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ustar.c,v 1.14 2005/11/08 03:52:42 kientzle Exp $"); #include +#ifdef MAJOR_IN_MKDEV +#include +#else +#ifdef MAJOR_IN_SYSMACROS +#include +#endif +#endif #include #include #include ==== //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#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/release/doc/share/misc/dev.archlist.txt,v 1.70 2005/10/25 04:32:42 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.71 2005/11/09 22:05:41 brueffer Exp $ # # @@ -64,7 +64,6 @@ de i386,pc98,alpha,ia64,amd64 dpt i386,ia64,amd64 ed i386,pc98 -em i386,pc98,alpha,ia64,amd64 ep i386,pc98,amd64 esp sparc64 ex i386,amd64 ==== //depot/projects/trustedbsd/base/sbin/kldconfig/kldconfig.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/kldconfig/kldconfig.c,v 1.7 2005/02/10 09:19:29 ru Exp $"); +__FBSDID("$FreeBSD: src/sbin/kldconfig/kldconfig.c,v 1.8 2005/11/07 19:22:20 ru Exp $"); #include #include @@ -270,7 +270,7 @@ while ((p = strsep(&path, ";")) != NULL) if (!uniq) { - if (((pe = malloc(sizeof(pe))) == NULL) || + if (((pe = malloc(sizeof(*pe))) == NULL) || ((pe->path = strdup(p)) == NULL)) { errno = ENOMEM; err(1, "allocating path element"); ==== //depot/projects/trustedbsd/base/share/examples/cvsup/ports-supfile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/cvsup/ports-supfile,v 1.33 2004/12/19 02:31:45 brueffer Exp $ +# $FreeBSD: src/share/examples/cvsup/ports-supfile,v 1.34 2005/11/09 10:14:07 pav Exp $ # # This file contains all of the "CVSup collections" that make up the # FreeBSD-current ports collection. @@ -110,6 +110,7 @@ #ports-misc #ports-multimedia #ports-net +#ports-net-im #ports-net-mgmt #ports-news #ports-palm ==== //depot/projects/trustedbsd/base/share/man/man4/twa.4#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/twa.4,v 1.4 2005/02/27 13:14:28 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/twa.4,v 1.5 2005/11/09 00:23:54 vkashyap Exp $ .\" .Dd August 15, 2004 .Dt TWA 4 @@ -68,6 +68,16 @@ AMCC's 3ware 9500S-12 .It AMCC's 3ware 9500S-12MI +.It +AMCC's 3ware 9500SX-4LP +.It +AMCC's 3ware 9500SX-8LP +.It +AMCC's 3ware 9500SX-12 +.It +AMCC's 3ware 9500SX-12MI +.It +AMCC's 3ware 9500SX-16ML .El .Sh DIAGNOSTICS Whenever the driver encounters a command failure, it prints out an error code in ==== //depot/projects/trustedbsd/base/share/man/man8/rescue.8#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man8/rescue.8,v 1.1 2003/07/28 21:06:38 simon Exp $ +.\" $FreeBSD: src/share/man/man8/rescue.8,v 1.2 2005/11/10 06:36:06 kientzle Exp $ .\" .Dd July 23, 2003 .Os @@ -145,11 +145,12 @@ The .Nm system was written by -.An Tim Kientzle Aq kientzle@acm.org . +.An Tim Kientzle Aq kientzle@FreeBSD.org , +based on ideas taken from NetBSD. This manual page was written by .An Simon L. Nielsen Aq simon@FreeBSD.org , based on text by -.An Tim Kientzle Aq kientzle@acm.org . +.An Tim Kientzle Aq kientzle@FreeBSD.org . .Sh BUGS Most of the .Nm ==== //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#45 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.183 2005/11/04 18:03:23 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.184 2005/11/09 08:19:19 alc Exp $"); #include #include @@ -317,11 +317,9 @@ */ static uma_zone_t pvzone; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; -int pmap_pagedaemon_waken; static PMAP_INLINE void free_pv_entry(pv_entry_t pv); -static pv_entry_t get_pv_entry(void); -static pv_entry_t pv_entry_reclaim(pmap_t locked_pmap); +static pv_entry_t get_pv_entry(pmap_t locked_pmap); static void alpha_protection_init(void); static void pmap_changebit(vm_page_t m, int bit, boolean_t setem); @@ -1300,39 +1298,44 @@ /* * get a new pv_entry, allocating a block from the system * when needed. - * the memory allocation is performed bypassing the malloc code - * because of the possibility of allocations at interrupt time. */ static pv_entry_t -get_pv_entry(void) +get_pv_entry(pmap_t locked_pmap) { - pv_entry_count++; - if ((pv_entry_count > pv_entry_high_water) && - (pmap_pagedaemon_waken == 0)) { - pmap_pagedaemon_waken = 1; - wakeup (&vm_pages_needed); - } - return uma_zalloc(pvzone, M_NOWAIT); -} - -/* - * Reclaim a pv entry by removing a mapping to an inactive page. - */ -static pv_entry_t -pv_entry_reclaim(pmap_t locked_pmap) -{ + static const struct timeval printinterval = { 60, 0 }; + static struct timeval lastprint; + struct vpgqueues *vpq; pmap_t pmap; pt_entry_t *pte, tpte; - pv_entry_t pv; + pv_entry_t allocated_pv, next_pv, pv; vm_offset_t va; vm_page_t m; PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - TAILQ_FOREACH(m, &vm_page_queues[PQ_INACTIVE].pl, pageq) { + allocated_pv = uma_zalloc(pvzone, M_NOWAIT); + if (allocated_pv != NULL) { + pv_entry_count++; + if (pv_entry_count > pv_entry_high_water) + pagedaemon_wakeup(); + else + return (allocated_pv); + } + + /* + * Reclaim pv entries: At first, destroy mappings to inactive + * pages. After that, if a pv entry is still needed, destroy + * mappings to active pages. + */ + if (ratecheck(&lastprint, &printinterval)) + printf("Approaching the limit on PV entries, " + "increase the vm.pmap.shpgperproc tunable.\n"); + vpq = &vm_page_queues[PQ_INACTIVE]; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 10 12:15:46 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE33216A422; Thu, 10 Nov 2005 12:15: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 8C50716A41F for ; Thu, 10 Nov 2005 12:15:45 +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 42CD743D6B for ; Thu, 10 Nov 2005 12:15: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 jAACFbkM075935 for ; Thu, 10 Nov 2005 12:15:38 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 jAACFWJd075846 for perforce@freebsd.org; Thu, 10 Nov 2005 12:15:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 10 Nov 2005 12:15:32 GMT Message-Id: <200511101215.jAACFWJd075846@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 86594 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, 10 Nov 2005 12:15:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=86594 Change 86594 by rwatson@rwatson_zoo on 2005/11/10 12:14:33 Further integrate TrustedBSD MAC branch from TrustedBSD base branch in order to pick up additional changes and fixes from FreeBSD CVS. See @86592 for details. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile.inc1#60 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#29 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#33 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#39 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ppp#4 branch .. //depot/projects/trustedbsd/mac/lib/bind/bind/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/bind/bind9/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/bind/dns/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/isc/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/isccc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/bind/isccfg/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/bind/lwres/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive.h.in#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_entry.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_private.h#9 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_compression_compress.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_cpio.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_iso9660.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_tar.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_pax.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_ustar.c#6 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/misc/dev.archlist.txt#7 integrate .. //depot/projects/trustedbsd/mac/sbin/kldconfig/kldconfig.c#5 integrate .. //depot/projects/trustedbsd/mac/share/examples/cvsup/ports-supfile#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/lmc.4#4 branch .. //depot/projects/trustedbsd/mac/share/man/man4/twa.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man8/rescue.8#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/pmap.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/pmap.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/pcpu.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/loader/loader.rc#4 branch .. //depot/projects/trustedbsd/mac/sys/compat/ndis/ndis_var.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/subr_ntoskrnl.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#122 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#49 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.powerpc#17 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.i386#29 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/if_pflog.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/if_pfsync.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi.c#41 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_pcib.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_resource.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.h#28 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_hw.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_osdep.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/joy/joy.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/lmc/if_lmc.c#11 branch .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbbdevid.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pci/pci.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/dev/rp/rp.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/si/si_pci.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/si/sireg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twa/tw_cl.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twa/tw_cl_externs.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twa/tw_cl_fwif.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twa/tw_cl_fwimg.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twa/tw_cl_ioctl.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twa/tw_osl.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twa/tw_osl_cam.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twa/tw_osl_freebsd.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twa/tw_osl_includes.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twa/tw_osl_inline.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/twa/tw_osl_share.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#62 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#58 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/PAE#12 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/XBOX#1 branch .. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#51 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#49 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/vm_machdep.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/xbox.h#1 branch .. //depot/projects/trustedbsd/mac/sys/i386/isa/clock.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_cfgreg.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/i386/xbox/pic16l.s#1 branch .. //depot/projects/trustedbsd/mac/sys/i386/xbox/xbox.c#1 branch .. //depot/projects/trustedbsd/mac/sys/i386/xbox/xboxfb.c#1 branch .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/pmap.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#60 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#46 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#49 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_power.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_sleepqueue.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_process.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_proto.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#46 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#78 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#83 integrate .. //depot/projects/trustedbsd/mac/sys/modules/i2c/controllers/viapm/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/twa/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_bridge.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_bridgevar.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_clone.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_clone.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_disc.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_faith.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_gif.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_gre.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_stf.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_var.h#35 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/net/rtsock.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/at_proto.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_proto.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/socket/ng_btsocket.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_eiface.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ether.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_fec.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_socket.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/if_ether.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_gif.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_proto.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_carp.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_divert.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_mroute.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6_proto.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/keysock.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/netipx/ipx_proto.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netkey/keysock.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/netnatm/natm_proto.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/conf/NOTES#25 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/include/mmuvar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/powerpc/include/pmap.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/machdep.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/mmu_if.m#1 branch .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/pmap.c#32 delete .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/pmap_dispatch.c#1 branch .. //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#44 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#46 integrate .. //depot/projects/trustedbsd/mac/sys/sys/ata.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mount.h#41 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#65 integrate .. //depot/projects/trustedbsd/mac/sys/sys/signalvar.h#21 integrate .. //depot/projects/trustedbsd/mac/sys/sys/wait.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_extattr.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/vm/pmap.h#26 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#46 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.c#31 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sigqueue/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sigqueue/sigqtest2/Makefile#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sigqueue/sigqtest2/sigqtest2.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sockets/unix_passfd/Makefile#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sockets/unix_passfd/unix_passfd.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/pkill/pgrep-t.t#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/pkill/pkill-t.t#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/netstat/if.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/config/configvers.h#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/create/create.h#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/create/main.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/create/perform.c#13 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/create/pkg_create.1#12 integrate Differences ... ==== //depot/projects/trustedbsd/mac/Makefile.inc1#60 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.514 2005/11/03 08:56:39 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.515 2005/11/07 15:03:04 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -481,6 +481,18 @@ SPECIAL_INSTALLCHECKS= # +# Require DESTDIR to be set if installing for a different architecture. +# +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} +SPECIAL_INSTALLCHECKS+= installcheck_DESTDIR +installcheck_DESTDIR: +.if !defined(DESTDIR) || empty(DESTDIR) + @echo "ERROR: Please set DESTDIR!"; \ + false +.endif +.endif + +# # installcheck # # Checks to be sure system is ready for installworld ==== //depot/projects/trustedbsd/mac/bin/ls/ls.1#29 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.91 2005/09/06 20:14:39 rse Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.92 2005/11/10 00:02:32 mux Exp $ .\" .Dd September 6, 2005 .Dt LS 1 @@ -40,7 +40,7 @@ .Nd list directory contents .Sh SYNOPSIS .Nm -.Op Fl ABCFGHLPRSTWZabcdfghiklmnopqrstuwx1 +.Op Fl ABCFGHILPRSTWZabcdfghiklmnopqrstuwx1 .Op Ar .Sh DESCRIPTION For each operand that names a @@ -73,6 +73,8 @@ and .Pa .. . Always set for the super-user. +.Fl I +cancel this option. .It Fl B Force printing of non-printable characters (as defined by .Xr ctype 3 @@ -117,6 +119,12 @@ or .Fl l options are specified. +.It Fl I +This option cancels the +.Fl A +option. Usually used by super-user when +.Fl A +is not necessary. .It Fl L If argument is a symbolic link, list the file or directory the link references rather than the link itself. ==== //depot/projects/trustedbsd/mac/bin/ls/ls.c#33 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.80 2005/06/03 11:05:58 dd Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.81 2005/11/10 00:02:32 mux Exp $"); #include #include @@ -110,6 +110,8 @@ static int f_kblocks; /* print size in kilobytes */ static int f_listdir; /* list actual directory, not contents */ static int f_listdot; /* list files beginning with . */ +static int f_nolistdot; /* don't list files beginning with . */ +static int f_forcelistdot; /* force list files beginning with . */ int f_longform; /* long listing format */ int f_nonprint; /* show unprintables as ? */ static int f_nosort; /* don't sort output */ @@ -175,13 +177,9 @@ termwidth = atoi(p); } - /* Root is -A automatically. */ - if (!getuid()) - f_listdot = 1; - fts_options = FTS_PHYSICAL; while ((ch = getopt(argc, argv, - "1ABCFGHLPRSTWZabcdfghiklmnopqrstuwx")) != -1) { + "1ABCFGHILPRSTWZabcdfghiklmnopqrstuwx")) != -1) { switch (ch) { /* * The -1, -C, -x and -l options all override each other so @@ -243,10 +241,14 @@ break; case 'a': fts_options |= FTS_SEEDOT; - /* FALLTHROUGH */ + f_forcelistdot = 1; + break; case 'A': f_listdot = 1; break; + case 'I': + f_nolistdot = 1; + break; /* The -d option turns off the -R option. */ case 'd': f_listdir = 1; @@ -326,6 +328,10 @@ argc -= optind; argv += optind; + /* Root is -A automatically. */ + if (!getuid() && !f_nolistdot) + f_listdot = 1; + /* Enabling of colours is conditional on the environment. */ if (getenv("CLICOLOR") && (isatty(STDOUT_FILENO) || getenv("CLICOLOR_FORCE"))) @@ -490,7 +496,8 @@ break; case FTS_D: if (p->fts_level != FTS_ROOTLEVEL && - p->fts_name[0] == '.' && !f_listdot) + p->fts_name[0] == '.' && ((!f_listdot || + f_nolistdot) && !f_forcelistdot)) break; /* @@ -650,7 +657,8 @@ } } else { /* Only display dot file if -a/-A set. */ - if (cur->fts_name[0] == '.' && !f_listdot) { + if (cur->fts_name[0] == '.' && ((!f_listdot || + f_nolistdot) && !f_forcelistdot)) { cur->fts_number = NO_PRINT; continue; } ==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#39 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.102 2005/10/03 07:09:40 scottl Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.103 2005/11/08 09:53:28 rwatson Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -48,8 +48,8 @@ .. iicbus .. - lmc - .. + lmc + .. ofw .. pbio ==== //depot/projects/trustedbsd/mac/lib/bind/bind/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/bind/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $ +# $FreeBSD: src/lib/bind/bind/Makefile,v 1.5 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -62,9 +62,6 @@ res_mkquery.c res_mkupdate.c res_query.c \ res_send.c res_sendsigned.c res_update.c -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - #.if defined(WITH_BIND_LIBS) #INCS= ${SRCDIR}/include/isc/assertions.h \ # ${SRCDIR}/include/isc/ctl.h \ ==== //depot/projects/trustedbsd/mac/lib/bind/bind9/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/bind9/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $ +# $FreeBSD: src/lib/bind/bind9/Makefile,v 1.5 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -14,9 +14,6 @@ CFLAGS+= -I${SRCDIR}/include -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - .if defined(WITH_BIND_LIBS) INCS= ${SRCDIR}/include/bind9/check.h \ ${SRCDIR}/include/bind9/getaddresses.h \ ==== //depot/projects/trustedbsd/mac/lib/bind/dns/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/dns/Makefile,v 1.5 2005/03/17 08:35:21 dougb Exp $ +# $FreeBSD: src/lib/bind/dns/Makefile,v 1.6 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -37,8 +37,8 @@ CFLAGS+= -I${SRCDIR}/include/dst -I${SRCDIR}/include -I${SRCDIR} CFLAGS+= -I${.CURDIR} -DPADD= ${CRYPTO_DPADD} ${PTHREAD_DPADD} -LDADD= ${CRYPTO_LDADD} ${PTHREAD_LDADD} +DPADD= ${CRYPTO_DPADD} +LDADD= ${CRYPTO_LDADD} .if defined(WITH_BIND_LIBS) DNSINCS= ${SRCDIR}/include/dns/acl.h \ ==== //depot/projects/trustedbsd/mac/lib/bind/isc/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/isc/Makefile,v 1.5 2005/07/25 14:44:09 des Exp $ +# $FreeBSD: src/lib/bind/isc/Makefile,v 1.6 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -38,9 +38,6 @@ CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/nothreads/include CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - .if defined(WITH_BIND_LIBS) INCS= ${SRCDIR}/include/isc/app.h \ ${SRCDIR}/include/isc/assertions.h \ ==== //depot/projects/trustedbsd/mac/lib/bind/isccc/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/isccc/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $ +# $FreeBSD: src/lib/bind/isccc/Makefile,v 1.5 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -16,9 +16,6 @@ CFLAGS+= -I${SRCDIR}/include -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - .if defined(WITH_BIND_LIBS) INCS= ${SRCDIR}/include/isccc/alist.h \ ${SRCDIR}/include/isccc/base64.h \ ==== //depot/projects/trustedbsd/mac/lib/bind/isccfg/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/isccfg/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $ +# $FreeBSD: src/lib/bind/isccfg/Makefile,v 1.5 2005/11/07 15:22:34 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -14,9 +14,6 @@ CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - .if defined(WITH_BIND_LIBS) INCS= ${SRCDIR}/include/isccfg/cfg.h \ ${SRCDIR}/include/isccfg/grammar.h \ ==== //depot/projects/trustedbsd/mac/lib/bind/lwres/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/lwres/Makefile,v 1.7 2004/10/24 15:32:30 ru Exp $ +# $FreeBSD: src/lib/bind/lwres/Makefile,v 1.8 2005/11/07 15:22:35 ru Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -24,9 +24,6 @@ CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include CFLAGS+= -I${.CURDIR} -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - .if defined(WITH_BIND_LIBS) MAN= lwres.3 lwres_buffer.3 lwres_config.3 lwres_context.3 \ lwres_gabn.3 lwres_gai_strerror.3 lwres_getaddrinfo.3 \ ==== //depot/projects/trustedbsd/mac/lib/libarchive/archive.h.in#6 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.25 2005/10/13 05:51:38 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.26 2005/11/08 07:41:03 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -132,6 +132,10 @@ #define ARCHIVE_FORMAT_BASE_MASK 0xff0000U #define ARCHIVE_FORMAT_CPIO 0x10000 #define ARCHIVE_FORMAT_CPIO_POSIX (ARCHIVE_FORMAT_CPIO | 1) +#define ARCHIVE_FORMAT_CPIO_BIN_LE (ARCHIVE_FORMAT_CPIO | 2) +#define ARCHIVE_FORMAT_CPIO_BIN_BE (ARCHIVE_FORMAT_CPIO | 3) +#define ARCHIVE_FORMAT_CPIO_SVR4_NOCRC (ARCHIVE_FORMAT_CPIO | 4) +#define ARCHIVE_FORMAT_CPIO_SVR4_CRC (ARCHIVE_FORMAT_CPIO | 5) #define ARCHIVE_FORMAT_SHAR 0x20000 #define ARCHIVE_FORMAT_SHAR_BASE (ARCHIVE_FORMAT_SHAR | 1) #define ARCHIVE_FORMAT_SHAR_DUMP (ARCHIVE_FORMAT_SHAR | 2) ==== //depot/projects/trustedbsd/mac/lib/libarchive/archive_entry.c#10 (text+ko) ==== @@ -25,10 +25,17 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.32 2005/10/12 03:26:09 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.33 2005/11/08 03:52:42 kientzle Exp $"); #include #include +#ifdef MAJOR_IN_MKDEV +#include +#else +#ifdef MAJOR_IN_SYSMACROS +#include +#endif +#endif #ifdef HAVE_EXT2FS_EXT2_FS_H #include /* for Linux file flags */ #endif ==== //depot/projects/trustedbsd/mac/lib/libarchive/archive_private.h#9 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.20 2005/09/24 21:15:00 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.21 2005/11/08 07:44:39 kientzle Exp $ */ #ifndef ARCHIVE_PRIVATE_H_INCLUDED @@ -157,7 +157,7 @@ int (*read_data_skip)(struct archive *); int (*cleanup)(struct archive *); void *format_data; /* Format-specific data for readers. */ - } formats[4]; + } formats[8]; struct archive_format_descriptor *format; /* Active format. */ /* ==== //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_compression_compress.c#3 (text+ko) ==== @@ -65,7 +65,7 @@ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_compress.c,v 1.3 2004/10/17 23:40:10 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_compress.c,v 1.4 2005/11/08 07:42:42 kientzle Exp $"); #include #include @@ -200,6 +200,7 @@ return (ARCHIVE_FATAL); } memset(state, 0, sizeof(*state)); + a->compression_data = state; state->uncompressed_buffer_size = 64 * 1024; state->uncompressed_buffer = malloc(state->uncompressed_buffer_size); @@ -217,12 +218,19 @@ state->avail_out = state->uncompressed_buffer_size; code = getbits(a, state, 8); - if (code != 037) + if (code != 037) /* This should be impossible. */ goto fatal; code = getbits(a, state, 8); - if (code != 0235) + if (code != 0235) { + /* This can happen if the library is receiving 1-byte + * blocks and gzip and compress are both enabled. + * You can't distinguish gzip and compress only from + * the first byte. */ + archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT, + "Compress signature did not match."); goto fatal; + } code = getbits(a, state, 8); state->maxcode_bits = code & 0x1f; @@ -242,8 +250,6 @@ state->suffix[code] = code; } next_code(a, state); - a->compression_data = state; - return (ARCHIVE_OK); fatal: @@ -331,17 +337,19 @@ finish(struct archive *a) { struct private_data *state; - int ret; + int ret = ARCHIVE_OK; state = a->compression_data; - ret = ARCHIVE_OK; - free(state->uncompressed_buffer); - free(state); + if (state != NULL) { + if (state->uncompressed_buffer != NULL) + free(state->uncompressed_buffer); + free(state); + } a->compression_data = NULL; if (a->client_closer != NULL) - (a->client_closer)(a, a->client_data); + ret = (a->client_closer)(a, a->client_data); return (ret); } ==== //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_cpio.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.14 2005/09/21 04:25:05 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.15 2005/11/08 07:41:03 kientzle Exp $"); #include @@ -317,9 +317,6 @@ const struct cpio_newc_header *header; size_t bytes; - a->archive_format = ARCHIVE_FORMAT_CPIO; - a->archive_format_name = "ASCII cpio (SVR4 with no CRC)"; - /* Read fixed-size portion of header. */ bytes = (a->compression_read_ahead)(a, &h, sizeof(struct cpio_newc_header)); if (bytes < sizeof(struct cpio_newc_header)) @@ -328,6 +325,17 @@ /* Parse out hex fields into struct stat. */ header = h; + + if (memcmp(header->c_magic, "070701", 6) == 0) { + a->archive_format = ARCHIVE_FORMAT_CPIO_SVR4_NOCRC; + a->archive_format_name = "ASCII cpio (SVR4 with no CRC)"; + } else if (memcmp(header->c_magic, "070702", 6) == 0) { + a->archive_format = ARCHIVE_FORMAT_CPIO_SVR4_CRC; + a->archive_format_name = "ASCII cpio (SVR4 with CRC)"; + } else { + /* TODO: Abort here? */ + } + st->st_ino = atol16(header->c_ino, sizeof(header->c_ino)); st->st_mode = atol16(header->c_mode, sizeof(header->c_mode)); st->st_uid = atol16(header->c_uid, sizeof(header->c_uid)); @@ -360,7 +368,7 @@ const struct cpio_odc_header *header; size_t bytes; - a->archive_format = ARCHIVE_FORMAT_CPIO; + a->archive_format = ARCHIVE_FORMAT_CPIO_POSIX; a->archive_format_name = "POSIX octet-oriented cpio"; /* Read fixed-size portion of header. */ @@ -404,7 +412,7 @@ const struct cpio_bin_header *header; size_t bytes; - a->archive_format = ARCHIVE_FORMAT_CPIO; + a->archive_format = ARCHIVE_FORMAT_CPIO_BIN_LE; a->archive_format_name = "cpio (little-endian binary)"; /* Read fixed-size portion of header. */ @@ -441,7 +449,7 @@ const struct cpio_bin_header *header; size_t bytes; - a->archive_format = ARCHIVE_FORMAT_CPIO; + a->archive_format = ARCHIVE_FORMAT_CPIO_BIN_BE; a->archive_format_name = "cpio (big-endian binary)"; /* Read fixed-size portion of header. */ ==== //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_iso9660.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.11 2005/11/06 23:38:01 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.12 2005/11/08 07:41:03 kientzle Exp $"); #include @@ -302,10 +302,7 @@ iso9660 = *(a->pformat_data); - if (iso9660->seenRockridge) { - a->archive_format = ARCHIVE_FORMAT_ISO9660_ROCKRIDGE; - a->archive_format_name = "ISO9660 with Rockridge extensions"; - } else { + if (!a->archive_format) { a->archive_format = ARCHIVE_FORMAT_ISO9660; a->archive_format_name = "ISO9660"; } @@ -402,6 +399,12 @@ continue; child = parse_file_info(iso9660, file, dr); add_entry(iso9660, child); + if (iso9660->seenRockridge) { + a->archive_format = + ARCHIVE_FORMAT_ISO9660_ROCKRIDGE; + a->archive_format_name = + "ISO9660 with Rockridge extensions"; + } } } } ==== //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_tar.c#9 (text+ko) ==== @@ -25,9 +25,16 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.38 2005/10/12 15:38:45 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.39 2005/11/08 03:52:42 kientzle Exp $"); #include +#ifdef MAJOR_IN_MKDEV +#include +#else +#ifdef MAJOR_IN_SYSMACROS +#include +#endif +#endif #include #include /* #include */ /* See archive_platform.h */ ==== //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_pax.c#11 (text+ko) ==== @@ -25,9 +25,16 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.31 2005/10/12 03:26:09 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.32 2005/11/08 03:52:42 kientzle Exp $"); #include +#ifdef MAJOR_IN_MKDEV +#include +#else +#ifdef MAJOR_IN_SYSMACROS +#include +#endif +#endif #include #include #include ==== //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_ustar.c#6 (text+ko) ==== @@ -25,9 +25,16 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ustar.c,v 1.13 2005/09/21 04:25:06 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ustar.c,v 1.14 2005/11/08 03:52:42 kientzle Exp $"); #include +#ifdef MAJOR_IN_MKDEV +#include +#else +#ifdef MAJOR_IN_SYSMACROS +#include +#endif +#endif #include #include #include ==== //depot/projects/trustedbsd/mac/release/doc/share/misc/dev.archlist.txt#7 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.70 2005/10/25 04:32:42 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.71 2005/11/09 22:05:41 brueffer Exp $ # # @@ -64,7 +64,6 @@ de i386,pc98,alpha,ia64,amd64 dpt i386,ia64,amd64 ed i386,pc98 -em i386,pc98,alpha,ia64,amd64 ep i386,pc98,amd64 esp sparc64 ex i386,amd64 ==== //depot/projects/trustedbsd/mac/sbin/kldconfig/kldconfig.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/kldconfig/kldconfig.c,v 1.7 2005/02/10 09:19:29 ru Exp $"); +__FBSDID("$FreeBSD: src/sbin/kldconfig/kldconfig.c,v 1.8 2005/11/07 19:22:20 ru Exp $"); #include #include @@ -270,7 +270,7 @@ while ((p = strsep(&path, ";")) != NULL) if (!uniq) { - if (((pe = malloc(sizeof(pe))) == NULL) || + if (((pe = malloc(sizeof(*pe))) == NULL) || ((pe->path = strdup(p)) == NULL)) { errno = ENOMEM; err(1, "allocating path element"); ==== //depot/projects/trustedbsd/mac/share/examples/cvsup/ports-supfile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/cvsup/ports-supfile,v 1.33 2004/12/19 02:31:45 brueffer Exp $ +# $FreeBSD: src/share/examples/cvsup/ports-supfile,v 1.34 2005/11/09 10:14:07 pav Exp $ # # This file contains all of the "CVSup collections" that make up the # FreeBSD-current ports collection. @@ -110,6 +110,7 @@ #ports-misc #ports-multimedia #ports-net +#ports-net-im #ports-net-mgmt #ports-news #ports-palm ==== //depot/projects/trustedbsd/mac/share/man/man4/twa.4#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/twa.4,v 1.4 2005/02/27 13:14:28 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/twa.4,v 1.5 2005/11/09 00:23:54 vkashyap Exp $ .\" .Dd August 15, 2004 .Dt TWA 4 @@ -68,6 +68,16 @@ AMCC's 3ware 9500S-12 .It AMCC's 3ware 9500S-12MI +.It +AMCC's 3ware 9500SX-4LP +.It +AMCC's 3ware 9500SX-8LP +.It +AMCC's 3ware 9500SX-12 +.It +AMCC's 3ware 9500SX-12MI +.It +AMCC's 3ware 9500SX-16ML .El .Sh DIAGNOSTICS Whenever the driver encounters a command failure, it prints out an error code in ==== //depot/projects/trustedbsd/mac/share/man/man8/rescue.8#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man8/rescue.8,v 1.1 2003/07/28 21:06:38 simon Exp $ +.\" $FreeBSD: src/share/man/man8/rescue.8,v 1.2 2005/11/10 06:36:06 kientzle Exp $ .\" .Dd July 23, 2003 .Os @@ -145,11 +145,12 @@ The .Nm system was written by -.An Tim Kientzle Aq kientzle@acm.org . +.An Tim Kientzle Aq kientzle@FreeBSD.org , +based on ideas taken from NetBSD. This manual page was written by .An Simon L. Nielsen Aq simon@FreeBSD.org , based on text by -.An Tim Kientzle Aq kientzle@acm.org . +.An Tim Kientzle Aq kientzle@FreeBSD.org . .Sh BUGS Most of the .Nm ==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/pmap.c#39 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.183 2005/11/04 18:03:23 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.184 2005/11/09 08:19:19 alc Exp $"); #include #include @@ -317,11 +317,9 @@ */ static uma_zone_t pvzone; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; -int pmap_pagedaemon_waken; static PMAP_INLINE void free_pv_entry(pv_entry_t pv); -static pv_entry_t get_pv_entry(void); -static pv_entry_t pv_entry_reclaim(pmap_t locked_pmap); +static pv_entry_t get_pv_entry(pmap_t locked_pmap); static void alpha_protection_init(void); static void pmap_changebit(vm_page_t m, int bit, boolean_t setem); @@ -1300,39 +1298,44 @@ /* * get a new pv_entry, allocating a block from the system * when needed. - * the memory allocation is performed bypassing the malloc code - * because of the possibility of allocations at interrupt time. */ static pv_entry_t -get_pv_entry(void) +get_pv_entry(pmap_t locked_pmap) { - pv_entry_count++; - if ((pv_entry_count > pv_entry_high_water) && - (pmap_pagedaemon_waken == 0)) { - pmap_pagedaemon_waken = 1; - wakeup (&vm_pages_needed); - } - return uma_zalloc(pvzone, M_NOWAIT); -} - -/* - * Reclaim a pv entry by removing a mapping to an inactive page. - */ -static pv_entry_t -pv_entry_reclaim(pmap_t locked_pmap) -{ + static const struct timeval printinterval = { 60, 0 }; + static struct timeval lastprint; + struct vpgqueues *vpq; pmap_t pmap; pt_entry_t *pte, tpte; - pv_entry_t pv; + pv_entry_t allocated_pv, next_pv, pv; vm_offset_t va; vm_page_t m; PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - TAILQ_FOREACH(m, &vm_page_queues[PQ_INACTIVE].pl, pageq) { + allocated_pv = uma_zalloc(pvzone, M_NOWAIT); + if (allocated_pv != NULL) { + pv_entry_count++; + if (pv_entry_count > pv_entry_high_water) + pagedaemon_wakeup(); + else + return (allocated_pv); + } + + /* + * Reclaim pv entries: At first, destroy mappings to inactive + * pages. After that, if a pv entry is still needed, destroy + * mappings to active pages. + */ + if (ratecheck(&lastprint, &printinterval)) + printf("Approaching the limit on PV entries, " + "increase the vm.pmap.shpgperproc tunable.\n"); + vpq = &vm_page_queues[PQ_INACTIVE]; +retry: + TAILQ_FOREACH(m, &vpq->pl, pageq) { if (m->hold_count || m->busy || (m->flags & PG_BUSY)) continue; - TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; pmap = pv->pv_pmap; if (pmap != locked_pmap && !PMAP_TRYLOCK(pmap)) @@ -1342,7 +1345,7 @@ tpte = *pte; *pte = 0; KASSERT((tpte & PG_W) == 0, - ("pv_entry_reclaim: wired pte %#lx", tpte)); + ("get_pv_entry: wired pte %#lx", tpte)); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 10 15:03:03 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AE3816A422; Thu, 10 Nov 2005 15:03: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 3950416A41F for ; Thu, 10 Nov 2005 15:03: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 03E4443D46 for ; Thu, 10 Nov 2005 15:03: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 jAAF31DF092105 for ; Thu, 10 Nov 2005 15:03: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 jAAF31Up092102 for perforce@freebsd.org; Thu, 10 Nov 2005 15:03:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 10 Nov 2005 15:03:01 GMT Message-Id: <200511101503.jAAF31Up092102@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 86599 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, 10 Nov 2005 15:03:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=86599 Change 86599 by rwatson@rwatson_zoo on 2005/11/10 15:02:32 Fix a merge nit and pass the new name for 'dev' into the MAC Framework. Affected files ... .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_devs.c#23 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_devs.c#23 (text+ko) ==== @@ -417,7 +417,7 @@ de->de_cdp = cdp; #ifdef MAC mac_create_devfs_device(cdp->cdp_c.si_cred, dm->dm_mount, - &cdp->cdp_c, de, dev->si_name); + &cdp->cdp_c, de, cdp->cdp_c.si_name); #endif de->de_dir = dd; TAILQ_INSERT_TAIL(&dd->de_dlist, de, de_list); From owner-p4-projects@FreeBSD.ORG Thu Nov 10 16:38:59 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6ABA316A421; Thu, 10 Nov 2005 16:38: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 02C0316A41F for ; Thu, 10 Nov 2005 16:38:59 +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 C43D043D45 for ; Thu, 10 Nov 2005 16:38:58 +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 jAAGcwqG096707 for ; Thu, 10 Nov 2005 16:38:58 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAAGcwj4096704 for perforce@freebsd.org; Thu, 10 Nov 2005 16:38:58 GMT (envelope-from millert@freebsd.org) Date: Thu, 10 Nov 2005 16:38:58 GMT Message-Id: <200511101638.jAAGcwj4096704@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 86602 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, 10 Nov 2005 16:39:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=86602 Change 86602 by millert@millert_ibook on 2005/11/10 16:38:30 Make ipctrace work again after some intervening framework changes. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/ipctrace/ipctrace.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/ipctrace/ipctrace.c#3 (text+ko) ==== @@ -69,7 +69,7 @@ static void ipctrace_init() { - + printf("ipctrace:: init\n"); tbuf_lock = mutex_alloc(ETAP_MISC_PRINTF); tbuf_size = sizeof(tbuf); tbuf_cur = tbuf; @@ -151,7 +151,7 @@ */ static int -ipctrace_syscall(struct proc *p, int call, void *arg) +ipctrace_syscall(struct proc *p, int call, void *arg, int *retval) { kern_return_t kr; struct ipctrace_call_get out; @@ -207,7 +207,7 @@ static int ipctrace_externalize_label(struct label *l, char *element_name, - struct sbuf *sb, int *claimed) + struct sbuf *sb) { struct ipctrace_label *ll; ll = SLOT(l); @@ -215,7 +215,6 @@ if (ll == NULL || strcmp(element_name, "ipctrace")) return (0); - (*claimed)++; if (ll->portn >= 0) { if (strcmp(ll->itask, ll->ttask)) sbuf_printf(sb, "P:%s:%s:%d", ll->itask, ll->ttask, @@ -389,9 +388,12 @@ .mpo_execve_will_transition = ipctrace_execve_will_transition }; +static char *labelnamespaces[] = {"ipctrace"}; struct mac_policy_conf ipctrace_policy_conf = { "ipctrace", /* policy name */ "IPC Trace Module", /* full name */ + labelnamespaces, /* label namespaces */ + 1, /* namespace count */ &ipctrace_ops, /* policy operations */ 0, /* loadtime flags*/ &ipctrace_slot, /* security field */ From owner-p4-projects@FreeBSD.ORG Thu Nov 10 18:39:28 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6CFA16A426; Thu, 10 Nov 2005 18:39: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 50F5116A422 for ; Thu, 10 Nov 2005 18:39:27 +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 0470443D53 for ; Thu, 10 Nov 2005 18:39:27 +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 jAAIdQn9008828 for ; Thu, 10 Nov 2005 18:39:26 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAAIdQYQ008825 for perforce@freebsd.org; Thu, 10 Nov 2005 18:39:26 GMT (envelope-from millert@freebsd.org) Date: Thu, 10 Nov 2005 18:39:26 GMT Message-Id: <200511101839.jAAIdQYQ008825@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 86609 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, 10 Nov 2005 18:39:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=86609 Change 86609 by millert@millert_ibook on 2005/11/10 18:38:40 Remove #ifdefs and make this Darwin-specific. The #ifdefs just make things more difficult to read and diffing against the sebsd version will give you a better idea of what is different. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#9 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#9 (text+ko) ==== @@ -39,49 +39,33 @@ /* * Try and convert some of the linux kernel routines to something that - * works in FreeBSD. Perhaps a bit dangerous, but the hope is that + * works in Darwin. Perhaps a bit dangerous, but the hope is that * diffs to the SELinux tree will be quite a bit smaller. */ #include -#ifdef __APPLE__ -#include -#include -#else /* Probably FreeBSD */ -#include -#endif - typedef u_int64_t u64; typedef u_int32_t u32; typedef u_int16_t u16; typedef u_int8_t u8; -#if !defined(_KERNEL) && !defined(KERNEL) + #if BYTE_ORDER == LITTLE_ENDIAN #define cpu_to_le32(x) ((__uint32_t)(x)) #define cpu_to_le64(x) ((__uint64_t)(x)) #define le32_to_cpu(x) ((__uint32_t)(x)) #define le64_to_cpu(x) ((__uint64_t)(x)) #else /* BYTE_ORDER != LITTLE_ENDIAN */ - -#ifdef __APPLE__ #define le32_to_cpu(x) NXSwapLittleLongToHost(x) #define le64_to_cpu(x) NXSwapLittleLongLongToHost(x) #define cpu_to_le32(x) NXSwapHostLongToLittle(x) #define cpu_to_le64(x) NXSwapHostLongLongToLittle(x) -#else - -#define cpu_to_le32(x) bswap32((x)) -#define cpu_to_le64(x) bswap64((x)) -#define le32_to_cpu(x) bswap32((x)) -#define le64_to_cpu(x) bswap64((x)) - -#endif #endif /* BYTE_ORDER */ -/* sebsd uses same ss source files for userspace */ +#if !defined(_KERNEL) && !defined(KERNEL) +/* sedarwin uses same ss source files for userspace */ #define kmalloc(size,flags) malloc(size) #define kfree(v) free(v) #define __get_free_page(flags) malloc(PAGE_SIZE) @@ -90,19 +74,6 @@ #else /* _KERNEL */ -#ifdef __APPLE__ -#if BYTE_ORDER == LITTLE_ENDIAN -#define le32_to_cpu(x) ((__uint32_t)(x)) -#define le64_to_cpu(x) ((__uint64_t)(x)) -#else /* BYTE_ORDER != LITTLE_ENDIAN */ -#define le32_to_cpu(x) NXSwapLittleLongToHost(x) -#define le64_to_cpu(x) NXSwapLittleLongLongToHost(x) -#endif -#else -#define le32_to_cpu(a) le32toh(a) -#define le64_to_cpu(a) le64toh(a) -#endif - #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define NIPQUAD(addr) \ @@ -113,33 +84,22 @@ #define __init -/* kmalloc */ - -#include - -#ifdef __APPLE__ - extern void *sebsd_malloc(size_t size, int flags); extern void sebsd_free(void *); +/* BSD-style malloc/free emulation */ +#include #define malloc(size, type, flags) sebsd_malloc(size, flags) #define free(addr, type) sebsd_free(addr) +#define M_SEBSD M_MACTEMP -#define M_SEBSD M_MACTEMP -#else -#ifndef _M_SEBSD_DEF -MALLOC_DECLARE(M_SEBSD); -#define _M_SEBSD_DEF -#endif -#endif /* __APPLE__ */ - +/* Linux-style kmalloc/kfree (note kfree namespace collision) */ #define kmalloc(size, flags) sebsd_malloc(size, flags) -#define kfree(v) sebsd_free(v) +#define kfree(addr) sebsd_free(addr) #define __get_free_page(flags) sebsd_malloc(PAGE_SIZE, flags) #define GFP_ATOMIC M_NOWAIT #define GFP_KERNEL M_WAITOK -#ifdef __APPLE__ /* TBD: no boot-time tunable support yet */ #define TUNABLE_INT_FETCH(str,var) @@ -148,14 +108,6 @@ #define spin_lock_irqsave(m,flags) mutex_lock(*(m)) #define spin_unlock_irqrestore(m,flags) mutex_unlock(*(m)) -#else /* ! __APPLE__ */ - -/* spinlock */ -#define spinlock_t struct mtx -#define spin_lock_irqsave(m,flags) mtx_lock(m) -#define spin_unlock_irqrestore(m,flags) mtx_unlock(m) -#endif /* !__APPLE__ */ - #endif /* _KERNEL */ #define BUG() printf("BUG: %s:%d", __FILE__, __LINE__) @@ -164,8 +116,11 @@ #define wmb() /* printk */ - +#ifdef MACH_KDB +#define printk kprintf +#else #define printk printf +#endif #define KERN_WARNING "warning: " #define KERN_INFO #define KERN_ERR "error: " From owner-p4-projects@FreeBSD.ORG Thu Nov 10 18:50:57 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4376316A422; Thu, 10 Nov 2005 18:50: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 03E7716A420 for ; Thu, 10 Nov 2005 18:50:57 +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 D97AC43D7F for ; Thu, 10 Nov 2005 18:50:48 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAAIofLE010056 for ; Thu, 10 Nov 2005 18:50:41 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAAIofta010053 for perforce@freebsd.org; Thu, 10 Nov 2005 18:50:41 GMT (envelope-from jhb@freebsd.org) Date: Thu, 10 Nov 2005 18:50:41 GMT Message-Id: <200511101850.jAAIofta010053@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 86612 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, 10 Nov 2005 18:50:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=86612 Change 86612 by jhb@jhb_slimer on 2005/11/10 18:50:02 Drop local diff. Affected files ... .. //depot/projects/smpng/sys/sys/_mutex.h#15 edit Differences ... ==== //depot/projects/smpng/sys/sys/_mutex.h#15 (text+ko) ==== @@ -37,7 +37,7 @@ struct mtx { struct lock_object mtx_object; /* Common lock properties. */ volatile uintptr_t mtx_lock; /* Owner and flags. */ - u_int mtx_recurse; /* Number of recursive holds. */ + volatile u_int mtx_recurse; /* Number of recursive holds. */ #ifdef MUTEX_PROFILING /* From owner-p4-projects@FreeBSD.ORG Thu Nov 10 22:33:15 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 467AC16A420; Thu, 10 Nov 2005 22:33: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 CDFED16A422 for ; Thu, 10 Nov 2005 22:33:14 +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 1514943D46 for ; Thu, 10 Nov 2005 22:33:14 +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 jAAMXDna028226 for ; Thu, 10 Nov 2005 22:33:13 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAAMXDUU028223 for perforce@freebsd.org; Thu, 10 Nov 2005 22:33:13 GMT (envelope-from millert@freebsd.org) Date: Thu, 10 Nov 2005 22:33:13 GMT Message-Id: <200511102233.jAAMXDUU028223@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 86623 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, 10 Nov 2005 22:33:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=86623 Change 86623 by millert@millert_ibook on 2005/11/10 22:32:36 Fix 2 compiler warnings due to minor type mismatches Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#18 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#18 (text+ko) ==== @@ -87,7 +87,7 @@ sebsd_malloc_init(void) { int i; - void *prealloc[512]; + vm_offset_t prealloc[512]; for (i = 0; i < 512; i++) { if ((prealloc[i] = kalloc(64)) == NULL) @@ -2601,7 +2601,7 @@ FD__USE, NULL)); } -extern int sebsd_syscall(struct proc *p, int call, void *args); +extern int sebsd_syscall(struct proc *p, int call, void *args, int *retv); static struct mac_policy_ops sebsd_ops = { .mpo_init = sebsd_init, From owner-p4-projects@FreeBSD.ORG Thu Nov 10 22:35:18 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50AAF16A421; Thu, 10 Nov 2005 22:35: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 D518216A41F for ; Thu, 10 Nov 2005 22:35:17 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D75943D46 for ; Thu, 10 Nov 2005 22:35:17 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAAMZG2P028330 for ; Thu, 10 Nov 2005 22:35:17 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAAMZGcg028327 for perforce@freebsd.org; Thu, 10 Nov 2005 22:35:16 GMT (envelope-from millert@freebsd.org) Date: Thu, 10 Nov 2005 22:35:16 GMT Message-Id: <200511102235.jAAMZGcg028327@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 86624 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, 10 Nov 2005 22:35:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=86624 Change 86624 by millert@millert_ibook on 2005/11/10 22:34:15 Remove some #if 0'd cruft for better readability Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#19 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#19 (text+ko) ==== @@ -528,17 +528,7 @@ SLOT(label) = NULL; } -#if 0 static void -sebsd_destroy_label(struct label *label) -{ - - free(SLOT(label), M_SEBSD); - SLOT(label) = NULL; -} -#endif - -static void sebsd_destroy_sysv_label(struct label *label) { @@ -2743,232 +2733,6 @@ #if 0 -static struct mac_policy_ops sebsd_ops_o = { - /* Init Labels */ - .mpo_init_bpfdesc_label = sebsd_init_network_label, - .mpo_init_cred_label = sebsd_init_cred_label, -#if 0 - .mpo_init_devfsdirent_label = sebsd_init_vnode_label, - .mpo_init_file_label = sebsd_init_file_label, -#endif - .mpo_init_ifnet_label = sebsd_init_network_label, - .mpo_init_ipq_label = sebsd_init_network_label_waitcheck, - .mpo_init_mbuf_label = sebsd_init_network_label_waitcheck, -#ifdef HAS_PIPES - .mpo_init_pipe_label = sebsd_init_vnode_label, -#endif - .mpo_init_socket_label = sebsd_init_network_label_waitcheck, - .mpo_init_socket_peer_label = sebsd_init_network_label_waitcheck, - .mpo_init_vnode_label = sebsd_init_vnode_label, - - /* Destroy Labels */ - .mpo_destroy = sebsd_destroy, - .mpo_destroy_bpfdesc_label = sebsd_destroy_label, - .mpo_destroy_cred_label = sebsd_destroy_label, -#ifdef HAS_DEVFS_DIRENT - .mpo_destroy_devfsdirent_label = sebsd_destroy_label, -#endif - .mpo_destroy_ifnet_label = sebsd_destroy_label, - .mpo_destroy_ipq_label = sebsd_destroy_label, - .mpo_destroy_mbuf_label = sebsd_destroy_label, -#if 0 - .mpo_destroy_file_label = sebsd_destroy_label, -#endif -#ifdef HAS_PIPES - .mpo_destroy_pipe_label = sebsd_destroy_label, -#endif - .mpo_destroy_socket_label = sebsd_destroy_label, - .mpo_destroy_socket_peer_label = sebsd_destroy_label, - .mpo_destroy_vnode_label = sebsd_destroy_label, - - /* Copy labels */ -#ifdef HAS_PIPES - .mpo_copy_pipe_label = sebsd_copy_vnode_label, -#endif - .mpo_copy_vnode_label = sebsd_copy_vnode_label, -#if 0 - .mpo_copy_mount_label = sebsd_copy_mount_label, -#endif - -#if 0 - /* In/Out */ - .mpo_externalize_cred_label = sebsd_externalize_cred_label, - .mpo_externalize_cred_audit_label = sebsd_externalize_cred_label, - .mpo_externalize_ifnet_label = sebsd_externalize_network_label, -#ifdef HAS_PIPES - .mpo_externalize_pipe_label = sebsd_externalize_vnode_label, -#endif - .mpo_externalize_socket_label = sebsd_externalize_network_label, - .mpo_externalize_socket_peer_label = sebsd_externalize_network_label, - .mpo_externalize_vnode_label = sebsd_externalize_vnode_label, - .mpo_externalize_vnode_audit_label = sebsd_externalize_vnode_label, - .mpo_externalize_mount_label = sebsd_externalize_mount_label, - .mpo_internalize_cred_label = sebsd_internalize_cred_label, - .mpo_internalize_ifnet_label = sebsd_internalize_network_label, -#ifdef HAS_PIPES - .mpo_internalize_pipe_label = sebsd_internalize_vnode_label, -#endif - .mpo_internalize_socket_label = sebsd_internalize_network_label, - .mpo_internalize_vnode_label = sebsd_internalize_vnode_label, - .mpo_internalize_mount_label = sebsd_internalize_mount_label, -#endif - -#ifdef notdef - void (*mpo_create_mbuf_from_socket)(struct socket *so, - struct label *socketlabel, struct mbuf *m, - struct label *mbuflabel); - void (*mpo_create_socket)(struct ucred *cred, struct socket *so, - struct label *socketlabel); - void (*mpo_create_socket_from_socket)(struct socket *oldsocket, - struct label *oldsocketlabel, struct socket *newsocket, - struct label *newsocketlabel); - void (*mpo_relabel_socket)(struct ucred *cred, struct socket *so, - struct label *oldlabel, struct label *newlabel); - void (*mpo_set_socket_peer_from_mbuf)(struct mbuf *mbuf, - struct label *mbuflabel, struct socket *so, - struct label *socketpeerlabel); - void (*mpo_set_socket_peer_from_socket)(struct socket *oldsocket, - struct label *oldsocketlabel, struct socket *newsocket, - struct label *newsocketpeerlabel); -#endif - - /* Create Labels */ - .mpo_create_cred = sebsd_create_cred, - -#ifdef HAS_DEVFS_DIRENT - .mpo_create_devfs_device = sebsd_create_devfs_device, - .mpo_create_devfs_directory = sebsd_create_devfs_directory, - .mpo_create_devfs_symlink = sebsd_create_devfs_symlink, -#endif -#if 0 - .mpo_create_file = sebsd_create_file, -#endif - /* .mpo_create_mbuf_from_socket = sebsd_create_mbuf_from_socket, */ -#ifdef HAS_PIPES - .mpo_create_pipe = sebsd_create_pipe, -#endif - .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, */ -#ifdef HAS_DEVFS_DIRENT - .mpo_associate_vnode_devfs = sebsd_associate_vnode_devfs, -#endif - .mpo_associate_vnode_singlelabel = sebsd_associate_vnode_singlelabel, -#ifdef HAS_EXTATTRS - .mpo_associate_vnode_extattr = sebsd_associate_vnode_extattr, -#endif - - /* Check Labels */ -#ifdef CAPABILITIES - .mpo_check_cap = sebsd_check_cap, -#endif - .mpo_check_cred_relabel = sebsd_check_cred_relabel, -#if 0 - .mpo_check_file_create = sebsd_check_file_create, - - /* - .mpo_check_file_dup - .mpo_check_file_inherit - .mpo_check_file_ioctl - .mpo_check_file_receive - */ - - .mpo_check_file_get_flags = sebsd_check_file_get_flags, - .mpo_check_file_get_ofileflags = sebsd_check_file_get_ofileflags, - .mpo_check_file_get_offset = sebsd_check_file_get_offset, - .mpo_check_file_change_flags = sebsd_check_file_change_flags, - .mpo_check_file_change_ofileflags = sebsd_check_file_change_ofileflags, - .mpo_check_file_change_offset = sebsd_check_file_change_offset, - .mpo_check_mount = sebsd_check_mount, - .mpo_check_umount = sebsd_check_umount, - .mpo_check_remount = sebsd_check_remount, - .mpo_check_mount_stat = sebsd_check_mount_stat, -#endif - -#ifdef HAS_PIPES - .mpo_check_pipe_ioctl = sebsd_check_pipe_ioctl, - .mpo_check_pipe_poll = sebsd_check_pipe_poll, - .mpo_check_pipe_read = sebsd_check_pipe_read, - .mpo_check_pipe_relabel = sebsd_check_pipe_relabel, - .mpo_check_pipe_stat = sebsd_check_pipe_stat, - .mpo_check_pipe_write = sebsd_check_pipe_write, -#endif - - .mpo_check_proc_debug = sebsd_check_proc_debug, - .mpo_check_proc_sched = sebsd_check_proc_sched, - .mpo_check_proc_signal = sebsd_check_proc_signal, - .mpo_check_system_nfsd = sebsd_check_system_nfsd, - .mpo_check_system_swapon = sebsd_check_system_swapon, - .mpo_check_system_swapoff = sebsd_check_system_swapoff, - .mpo_check_system_sysctl = sebsd_check_system_sysctl, - .mpo_check_vnode_access = sebsd_check_vnode_access, - .mpo_check_vnode_chdir = sebsd_check_vnode_chdir, - .mpo_check_vnode_chroot = sebsd_check_vnode_chroot, - .mpo_check_vnode_create = sebsd_check_vnode_create, - .mpo_check_vnode_delete = sebsd_check_vnode_delete, -#ifdef HAS_ACLS - .mpo_check_vnode_deleteacl = sebsd_check_vnode_deleteacl, -#endif -#ifdef HAS_IMAGE_PARAMS - .mpo_check_vnode_exec = sebsd_check_vnode_exec, -#endif -#ifdef HAS_ACLS - .mpo_check_vnode_getacl = sebsd_check_vnode_getacl, -#endif -#ifdef EXTATTR - .mpo_check_vnode_getextattr = sebsd_check_vnode_getextattr, - .mpo_check_vnode_listextattr = NOT_IMPLEMENTED, - .mpo_check_vnode_deleteextattr = NOT_IMPLEMENTED, -#endif - .mpo_check_vnode_link = sebsd_check_vnode_link, - .mpo_check_vnode_lookup = sebsd_check_vnode_lookup, - .mpo_check_vnode_mmap = sebsd_check_vnode_mmap, - .mpo_check_vnode_mprotect = sebsd_check_vnode_mmap, - .mpo_check_vnode_open = sebsd_check_vnode_open, - .mpo_check_vnode_poll = sebsd_check_vnode_poll, - .mpo_check_vnode_read = sebsd_check_vnode_read, - .mpo_check_vnode_readdir = sebsd_check_vnode_readdir, - .mpo_check_vnode_readlink = sebsd_check_vnode_readlink, - .mpo_check_vnode_relabel = sebsd_check_vnode_relabel, - .mpo_check_vnode_rename_from = sebsd_check_vnode_rename_from, - .mpo_check_vnode_rename_to = sebsd_check_vnode_rename_to, - .mpo_check_vnode_revoke = sebsd_check_vnode_revoke, -#ifdef HAS_ACLS - .mpo_check_vnode_setacl = sebsd_check_vnode_setacl, -#endif -#ifdef HAS_EXTATTRS - .mpo_check_vnode_setextattr = sebsd_check_vnode_setextattr, -#endif - .mpo_check_vnode_setflags = sebsd_check_vnode_setflags, - .mpo_check_vnode_setmode = sebsd_check_vnode_setmode, - .mpo_check_vnode_setowner = sebsd_check_vnode_setowner, - .mpo_check_vnode_setutimes = sebsd_check_vnode_setutimes, - .mpo_check_vnode_stat = sebsd_check_vnode_stat, - .mpo_check_vnode_write = sebsd_check_vnode_write, - - /* Misc */ -#ifdef HAS_IMAGE_PARAMS - .mpo_execve_transition = sebsd_execve_transition, - .mpo_execve_will_transition = sebsd_execve_will_transition, -#endif - .mpo_relabel_cred = sebsd_relabel_cred, -#ifdef HAS_PIPES - .mpo_relabel_pipe = sebsd_relabel_pipe, -#endif - /* .mpo_relabel_socket = sebsd_relabel_socket, */ - .mpo_relabel_vnode = sebsd_relabel_vnode, - /*.mpo_set_socket_peer_from_mbuf = sebsd_set_socket_peer_from_mbuf,*/ - /*.mpo_set_socket_peer_from_socket = sebsd_set_socket_peer_from_socket,*/ - -#if 0 - .mpo_syscall = sebsd_syscall, -#endif -}; -#endif - -#if 0 MAC_POLICY_SET(&sebsd_ops, sebsd, "NSA/NAI Labs Security Enhanced BSD", MPC_LOADTIME_FLAG_NOTLATE, &slot); #endif From owner-p4-projects@FreeBSD.ORG Fri Nov 11 06:07:38 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D14F116A421; Fri, 11 Nov 2005 06:07:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A70B116A41F for ; Fri, 11 Nov 2005 06:07:37 +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 533BB43D45 for ; Fri, 11 Nov 2005 06:07:37 +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 jAB67bTo068998 for ; Fri, 11 Nov 2005 06:07:37 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAB67aRR068995 for perforce@freebsd.org; Fri, 11 Nov 2005 06:07:36 GMT (envelope-from scottl@freebsd.org) Date: Fri, 11 Nov 2005 06:07:36 GMT Message-Id: <200511110607.jAB67aRR068995@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 86632 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, 11 Nov 2005 06:07:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=86632 Change 86632 by scottl@scottl-junior on 2005/11/11 06:06:39 iSCSI initiator import patch 12 from Danny. Affected files ... .. //depot/projects/iscsi/src/sys/dev/iscsi/isc_cam.c#3 edit .. //depot/projects/iscsi/src/sys/dev/iscsi/isc_sm.c#3 edit .. //depot/projects/iscsi/src/sys/dev/iscsi/isc_soc.c#3 edit .. //depot/projects/iscsi/src/sys/dev/iscsi/isc_subr.c#3 edit .. //depot/projects/iscsi/src/sys/dev/iscsi/iscsi.c#3 edit .. //depot/projects/iscsi/src/sys/dev/iscsi/iscsi.h#2 edit .. //depot/projects/iscsi/src/sys/dev/iscsi/iscsi_subr.c#3 edit .. //depot/projects/iscsi/src/sys/dev/iscsi/iscsivar.h#2 edit .. //depot/projects/iscsi/src/usr.sbin/iscontrol/Makefile#2 edit .. //depot/projects/iscsi/src/usr.sbin/iscontrol/fsm.c#2 edit Differences ... ==== //depot/projects/iscsi/src/sys/dev/iscsi/isc_cam.c#3 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -51,11 +52,11 @@ { debug_called(8); + sdebug(4, "freezing path=%p", sp->cam_path == NULL? 0: sp->cam_path); if((sp->cam_path != NULL) && !(sp->flags & ISC_FROZEN)) { - sdebug(3, "freezing path=%p", sp->cam_path); xpt_freeze_devq(sp->cam_path, 1); - sp->flags |= ISC_FROZEN; } + sp->flags |= ISC_FROZEN; } // XXX: untested/incomplete @@ -64,11 +65,11 @@ { debug_called(8); + sdebug(4, "release path=%p", sp->cam_path == NULL? 0: sp->cam_path); if((sp->cam_path != NULL) && (sp->flags & ISC_FROZEN)) { - sdebug(3, "release"); - sp->flags &= ~ISC_FROZEN; xpt_release_devq(sp->cam_path, 1, TRUE); } + sp->flags &= ~ISC_FROZEN; } void @@ -91,11 +92,14 @@ static void _scan_callback(struct cam_periph *periph, union ccb *ccb) { -// isc_session_t *sp = (isc_session_t *)ccb->ccb_h.spriv_ptr0; + isc_session_t *sp = (isc_session_t *)ccb->ccb_h.spriv_ptr0; debug_called(8); xpt_free_path(ccb->ccb_h.path); free(ccb, M_TEMP); + + if(sp->flags & ISC_FFPWAIT) + wakeup(&sp->flags); } static void @@ -118,7 +122,7 @@ return; } xpt_setup_ccb(&ccb->ccb_h, path, 5/*priority (low)*/); - ccb->ccb_h.func_code = XPT_SCAN_LUN; + ccb->ccb_h.func_code = XPT_SCAN_BUS; ccb->ccb_h.cbfcnp = _scan_callback; ccb->crcn.flags = CAM_FLAG_NONE; ccb->ccb_h.spriv_ptr0 = sp; @@ -126,7 +130,7 @@ } int -ic_newdev(struct cdev *dev) +ic_fullfeature(struct cdev *dev) { struct isc *isp = (struct isc *)dev->si_drv1; isc_session_t *sp = (isc_session_t *)dev->si_drv2; @@ -134,9 +138,19 @@ debug_called(8); sdebug(2, "dev=%d sc=%p", minor(dev), isp); + sp->flags &= ~ISC_FFPHASE; + sp->flags |= ISC_FFPWAIT; + _scan_target(sp, sp->sid); - return 0; + tsleep(&sp->flags, PRIBIO, "ffp", 30*hz); // the timeout time should + // be configurable + if(sp->target_nluns > 1) { + sp->flags |= ISC_FFPHASE; + return 0; + } + + return ENODEV; } static void @@ -238,6 +252,11 @@ debug(4, "xpt_done.status=%d", ccb_h->status); break; } + if(ccb_h->target_lun == CAM_LUN_WILDCARD) { + debug(3, "target=%d: bad lun (-1)", ccb_h->target_id); + ccb_h->status = CAM_LUN_INVALID; + break; + } if(scsi_encap(sim, ccb)) return; break; @@ -273,12 +292,16 @@ int ic_getCamVals(isc_session_t *sp, iscsi_cam_t *cp) { + int i; + debug_called(8); if(sp && sp->isc->cam_sim) { cp->path_id = cam_sim_path(sp->isc->cam_sim); cp->target_id = sp->sid; - cp->target_lun = 0; // XXX: always 0? + cp->target_nluns = sp->target_nluns; // XXX: -1? + for(i = 0; i < cp->target_nluns; i++) + cp->target_lun[i] = sp->target_lun[i]; return 0; } return ENXIO; ==== //depot/projects/iscsi/src/sys/dev/iscsi/isc_sm.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ /* | iSCSI - Session Manager - | $Id: isc_sm.c,v 1.19 2005/06/03 12:02:50 danny Exp danny $ + | $Id: isc_sm.c,v 1.20 2005/09/25 11:56:07 danny Exp danny $ */ #include #include @@ -144,24 +144,26 @@ static void _nop_out(isc_session_t *sp) { -#if 0 pduq_t *pq; nop_out_t *nop_out; debug_called(8); - if((pq = pdu_alloc(sp->isc)) == NULL) - // I guess we ran out of resources - return; - nop_out = &pq->pdu.ipdu.nop_out; - nop_out->opcode = ISCSI_NOP_OUT; - nop_out->itt = htonl(sp->sn.itt); - nop_out->ttt = -1; - pq->pdu.ipdu.bhs.I = 1; - if(isc_qout(sp, pq) != 0) { - sdebug(1, "failed"); - pdu_free(sp->isc, pq); + + sdebug(4, "cws=%d", sp->cws); + if(sp->cws == 0) { + if((pq = pdu_alloc(sp->isc, 0)) == NULL) + // I guess we ran out of resources + return; + nop_out = &pq->pdu.ipdu.nop_out; + nop_out->opcode = ISCSI_NOP_OUT; + nop_out->itt = htonl(sp->sn.itt); + nop_out->ttt = -1; + pq->pdu.ipdu.bhs.I = 1; + if(isc_qout(sp, pq) != 0) { + sdebug(1, "failed"); + pdu_free(sp->isc, pq); + } } -#endif } static void @@ -277,7 +279,13 @@ if(pq->len == 0 && (error = i_prepPDU(sp, pq))) return error; - i_nqueue_snd(sp, pq); + if(pq->pdu.ipdu.bhs.I) + i_nqueue_isnd(sp, pq); + else + if(pq->pdu.ipdu.data_out.opcode == ISCSI_WRITE_DATA) + i_nqueue_wsnd(sp, pq); + else + i_nqueue_csnd(sp, pq); sdebug(5, "enqued: pq=%p", pq); @@ -295,8 +303,7 @@ sdebug(3, "start=%d", flag); if(flag) { - sp->flags |= ISC_FFPHASE; - error = ic_newdev(dev); + error = ic_fullfeature(dev); } else { sp->flags &= ~ISC_FFPHASE; @@ -306,82 +313,80 @@ return error; } -static int -proc_in(isc_session_t *sp) +void +ism_recv(isc_session_t *sp, pduq_t *pq) { - pduq_t *pq; bhs_t *bhs; sn_t *sn = &sp->sn; - int statSN, ndone = 0; + int statSN; debug_called(8); - while((pq = i_dqueue_rsv(sp)) != NULL) { - ndone++; - bhs = &pq->pdu.ipdu.bhs; - statSN = ntohl(bhs->OpcodeSpecificFields[1]); - sn->maxCmd = ntohl(bhs->MaxCmdSN); - sn->expCmd = ntohl(bhs->ExpStSN); + bhs = &pq->pdu.ipdu.bhs; + statSN = ntohl(bhs->OpcodeSpecificFields[1]); - if(sn->maxCmd + 1 == sn->expCmd) { - sdebug(2, "window closed: 0x%x 0x%x ", sn->maxCmd, sn->expCmd); + if(sp->cws == 0) { + if((sp->flags & ISC_FROZEN) == 0) { + //iscsi_debug = 9; + sdebug(3, "window closed: max=0x%x exp=0x%x opcode=0x%x cmd=0x%x cws=%d.", + sn->maxCmd, sn->expCmd, bhs->opcode, sn->cmd, sp->cws); // window closed ic_freeze(sp); - } else + } + } else if(sp->flags & ISC_FROZEN) { - sdebug(2, "window opened: 0x%x 0x%x ", sn->maxCmd, sn->expCmd); + sdebug(3, "window opened: max=0x%x exp=0x%x opcode=0x%x cmd=0x%x cws=%d.", + sn->maxCmd, sn->expCmd, bhs->opcode, sn->cmd, sp->cws); ic_release(sp); } #if notyet - if(sp->sn.expCmd != sp->sn.cmd) { - sdebug(1, "we lost something ... exp=0x%x cmd=0x%x", - sp->sn.expCmd, sp->sn.cmd); - } + if(sp->sn.expCmd != sn->cmd) { + sdebug(1, "we lost something ... exp=0x%x cmd=0x%x", + sn->expCmd, sn->cmd); + } #endif - sdebug(5, "opcode=0x%x itt=0x%x stat#0x%x maxcmd=0x%0x", - bhs->opcode, ntohl(bhs->itt), statSN, sp->sn.maxCmd); + sdebug(5, "opcode=0x%x itt=0x%x stat#0x%x maxcmd=0x%0x", + bhs->opcode, ntohl(bhs->itt), statSN, sp->sn.maxCmd); - switch(bhs->opcode) { - case ISCSI_READ_DATA: { - data_in_t *cmd = &pq->pdu.ipdu.data_in; + switch(bhs->opcode) { + case ISCSI_READ_DATA: { + data_in_t *cmd = &pq->pdu.ipdu.data_in; - if(cmd->S == 0) - break; - } + if(cmd->S == 0) + break; + } - default: - if(statSN > (sp->sn.stat + 1)) { - sdebug(1, "we lost some rec=0x%x exp=0x%x", - statSN, sp->sn.stat); - // XXX: must do some error recovery here. - } - sp->sn.stat = statSN; + default: + if(statSN > (sp->sn.stat + 1)) { + sdebug(1, "we lost some rec=0x%x exp=0x%x", + statSN, sp->sn.stat); + // XXX: must do some error recovery here. } + sp->sn.stat = statSN; + } - switch(bhs->opcode) { - case ISCSI_LOGIN_RSP: - case ISCSI_TEXT_RSP: - case ISCSI_LOGOUT_RSP: - i_nqueue_rsp(sp, pq); - wakeup(&sp->rsp); - break; + switch(bhs->opcode) { + case ISCSI_LOGIN_RSP: + case ISCSI_TEXT_RSP: + case ISCSI_LOGOUT_RSP: + i_nqueue_rsp(sp, pq); + wakeup(&sp->rsp); + break; - case ISCSI_NOP_IN: _nop_in(sp, pq); break; - case ISCSI_SCSI_RSP: _scsi_rsp(sp, pq); break; - case ISCSI_READ_DATA: _read_data(sp, pq); break; - case ISCSI_R2T: _r2t(sp, pq); break; - case ISCSI_REJECT: _reject(sp, pq); break; - case ISCSI_ASYNC: _async(sp, pq); break; + case ISCSI_NOP_IN: _nop_in(sp, pq); break; + case ISCSI_SCSI_RSP: _scsi_rsp(sp, pq); break; + case ISCSI_READ_DATA: _read_data(sp, pq); break; + case ISCSI_R2T: _r2t(sp, pq); break; + case ISCSI_REJECT: _reject(sp, pq); break; + case ISCSI_ASYNC: _async(sp, pq); break; - case ISCSI_TASK_RSP: - default: - sdebug(1, "opcode=0x%x itt=0x%x not implemented yet", - bhs->opcode, ntohl(bhs->itt)); - break; - } + case ISCSI_TASK_RSP: + default: + sdebug(1, "opcode=0x%x itt=0x%x not implemented yet", + bhs->opcode, ntohl(bhs->itt)); + break; } - return ndone; } static int @@ -390,27 +395,40 @@ sn_t *sn = &sp->sn; pduq_t *pq; int error, ndone = 0; + int which; debug_called(8); - while((pq = i_dqueue_snd(sp)) != NULL) { + which = BIT(0) | BIT(1) | BIT(2); // all queues + + while(1) { pdu_t *pp; bhs_t *bhs; - error = 0; + /* + | check if there is outstanding work in: + | 1- the Inmediate queue + | 2- the R2T queue + | 3- the cmd queue, only if the command window allows it. + */ + which = BIT(0) | BIT(1); + if(SNA_GT(sn->cmd, sn->maxCmd) == 0) + which |= BIT(2); + + if((pq = i_dqueue_snd(sp, which)) == NULL) + break; + pp = &pq->pdu; bhs = &pp->ipdu.bhs; sdebug(5, "opcode=0x%x sn(cmd=0x%x expCmd=0x%x maxCmd=0x%x expStat=0x%x itt=0x%x)", bhs->opcode, sn->cmd, sn->expCmd, sn->maxCmd, sn->expStat, sn->itt); - switch(bhs->opcode) { case ISCSI_SCSI_CMD: sn->itt++; - bhs->itt = htonl(sn->itt); + bhs->itt = htonl(sn->itt); - case ISCSI_WRITE_DATA: case ISCSI_LOGIN_CMD: case ISCSI_TEXT_CMD: case ISCSI_LOGOUT_CMD: @@ -418,15 +436,16 @@ case ISCSI_NOP_OUT: case ISCSI_TASK_CMD: bhs->CmdSN = htonl(sn->cmd); + if(bhs->I == 0) + sn->cmd++; + + case ISCSI_WRITE_DATA: if(bhs->opcode == ISCSI_NOP_OUT) bhs->ExpStSN = htonl(sn->stat); else bhs->ExpStSN = htonl(sn->stat + 1); break; } - if(bhs->I == 0 && (bhs->opcode != ISCSI_WRITE_DATA)) - sn->cmd++; - if(pq->ccb) i_nqueue_hld(sp, pq); @@ -445,34 +464,35 @@ xdebug("error=%d", error); } } - if(pq->ccb == NULL || error) pdu_free(sp->isc, pq); } return ndone; } /* - | this is the main 'engine' - | it survives link breakdowns. + | survives link breakdowns. */ static void ism_proc(void *vp) { isc_session_t *sp = (isc_session_t *)vp; - int odone, idone; + int odone; debug_called(8); sdebug(2, "started"); sp->flags |= ISC_SM_RUN; do { - idone = proc_in(sp); odone = proc_out(sp); - sdebug(7, "idone=%d odone=%d", idone, odone); - if(!idone && !odone) { - if((tsleep(sp, PRIBIO, "isc_proc", hz*30) == EWOULDBLOCK) + sdebug(7, "odone=%d", odone); + if(odone == 0) { + mtx_lock(&sp->io_mtx); + sp->flags |= ISC_IWAITING; + if((msleep(sp, &sp->io_mtx, PRIBIO, "isc_proc", hz*30) == EWOULDBLOCK) && (sp->flags & ISC_CON_RUN)) _nop_out(sp); + sp->flags &= ~ISC_IWAITING; + mtx_unlock(&sp->io_mtx); } } while(sp->flags & ISC_SM_RUN); @@ -507,7 +527,9 @@ */ TAILQ_INIT(&sp->rsp); TAILQ_INIT(&sp->rsv); - TAILQ_INIT(&sp->snd); + TAILQ_INIT(&sp->csnd); + TAILQ_INIT(&sp->isnd); + TAILQ_INIT(&sp->wsnd); TAILQ_INIT(&sp->hld); #if 1 mtx_init(&sp->rsv_mtx, "iscsi-rsv", NULL, MTX_DEF); ==== //depot/projects/iscsi/src/sys/dev/iscsi/isc_soc.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ /* | iSCSI - | $Id: isc_soc.c,v 1.15 2005/05/08 10:08:10 danny Exp danny $ + | $Id: isc_soc.c,v 1.16 2005/09/09 09:44:38 danny Exp danny $ */ #include #include @@ -57,33 +57,34 @@ | from the socket. */ static int -so_getbhs(struct socket *so, bhs_t *bhs) +so_getbhs(isc_session_t *sp) { - struct uio uio; - struct iovec iov; + bhs_t *bhs = &sp->bhs; + struct uio *uio = &sp->uio; + struct iovec *iov = &sp->iov; int error, flags; debug_called(8); - iov.iov_base = bhs; - iov.iov_len = sizeof(bhs_t); + iov->iov_base = bhs; + iov->iov_len = sizeof(bhs_t); - uio.uio_iov = &iov; - uio.uio_iovcnt = 1; - uio.uio_rw = UIO_READ; - uio.uio_segflg = UIO_SYSSPACE; - uio.uio_td = curthread; // why ... - uio.uio_resid = sizeof(bhs_t); + uio->uio_iov = iov; + uio->uio_iovcnt = 1; + uio->uio_rw = UIO_READ; + uio->uio_segflg = UIO_SYSSPACE; + uio->uio_td = curthread; // why ... + uio->uio_resid = sizeof(bhs_t); flags = MSG_WAITALL; - error = soreceive(so, NULL, &uio, 0, 0, &flags); - if(!error && uio.uio_resid > 0) { + error = soreceive(sp->soc, NULL, uio, 0, 0, &flags); + if(!error && uio->uio_resid > 0) { #if __FreeBSD_version < 600000 - debug(5, "so_error=%d uio.uio_resid=%d iov.iov_len=%d", + debug(5, "so_error=%d uio->uio_resid=%d iov.iov_len=%d", #else - debug(5, "so_error=%d uio.uio_resid=%d iov.iov_len=%zd", + debug(5, "so_error=%d uio->uio_resid=%d iov.iov_len=%zd", #endif - so->so_error, uio.uio_resid, iov.iov_len); + sp->soc->so_error, uio->uio_resid, iov->iov_len); error = EPIPE; } return error; @@ -97,11 +98,13 @@ so_recv(isc_session_t *sp, pduq_t *pq) { struct socket *so = sp->soc; - struct uio uio; + sn_t *sn = &sp->sn; + struct uio *uio = &pq->uio; pdu_t *pp; int error; size_t n, len; bhs_t *bhs; + u_int max, exp; debug_called(8); /* @@ -147,20 +150,36 @@ if(len) { int flags; - uio.uio_resid = len; - uio.uio_td = curthread; // why ... + uio->uio_resid = len; + uio->uio_td = curthread; // why ... flags = MSG_WAITALL; - error = soreceive(so, NULL, &uio, &pq->mp, NULL, &flags); - if(error || uio.uio_resid) + error = soreceive(so, NULL, uio, &pq->mp, NULL, &flags); + if(error || uio->uio_resid) goto out; } - sdebug(5, "opcode=%x ahs_len=%x ds_len=%x", + sdebug(5, "opcode=0x%x ahs_len=0x%x ds_len=0x%x", bhs->opcode, pp->ahs_len, pp->ds_len); - i_nqueue_rsv(sp, pq); - wakeup(sp); - sp->stats.nrecv++; + + + max = ntohl(bhs->MaxCmdSN); + exp = ntohl(bhs->ExpStSN); + + + if(max < exp - 1 && + max > exp - _MAXINCR) { + sdebug(2, "bad cmd window size"); + error = EIO; // XXX: for now; + goto out; // error + } + + if(SNA_GT(max, sn->maxCmd)) + sn->maxCmd = max; + + if(SNA_GT(exp, sn->expCmd)) + sn->expCmd = exp; + sp->cws = sn->maxCmd - sn->expCmd + 1; return 0; @@ -168,7 +187,7 @@ // XXX: need some work here xdebug("have a problem, error=%d", error); pdu_free(sp->isc, pq); - if(!error && uio.uio_resid > 0) + if(!error && uio->uio_resid > 0) error = EPIPE; return error; } @@ -177,22 +196,22 @@ isc_sendPDU(isc_session_t *sp, pduq_t *pq) { pdu_t *pp = &pq->pdu; - struct uio uio; - struct iovec iov[5], *iv; + struct uio *uio = &pq->uio; + struct iovec *iv; int len, error; debug_called(8); - bzero(&uio, sizeof(struct uio)); + bzero(uio, sizeof(struct uio)); - uio.uio_rw = UIO_WRITE; - uio.uio_segflg = UIO_SYSSPACE; - uio.uio_td = sp->td; - uio.uio_iov = iv = iov; + uio->uio_rw = UIO_WRITE; + uio->uio_segflg = UIO_SYSSPACE; + uio->uio_td = sp->td; + uio->uio_iov = iv = pq->iov; iv->iov_base = &pp->ipdu; iv->iov_len = sizeof(union ipdu_u); - uio.uio_resid = pq->len; + uio->uio_resid = pq->len; iv++; if(pp->ahs_len) { @@ -201,7 +220,7 @@ iv++; } if(sp->hdrDigest) { - pq->pdu.hdr_dig = sp->hdrDigest(&pp->ipdu, uio.uio_resid); + pq->pdu.hdr_dig = sp->hdrDigest(&pp->ipdu, uio->uio_resid); iv->iov_base = &pp->hdr_dig; iv->iov_len = sizeof(int); iv++; @@ -209,7 +228,7 @@ if(pq->pdu.ds) { iv->iov_base = pp->ds; iv->iov_len = pp->ds_len; - while(iv->iov_len & 03) // the specs say it must be int allingned + while(iv->iov_len & 03) // the specs say it must be int alligned iv->iov_len++; iv++; } @@ -219,26 +238,26 @@ iv->iov_len = sizeof(int); iv++; } - uio.uio_iovcnt = iv - iov; + uio->uio_iovcnt = iv - pq->iov; sdebug(5, "opcode=%x iovcnt=%d uio_resid=%d itt=%x", - pp->ipdu.bhs.opcode, uio.uio_iovcnt, uio.uio_resid, + pp->ipdu.bhs.opcode, uio->uio_iovcnt, uio->uio_resid, ntohl(pp->ipdu.bhs.itt)); + sp->stats.nsent++; do { - len = uio.uio_resid; - error = sosend(sp->soc, NULL, &uio, 0, 0, 0, sp->td); - if(uio.uio_resid == 0 || error || len == uio.uio_resid) { - if(uio.uio_resid != 0) { - sdebug(3, "uio.uio_resid=%d uio.uio_iovcnt=%d error=%d len=%d", - uio.uio_resid, uio.uio_iovcnt, error, len); + len = uio->uio_resid; + error = sosend(sp->soc, NULL, uio, 0, 0, 0, sp->td); + if(uio->uio_resid == 0 || error || len == uio->uio_resid) { + if(uio->uio_resid != 0) { + sdebug(3, "uio->uio_resid=%d uio->uio_iovcnt=%d error=%d len=%d", + uio->uio_resid, uio->uio_iovcnt, error, len); } break; } - // XXX: can this really happen? - sdebug(1, "uio.uio_resid=%d uio.uio_iovcnt=%d", - uio.uio_resid, uio.uio_iovcnt); - iv = uio.uio_iov; - len -= uio.uio_resid; - while(uio.uio_iovcnt > 0) { + sdebug(1, "uio->uio_resid=%d uio->uio_iovcnt=%d", + uio->uio_resid, uio->uio_iovcnt); + iv = uio->uio_iov; + len -= uio->uio_resid; + while(uio->uio_iovcnt > 0) { if(iv->iov_len > len) { caddr_t bp = (caddr_t)iv->iov_base; @@ -247,18 +266,18 @@ break; } len -= iv->iov_len; - uio.uio_iovcnt--; - uio.uio_iov++; + uio->uio_iovcnt--; + uio->uio_iov++; iv++; } - } while(uio.uio_resid); + } while(uio->uio_resid); return error; } /* | one per active session. | wait for something to arrive. - | and if the pdu is without errors, queue it. + | and if the pdu is without errors, process it. */ static void isc_soc(void *vp) @@ -280,27 +299,32 @@ ic_release(sp); while((sp->flags & ISC_CON_RUN) && (so->so_state & SS_ISCONNECTED)) { - bhs_t bhs; /* | first read in the iSCSI header */ - error = so_getbhs(so, &bhs); + error = so_getbhs(sp); if(error) { if(error == EPIPE) break; } else { - if((pq = pdu_alloc(sp->isc)) == NULL) { - // Note: choose a less drastic way out - xdebug("out of pdus"); - break; - } - pq->pdu.ipdu.bhs = bhs; + sp->flags |= ISC_MEMWAIT; + pq = pdu_alloc(sp->isc, 1); // OK to WAIT + sp->flags &= ~ISC_MEMWAIT; + + pq->pdu.ipdu.bhs = sp->bhs; if(so_recv(sp, pq)) { // terminal error // XXX: close connection and exit break; } + ism_recv(sp, pq); + + mtx_lock(&sp->io_mtx); + if(sp->flags & ISC_IWAITING) + wakeup(sp); + mtx_unlock(&sp->io_mtx); + sp->stats.nrecv++; } } sdebug(2, "terminated flags=%x so_count=%d so_state=%x error=%d", ==== //depot/projects/iscsi/src/sys/dev/iscsi/isc_subr.c#3 (text+ko) ==== @@ -67,7 +67,7 @@ pdu_free(sp->isc, pq); n++; } - while((pq = i_dqueue_snd(sp)) != NULL) { + while((pq = i_dqueue_snd(sp, -1)) != NULL) { pdu_free(sp->isc, pq); n++; } ==== //depot/projects/iscsi/src/sys/dev/iscsi/iscsi.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ /* | iSCSI - | $Id: iscsi.c,v 1.25 2005/05/07 07:28:39 danny Exp danny $ + | $Id: iscsi.c,v 1.26 2005/09/11 12:39:14 danny Exp danny $ */ #include #include @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -283,38 +284,46 @@ pukeit(i, pq); i++; uiomove(buf, strlen(buf), uio); } - sprintf(buf, "/---- rsv -----/\n"); + sprintf(buf, "/---- csnd -----/\n"); i = 0; uiomove(buf, strlen(buf), uio); - TAILQ_FOREACH(pq, &sp->rsv, pq_link) { + TAILQ_FOREACH(pq, &sp->csnd, pq_link) { if(uio->uio_resid == 0) return 0; pukeit(i, pq); i++; uiomove(buf, strlen(buf), uio); } - - sprintf(buf, "/---- snd -----/\n"); + sprintf(buf, "/---- wsnd -----/\n"); i = 0; uiomove(buf, strlen(buf), uio); - TAILQ_FOREACH(pq, &sp->snd, pq_link) { + TAILQ_FOREACH(pq, &sp->wsnd, pq_link) { if(uio->uio_resid == 0) return 0; pukeit(i, pq); i++; uiomove(buf, strlen(buf), uio); } - - sprintf(buf, "/---- pdu free -----/\n"); + sprintf(buf, "/---- isnd -----/\n"); i = 0; uiomove(buf, strlen(buf), uio); - TAILQ_FOREACH(pq, &sc->free_pdus, pq_link) { + TAILQ_FOREACH(pq, &sp->isnd, pq_link) { if(uio->uio_resid == 0) return 0; pukeit(i, pq); i++; uiomove(buf, strlen(buf), uio); } - sprintf(buf, "last cmd=%x stat=%x itt=%x\n", - sp->sn.cmd, sp->sn.stat, sp->sn.itt); + sprintf(buf, "/---- Stats ---/\n"); + uiomove(buf, strlen(buf), uio); + + sprintf(buf, "recv=%d sent=%d\n", sp->stats.nrecv, sp->stats.nsent); + uiomove(buf, strlen(buf), uio); + + sprintf(buf, "flags=%x pdus: free=%d alloc=%d max=%d\n", + sp->flags, sc->npdu_free, sc->npdu_alloc, sc->npdu_max); + uiomove(buf, strlen(buf), uio); + + sprintf(buf, "cws=%d last cmd=%x exp=%x max=%x stat=%x itt=%x\n", + sp->cws, sp->sn.cmd, sp->sn.expCmd, sp->sn.maxCmd, sp->sn.stat, sp->sn.itt); uiomove(buf, strlen(buf), uio); sprintf(buf, "/---- socket -----/\nso_count=%d so_state=%x\n", so->so_count, so->so_state); @@ -345,7 +354,7 @@ debug_called(8); - if((pq = pdu_alloc(sc)) == NULL) + if((pq = pdu_alloc(sc, 0)) == NULL) return EAGAIN; pp = &pq->pdu; @@ -514,8 +523,18 @@ sc->dev->si_drv1 = sc; TAILQ_INIT(&sc->isc_sess); - TAILQ_INIT(&sc->free_pdus); - + + sc->pdu_zone = uma_zcreate("pdu", sizeof(pduq_t), + NULL, NULL, NULL, NULL, + 0, 0); + if(sc->pdu_zone == NULL) { + printf("iscsi_initiator: uma_zcreate failed"); + // XXX: and now what? + } + uma_zone_set_max(sc->pdu_zone, MAX_PDUS*2+1); +#ifdef ISCSI_DEBUG + sc->npdu_free = MAX_PDUS*2+1; +#endif mtx_init(&sc->mtx, "iscsi", NULL, MTX_DEF); mtx_init(&sc->mtx_pdu, "iscsi pdu pool", NULL, MTX_DEF); @@ -546,6 +565,8 @@ ic_destroy(sc); + uma_zdestroy(sc->pdu_zone); + if(sc->dev) destroy_dev(sc->dev); } ==== //depot/projects/iscsi/src/sys/dev/iscsi/iscsi.h#2 (text+ko) ==== @@ -37,6 +37,10 @@ #define ISCSIDEV "iscsi" +#define ISCSI_MAX_TARGETS 4 //64 + +#define ISCSI_MAX_LUNS 4 + /* | iSCSI commands */ @@ -394,7 +398,8 @@ typedef struct iscsi_cam { path_id_t path_id; target_id_t target_id; - lun_id_t target_lun; + int target_nluns; + lun_id_t target_lun[ISCSI_MAX_LUNS]; } iscsi_cam_t; #define ISCSIGETCAM _IOR('i', 32, iscsi_cam_t) ==== //depot/projects/iscsi/src/sys/dev/iscsi/iscsi_subr.c#3 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -79,8 +80,9 @@ dsn = 0; sdebug(5, "edtl=%x ddtl=%x bo=%x dsn=%x bs=%x", edtl, ddtl, bo, dsn, bs); while(bleft > 0) { - wpq = pdu_alloc(sp->isc); + wpq = pdu_alloc(sp->isc, 1); if(wpq == NULL) { + // should not happen if above is 1 sdebug(1, "now what?"); return; } @@ -252,6 +254,47 @@ } /* + | deal with lun + */ +static int +dwl(isc_session_t *sp, int lun, u_char *lp) +{ + int i; + + debug_called(8); + + /* + | mapping LUN to iSCSI LUN + | check the SAM-2 specs + | hint: maxLUNS is a small number, cam's LUN is 32bits + | iSCSI is 64bits, scsi is ? + */ + // XXX: check if this will pass the endian test + if(lun < 256) { + lp[0] = 0; + lp[1] = lun; + } else + if(lun < 16384) { + lp[0] = (1 << 5) | ((lun >> 8) & 0x3f); + lp[1] = lun & 0xff; + } + else { + xdebug("lun %d: is unsupported!", lun); + return -1; + } + + for(i = 0; i < sp->target_nluns; i++) + if(sp->target_lun[i] == lun) + return 0; + if(sp->target_nluns < ISCSI_MAX_LUNS) + sp->target_lun[sp->target_nluns++] = lun; + + sdebug(3, "nluns=%d lun=%d", sp->target_nluns, lun); + + return 0; +} + +/* | encapsulate the scsi command and */ int @@ -269,19 +312,19 @@ debug(6, "ccb->sp=%p", ccb_h->spriv_ptr0); sp = ccb_h->spriv_ptr0; - if((pq = pdu_alloc(isp)) == NULL) { + if((pq = pdu_alloc(isp, 1)) == NULL) { // cannot happen sdebug(3, "freezing"); ccb->ccb_h.status = CAM_REQUEUE_REQ; ic_freeze(sp); return 0; } - +#if 0 if((sp->flags & ISC_FFPHASE) == 0) { ccb->ccb_h.status = CAM_DEV_NOT_THERE; // CAM_NO_NEXUS; sdebug(3, "no active session with target %d", ccb_h->target_id); goto bad; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 11 18:42:11 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A02116A421; Fri, 11 Nov 2005 18:42: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 59FC116A41F for ; Fri, 11 Nov 2005 18:42: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 250F743D45 for ; Fri, 11 Nov 2005 18:42: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 jABIgAu1026590 for ; Fri, 11 Nov 2005 18:42:10 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jABIg9gd026587 for perforce@freebsd.org; Fri, 11 Nov 2005 18:42:09 GMT (envelope-from millert@freebsd.org) Date: Fri, 11 Nov 2005 18:42:09 GMT Message-Id: <200511111842.jABIg9gd026587@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 86661 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, 11 Nov 2005 18:42:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=86661 Change 86661 by millert@millert_ibook on 2005/11/11 18:41:54 Fix yesterday's change here by explicitly including endian and byte order includes again. They are implicitly included by the BSD sys/types but *not* by the mach sys/types. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#10 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#10 (text+ko) ==== @@ -43,7 +43,9 @@ * diffs to the SELinux tree will be quite a bit smaller. */ -#include +#include /* NOTE: mach sys/types, not BSD one. */ +#include /* We need to explicitly include */ +#include /* byte order includes for mach. */ typedef u_int64_t u64; typedef u_int32_t u32; @@ -51,16 +53,20 @@ typedef u_int8_t u8; -#if BYTE_ORDER == LITTLE_ENDIAN +#if !defined(BYTE_ORDER) +#error BYTE_ORDER not defined +#elif BYTE_ORDER == LITTLE_ENDIAN #define cpu_to_le32(x) ((__uint32_t)(x)) #define cpu_to_le64(x) ((__uint64_t)(x)) #define le32_to_cpu(x) ((__uint32_t)(x)) #define le64_to_cpu(x) ((__uint64_t)(x)) -#else /* BYTE_ORDER != LITTLE_ENDIAN */ +#elif BYTE_ORDER == BIG_ENDIAN +#define cpu_to_le32(x) NXSwapHostLongToLittle(x) +#define cpu_to_le64(x) NXSwapHostLongLongToLittle(x) #define le32_to_cpu(x) NXSwapLittleLongToHost(x) #define le64_to_cpu(x) NXSwapLittleLongLongToHost(x) -#define cpu_to_le32(x) NXSwapHostLongToLittle(x) -#define cpu_to_le64(x) NXSwapHostLongLongToLittle(x) +#else +#error unsupported BYTE_ORDER #endif /* BYTE_ORDER */ #if !defined(_KERNEL) && !defined(KERNEL) From owner-p4-projects@FreeBSD.ORG Fri Nov 11 19:14:50 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3ED1A16A421; Fri, 11 Nov 2005 19:14: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 F31DB16A41F for ; Fri, 11 Nov 2005 19:14: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 BE88B43D46 for ; Fri, 11 Nov 2005 19:14: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 jABJEn6u028178 for ; Fri, 11 Nov 2005 19:14:49 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jABJEnRC028175 for perforce@freebsd.org; Fri, 11 Nov 2005 19:14:49 GMT (envelope-from millert@freebsd.org) Date: Fri, 11 Nov 2005 19:14:49 GMT Message-Id: <200511111914.jABJEnRC028175@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 86662 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, 11 Nov 2005 19:14:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=86662 Change 86662 by millert@millert_ibook on 2005/11/11 19:14:16 Remove my horrible hack to make M_NOWAIT sort of work. It is too specific to the size of the policy to be loaded and doesn't really help anything. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#11 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#20 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#11 (text+ko) ==== @@ -103,7 +103,7 @@ #define kmalloc(size, flags) sebsd_malloc(size, flags) #define kfree(addr) sebsd_free(addr) #define __get_free_page(flags) sebsd_malloc(PAGE_SIZE, flags) -#define GFP_ATOMIC M_NOWAIT +#define GFP_ATOMIC M_WAITOK /* XXX - want M_NOWAIT but too early */ #define GFP_KERNEL M_WAITOK /* TBD: no boot-time tunable support yet */ ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#20 (text+ko) ==== @@ -76,27 +76,6 @@ #include #include -/* - * XXX - * Hack to populate the free list with lots of small allocations. - * Needed to make non-blocking allocations work early on in the - * boot sequence. Otherwise we crash in avc_init(). - * XXX - */ -void -sebsd_malloc_init(void) -{ - int i; - vm_offset_t prealloc[512]; - - for (i = 0; i < 512; i++) { - if ((prealloc[i] = kalloc(64)) == NULL) - break; - } - while (i--) - kfree(prealloc[i], 64); -} - void * sebsd_malloc(size_t size, int flags) { @@ -153,7 +132,6 @@ { printf("sebsd:: init\n"); - sebsd_malloc_init(); avc_init(); //sebsd_register_sysctls(); if (security_init()) {