From owner-p4-projects@FreeBSD.ORG Sun Jun 25 01:06:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 535DE16A4A0; Sun, 25 Jun 2006 01:06:21 +0000 (UTC) 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 2D85916A49A for ; Sun, 25 Jun 2006 01:06:21 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D65EB43D45 for ; Sun, 25 Jun 2006 01:06:20 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5P16KsZ050127 for ; Sun, 25 Jun 2006 01:06:20 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5P16Ksh050124 for perforce@freebsd.org; Sun, 25 Jun 2006 01:06:20 GMT (envelope-from csjp@freebsd.org) Date: Sun, 25 Jun 2006 01:06:20 GMT Message-Id: <200606250106.k5P16Ksh050124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 99955 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 01:06:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=99955 Change 99955 by csjp@csjp_rnd01 on 2006/06/25 01:05:23 Import the machinery for being able to set specific sysctl OIDs as being mpsafe. There are some more changes to come. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/dev/bge/if_bge.c#7 edit .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_descrip.c#8 edit .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_proc.c#7 edit .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_sysctl.c#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/sysctl.h#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/dev/bge/if_bge.c#7 (text+ko) ==== @@ -110,6 +110,9 @@ #include +#include +#include + #define BGE_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP) #define ETHER_MIN_NOPAD (ETHER_MIN_LEN - ETHER_CRC_LEN) /* i.e., 60 */ @@ -721,8 +724,8 @@ } return(ENOMEM); } - r->bge_addr.bge_addr_lo = BGE_ADDR_LO(ctx.bge_busaddr); - r->bge_addr.bge_addr_hi = BGE_ADDR_HI(ctx.bge_busaddr); + r->bge_addr.bge_addr_lo = htole32(BGE_ADDR_LO(ctx.bge_busaddr)); + r->bge_addr.bge_addr_hi = htole32(BGE_ADDR_HI(ctx.bge_busaddr)); r->bge_flags = BGE_RXBDFLAG_END; r->bge_len = m_new->m_len; r->bge_idx = i; @@ -2051,7 +2054,6 @@ struct ifnet *ifp; struct bge_softc *sc; u_int32_t hwcfg = 0; - u_int32_t mac_tmp = 0; u_char eaddr[6]; int error = 0, rid; @@ -2132,24 +2134,9 @@ } /* - * Get station address from the EEPROM. + * XXX get address from OpenFirmware */ - mac_tmp = bge_readmem_ind(sc, 0x0c14); - if ((mac_tmp >> 16) == 0x484b) { - eaddr[0] = (u_char)(mac_tmp >> 8); - eaddr[1] = (u_char)mac_tmp; - mac_tmp = bge_readmem_ind(sc, 0x0c18); - eaddr[2] = (u_char)(mac_tmp >> 24); - eaddr[3] = (u_char)(mac_tmp >> 16); - eaddr[4] = (u_char)(mac_tmp >> 8); - eaddr[5] = (u_char)mac_tmp; - } else if (bge_read_eeprom(sc, eaddr, - BGE_EE_MAC_OFFSET + 2, ETHER_ADDR_LEN)) { - device_printf(sc->bge_dev, "failed to read station address\n"); - bge_release_resources(sc); - error = ENXIO; - goto fail; - } + OF_getetheraddr(dev, &eaddr[0]); /* 5705 limits RX return ring to 512 entries. */ if (sc->bge_asicrev == BGE_ASICREV_BCM5705 || ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_descrip.c#8 (text+ko) ==== @@ -2479,7 +2479,7 @@ return (error); } -SYSCTL_PROC(_kern, KERN_FILE, file, CTLTYPE_OPAQUE|CTLFLAG_RD, +SYSCTL_PROC(_kern, KERN_FILE, file, CTLTYPE_OPAQUE|CTLFLAG_RD|CTLFLAG_MPSAFE, 0, 0, sysctl_kern_file, "S,xfile", "Entire file table"); #ifdef DDB ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_proc.c#7 (text+ko) ==== @@ -1291,34 +1291,40 @@ static SYSCTL_NODE(_kern, KERN_PROC, proc, CTLFLAG_RD, 0, "Process table"); -SYSCTL_PROC(_kern_proc, KERN_PROC_ALL, all, CTLFLAG_RD|CTLTYPE_STRUCT, +SYSCTL_PROC(_kern_proc, KERN_PROC_ALL, all, + CTLFLAG_RD|CTLTYPE_STRUCT|CTLFLAG_MPSAFE, 0, 0, sysctl_kern_proc, "S,proc", "Return entire process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_GID, gid, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_GID, gid, CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_PGRP, pgrp, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_PGRP, pgrp, + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_RGID, rgid, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_RGID, rgid, + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_SESSION, sid, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_SESSION, sid, + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_TTY, tty, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_TTY, tty, CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_UID, uid, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_UID, uid, CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_RUID, ruid, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_RUID, ruid, + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_PID, pid, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_PID, pid, CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_PROC, proc, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_PROC, proc, + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Return process table, no threads"); static SYSCTL_NODE(_kern_proc, KERN_PROC_ARGS, args, @@ -1332,28 +1338,29 @@ sysctl_kern_proc_sv_name, "Process syscall vector name (ABI type)"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_GID | KERN_PROC_INC_THREAD), gid_td, - CTLFLAG_RD, sysctl_kern_proc, "Process table"); + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_PGRP | KERN_PROC_INC_THREAD), pgrp_td, - CTLFLAG_RD, sysctl_kern_proc, "Process table"); + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_RGID | KERN_PROC_INC_THREAD), rgid_td, - CTLFLAG_RD, sysctl_kern_proc, "Process table"); + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_SESSION | KERN_PROC_INC_THREAD), - sid_td, CTLFLAG_RD, sysctl_kern_proc, "Process table"); + sid_td, CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_TTY | KERN_PROC_INC_THREAD), tty_td, - CTLFLAG_RD, sysctl_kern_proc, "Process table"); + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_UID | KERN_PROC_INC_THREAD), uid_td, - CTLFLAG_RD, sysctl_kern_proc, "Process table"); + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_RUID | KERN_PROC_INC_THREAD), ruid_td, - CTLFLAG_RD, sysctl_kern_proc, "Process table"); + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_PID | KERN_PROC_INC_THREAD), pid_td, - CTLFLAG_RD, sysctl_kern_proc, "Process table"); + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_PROC | KERN_PROC_INC_THREAD), proc_td, - CTLFLAG_RD, sysctl_kern_proc, "Return process table, no threads"); + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, + "Return process table, no threads"); ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_sysctl.c#4 (text+ko) ==== @@ -1229,19 +1229,25 @@ if (error) return (error); + if ((oid->oid_kind & CTLFLAG_MPSAFE) == 0) + mtx_lock(&Giant); if ((oid->oid_kind & CTLTYPE) == CTLTYPE_NODE) { /* * You can't call a sysctl when it's a node, but has * no handler. Inform the user that it's a node. * The indx may or may not be the same as namelen. */ - if (oid->oid_handler == NULL) - return (EISDIR); + if (oid->oid_handler == NULL) { + error = EISDIR; + goto done; + } } /* Is this sysctl writable? */ - if (req->newptr && !(oid->oid_kind & CTLFLAG_WR)) - return (EPERM); + if (req->newptr && !(oid->oid_kind & CTLFLAG_WR)) { + error = EPERM; + goto done; + } KASSERT(req->td != NULL, ("sysctl_root(): req->td == NULL")); @@ -1250,7 +1256,7 @@ lvl = (oid->oid_kind & CTLMASK_SECURE) >> CTLSHIFT_SECURE; error = securelevel_gt(req->td->td_ucred, lvl); if (error) - return (error); + goto done; } /* Is this sysctl writable by only privileged users? */ @@ -1263,11 +1269,13 @@ flags = 0; error = suser_cred(req->td->td_ucred, flags); if (error) - return (error); + goto done; } - if (!oid->oid_handler) - return (EINVAL); + if (!oid->oid_handler) { + error = EINVAL; + goto done; + } if ((oid->oid_kind & CTLTYPE) == CTLTYPE_NODE) { arg1 = (int *)arg1 + indx; @@ -1280,12 +1288,14 @@ error = mac_check_system_sysctl(req->td->td_ucred, oid, arg1, arg2, req); if (error != 0) - return (error); + goto done; #endif if (oid->oid_handler == NULL) panic("oid handler null"); error = oid->oid_handler(oid, arg1, arg2, req); - +done: + if ((oid->oid_kind & CTLFLAG_MPSAFE) == 0) + mtx_unlock(&Giant); return (error); } @@ -1316,8 +1326,6 @@ if (error) return (error); - mtx_lock(&Giant); - error = userland_sysctl(td, name, uap->namelen, uap->old, uap->oldlenp, 0, uap->new, uap->newlen, &j, 0); @@ -1329,7 +1337,6 @@ error = i; } done2: - mtx_unlock(&Giant); return (error); } ==== //depot/projects/kmacy_sun4v/src/sys/sys/sysctl.h#4 (text+ko) ==== @@ -84,6 +84,7 @@ #define CTLFLAG_SKIP 0x01000000 /* Skip this sysctl when listing */ #define CTLMASK_SECURE 0x00F00000 /* Secure level */ #define CTLFLAG_TUN 0x00080000 /* Tunable variable */ +#define CTLFLAG_MPSAFE 0x00040000 /* Handler is MP safe */ #define CTLFLAG_RDTUN (CTLFLAG_RD|CTLFLAG_TUN) /* From owner-p4-projects@FreeBSD.ORG Sun Jun 25 01:09:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECD2F16A47E; Sun, 25 Jun 2006 01:09:25 +0000 (UTC) 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 B212216A49A for ; Sun, 25 Jun 2006 01:09:25 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EAF843D64 for ; Sun, 25 Jun 2006 01:09:25 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5P19ONx050239 for ; Sun, 25 Jun 2006 01:09:25 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5P19Osw050236 for perforce@freebsd.org; Sun, 25 Jun 2006 01:09:24 GMT (envelope-from csjp@freebsd.org) Date: Sun, 25 Jun 2006 01:09:24 GMT Message-Id: <200606250109.k5P19Osw050236@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 99956 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 01:09:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=99956 Change 99956 by csjp@csjp_rnd01 on 2006/06/25 01:09:23 sysctl_kern_proc_args looks like it has suffucient locking. Tag kern.proc.args as being mpsafe, this should eliminate Giant aquisitions from anything which makes a lot of calls to things like setproctitle() Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_proc.c#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_proc.c#8 (text+ko) ==== @@ -1328,7 +1328,7 @@ sysctl_kern_proc, "Return process table, no threads"); static SYSCTL_NODE(_kern_proc, KERN_PROC_ARGS, args, - CTLFLAG_RW | CTLFLAG_ANYBODY, + CTLFLAG_RW | CTLFLAG_ANYBODY | CTLFLAG_MPSAFE, sysctl_kern_proc_args, "Process argument list"); static SYSCTL_NODE(_kern_proc, KERN_PROC_PATHNAME, pathname, CTLFLAG_RD, From owner-p4-projects@FreeBSD.ORG Sun Jun 25 01:13:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04C7916A4B3; Sun, 25 Jun 2006 01:13:32 +0000 (UTC) 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 BD5CE16A4A9 for ; Sun, 25 Jun 2006 01:13:31 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A91D43D45 for ; Sun, 25 Jun 2006 01:13:31 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5P1DU1p050455 for ; Sun, 25 Jun 2006 01:13:31 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5P1DU73050452 for perforce@freebsd.org; Sun, 25 Jun 2006 01:13:30 GMT (envelope-from csjp@freebsd.org) Date: Sun, 25 Jun 2006 01:13:30 GMT Message-Id: <200606250113.k5P1DU73050452@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 99957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 01:13:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=99957 Change 99957 by csjp@csjp_rnd01 on 2006/06/25 01:12:50 We can safely drop Giant here, these numbers are calculated in loadav(9) which is done via an MPSAFE callout. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/vm/vm_meter.c#7 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/vm/vm_meter.c#7 (text+ko) ==== @@ -102,7 +102,7 @@ #endif return SYSCTL_OUT(req, &averunnable, sizeof(averunnable)); } -SYSCTL_PROC(_vm, VM_LOADAVG, loadavg, CTLTYPE_STRUCT|CTLFLAG_RD, +SYSCTL_PROC(_vm, VM_LOADAVG, loadavg, CTLTYPE_STRUCT|CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, sysctl_vm_loadavg, "S,loadavg", "Machine loadaverage history"); static int From owner-p4-projects@FreeBSD.ORG Sun Jun 25 01:16:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E102916A49E; Sun, 25 Jun 2006 01:16:41 +0000 (UTC) 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 BAA1816A47E for ; Sun, 25 Jun 2006 01:16:41 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1126043D66 for ; Sun, 25 Jun 2006 01:16:37 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5P1Ga3M050578 for ; Sun, 25 Jun 2006 01:16:36 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5P1GaHt050575 for perforce@freebsd.org; Sun, 25 Jun 2006 01:16:36 GMT (envelope-from csjp@freebsd.org) Date: Sun, 25 Jun 2006 01:16:36 GMT Message-Id: <200606250116.k5P1GaHt050575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 99958 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 01:16:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=99958 Change 99958 by csjp@csjp_rnd01 on 2006/06/25 01:15:54 I am reasonly sure that reads of the system page size variable do not need to be protected as this is constant. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mib.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_mib.c#3 (text+ko) ==== @@ -146,7 +146,7 @@ SYSCTL_INT(_hw, HW_BYTEORDER, byteorder, CTLFLAG_RD, 0, BYTE_ORDER, "System byte order"); -SYSCTL_INT(_hw, HW_PAGESIZE, pagesize, CTLFLAG_RD, +SYSCTL_INT(_hw, HW_PAGESIZE, pagesize, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, PAGE_SIZE, "System memory page size"); static int From owner-p4-projects@FreeBSD.ORG Sun Jun 25 01:48:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C24E16A4AB; Sun, 25 Jun 2006 01:48:17 +0000 (UTC) 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 C2EE916A494 for ; Sun, 25 Jun 2006 01:48:16 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 79C0443D62 for ; Sun, 25 Jun 2006 01:48:16 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5P1mGrp051857 for ; Sun, 25 Jun 2006 01:48:16 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5P1mG6J051854 for perforce@freebsd.org; Sun, 25 Jun 2006 01:48:16 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 25 Jun 2006 01:48:16 GMT Message-Id: <200606250148.k5P1mG6J051854@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 99960 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 01:48:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=99960 Change 99960 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/25 01:48:12 make sure that td_waittime always gets reset Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sys/lock_profile.h#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sys/lock_profile.h#5 (text+ko) ==== @@ -110,7 +110,8 @@ l->lpo_waittime = l->lpo_acqtime - td->td_waittime; td->td_waittime = 0; } - } + } else + curthread->td_waittime = 0; } static inline void lock_profile_release_lock(struct lock_object *lo) From owner-p4-projects@FreeBSD.ORG Sun Jun 25 02:16:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8759716A4A7; Sun, 25 Jun 2006 02:16:52 +0000 (UTC) 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 6618C16A494 for ; Sun, 25 Jun 2006 02:16:52 +0000 (UTC) (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 350C143D6A for ; Sun, 25 Jun 2006 02:16:52 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5P2GqrH054475 for ; Sun, 25 Jun 2006 02:16:52 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5P2GqlI054472 for perforce@freebsd.org; Sun, 25 Jun 2006 02:16:52 GMT (envelope-from jhb@freebsd.org) Date: Sun, 25 Jun 2006 02:16:52 GMT Message-Id: <200606250216.k5P2GqlI054472@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 99962 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 02:16:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=99962 Change 99962 by jhb@jhb_mutex on 2006/06/25 02:16:18 freebsd32_utimes is MPSAFE, and has been for quite a while. Affected files ... .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#32 edit Differences ... ==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#32 (text+ko) ==== @@ -253,7 +253,7 @@ int protocol, int *rsv); } 136 AUE_MKDIR MNOPROTO { int mkdir(char *path, int mode); } 137 AUE_RMDIR MNOPROTO { int rmdir(char *path); } -138 AUE_UTIMES STD { int freebsd32_utimes(char *path, \ +138 AUE_UTIMES MSTD { int freebsd32_utimes(char *path, \ struct timeval32 *tptr); } 139 AUE_NULL OBSOL 4.2 sigreturn 140 AUE_ADJTIME MSTD { int freebsd32_adjtime( \ From owner-p4-projects@FreeBSD.ORG Sun Jun 25 02:29:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 866B316A4A6; Sun, 25 Jun 2006 02:29:08 +0000 (UTC) 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 C57D016A492 for ; Sun, 25 Jun 2006 02:29:07 +0000 (UTC) (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 82D1843D68 for ; Sun, 25 Jun 2006 02:29:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5P2T7Oo055105 for ; Sun, 25 Jun 2006 02:29:07 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5P2T7co055102 for perforce@freebsd.org; Sun, 25 Jun 2006 02:29:07 GMT (envelope-from jhb@freebsd.org) Date: Sun, 25 Jun 2006 02:29:07 GMT Message-Id: <200606250229.k5P2T7co055102@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 99963 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 02:29:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=99963 Change 99963 by jhb@jhb_mutex on 2006/06/25 02:28:11 Sync svr4_sys_break() with obreak() some and mark MPSAFE: - Just read the process limits once up front and cache them. - Use vm_map_max() rather than VM_MAXUSER_ADDRESS. - Add vm_map locking. Affected files ... .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#45 edit .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#11 edit Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#45 (text+ko) ==== @@ -795,27 +795,36 @@ struct proc *p = td->td_proc; struct vmspace *vm = p->p_vmspace; vm_offset_t new, old, base, ns; - int rv; + rlim_t datalim, vmemlim; + int error, rv; + + PROC_LOCK(p); + datalim = lim_cur(p, RLIMIT_DATA); + vmemlim = lim_cur(p, RLIMIT_VMEM); + PROC_UNLOCK(p); base = round_page((vm_offset_t) vm->vm_daddr); ns = (vm_offset_t)uap->nsize; new = round_page(ns); + error = 0; + vm_map_lock(&vm->vm_map); if (new > base) { - PROC_LOCK(p); - if ((new - base) > (unsigned)lim_cur(p, RLIMIT_DATA)) { - PROC_UNLOCK(p); - return ENOMEM; + if ((new - base) > (unsigned)datalim) { + error = ENOMEM; + goto done; + } + if (new > vm_map_max(&vm->vm_map)) { + error = ENOMEM; + goto done; } - PROC_UNLOCK(p); - if (new >= VM_MAXUSER_ADDRESS) - return (ENOMEM); } else if (new < base) { /* * This is simply an invalid value. If someone wants to * do fancy address space manipulations, mmap and munmap * can do most of what the user would want. */ - return EINVAL; + error = EINVAL; + goto done; } old = base + ctob(vm->vm_dsize); @@ -823,27 +832,29 @@ if (new > old) { vm_size_t diff; diff = new - old; - PROC_LOCK(p); - if (vm->vm_map.size + diff > lim_cur(p, RLIMIT_VMEM)) { - PROC_UNLOCK(p); - return(ENOMEM); + if (vm->vm_map.size + diff > vmemlim) { + error = ENOMEM; + goto done; } - PROC_UNLOCK(p); rv = vm_map_find(&vm->vm_map, NULL, 0, &old, diff, FALSE, VM_PROT_ALL, VM_PROT_ALL, 0); if (rv != KERN_SUCCESS) { - return (ENOMEM); + error = ENOMEM; + goto done; } vm->vm_dsize += btoc(diff); } else if (new < old) { rv = vm_map_remove(&vm->vm_map, new, old); if (rv != KERN_SUCCESS) { - return (ENOMEM); + error = ENOMEM; + goto done; } vm->vm_dsize -= btoc(old - new); } +done: + vm_map_unlock(&vm->vm_map); - return (0); + return (error); } static __inline clock_t ==== //depot/projects/smpng/sys/compat/svr4/syscalls.master#11 (text+ko) ==== @@ -57,7 +57,7 @@ 14 AUE_NULL MSTD { int svr4_sys_mknod(char* path, int mode, int dev); } 15 AUE_NULL MNOPROTO { int chmod(char *path, int mode); } 16 AUE_NULL MNOPROTO { int chown(char *path, uid_t uid, gid_t gid); } -17 AUE_NULL STD { int svr4_sys_break(caddr_t nsize); } +17 AUE_NULL MSTD { int svr4_sys_break(caddr_t nsize); } 18 AUE_NULL MSTD { int svr4_sys_stat(char* path, \ struct svr4_stat* ub); } 19 AUE_NULL MNOPROTO { int lseek(int filedes, off_t *offset, \ From owner-p4-projects@FreeBSD.ORG Sun Jun 25 05:02:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54F3E16A49E; Sun, 25 Jun 2006 05:02:21 +0000 (UTC) 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 091A816A494 for ; Sun, 25 Jun 2006 05:02:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C79CE43D46 for ; Sun, 25 Jun 2006 05:02:19 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5P52JO3071954 for ; Sun, 25 Jun 2006 05:02:19 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5P52J0Z071951 for perforce@freebsd.org; Sun, 25 Jun 2006 05:02:19 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 25 Jun 2006 05:02:19 GMT Message-Id: <200606250502.k5P52J0Z071951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 99967 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 05:02:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=99967 Change 99967 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/25 05:01:48 fix wait tracking to handle nested locking in sleep mutexes Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#17 edit .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_sx.c#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/lock_profile.h#6 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/proc.h#10 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#17 (text+ko) ==== @@ -273,18 +273,21 @@ void _mtx_lock_flags(struct mtx *m, int opts, const char *file, int line) { - + + uint64_t waittime; MPASS(curthread != NULL); KASSERT(LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_sleep, ("mtx_lock() of spin mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); WITNESS_CHECKORDER(&m->mtx_object, opts | LOP_NEWORDER | LOP_EXCLUSIVE, file, line); + + lock_profile_waitstart(&waittime); _get_sleep_lock(m, curthread, opts, file, line); LOCK_LOG_LOCK("LOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); WITNESS_LOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); - lock_profile_obtain_lock_success(&m->mtx_object, file, line); + lock_profile_obtain_lock_success(&m->mtx_object, waittime, file, line); } void @@ -307,18 +310,19 @@ void _mtx_lock_spin_flags(struct mtx *m, int opts, const char *file, int line) { - + uint64_t waittime; MPASS(curthread != NULL); KASSERT(LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_spin, ("mtx_lock_spin() of sleep mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); WITNESS_CHECKORDER(&m->mtx_object, opts | LOP_NEWORDER | LOP_EXCLUSIVE, file, line); + lock_profile_waitstart(&waittime); _get_spin_lock(m, curthread, opts, file, line); LOCK_LOG_LOCK("LOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); WITNESS_LOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); - lock_profile_obtain_lock_success(&m->mtx_object, file, line); + lock_profile_obtain_lock_success(&m->mtx_object, waittime, file, line); } void @@ -345,8 +349,9 @@ int _mtx_trylock(struct mtx *m, int opts, const char *file, int line) { + uint64_t waittime = 0; int rval; - + MPASS(curthread != NULL); KASSERT(LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_sleep, ("mtx_trylock() of spin mutex %s @ %s:%d", m->mtx_object.lo_name, @@ -363,7 +368,7 @@ if (rval) { WITNESS_LOCK(&m->mtx_object, opts | LOP_EXCLUSIVE | LOP_TRYLOCK, file, line); - lock_profile_obtain_lock_success(&m->mtx_object, file, line); + lock_profile_obtain_lock_success(&m->mtx_object, waittime, file, line); } return (rval); } @@ -382,13 +387,8 @@ volatile struct thread *owner; #endif uintptr_t v; -#ifdef KTR -#if 0 - int cont_logged = 0; -#endif -#endif int contested; - + if (mtx_owned(m)) { KASSERT((m->mtx_object.lo_flags & LO_RECURSABLE) != 0, ("_mtx_lock_sleep: recursed on non-recursive mutex %s @ %s:%d\n", ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_sx.c#4 (text+ko) ==== @@ -113,6 +113,7 @@ { int contested; + uint64_t waittime = 0; mtx_lock(sx->sx_lock); KASSERT(sx->sx_xholder != curthread, @@ -123,6 +124,8 @@ /* * Loop in case we lose the race for lock acquisition. */ + if (sx->sx_cnt < 0) + lock_profile_waitstart(&waittime); while (sx->sx_cnt < 0) { sx->sx_shrd_wcnt++; lock_profile_obtain_lock_failed(&sx->sx_object, &contested); @@ -135,7 +138,7 @@ sx->sx_cnt++; if (sx->sx_cnt == 1) - lock_profile_obtain_lock_success(&sx->sx_object, file, line); + lock_profile_obtain_lock_success(&sx->sx_object, waittime, file, line); LOCK_LOG_LOCK("SLOCK", &sx->sx_object, 0, 0, file, line); WITNESS_LOCK(&sx->sx_object, 0, file, line); @@ -166,7 +169,8 @@ { int contested; - + uint64_t waittime = 0; + mtx_lock(sx->sx_lock); /* @@ -183,6 +187,8 @@ line); /* Loop in case we lose the race for lock acquisition. */ + if (sx->sx_cnt) + lock_profile_waitstart(&waittime); while (sx->sx_cnt != 0) { sx->sx_excl_wcnt++; lock_profile_obtain_lock_failed(&sx->sx_object, &contested); @@ -196,7 +202,7 @@ sx->sx_cnt--; sx->sx_xholder = curthread; - lock_profile_obtain_lock_success(&sx->sx_object, file, line); + lock_profile_obtain_lock_success(&sx->sx_object, waittime, file, line); LOCK_LOG_LOCK("XLOCK", &sx->sx_object, 0, 0, file, line); WITNESS_LOCK(&sx->sx_object, LOP_EXCLUSIVE, file, line); ==== //depot/projects/kmacy_sun4v/src/sys/sys/lock_profile.h#6 (text+ko) ==== @@ -84,34 +84,34 @@ } } +static inline void lock_profile_waitstart(uint64_t *waittime) +{ + *waittime = rd(tick); +} + static inline void lock_profile_obtain_lock_failed(struct lock_object *lo, int *contested) { struct lock_profile_object *l = &lo->lo_profile_obj; if (mutex_prof_enable) { *contested = 1; atomic_add_int(&l->lpo_contest_holding, 1); - if (curthread->td_waittime == 0) - curthread->td_waittime = rd(tick); } } -static inline void lock_profile_obtain_lock_success(struct lock_object *lo, const char *file, int line) +static inline void lock_profile_obtain_lock_success(struct lock_object *lo, uint64_t waittime, const char *file, int line) { struct lock_profile_object *l = &lo->lo_profile_obj; - + /* don't reset the timer when/if recursing */ if (mutex_prof_enable && l->lpo_acqtime == 0) { l->lpo_filename = file; l->lpo_lineno = line; l->lpo_acqtime = rd(tick); /* substitute for more general TSC read */ - if (curthread->td_waittime) { - struct thread *td = curthread; - if (l->lpo_acqtime > td->td_waittime) - l->lpo_waittime = l->lpo_acqtime - td->td_waittime; - td->td_waittime = 0; + if (waittime) { + if (l->lpo_acqtime > waittime) + l->lpo_waittime = l->lpo_acqtime - waittime; } - } else - curthread->td_waittime = 0; + } } static inline void lock_profile_release_lock(struct lock_object *lo) ==== //depot/projects/kmacy_sun4v/src/sys/sys/proc.h#10 (text+ko) ==== @@ -259,9 +259,6 @@ struct mdthread td_md; /* (k) Any machine-dependent fields. */ struct td_sched *td_sched; /* (*) Scheduler-specific data. */ struct kaudit_record *td_ar; /* (k) Active audit record, if any. */ -#ifdef MUTEX_PROFILING - uint64_t td_waittime; /* time in ns that thread started waiting for lock */ -#endif }; /* From owner-p4-projects@FreeBSD.ORG Sun Jun 25 05:19:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9068516A4D1; Sun, 25 Jun 2006 05:19:43 +0000 (UTC) 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 3739316A47E for ; Sun, 25 Jun 2006 05:19:43 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1BB443D76 for ; Sun, 25 Jun 2006 05:19:41 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5P5JfUZ073786 for ; Sun, 25 Jun 2006 05:19:41 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5P5JfgO073783 for perforce@freebsd.org; Sun, 25 Jun 2006 05:19:41 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 25 Jun 2006 05:19:41 GMT Message-Id: <200606250519.k5P5JfgO073783@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 99968 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 05:19:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=99968 Change 99968 by kmacy@kmacy_storage:sun4v_work_ifc on 2006/06/25 05:19:17 fix assert to recognize new flag Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#18 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#18 (text+ko) ==== @@ -814,7 +814,7 @@ int flags; MPASS((opts & ~(MTX_SPIN | MTX_QUIET | MTX_RECURSE | - MTX_NOWITNESS | MTX_DUPOK)) == 0); + MTX_NOWITNESS | MTX_DUPOK | MTX_NOPROFILE)) == 0); #ifdef MUTEX_DEBUG /* Diagnostic and error correction */ From owner-p4-projects@FreeBSD.ORG Sun Jun 25 05:47:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C84B016A4B3; Sun, 25 Jun 2006 05:47:16 +0000 (UTC) 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 8B38B16A4A0 for ; Sun, 25 Jun 2006 05:47:16 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C3E443D53 for ; Sun, 25 Jun 2006 05:47:16 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5P5lGHs074897 for ; Sun, 25 Jun 2006 05:47:16 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5P5lF4Q074894 for perforce@freebsd.org; Sun, 25 Jun 2006 05:47:15 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 25 Jun 2006 05:47:15 GMT Message-Id: <200606250547.k5P5lF4Q074894@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 99969 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 05:47:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=99969 Change 99969 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/25 05:46:34 grab thread lock before sleepq_remove to save some awkwardnesss Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_synch.c#9 edit .. //depot/projects/kmacy_sun4v/src/sys/kern/sys_generic.c#5 edit .. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_subr.c#7 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_synch.c#9 (text+ko) ==== @@ -116,11 +116,7 @@ * flag the mutex is not re-locked before returning. */ int -msleep(ident, mtx, priority, wmesg, timo) - void *ident; - struct mtx *mtx; - int priority, timo; - const char *wmesg; +msleep(void *ident, struct mtx *mtx, int priority, const char *wmesg, int timo) { struct thread *td; struct proc *p; @@ -133,6 +129,7 @@ if (KTRPOINT(td, KTR_CSW)) ktrcsw(1, 0); #endif + TD_SLOCK_ASSERT(td, MA_NOTOWNED); WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, mtx == NULL ? NULL : &mtx->mtx_object, "Sleeping on \"%s\"", wmesg); KASSERT(timo != 0 || mtx_owned(&Giant) || mtx != NULL, @@ -161,9 +158,11 @@ * sleep queue first. We have to do this to handle recursive * sleeps. */ - if (TD_ON_SLEEPQ(td)) + if (TD_ON_SLEEPQ(td)) { + TD_SLOCK(td); sleepq_remove(td, td->td_wchan); - + TD_SUNLOCK(td); + } flags = SLEEPQ_MSLEEP; if (catch) flags |= SLEEPQ_INTERRUPTIBLE; @@ -224,11 +223,7 @@ } int -msleep_spin(ident, mtx, wmesg, timo) - void *ident; - struct mtx *mtx; - const char *wmesg; - int timo; +msleep_spin(void *ident, struct mtx *mtx, const char *wmesg, int timo) { struct thread *td; struct proc *p; ==== //depot/projects/kmacy_sun4v/src/sys/kern/sys_generic.c#5 (text+ko) ==== @@ -1136,9 +1136,13 @@ } TAILQ_REMOVE(&td->td_selq, sip, si_thrlist); sip->si_thread = NULL; + mtx_unlock(&sellock); + atomic_clear_int(&td->td_flags, TDF_SELECT); + TD_SLOCK(td); sleepq_remove(td, &selwait); - mtx_unlock(&sellock); + TD_SUNLOCK(td); + } static void selectinit(void *); ==== //depot/projects/kmacy_sun4v/src/sys/kern/vfs_subr.c#7 (text+ko) ==== @@ -1731,7 +1731,9 @@ int ret = 0; td = FIRST_THREAD_IN_PROC(updateproc); + TD_SLOCK(td); sleepq_remove(td, &lbolt); + TD_SUNLOCK(td); mtx_lock(&sync_mtx); if (rushjob < syncdelay / 2) { rushjob += 1; @@ -1754,7 +1756,9 @@ if (howto & RB_NOSYNC) return; td = FIRST_THREAD_IN_PROC(updateproc); + TD_SLOCK(td); sleepq_remove(td, &lbolt); + TD_SUNLOCK(td); mtx_lock(&sync_mtx); syncer_state = SYNCER_SHUTTING_DOWN; rushjob = 0; From owner-p4-projects@FreeBSD.ORG Sun Jun 25 07:55:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C156E16A4A7; Sun, 25 Jun 2006 07:55:57 +0000 (UTC) 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 9C0B916A492 for ; Sun, 25 Jun 2006 07:55:57 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 69C4043D5D for ; Sun, 25 Jun 2006 07:55:55 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5P7ttwp082451 for ; Sun, 25 Jun 2006 07:55:55 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5P7tton082448 for perforce@freebsd.org; Sun, 25 Jun 2006 07:55:55 GMT (envelope-from clem1@FreeBSD.org) Date: Sun, 25 Jun 2006 07:55:55 GMT Message-Id: <200606250755.k5P7tton082448@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 99971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 07:55:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=99971 Change 99971 by clem1@clem1_ipv6vulns on 2006/06/25 07:55:15 pcs improvements: - almost icmp6 full support. - new samples (mld6query, nb-sk) Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/ethernet.py#2 edit .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/icmpv6.py#3 edit .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/ipv6.py#2 edit .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/pcs.py#3 edit .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/samples/mld6query.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/samples/nb-sk.py#1 add Differences ... ==== //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/ethernet.py#2 (text+ko) ==== @@ -1,5 +1,6 @@ import pcs import struct +import os import ipv4 import ipv6 @@ -19,7 +20,7 @@ type = pcs.Field("type", 16) etherlen = 14 - pcs.Packet.__init__(self, [src, dst, type], bytes = bytes) + pcs.Packet.__init__(self, [dst, src, type], bytes = bytes) if (bytes != None): self.data = self.next(bytes[etherlen:len(bytes)]) @@ -50,3 +51,19 @@ return ipv6.ipv6(bytes) return None + def name2eth(self, mac): + """return big endian representation of the human readable mac""" + addr = "" + for i in 0, 3, 6, 9, 12, 15: + addr += "%c" % int(mac[i:i+2], 16) + return addr + + def getmac(self, iface): + """return mac address associated to interface iface.""" + mac = "" + # XXX: use ioctl() instead. + for line in os.popen("/sbin/ifconfig %s" % iface): + if line.find('ether') > -1: + mac = line.split()[1] + break + return mac ==== //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/icmpv6.py#3 (text+ko) ==== @@ -38,12 +38,22 @@ import struct from pseudoipv6 import * +# icmp6 type ND_ROUTER_SOLICIT = 133 ND_ROUTER_ADVERT = 134 ND_NEIGHBOR_SOLICIT = 135 ND_NEIGHBOR_ADVERT = 136 ND_REDIRECT = 137 -ICMP6_ROUTER_RENUMBERING = 138 + +MLD6_LISTENER_QUERY = 130 +MLD6_LISTENER_REPORT = 131 +MLD6_LISTENER_DONE = 132 +MLD6_MTRACE_RESP = 200 +MLD6_MTRACE = 201 + +ICMP6_ROUTER_RENUMBERING = 138 +ICMP6_NI_QUERY = 139 +ICMP6_NI_REPLY = 140 ICMP6_WRUREQUEST = 139 ICMP6_WRUREPLY = 140 ICMP6_DST_UNREACH = 1 @@ -53,6 +63,13 @@ ICMP6_ECHO_REQUEST = 128 ICMP6_ECHO_REPLY = 129 +# router renumbering flags +ICMP6_RR_FLAGS_TEST = 0x80 +ICMP6_RR_FLAGS_REQRESULT = 0x40 +ICMP6_RR_FLAGS_FORCEAPPLY = 0x20 +ICMP6_RR_FLAGS_SPECSITE = 0x10 +ICMP6_RR_FLAGS_PREVDONE = 0x08 + op = 0 class icmpv6(pcs.Packet): @@ -61,6 +78,8 @@ def __init__(self, type = 0, bytes = None): """icmpv6 header RFC2463 and RFC2461""" + global op + op = 0 ty = pcs.Field("type", 8, default = type) code = pcs.Field("code", 8) cksum = pcs.Field("checksum", 16) @@ -77,7 +96,11 @@ elif type == ICMP6_PACKET_TOO_BIG: mtu = pcs.Field("mtu", 32) pcs.Packet.__init__(self, [ty, code, cksum, mtu], bytes) - #elif type == ICMP6_WRUREQUEST or type == ICMP6_WRUREPLY: + elif type == ICMP6_NI_QUERY or type == ICMP6_NI_REPLY: + qtype = pcs.Field("qtype", 16) + flags = pcs.Field("flags", 16) + nonce = pcs.Field("nonce", 64) + pcs.Packet.__init__(self, [ty, code, cksum, qtype, flags, nonce], bytes) elif type == ND_ROUTER_ADVERT: chp = pcs.Field("current_hop_limit", 8) m = pcs.Field("m", 1) @@ -86,18 +109,28 @@ rlf = pcs.Field("router_lifetime", 16) rct = pcs.Field("reachable_time", 32) rtt = pcs.Field("retrans_timer", 32) - pcs.Packet.__init__(self, [ty, code, cksum, chp, m, o, unused, rlt, rct, rtt], bytes) + pcs.Packet.__init__(self, [ty, code, cksum, chp, m, o, unused, rlf, rct, rtt], bytes) elif type == ND_NEIGHBOR_SOLICIT: reserved = pcs.Field("reserved", 32) - target = pcs.Field("target", 16 * 8) + target = pcs.Field("target", 16 * 8, type = str) pcs.Packet.__init__(self, [ty, code, cksum, reserved, target], bytes) elif type == ND_NEIGHBOR_ADVERT: r = pcs.Field("router", 1) s = pcs.Field("solicited", 1) o = pcs.Field("override", 1) reserved = pcs.Field("reserved", 29) - target = pcs.Field("target", 16 * 8) + target = pcs.Field("target", 16 * 8, type = str) pcs.Packet.__init__(self, [ty, code, cksum, r, s, o, reserved, target], bytes) + elif type == ND_REDIRECT: + reserved = pcs.Field("reserved", 32) + target = pcs.Field("target", 16 * 8, type = str) + dest = pcs.Field("destination", 16 * 8, type = str) + pcs.Packet.__init__(self, [ty, code, cksum, reserved, target, dest], bytes) + elif type == MLD6_LISTENER_QUERY or type == MLD6_LISTENER_REPORT or MLD6_LISTENER_DONE: + md = pcs.Field("maxdelay", 16) + reserved = pcs.Field("reserved", 16) + mcast = pcs.Field("mcastaddr", 16 * 8, type = str) + pcs.Packet.__init__(self, [ty, code, cksum, md, reserved, mcast], bytes) else: pcs.Packet.__init__(self, [ty, code, cksum], bytes) ==== //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/ipv6.py#2 (text+ko) ==== @@ -37,8 +37,15 @@ import pcs import struct +import os from socket import AF_INET6, inet_ntop +# extension header next header field. +IPV6_FRAG = 44 +IPV6_HOPOPTS = 49 +IPV6_RTHDR = 43 +IPV6_DSTOPTS = 60 + class ipv6(pcs.Packet): """A class that contains the IPv6 header. All other data is chained on the end.""" @@ -69,3 +76,114 @@ else: retval += "%s %s\n" % (field.name, self.__dict__[field.name]) return retval + + def getipv6(self, iface): + """return one ipv6 address associated to iface""" + v6 = "" + # XXX: improve this using getifaddrs() wrapper. + for line in os.popen("/sbin/ifconfig %s" % iface): + if line.find('inet6') > -1: + if line.split()[1][:4] == "fe80" or line.split()[1][:4] == "fec0": + continue + v6 = line.split()[1] + break + return v6 + +class rthdr(pcs.Packet): + """A class that contains the IPv6 routing extension-headers.""" + + layout = pcs.Layout() + + def __init__(self, bytes = None): + """IPv6 routing extension header from RFC 2460""" + next = pcs.Field("next_header", 8) + len = pcs.Field("length", 8) + type = pcs.Field("type", 8) + segments_left = pcs.Field("segments_left", 8) + pcs.Packet.__init__(self, + [next, len, type, segments_left], bytes) + + def rthdr0(self, seg = 1, bytes = None): + """IPv6 routing extension header type 0""" + reserved = pcs.Field("reserved", 32, default = 0) + header = [ reserved ] + for i in range(seg): + header.append(pcs.Field("address" + str(i), 128, type = str)) + pcs.Packet.__add__(self, header) + +class hopopts(pcs.Packet): + """A class that contains the IPv6 hop-by-hop options + extension-headers.""" + + layout = pcs.Layout() + + op = 0 + + def __init__(self, bytes = None): + """IPv6 hopbyhop options extension header from RFC 2460""" + global op + op = 0 + next = pcs.Field("next_header", 8) + len = pcs.Field("length", 8) + type = pcs.Field("type", 8) + pcs.Packet.__init__(self, + [next, len, type, segments_left], bytes) + + def option(self, len = 0): + """add option header to the hop-by-hop extension header""" + global op + op += 1 + otype = pcs.Field("otype" + str(op), 8) + olen = pcs.Field("olength" + str(op), 8, default = len / 8) + if len != 0: + odata = pcs.Field("odata" + str(op), len) + pcs.Packet.__add__(self, [otype, olen, odata]) + else: + pcs.Packet.__add__(self, [otype, olen]) + +class dstopts(pcs.Packet): + """A class that contains the IPv6 destination options + extension-headers.""" + + layout = pcs.Layout() + + op = 0 + + def __init__(self, bytes = None): + """IPv6 destination options extension header from RFC 2460""" + global op + op = 0 + next = pcs.Field("next_header", 8) + len = pcs.Field("length", 8) + type = pcs.Field("type", 8) + pcs.Packet.__init__(self, + [next, len, type, segments_left], bytes) + + def option(self, len = 0): + """add option header to the destination extension header""" + global op + op += 1 + otype = pcs.Field("otype" + str(op), 8) + olen = pcs.Field("olength" + str(op), 8, default = len / 8) + if len != 0: + odata = pcs.Field("odata" + str(op), len) + pcs.Packet.__add__(self, [otype, olen, odata]) + else: + pcs.Packet.__add__(self, [otype, olen]) + +class frag(pcs.Packet): + """A class that contains the IPv6 fragmentation extension-headers.""" + + layout = pcs.Layout() + + def __init__(self, bytes = None): + """IPv6 fragmentation extension header from RFC 2460""" + next = pcs.Field("next_header", 8) + reserved = pcs.Field("reserved", 8) + offset = pcs.Field("offset", 13) + res = pcs.Field("res", 2) + m = pcs.Field("m", 1) + identification = pcs.Field("identification", 32) + pcs.Packet.__init__(self, + [next, reserved, offset, res, m, identification], bytes) + ==== //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/pcs.py#3 (text+ko) ==== @@ -36,8 +36,8 @@ # individual protocols separately. # We need the struct module to pack our class into a byte string. -import struct - +import struct, re, sys +from socket import * import itertools def attribreprlist(obj, attrs): @@ -349,9 +349,7 @@ and low level stuff like pcap and bpf, connectors will be a unifying mechanism so you can write packets over any of the available APIs and the connector will do the right thing.""" - def __init__(self, name, arg = ""): - from socket import * import bpf connectors = [ "IPV4", "IPV6", "ICMP6", "UDP6", "TCP6", "ICMP", "UDP", "TCP", "BPF", "PCAP" ] self.bsd = 0 @@ -380,6 +378,14 @@ elif name == "PCAP": self.sock = pcap.pcap(arg) + def mcast(self, iface): + import dl + _libc = dl.open('libc.so') + ifn = _libc.call('if_nametoindex', iface) + self.sock.setsockopt(IPPROTO_IPV6, IPV6_MULTICAST_LOOP, 1) + self.sock.setsockopt(IPPROTO_IPV6, IPV6_MULTICAST_HOPS, 5) + self.sock.setsockopt(IPPROTO_IPV6, IPV6_MULTICAST_IF, ifn) + def read(): pass From owner-p4-projects@FreeBSD.ORG Sun Jun 25 08:26:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61AB316A406; Sun, 25 Jun 2006 08:26:39 +0000 (UTC) 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 0BE2C16A402 for ; Sun, 25 Jun 2006 08:26:39 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 093A043D4C for ; Sun, 25 Jun 2006 08:26:35 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5P8QYYG084974 for ; Sun, 25 Jun 2006 08:26:34 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5P8QYEt084971 for perforce@freebsd.org; Sun, 25 Jun 2006 08:26:34 GMT (envelope-from imp@freebsd.org) Date: Sun, 25 Jun 2006 08:26:34 GMT Message-Id: <200606250826.k5P8QYEt084971@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 99974 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 08:26:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=99974 Change 99974 by imp@imp_lighthouse on 2006/06/25 08:26:29 Checkpoint work in progress to make units != 0 work. they aren't initialized as a console, so don't presently work. We also shouldn't be turning on interrupt bits in the console code since it is polled. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#24 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#24 (text+ko) ==== @@ -72,6 +72,9 @@ } \ } while (0); +#define BAUD2DIVISOR(b) \ + ((((DEFAULT_RCLK * 10) / ((b) * 16)) + 5) / 10) + /* * Low-level UART interface. */ @@ -167,6 +170,13 @@ mr &= ~USART_MR_MSBF; /* lsb first */ mr &= ~USART_MR_CKLO_SCK; /* Don't drive SCK */ + WR4(bas, USART_MR, mr); + + /* + * Set the baud rate + */ + WR4(bas, USART_BRGR, BAUD2DIVISOR(baudrate)); + /* XXX Need to take possible synchronous mode into account */ return (0); } @@ -202,9 +212,11 @@ cr = USART_CR_RSTSTA | USART_CR_RSTRX | USART_CR_RSTTX; WR4(bas, USART_CR, cr); WR4(bas, USART_CR, USART_CR_RXEN | USART_CR_TXEN); +#if 0 WR4(bas, USART_IER, USART_CSR_TIMEOUT | USART_CSR_TXRDY | USART_CSR_RXRDY | USART_CSR_RXBRK | USART_CSR_ENDRX | USART_CSR_ENDTX); +#endif /* Set the receive timeout to be 1.5 character times. */ WR4(bas, USART_RTOR, 12); } @@ -295,6 +307,7 @@ at91_usart_bus_attach(struct uart_softc *sc) { int err; + uint32_t cr; struct at91_usart_softc *atsc; atsc = (struct at91_usart_softc *)sc; @@ -317,6 +330,17 @@ err = bus_dmamap_create(atsc->dmatag, 0, &atsc->rx_map); if (err != 0) goto errout; + + /* Turn on rx and tx */ + cr = USART_CR_RSTSTA | USART_CR_RSTRX | USART_CR_RSTTX; + WR4(&sc->sc_bas, USART_CR, cr); + WR4(&sc->sc_bas, USART_CR, USART_CR_RXEN | USART_CR_TXEN); + WR4(&sc->sc_bas, USART_IDR, 0xffffffff); + WR4(&sc->sc_bas, USART_IER, USART_CSR_TIMEOUT | + USART_CSR_TXRDY | USART_CSR_RXRDY | + USART_CSR_RXBRK | USART_CSR_ENDRX | USART_CSR_ENDTX); + /* Set the receive timeout to be 1.5 character times. */ + WR4(&sc->sc_bas, USART_RTOR, 12); errout:; // XXX bad return (err); @@ -360,6 +384,8 @@ WR4(&sc->sc_bas, PDC_TCR, sc->sc_txdatasz); WR4(&sc->sc_bas, PDC_PTCR, PDC_PTCR_TXTEN); uart_unlock(sc->sc_hwmtx); + if (device_get_unit(sc->sc_dev)) + device_printf(sc->sc_dev, "transmit %d bytes\n", sc->sc_txdatasz); #else for (int i = 0; i < sc->sc_txdatasz; i++) at91_usart_putc(&sc->sc_bas, sc->sc_txbuf[i]); @@ -425,6 +451,8 @@ int ipend = 0; struct at91_usart_softc *atsc; + if (device_get_unit(sc->sc_dev)) + device_printf(sc->sc_dev, "ipend csr %#x\n", csr); atsc = (struct at91_usart_softc *)sc; if (csr & USART_CSR_ENDTX) { bus_dmamap_sync(atsc->dmatag, atsc->tx_map, @@ -479,6 +507,15 @@ static int at91_usart_bus_ioctl(struct uart_softc *sc, int request, intptr_t data) { + switch (request) { + case UART_IOCTL_BREAK: + case UART_IOCTL_IFLOW: + case UART_IOCTL_OFLOW: + break; + case UART_IOCTL_BAUD: + WR4(&sc->sc_bas, USART_BRGR, BAUD2DIVISOR(*(int *)data)); + return (0); + } return (EINVAL); } struct uart_class at91_usart_class = { From owner-p4-projects@FreeBSD.ORG Sun Jun 25 11:10:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6347716A409; Sun, 25 Jun 2006 11:10:00 +0000 (UTC) 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 0A8D916A400 for ; Sun, 25 Jun 2006 11:10:00 +0000 (UTC) (envelope-from m@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A704A43D45 for ; Sun, 25 Jun 2006 11:09:59 +0000 (GMT) (envelope-from m@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5PB9xXZ004471 for ; Sun, 25 Jun 2006 11:09:59 GMT (envelope-from m@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5PB9xTR004468 for perforce@freebsd.org; Sun, 25 Jun 2006 11:09:59 GMT (envelope-from m@FreeBSD.org) Date: Sun, 25 Jun 2006 11:09:59 GMT Message-Id: <200606251109.k5PB9xTR004468@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to m@FreeBSD.org using -f From: Markus Boelter To: Perforce Change Reviews Cc: Subject: PERFORCE change 99979 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 11:10:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=99979 Change 99979 by m@m_coffee on 2006/06/25 11:09:38 Added FreeSBIE II tree to perforce with BSDInstaller LUA Backend plugin. Affected files ... .. //depot/projects/soc2006/m_netboot_server/freesbie/COPYING#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/Makefile#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/README#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/conf/amd64/FREESBIE#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/conf/freesbie.conf#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/conf/freesbie.defaults.conf#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/conf/i386/FREESBIE#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/conf/make.conf#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/conf/make.conf.minimal#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/conf/packages#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/conf/powerpc/FREESBIE#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/conf/rc.d/unionfs#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/conf/rc.d/uzip#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/adduser.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/adduser/homemfs.rc#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/buildmodules.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/comconsole.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/customroot.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/customroot/README#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/customscripts.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/customscripts/README#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/200_install.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/400_configure.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/600_upgrade.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/800_netboot.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/950_reboot.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/Makefile#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/conf/BSDInstaller.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/conf/DragonFly.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/conf/FreeBSD.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/conf/NetBSD.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/conf/OpenBSD.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/configure/100_choose_where_from.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/configure/200_select_disk.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/configure/300_select_part.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/configure/400_mount_target_system.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/configure/450_init_configuration.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/configure/500_menu.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/configure/550_write_configuration.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/configure/600_unmount_target_system.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/configure/main.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/configure/menu/100_set_root_password.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/configure/menu/200_add_user.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/configure/menu/300_set_timezone.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/configure/menu/350_set_datetime.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/configure/menu/400_change_console_settings.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/configure/menu/500_install_packages.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/configure/menu/550_remove_packages.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/configure/menu/main.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/install/100_welcome.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/install/200_select_disk.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/install/220_format_disk.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/install/250_partition_disk.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/install/270_install_bootblocks.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/install/300_select_part.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/install/400_select_subparts.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/install/405_warn_omitted_subparts.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/install/407_create_subparts.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/install/410_select_additional_filesystems.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/install/420_preselect_packages.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/install/450_select_packages.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/install/490_confirm_install_os.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/install/500_install_os.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/install/800_finished.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/install/900_reboot.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/install/main.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/lib/bitwise.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/lib/cmdchain.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/lib/configvars.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/lib/flow.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/lib/menu.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/lib/network.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/lib/network_ui.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/lib/package.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/lib/package_ui.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/lib/storage.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/lib/storage_ui.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/lib/target_system.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/lib/target_system_ui.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/lib/uinav.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/main.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/netboot/500_setup_server.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/netboot/main.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/pit/050_welcome.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/pit/100_select_language.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/pit/150_configure_console.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/pit/400_load_kernel_modules.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/pit/800_configure_network.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/pit/main.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/po/dfuibe_lua.pot#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/po/ru.po#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/apptest.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/bitwise.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/clock.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/commands.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/configvars.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/dfui.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/expander.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/filesystem.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/fsm.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/fsm/final.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/fsm/main.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/fsm/middle.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/fsm/start.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/fsm/subfsm.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/fsm/subfsm/main.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/fsm/subfsm/one.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/fsm/subfsm/two.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/main.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/menu.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/menu/010_first.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/menu/020_second.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/menu/030_third.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/menu/500_submenu.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/menu/500_submenu/010_first.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/menu/500_submenu/main.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/menu/main.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/network.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/pipe.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/progress.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/pty.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/storage.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/scripts/test/wait_for.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/upgrade/100_begin_upgrade.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/upgrade/200_select_disk.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/upgrade/300_select_part.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/upgrade/400_mount_target_system.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/upgrade/500_perform_upgrade.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/upgrade/550_upgrade_configuration.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/upgrade/600_unmount_target_system.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/upgrade/main.lua#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/etcmfs.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/etcmfs/etcmfs.rc#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/installports.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/mountdisks.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/mountdisks/mountdisks.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/mountdisks/mountdisksrc.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/rootmfs.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/rootmfs/rootmfs.rc#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/sound.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/sound/snd_card_ids.txt#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/sound/sound_detect.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/swapfind.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/swapfind/swapfind.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/varmfs.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/varmfs/varmfs.rc#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/xconfig-probe.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/xconfig-probe/xconfig-probe.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/xconfig-probe/xkbdlayout.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/xconfig-probe/xorg.conf.orig#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/xconfig.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/xconfig/xconfig.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/xconfig/xkbdlayout.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/xconfig/xorg.conf.orig#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/scripts/buildkernel.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/scripts/buildworld.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/scripts/cleandir.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/scripts/clonefs.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/scripts/custom/README#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/scripts/extra.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/scripts/flash.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/scripts/img.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/scripts/installkernel.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/scripts/installworld.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/scripts/iso.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/scripts/launch.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/scripts/pkginstall.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/scripts/pkgselect.sh#1 add .. //depot/projects/soc2006/m_netboot_server/freesbie/scripts/powerpc/iso.sh#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jun 25 13:20:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE14216A40F; Sun, 25 Jun 2006 13:20:00 +0000 (UTC) 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 5CF5316A554 for ; Sun, 25 Jun 2006 13:20:00 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B964043D6B for ; Sun, 25 Jun 2006 13:19:47 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5PDJlQl022359 for ; Sun, 25 Jun 2006 13:19:47 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5PDJlod022356 for perforce@freebsd.org; Sun, 25 Jun 2006 13:19:47 GMT (envelope-from piso@freebsd.org) Date: Sun, 25 Jun 2006 13:19:47 GMT Message-Id: <200606251319.k5PDJlod022356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 99985 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 13:20:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=99985 Change 99985 by piso@piso_newluxor on 2006/06/25 13:19:14 Axe old libalias work that we don't need anymore. Affected files ... .. //depot/projects/soc2005/libalias/Makefile#5 delete .. //depot/projects/soc2005/libalias/fix-base.sh#3 delete .. //depot/projects/soc2005/libalias/ipfw2-4/Makefile#3 delete .. //depot/projects/soc2005/libalias/ipfw2-4/kld/Makefile#3 delete .. //depot/projects/soc2005/libalias/ipfw2-4/kld/in.h#3 delete .. //depot/projects/soc2005/libalias/ipfw2-4/kld/ip_fw.c#3 delete .. //depot/projects/soc2005/libalias/ipfw2-4/kld/ip_fw.h#3 delete .. //depot/projects/soc2005/libalias/ipfw2-4/kld/ip_fw2.c#3 delete .. //depot/projects/soc2005/libalias/ipfw2-4/kld/ip_fw2.h#3 delete .. //depot/projects/soc2005/libalias/ipfw2-4/kld/raw_ip.c#3 delete .. //depot/projects/soc2005/libalias/ipfw2-4/sbin/Makefile#3 delete .. //depot/projects/soc2005/libalias/ipfw2-4/sbin/ipfw.8#3 delete .. //depot/projects/soc2005/libalias/ipfw2-4/sbin/ipfw.c#3 delete .. //depot/projects/soc2005/libalias/ipfw2-4/sbin/ipfw2.c#3 delete .. //depot/projects/soc2005/libalias/ipfw2-5/Makefile#3 delete .. //depot/projects/soc2005/libalias/ipfw2-5/kld/Makefile#3 delete .. //depot/projects/soc2005/libalias/ipfw2-5/kld/in.h#3 delete .. //depot/projects/soc2005/libalias/ipfw2-5/kld/ip_fw.h#3 delete .. //depot/projects/soc2005/libalias/ipfw2-5/kld/ip_fw2.c#3 delete .. //depot/projects/soc2005/libalias/ipfw2-5/kld/ip_fw_pfil.c#3 delete .. //depot/projects/soc2005/libalias/ipfw2-5/kld/raw_ip.c#3 delete .. //depot/projects/soc2005/libalias/ipfw2-5/sbin/Makefile#3 delete .. //depot/projects/soc2005/libalias/ipfw2-5/sbin/ipfw.8#3 delete .. //depot/projects/soc2005/libalias/ipfw2-5/sbin/ipfw2.c#3 delete .. //depot/projects/soc2005/libalias/ipfw2-6/Makefile#3 delete .. //depot/projects/soc2005/libalias/ipfw2-6/kld/Makefile#3 delete .. //depot/projects/soc2005/libalias/ipfw2-6/kld/in.h#3 delete .. //depot/projects/soc2005/libalias/ipfw2-6/kld/ip_fw.h#3 delete .. //depot/projects/soc2005/libalias/ipfw2-6/kld/ip_fw2.c#3 delete .. //depot/projects/soc2005/libalias/ipfw2-6/kld/ip_fw_pfil.c#3 delete .. //depot/projects/soc2005/libalias/ipfw2-6/kld/raw_ip.c#3 delete .. //depot/projects/soc2005/libalias/ipfw2-6/sbin/Makefile#3 delete .. //depot/projects/soc2005/libalias/ipfw2-6/sbin/ipfw.8#3 delete .. //depot/projects/soc2005/libalias/ipfw2-6/sbin/ipfw2.c#3 delete .. //depot/projects/soc2005/libalias/libalias/HISTORY#3 delete .. //depot/projects/soc2005/libalias/libalias/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/alias.c#3 delete .. //depot/projects/soc2005/libalias/libalias/alias.h#3 delete .. //depot/projects/soc2005/libalias/libalias/alias_cuseeme.c#3 delete .. //depot/projects/soc2005/libalias/libalias/alias_db.c#3 delete .. //depot/projects/soc2005/libalias/libalias/alias_dummy.c#3 delete .. //depot/projects/soc2005/libalias/libalias/alias_ftp.c#3 delete .. //depot/projects/soc2005/libalias/libalias/alias_irc.c#3 delete .. //depot/projects/soc2005/libalias/libalias/alias_local.h#3 delete .. //depot/projects/soc2005/libalias/libalias/alias_mod.c#3 delete .. //depot/projects/soc2005/libalias/libalias/alias_mod.h#3 delete .. //depot/projects/soc2005/libalias/libalias/alias_nbt.c#3 delete .. //depot/projects/soc2005/libalias/libalias/alias_old.c#3 delete .. //depot/projects/soc2005/libalias/libalias/alias_pptp.c#3 delete .. //depot/projects/soc2005/libalias/libalias/alias_proxy.c#3 delete .. //depot/projects/soc2005/libalias/libalias/alias_skinny.c#3 delete .. //depot/projects/soc2005/libalias/libalias/alias_smedia.c#3 delete .. //depot/projects/soc2005/libalias/libalias/alias_util.c#3 delete .. //depot/projects/soc2005/libalias/libalias/kld-cuseeme/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/kld-dummy/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/kld-ftp/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/kld-irc/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/kld-libalias/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/kld-nbt/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/kld-pptp/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/kld-skinny/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/kld-smedia/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/lib-cuseeme/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/lib-dummy/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/lib-ftp/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/lib-irc/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/lib-libalias/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/lib-nbt/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/lib-pptp/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/lib-skinny/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/lib-smedia/Makefile#3 delete .. //depot/projects/soc2005/libalias/libalias/libalias.3#3 delete .. //depot/projects/soc2005/libalias/libalias/libalias.conf#3 delete .. //depot/projects/soc2005/libalias/ng_nat/Makefile#3 delete .. //depot/projects/soc2005/libalias/ng_nat/ng_nat.c#3 delete .. //depot/projects/soc2005/libalias/ng_nat/ng_nat.h#3 delete .. //depot/projects/soc2005/libalias/patch/strsep.c#3 delete .. //depot/projects/soc2005/libalias/patch/strspn.c#3 delete .. //depot/projects/soc2005/libalias/readme.txt#3 delete .. //depot/projects/soc2005/libalias/test/setup_test_env.sh#3 delete .. //depot/projects/soc2005/libalias/test/test_ipfw_nat.sh#3 delete .. //depot/projects/soc2005/libalias/test/test_ng_nat.sh#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jun 25 13:51:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96C0916A406; Sun, 25 Jun 2006 13:51:29 +0000 (UTC) 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 72CE416A400 for ; Sun, 25 Jun 2006 13:51:29 +0000 (UTC) (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 2049243D68 for ; Sun, 25 Jun 2006 13:51:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5PDpRvh023913 for ; Sun, 25 Jun 2006 13:51:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5PDpR1F023910 for perforce@freebsd.org; Sun, 25 Jun 2006 13:51:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 25 Jun 2006 13:51:27 GMT Message-Id: <200606251351.k5PDpR1F023910@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 99988 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 13:51:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=99988 Change 99988 by rwatson@rwatson_sesame on 2006/06/25 13:51:12 Update HISTORY. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#15 (text+ko) ==== @@ -6,6 +6,7 @@ - Prefer inttypes.h to stdint.h; enhance queue.h detection to test for TAILQ_FOREACH_SAFE(), which is present in recent BSD queue.h's, but not older ones. OpenBSM now builds on some FreeBSD 4.x version. +- New event types for extended attributes, ACLs, and scheduling. OpenBSM 1.0 alpha 6 @@ -174,4 +175,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#14 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#15 $ From owner-p4-projects@FreeBSD.ORG Sun Jun 25 14:58:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10B7116A403; Sun, 25 Jun 2006 14:58:59 +0000 (UTC) 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 9540D16A40D for ; Sun, 25 Jun 2006 14:58:58 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9177A43D5D for ; Sun, 25 Jun 2006 14:58:51 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5PEwp4x028447 for ; Sun, 25 Jun 2006 14:58:51 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5PEwotj028434 for perforce@freebsd.org; Sun, 25 Jun 2006 14:58:50 GMT (envelope-from piso@freebsd.org) Date: Sun, 25 Jun 2006 14:58:50 GMT Message-Id: <200606251458.k5PEwotj028434@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 99991 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 14:58:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=99991 Change 99991 by piso@piso_newluxor on 2006/06/25 14:49:45 IFC Affected files ... .. //depot/projects/soc2005/libalias/COPYRIGHT#1 branch .. //depot/projects/soc2005/libalias/LOCKS#1 branch .. //depot/projects/soc2005/libalias/MAINTAINERS#1 branch .. //depot/projects/soc2005/libalias/Makefile#6 branch .. //depot/projects/soc2005/libalias/Makefile.inc1#1 branch .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#1 branch .. //depot/projects/soc2005/libalias/README#1 branch .. //depot/projects/soc2005/libalias/UPDATING#1 branch .. //depot/projects/soc2005/libalias/bin/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/Makefile.inc#1 branch .. //depot/projects/soc2005/libalias/bin/cat/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/cat/cat.1#1 branch .. //depot/projects/soc2005/libalias/bin/cat/cat.c#1 branch .. //depot/projects/soc2005/libalias/bin/chflags/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/chflags/chflags.1#1 branch .. //depot/projects/soc2005/libalias/bin/chflags/chflags.c#1 branch .. //depot/projects/soc2005/libalias/bin/chio/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/chio/chio.1#1 branch .. //depot/projects/soc2005/libalias/bin/chio/chio.c#1 branch .. //depot/projects/soc2005/libalias/bin/chio/defs.h#1 branch .. //depot/projects/soc2005/libalias/bin/chio/pathnames.h#1 branch .. //depot/projects/soc2005/libalias/bin/chmod/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/chmod/chmod.1#1 branch .. //depot/projects/soc2005/libalias/bin/chmod/chmod.c#1 branch .. //depot/projects/soc2005/libalias/bin/cp/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/cp/cp.1#1 branch .. //depot/projects/soc2005/libalias/bin/cp/cp.c#1 branch .. //depot/projects/soc2005/libalias/bin/cp/extern.h#1 branch .. //depot/projects/soc2005/libalias/bin/cp/utils.c#1 branch .. //depot/projects/soc2005/libalias/bin/csh/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/soc2005/libalias/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/soc2005/libalias/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/soc2005/libalias/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/soc2005/libalias/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/soc2005/libalias/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/soc2005/libalias/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/soc2005/libalias/bin/csh/config.h#1 branch .. //depot/projects/soc2005/libalias/bin/csh/config_p.h#1 branch .. //depot/projects/soc2005/libalias/bin/csh/host.defs#1 branch .. //depot/projects/soc2005/libalias/bin/csh/iconv.h#1 branch .. //depot/projects/soc2005/libalias/bin/csh/iconv_stub.c#1 branch .. //depot/projects/soc2005/libalias/bin/date/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/date/date.1#1 branch .. //depot/projects/soc2005/libalias/bin/date/date.c#1 branch .. //depot/projects/soc2005/libalias/bin/date/extern.h#1 branch .. //depot/projects/soc2005/libalias/bin/date/netdate.c#1 branch .. //depot/projects/soc2005/libalias/bin/date/vary.c#1 branch .. //depot/projects/soc2005/libalias/bin/date/vary.h#1 branch .. //depot/projects/soc2005/libalias/bin/dd/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/dd/args.c#1 branch .. //depot/projects/soc2005/libalias/bin/dd/conv.c#1 branch .. //depot/projects/soc2005/libalias/bin/dd/conv_tab.c#1 branch .. //depot/projects/soc2005/libalias/bin/dd/dd.1#1 branch .. //depot/projects/soc2005/libalias/bin/dd/dd.c#1 branch .. //depot/projects/soc2005/libalias/bin/dd/dd.h#1 branch .. //depot/projects/soc2005/libalias/bin/dd/extern.h#1 branch .. //depot/projects/soc2005/libalias/bin/dd/gen.c#1 branch .. //depot/projects/soc2005/libalias/bin/dd/misc.c#1 branch .. //depot/projects/soc2005/libalias/bin/dd/position.c#1 branch .. //depot/projects/soc2005/libalias/bin/dd/ref.ascii#1 branch .. //depot/projects/soc2005/libalias/bin/dd/ref.ebcdic#1 branch .. //depot/projects/soc2005/libalias/bin/dd/ref.ibm#1 branch .. //depot/projects/soc2005/libalias/bin/dd/ref.lcase#1 branch .. //depot/projects/soc2005/libalias/bin/dd/ref.oldascii#1 branch .. //depot/projects/soc2005/libalias/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/soc2005/libalias/bin/dd/ref.oldibm#1 branch .. //depot/projects/soc2005/libalias/bin/dd/ref.pareven#1 branch .. //depot/projects/soc2005/libalias/bin/dd/ref.parnone#1 branch .. //depot/projects/soc2005/libalias/bin/dd/ref.parodd#1 branch .. //depot/projects/soc2005/libalias/bin/dd/ref.parset#1 branch .. //depot/projects/soc2005/libalias/bin/dd/ref.swab#1 branch .. //depot/projects/soc2005/libalias/bin/dd/ref.ucase#1 branch .. //depot/projects/soc2005/libalias/bin/df/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/df/df.1#1 branch .. //depot/projects/soc2005/libalias/bin/df/df.c#1 branch .. //depot/projects/soc2005/libalias/bin/domainname/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/domainname/domainname.1#1 branch .. //depot/projects/soc2005/libalias/bin/domainname/domainname.c#1 branch .. //depot/projects/soc2005/libalias/bin/echo/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/echo/echo.1#1 branch .. //depot/projects/soc2005/libalias/bin/echo/echo.c#1 branch .. //depot/projects/soc2005/libalias/bin/ed/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/ed/POSIX#1 branch .. //depot/projects/soc2005/libalias/bin/ed/README#1 branch .. //depot/projects/soc2005/libalias/bin/ed/buf.c#1 branch .. //depot/projects/soc2005/libalias/bin/ed/cbc.c#1 branch .. //depot/projects/soc2005/libalias/bin/ed/ed.1#1 branch .. //depot/projects/soc2005/libalias/bin/ed/ed.h#1 branch .. //depot/projects/soc2005/libalias/bin/ed/glbl.c#1 branch .. //depot/projects/soc2005/libalias/bin/ed/io.c#1 branch .. //depot/projects/soc2005/libalias/bin/ed/main.c#1 branch .. //depot/projects/soc2005/libalias/bin/ed/re.c#1 branch .. //depot/projects/soc2005/libalias/bin/ed/sub.c#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/=.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/README#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/TODO#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/a.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/a.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/a.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/a1.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/a2.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/addr.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/addr.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/addr.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/addr1.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/addr2.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/ascii.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/bang1.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/bang1.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/bang1.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/bang1.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/bang2.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/c.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/c.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/c.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/c1.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/c2.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/d.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/d.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/d.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/d.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/e1.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/e1.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/e1.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/e1.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/e2.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/e2.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/e2.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/e2.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/e3.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/e3.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/e3.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/e3.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/e4.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/e4.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/e4.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/f1.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/f2.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g1.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g1.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g1.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g1.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g2.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g2.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g2.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g2.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g3.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g3.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g3.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g3.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g4.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g4.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g4.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g5.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g5.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/g5.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/h.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/i.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/i.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/i.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/i1.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/i2.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/i3.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/j.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/j.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/j.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/k.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/k.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/k.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/k1.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/k2.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/k3.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/k4.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/l.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/l.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/l.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/m.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/m.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/m.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/m.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/n.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/n.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/n.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/nl.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/nl1.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/nl1.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/nl1.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/nl2.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/nl2.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/nl2.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/p.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/p.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/p.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/q.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/q.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/q.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/q1.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/r1.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/r1.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/r1.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/r1.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/r2.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/r2.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/r2.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/r2.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/r3.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/r3.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/r3.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s1.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s1.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s1.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s1.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s10.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s2.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s2.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s2.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s2.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s3.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s3.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s3.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s3.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s4.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s5.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s6.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s7.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s8.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/s9.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/t.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/t.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/t1.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/t1.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/t1.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/t1.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/t2.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/t2.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/t2.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/t2.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/u.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/u.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/u.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/u.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/v.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/v.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/v.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/w.d#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/w.r#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/w.t#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/w1.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/w2.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/w3.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/x.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/test/z.err#1 branch .. //depot/projects/soc2005/libalias/bin/ed/undo.c#1 branch .. //depot/projects/soc2005/libalias/bin/expr/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/expr/expr.1#1 branch .. //depot/projects/soc2005/libalias/bin/expr/expr.y#1 branch .. //depot/projects/soc2005/libalias/bin/getfacl/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/getfacl/getfacl.1#1 branch .. //depot/projects/soc2005/libalias/bin/getfacl/getfacl.c#1 branch .. //depot/projects/soc2005/libalias/bin/hostname/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/hostname/hostname.1#1 branch .. //depot/projects/soc2005/libalias/bin/hostname/hostname.c#1 branch .. //depot/projects/soc2005/libalias/bin/kenv/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/kenv/kenv.1#1 branch .. //depot/projects/soc2005/libalias/bin/kenv/kenv.c#1 branch .. //depot/projects/soc2005/libalias/bin/kill/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/kill/kill.1#1 branch .. //depot/projects/soc2005/libalias/bin/kill/kill.c#1 branch .. //depot/projects/soc2005/libalias/bin/ln/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/ln/ln.1#1 branch .. //depot/projects/soc2005/libalias/bin/ln/ln.c#1 branch .. //depot/projects/soc2005/libalias/bin/ln/symlink.7#1 branch .. //depot/projects/soc2005/libalias/bin/ls/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/ls/cmp.c#1 branch .. //depot/projects/soc2005/libalias/bin/ls/extern.h#1 branch .. //depot/projects/soc2005/libalias/bin/ls/ls.1#1 branch .. //depot/projects/soc2005/libalias/bin/ls/ls.c#1 branch .. //depot/projects/soc2005/libalias/bin/ls/ls.h#1 branch .. //depot/projects/soc2005/libalias/bin/ls/print.c#1 branch .. //depot/projects/soc2005/libalias/bin/ls/util.c#1 branch .. //depot/projects/soc2005/libalias/bin/mkdir/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/mkdir/mkdir.1#1 branch .. //depot/projects/soc2005/libalias/bin/mkdir/mkdir.c#1 branch .. //depot/projects/soc2005/libalias/bin/mv/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/mv/mv.1#1 branch .. //depot/projects/soc2005/libalias/bin/mv/mv.c#1 branch .. //depot/projects/soc2005/libalias/bin/pax/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/pax/ar_io.c#1 branch .. //depot/projects/soc2005/libalias/bin/pax/ar_subs.c#1 branch .. //depot/projects/soc2005/libalias/bin/pax/buf_subs.c#1 branch .. //depot/projects/soc2005/libalias/bin/pax/cache.c#1 branch .. //depot/projects/soc2005/libalias/bin/pax/cache.h#1 branch .. //depot/projects/soc2005/libalias/bin/pax/cpio.1#1 branch .. //depot/projects/soc2005/libalias/bin/pax/cpio.c#1 branch .. //depot/projects/soc2005/libalias/bin/pax/cpio.h#1 branch .. //depot/projects/soc2005/libalias/bin/pax/extern.h#1 branch .. //depot/projects/soc2005/libalias/bin/pax/file_subs.c#1 branch .. //depot/projects/soc2005/libalias/bin/pax/ftree.c#1 branch .. //depot/projects/soc2005/libalias/bin/pax/ftree.h#1 branch .. //depot/projects/soc2005/libalias/bin/pax/gen_subs.c#1 branch .. //depot/projects/soc2005/libalias/bin/pax/getoldopt.c#1 branch .. //depot/projects/soc2005/libalias/bin/pax/options.c#1 branch .. //depot/projects/soc2005/libalias/bin/pax/options.h#1 branch .. //depot/projects/soc2005/libalias/bin/pax/pat_rep.c#1 branch .. //depot/projects/soc2005/libalias/bin/pax/pat_rep.h#1 branch .. //depot/projects/soc2005/libalias/bin/pax/pax.1#1 branch .. //depot/projects/soc2005/libalias/bin/pax/pax.c#1 branch .. //depot/projects/soc2005/libalias/bin/pax/pax.h#1 branch .. //depot/projects/soc2005/libalias/bin/pax/sel_subs.c#1 branch .. //depot/projects/soc2005/libalias/bin/pax/sel_subs.h#1 branch .. //depot/projects/soc2005/libalias/bin/pax/tables.c#1 branch .. //depot/projects/soc2005/libalias/bin/pax/tables.h#1 branch .. //depot/projects/soc2005/libalias/bin/pax/tar.1#1 branch .. //depot/projects/soc2005/libalias/bin/pax/tar.c#1 branch .. //depot/projects/soc2005/libalias/bin/pax/tar.h#1 branch .. //depot/projects/soc2005/libalias/bin/pax/tty_subs.c#1 branch .. //depot/projects/soc2005/libalias/bin/ps/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/ps/extern.h#1 branch .. //depot/projects/soc2005/libalias/bin/ps/fmt.c#1 branch .. //depot/projects/soc2005/libalias/bin/ps/keyword.c#1 branch .. //depot/projects/soc2005/libalias/bin/ps/nlist.c#1 branch .. //depot/projects/soc2005/libalias/bin/ps/print.c#1 branch .. //depot/projects/soc2005/libalias/bin/ps/ps.1#1 branch .. //depot/projects/soc2005/libalias/bin/ps/ps.c#1 branch .. //depot/projects/soc2005/libalias/bin/ps/ps.h#1 branch .. //depot/projects/soc2005/libalias/bin/pwd/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/pwd/pwd.1#1 branch .. //depot/projects/soc2005/libalias/bin/pwd/pwd.c#1 branch .. //depot/projects/soc2005/libalias/bin/rcp/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/rcp/extern.h#1 branch .. //depot/projects/soc2005/libalias/bin/rcp/rcp.1#1 branch .. //depot/projects/soc2005/libalias/bin/rcp/rcp.c#1 branch .. //depot/projects/soc2005/libalias/bin/rcp/util.c#1 branch .. //depot/projects/soc2005/libalias/bin/realpath/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/realpath/realpath.1#1 branch .. //depot/projects/soc2005/libalias/bin/realpath/realpath.c#1 branch .. //depot/projects/soc2005/libalias/bin/rm/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/rm/rm.1#1 branch .. //depot/projects/soc2005/libalias/bin/rm/rm.c#1 branch .. //depot/projects/soc2005/libalias/bin/rmail/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/rmdir/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/rmdir/rmdir.1#1 branch .. //depot/projects/soc2005/libalias/bin/rmdir/rmdir.c#1 branch .. //depot/projects/soc2005/libalias/bin/setfacl/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/setfacl/file.c#1 branch .. //depot/projects/soc2005/libalias/bin/setfacl/mask.c#1 branch .. //depot/projects/soc2005/libalias/bin/setfacl/merge.c#1 branch .. //depot/projects/soc2005/libalias/bin/setfacl/remove.c#1 branch .. //depot/projects/soc2005/libalias/bin/setfacl/setfacl.1#1 branch .. //depot/projects/soc2005/libalias/bin/setfacl/setfacl.c#1 branch .. //depot/projects/soc2005/libalias/bin/setfacl/setfacl.h#1 branch .. //depot/projects/soc2005/libalias/bin/setfacl/util.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/sh/TOUR#1 branch .. //depot/projects/soc2005/libalias/bin/sh/alias.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/alias.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/arith.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/arith.y#1 branch .. //depot/projects/soc2005/libalias/bin/sh/arith_lex.l#1 branch .. //depot/projects/soc2005/libalias/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/bltin/echo.1#1 branch .. //depot/projects/soc2005/libalias/bin/sh/bltin/echo.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/builtins.def#1 branch .. //depot/projects/soc2005/libalias/bin/sh/cd.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/cd.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/error.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/error.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/eval.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/eval.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/exec.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/exec.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/expand.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/expand.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/funcs/cmv#1 branch .. //depot/projects/soc2005/libalias/bin/sh/funcs/dirs#1 branch .. //depot/projects/soc2005/libalias/bin/sh/funcs/kill#1 branch .. //depot/projects/soc2005/libalias/bin/sh/funcs/login#1 branch .. //depot/projects/soc2005/libalias/bin/sh/funcs/newgrp#1 branch .. //depot/projects/soc2005/libalias/bin/sh/funcs/popd#1 branch .. //depot/projects/soc2005/libalias/bin/sh/funcs/pushd#1 branch .. //depot/projects/soc2005/libalias/bin/sh/funcs/suspend#1 branch .. //depot/projects/soc2005/libalias/bin/sh/histedit.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/init.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/input.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/input.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/jobs.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/jobs.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/mail.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/mail.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/main.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/main.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/memalloc.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/memalloc.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/miscbltin.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/mkbuiltins#1 branch .. //depot/projects/soc2005/libalias/bin/sh/mkinit.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/mknodes.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/mksyntax.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/mktokens#1 branch .. //depot/projects/soc2005/libalias/bin/sh/myhistedit.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/mystring.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/mystring.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/nodes.c.pat#1 branch .. //depot/projects/soc2005/libalias/bin/sh/nodetypes#1 branch .. //depot/projects/soc2005/libalias/bin/sh/options.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/options.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/output.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/output.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/parser.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/parser.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/redir.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/redir.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/sh.1#1 branch .. //depot/projects/soc2005/libalias/bin/sh/shell.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/show.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/show.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/trap.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/trap.h#1 branch .. //depot/projects/soc2005/libalias/bin/sh/var.c#1 branch .. //depot/projects/soc2005/libalias/bin/sh/var.h#1 branch .. //depot/projects/soc2005/libalias/bin/sleep/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/sleep/sleep.1#1 branch .. //depot/projects/soc2005/libalias/bin/sleep/sleep.c#1 branch .. //depot/projects/soc2005/libalias/bin/stty/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/stty/cchar.c#1 branch .. //depot/projects/soc2005/libalias/bin/stty/extern.h#1 branch .. //depot/projects/soc2005/libalias/bin/stty/gfmt.c#1 branch .. //depot/projects/soc2005/libalias/bin/stty/key.c#1 branch .. //depot/projects/soc2005/libalias/bin/stty/modes.c#1 branch .. //depot/projects/soc2005/libalias/bin/stty/print.c#1 branch .. //depot/projects/soc2005/libalias/bin/stty/stty.1#1 branch .. //depot/projects/soc2005/libalias/bin/stty/stty.c#1 branch .. //depot/projects/soc2005/libalias/bin/stty/stty.h#1 branch .. //depot/projects/soc2005/libalias/bin/stty/util.c#1 branch .. //depot/projects/soc2005/libalias/bin/sync/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/sync/sync.8#1 branch .. //depot/projects/soc2005/libalias/bin/sync/sync.c#1 branch .. //depot/projects/soc2005/libalias/bin/test/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/test/TEST.README#1 branch .. //depot/projects/soc2005/libalias/bin/test/TEST.csh#1 branch .. //depot/projects/soc2005/libalias/bin/test/TEST.sh#1 branch .. //depot/projects/soc2005/libalias/bin/test/test.1#1 branch .. //depot/projects/soc2005/libalias/bin/test/test.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/AUTHORS#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/BUGS#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/COPYING#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/ChangeLog#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/INSTALL#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/NEWS#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/README#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/README.ldap#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/README.y2k#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amd.8#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amd.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amd.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/autil.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/clock.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/conf.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/map.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/opts.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/restart.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/sched.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amq/amq.8#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amq/amq.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amq/amq.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/bootstrap#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/doc/version.texi#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/libamu/util.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/m4/amindent#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/m4/autopat#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/m4/mkconf#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/tasks#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/AUTHORS#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/ChangeLog#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/FAQ#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/INSTALL#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Makefile.am#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/NEWS#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/README#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/array.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/atan.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/div.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/exp.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/fact.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/jn.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/ln.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/mul.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/raise.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/signum#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/sine.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/Test/timetest#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/acconfig.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/aclocal.m4#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/bc.y#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/const.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/execute.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/global.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/global.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/load.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/main.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/proto.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/scan.l#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/storage.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/bc/util.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/config.h.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/configure#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/configure.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/dc/array.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/dc/dc.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/dc/dc.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/dc/eval.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/dc/misc.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/dc/stack.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/dc/string.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/doc/bc.1#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/doc/dc.1#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/h/number.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/install-sh#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/lib/number.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/missing#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/soc2005/libalias/contrib/bc/stamp-h.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/CHANGES#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/FAQ#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/README#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/acconfig.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/config.guess#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/config.sub#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/config.threads.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/configure.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc3445.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 25 17:22:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A06116A401; Sun, 25 Jun 2006 17:22:49 +0000 (UTC) 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 76E7716A40B for ; Sun, 25 Jun 2006 17:22:49 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39C4243D46 for ; Sun, 25 Jun 2006 17:22:49 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5PHMnK1048209 for ; Sun, 25 Jun 2006 17:22:49 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5PHMmGn048206 for perforce@freebsd.org; Sun, 25 Jun 2006 17:22:48 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 25 Jun 2006 17:22:48 GMT Message-Id: <200606251722.k5PHMmGn048206@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 99993 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 17:22:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=99993 Change 99993 by hselasky@hselasky_mini_itx on 2006/06/25 17:22:26 Finished converting "sys/dev/if_ndis/if_ndis_usb.c". Affected files ... .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#2 (text+ko) ==== @@ -31,8 +31,6 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.5 2005/04/24 20:21:22 wpaul Exp $"); - #include #include #include @@ -42,6 +40,11 @@ #include #include +#include +#include +#include +#include + #include #include #include @@ -50,14 +53,6 @@ #include -#include -#include -#include -#include -#include -#include -#include "usbdevs.h" - #include #include @@ -67,25 +62,26 @@ #include #include +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.5 2005/04/24 20:21:22 wpaul Exp $"); + MODULE_DEPEND(ndis, usb, 1, 1, 1); -Static int ndisusb_match (device_ptr_t); -Static int ndisusb_attach (device_ptr_t); -Static struct resource_list *ndis_get_resource_list - (device_t, device_t); +static device_probe_t ndisusb_probe; +static device_attach_t ndisusb_attach; +static struct resource_list *ndis_get_resource_list(device_t, device_t); -extern int ndisdrv_modevent (module_t, int, void *); -extern int ndis_attach (device_t); -extern int ndis_shutdown (device_t); -extern int ndis_detach (device_t); -extern int ndis_suspend (device_t); -extern int ndis_resume (device_t); +extern device_attach_t ndis_attach; +extern device_shutdown_t ndis_shutdown; +extern device_detach_t ndis_detach; +extern device_suspend_t ndis_suspend; +extern device_resume_t ndis_resume; +extern int ndisdrv_modevent(module_t, int, void *); extern unsigned char drv_data[]; -Static device_method_t ndis_methods[] = { +static device_method_t ndis_methods[] = { /* Device interface */ - DEVMETHOD(device_probe, ndisusb_match), + DEVMETHOD(device_probe, ndisusb_probe), DEVMETHOD(device_attach, ndisusb_attach), DEVMETHOD(device_detach, ndis_detach), DEVMETHOD(device_shutdown, ndis_shutdown), @@ -98,60 +94,56 @@ { 0, 0 } }; -Static driver_t ndis_driver = { +static driver_t ndis_driver = { "ndis", ndis_methods, sizeof(struct ndis_softc) }; -Static devclass_t ndis_devclass; +static devclass_t ndis_devclass; DRIVER_MODULE(ndis, uhub, ndis_driver, ndis_devclass, ndisdrv_modevent, 0); -USB_MATCH(ndisusb) +static int +ndisusb_probe(device_t dev) { - USB_MATCH_START(ndisusb, uaa); + struct usb_attach_arg *uaa = device_get_ivars(dev); - if (windrv_lookup(0, "USB Bus") == NULL) - return(UMATCH_NONE); + if (windrv_lookup(0, "USB Bus") == NULL) { + return UMATCH_NONE; + } - if (uaa->iface != NULL) - return(UMATCH_NONE); + if (uaa->iface != NULL) { + return UMATCH_NONE; + } - return(UMATCH_NONE); + return UMATCH_NONE; } -USB_ATTACH(ndisusb) +static int +ndisusb_attach(device_t dev) { - USB_ATTACH_START(ndisusb, dummy, uaa); - struct ndis_softc *sc; - driver_object *drv; + struct ndis_softc *sc = device_get_softc(dev); + driver_object *drv; - sc = (struct ndis_softc *)dummy; - - if (uaa->device == NULL) - USB_ATTACH_ERROR_RETURN; - - sc->ndis_dev = self; + sc->ndis_dev = dev; /* Create PDO for this device instance */ drv = windrv_lookup(0, "USB Bus"); - windrv_create_pdo(drv, self); + windrv_create_pdo(drv, dev); - if (ndis_attach(self) != 0) - USB_ATTACH_ERROR_RETURN; + if (ndis_attach(dev) != 0) { + return ENXIO; + } - USB_ATTACH_SUCCESS_RETURN; + return 0; /* success */ } static struct resource_list * -ndis_get_resource_list(dev, child) - device_t dev; - device_t child; +ndis_get_resource_list(device_t dev, device_t child) { - struct ndis_softc *sc; + struct ndis_softc *sc = device_get_softc(dev); - sc = device_get_softc(dev); return (BUS_GET_RESOURCE_LIST(device_get_parent(sc->ndis_dev), dev)); } From owner-p4-projects@FreeBSD.ORG Sun Jun 25 17:41:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E087B16A411; Sun, 25 Jun 2006 17:41:15 +0000 (UTC) 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 A0F6616A405 for ; Sun, 25 Jun 2006 17:41:12 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F5D743D45 for ; Sun, 25 Jun 2006 17:41:12 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5PHfBhZ049447 for ; Sun, 25 Jun 2006 17:41:12 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5PHfBrH049444 for perforce@freebsd.org; Sun, 25 Jun 2006 17:41:11 GMT (envelope-from piso@freebsd.org) Date: Sun, 25 Jun 2006 17:41:11 GMT Message-Id: <200606251741.k5PHfBrH049444@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 99994 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 17:41:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=99994 Change 99994 by piso@piso_newluxor on 2006/06/25 17:40:35 Add a filter parameter to nexus_setup_intr() and intr_add_handler(). Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#3 edit .. //depot/projects/soc2006/intr_filter/amd64/amd64/nexus.c#2 edit .. //depot/projects/soc2006/intr_filter/amd64/include/intr_machdep.h#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#3 (text+ko) ==== @@ -112,8 +112,9 @@ } int -intr_add_handler(const char *name, int vector, driver_intr_t handler, - void *arg, enum intr_type flags, void **cookiep) +intr_add_handler(const char *name, int vector, driver_filter_t filter, + driver_intr_t handler, void *arg, enum intr_type flags, + void **cookiep) { struct intsrc *isrc; int error; @@ -121,8 +122,8 @@ isrc = intr_lookup_source(vector); if (isrc == NULL) return (EINVAL); - error = intr_event_add_handler(isrc->is_event, name, handler, arg, - intr_priority(flags), flags, cookiep); + error = intr_event_add_handler(isrc->is_event, name, filter, handler, + arg, intr_priority(flags), flags, cookiep); if (error == 0) { intrcnt_updatename(isrc); mtx_lock_spin(&intr_table_lock); ==== //depot/projects/soc2006/intr_filter/amd64/amd64/nexus.c#2 (text+ko) ==== @@ -93,7 +93,8 @@ static int nexus_release_resource(device_t, device_t, int, int, struct resource *); static int nexus_setup_intr(device_t, device_t, struct resource *, int flags, - void (*)(void *), void *, void **); + driver_filter_t filter, void (*)(void *), void *, + void **); static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); static struct resource_list *nexus_get_reslist(device_t dev, device_t child); @@ -429,7 +430,8 @@ */ static int nexus_setup_intr(device_t bus, device_t child, struct resource *irq, - int flags, void (*ihand)(void *), void *arg, void **cookiep) + int flags, driver_filter_t filter, void (*ihand)(void *), + void *arg, void **cookiep) { int error; @@ -449,7 +451,7 @@ return (error); error = intr_add_handler(device_get_nameunit(child), - rman_get_start(irq), ihand, arg, flags, cookiep); + rman_get_start(irq), filter, ihand, arg, flags, cookiep); return (error); } ==== //depot/projects/soc2006/intr_filter/amd64/include/intr_machdep.h#2 (text+ko) ==== @@ -124,8 +124,9 @@ #else #define intr_add_cpu(apic_id) #endif -int intr_add_handler(const char *name, int vector, driver_intr_t handler, - void *arg, enum intr_type flags, void **cookiep); +int intr_add_handler(const char *name, int vector, driver_filter_t filter, + driver_intr_t handler, void *arg, enum intr_type flags, + void **cookiep); int intr_config_intr(int vector, enum intr_trigger trig, enum intr_polarity pol); void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame); From owner-p4-projects@FreeBSD.ORG Sun Jun 25 18:39:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06F9416A588; Sun, 25 Jun 2006 18:39:26 +0000 (UTC) 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 A7D5316A403 for ; Sun, 25 Jun 2006 18:39:25 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DAFE43D45 for ; Sun, 25 Jun 2006 18:39:25 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5PIdP8W053061 for ; Sun, 25 Jun 2006 18:39:25 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5PIdNS9053058 for perforce@freebsd.org; Sun, 25 Jun 2006 18:39:23 GMT (envelope-from piso@freebsd.org) Date: Sun, 25 Jun 2006 18:39:23 GMT Message-Id: <200606251839.k5PIdNS9053058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 99995 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 18:39:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=99995 Change 99995 by piso@piso_newluxor on 2006/06/25 18:38:49 Apply my libalias+ipfw patch Affected files ... .. //depot/projects/soc2005/libalias/etc/Makefile#2 edit .. //depot/projects/soc2005/libalias/etc/libalias.conf#1 add .. //depot/projects/soc2005/libalias/lib/libalias/Makefile#2 edit .. //depot/projects/soc2005/libalias/lib/libalias/lib-cuseeme/Makefile#1 add .. //depot/projects/soc2005/libalias/lib/libalias/lib-dummy/Makefile#1 add .. //depot/projects/soc2005/libalias/lib/libalias/lib-ftp/Makefile#1 add .. //depot/projects/soc2005/libalias/lib/libalias/lib-irc/Makefile#1 add .. //depot/projects/soc2005/libalias/lib/libalias/lib-libalias/Makefile#1 add .. //depot/projects/soc2005/libalias/lib/libalias/lib-nbt/Makefile#1 add .. //depot/projects/soc2005/libalias/lib/libalias/lib-pptp/Makefile#1 add .. //depot/projects/soc2005/libalias/lib/libalias/lib-skinny/Makefile#1 add .. //depot/projects/soc2005/libalias/lib/libalias/lib-smedia/Makefile#1 add .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw.8#2 edit .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#2 edit .. //depot/projects/soc2005/libalias/sbin/natd/natd.c#2 edit .. //depot/projects/soc2005/libalias/sys/conf/files#2 edit .. //depot/projects/soc2005/libalias/sys/modules/libalias/Makefile#2 edit .. //depot/projects/soc2005/libalias/sys/modules/libalias/kld-cuseeme/Makefile#1 add .. //depot/projects/soc2005/libalias/sys/modules/libalias/kld-dummy/Makefile#1 add .. //depot/projects/soc2005/libalias/sys/modules/libalias/kld-ftp/Makefile#1 add .. //depot/projects/soc2005/libalias/sys/modules/libalias/kld-irc/Makefile#1 add .. //depot/projects/soc2005/libalias/sys/modules/libalias/kld-libalias/Makefile#1 add .. //depot/projects/soc2005/libalias/sys/modules/libalias/kld-nbt/Makefile#1 add .. //depot/projects/soc2005/libalias/sys/modules/libalias/kld-pptp/Makefile#1 add .. //depot/projects/soc2005/libalias/sys/modules/libalias/kld-skinny/Makefile#1 add .. //depot/projects/soc2005/libalias/sys/modules/libalias/kld-smedia/Makefile#1 add .. //depot/projects/soc2005/libalias/sys/netinet/in.h#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw.h#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw_pfil.c#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#1 add .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#1 add .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#1 add .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_nbt.c#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_old.c#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_pptp.c#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_skinny.c#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_util.c#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/libalias.3#2 edit .. //depot/projects/soc2005/libalias/sys/netinet/raw_ip.c#2 edit .. //depot/projects/soc2005/libalias/usr.sbin/ppp/main.c#2 edit Differences ... ==== //depot/projects/soc2005/libalias/etc/Makefile#2 (text+ko) ==== @@ -11,7 +11,7 @@ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ dhclient.conf disktab fbtab ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ - inetd.conf login.access login.conf mac.conf motd \ + inetd.conf libalias.conf login.access login.conf mac.conf motd \ netconfig network.subr networks newsyslog.conf nsswitch.conf \ portsnap.conf pf.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ ==== //depot/projects/soc2005/libalias/lib/libalias/Makefile#2 (text+ko) ==== @@ -1,16 +1,12 @@ # $FreeBSD: src/lib/libalias/Makefile,v 1.31 2005/07/22 17:18:59 kensmith Exp $ - -.PATH: ${.CURDIR}/../../sys/netinet/libalias - -LIB= alias -SHLIBDIR?= /lib -SHLIB_MAJOR= 5 -MAN= libalias.3 -SRCS= alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \ - alias_nbt.c alias_pptp.c alias_proxy.c alias_skinny.c alias_smedia.c \ - alias_util.c alias_old.c -INCS= alias.h -WARNS?= 6 -NO_WERROR= - -.include +SUBDIR= lib-cuseeme \ + lib-dummy \ + lib-ftp \ + lib-irc \ + lib-libalias \ + lib-nbt \ + lib-pptp \ + lib-skinny \ + lib-smedia + +.include ==== //depot/projects/soc2005/libalias/sbin/ipfw/ipfw.8#2 (text+ko) ==== @@ -2031,6 +2031,98 @@ If no socket is bound to the destination port, or if the divert module is not loaded, or if the kernel was not compiled with divert socket support, the packets are dropped. +.Sh IPFW NAT +To support nat operations inside ipfw, the syntax was extended with a +new action: nat. +Then, to configure/handle nat instances the following syntax was +added (trying to follow closely pipe|queue options): +.Bd -ragged -offset indent +.Bk -words +.Cm nat +.Ar nat_number +.Cm config +.Ar options +.Ek +.Ed +.Pp +where +.Ar options +is one or more mandatory fields that can assume the +following values: +.Bl -tag -width indent +.It Cm ip Ar ip_address +Define an ip address to use for aliasing +.It Cm if Ar nic +Use ip addres of NIC for aliasing, dynamically changing +it if NIC's ip address change +.It Cm log +Enable logging on this nat instance +.It Cm deny_in +Deny any incoming connection from outside world +.It Cm same_ports +Try to leave the alias port numbers unchanged from +the actual local port numbers +.It Cm unreg_only +Traffic on the local network not originating from an +unregistered address spaces will be ignored +.It Cm reset +Reset table of the packet aliasing engine on address change +.It Cm reverse +Reverse the way libalias handles aliasing +.It Cm proxy_only +Obey transparent proxy rules only, packet aliasing is not performed +.El +.Pp +For more information about aliasing modes, take a look +at libalias( +.Xr libalias 3 +). +.Pp +Other commands to manipulate nats are: +.Bd -ragged -offset indent +.Bk -words +.Cm nat +.Ar nat_number +.Cm show +.Cm config +.Ek +.Ed +.Pp +to see nat configuration of +.Ar nat_number +. +.Pp +.Bd -ragged -offset indent +.Bk -words +.Cm nat +.Ar nat_number +.Cm show +.Ek +.Ed +.Pp +to see the logs of +.Ar nat_number +(if any) +.Pp +In these two previous examples +.Ar nat_number +could be a single number to see the configuration of that +instance (i.e. 123, a range of numbers (i.e 333-555) to see the +configurations all the instances in that range or nothing, to see all +the configured instances. +.Pp +See Section +.Sx EXAMPLES +for some examples on how to use nat. +.Sh REDIRECT AND LSNAT SUPPORT IN IPFW +Redirect and LSNAT support follow closely the syntax used in natd: refer to natd's man page +for syntax details. +The only difference between natd's redirect and ipfw redirect is: +instead of redirect_[addr|port|prot] i chose redir_[addr|port|proto]. +.Pp +See Section +.Sx EXAMPLES +for some examples on how to do redirect and lsnat. .Sh SYSCTL VARIABLES A set of .Xr sysctl 8 @@ -2410,6 +2502,55 @@ Otherwise, e.g.\& if you cannot access your box, the ruleset will be disabled after the sleep terminates thus restoring the previous situation. +.Ss NAT, REDIRECT AND LSNAT +First redirect all the traffic to nat instance 123: +.Pp +.Dl "ipfw add nat 123 all from any to any" +.Pp +Then to configure nat instance 123 to alias all the outgoing traffic with ip +192.168.0.123, blocking all incoming connections, trying to keep +same ports on both sides, clearing aliasing table on address change +and keeping a log of traffic/link statistics: +.Pp +.Dl "ipfw nat 123 config ip 192.168.0.123 log deny_in reset same_ports" +.Pp +Or to change address of instance 123, aliasing table will be cleared (see +reset option): +.Pp +.Dl "ipfw nat 123 config ip 10.0.0.1" +.Pp +To see configuration of nat instance 123: +.Pp +.Dl "ipfw nat 123 show config" +.Pp +To show logs of all the instances in range 111-999: +.Pp +.Dl "ipfw nat 111-999 show" +.Pp +To see configurations of all instances: +.Pp +.Dl "ipfw nat show config" +.Pp +Or a redirect rule with mixed modes could looks like: +.Pp +.Dl "ipfw nat 123 config redir_addr 10.0.0.1 10.0.0.66" +.Dl " redir_port tcp 192.168.0.1:80 500" +.Dl " redir_proto udp 192.168.1.43 192.168.1.1" +.Dl " redir_addr 192.168.0.10,192.168.0.11" +.Dl " 10.0.0.100 # LSNAT" +.Dl " redir_port tcp 192.168.0.1:80,192.168.0.10:22" +.Dl " 500 # LSNAT" +.Pp +or it could be splitted in: +.Pp +.Dl "ipfw nat 1 config redir_addr 10.0.0.1 10.0.0.66" +.Dl "ipfw nat 2 config redir_port tcp 192.168.0.1:80 500" +.Dl "ipfw nat 3 config redir_proto udp 192.168.1.43 192.168.1.1" +.Dl "ipfw nat 4 config redir_addr 192.168.0.10,192.168.0.11,192.168.0.12" +.Dl " 10.0.0.100" +.Dl "ipfw nat 5 config redir_port tcp" +.Dl " 192.168.0.1:80,192.168.0.10:22,192.168.0.20:25 500" +.Pp .Sh SEE ALSO .Xr cpp 1 , .Xr m4 1 , @@ -2451,6 +2592,11 @@ .An Daniel Boulet for BSDI. .Pp +.An -nosplit +In-kernel NAT support written by +.An Paolo Pisati Aq piso@FreeBSD.org +as part of a Summer of Code 2005 project. +.Pp Work on .Xr dummynet 4 traffic shaper supported by Akamba Corp. ==== //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#2 (text+ko) ==== @@ -48,6 +48,7 @@ #include #include +#include #include #include /* def. of struct route */ #include @@ -59,12 +60,14 @@ #include #include #include +#include int do_resolv, /* Would try to resolve all */ do_time, /* Show time stamps */ do_quiet, /* Be quiet in add and flush */ do_pipe, /* this cmd refers to a pipe */ + do_nat, /* nat configuration */ do_sort, /* field to sort results (0 = no) */ do_dynamic, /* display dynamic rules */ do_expired, /* display expired dynamic rules */ @@ -247,6 +250,7 @@ TOK_RESET, TOK_UNREACH, TOK_CHECKSTATE, + TOK_NAT, TOK_ALTQ, TOK_LOG, @@ -309,6 +313,18 @@ TOK_DROPTAIL, TOK_PROTO, TOK_WEIGHT, + TOK_IP, + TOK_IF, + TOK_LOG, + TOK_DENY_INC, + TOK_SAME_PORTS, + TOK_UNREG_ONLY, + TOK_RESET_ADDR, + TOK_ALIAS_REV, + TOK_PROXY_ONLY, + TOK_REDIR_ADDR, + TOK_REDIR_PORT, + TOK_REDIR_PROTO, TOK_IPV6, TOK_FLOWID, @@ -351,6 +367,22 @@ { NULL, 0 } /* terminator */ }; +struct _s_x nat_params[] = { + { "ip", TOK_IP }, + { "if", TOK_IF }, + { "log", TOK_LOG }, + { "deny_in", TOK_DENY_INC }, + { "same_ports", TOK_SAME_PORTS }, + { "unreg_only", TOK_UNREG_ONLY }, + { "reset", TOK_RESET_ADDR }, + { "reverse", TOK_ALIAS_REV }, + { "proxy_only", TOK_PROXY_ONLY }, + { "redir_addr", TOK_REDIR_ADDR }, + { "redir_port", TOK_REDIR_PORT }, + { "redir_proto", TOK_REDIR_PROTO }, + { NULL, 0 } /* terminator */ +}; + struct _s_x rule_actions[] = { { "accept", TOK_ACCEPT }, { "pass", TOK_ACCEPT }, @@ -375,6 +407,7 @@ { "unreach", TOK_UNREACH }, { "check-state", TOK_CHECKSTATE }, { "//", TOK_COMMENT }, + { "nat", TOK_NAT}, { NULL, 0 } /* terminator */ }; @@ -482,7 +515,7 @@ { static int s = -1; /* the socket */ int i; - + if (test_only) return 0; @@ -493,7 +526,8 @@ if (optname == IP_FW_GET || optname == IP_DUMMYNET_GET || optname == IP_FW_ADD || optname == IP_FW_TABLE_LIST || - optname == IP_FW_TABLE_GETSIZE) + optname == IP_FW_TABLE_GETSIZE || optname == IP_FW_NAT_GET_CONFIG || + optname == IP_FW_NAT_GET_LOG) i = getsockopt(s, IPPROTO_IP, optname, optval, (socklen_t *)optlen); else @@ -1563,6 +1597,10 @@ tagptr = cmd; break; + case O_NAT: + printf("nat %u", cmd->arg1); + break; + default: printf("** unrecognized action %d len %d ", cmd->opcode, cmd->len); @@ -2625,13 +2663,16 @@ "add [num] [set N] [prob x] RULE-BODY\n" "{pipe|queue} N config PIPE-BODY\n" "[pipe|queue] {zero|delete|show} [N{,N}]\n" +"nat N config {ip IPADDR|if IFNAME|log|deny_in|same_ports|unreg_only|reset|\n" +" reverse|proxy_only|redir_addr linkspec| redir_port linkspec|\n" +" redir_proto linkspec}\n" "set [disable N... enable N...] | move [rule] X to Y | swap X Y | show\n" "table N {add ip[/bits] [value] | delete ip[/bits] | flush | list}\n" "\n" "RULE-BODY: check-state [PARAMS] | ACTION [PARAMS] ADDR [OPTION_LIST]\n" "ACTION: check-state | allow | count | deny | unreach{,6} CODE |\n" " skipto N | {divert|tee} PORT | forward ADDR |\n" -" pipe N | queue N\n" +" pipe N | queue N | nat N\n" "PARAMS: [log [logamount LOGLIMIT]] [altq QUEUE_NAME]\n" "ADDR: [ MAC dst src ether_type ] \n" " [ ip from IPADDR [ PORT ] to IPADDR [ PORTLIST ] ]\n" @@ -3140,7 +3181,14 @@ /* Rule number */ while (ac && isdigit(**av)) { i = atoi(*av); av++; ac--; - if (do_pipe) { + if (do_nat) { + exitval = do_cmd(IP_FW_NAT_DEL, &i, sizeof i); + if (exitval) { + exitval = EX_UNAVAILABLE; + warn("rule %u not available", + i); + } + } else if (do_pipe) { if (do_pipe == 1) p.pipe_nr = i; else @@ -3165,7 +3213,6 @@ exit(exitval); } - /* * fill the interface structure. We do not check the name as we can * create interfaces dynamically, so checking them at insert time @@ -3189,7 +3236,754 @@ errx(EX_DATAERR, "bad ip address ``%s''", arg); } +/* + * Search for interface with name "ifn", and fill n accordingly: + * + * n->ip ip address of interface "ifn" + * n->if_name copy of interface name "ifn" + */ static void +set_addr_dynamic(const char *ifn, struct cfg_nat *n) +{ + size_t needed; + int mib[6]; + char *buf, *lim, *next; + struct if_msghdr *ifm; + struct ifa_msghdr *ifam; + struct sockaddr_dl *sdl; + struct sockaddr_in *sin; + int ifIndex, ifMTU; + + mib[0] = CTL_NET; + mib[1] = PF_ROUTE; + mib[2] = 0; + mib[3] = AF_INET; /* Only IP addresses please */ + mib[4] = NET_RT_IFLIST; + mib[5] = 0; /* ifIndex??? */ +/* + * Get interface data. + */ + if (sysctl(mib, 6, NULL, &needed, NULL, 0) == -1) + err(1, "iflist-sysctl-estimate"); + if ((buf = malloc(needed)) == NULL) + errx(1, "malloc failed"); + if (sysctl(mib, 6, buf, &needed, NULL, 0) == -1) + err(1, "iflist-sysctl-get"); + lim = buf + needed; +/* + * Loop through interfaces until one with + * given name is found. This is done to + * find correct interface index for routing + * message processing. + */ + ifIndex = 0; + next = buf; + while (next < lim) { + ifm = (struct if_msghdr *)next; + next += ifm->ifm_msglen; + if (ifm->ifm_version != RTM_VERSION) { + if (verbose) + warnx("routing message version %d " + "not understood", ifm->ifm_version); + continue; + } + if (ifm->ifm_type == RTM_IFINFO) { + sdl = (struct sockaddr_dl *)(ifm + 1); + if (strlen(ifn) == sdl->sdl_nlen && + strncmp(ifn, sdl->sdl_data, sdl->sdl_nlen) == 0) { + ifIndex = ifm->ifm_index; + ifMTU = ifm->ifm_data.ifi_mtu; + break; + } + } + } + if (!ifIndex) + errx(1, "unknown interface name %s", ifn); +/* + * Get interface address. + */ + sin = NULL; + while (next < lim) { + ifam = (struct ifa_msghdr *)next; + next += ifam->ifam_msglen; + if (ifam->ifam_version != RTM_VERSION) { + if (verbose) + warnx("routing message version %d " + "not understood", ifam->ifam_version); + continue; + } + if (ifam->ifam_type != RTM_NEWADDR) + break; + if (ifam->ifam_addrs & RTA_IFA) { + int i; + char *cp = (char *)(ifam + 1); + + for (i = 1; i < RTA_IFA; i <<= 1) + if (ifam->ifam_addrs & i) + cp += SA_SIZE((struct sockaddr *)cp); + if (((struct sockaddr *)cp)->sa_family == AF_INET) { + sin = (struct sockaddr_in *)cp; + break; + } + } + } + if (sin == NULL) + errx(1, "%s: cannot get interface address", ifn); + + n->ip = sin->sin_addr; + strncpy(n->if_name, ifn, IF_NAMESIZE); + + free(buf); +} + +/* + * XXX: the following functions, macros and definitions come from natd.c: + * it would be better to move them outside of natd.c, in a file + * (redirect_support.[ch]?) shared by ipfw and natd, but for now i can live + * with it... + */ + +/* + * Definition of a port range, and macros to deal with values. + * FORMAT: HI 16-bits == first port in range, 0 == all ports. + * LO 16-bits == number of ports in range + * NOTES: - Port values are not stored in network byte order. + */ + +#define port_range u_long + +#define GETLOPORT(x) ((x) >> 0x10) +#define GETNUMPORTS(x) ((x) & 0x0000ffff) +#define GETHIPORT(x) (GETLOPORT((x)) + GETNUMPORTS((x))) + +/* Set y to be the low-port value in port_range variable x. */ +#define SETLOPORT(x,y) ((x) = ((x) & 0x0000ffff) | ((y) << 0x10)) + +/* Set y to be the number of ports in port_range variable x. */ +#define SETNUMPORTS(x,y) ((x) = ((x) & 0xffff0000) | (y)) + +static void +StrToAddr (const char* str, struct in_addr* addr) +{ + struct hostent* hp; + + if (inet_aton (str, addr)) + return; + + hp = gethostbyname (str); + if (!hp) + errx (1, "unknown host %s", str); + + memcpy (addr, hp->h_addr, sizeof (struct in_addr)); +} + +static int +StrToPortRange (const char* str, const char* proto, port_range *portRange) +{ + char* sep; + struct servent* sp; + char* end; + u_short loPort; + u_short hiPort; + + /* First see if this is a service, return corresponding port if so. */ + sp = getservbyname (str,proto); + if (sp) { + SETLOPORT(*portRange, ntohs(sp->s_port)); + SETNUMPORTS(*portRange, 1); + return 0; + } + + /* Not a service, see if it's a single port or port range. */ + sep = strchr (str, '-'); + if (sep == NULL) { + SETLOPORT(*portRange, strtol(str, &end, 10)); + if (end != str) { + /* Single port. */ + SETNUMPORTS(*portRange, 1); + return 0; + } + + /* Error in port range field. */ + errx (EX_DATAERR, "%s/%s: unknown service", str, proto); + } + + /* Port range, get the values and sanity check. */ + sscanf (str, "%hu-%hu", &loPort, &hiPort); + SETLOPORT(*portRange, loPort); + SETNUMPORTS(*portRange, 0); /* Error by default */ + if (loPort <= hiPort) + SETNUMPORTS(*portRange, hiPort - loPort + 1); + + if (GETNUMPORTS(*portRange) == 0) + errx (EX_DATAERR, "invalid port range %s", str); + + return 0; +} + +static int +StrToProto (const char* str) +{ + if (!strcmp (str, "tcp")) + return IPPROTO_TCP; + + if (!strcmp (str, "udp")) + return IPPROTO_UDP; + + errx (EX_DATAERR, "unknown protocol %s. Expected tcp or udp", str); +} + +static int +StrToAddrAndPortRange (const char* str, struct in_addr* addr, char* proto, port_range *portRange) +{ + char* ptr; + + ptr = strchr (str, ':'); + if (!ptr) + errx (EX_DATAERR, "%s is missing port number", str); + + *ptr = '\0'; + ++ptr; + + StrToAddr (str, addr); + return StrToPortRange (ptr, proto, portRange); +} + +/* end of stuff taken from natd.c */ + +#define INC_ARGCV() do { \ + (*_av)++; \ + (*_ac)--; \ + av = *_av; \ + ac = *_ac; \ +} while(0) + +/* + * The next 3 functions add support for the addr, port and proto redirect and + * their logic is loosely based on SetupAddressRedirect(), SetupPortRedirect() + * and SetupProtoRedirect() from natd.c. + * + * Every setup_* function fills at least one redirect entry + * (struct cfg_redir) and zero or more server pool entry (struct cfg_spool) + * in buf. + * + * The format of data in buf is: + * + * + * cfg_nat cfg_redir cfg_spool ...... cfg_spool + * + * ------------------------------------- ------------ + * | | .....X ... | | | | ..... + * ------------------------------------- ...... ------------ + * ^ + * spool_cnt n=0 ...... n=(X-1) + * + * len points to the amount of available space in buf + * space counts the memory consumed by every function + * + * XXX - Every function get all the argv params so it + * has to check, in optional parameters, that the next + * args is a valid option for the redir entry and not + * another token. Only redir_port and redir_proto are + * affected by this. + */ + +static int +setup_redir_addr(char *spool_buf, int len, + int *_ac, char ***_av) +{ + char **av = *_av, *sep; /* token separator */ + /* temporary buffer used to hold server pool ip's */ + char tmp_spool_buf[NAT_BUF_LEN]; + int ac = *_ac, i, space = 0, lsnat = 0; + int sof_redir = sizeof(struct cfg_redir); + struct cfg_redir *r; + + if (len >= sof_redir) { + r = (struct cfg_redir *)spool_buf; + /* skip cfg_redir at beginning of buf */ + spool_buf = &spool_buf[sof_redir]; + space = sof_redir; + len -= sof_redir; + } else + goto nospace; + r->mode = REDIR_ADDR; + /* extract local address */ + if (ac == 0) + errx(EX_DATAERR, "redir_addr: missing local address"); + sep = strchr(*av, ','); + if (sep) { /* LSNAT redirection syntax. */ + r->laddr.s_addr = INADDR_NONE; + /* preserve av, copy spool servers to tmp_spool_buf */ + strncpy(tmp_spool_buf, *av, strlen(*av)+1); + lsnat = 1; + } else + StrToAddr(*av, &r->laddr); + INC_ARGCV(); + + /* extract public address */ + if (ac == 0) + errx(EX_DATAERR, "redir_addr: missing public address"); + StrToAddr(*av, &r->paddr); + INC_ARGCV(); + + /* setup LSNAT server pool */ + if (sep) { + int sof_spool = sizeof(struct cfg_spool); + struct cfg_spool *tmp; + + sep = strtok(tmp_spool_buf, ","); + while (sep != NULL) { + tmp = (struct cfg_spool *)spool_buf; + if (len < sof_spool) + goto nospace; + len -= sof_spool; + space += sof_spool; + StrToAddr(sep, &tmp->addr); + tmp->port = ~0; + r->spool_cnt++; + /* point to the next possible cfg_spool */ + spool_buf = &spool_buf[sof_spool]; + sep = strtok(NULL, ","); + } + } + return(space); +nospace: + errx(EX_DATAERR, "redir_addr: buf is too small\n"); +} + +static int +setup_redir_port(char *spool_buf, int len, + int *_ac, char ***_av) +{ + char **av = *_av, *sep, *protoName; + char tmp_spool_buf[NAT_BUF_LEN]; + int ac = *_ac, space = 0, lsnat = 0; + int sof_redir = sizeof(struct cfg_redir); + struct cfg_redir *r; + u_short numLocalPorts = 0; + port_range portRange; + + if (len >= sof_redir) { + r = (struct cfg_redir *)spool_buf; + /* skip cfg_redir at beginning of buf */ + spool_buf = &spool_buf[sof_redir]; + space = sof_redir; + len -= sof_redir; + } else + goto nospace; + r->mode = REDIR_PORT; + /* + * Extract protocol. + */ + if (ac == 0) + errx (EX_DATAERR, "redirect_port: missing protocol"); + r->proto = StrToProto(*av); + protoName = *av; + INC_ARGCV(); + + /* + * Extract local address. + */ + if (ac == 0) + errx (EX_DATAERR, "redirect_port: missing local address"); + + sep = strchr(*av, ','); + if (sep) { /* LSNAT redirection syntax. */ + r->laddr.s_addr = INADDR_NONE; + r->lport = ~0; + numLocalPorts = 1; + /* preserve av, copy spool servers to tmp_spool_buf */ + strncpy(tmp_spool_buf, *av, strlen(*av)+1); + lsnat = 1; + } else { + if ( StrToAddrAndPortRange (*av, &r->laddr, protoName, &portRange) != 0 ) + errx (EX_DATAERR, "redirect_port: invalid local port range"); + + r->lport = GETLOPORT(portRange); + numLocalPorts = GETNUMPORTS(portRange); + } + INC_ARGCV(); + + /* + * Extract public port and optionally address. + */ + if (ac == 0) + errx (EX_DATAERR, "redirect_port: missing public port"); + + sep = strchr (*av, ':'); + if (sep) { + if (StrToAddrAndPortRange (*av, &r->paddr, protoName, &portRange) != 0 ) + errx (EX_DATAERR, "redirect_port: invalid public port range"); + } else { + r->paddr.s_addr = INADDR_ANY; + if (StrToPortRange (*av, protoName, &portRange) != 0) + errx (EX_DATAERR, "redirect_port: invalid public port range"); + } + + r->pport = GETLOPORT(portRange); + r->pport_cnt = GETNUMPORTS(portRange); + INC_ARGCV(); + + /* + * Extract remote address and optionally port. + */ + /* + * isalpha(**av) => we've to check that next parameter is really an + * option for this redirect entry, else stop here processing arg[cv] + */ + if (ac != 0 && !isalpha(**av)) { + sep = strchr (*av, ':'); + if (sep) { + if (StrToAddrAndPortRange (*av, &r->raddr, protoName, &portRange) != 0) + errx (EX_DATAERR, "redirect_port: invalid remote port range"); + } else { + SETLOPORT(portRange, 0); + SETNUMPORTS(portRange, 1); + StrToAddr (*av, &r->raddr); + } + INC_ARGCV(); + } else { + SETLOPORT(portRange, 0); + SETNUMPORTS(portRange, 1); + r->raddr.s_addr = INADDR_ANY; + } + r->rport = GETLOPORT(portRange); + r->rport_cnt = GETNUMPORTS(portRange); + + /* + * Make sure port ranges match up, then add the redirect ports. + */ + if (numLocalPorts != r->pport_cnt) + errx(EX_DATAERR, "redirect_port: port ranges must be equal in size"); + + /* Remote port range is allowed to be '0' which means all ports. */ + if (r->rport_cnt != numLocalPorts && (r->rport_cnt != 1 || r->rport != 0)) + errx(EX_DATAERR, "redirect_port: remote port must be 0 or equal to local port range in size"); + + /* + * Setup LSNAT server pool. + */ + if (lsnat) { + int sof_spool = sizeof(struct cfg_spool); + struct cfg_spool *tmp; + + sep = strtok(tmp_spool_buf, ","); + while (sep != NULL) { + tmp = (struct cfg_spool *)spool_buf; + if (len < sof_spool) + goto nospace; + len -= sof_spool; + space += sof_spool; + if (StrToAddrAndPortRange(sep, &tmp->addr, protoName, &portRange) != 0) + errx(EX_DATAERR, "redirect_port: invalid local port range"); + if (GETNUMPORTS(portRange) != 1) + errx(EX_DATAERR, "redirect_port: local port must be single in this context"); + tmp->port = GETLOPORT(portRange); + r->spool_cnt++; + /* point to the next possible cfg_spool */ + spool_buf = &spool_buf[sof_spool]; + sep = strtok(NULL, ","); + } + } + return(space); +nospace: + errx(EX_DATAERR, "redir_port: buf is too small\n"); +} + +static int +setup_redir_proto(char *spool_buf, int len, + int *_ac, char ***_av) +{ + char **av = *_av; + int ac = *_ac, i, space; + struct protoent *protoent; + int sof_redir = sizeof(struct cfg_redir); + struct cfg_redir *r; + + if (len >= sof_redir) { + r = (struct cfg_redir *)spool_buf; + /* skip cfg_redir at beginning of buf */ + spool_buf = &spool_buf[sof_redir]; + space = sof_redir; + len -= sof_redir; + } else + goto nospace; + r->mode = REDIR_PROTO; + /* + * Extract protocol. + */ + if (ac == 0) + errx(EX_DATAERR, "redirect_proto: missing protocol"); + + protoent = getprotobyname(*av); + if (protoent == NULL) + errx(EX_DATAERR, "redirect_proto: unknown protocol %s", *av); + else + r->proto = protoent->p_proto; + + INC_ARGCV(); + + /* + * Extract local address. + */ + if (ac == 0) + errx(EX_DATAERR, "redirect_proto: missing local address"); + else + StrToAddr(*av, &r->laddr); + + INC_ARGCV(); + + /* + * Extract optional public address. + */ + if (ac == 0) { + r->paddr.s_addr = INADDR_ANY; + r->raddr.s_addr = INADDR_ANY; + } else { + /* see above in setup_redir_port() */ + if (!isalpha(**av)) { + StrToAddr(*av, &r->paddr); + INC_ARGCV(); + + /* + * Extract optional remote address. + */ + /* see above in setup_redir_port() */ + if (ac!=0 && !isalpha(**av)) { + StrToAddr(*av, &r->raddr); + INC_ARGCV(); + } + } + } + return(space); +nospace: + errx(EX_DATAERR, "redir_proto: buf is too small\n"); +} + +static void +show_nat(int ac, char **av); + +static void +print_nat_config(char *buf) { + struct cfg_nat *n = (struct cfg_nat *)buf; + int i, cnt, flag = 1, off = sizeof(*n); + int sof_redir = sizeof(struct cfg_redir); + int sof_spool = sizeof(struct cfg_spool); + struct cfg_redir *t; + struct cfg_spool *s; + struct protoent *p; + + printf("ipfw nat %u config", n->id); + if (strlen(n->if_name) != 0) + printf(" if %s", n->if_name); + else if (n->ip.s_addr != 0) + printf(" ip %s", inet_ntoa(n->ip)); + while (n->mode != 0) { + if (n->mode & PKT_ALIAS_LOG) { + printf(" log"); + n->mode &= ~PKT_ALIAS_LOG; + } else if (n->mode & PKT_ALIAS_DENY_INCOMING) { + printf(" deny_in"); + n->mode &= ~PKT_ALIAS_DENY_INCOMING; + } else if (n->mode & PKT_ALIAS_SAME_PORTS) { + printf(" same_ports"); + n->mode &= ~PKT_ALIAS_SAME_PORTS; + } else if (n->mode & PKT_ALIAS_UNREGISTERED_ONLY) { + printf(" unreg_only"); + n->mode &= ~PKT_ALIAS_UNREGISTERED_ONLY; + } else if (n->mode & PKT_ALIAS_RESET_ON_ADDR_CHANGE) { + printf(" reset"); + n->mode &= ~PKT_ALIAS_RESET_ON_ADDR_CHANGE; + } else if (n->mode & PKT_ALIAS_REVERSE) { + printf(" reverse"); + n->mode &= ~PKT_ALIAS_REVERSE; + } else if (n->mode & PKT_ALIAS_PROXY_ONLY) { + printf(" proxy_only"); + n->mode &= ~PKT_ALIAS_PROXY_ONLY; + } + } + /* print all the redirect's data configuration */ + for (cnt=0; cnt < n->redir_cnt; cnt++) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 26 00:26:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32CAC16A404; Mon, 26 Jun 2006 00:26:07 +0000 (UTC) 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 E86E716A402 for ; Mon, 26 Jun 2006 00:26:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 064CE447AC for ; Mon, 26 Jun 2006 00:25:46 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q0PgSk082427 for ; Mon, 26 Jun 2006 00:25:43 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q0PgBv082424 for perforce@freebsd.org; Mon, 26 Jun 2006 00:25:42 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 26 Jun 2006 00:25:42 GMT Message-Id: <200606260025.k5Q0PgBv082424@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100004 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, 26 Jun 2006 00:26:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=100004 Change 100004 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/26 00:24:59 hoist large functions out of line for mutex profiling this yields a ~8% speedup on sun4v Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#19 edit .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_lock.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/lock_profile.h#7 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#19 (text+ko) ==== @@ -257,13 +257,24 @@ if (v == 0) return (0); - bzero(mprof_buf, MPROF_HASH_SIZE); + bzero(mprof_buf, MPROF_HASH_SIZE*sizeof(*mprof_buf)); allocated_mprof_buf = 0; return (0); } SYSCTL_PROC(_debug_mutex_prof, OID_AUTO, reset, CTLTYPE_INT | CTLFLAG_RW, NULL, 0, reset_mutex_prof_stats, "I", "Reset mutex profiling statistics"); + +static inline void mutex_profile_init(void) +{ + int i; + /* Initialize the mutex profiling locks */ + for (i = 0; i < MPROF_LOCK_SIZE; i++) { + mtx_init(&mprof_locks[i], "mprof lock", + NULL, MTX_SPIN|MTX_QUIET|MTX_NOPROFILE); + } +} + #endif /* @@ -521,22 +532,27 @@ _mtx_trylockn_spin(struct mtx *m, uintptr_t tid, int n, const char *file, int line) { uintptr_t _tid = (uintptr_t)(tid); - int i, v; + int i, v, contested; + uint64_t waittime; KASSERT(LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_spin, ("mtx_lock_spin() of sleep mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); + lock_profile_waitstart(&waittime); for (i = 0, v = 0; i < n; i++) { spinlock_enter(); v = _obtain_lock((m), _tid); - if (!v) + if (!v) { + lock_profile_obtain_lock_failed(&m->mtx_object, &contested); spinlock_exit(); - else { + } else { WITNESS_LOCK(&m->mtx_object, LOP_EXCLUSIVE, file, line); - break; + lock_profile_obtain_lock_success(&m->mtx_object, waittime, file, line); + return v; } } + lock_profile_update_wait(&m->mtx_object, waittime); return v; } ==== //depot/projects/kmacy_sun4v/src/sys/kern/subr_lock.c#3 (text+ko) ==== @@ -36,12 +36,14 @@ __FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.4 2006/01/27 23:13:25 jhb Exp $"); #include "opt_ddb.h" +#include "opt_mprof.h" #include #include #include #include #include +#include #ifdef DDB #include @@ -55,6 +57,7 @@ &lock_class_sx, &lock_class_rw, }; +static u_int global_lock_id; void lock_init(struct lock_object *lock, struct lock_class *class, const char *name, @@ -78,6 +81,7 @@ lock->lo_name = name; lock->lo_type = type != NULL ? type : name; lock->lo_flags |= flags | LO_INITIALIZED; + lock->lo_id = atomic_fetchadd_int(&global_lock_id, 1); LOCK_LOG_INIT(lock, 0); WITNESS_INIT(lock); } @@ -113,3 +117,151 @@ class->lc_ddb_show(lock); } #endif + +#ifdef MUTEX_PROFILING +void _lock_profile_obtain_lock_success(struct lock_object *lo, uint64_t waittime, const char *file, int line) +{ + struct lock_profile_object *l = &lo->lo_profile_obj; + + /* don't reset the timer when/if recursing */ + if (l->lpo_acqtime == 0) { + l->lpo_filename = file; + l->lpo_lineno = line; + l->lpo_acqtime = rd(tick); /* substitute for more general TSC read */ + if (waittime) { + if (l->lpo_acqtime > waittime) + l->lpo_waittime = l->lpo_acqtime - waittime; + } + } +} + +void _lock_profile_update_wait(struct lock_object *lo, uint64_t waitstart) +{ + struct lock_profile_object *l = &lo->lo_profile_obj; + + if (mutex_prof_enable && waitstart) { + uint64_t now, waittime; + struct mutex_prof *mpp; + u_int hash; + const char *p = l->lpo_filename; + int collision = 0; + now = rd(tick); + if (now < waitstart) + return; + waittime = now - waitstart; + hash = (l->lpo_namehash * 31 * 31 + (uintptr_t)p * 31 + l->lpo_lineno) & MPROF_HASH_MASK; + + mpp = &mprof_buf[hash]; + while (mpp->name != NULL) { + if (mpp->line == l->lpo_lineno && + mpp->file == p && + mpp->namehash == l->lpo_namehash) + break; + /* If the mprof_hash entry is allocated to someone else, try the next one */ + collision = 1; + CTR4(KTR_SPARE1, "Hash collision, %s:%d %s(%x)", mpp->file, mpp->line, mpp->name, mpp->namehash); + hash = (hash + 1) & MPROF_HASH_MASK; + mpp = &mprof_buf[hash]; + } + if (mpp->name == NULL) { + int buf; + + buf = atomic_fetchadd_int(&allocated_mprof_buf, 1); + /* Just exit if we cannot get a trace buffer */ + if (buf >= MPROF_HASH_SIZE) { + ++mutex_prof_rejected; + return; + } + mpp->file = p; + mpp->line = l->lpo_lineno; + mpp->name = lo->lo_name; + mpp->namehash = l->lpo_namehash; + if (collision) + ++mutex_prof_collisions; + /* We might have raced someone else but who cares, they'll try again next time */ + ++mutex_prof_records; + } + MPROF_LOCK(hash); + mpp->cnt_wait += waittime; + MPROF_UNLOCK(hash); + } +} + +void _lock_profile_release_lock(struct lock_object *lo) +{ + struct lock_profile_object *l = &lo->lo_profile_obj; + + if (l->lpo_acqtime && !(lo->lo_flags & LO_NOPROFILE)) { + const char *unknown = "(unknown)"; + u_int64_t acqtime, now, waittime; + struct mutex_prof *mpp; + u_int hash; + const char *p = l->lpo_filename; + int collision = 0; + + now = rd(tick); + acqtime = l->lpo_acqtime; + waittime = l->lpo_waittime; + if (now <= acqtime) + return; + if (p == NULL || *p == '\0') + p = unknown; + hash = (l->lpo_namehash * 31 * 31 + (uintptr_t)p * 31 + l->lpo_lineno) & MPROF_HASH_MASK; + CTR5(KTR_SPARE1, "Hashing %s(%x) %s:%d to %d", l->lpo_name, l->lpo_namehash, p, l->lpo_lineno, hash); + mpp = &mprof_buf[hash]; + while (mpp->name != NULL) { + if (mpp->line == l->lpo_lineno && + mpp->file == p && + mpp->namehash == l->lpo_namehash) + break; + /* If the mprof_hash entry is allocated to someone else, try the next one */ + collision = 1; + CTR4(KTR_SPARE1, "Hash collision, %s:%d %s(%x)", mpp->file, mpp->line, mpp->name, mpp->namehash); + hash = (hash + 1) & MPROF_HASH_MASK; + mpp = &mprof_buf[hash]; + } + if (mpp->name == NULL) { + int buf; + + buf = atomic_fetchadd_int(&allocated_mprof_buf, 1); + /* Just exit if we cannot get a trace buffer */ + if (buf >= MPROF_HASH_SIZE) { + ++mutex_prof_rejected; + return; + } + mpp->file = p; + mpp->line = l->lpo_lineno; + mpp->name = lo->lo_name; + mpp->namehash = l->lpo_namehash; + if (collision) + ++mutex_prof_collisions; + /* We might have raced someone else but who cares, they'll try again next time */ + ++mutex_prof_records; + } + MPROF_LOCK(hash); + /* + * Record if the mutex has been held longer now than ever + * before. + */ + if (now - acqtime > mpp->cnt_max) + mpp->cnt_max = now - acqtime; + mpp->cnt_tot += now - acqtime; + mpp->cnt_wait += waittime; + mpp->cnt_cur++; + /* + * There's a small race, really we should cmpxchg + * 0 with the current value, but that would bill + * the contention to the wrong lock instance if + * it followed this also. + */ + mpp->cnt_contest_holding += l->lpo_contest_holding; + mpp->cnt_contest_locking += l->lpo_contest_locking; + MPROF_UNLOCK(hash); + + } + l->lpo_acqtime = 0; + l->lpo_waittime = 0; + l->lpo_contest_locking = 0; + l->lpo_contest_holding = 0; +} +#endif ==== //depot/projects/kmacy_sun4v/src/sys/sys/lock_profile.h#7 (text+ko) ==== @@ -4,6 +4,7 @@ #ifdef MUTEX_PROFILING #include #include +#include #ifndef MPROF_HASH_SIZE #define MPROF_HASH_SIZE 4096 @@ -40,6 +41,10 @@ extern int mutex_prof_rejected; extern int mutex_prof_collisions; +void _lock_profile_obtain_lock_success(struct lock_object *lo, uint64_t waittime, const char *file, int line); +void _lock_profile_update_wait(struct lock_object *lo, uint64_t waitstart); +void _lock_profile_release_lock(struct lock_object *lo); + static inline void lock_profile_init(struct lock_object *lo, const char *name) { const char *p; u_int hash = 0; @@ -74,19 +79,10 @@ } -static inline void mutex_profile_init(void) -{ - int i; - /* Initialize the mutex profiling locks */ - for (i = 0; i < MPROF_LOCK_SIZE; i++) { - mtx_init(&mprof_locks[i], "mprof lock", - NULL, MTX_SPIN|MTX_QUIET|MTX_NOPROFILE); - } -} - static inline void lock_profile_waitstart(uint64_t *waittime) { - *waittime = rd(tick); + if (mutex_prof_enable) + *waittime = rd(tick); } static inline void lock_profile_obtain_lock_failed(struct lock_object *lo, int *contested) @@ -100,104 +96,31 @@ static inline void lock_profile_obtain_lock_success(struct lock_object *lo, uint64_t waittime, const char *file, int line) { - struct lock_profile_object *l = &lo->lo_profile_obj; - - /* don't reset the timer when/if recursing */ - if (mutex_prof_enable && l->lpo_acqtime == 0) { - l->lpo_filename = file; - l->lpo_lineno = line; - l->lpo_acqtime = rd(tick); /* substitute for more general TSC read */ - if (waittime) { - if (l->lpo_acqtime > waittime) - l->lpo_waittime = l->lpo_acqtime - waittime; - } - } + if (mutex_prof_enable) + _lock_profile_obtain_lock_success(lo, waittime, file, line); +} + +static inline void lock_profile_update_wait(struct lock_object *lo, uint64_t waitstart) +{ + if (mutex_prof_enable) + _lock_profile_update_wait(lo, waitstart); } -static inline void lock_profile_release_lock(struct lock_object *lo) +static inline void lock_profile_release_lock(struct lock_object *lo) { struct lock_profile_object *l = &lo->lo_profile_obj; - - if (l->lpo_acqtime && !(lo->lo_flags & LO_NOPROFILE)) { - const char *unknown = "(unknown)"; - struct mutex_prof *mpp; - u_int64_t acqtime, now, waittime; - u_int hash; - const char *p = l->lpo_filename; - int collision = 0; - - now = rd(tick); - acqtime = l->lpo_acqtime; - waittime = l->lpo_waittime; - l->lpo_acqtime = 0; - l->lpo_waittime = 0; - if (now <= acqtime) - return; - if (p == NULL || *p == '\0') - p = unknown; - hash = (l->lpo_namehash * 31 * 31 + (uintptr_t)p * 31 + l->lpo_lineno) & MPROF_HASH_MASK; - CTR5(KTR_SPARE1, "Hashing %s(%x) %s:%d to %d", l->lpo_name, l->lpo_namehash, p, l->lpo_lineno, hash); - mpp = &mprof_buf[hash]; - while (mpp->name != NULL) { - if (mpp->line == l->lpo_lineno && - mpp->file == p && - mpp->namehash == l->lpo_namehash) - break; - /* If the mprof_hash entry is allocated to someone else, try the next one */ - collision = 1; - CTR4(KTR_SPARE1, "Hash collision, %s:%d %s(%x)", mpp->file, mpp->line, mpp->name, mpp->namehash); - hash = (hash + 1) & MPROF_HASH_MASK; - mpp = &mprof_buf[hash]; - } - if (mpp->name == NULL) { - int buf; - - buf = atomic_fetchadd_int(&allocated_mprof_buf, 1); - /* Just exit if we cannot get a trace buffer */ - if (buf >= MPROF_HASH_SIZE) { - ++mutex_prof_rejected; - return; - } - mpp->file = p; - mpp->line = l->lpo_lineno; - mpp->name = lo->lo_name; - mpp->namehash = l->lpo_namehash; - if (collision) - ++mutex_prof_collisions; - /* We might have raced someone else but who cares, they'll try again next time */ - ++mutex_prof_records; - } - MPROF_LOCK(hash); - /* - * Record if the mutex has been held longer now than ever - * before. - */ - if (now - acqtime > mpp->cnt_max) - mpp->cnt_max = now - acqtime; - mpp->cnt_tot += now - acqtime; - mpp->cnt_wait += waittime; - mpp->cnt_cur++; - /* - * There's a small race, really we should cmpxchg - * 0 with the current value, but that would bill - * the contention to the wrong lock instance if - * it followed this also. - */ - mpp->cnt_contest_holding += l->lpo_contest_holding; - l->lpo_contest_holding = 0; - mpp->cnt_contest_locking += l->lpo_contest_locking; - l->lpo_contest_locking = 0; - MPROF_UNLOCK(hash); - } + if (mutex_prof_enable || l->lpo_acqtime) + _lock_profile_release_lock(lo); } #else /* !MUTEX_PROFILING */ static inline void mutex_profile_init(void) {;} static inline void lock_profile_init(struct lock_object *lo, const char *name) {;} +static inline void lock_profile_destroy(struct lock_object *lo) {;} static inline void lock_profile_obtain_lock_failed(struct lock_object *m, int *contested) {;} static inline void lock_profile_obtain_lock_success(struct lock_object *m, const char *file, int line) {;} +static inline void lock_profile_update_wait(struct lock_object *lo, uint64_t waitstart) {;} static inline void lock_profile_release_lock(struct lock_object *m) {;} -static inline void lock_profile_destroy(struct lock_object *lo) {;} #endif /* !MUTEX_PROFILING */ #endif /* _SYS_LOCK_PROFILE_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Jun 26 03:10:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 397B416A405; Mon, 26 Jun 2006 03:10:13 +0000 (UTC) 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 1955C16A400 for ; Mon, 26 Jun 2006 03:10:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8EC2B4454B for ; Mon, 26 Jun 2006 01:39:16 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q1dGhf094362 for ; Mon, 26 Jun 2006 01:39:16 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q1dG3X094359 for perforce@freebsd.org; Mon, 26 Jun 2006 01:39:16 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 26 Jun 2006 01:39:16 GMT Message-Id: <200606260139.k5Q1dG3X094359@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100007 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, 26 Jun 2006 03:10:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=100007 Change 100007 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/26 01:38:33 tune interval at which we poll choosethread Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_idle.c#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_idle.c#8 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #ifdef SMP @@ -45,6 +46,12 @@ SYSINIT(idle_setup, SI_SUB_SCHED_IDLE, SI_ORDER_FIRST, idle_setup, NULL) static void idle_proc(void *dummy); +static int interval = 10; + +SYSCTL_NODE(_debug, OID_AUTO, scheduler, CTLFLAG_RD, NULL, "scheduler debugging"); +SYSCTL_NODE(_debug_scheduler, OID_AUTO, idle, CTLFLAG_RD, NULL, "idle info"); +SYSCTL_INT(_debug_scheduler_idle, OID_AUTO, interval, CTLFLAG_RW, + &interval, 0, "interval between idle skips"); /* * Set up per-cpu idle process contexts. The AP's shouldn't be running or @@ -95,20 +102,18 @@ static void idle_proc(void *dummy) { - int i; #ifdef SMP cpumask_t mycpu; #endif - + int i = 0; #ifdef SMP mycpu = PCPU_GET(cpumask); atomic_set_int(&idle_cpus_mask, mycpu); #endif - i = 0; for (;;) { mtx_assert(&Giant, MA_NOTOWNED); - while (sched_runnable() == 0 && (i++%10 != 0)) + while (sched_runnable() == 0 && (i++%interval != 0)) cpu_idle(); #ifdef SMP atomic_clear_int(&idle_cpus_mask, mycpu); From owner-p4-projects@FreeBSD.ORG Mon Jun 26 05:10:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8850016A402; Mon, 26 Jun 2006 05:10:47 +0000 (UTC) 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 489E216A400 for ; Mon, 26 Jun 2006 05:10:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED18B43D68 for ; Mon, 26 Jun 2006 05:10:46 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q5AkhW018571 for ; Mon, 26 Jun 2006 05:10:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q5Akmr018568 for perforce@freebsd.org; Mon, 26 Jun 2006 05:10:46 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 05:10:46 GMT Message-Id: <200606260510.k5Q5Akmr018568@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100017 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, 26 Jun 2006 05:10:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=100017 Change 100017 by jb@jb_freebsd2 on 2006/06/26 05:10:14 Save the file name and line number where an errno value is saved for later reporting. Getting a good ol' Unix error message like "no such file" is not terribly helpful when the application is actually doing ioctls on a device. Grrr. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_error.c#3 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#9 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_error.c#3 (text) ==== @@ -139,12 +139,29 @@ return (dtp->dt_errno); } +#if defined(sun) int dt_set_errno(dtrace_hdl_t *dtp, int err) { dtp->dt_errno = err; return (-1); } +#else +int +_dt_set_errno(dtrace_hdl_t *dtp, int err, char *errfile, int errline) +{ + dtp->dt_errno = err; + dtp->dt_errfile = errfile; + dtp->dt_errline = errline; + return (-1); +} + +void dt_get_errloc(dtrace_hdl_t *dtp, char **p_errfile, int *p_errline) +{ + *p_errfile = dtp->dt_errfile; + *p_errline = dtp->dt_errline; +} +#endif void dt_set_errmsg(dtrace_hdl_t *dtp, const char *errtag, const char *region, ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#9 (text) ==== @@ -270,6 +270,10 @@ int dt_version; /* library version requested by client */ int dt_ctferr; /* error resulting from last CTF failure */ int dt_errno; /* error resulting from last failed operation */ +#if !defined(sun) + char *dt_errfile; + int dt_errline; +#endif int dt_fd; /* file descriptor for dtrace pseudo-device */ int dt_ftfd; /* file descriptor for fasttrap pseudo-device */ int dt_fterr; /* saved errno from failed open of dt_ftfd */ @@ -546,7 +550,13 @@ extern char *dt_cpp_add_arg(dtrace_hdl_t *, const char *); extern char *dt_cpp_pop_arg(dtrace_hdl_t *); +#if defined(sun) extern int dt_set_errno(dtrace_hdl_t *, int); +#else +int _dt_set_errno(dtrace_hdl_t *, int, char *, int); +void dt_get_errloc(dtrace_hdl_t *, char **, int *); +#define dt_set_errno(_a,_b) _dt_set_errno(_a,_b,__FILE__,__LINE__) +#endif extern void dt_set_errmsg(dtrace_hdl_t *, const char *, const char *, const char *, int, const char *, va_list); From owner-p4-projects@FreeBSD.ORG Mon Jun 26 05:11:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FC1116A405; Mon, 26 Jun 2006 05:11:49 +0000 (UTC) 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 4E79E16A402 for ; Mon, 26 Jun 2006 05:11:49 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9EC4543D7D for ; Mon, 26 Jun 2006 05:11:48 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q5Bm3t018662 for ; Mon, 26 Jun 2006 05:11:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q5Bm6x018659 for perforce@freebsd.org; Mon, 26 Jun 2006 05:11:48 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 05:11:48 GMT Message-Id: <200606260511.k5Q5Bm6x018659@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100018 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, 26 Jun 2006 05:11:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=100018 Change 100018 by jb@jb_freebsd2 on 2006/06/26 05:11:21 Report the error file and line number to help determine what caused the error. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#7 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#7 (text) ==== @@ -203,6 +203,10 @@ static void dfatal(const char *fmt, ...) { +#if !defined(sun) + char *p_errfile = NULL; + int errline = 0; +#endif va_list ap; va_start(ap, fmt); @@ -220,6 +224,11 @@ (void) fprintf(stderr, "%s\n", dtrace_errmsg(g_dtp, dtrace_errno(g_dtp))); } +#if !defined(sun) + dt_get_errloc(g_dtp, &p_errfile, &errline); + if (p_errfile != NULL) + printf("File '%s', line %d\n", p_errfile, errline); +#endif exit(E_ERROR); } From owner-p4-projects@FreeBSD.ORG Mon Jun 26 05:15:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C269B16A406; Mon, 26 Jun 2006 05:15:54 +0000 (UTC) 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 9DE9B16A401 for ; Mon, 26 Jun 2006 05:15:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5174943D60 for ; Mon, 26 Jun 2006 05:15:54 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q5Fsxx018880 for ; Mon, 26 Jun 2006 05:15:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q5Frv7018877 for perforce@freebsd.org; Mon, 26 Jun 2006 05:15:53 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 05:15:53 GMT Message-Id: <200606260515.k5Q5Frv7018877@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100019 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, 26 Jun 2006 05:15:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=100019 Change 100019 by jb@jb_freebsd2 on 2006/06/26 05:15:21 Add a number of system initialisation levels so that the DTrace device and it's providers can be initialised as early as possible so that as much of the remaining boot process can be traced via a anonymous enablings. Affected files ... .. //depot/projects/dtrace/src/sys/sys/kernel.h#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/kernel.h#5 (text+ko) ==== @@ -123,7 +123,11 @@ SI_SUB_VM_CONF = 0x2300000, /* config VM, set limits*/ SI_SUB_RUN_QUEUE = 0x2400000, /* set up run queue*/ SI_SUB_KTRACE = 0x2480000, /* ktrace */ - SI_SUB_KDTRACE = 0x24A0000, /* kdtrace */ + SI_SUB_CYCLIC = 0x2490000, /* Cyclic timers */ + SI_SUB_KDTRACE = 0x24A0000, /* kernel dtrace hooks */ + SI_SUB_DTRACE = 0x24B0000, /* dtrace subsystem */ + SI_SUB_DTRACE_PROVIDER = 0x24B8000, /* dtrace providers */ + SI_SUB_DTRACE_ANON = 0x24BC000, /* dtrace anon enabling */ SI_SUB_AUDIT = 0x24C0000, /* audit */ SI_SUB_CREATE_INIT = 0x2500000, /* create init process*/ SI_SUB_SCHED_IDLE = 0x2600000, /* required idle procs */ From owner-p4-projects@FreeBSD.ORG Mon Jun 26 05:16:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10C9416A405; Mon, 26 Jun 2006 05:16:57 +0000 (UTC) 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 E3FC316A400 for ; Mon, 26 Jun 2006 05:16:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2750643D62 for ; Mon, 26 Jun 2006 05:16:56 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q5GtYx018969 for ; Mon, 26 Jun 2006 05:16:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q5Gtrw018966 for perforce@freebsd.org; Mon, 26 Jun 2006 05:16:55 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 05:16:55 GMT Message-Id: <200606260516.k5Q5Gtrw018966@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100020 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, 26 Jun 2006 05:16:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=100020 Change 100020 by jb@jb_freebsd2 on 2006/06/26 05:16:11 Ensure that the string in the buffer really is zero terminated. Affected files ... .. //depot/projects/dtrace/src/sys/boot/common/boot.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/boot/common/boot.c#3 (text+ko) ==== @@ -194,6 +194,9 @@ * input line to the environment. */ if (n_buf > 0 && (p = strchr(p_buf, '=')) != NULL) { + /* Zero terminate the value. */ + p_buf[n_buf] = '\0'; + /* Zero terminate the name. */ *p = '\0'; From owner-p4-projects@FreeBSD.ORG Mon Jun 26 05:21:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8FFF16A409; Mon, 26 Jun 2006 05:21:04 +0000 (UTC) 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 A4A0E16A402 for ; Mon, 26 Jun 2006 05:21:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91D5943DB8 for ; Mon, 26 Jun 2006 05:21:01 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q5L1nJ019195 for ; Mon, 26 Jun 2006 05:21:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q5L1OH019192 for perforce@freebsd.org; Mon, 26 Jun 2006 05:21:01 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 05:21:01 GMT Message-Id: <200606260521.k5Q5L1OH019192@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100021 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, 26 Jun 2006 05:21:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=100021 Change 100021 by jb@jb_freebsd2 on 2006/06/26 05:20:36 Remove the length limitation on kernel getenv() strings. The sx lock allows a malloc while the lock is held, so why not simplify the code and avoid copying the string to a temporary (size limited) string. This allows large kenv strings to be passed from the boot loader. The length limitation still applies in kenv(1) when setting a string. I think it should be removed from there too. It's a pretty silly limit in this day and age when we often have gobs of memory. kenv(1) has no difficulty reporting the long strings. This is required so that the anonymous enablings can be passed to the kernel from the boot loader. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_environment.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_environment.c#2 (text+ko) ==== @@ -283,7 +283,6 @@ char * getenv(const char *name) { - char buf[KENV_MNAMELEN + 1 + KENV_MVALLEN + 1]; char *ret, *cp; int len; @@ -291,11 +290,10 @@ sx_slock(&kenv_lock); cp = _getenv_dynamic(name, NULL); if (cp != NULL) { - strcpy(buf, cp); + len = strlen(cp) + 1; + ret = malloc(len, M_KENV, M_WAITOK); + strcpy(ret, cp); sx_sunlock(&kenv_lock); - len = strlen(buf) + 1; - ret = malloc(len, M_KENV, M_WAITOK); - strcpy(ret, buf); } else { sx_sunlock(&kenv_lock); ret = NULL; From owner-p4-projects@FreeBSD.ORG Mon Jun 26 05:29:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0114C16A40A; Mon, 26 Jun 2006 05:29:17 +0000 (UTC) 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 D106916A407 for ; Mon, 26 Jun 2006 05:29:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 558A143DA9 for ; Mon, 26 Jun 2006 05:29:12 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q5TB0L019487 for ; Mon, 26 Jun 2006 05:29:11 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q5TBBG019484 for perforce@freebsd.org; Mon, 26 Jun 2006 05:29:11 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 05:29:11 GMT Message-Id: <200606260529.k5Q5TBBG019484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100022 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, 26 Jun 2006 05:29:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=100022 Change 100022 by jb@jb_freebsd2 on 2006/06/26 05:28:59 Report output as from 'DTrace'. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/cmn_err.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/cmn_err.c#2 (text+ko) ==== @@ -27,7 +27,9 @@ cmn_err(int type __unused, const char *fmt, ...) { va_list ap; + printf("DTrace "); va_start(ap, fmt); vprintf(fmt, ap); va_end(ap); + printf("\n"); } From owner-p4-projects@FreeBSD.ORG Mon Jun 26 05:32:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA6F716A406; Mon, 26 Jun 2006 05:32:19 +0000 (UTC) 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 6815116A400 for ; Mon, 26 Jun 2006 05:32:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A9D243D92 for ; Mon, 26 Jun 2006 05:32:17 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q5WHC7019731 for ; Mon, 26 Jun 2006 05:32:17 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q5WGmD019726 for perforce@freebsd.org; Mon, 26 Jun 2006 05:32:16 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 05:32:16 GMT Message-Id: <200606260532.k5Q5WGmD019726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100023 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, 26 Jun 2006 05:32:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=100023 Change 100023 by jb@jb_freebsd2 on 2006/06/26 05:31:32 Add a bit of missing code required for anonymous enablings. Without this you get the infamous "no such file" error. 8-) Remove the demo sdt probe in preparation for changing the SDT provider to use invops like Sun does. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#15 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#15 (text+ko) ==== @@ -32,8 +32,6 @@ if (state == NULL) return (EINVAL); - SDT_PROBE(dtrace, ioctl, entry, cmd, addr, 0, 0, 0); - #if defined(__i386__) /* * Check if any probe recursions have occurred. These are more @@ -46,6 +44,11 @@ } #endif + if (state->dts_anon) { + ASSERT(dtrace_anon.dta_state == NULL); + state = state->dts_anon; + } + switch (cmd) { case DTRACEIOC_AGGDESC: { dtrace_aggdesc_t **paggdesc = (dtrace_aggdesc_t **) addr; From owner-p4-projects@FreeBSD.ORG Mon Jun 26 05:34:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51B7816A403; Mon, 26 Jun 2006 05:34:21 +0000 (UTC) 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 3077016A401 for ; Mon, 26 Jun 2006 05:34:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51F3043D9C for ; Mon, 26 Jun 2006 05:34:20 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q5YKNJ019885 for ; Mon, 26 Jun 2006 05:34:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q5YJ2E019882 for perforce@freebsd.org; Mon, 26 Jun 2006 05:34:19 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 05:34:19 GMT Message-Id: <200606260534.k5Q5YJ2E019882@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100024 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, 26 Jun 2006 05:34:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=100024 Change 100024 by jb@jb_freebsd2 on 2006/06/26 05:33:28 Give the cyclic subsystem it's own system initialisation level. SI_SUB_CLOCKS is too late. Also fix a copy-n-paste oops. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/kern/kern_cyclic.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/kern/kern_cyclic.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ cyclic_machdep_init(); } -SYSINIT(cyclic_register, SI_SUB_CLOCKS, SI_ORDER_SECOND, cyclic_load, NULL) +SYSINIT(cyclic_register, SI_SUB_CYCLIC, SI_ORDER_SECOND, cyclic_load, NULL) static void cyclic_unload(void) @@ -54,7 +54,7 @@ cyclic_machdep_uninit(); } -SYSUNINIT(ata_unregister, SI_SUB_CLOCKS, SI_ORDER_SECOND, cyclic_unload, NULL); +SYSUNINIT(cyclic_unregister, SI_SUB_CYCLIC, SI_ORDER_SECOND, cyclic_unload, NULL); /* * This function is the one registered by the machine dependent From owner-p4-projects@FreeBSD.ORG Mon Jun 26 05:37:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDEFB16A404; Mon, 26 Jun 2006 05:37:24 +0000 (UTC) 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 C3FE716A402 for ; Mon, 26 Jun 2006 05:37:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 800C643D7D for ; Mon, 26 Jun 2006 05:37:24 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q5bO9L020003 for ; Mon, 26 Jun 2006 05:37:24 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q5bOgw020000 for perforce@freebsd.org; Mon, 26 Jun 2006 05:37:24 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 05:37:24 GMT Message-Id: <200606260537.k5Q5bOgw020000@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100025 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, 26 Jun 2006 05:37:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=100025 Change 100025 by jb@jb_freebsd2 on 2006/06/26 05:37:23 The use of FreeBSD's semaphores here creates scheduler instability. This device needs a clean path from the timer interrupt. For the time being, since I'm only working on single processor systems, comment out the semaphore calls. When I get access to a multi-cpu machine, I'll need to implement a simple semaphore system for use here. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/kern/cyclic.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/kern/cyclic.c#4 (text+ko) ==== @@ -1006,7 +1006,9 @@ /* * We can now let the remove operation complete. */ +#ifdef DOODAD sema_post(&cpu->cyp_modify_wait); +#endif } /* @@ -1257,7 +1259,9 @@ */ if (nlev == CY_SOFT_LEVELS) { CYC_TRACE0(cpu, level, "resize-kick"); +#ifdef DOODAD sema_post(&cpu->cyp_modify_wait); +#endif } else { ASSERT(nlev < CY_SOFT_LEVELS); if (level != CY_LOW_LEVEL) { @@ -1434,7 +1438,9 @@ /* * Now block, waiting for the resize operation to complete. */ +#ifdef DOODAD sema_wait(&cpu->cyp_modify_wait); +#endif ASSERT(cpu->cyp_modify_levels == CY_SOFT_LEVELS); /* @@ -1875,8 +1881,10 @@ return (0); } +#ifdef DOODAD if (cpu->cyp_rpend != 0) sema_wait(&cpu->cyp_modify_wait); +#endif ASSERT(cpu->cyp_state == CYS_REMOVING); @@ -2140,7 +2148,9 @@ cpu->cyp_cpu = c; +#ifdef DOODAD sema_init(&cpu->cyp_modify_wait, 0, "cyclic modify"); +#endif cpu->cyp_size = 1; cpu->cyp_heap = kmem_zalloc(sizeof (cyc_index_t), KM_SLEEP); @@ -2221,7 +2231,9 @@ pc->cypc_buf = NULL; } +#ifdef DOODAD sema_destroy(&cpu->cyp_modify_wait); +#endif /* * Finally, clean up our remaining dynamic structures and NULL out From owner-p4-projects@FreeBSD.ORG Mon Jun 26 05:49:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84FE216A406; Mon, 26 Jun 2006 05:49:45 +0000 (UTC) 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 63A1116A404 for ; Mon, 26 Jun 2006 05:49:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8430F43D83 for ; Mon, 26 Jun 2006 05:49:41 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q5nftX020739 for ; Mon, 26 Jun 2006 05:49:41 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q5nfS7020736 for perforce@freebsd.org; Mon, 26 Jun 2006 05:49:41 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 05:49:41 GMT Message-Id: <200606260549.k5Q5nfS7020736@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100027 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, 26 Jun 2006 05:49:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=100027 Change 100027 by jb@jb_freebsd2 on 2006/06/26 05:48:50 Implement dof_get_property for FreeBSD. The DOF is in an ASCII hex string with two characters per byte. This was the easiest and most compact format for FreeBSD given that we don't have a device configuration file like Solaris does. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dof.c#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dof.c#7 (text+ko) ==== @@ -120,15 +120,47 @@ return (dof); } +#if !defined(sun) +static __inline uchar_t dtrace_dof_char(char c) { + switch (c) { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + return (c - '0'); + case 'A': + case 'B': + case 'C': + case 'D': + case 'E': + case 'F': + return (c - 'A' + 10); + case 'a': + case 'b': + case 'c': + case 'd': + case 'e': + case 'f': + return (c - 'a' + 10); + } +} +#endif + static dof_hdr_t * dtrace_dof_property(const char *name) { -#if defined(sun) uchar_t *buf; uint64_t loadsz; unsigned int len, i; dof_hdr_t *dof; +#if defined(sun) /* * Unfortunately, array of values in .conf files are always (and * only) interpreted to be integer arrays. We must read our DOF @@ -162,11 +194,50 @@ dof = kmem_alloc(loadsz, KM_SLEEP); bcopy(buf, dof, loadsz); ddi_prop_free(buf); +#else + char *p; + char *p_env; + + if ((p_env = getenv(name)) == NULL) + return (NULL); + len = strlen(p_env) / 2; + + buf = kmem_alloc(len, KM_SLEEP); + + dof = (dof_hdr_t *) buf; + + p = p_env; + + for (i = 0; i < len; i++) { + buf[i] = (dtrace_dof_char(p[0]) << 4) | + dtrace_dof_char(p[1]); + p += 2; + } + + freeenv(p_env); + + if (len < sizeof (dof_hdr_t)) { + free(buf, M_DTRACE); + dtrace_dof_error(NULL, "truncated header"); + return (NULL); + } + + if (len < (loadsz = dof->dofh_loadsz)) { + free(buf, M_DTRACE); + dtrace_dof_error(NULL, "truncated DOF"); + return (NULL); + } + + if (loadsz >= dtrace_dof_maxsize) { + free(buf, M_DTRACE); + dtrace_dof_error(NULL, "oversized DOF"); + return (NULL); + } + +#endif + return (dof); -#else - return (NULL); -#endif } static void From owner-p4-projects@FreeBSD.ORG Mon Jun 26 06:18:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E966916A408; Mon, 26 Jun 2006 06:18:22 +0000 (UTC) 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 9775216A406 for ; Mon, 26 Jun 2006 06:18:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D4C2445E4 for ; Mon, 26 Jun 2006 06:18:22 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q6IMjt023430 for ; Mon, 26 Jun 2006 06:18:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q6IMwR023427 for perforce@freebsd.org; Mon, 26 Jun 2006 06:18:22 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 06:18:22 GMT Message-Id: <200606260618.k5Q6IMwR023427@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100035 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, 26 Jun 2006 06:18:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=100035 Change 100035 by jb@jb_freebsd2 on 2006/06/26 06:17:54 Add system initialisation callbacks from the dtrace module and the anonymous enablings. The provider initialisation takes place between the two. This change moves the DTrace initialistion a lot earlier in the kernel boot process, thereby allowing tracing of all the device probing etc. On my development box the early part of the dmesg looks like this when booting with DTrace modules loaded: Copyright (c) 1992-2006 The FreeBSD Project. Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 The Regents of the University of California. All rights reserved. FreeBSD 7.0-CURRENT #68: Mon Jun 26 09:29:31 EST 2006 jbr@freebsd7.cimlogic.com.au:/u2/freebsd/obj/freebsd2/u2/p4/dtrace/src/sys/DTRACE Timecounter "i8254" frequency 1193182 Hz quality 0 CPU: Intel(R) Pentium(R) 4 CPU 2.40GHz (2400.10-MHz 686-class CPU) Origin = "GenuineIntel" Id = 0xf27 Stepping = 7 Features=0xbfebfbff Features2=0x400 real memory = 503300096 (479 MB) avail memory = 482922496 (460 MB) ACPI APIC Table: DTrace registered provider 'dtrace' DTrace registered provider 'sdt' DTrace registered provider 'fbt' DTrace registered provider 'profile' DTrace registered provider 'syscall' DTrace enabling probe (:::BEGIN) DTrace enabling probe (:::ERROR) ioapic0 irqs 0-23 on motherboard kbd1 at kbdmux0 acpi0: on motherboard acpi0: Overriding SCI Interrupt from IRQ 9 to IRQ 20 acpi0: Power Button (fixed) Timecounter "ACPI-fast" frequency 3579545 Hz quality 1000 acpi_timer0: <24-bit timer at 3.579545MHz> port 0xe408-0xe40b on acpi0 Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#30 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#30 (text+ko) ==== @@ -86,7 +86,7 @@ static d_close_t dtrace_close; static d_ioctl_t dtrace_ioctl; static d_open_t dtrace_open; -static int dtrace_load(void); +static void dtrace_load(void *); static int dtrace_unload(void); static void dtrace_clone(void *, struct ucred *, char *, int , struct cdev **); @@ -512,6 +512,7 @@ static void dtrace_action_stop(void); static void dtrace_action_ustack(dtrace_mstate_t *, dtrace_state_t *, uint64_t *, uint64_t); static void dtrace_aggregate(dtrace_aggregation_t *, dtrace_buffer_t *, intptr_t, dtrace_buffer_t *, uint64_t, uint64_t); +static void dtrace_anon_init(void *); static void dtrace_anon_property(void); static void dtrace_bcopy(const void *, void *, size_t); static void dtrace_buffer_drop(dtrace_buffer_t *); @@ -665,6 +666,9 @@ #include #endif +SYSINIT(dtrace_load, SI_SUB_DTRACE, SI_ORDER_FIRST, dtrace_load, NULL) +SYSINIT(dtrace_anon_init, SI_SUB_DTRACE_ANON, SI_ORDER_FIRST, dtrace_anon_init, NULL) + DEV_MODULE(dtrace, dtrace_modevent, NULL); MODULE_VERSION(dtrace, 1); MODULE_DEPEND(dtrace, cyclic, 1, 1, 1); From owner-p4-projects@FreeBSD.ORG Mon Jun 26 06:25:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDB5F16A402; Mon, 26 Jun 2006 06:25:31 +0000 (UTC) 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 A1E6816A400 for ; Mon, 26 Jun 2006 06:25:31 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6EA64446C4 for ; Mon, 26 Jun 2006 06:25:31 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q6PVbR023866 for ; Mon, 26 Jun 2006 06:25:31 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q6PVSa023863 for perforce@freebsd.org; Mon, 26 Jun 2006 06:25:31 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 06:25:31 GMT Message-Id: <200606260625.k5Q6PVSa023863@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100036 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, 26 Jun 2006 06:25:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=100036 Change 100036 by jb@jb_freebsd2 on 2006/06/26 06:25:30 Change the initialisation so that only the device and event stuff happens when MOD_LOAD gets called (which is a lot later then when the dtrace device needs to be initialised for anon enablings). Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_modevent.c#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_modevent.c#7 (text+ko) ==== @@ -30,14 +30,12 @@ switch (type) { case MOD_LOAD: - printf("dtrace -------------------------------------------------\n"); - if ((error = dtrace_load()) == 0) { - /* Enable device cloning. */ - clone_setup(&dtrace_clones); + + /* Enable device cloning. */ + clone_setup(&dtrace_clones); - /* Setup device cloning events. */ - eh_tag = EVENTHANDLER_REGISTER(dev_clone, dtrace_clone, 0, 1000); - } + /* Setup device cloning events. */ + eh_tag = EVENTHANDLER_REGISTER(dev_clone, dtrace_clone, 0, 1000); break; case MOD_UNLOAD: From owner-p4-projects@FreeBSD.ORG Mon Jun 26 06:29:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AB8716A55D; Mon, 26 Jun 2006 06:29:41 +0000 (UTC) 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 0FDF616A52B for ; Mon, 26 Jun 2006 06:29:41 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B59844404 for ; Mon, 26 Jun 2006 05:59:55 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q5xtXp021192 for ; Mon, 26 Jun 2006 05:59:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q5xtgt021189 for perforce@freebsd.org; Mon, 26 Jun 2006 05:59:55 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 05:59:55 GMT Message-Id: <200606260559.k5Q5xtgt021189@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100029 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, 26 Jun 2006 06:29:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=100029 Change 100029 by jb@jb_freebsd2 on 2006/06/26 05:59:49 Display the registered provider name. When the DTrace modules are loaded via the boot loader, this output shows up in the boot messages to make it obvious at what point DTrace can do it's magic. If there are anonymous enablings, those probes will appear after the provider registration messages. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_register.c#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_register.c#6 (text+ko) ==== @@ -98,6 +98,10 @@ provider->dtpv_arg = arg; *idp = (dtrace_provider_id_t)provider; +#if !defined(sun) + printf("DTrace registered provider '%s'\n", name); +#endif + if (pops == &dtrace_provider_ops) { ASSERT(MUTEX_HELD(&dtrace_provider_lock)); ASSERT(MUTEX_HELD(&dtrace_lock)); From owner-p4-projects@FreeBSD.ORG Mon Jun 26 06:29:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5443E16A5A5; Mon, 26 Jun 2006 06:29:42 +0000 (UTC) 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 2846F16A533 for ; Mon, 26 Jun 2006 06:29:41 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5587A4453A for ; Mon, 26 Jun 2006 06:06:04 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q664US022828 for ; Mon, 26 Jun 2006 06:06:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q664Z4022825 for perforce@freebsd.org; Mon, 26 Jun 2006 06:06:04 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 06:06:04 GMT Message-Id: <200606260606.k5Q664Z4022825@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100032 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, 26 Jun 2006 06:29:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=100032 Change 100032 by jb@jb_freebsd2 on 2006/06/26 06:05:41 Change the dtrace_load function to run off a system initialisation level so that it is ready for service as early in the boot as possible. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#14 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#14 (text+ko) ==== @@ -22,18 +22,10 @@ * */ -/* - * This function implements similar code to the Solaris dtrace_attach() - * function. - */ - -static int -dtrace_load() +static void +dtrace_load(void *dummy) { dtrace_provider_id_t id; - dtrace_state_t *state = NULL; - dtrace_enabling_t *enab; - int error = 0; /* Hang our hook for DTrace traps during probes. */ dtrace_instr_size_func = dtrace_instr_size; @@ -166,9 +158,6 @@ dtrace_probeid_error = dtrace_probe_create((dtrace_provider_id_t) dtrace_provider, NULL, NULL, "ERROR", 1, NULL); -dtrace_err_verbose = 1; - - dtrace_anon_property(); mutex_exit(&cpu_lock); /* @@ -182,48 +171,8 @@ dtrace_helptrace_next = 0; } - /* - * If there are already providers, we must ask them to provide their - * probes, and then match any anonymous enabling against them. Note - * that there should be no other retained enablings at this time: - * the only retained enablings at this time should be the anonymous - * enabling. - */ - if (dtrace_anon.dta_enabling != NULL) { - ASSERT(dtrace_retained == dtrace_anon.dta_enabling); - - dtrace_enabling_provide(NULL); - state = dtrace_anon.dta_state; - - /* - * We couldn't hold cpu_lock across the above call to - * dtrace_enabling_provide(), but we must hold it to actually - * enable the probes. We have to drop all of our locks, pick - * up cpu_lock, and regain our locks before matching the - * retained anonymous enabling. - */ - mutex_exit(&dtrace_lock); - mutex_exit(&dtrace_provider_lock); - - mutex_enter(&cpu_lock); - mutex_enter(&dtrace_provider_lock); - mutex_enter(&dtrace_lock); - - if ((enab = dtrace_anon.dta_enabling) != NULL) - (void) dtrace_enabling_match(enab, NULL); - - mutex_exit(&cpu_lock); - } - mutex_exit(&dtrace_lock); mutex_exit(&dtrace_provider_lock); - if (state != NULL) { - /* - * If we created any anonymous state, set it going now. - */ - (void) dtrace_state_go(state, &dtrace_anon.dta_beganon); - } - - return (error); + return; } From owner-p4-projects@FreeBSD.ORG Mon Jun 26 06:29:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9796916A406; Mon, 26 Jun 2006 06:29:42 +0000 (UTC) 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 195CB16A577 for ; Mon, 26 Jun 2006 06:29:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EDFD1444C4 for ; Mon, 26 Jun 2006 06:04:00 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q640Ee022631 for ; Mon, 26 Jun 2006 06:04:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q640jm022626 for perforce@freebsd.org; Mon, 26 Jun 2006 06:04:00 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 06:04:00 GMT Message-Id: <200606260604.k5Q640jm022626@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100030 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, 26 Jun 2006 06:29:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=100030 Change 100030 by jb@jb_freebsd2 on 2006/06/26 06:03:26 Allow the state creation function to be called for anon states. For the time being, use only high level cyclic timers. The low level ones come from software interrupts and the current cyclic implementation causes scheduler instability when using those. The long term solution may well be to only have one cyclic timer level since FreeBSD isn't built on top of this timer design. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_state.c#10 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_state.c#10 (text+ko) ==== @@ -191,7 +191,7 @@ major_t major; #else cred_t *cr = NULL; - int m = minor(dev); + int m = 0; #endif char c[30]; dtrace_state_t *state; @@ -212,8 +212,10 @@ state = ddi_get_soft_state(dtrace_softstate, m); #else - if (dev != NULL) + if (dev != NULL) { cr = dev->si_cred; + m = minor(dev); + } /* Allocate memory for the state. */ state = malloc(sizeof(dtrace_state_t), M_DTRACE, M_WAITOK | M_ZERO); @@ -710,6 +712,8 @@ hdlr.cyh_func = (cyc_func_t)dtrace_state_clean; hdlr.cyh_arg = state; hdlr.cyh_level = CY_LOW_LEVEL; +/* XXX CY_LOW_LEVEL requires use of the scheduler on FreeBSD and this ends in tears for anon enablings. */ +hdlr.cyh_level = CY_HIGH_LEVEL; when.cyt_when = 0; when.cyt_interval = opt[DTRACEOPT_CLEANRATE]; @@ -719,6 +723,8 @@ hdlr.cyh_func = (cyc_func_t)dtrace_state_deadman; hdlr.cyh_arg = state; hdlr.cyh_level = CY_LOW_LEVEL; +/* XXX CY_LOW_LEVEL requires use of the scheduler on FreeBSD and this ends in tears for anon enablings. */ +hdlr.cyh_level = CY_HIGH_LEVEL; when.cyt_when = 0; when.cyt_interval = dtrace_deadman_interval; From owner-p4-projects@FreeBSD.ORG Mon Jun 26 06:29:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA6E816A415; Mon, 26 Jun 2006 06:29:42 +0000 (UTC) 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 43A2816A596 for ; Mon, 26 Jun 2006 06:29:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEB7744598 for ; Mon, 26 Jun 2006 06:08:07 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q687do022955 for ; Mon, 26 Jun 2006 06:08:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q687vH022951 for perforce@freebsd.org; Mon, 26 Jun 2006 06:08:07 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 06:08:07 GMT Message-Id: <200606260608.k5Q687vH022951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100033 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, 26 Jun 2006 06:29:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=100033 Change 100033 by jb@jb_freebsd2 on 2006/06/26 06:07:40 Move the anonymous enabling into a separate system initialisation function with it's own level. This allows all providers to be initialised before the anonymous stuff happens. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_anon.c#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_anon.c#5 (text+ko) ==== @@ -2,6 +2,64 @@ /* * DTrace Anonymous Enabling Functions */ +static void +dtrace_anon_init(void *dummy) +{ + dtrace_state_t *state = NULL; + dtrace_enabling_t *enab; + + mutex_enter(&cpu_lock); + mutex_enter(&dtrace_provider_lock); + mutex_enter(&dtrace_lock); + + dtrace_anon_property(); + + mutex_exit(&cpu_lock); + + /* + * If there are already providers, we must ask them to provide their + * probes, and then match any anonymous enabling against them. Note + * that there should be no other retained enablings at this time: + * the only retained enablings at this time should be the anonymous + * enabling. + */ + if (dtrace_anon.dta_enabling != NULL) { + ASSERT(dtrace_retained == dtrace_anon.dta_enabling); + + dtrace_enabling_provide(NULL); + state = dtrace_anon.dta_state; + + /* + * We couldn't hold cpu_lock across the above call to + * dtrace_enabling_provide(), but we must hold it to actually + * enable the probes. We have to drop all of our locks, pick + * up cpu_lock, and regain our locks before matching the + * retained anonymous enabling. + */ + mutex_exit(&dtrace_lock); + mutex_exit(&dtrace_provider_lock); + + mutex_enter(&cpu_lock); + mutex_enter(&dtrace_provider_lock); + mutex_enter(&dtrace_lock); + + if ((enab = dtrace_anon.dta_enabling) != NULL) + (void) dtrace_enabling_match(enab, NULL); + + mutex_exit(&cpu_lock); + } + + mutex_exit(&dtrace_provider_lock); + mutex_exit(&dtrace_lock); + + if (state != NULL) { + /* + * If we created any anonymous state, set it going now. + */ + (void) dtrace_state_go(state, &dtrace_anon.dta_beganon); + } +} + static dtrace_state_t * dtrace_anon_grab(void) { From owner-p4-projects@FreeBSD.ORG Mon Jun 26 06:30:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF8F616A4D8; Mon, 26 Jun 2006 06:30:38 +0000 (UTC) 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 CE0D416A4A6 for ; Mon, 26 Jun 2006 06:30:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F1AB43D5E for ; Mon, 26 Jun 2006 06:30:38 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q6Ucrn024131 for ; Mon, 26 Jun 2006 06:30:38 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q6Uc3m024128 for perforce@freebsd.org; Mon, 26 Jun 2006 06:30:38 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 06:30:38 GMT Message-Id: <200606260630.k5Q6Uc3m024128@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100037 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, 26 Jun 2006 06:30:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=100037 Change 100037 by jb@jb_freebsd2 on 2006/06/26 06:29:57 Create system initialisation callbacks for the DTrace providers so that ther are initialised early in the boot process and available for tracing the device probes etc (which may be loaded in modules too, but they are listed later in the system initialisation order)/ Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/fbt/fbt.c#3 edit .. //depot/projects/dtrace/src/sys/cddl/dev/profile/profile.c#2 edit .. //depot/projects/dtrace/src/sys/cddl/dev/prototype.c#3 edit .. //depot/projects/dtrace/src/sys/cddl/dev/sdt/sdt.c#3 edit .. //depot/projects/dtrace/src/sys/cddl/dev/systrace/systrace.c#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/fbt/fbt.c#3 (text+ko) ==== @@ -101,12 +101,12 @@ #endif static d_open_t fbt_open; -static int fbt_load(void); static int fbt_unload(void); static void fbt_provide_module(void *, modctl_t *); static void fbt_destroy(void *, dtrace_id_t, void *); static void fbt_enable(void *, dtrace_id_t, void *); static void fbt_disable(void *, dtrace_id_t, void *); +static void fbt_load(void *); static void fbt_suspend(void *, dtrace_id_t, void *); static void fbt_resume(void *, dtrace_id_t, void *); @@ -251,15 +251,18 @@ strncmp(name, "kdb_", 4) == 0 || strncmp(name, "intr_", 5) == 0 || + strncmp(name, "X_", 2) == 0 || strncmp(name, "vm", 2) == 0 || strncmp(name, "th", 2) == 0 || strncmp(name, "sh", 2) == 0 || strncmp(name, "fi", 2) == 0 || strncmp(name, "fd", 2) == 0 || + strncmp(name, "elf", 3) == 0 || strncmp(name, "str", 3) == 0 || strncmp(name, "nfs", 3) == 0 || strncmp(name, "ata_", 4) == 0 || strncmp(name, "acpi", 4) == 0 || + strncmp(name, "link_", 5) == 0 || strncmp(name, "bufobj", 6) == 0 || strncmp(name, "linker", 6) == 0 || strncmp(name, "witness", 7) == 0 || @@ -589,11 +592,9 @@ *fbt->fbtp_patchpoint = fbt->fbtp_patchval; } -static int -fbt_load() +static void +fbt_load(void *dummy) { - int error = 0; - /* Default the probe table size if not specified. */ if (fbt_probetab_size == 0) fbt_probetab_size = FBT_PROBETAB_SIZE; @@ -607,15 +608,9 @@ dtrace_invop_add(fbt_invop); - if ((error = dtrace_register("fbt", &fbt_attr, DTRACE_PRIV_USER, - NULL, &fbt_pops, NULL, &fbt_id)) != 0) - return (error); - - /* Create the /dev/dtrace/fbt entry. */ - fbt_cdev = make_dev(&fbt_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "dtrace/fbt"); - - return (error); + if (dtrace_register("fbt", &fbt_attr, DTRACE_PRIV_USER, + NULL, &fbt_pops, NULL, &fbt_id) != 0) + return; } @@ -649,8 +644,9 @@ switch (type) { case MOD_LOAD: - printf("fbt -----------------------------------------------\n"); - error = fbt_load(); + /* Create the /dev/dtrace/fbt entry. */ + fbt_cdev = make_dev(&fbt_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, + "dtrace/fbt"); break; case MOD_UNLOAD: @@ -676,6 +672,8 @@ return (0); } +SYSINIT(fbt_load, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, fbt_load, NULL) + DEV_MODULE(fbt, fbt_modevent, NULL); MODULE_VERSION(fbt, 1); MODULE_DEPEND(fbt, dtrace, 1, 1, 1); ==== //depot/projects/dtrace/src/sys/cddl/dev/profile/profile.c#2 (text+ko) ==== @@ -131,13 +131,13 @@ } profile_probe_percpu_t; static d_open_t profile_open; -static int profile_load(void); static int profile_unload(void); -static void profile_provide(void *, dtrace_probedesc_t *); +static void profile_create(hrtime_t, char *, int); static void profile_destroy(void *, dtrace_id_t, void *); static void profile_enable(void *, dtrace_id_t, void *); static void profile_disable(void *, dtrace_id_t, void *); -static void profile_create(hrtime_t, char *, int); +static void profile_load(void *); +static void profile_provide(void *, dtrace_probedesc_t *); static int profile_rates[] = { 97, 199, 499, 997, 1999, @@ -476,20 +476,12 @@ prof->prof_cyclic = CYCLIC_NONE; } -static int -profile_load() +static void +profile_load(void *dummy) { - int error = 0; - - if ((error = dtrace_register("profile", &profile_attr, DTRACE_PRIV_USER, - NULL, &profile_pops, NULL, &profile_id)) != 0) - return (error); - - /* Create the /dev/dtrace/profile entry. */ - profile_cdev = make_dev(&profile_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "dtrace/profile"); - - return (error); + if (dtrace_register("profile", &profile_attr, DTRACE_PRIV_USER, + NULL, &profile_pops, NULL, &profile_id) != 0) + return; } @@ -514,8 +506,9 @@ switch (type) { case MOD_LOAD: - printf("profile ------------------------------------------------\n"); - error = profile_load(); + /* Create the /dev/dtrace/profile entry. */ + profile_cdev = make_dev(&profile_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, + "dtrace/profile"); break; case MOD_UNLOAD: @@ -540,6 +533,8 @@ return (0); } +SYSINIT(profile_load, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, profile_load, NULL) + DEV_MODULE(profile, profile_modevent, NULL); MODULE_VERSION(profile, 1); MODULE_DEPEND(profile, dtrace, 1, 1, 1); ==== //depot/projects/dtrace/src/sys/cddl/dev/prototype.c#3 (text+ko) ==== @@ -62,12 +62,12 @@ #include static d_open_t prototype_open; -static int prototype_load(void); static int prototype_unload(void); static void prototype_provide(void *, dtrace_probedesc_t *); static void prototype_destroy(void *, dtrace_id_t, void *); static void prototype_enable(void *, dtrace_id_t, void *); static void prototype_disable(void *, dtrace_id_t, void *); +static void prototype_load(void *); static struct cdevsw prototype_cdevsw = { .d_version = D_VERSION, @@ -127,20 +127,12 @@ { } -static int -prototype_load() +static void +prototype_load(void *dummy) { - int error = 0; - - if ((error = dtrace_register("prototype", &prototype_attr, DTRACE_PRIV_USER, - NULL, &prototype_pops, NULL, &prototype_id)) != 0) - return (error); - - /* Create the /dev/dtrace/prototype entry. */ - prototype_cdev = make_dev(&prototype_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "dtrace/prototype"); - - return (error); + if (dtrace_register("prototype", &prototype_attr, DTRACE_PRIV_USER, + NULL, &prototype_pops, NULL, &prototype_id) != 0) + return; } @@ -165,8 +157,9 @@ switch (type) { case MOD_LOAD: - printf("prototype -----------------------------------------------\n"); - error = prototype_load(); + /* Create the /dev/dtrace/prototype entry. */ + prototype_cdev = make_dev(&prototype_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, + "dtrace/prototype"); break; case MOD_UNLOAD: @@ -192,6 +185,8 @@ return (0); } +SYSINIT(prototype_load, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, prototype_load, NULL) + DEV_MODULE(prototype, prototype_modevent, NULL); MODULE_VERSION(prototype, 1); MODULE_DEPEND(prototype, dtrace, 1, 1, 1); ==== //depot/projects/dtrace/src/sys/cddl/dev/sdt/sdt.c#3 (text+ko) ==== @@ -63,13 +63,13 @@ #include static d_open_t sdt_open; -static int sdt_load(void); static int sdt_provide_ref(struct sdt_ref *, void *); static int sdt_unload(void); static void sdt_provide(void *, dtrace_probedesc_t *); static void sdt_destroy(void *, dtrace_id_t, void *); static void sdt_enable(void *, dtrace_id_t, void *); static void sdt_disable(void *, dtrace_id_t, void *); +static void sdt_load(void *); static struct cdevsw sdt_cdevsw = { .d_version = D_VERSION, @@ -171,26 +171,18 @@ #endif } -static int -sdt_load() +static void +sdt_load(void *dummy) { - int error = 0; - - if ((error = dtrace_register("sdt", &sdt_attr, DTRACE_PRIV_USER, - NULL, &sdt_pops, NULL, &sdt_id)) != 0) - return (error); + if (dtrace_register("sdt", &sdt_attr, DTRACE_PRIV_USER, + NULL, &sdt_pops, NULL, &sdt_id) != 0) + return; - /* Create the /dev/dtrace/sdt entry. */ - sdt_cdev = make_dev(&sdt_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "dtrace/sdt"); - /* * Register the read DTrace probe function pointer in place * of the stub. */ sdt_probe_func = dtrace_probe; - - return (error); } @@ -220,8 +212,9 @@ switch (type) { case MOD_LOAD: - printf("sdt ----------------------------------------------------\n"); - error = sdt_load(); + /* Create the /dev/dtrace/sdt entry. */ + sdt_cdev = make_dev(&sdt_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, + "dtrace/sdt"); break; case MOD_UNLOAD: @@ -246,6 +239,8 @@ return (0); } +SYSINIT(sdt_load, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, sdt_load, NULL) + DEV_MODULE(sdt, sdt_modevent, NULL); MODULE_VERSION(sdt, 1); MODULE_DEPEND(sdt, dtrace, 1, 1, 1); ==== //depot/projects/dtrace/src/sys/cddl/dev/systrace/systrace.c#6 (text+ko) ==== @@ -75,7 +75,6 @@ extern char *syscallnames[]; static d_open_t systrace_open; -static int systrace_load(void); static int systrace_unload(void); static void systrace_args(int, void *, u_int64_t *, int *); static void systrace_probe(u_int32_t, int, struct sysent *, void *); @@ -83,6 +82,7 @@ static void systrace_destroy(void *, dtrace_id_t, void *); static void systrace_enable(void *, dtrace_id_t, void *); static void systrace_disable(void *, dtrace_id_t, void *); +static void systrace_load(void *); static struct cdevsw systrace_cdevsw = { .d_version = D_VERSION, @@ -229,22 +229,14 @@ sysent[sysnum].sy_return = 0; } -static int -systrace_load() +static void +systrace_load(void *dummy) { - int error = 0; - - if ((error = dtrace_register("syscall", &systrace_attr, DTRACE_PRIV_USER, - NULL, &systrace_pops, NULL, &systrace_id)) != 0) - return (error); + if (dtrace_register("syscall", &systrace_attr, DTRACE_PRIV_USER, + NULL, &systrace_pops, NULL, &systrace_id) != 0) + return; - /* Create the /dev/dtrace/systrace entry. */ - systrace_cdev = make_dev(&systrace_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "dtrace/systrace"); - systrace_probe_func = systrace_probe; - - return (error); } @@ -271,8 +263,9 @@ switch (type) { case MOD_LOAD: - printf("systrace -----------------------------------------------\n"); - error = systrace_load(); + /* Create the /dev/dtrace/systrace entry. */ + systrace_cdev = make_dev(&systrace_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, + "dtrace/systrace"); break; case MOD_UNLOAD: @@ -297,6 +290,8 @@ return (0); } +SYSINIT(systrace_load, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, systrace_load, NULL) + DEV_MODULE(systrace, systrace_modevent, NULL); MODULE_VERSION(systrace, 1); MODULE_DEPEND(systrace, dtrace, 1, 1, 1); From owner-p4-projects@FreeBSD.ORG Mon Jun 26 06:53:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4FA816A40A; Mon, 26 Jun 2006 06:53:13 +0000 (UTC) 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 9633416A400 for ; Mon, 26 Jun 2006 06:53:13 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C186C43D9C for ; Mon, 26 Jun 2006 06:53:06 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q6r6Pu025047 for ; Mon, 26 Jun 2006 06:53:06 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q6r6Jh025044 for perforce@freebsd.org; Mon, 26 Jun 2006 06:53:06 GMT (envelope-from clem1@FreeBSD.org) Date: Mon, 26 Jun 2006 06:53:06 GMT Message-Id: <200606260653.k5Q6r6Jh025044@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 100038 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, 26 Jun 2006 06:53:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=100038 Change 100038 by clem1@clem1_ipv6vulns on 2006/06/26 06:52:58 - icmpv6 bug fix. - ipv6 extension headers support. - dosbig6.py Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/icmpv6.py#4 edit .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/ipv6.py#3 edit .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/pcs.py#4 edit .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/samples/dosbig6.py#1 add Differences ... ==== //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/icmpv6.py#4 (text+ko) ==== @@ -171,7 +171,7 @@ else: pcs.Packet.__add__(self, [ty, length]) - def cksum(self, ip, data = ""): + def cksum(self, ip, data = "", nx = 0): """return icmpv6 checksum if we send packet through raw link level (i.e bpf)""" total = 0 @@ -179,7 +179,10 @@ p6.src = ip.src p6.dst = ip.dst p6.length = len(self.getbytes()) + len (data) - p6.next_header = ip.next_header + if nx: + p6.next_header = nx + else: + p6.next_header = ip.next_header pkt = p6.getbytes() + self.getbytes() + data if len(pkt) % 2 == 1: pkt += "\0" ==== //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/ipv6.py#3 (text+ko) ==== ==== //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/pcs.py#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Jun 26 10:00:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C46816A410; Mon, 26 Jun 2006 10:00:11 +0000 (UTC) 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 3426F16A40D for ; Mon, 26 Jun 2006 10:00:11 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AA6243D5E for ; Mon, 26 Jun 2006 10:00:01 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QA01oN049308 for ; Mon, 26 Jun 2006 10:00:01 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QA01JV049305 for perforce@freebsd.org; Mon, 26 Jun 2006 10:00:01 GMT (envelope-from piso@freebsd.org) Date: Mon, 26 Jun 2006 10:00:01 GMT Message-Id: <200606261000.k5QA01JV049305@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 100042 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, 26 Jun 2006 10:00:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=100042 Change 100042 by piso@piso_newluxor on 2006/06/26 09:59:11 Add a filter parameter for nexus_setup_intr() and arm_setup_irqhandler(). Affected files ... .. //depot/projects/soc2006/intr_filter/arm/arm/intr.c#3 edit .. //depot/projects/soc2006/intr_filter/arm/arm/nexus.c#2 edit .. //depot/projects/soc2006/intr_filter/arm/include/intr.h#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/arm/arm/intr.c#3 (text+ko) ==== @@ -58,7 +58,7 @@ void arm_handler_execute(struct trapframe *, int); void -arm_setup_irqhandler(const char *name, void (*hand)(void*), void *arg, +arm_setup_irqhandler(const char *name, driver_filter_t *filter, void (*hand)(void*), void *arg, int irq, int flags, void **cookiep) { struct intr_event *event; @@ -82,7 +82,7 @@ intrcnt_index++; } - intr_event_add_handler(event, name, hand, arg, + intr_event_add_handler(event, name, filter, hand, arg, intr_priority(flags), flags, cookiep); } ==== //depot/projects/soc2006/intr_filter/arm/arm/nexus.c#2 (text+ko) ==== @@ -81,7 +81,8 @@ struct resource *); static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep); + driver_filter_t *filter, driver_intr_t *intr, void *arg, + void **cookiep); static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); @@ -125,10 +126,10 @@ static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep) + driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) { arm_setup_irqhandler(device_get_nameunit(child), - intr, arg, rman_get_start(res), flags, cookiep); + filter, intr, arg, rman_get_start(res), flags, cookiep); return (0); } ==== //depot/projects/soc2006/intr_filter/arm/include/intr.h#2 (text+ko) ==== @@ -50,7 +50,7 @@ int arm_get_next_irq(void); void arm_mask_irq(uintptr_t); void arm_unmask_irq(uintptr_t); -void arm_setup_irqhandler(const char *, void (*)(void*), void *, int, int, - void **); +void arm_setup_irqhandler(const char *, driver_filter_t *, void (*)(void*), + void *, int, int, void **); int arm_remove_irqhandler(void *); #endif /* _MACHINE_INTR_H */ From owner-p4-projects@FreeBSD.ORG Mon Jun 26 10:37:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE1B016A404; Mon, 26 Jun 2006 10:37:51 +0000 (UTC) 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 84BCB16A400 for ; Mon, 26 Jun 2006 10:37:51 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48429444AA for ; Mon, 26 Jun 2006 10:37:51 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QAbp3h052198 for ; Mon, 26 Jun 2006 10:37:51 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QAboqm052195 for perforce@freebsd.org; Mon, 26 Jun 2006 10:37:50 GMT (envelope-from piso@freebsd.org) Date: Mon, 26 Jun 2006 10:37:50 GMT Message-Id: <200606261037.k5QAboqm052195@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 100044 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, 26 Jun 2006 10:37:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=100044 Change 100044 by piso@piso_newluxor on 2006/06/26 10:37:26 Add a filter parameter to at91_setup_intr(), sa1110_setup_intr(), i80321_pci_setup_intr() and iq80321_setup_intr(). Affected files ... .. //depot/projects/soc2006/intr_filter/arm/at91/at91.c#2 edit .. //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0.c#2 edit .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/i80321_pci.c#2 edit .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/iq80321.c#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/arm/at91/at91.c#2 (text) ==== @@ -539,15 +539,15 @@ static int at91_setup_intr(device_t dev, device_t child, - struct resource *ires, int flags, driver_intr_t *intr, void *arg, + struct resource *ires, int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) { struct at91_softc *sc = device_get_softc(dev); if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && !(flags & INTR_FAST)) panic("All system interrupt ISRs must be type INTR_FAST"); - BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, - cookiep); + BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filter, intr, + arg, cookiep); bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_IECR, 1 << rman_get_start(ires)); return (0); ==== //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0.c#2 (text+ko) ==== @@ -92,14 +92,14 @@ static int sa1110_activate_resource(device_t, device_t, int, int, struct resource *); static int sa1110_setup_intr(device_t, device_t, struct resource *, int, - driver_intr_t *, void *, void **); + driver_filter_t *, driver_intr_t *, void *, void **); struct sa11x0_softc *sa11x0_softc; /* There can be only one. */ static int sa1110_setup_intr(device_t dev, device_t child, - struct resource *ires, int flags, driver_intr_t *intr, void *arg, - void **cookiep) + struct resource *ires, int flags, driver_filter_t *filter, driver_intr_t *intr, + void *arg, void **cookiep) { int saved_cpsr; @@ -114,8 +114,8 @@ saved_cpsr = SetCPSR(I32_bit, I32_bit); SetCPSR(I32_bit, saved_cpsr & I32_bit); - BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, - cookiep); + BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filter, intr, + arg, cookiep); return (0); } ==== //depot/projects/soc2006/intr_filter/arm/xscale/i80321/i80321_pci.c#2 (text+ko) ==== @@ -416,11 +416,11 @@ static int i80321_pci_setup_intr(device_t dev, device_t child, - struct resource *ires, int flags, driver_intr_t *intr, void *arg, - void **cookiep) + struct resource *ires, int flags, driver_filter_t *filter, + driver_intr_t *intr, void *arg, void **cookiep) { return (BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, - intr, arg, cookiep)); + filter, intr, arg, cookiep)); } static int ==== //depot/projects/soc2006/intr_filter/arm/xscale/i80321/iq80321.c#2 (text+ko) ==== @@ -314,10 +314,10 @@ static int iq80321_setup_intr(device_t dev, device_t child, - struct resource *ires, int flags, driver_intr_t *intr, void *arg, - void **cookiep) + struct resource *ires, int flags, driver_filter_t *filter, + driver_intr_t *intr, void *arg, void **cookiep) { - BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, + BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filter, intr, arg, cookiep); intr_enabled |= 1 << rman_get_start(ires); i80321_set_intrmask(); From owner-p4-projects@FreeBSD.ORG Mon Jun 26 10:51:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E037F16A402; Mon, 26 Jun 2006 10:51:11 +0000 (UTC) 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 BABC116A406 for ; Mon, 26 Jun 2006 10:51:11 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2BE743D9C for ; Mon, 26 Jun 2006 10:51:08 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QAp8A5052787 for ; Mon, 26 Jun 2006 10:51:08 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QAp8VF052783 for perforce@freebsd.org; Mon, 26 Jun 2006 10:51:08 GMT (envelope-from piso@freebsd.org) Date: Mon, 26 Jun 2006 10:51:08 GMT Message-Id: <200606261051.k5QAp8VF052783@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 100045 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, 26 Jun 2006 10:51:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=100045 Change 100045 by piso@piso_newluxor on 2006/06/26 10:50:27 Add a filter parameter (unused in this case) to ata_cbus_setup_intr(). Affected files ... .. //depot/projects/soc2006/intr_filter/dev/ata/ata-cbus.c#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/ata/ata-cbus.c#2 (text+ko) ==== @@ -188,8 +188,8 @@ static int ata_cbus_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_intr_t *intr, void *arg, - void **cookiep) + int flags, driver_filter_t *filter __unused, driver_intr_t *intr, + void *arg, void **cookiep) { struct ata_cbus_controller *controller = device_get_softc(dev); int unit = ((struct ata_channel *)device_get_softc(child))->unit; From owner-p4-projects@FreeBSD.ORG Mon Jun 26 11:19:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B95C916A409; Mon, 26 Jun 2006 11:19:49 +0000 (UTC) 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 9575B16A407 for ; Mon, 26 Jun 2006 11:19:49 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38D1043D46 for ; Mon, 26 Jun 2006 11:19:48 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QBJmxi055145 for ; Mon, 26 Jun 2006 11:19:48 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QBJlQO055142 for perforce@freebsd.org; Mon, 26 Jun 2006 11:19:47 GMT (envelope-from piso@freebsd.org) Date: Mon, 26 Jun 2006 11:19:47 GMT Message-Id: <200606261119.k5QBJlQO055142@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 100047 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, 26 Jun 2006 11:19:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=100047 Change 100047 by piso@piso_newluxor on 2006/06/26 11:19:33 Indent it for 80 columns. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/ppc/ppc.c#3 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/ppc/ppc.c#3 (text+ko) ==== @@ -1963,7 +1963,8 @@ */ int ppc_setup_intr(device_t bus, device_t child, struct resource *r, int flags, - driver_filter_t *filter, void (*ihand)(void *), void *arg, void **cookiep) + driver_filter_t *filter, void (*ihand)(void *), void *arg, + void **cookiep) { int error; struct ppc_data *ppc = DEVTOSOFTC(bus); From owner-p4-projects@FreeBSD.ORG Mon Jun 26 11:59:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1421716A40A; Mon, 26 Jun 2006 11:59:43 +0000 (UTC) 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 E4FC816A408 for ; Mon, 26 Jun 2006 11:59:42 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6377343D79 for ; Mon, 26 Jun 2006 11:59:39 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QBxdIp056861 for ; Mon, 26 Jun 2006 11:59:39 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QBxd1H056858 for perforce@freebsd.org; Mon, 26 Jun 2006 11:59:39 GMT (envelope-from piso@freebsd.org) Date: Mon, 26 Jun 2006 11:59:39 GMT Message-Id: <200606261159.k5QBxd1H056858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 100049 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, 26 Jun 2006 11:59:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=100049 Change 100049 by piso@piso_newluxor on 2006/06/26 11:58:49 Add a filter parameter (even if unused) to sbc_setup_intr(). Affected files ... .. //depot/projects/soc2006/intr_filter/dev/sound/isa/sbc.c#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/sound/isa/sbc.c#2 (text+ko) ==== @@ -503,8 +503,8 @@ static int sbc_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_intr_t *intr, void *arg, - void **cookiep) + int flags, driver_filter_t *filter __unused, driver_intr_t *intr, + void *arg, void **cookiep) { struct sbc_softc *scp = device_get_softc(dev); struct sbc_ihl *ihl = NULL; From owner-p4-projects@FreeBSD.ORG Mon Jun 26 12:01:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 211D916A406; Mon, 26 Jun 2006 12:01:49 +0000 (UTC) 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 EF5D016A404 for ; Mon, 26 Jun 2006 12:01:48 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C67CA43D5D for ; Mon, 26 Jun 2006 12:01:42 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QC1ggI056998 for ; Mon, 26 Jun 2006 12:01:42 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QC1gH8056995 for perforce@freebsd.org; Mon, 26 Jun 2006 12:01:42 GMT (envelope-from piso@freebsd.org) Date: Mon, 26 Jun 2006 12:01:42 GMT Message-Id: <200606261201.k5QC1gH8056995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 100050 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, 26 Jun 2006 12:01:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=100050 Change 100050 by piso@piso_newluxor on 2006/06/26 12:00:55 Forgot to fix the prototype in the previous commit. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/sound/isa/sbc.c#3 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/sound/isa/sbc.c#3 (text+ko) ==== @@ -80,8 +80,8 @@ static int sbc_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r); static int sbc_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_intr_t *intr, void *arg, - void **cookiep); + int flags, driver_filter_t *filter, driver_intr_t *intr, + void *arg, void **cookiep); static int sbc_teardown_intr(device_t dev, device_t child, struct resource *irq, void *cookie); From owner-p4-projects@FreeBSD.ORG Mon Jun 26 12:03:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF04416A407; Mon, 26 Jun 2006 12:03:05 +0000 (UTC) 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 8301316A400 for ; Mon, 26 Jun 2006 12:03:05 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BEC2644922 for ; Mon, 26 Jun 2006 11:35:08 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QBZ8N4055934 for ; Mon, 26 Jun 2006 11:35:08 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QBZ7Dq055931 for perforce@freebsd.org; Mon, 26 Jun 2006 11:35:07 GMT (envelope-from piso@freebsd.org) Date: Mon, 26 Jun 2006 11:35:07 GMT Message-Id: <200606261135.k5QBZ7Dq055931@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 100048 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, 26 Jun 2006 12:03:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=100048 Change 100048 by piso@piso_newluxor on 2006/06/26 11:34:21 Add a filter parameter (even if unused) to scc_bus_setup_intr(). Affected files ... .. //depot/projects/soc2006/intr_filter/dev/scc/scc_bfe.h#2 edit .. //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#4 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/scc/scc_bfe.h#2 (text) ==== @@ -146,7 +146,7 @@ int scc_bus_read_ivar(device_t, device_t, int, uintptr_t *); int scc_bus_release_resource(device_t, device_t, int, int, struct resource *); int scc_bus_setup_intr(device_t, device_t, struct resource *, int, - void (*)(void *), void *, void **); + driver_filter_t *, void (*)(void *), void *, void **); int scc_bus_teardown_intr(device_t, device_t, struct resource *, void *); #endif /* _DEV_SCC_BFE_H_ */ ==== //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#4 (text) ==== @@ -498,7 +498,8 @@ int scc_bus_setup_intr(device_t dev, device_t child, struct resource *r, int flags, - void (*ihand)(void *), void *arg, void **cookiep) + driver_filter_t *filter __unused, void (*ihand)(void *), void *arg, + void **cookiep) { struct scc_chan *ch; struct scc_mode *m; @@ -525,7 +526,7 @@ bus_teardown_intr(dev, ch->ch_ires, ch->ch_icookie); bus_setup_intr(dev, ch->ch_ires, INTR_TYPE_TTY | INTR_MPSAFE, - NULL, (driver_intr_t *)scc_bfe_intr, sc, &ch->ch_icookie); + scc_bfe_intr, NULL, sc, &ch->ch_icookie); } } From owner-p4-projects@FreeBSD.ORG Mon Jun 26 12:09:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 725A516A413; Mon, 26 Jun 2006 12:09:11 +0000 (UTC) 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 4BF6C16A40B for ; Mon, 26 Jun 2006 12:09:11 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41D5143E36 for ; Mon, 26 Jun 2006 12:05:48 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QC5mIx058372 for ; Mon, 26 Jun 2006 12:05:48 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QC5mfU058369 for perforce@freebsd.org; Mon, 26 Jun 2006 12:05:48 GMT (envelope-from piso@freebsd.org) Date: Mon, 26 Jun 2006 12:05:48 GMT Message-Id: <200606261205.k5QC5mfU058369@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 100051 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, 26 Jun 2006 12:09:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=100051 Change 100051 by piso@piso_newluxor on 2006/06/26 12:05:44 Add a filter parameter (even if unused) to csa_setup_intr(). Affected files ... .. //depot/projects/soc2006/intr_filter/dev/sound/pci/csa.c#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/sound/pci/csa.c#2 (text+ko) ==== @@ -82,7 +82,8 @@ struct resource *r); static int csa_setup_intr(device_t bus, device_t child, struct resource *irq, int flags, - driver_intr_t *intr, void *arg, void **cookiep); + driver_filter_t *filter, driver_intr_t *intr, + void *arg, void **cookiep); static int csa_teardown_intr(device_t bus, device_t child, struct resource *irq, void *cookie); static driver_intr_t csa_intr; @@ -439,7 +440,8 @@ static int csa_setup_intr(device_t bus, device_t child, struct resource *irq, int flags, - driver_intr_t *intr, void *arg, void **cookiep) + driver_filter_t *filter __unused, driver_intr_t *intr, void *arg, + void **cookiep) { sc_p scp; csa_res *resp; From owner-p4-projects@FreeBSD.ORG Mon Jun 26 13:29:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AA2116A408; Mon, 26 Jun 2006 13:29:40 +0000 (UTC) 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 19CCB16A40B for ; Mon, 26 Jun 2006 13:29:40 +0000 (UTC) (envelope-from m@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0913843D8A for ; Mon, 26 Jun 2006 13:29:34 +0000 (GMT) (envelope-from m@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QDTX8M070749 for ; Mon, 26 Jun 2006 13:29:33 GMT (envelope-from m@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QDTXxp070746 for perforce@freebsd.org; Mon, 26 Jun 2006 13:29:33 GMT (envelope-from m@FreeBSD.org) Date: Mon, 26 Jun 2006 13:29:33 GMT Message-Id: <200606261329.k5QDTXxp070746@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to m@FreeBSD.org using -f From: Markus Boelter To: Perforce Change Reviews Cc: Subject: PERFORCE change 100052 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, 26 Jun 2006 13:29:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=100052 Change 100052 by m@m_coffee on 2006/06/26 13:29:00 Prevent FreeSBIE from trying to mount root-fs with rw-flags when booting via PXE Affected files ... .. //depot/projects/soc2006/m_netboot_server/freesbie/scripts/iso.sh#2 edit Differences ... ==== //depot/projects/soc2006/m_netboot_server/freesbie/scripts/iso.sh#2 (text+ko) ==== @@ -42,7 +42,7 @@ mkdir -p ${CLONEDIR}/dist mv root.dist.bz2 ${CLONEDIR}/dist/ -echo "/dev/iso9660/${FREESBIE_LABEL} / cd9660 ro 0 0" > ${CLONEDIR}/etc/fstab +echo "/dev/iso9660/${FREESBIE_LABEL} / cd9660 ro,noauto 0 0" > ${CLONEDIR}/etc/fstab cd ${CLONEDIR} From owner-p4-projects@FreeBSD.ORG Mon Jun 26 13:31:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EB0F16A406; Mon, 26 Jun 2006 13:31:38 +0000 (UTC) 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 C4D7916A403 for ; Mon, 26 Jun 2006 13:31:37 +0000 (UTC) (envelope-from m@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9061943D62 for ; Mon, 26 Jun 2006 13:31:37 +0000 (GMT) (envelope-from m@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QDVbWv070867 for ; Mon, 26 Jun 2006 13:31:37 GMT (envelope-from m@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QDVbA5070864 for perforce@freebsd.org; Mon, 26 Jun 2006 13:31:37 GMT (envelope-from m@FreeBSD.org) Date: Mon, 26 Jun 2006 13:31:37 GMT Message-Id: <200606261331.k5QDVbA5070864@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to m@FreeBSD.org using -f From: Markus Boelter To: Perforce Change Reviews Cc: Subject: PERFORCE change 100053 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, 26 Jun 2006 13:31:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=100053 Change 100053 by m@m_coffee on 2006/06/26 13:31:04 plugin will create /usr/local/bin/bsdinstaller. This script will start the lua based backend and curses based frontend (dfuife_curses) Makes things a lot easier and faster to debug. Affected files ... .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua.sh#2 edit Differences ... ==== //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua.sh#2 (text+ko) ==== @@ -9,5 +9,12 @@ fi mkdir -p $BASEDIR/usr/local/share/dfuibe_lua +cp -Rp extra/dfuibe_lua/* $BASEDIR/usr/local/share/dfuibe_lua + +BSDINSTALLER=$BASEDIR/usr/local/bin/bsdinstaller -cp -Rp extra/dfuibe_lua/* $BASEDIR/usr/local/share/dfuibe_lua +echo "#!/bin/sh" > $BSDINSTALLER +echo "/usr/local/share/dfuibe_lua/dfuibe_lua.sh >/dev/null 2>&1 &" >> $BSDINSTALLER +echo "/usr/local/bin/dfuife_curses" >> $BSDINSTALLER + +chmod 755 $BSDINSTALLER From owner-p4-projects@FreeBSD.ORG Mon Jun 26 13:32:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AFC516A404; Mon, 26 Jun 2006 13:32:40 +0000 (UTC) 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 4C6A816A401 for ; Mon, 26 Jun 2006 13:32:40 +0000 (UTC) (envelope-from m@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68D2143D68 for ; Mon, 26 Jun 2006 13:32:39 +0000 (GMT) (envelope-from m@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QDWdKQ070906 for ; Mon, 26 Jun 2006 13:32:39 GMT (envelope-from m@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QDWdTW070903 for perforce@freebsd.org; Mon, 26 Jun 2006 13:32:39 GMT (envelope-from m@FreeBSD.org) Date: Mon, 26 Jun 2006 13:32:39 GMT Message-Id: <200606261332.k5QDWdTW070903@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to m@FreeBSD.org using -f From: Markus Boelter To: Perforce Change Reviews Cc: Subject: PERFORCE change 100054 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, 26 Jun 2006 13:32:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=100054 Change 100054 by m@m_coffee on 2006/06/26 13:32:26 added wrapper to start bsdinstaller lua backend Affected files ... .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/dfuibe_lua.sh#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jun 26 13:34:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 668E716A403; Mon, 26 Jun 2006 13:34:43 +0000 (UTC) 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 1989016A401 for ; Mon, 26 Jun 2006 13:34:43 +0000 (UTC) (envelope-from m@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F69C43D64 for ; Mon, 26 Jun 2006 13:34:42 +0000 (GMT) (envelope-from m@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QDYg2q071029 for ; Mon, 26 Jun 2006 13:34:42 GMT (envelope-from m@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QDYgfR071026 for perforce@freebsd.org; Mon, 26 Jun 2006 13:34:42 GMT (envelope-from m@FreeBSD.org) Date: Mon, 26 Jun 2006 13:34:42 GMT Message-Id: <200606261334.k5QDYgfR071026@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to m@FreeBSD.org using -f From: Markus Boelter To: Perforce Change Reviews Cc: Subject: PERFORCE change 100055 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, 26 Jun 2006 13:34:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=100055 Change 100055 by m@m_coffee on 2006/06/26 13:33:56 added script to start bsdinstaller with simple command "bsdinstaller" from commandline Affected files ... .. //depot/projects/soc2006/m_netboot_server/freesbie/extra/dfuibe_lua/bsdinstaller#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jun 26 14:35:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8270D16A47B; Mon, 26 Jun 2006 14:35:42 +0000 (UTC) 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 47DE016A40B for ; Mon, 26 Jun 2006 14:35:42 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B89144B7E for ; Mon, 26 Jun 2006 14:13:37 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QEDaAJ074144 for ; Mon, 26 Jun 2006 14:13:36 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QEDaM7074141 for perforce@freebsd.org; Mon, 26 Jun 2006 14:13:36 GMT (envelope-from piso@freebsd.org) Date: Mon, 26 Jun 2006 14:13:36 GMT Message-Id: <200606261413.k5QEDaM7074141@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 100060 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, 26 Jun 2006 14:35:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=100060 Change 100060 by piso@piso_newluxor on 2006/06/26 14:13:02 Add a filter parameter to isa_setup_intr() for amd64, ia64 and sparc64. Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/isa/isa.c#2 edit .. //depot/projects/soc2006/intr_filter/ia64/isa/isa.c#2 edit .. //depot/projects/soc2006/intr_filter/sparc64/isa/isa.c#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/isa/isa.c#2 (text+ko) ==== @@ -147,10 +147,11 @@ */ int isa_setup_intr(device_t bus, device_t child, struct resource *r, int flags, - void (*ihand)(void *), void *arg, void **cookiep) + driver_filter_t *filter, void (*ihand)(void *), void *arg, + void **cookiep) { return (BUS_SETUP_INTR(device_get_parent(bus), child, r, flags, - ihand, arg, cookiep)); + filter, ihand, arg, cookiep)); } int ==== //depot/projects/soc2006/intr_filter/ia64/isa/isa.c#2 (text+ko) ==== @@ -155,10 +155,11 @@ */ int isa_setup_intr(device_t bus, device_t child, struct resource *r, int flags, - void (*ihand)(void *), void *arg, void **cookiep) + driver_filter_t *filter, void (*ihand)(void *), void *arg, + void **cookiep) { return (BUS_SETUP_INTR(device_get_parent(bus), child, r, flags, - ihand, arg, cookiep)); + filter, ihand, arg, cookiep)); } int ==== //depot/projects/soc2006/intr_filter/sparc64/isa/isa.c#2 (text+ko) ==== @@ -399,9 +399,9 @@ } int -isa_setup_intr(device_t dev, device_t child, - struct resource *irq, int flags, - driver_intr_t *intr, void *arg, void **cookiep) +isa_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, + driver_filter_t *filter, driver_intr_t *intr, void *arg, + void **cookiep) { /* @@ -410,8 +410,8 @@ * The interrupt had been routed before it was added to the * resource list of the child. */ - return (BUS_SETUP_INTR(device_get_parent(dev), child, irq, flags, intr, - arg, cookiep)); + return (BUS_SETUP_INTR(device_get_parent(dev), child, irq, flags, filter, + intr, arg, cookiep)); } int From owner-p4-projects@FreeBSD.ORG Mon Jun 26 15:01:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEFBF16A408; Mon, 26 Jun 2006 15:01:39 +0000 (UTC) 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 8F43116A404 for ; Mon, 26 Jun 2006 15:01:39 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E85F4511B for ; Mon, 26 Jun 2006 15:01:39 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QF1dLV076482 for ; Mon, 26 Jun 2006 15:01:39 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QF1cmS076479 for perforce@freebsd.org; Mon, 26 Jun 2006 15:01:38 GMT (envelope-from piso@freebsd.org) Date: Mon, 26 Jun 2006 15:01:38 GMT Message-Id: <200606261501.k5QF1cmS076479@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 100064 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, 26 Jun 2006 15:01:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=100064 Change 100064 by piso@piso_newluxor on 2006/06/26 15:00:58 Add a filter parameter to nexus_setup_intr() and to inthand_add(). While here, put a comment about sparc64 particular interrupt calling path: intr_fast() when it's an IH_FAST or intr_execute_handlers() for ithread. In this situation filters won't work as expected, cause intr_fast() doesn't check return code and doesn't schedule any ithread: it has to be fixed somehow. Affected files ... .. //depot/projects/soc2006/intr_filter/sparc64/include/intr_machdep.h#2 edit .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#4 edit .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/nexus.c#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/sparc64/include/intr_machdep.h#2 (text+ko) ==== @@ -79,8 +79,8 @@ void *iva); void intr_init1(void); void intr_init2(void); -int inthand_add(const char *name, int vec, void (*handler)(void *), - void *arg, int flags, void **cookiep); +int inthand_add(const char *name, int vec, driver_filter_t *filter, + void (*handler)(void *), void *arg, int flags, void **cookiep); int inthand_remove(int vec, void *cookie); ih_func_t intr_fast; ==== //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#4 (text+ko) ==== @@ -256,8 +256,8 @@ } int -inthand_add(const char *name, int vec, void (*handler)(void *), void *arg, - int flags, void **cookiep) +inthand_add(const char *name, int vec, driver_filter_t *filter, + void (*handler)(void *), void *arg, int flags, void **cookiep) { struct intr_vector *iv; struct intr_event *ie; /* descriptor for the IRQ */ @@ -289,11 +289,16 @@ } } - errcode = intr_event_add_handler(ie, name, handler, arg, + errcode = intr_event_add_handler(ie, name, filter, handler, arg, intr_priority(flags), flags, cookiep); if (errcode) return (errcode); + /* + * XXX Fast handlers are called from an asm routine(intr_fast), + * instead from intr_execute_handlers: with interrupt filters in + * place, they won't work, to be fixed. + */ intr_setup(flags & INTR_FAST ? PIL_FAST : PIL_ITHREAD, intr_fast, vec, intr_execute_handlers, iv); ==== //depot/projects/soc2006/intr_filter/sparc64/sparc64/nexus.c#2 (text+ko) ==== @@ -313,7 +313,7 @@ static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep) + driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) { int error; @@ -329,7 +329,7 @@ return (error); error = inthand_add(device_get_nameunit(child), rman_get_start(res), - intr, arg, flags, cookiep); + filter, intr, arg, flags, cookiep); return (error); } From owner-p4-projects@FreeBSD.ORG Mon Jun 26 15:11:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A803B16A5BB; Mon, 26 Jun 2006 15:11:18 +0000 (UTC) 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 64F8816A4C2 for ; Mon, 26 Jun 2006 15:11:18 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F1BD44EB0 for ; Mon, 26 Jun 2006 14:42:13 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QEgDXj075500 for ; Mon, 26 Jun 2006 14:42:13 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QEgCGi075497 for perforce@freebsd.org; Mon, 26 Jun 2006 14:42:12 GMT (envelope-from piso@freebsd.org) Date: Mon, 26 Jun 2006 14:42:12 GMT Message-Id: <200606261442.k5QEgCGi075497@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 100062 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, 26 Jun 2006 15:11:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=100062 Change 100062 by piso@piso_newluxor on 2006/06/26 14:41:49 Add a filter parameter to fhc_setup_intr(), pscyho_setup_intr() and sbus_setup_intr(). Affected files ... .. //depot/projects/soc2006/intr_filter/sparc64/fhc/fhc.c#2 edit .. //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#4 edit .. //depot/projects/soc2006/intr_filter/sparc64/sbus/sbus.c#4 edit Differences ... ==== //depot/projects/soc2006/intr_filter/sparc64/fhc/fhc.c#2 (text+ko) ==== @@ -206,7 +206,7 @@ int fhc_setup_intr(device_t bus, device_t child, struct resource *r, int flags, - driver_intr_t *func, void *arg, void **cookiep) + driver_filter_t *filter, driver_intr_t *func, void *arg, void **cookiep) { struct fhc_softc *sc; struct fhc_clr *fc; @@ -246,8 +246,8 @@ bus_space_write_4(bt, bh, FHC_IMAP, inr); bus_space_read_4(bt, bh, FHC_IMAP); - error = bus_generic_setup_intr(bus, child, r, flags, fhc_intr_stub, - fc, cookiep); + error = bus_generic_setup_intr(bus, child, r, flags, filter, + fhc_intr_stub, fc, cookiep); if (error != 0) { free(fc, M_DEVBUF); return (error); ==== //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#4 (text+ko) ==== @@ -948,7 +948,8 @@ static int psycho_setup_intr(device_t dev, device_t child, struct resource *ires, - int flags, driver_intr_t *intr, void *arg, void **cookiep) + int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg, + void **cookiep) { struct psycho_softc *sc; struct psycho_clr *pc; @@ -991,7 +992,7 @@ mr = PSYCHO_READ8(sc, intrmapptr); PSYCHO_WRITE8(sc, intrmapptr, mr & ~INTMAP_V); error = BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, - psycho_intr_stub, pc, cookiep); + filter, psycho_intr_stub, pc, cookiep); if (error != 0) { free(pc, M_DEVBUF); return (error); ==== //depot/projects/soc2006/intr_filter/sparc64/sbus/sbus.c#4 (text+ko) ==== @@ -647,7 +647,7 @@ static int sbus_setup_intr(device_t dev, device_t child, struct resource *ires, int flags, - driver_intr_t *intr, void *arg, void **cookiep) + driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) { struct sbus_softc *sc; struct sbus_clr *scl; @@ -700,7 +700,7 @@ /* Disable the interrupt while we fiddle with it */ SYSIO_WRITE8(sc, intrmapptr, intrmap & ~INTMAP_V); error = BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, - sbus_intr_stub, scl, cookiep); + filter, sbus_intr_stub, scl, cookiep); if (error != 0) { free(scl, M_DEVBUF); return (error); From owner-p4-projects@FreeBSD.ORG Mon Jun 26 15:34:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40E2D16A402; Mon, 26 Jun 2006 15:34:20 +0000 (UTC) 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 E14B216A40A for ; Mon, 26 Jun 2006 15:34:19 +0000 (UTC) (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 6E3DF45464 for ; Mon, 26 Jun 2006 15:34:19 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QFYJZp079350 for ; Mon, 26 Jun 2006 15:34:19 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QFYI1x079347 for perforce@freebsd.org; Mon, 26 Jun 2006 15:34:18 GMT (envelope-from scottl@freebsd.org) Date: Mon, 26 Jun 2006 15:34:18 GMT Message-Id: <200606261534.k5QFYI1x079347@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 100065 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, 26 Jun 2006 15:34:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=100065 Change 100065 by scottl@scottl-wv1u on 2006/06/26 15:33:26 Start going to MPSAFE callouts. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.c#6 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#9 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.h#6 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.c#6 (text+ko) ==== @@ -8092,8 +8092,8 @@ ahd_outb(ahd, SCSISEQ1, scsiseq1 & (ENSELI|ENRSELI|ENAUTOATNP)); ahd_unpause(ahd); ahd->flags &= ~AHD_RESET_POLL_ACTIVE; + aic_release_simq(ahd); ahd_unlock(ahd, &s); - aic_release_simq(ahd); ahd_list_unlock(&l); } @@ -9276,12 +9276,15 @@ ahd_timeout(struct scb *scb) { struct ahd_softc *ahd; + u_long s; ahd = scb->ahd_softc; if ((scb->flags & SCB_ACTIVE) != 0) { if ((scb->flags & SCB_TIMEDOUT) == 0) { + ahd_lock(ahd, &s); LIST_INSERT_HEAD(&ahd->timedout_scbs, scb, timedout_links); + ahd_unlock(ahd, &s); scb->flags |= SCB_TIMEDOUT; } ahd_wakeup_recovery_thread(ahd); ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#9 (text+ko) ==== @@ -222,7 +222,7 @@ if ((scb->flags & SCB_TIMEDOUT) != 0) LIST_REMOVE(scb, timedout_links); - untimeout(ahd_platform_timeout, (caddr_t)scb, ccb->ccb_h.timeout_ch); + callout_stop(&ccb->ccb_h.callout); if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { bus_dmasync_op_t op; ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.c#5 (text+ko) ==== @@ -57,8 +57,7 @@ union ccb *ccb; ccb = list_scb->io_ctx; - untimeout(aic_platform_timeout, list_scb, - ccb->ccb_h.timeout_ch); + callout_stop(&ccb->ccb_h.callout); } } } @@ -116,9 +115,6 @@ struct aic_softc *aic; u_long s; -#if __FreeBSD_version >= 500000 - mtx_lock(&Giant); -#endif aic = (struct aic_softc *)arg; aic_lock(aic, &s); for (;;) { @@ -137,9 +133,6 @@ aic->platform_data->recovery_thread = NULL; wakeup(aic->platform_data); aic_unlock(aic, &s); -#if __FreeBSD_version >= 500000 - mtx_unlock(&Giant); -#endif kthread_exit(0); } ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.h#6 (text+ko) ==== @@ -187,7 +187,7 @@ /***************************** Timer Facilities *******************************/ #if __FreeBSD_version >= 500000 -#define aic_timer_init(timer) callout_init(timer, /*mpsafe*/0) +#define aic_timer_init(timer) callout_init(timer, /*mpsafe*/1) #else #define aic_timer_init callout_init #endif @@ -223,10 +223,8 @@ time = msec; time *= hz; time /= 1000; - untimeout(aic_platform_timeout, (caddr_t)scb, - scb->io_ctx->ccb_h.timeout_ch); - scb->io_ctx->ccb_h.timeout_ch = - timeout(aic_platform_timeout, scb, time); + callout_reset(&scb->io_ctx->ccb_h.callout, time, aic_platform_timeout, + scb); } static __inline void @@ -235,13 +233,7 @@ if (AIC_SCB_DATA(scb->aic_softc)->recovery_scbs == 0 && scb->io_ctx->ccb_h.timeout != CAM_TIME_INFINITY) { - uint64_t time; - - time = scb->io_ctx->ccb_h.timeout; - time *= hz; - time /= 1000; - scb->io_ctx->ccb_h.timeout_ch = - timeout(aic_platform_timeout, scb, time); + aic_scb_timer_reset(scb, scb->io_ctx->ccb_h.timeout); } } From owner-p4-projects@FreeBSD.ORG Mon Jun 26 17:10:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36E3F16A515; Mon, 26 Jun 2006 17:10:20 +0000 (UTC) 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 1211E16A509 for ; Mon, 26 Jun 2006 17:10:19 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB328457B1 for ; Mon, 26 Jun 2006 15:58:50 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QFwoJU083934 for ; Mon, 26 Jun 2006 15:58:50 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QFwoEp083925 for perforce@freebsd.org; Mon, 26 Jun 2006 15:58:50 GMT (envelope-from clem1@FreeBSD.org) Date: Mon, 26 Jun 2006 15:58:50 GMT Message-Id: <200606261558.k5QFwoEp083925@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 100067 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, 26 Jun 2006 17:10:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=100067 Change 100067 by clem1@clem1_ipv6vulns on 2006/06/26 15:58:03 Almost full icmp6 support to libnet. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-functions.h#4 edit .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-headers.h#3 edit .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-structures.h#3 edit .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_icmpv6.c#2 edit .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_pblock.c#3 edit Differences ... ==== //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-functions.h#4 (text+ko) ==== @@ -877,6 +877,110 @@ /** * Builds an IP version 6 RFC 2463 Internet Control Message Protocol (ICMP) + * node information header + * @param type type of ICMP packet (should be ICMP6_NIQUERY or ICMP6_NIREPLY) + * @param code code of ICMP packet (should be ICMP6_NIQUERY_IPV6, ICMP6_NIQUERY_IPV4, ICMP6_NIQUERY_FQDN, ICMP6_NIREPLY_SUCCESS, ICMP6_NIREPLY_REFUSED or ICMP6_NIREPLY_UNKNOWN) + * @param sum checksum (0 for libnet to autofill) + * @param qtype + * @param flags + * @param nonce + * @param payload optional payload or NULL + * @param payload_s payload length or 0 + * @param l pointer to a libnet context + * @param ptag protocol tag to modify an existing header, 0 to build a new one + * @return protocol tag value on success, -1 on error + */ +libnet_ptag_t +libnet_build_icmpv6_ni(u_int8_t type, u_int8_t code, u_int16_t sum, +u_int16_t qtype, u_int16_t flags, u_int8_t * nonce, u_int8_t *payload, +u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag); + +/** + * Builds an IP version 6 RFC 2463 Internet Control Message Protocol (ICMP) + * router advertissement header + * @param type type of ICMP packet (should be ICMP6_ROUTERADV) + * @param code code of ICMP packet (should be 0) + * @param sum checksum (0 for libnet to autofill) + * @param chl (current hop limit) + * @param m (manager address) + * @param o (other stateful config flag) + * @param rlf (router lifetime) + * @param rct (recheable time) + * @param rtt (retrans time) + * @param payload optional payload or NULL + * @param payload_s payload length or 0 + * @param l pointer to a libnet context + * @param ptag protocol tag to modify an existing header, 0 to build a new one + * @return protocol tag value on success, -1 on error + */ +libnet_ptag_t +libnet_build_icmpv6_ra(u_int8_t type, u_int8_t code, u_int16_t sum, +u_int8_t chl, u_int8_t m, u_int8_t o, u_int16_t rlf, u_int32_t rct, +u_int16_t rtt, u_int8_t *payload, u_int32_t payload_s, libnet_t *l, +libnet_ptag_t ptag); + +/** + * Builds an IP version 6 RFC 2463 Internet Control Message Protocol (ICMP) + * router solicitation header + * @param type type of ICMP packet (should be ICMP6_ROUTERSO) + * @param code code of ICMP packet (should be 0) + * @param sum checksum (0 for libnet to autofill) + * @param unused + * @param payload optional payload or NULL + * @param payload_s payload length or 0 + * @param l pointer to a libnet context + * @param ptag protocol tag to modify an existing header, 0 to build a new one + * @return protocol tag value on success, -1 on error + */ +libnet_ptag_t +libnet_build_icmpv6_rs(u_int8_t type, u_int8_t code, u_int16_t sum, +u_int32_t unused, u_int8_t *payload, u_int32_t payload_s, libnet_t *l, +libnet_ptag_t ptag); + +/** + * Builds an IP version 6 RFC 2463 Internet Control Message Protocol (ICMP) + * neighbor solicitation header + * @param type type of ICMP packet (should be ICMP6_NEIGHBORSO) + * @param code code of ICMP packet (should be 0) + * @param sum checksum (0 for libnet to autofill) + * @param reserved + * @param target + * @param payload optional payload or NULL + * @param payload_s payload length or 0 + * @param l pointer to a libnet context + * @param ptag protocol tag to modify an existing header, 0 to build a new one + * @return protocol tag value on success, -1 on error + */ +libnet_ptag_t +libnet_build_icmpv6_ns(u_int8_t type, u_int8_t code, u_int16_t sum, +u_int32_t reserved, struct libnet_in6_addr target, u_int8_t *payload, +u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag); + +/** + * Builds an IP version 6 RFC 2463 Internet Control Message Protocol (ICMP) + * neighbor advertissement header + * @param type type of ICMP packet (should be ICMP6_NEIGHBORADV) + * @param code code of ICMP packet (should be 0) + * @param sum checksum (0 for libnet to autofill) + * @param router flag + * @param solicited flag + * @param override flag + * @param target address + * @param payload optional payload or NULL + * @param payload_s payload length or 0 + * @param l pointer to a libnet context + * @param ptag protocol tag to modify an existing header, 0 to build a new one + * @return protocol tag value on success, -1 on error + */ +libnet_ptag_t +libnet_build_icmpv6_na(u_int8_t type, u_int8_t code, u_int16_t sum, +u_int8_t router, u_int8_t solicited, u_int8_t override, +struct libnet_in6_addr target, u_int8_t *payload, +u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag); + + +/** + * Builds an IP version 6 RFC 2463 Internet Control Message Protocol (ICMP) * redirect message header * @param type type of ICMP packet (should be ICMP6_REDIRECT) * @param code code of ICMP packet (should be 0) ==== //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-headers.h#3 (text+ko) ==== @@ -69,7 +69,12 @@ #define LIBNET_ICMPV6_PARAMPB_H 0x08 /**< ICMPV6_PARAMPB header: 8 bytes */ #define LIBNET_ICMPV6_UNREACH_H 0x08 /**< ICMPV6_UNREACH header: 8 bytes */ #define LIBNET_ICMPV6_TOOBIG_H 0x08 /**< ICMPV6_TOOBIG header: 8 bytes */ +#define LIBNET_ICMPV6_RS_H 0x08 /**< ICMPV6_RS header: 8 bytes */ #define LIBNET_ICMPV6_REDIRECT_H 0x28 /**< ICMPV6_REDIRECT header: 40 bytes */ +#define LIBNET_ICMPV6_NI_H 0x10 /**< ICMPV6_NI header: 16 bytes */ +#define LIBNET_ICMPV6_RA_H 0x10 /**< ICMPV6_RA header: 16 bytes */ +#define LIBNET_ICMPV6_NS_H 0x18 /**< ICMPV6_NS header: 24 bytes */ +#define LIBNET_ICMPV6_NA_H 0x18 /**< ICMPV6_NA header: 24 bytes */ #define LIBNET_IGMP_H 0x08 /**< IGMP header: 8 bytes */ #define LIBNET_IPV4_H 0x14 /**< IPv4 header: 20 bytes */ #define LIBNET_IPV6_H 0x28 /**< IPv6 header: 40 bytes */ @@ -859,11 +864,11 @@ #ifndef ICMP6_ROUTERADV #define ICMP6_ROUTERADV 134 #endif -#ifndef ICMP6_WRUQUERY -#define ICMP6_WRUQUERY 139 +#ifndef ICMP6_NIQUERY +#define ICMP6_NIQUERY 139 #endif -#ifndef ICMP6_WRUREPLY -#define ICMP6_WRUREPLY 140 +#ifndef ICMP6_NIREPLY +#define ICMP6_NIREPLY 140 #endif #ifndef ICMP6_REDIRECT #define ICMP6_REDIRECT 137 @@ -899,23 +904,23 @@ #ifndef ICMP6_PARAMPROB_OPTION #define ICMP6_PARAMPROB_OPTION 2 #endif -#ifndef ICMP6_WRUQUERY_IPV6 -#define ICMP6_WRUQUERY_IPV6 0 +#ifndef ICMP6_NIQUERY_IPV6 +#define ICMP6_NIQUERY_IPV6 0 #endif -#ifndef ICMP6_WRUQUERY_FQDN -#define ICMP6_WRUQUERY_FQDN 1 +#ifndef ICMP6_NIQUERY_FQDN +#define ICMP6_NIQUERY_FQDN 1 #endif -#ifndef ICMP6_WRUQUERY_IPV4 -#define ICMP6_WRUQUERY_IPV4 2 +#ifndef ICMP6_NIQUERY_IPV4 +#define ICMP6_NIQUERY_IPV4 2 #endif -#ifndef ICMP6_WRUREPLY_SUCCESS -#define ICMP6_WRUREPLY_SUCCESS 0 +#ifndef ICMP6_NIREPLY_SUCCESS +#define ICMP6_NIREPLY_SUCCESS 0 #endif -#ifndef ICMP6_WRUREPLY_REFUSED -#define ICMP6_WRUREPLY_REFUSED 1 +#ifndef ICMP6_NIREPLY_REFUSED +#define ICMP6_NIREPLY_REFUSED 1 #endif -#ifndef ICMP6_WRUREPLY_UNKNOWN -#define ICMP6_WRUREPLY_UNKNOWN 2 +#ifndef ICMP6_NIREPLY_UNKNOWN +#define ICMP6_NIREPLY_UNKNOWN 2 #endif #ifndef ICMP6_REDIRECT_ONLINK #define ICMP6_REDIRECT_ONLINK 0 @@ -933,25 +938,81 @@ #undef icmp_seq #define icmp_id hun.echo.id #define icmp_seq hun.echo.seq + struct { + u_int16_t qtype; + u_int16_t flags; + }ni; +#undef icmp_qtype +#undef icmp_flags +#define icmp_qtype hun.ni.qtype +#define icmp_flags hun.ni.flags + struct { + u_int8_t chl; /* current_hop_limit */ + u_int8_t mo; /* m and o bits and 6 bytes reserved */ + u_int16_t rlf; /* router lifetime */ + } ra; +#undef icmp_chl +#undef icmp_mo +#undef icmp_rlf +#define icmp_chl hun.ra.chl +#define icmp_mo hun.ra.mo +#define icmp_rlf hun.ra.rlf + u_int32_t rso; /* router, solicited, override bits in ND_ADVERT */ +#undef icmp_rso +#define icmp_rso hun.rso + struct { + u_int16_t maxdelay; /* ICMP maxdelay used by MLD */ + u_int16_t reserved2; /* ICMP reserved 2 bytes */ + } mld; +#undef icmp_maxdelay +#undef icmp_reserved2 +#define icmp_maxdelay hun.mld.maxdelay +#define icmp_reserved hun.mld.reserved2 u_int32_t pointer; /* ICMP pointer */ #undef icmp_pointer #define icmp_pointer hun.pointer u_int32_t unused; /* ICMP unused bytes in TIMEEXCEED, DEST UNREACH and REDIRECT */ #undef icmp_unused #define icmp_unused hun.unused + u_int32_t reserved4; /* ICMP reserved 4 bytes in ND_NEIGHBOR_ADVERT and SOLIC */ +#undef icmp_reserved4 +#define icmp_reserved4 hun.reserved4 u_int32_t mtu; /* ICMP mtu (TOOBIG) */ #undef icmp_mtu #define icmp_mtu hun.mtu }hun; union{ + int8_t nonce[8]; /* nonce used by node information msg */ + int8_t target1[8]; /* first part of target address in REDIRECT msg */ +#undef icmp_nonce +#define icmp_nonce dun.nonce +#undef icmp_target1 +#define icmp_target1 dun.target1 + int8_t mcast1[8]; /* fist part of the multicast address used by MLD msg */ +#undef icmp_mcast1 +#define icmp_mcast1 dun.mcast1 struct { - struct libnet_in6_addr target, dst; - } redir; -#undef icmp_target -#define icmp_target dun.redir.target + u_int32_t rct; /* reachaable time (ROUTER ADVERT) */ + u_int32_t rtt; /* retransmission time (ROUTER ADVERT) */ + }ra; +#undef icmp_rct +#undef icmp_rtt +#define icmp_rct dun.ra.rct +#define icmp_rtt dun.ra.rtt + }dun; + union{ + int8_t target2[8]; /* second part of target address in REDIRECT msg */ +#undef icmp_target2 +#define icmp_target2 tun.target2 + int8_t mcast2[8]; /* second part of multicast address used by MLD msg */ +#undef icmp_mcast2 +#define icmp_mcast2 tun.mcast2 + }tun; + union{ + struct libnet_in6_addr dst; /* dst address used by REDIRECT msg */ #undef icmp_dst -#define icmp_dst dun.redir.dst - }dun; +#define icmp_dst qun.dst + }qun; }; ==== //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-structures.h#3 (text+ko) ==== @@ -157,7 +157,7 @@ #define LIBNET_PBLOCK_ICMPV6_NEIGHBORADV_H 0x48 /* ICMP6 neighbor advertisement header */ #define LIBNET_PBLOCK_ICMPV6_REDIRECT_H 0x49 /* ICMP6 redirect message header */ #define LIBNET_PBLOCK_ICMPV6_MULTICAST_H 0x4a /* ICMP6 multicast group management header */ -#define LIBNET_PBLOCK_ICMPV6_WRU_H 0x4b /* ICMP6 Who Are You name lookup header */ +#define LIBNET_PBLOCK_ICMPV6_NI_H 0x4b /* ICMP6 node information header */ #define LIBNET_PBLOCK_ICMPV6_UNREACH_H 0x4c /* ICMP6 destination unreach packet */ u_int8_t flags; /* control flags */ #define LIBNET_PBLOCK_DO_CHECKSUM 0x01 /* needs a checksum */ ==== //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_icmpv6.c#2 (text+ko) ==== @@ -401,7 +401,7 @@ u_int32_t unused, struct libnet_in6_addr target, struct libnet_in6_addr dst, u_int8_t *payload, u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag) { - u_int32_t n, h; + u_int32_t n, h, i; libnet_pblock_t *p; struct libnet_icmpv6_hdr icmp_hdr; @@ -428,7 +428,14 @@ icmp_hdr.icmp_code = code; /* packet code */ icmp_hdr.icmp_sum = (sum ? htons(sum) : 0); /* checksum */ icmp_hdr.icmp_unused = htonl(unused); /* pointer */ - icmp_hdr.icmp_target = target; /* target */ + for (i = 0; i < 8; i++) + { + icmp_hdr.icmp_target1[i] = target.libnet_s6_addr[i]; /* target1 */ + } + for (n = 0; n < 8; n++) + { + icmp_hdr.icmp_target2[n] = target.libnet_s6_addr[i++]; /* target2 */ + } icmp_hdr.icmp_dst = dst; /* dst */ n = libnet_pblock_append(l, p, (u_int8_t *)&icmp_hdr, LIBNET_ICMPV6_REDIRECT_H); @@ -470,3 +477,386 @@ return (-1); } + +libnet_ptag_t +libnet_build_icmpv6_ni(u_int8_t type, u_int8_t code, u_int16_t sum, +u_int16_t qtype, u_int16_t flags, u_int8_t *nonce, u_int8_t *payload, +u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag) +{ + u_int32_t n, h, i; + libnet_pblock_t *p; + struct libnet_icmpv6_hdr icmp_hdr; + + if(l == NULL) + { + return (-1); + } + + n = LIBNET_ICMPV6_NI_H + payload_s; /* size of memory block */ + h = LIBNET_ICMPV6_NI_H + payload_s; /* hl for checksum */ + + /* + * Find the existing protocol block if a ptag is specified, or create + * a new one. + */ + p = libnet_pblock_probe(l, ptag, n, LIBNET_PBLOCK_ICMPV6_NI_H); + if(p == NULL) + { + return (-1); + } + + memset(&icmp_hdr, 0, sizeof(icmp_hdr)); + icmp_hdr.icmp_type = type; /* packet type */ + icmp_hdr.icmp_code = code; /* packet code */ + icmp_hdr.icmp_sum = (sum ? htons(sum) : 0); /* checksum */ + icmp_hdr.icmp_qtype = htonl(qtype); /* qtype */ + icmp_hdr.icmp_flags = htonl(flags); /* flags */ + for (i = 0; i < 8; i++) + { + icmp_hdr.icmp_nonce[i] = nonce[i]; /* nonce */ + } + + n = libnet_pblock_append(l, p, (u_int8_t *)&icmp_hdr, LIBNET_ICMPV6_NI_H); + if (n == -1) + { + goto bad; + } + + if ((payload && !payload_s) || (!payload && payload_s)) + { + snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, + "%s(): payload inconsistency\n", __func__); + goto bad; + } + + if (payload && payload_s) + { + n = libnet_pblock_append(l, p, payload, payload_s); + if (n == -1) + { + goto bad; + } + } + + if (sum == 0) + { + /* + * If checksum is zero, by default libnet will compute a checksum + * for the user. The programmer can override this by calling + * libnet_toggle_checksum(l, ptag, 1); + */ + libnet_pblock_setflags(p, LIBNET_PBLOCK_DO_CHECKSUM); + } + return (ptag ? ptag : libnet_pblock_update(l, p, h, + LIBNET_PBLOCK_ICMPV6_NI_H)); +bad: + libnet_pblock_delete(l, p); + return (-1); +} + +libnet_ptag_t +libnet_build_icmpv6_ra(u_int8_t type, u_int8_t code, u_int16_t sum, +u_int8_t chl, u_int8_t m, u_int8_t o, u_int16_t rlf, u_int32_t rct, +u_int16_t rtt, u_int8_t *payload, +u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag) +{ + u_int32_t n, h; + libnet_pblock_t *p; + struct libnet_icmpv6_hdr icmp_hdr; + + if(l == NULL) + { + return (-1); + } + + n = LIBNET_ICMPV6_RA_H + payload_s; /* size of memory block */ + h = LIBNET_ICMPV6_RA_H + payload_s; /* hl for checksum */ + /* + * Find the existing protocol block if a ptag is specified, or create + * a new one. + */ + p = libnet_pblock_probe(l, ptag, n, LIBNET_PBLOCK_ICMPV6_ROUTERADV_H); + if(p == NULL) + { + return (-1); + } + + memset(&icmp_hdr, 0, sizeof(icmp_hdr)); + icmp_hdr.icmp_type = type; /* packet type */ + icmp_hdr.icmp_code = code; /* packet code */ + icmp_hdr.icmp_sum = (sum ? htons(sum) : 0); /* checksum */ + icmp_hdr.icmp_chl = htons(chl); /* current hop limit */ + icmp_hdr.icmp_mo = (m << 7) + (o << 6); /* managed & other bits */ + icmp_hdr.icmp_rlf = htons(rlf); /* router lifetime */ + icmp_hdr.icmp_rct = htonl(rct); /* recheable time */ + icmp_hdr.icmp_rtt = htonl(rtt); /* retrans time */ + + n = libnet_pblock_append(l, p, (u_int8_t *)&icmp_hdr, LIBNET_ICMPV6_RA_H); + if (n == -1) + { + goto bad; + } + + if ((payload && !payload_s) || (!payload && payload_s)) + { + snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, + "%s(): payload inconsistency\n", __func__); + goto bad; + } + + if (payload && payload_s) + { + n = libnet_pblock_append(l, p, payload, payload_s); + if (n == -1) + { + goto bad; + } + } + + if (sum == 0) + { + /* + * If checksum is zero, by default libnet will compute a checksum + * for the user. The programmer can override this by calling + * libnet_toggle_checksum(l, ptag, 1); + */ + libnet_pblock_setflags(p, LIBNET_PBLOCK_DO_CHECKSUM); + } + return (ptag ? ptag : libnet_pblock_update(l, p, h, + LIBNET_PBLOCK_ICMPV6_ROUTERADV_H)); +bad: + libnet_pblock_delete(l, p); + return (-1); +} + + +libnet_ptag_t +libnet_build_icmpv6_rs(u_int8_t type, u_int8_t code, u_int16_t sum, +u_int32_t unused, u_int8_t *payload, u_int32_t payload_s, libnet_t *l, +libnet_ptag_t ptag) +{ + u_int32_t n, h; + libnet_pblock_t *p; + struct libnet_icmpv6_hdr icmp_hdr; + + if(l == NULL) + { + return (-1); + } + + n = LIBNET_ICMPV6_RS_H + payload_s; /* size of memory block */ + h = LIBNET_ICMPV6_RS_H + payload_s; /* hl for checksum */ + + /* + * Find the existing protocol block if a ptag is specified, or create + * a new one. + */ + p = libnet_pblock_probe(l, ptag, n, LIBNET_PBLOCK_ICMPV6_ROUTERSO_H); + if(p == NULL) + { + return (-1); + } + + memset(&icmp_hdr, 0, sizeof(icmp_hdr)); + icmp_hdr.icmp_type = type; /* packet type */ + icmp_hdr.icmp_code = code; /* packet code */ + icmp_hdr.icmp_sum = (sum ? htons(sum) : 0); /* checksum */ + icmp_hdr.icmp_unused = htonl(unused); /* unused field */ + + n = libnet_pblock_append(l, p, (u_int8_t *)&icmp_hdr, LIBNET_ICMPV6_RS_H); + if (n == -1) + { + goto bad; + } + + if ((payload && !payload_s) || (!payload && payload_s)) + { + snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, + "%s(): payload inconsistency\n", __func__); + goto bad; + } + + if (payload && payload_s) + { + n = libnet_pblock_append(l, p, payload, payload_s); + if (n == -1) + { + goto bad; + } + } + + if (sum == 0) + { + /* + * If checksum is zero, by default libnet will compute a checksum + * for the user. The programmer can override this by calling + * libnet_toggle_checksum(l, ptag, 1); + */ + libnet_pblock_setflags(p, LIBNET_PBLOCK_DO_CHECKSUM); + } + return (ptag ? ptag : libnet_pblock_update(l, p, h, + LIBNET_PBLOCK_ICMPV6_ROUTERSO_H)); +bad: + libnet_pblock_delete(l, p); + return (-1); +} + +libnet_ptag_t +libnet_build_icmpv6_ns(u_int8_t type, u_int8_t code, u_int16_t sum, +u_int32_t reserved, struct libnet_in6_addr target, u_int8_t *payload, +u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag) +{ + u_int32_t n, h, i; + libnet_pblock_t *p; + struct libnet_icmpv6_hdr icmp_hdr; + + if(l == NULL) + { + return (-1); + } + + n = LIBNET_ICMPV6_NS_H + payload_s; /* size of memory block */ + h = LIBNET_ICMPV6_NS_H + payload_s; /* hl for checksum */ + + /* + * Find the existing protocol block if a ptag is specified, or create + * a new one. + */ + p = libnet_pblock_probe(l, ptag, n, LIBNET_PBLOCK_ICMPV6_NEIGHBORSO_H); + if(p == NULL) + { + return (-1); + } + + memset(&icmp_hdr, 0, sizeof(icmp_hdr)); + icmp_hdr.icmp_type = type; /* packet type */ + icmp_hdr.icmp_code = code; /* packet code */ + icmp_hdr.icmp_sum = (sum ? htons(sum) : 0); /* checksum */ + icmp_hdr.icmp_reserved4 = htonl(reserved); /* unused field */ + for (i = 0; i < 8; i++) + { + icmp_hdr.icmp_target1[i] = target.libnet_s6_addr[i]; /* target1 */ + } + for (n = 0; n < 8; n++) + { + icmp_hdr.icmp_target2[n] = target.libnet_s6_addr[i++]; /* target2 */ + } + + n = libnet_pblock_append(l, p, (u_int8_t *)&icmp_hdr, LIBNET_ICMPV6_NS_H); + if (n == -1) + { + goto bad; + } + + if ((payload && !payload_s) || (!payload && payload_s)) + { + snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, + "%s(): payload inconsistency\n", __func__); + goto bad; + } + + if (payload && payload_s) + { + n = libnet_pblock_append(l, p, payload, payload_s); + if (n == -1) + { + goto bad; + } + } + + if (sum == 0) + { + /* + * If checksum is zero, by default libnet will compute a checksum + * for the user. The programmer can override this by calling + * libnet_toggle_checksum(l, ptag, 1); + */ + libnet_pblock_setflags(p, LIBNET_PBLOCK_DO_CHECKSUM); + } + return (ptag ? ptag : libnet_pblock_update(l, p, h, + LIBNET_PBLOCK_ICMPV6_NEIGHBORSO_H)); +bad: + libnet_pblock_delete(l, p); + return (-1); +} + +libnet_ptag_t +libnet_build_icmpv6_na(u_int8_t type, u_int8_t code, u_int16_t sum, +u_int8_t router, u_int8_t solicited, u_int8_t override, +struct libnet_in6_addr target, u_int8_t *payload, +u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag) +{ + u_int32_t n, h, i; + libnet_pblock_t *p; + struct libnet_icmpv6_hdr icmp_hdr; + + if(l == NULL) + { + return (-1); + } + + n = LIBNET_ICMPV6_NA_H + payload_s; /* size of memory block */ + h = LIBNET_ICMPV6_NA_H + payload_s; /* hl for checksum */ + + /* + * Find the existing protocol block if a ptag is specified, or create + * a new one. + */ + p = libnet_pblock_probe(l, ptag, n, LIBNET_PBLOCK_ICMPV6_NEIGHBORADV_H); + if(p == NULL) + { + return (-1); + } + + memset(&icmp_hdr, 0, sizeof(icmp_hdr)); + icmp_hdr.icmp_type = type; /* packet type */ + icmp_hdr.icmp_code = code; /* packet code */ + icmp_hdr.icmp_sum = (sum ? htons(sum) : 0); /* checksum */ + icmp_hdr.icmp_rso = htonl((router << 31) + (solicited << 30) + (override << 29)); /* router, solicited and override bits */ + for (i = 0; i < 8; i++) + { + icmp_hdr.icmp_target1[i] = target.libnet_s6_addr[i]; /* target1 */ + } + for (n = 0; n < 8; n++) + { + icmp_hdr.icmp_target2[n] = target.libnet_s6_addr[i++]; /* target2 */ + } + + n = libnet_pblock_append(l, p, (u_int8_t *)&icmp_hdr, LIBNET_ICMPV6_NA_H); + if (n == -1) + { + goto bad; + } + + if ((payload && !payload_s) || (!payload && payload_s)) + { + snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, + "%s(): payload inconsistency\n", __func__); + goto bad; + } + + if (payload && payload_s) + { + n = libnet_pblock_append(l, p, payload, payload_s); + if (n == -1) + { + goto bad; + } + } + + if (sum == 0) + { + /* + * If checksum is zero, by default libnet will compute a checksum + * for the user. The programmer can override this by calling + * libnet_toggle_checksum(l, ptag, 1); + */ + libnet_pblock_setflags(p, LIBNET_PBLOCK_DO_CHECKSUM); + } + return (ptag ? ptag : libnet_pblock_update(l, p, h, + LIBNET_PBLOCK_ICMPV6_NEIGHBORADV_H)); +bad: + libnet_pblock_delete(l, p); + return (-1); +} + ==== //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_pblock.c#3 (text+ko) ==== @@ -508,7 +508,7 @@ case LIBNET_PBLOCK_ICMPV6_TIMXCEED_H: case LIBNET_PBLOCK_ICMPV6_TOOBIG_H: case LIBNET_PBLOCK_ICMPV6_UNREACH_H: - case LIBNET_PBLOCK_ICMPV6_WRU_H: + case LIBNET_PBLOCK_ICMPV6_NI_H: case LIBNET_PBLOCK_ICMPV6_MULTICAST_H: case LIBNET_PBLOCK_ICMPV6_REDIRECT_H: case LIBNET_PBLOCK_ICMPV6_NEIGHBORADV_H: From owner-p4-projects@FreeBSD.ORG Mon Jun 26 18:21:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72F0C16A4CE; Mon, 26 Jun 2006 18:21:35 +0000 (UTC) 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 34C3616A4CB for ; Mon, 26 Jun 2006 18:21:35 +0000 (UTC) (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 7C07444B30 for ; Mon, 26 Jun 2006 18:20:56 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QIKuhA004654 for ; Mon, 26 Jun 2006 18:20:56 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QIKuJ5004651 for perforce@freebsd.org; Mon, 26 Jun 2006 18:20:56 GMT (envelope-from jhb@freebsd.org) Date: Mon, 26 Jun 2006 18:20:56 GMT Message-Id: <200606261820.k5QIKuJ5004651@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 100078 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, 26 Jun 2006 18:21:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=100078 Change 100078 by jhb@jhb_mutex on 2006/06/26 18:20:06 Just call obreak(). Discussed with: alc Affected files ... .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#46 edit Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#46 (text+ko) ==== @@ -792,69 +792,10 @@ struct thread *td; struct svr4_sys_break_args *uap; { - struct proc *p = td->td_proc; - struct vmspace *vm = p->p_vmspace; - vm_offset_t new, old, base, ns; - rlim_t datalim, vmemlim; - int error, rv; + struct obreak_args ap; - PROC_LOCK(p); - datalim = lim_cur(p, RLIMIT_DATA); - vmemlim = lim_cur(p, RLIMIT_VMEM); - PROC_UNLOCK(p); - - base = round_page((vm_offset_t) vm->vm_daddr); - ns = (vm_offset_t)uap->nsize; - new = round_page(ns); - error = 0; - vm_map_lock(&vm->vm_map); - if (new > base) { - if ((new - base) > (unsigned)datalim) { - error = ENOMEM; - goto done; - } - if (new > vm_map_max(&vm->vm_map)) { - error = ENOMEM; - goto done; - } - } else if (new < base) { - /* - * This is simply an invalid value. If someone wants to - * do fancy address space manipulations, mmap and munmap - * can do most of what the user would want. - */ - error = EINVAL; - goto done; - } - - old = base + ctob(vm->vm_dsize); - - if (new > old) { - vm_size_t diff; - diff = new - old; - if (vm->vm_map.size + diff > vmemlim) { - error = ENOMEM; - goto done; - } - rv = vm_map_find(&vm->vm_map, NULL, 0, &old, diff, FALSE, - VM_PROT_ALL, VM_PROT_ALL, 0); - if (rv != KERN_SUCCESS) { - error = ENOMEM; - goto done; - } - vm->vm_dsize += btoc(diff); - } else if (new < old) { - rv = vm_map_remove(&vm->vm_map, new, old); - if (rv != KERN_SUCCESS) { - error = ENOMEM; - goto done; - } - vm->vm_dsize -= btoc(old - new); - } -done: - vm_map_unlock(&vm->vm_map); - - return (error); + ap.nsize = uap->nsize; + return (obreak(td, &ap)); } static __inline clock_t From owner-p4-projects@FreeBSD.ORG Mon Jun 26 18:29:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FA8916A409; Mon, 26 Jun 2006 18:29:08 +0000 (UTC) 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 6E01416A400 for ; Mon, 26 Jun 2006 18:29:08 +0000 (UTC) (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 BB51F4570F for ; Mon, 26 Jun 2006 18:04:02 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QI3XLN003634 for ; Mon, 26 Jun 2006 18:03:33 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QI3XeQ003631 for perforce@freebsd.org; Mon, 26 Jun 2006 18:03:33 GMT (envelope-from jhb@freebsd.org) Date: Mon, 26 Jun 2006 18:03:33 GMT Message-Id: <200606261803.k5QI3XeQ003631@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 100075 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, 26 Jun 2006 18:29:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=100075 Change 100075 by jhb@jhb_mutex on 2006/06/26 18:03:03 Use kern_shmctl() and mark svr4_sys_shmsys() MPSAFE. Affected files ... .. //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#13 edit .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#12 edit Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#13 (text+ko) ==== @@ -650,76 +650,61 @@ void *v; { struct svr4_sys_shmctl_args *uap = v; - int error; - caddr_t sg = stackgap_init(); - struct shmctl_args ap; struct shmid_ds bs; struct svr4_shmid_ds ss; + size_t bufsize; + int cmd, error; - ap.shmid = uap->shmid; - if (uap->buf != NULL) { - ap.buf = stackgap_alloc(&sg, sizeof (struct shmid_ds)); switch (uap->cmd) { case SVR4_IPC_SET: case SVR4_IPC_RMID: case SVR4_SHM_LOCK: case SVR4_SHM_UNLOCK: - error = copyin(uap->buf, (caddr_t) &ss, - sizeof ss); + error = copyin(uap->buf, &ss, sizeof(ss)); if (error) - return error; + return (error); svr4_to_bsd_shmid_ds(&ss, &bs); - error = copyout(&bs, ap.buf, sizeof bs); - if (error) - return error; break; default: - break; + return (EINVAL); } } - else - ap.buf = NULL; - switch (uap->cmd) { case SVR4_IPC_STAT: - ap.cmd = IPC_STAT; - if ((error = shmctl(td, &ap)) != 0) - return error; - if (uap->buf == NULL) - return 0; - error = copyin(&bs, ap.buf, sizeof bs); - if (error) - return error; - bsd_to_svr4_shmid_ds(&bs, &ss); - return copyout(&ss, uap->buf, sizeof ss); - + cmd = IPC_STAT; + break; case SVR4_IPC_SET: - ap.cmd = IPC_SET; - return shmctl(td, &ap); - + cmd = IPC_SET; + break; case SVR4_IPC_RMID: + cmd = IPC_RMID; + break; case SVR4_SHM_LOCK: + cmd = SHM_LOCK; + break; case SVR4_SHM_UNLOCK: - switch (uap->cmd) { - case SVR4_IPC_RMID: - ap.cmd = IPC_RMID; - break; - case SVR4_SHM_LOCK: - ap.cmd = SHM_LOCK; - break; - case SVR4_SHM_UNLOCK: - ap.cmd = SHM_UNLOCK; - break; - default: - return EINVAL; + cmd = SHM_UNLOCK; + break; + default: + return (EINVAL); + } + + error = kern_shmctl(td, uap->shmid, cmd, &bs, &bufsize); + if (error) + return (error); + + switch (uap->cmd) { + case SVR4_IPC_STAT: + if (uap->buf != NULL) { + bsd_to_svr4_shmid_ds(&bs, &ss); + error = copyout(&ss, uap->buf, sizeof(ss)); } - return shmctl(td, &ap); + break; + } - default: - return EINVAL; - } + return (error); } int ==== //depot/projects/smpng/sys/compat/svr4/syscalls.master#12 (text+ko) ==== @@ -100,7 +100,7 @@ int a3, int a4, int a5); } 50 AUE_NULL MSTD { int svr4_sys_sysarch(int op, void *a1); } 51 AUE_NULL UNIMPL acct -52 AUE_NULL STD { int svr4_sys_shmsys(int what, int a2, \ +52 AUE_NULL MSTD { int svr4_sys_shmsys(int what, int a2, \ int a3, int a4, int a5); } 53 AUE_NULL STD { int svr4_sys_semsys(int what, int a2, \ int a3, int a4, int a5); } From owner-p4-projects@FreeBSD.ORG Mon Jun 26 18:37:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6742616A5C0; Mon, 26 Jun 2006 18:37:16 +0000 (UTC) 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 4360516A5BC; Mon, 26 Jun 2006 18:37:16 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C49444840; Mon, 26 Jun 2006 13:56:37 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from zion.baldwin.cx (zion.baldwin.cx [192.168.0.7]) (authenticated bits=0) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k5QDuZ0k083303; Mon, 26 Jun 2006 09:56:37 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: John Birrell Date: Mon, 26 Jun 2006 09:55:25 -0400 User-Agent: KMail/1.9.1 References: <200606260537.k5Q5bOgw020000@repoman.freebsd.org> In-Reply-To: <200606260537.k5Q5bOgw020000@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200606260955.25591.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [192.168.0.1]); Mon, 26 Jun 2006 09:56:37 -0400 (EDT) X-Virus-Scanned: ClamAV 0.87.1/1563/Mon Jun 26 05:00:08 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 100025 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, 26 Jun 2006 18:37:16 -0000 On Monday 26 June 2006 01:37, John Birrell wrote: > http://perforce.freebsd.org/chv.cgi?CH=100025 > > Change 100025 by jb@jb_freebsd2 on 2006/06/26 05:37:23 > > The use of FreeBSD's semaphores here creates scheduler instability. > This device needs a clean path from the timer interrupt. > > For the time being, since I'm only working on single processor > systems, comment out the semaphore calls. When I get access to a > multi-cpu machine, I'll need to implement a simple semaphore system > for use here. The only thing you can use from the timer interrupt is a spin mutex as far as synchronization primitives. Note that you can provide sleep/wakeup via msleep_spin() and wakeup() + wakeup_one(). -- John Baldwin From owner-p4-projects@FreeBSD.ORG Mon Jun 26 18:52:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C5E016A5CC; Mon, 26 Jun 2006 18:52:12 +0000 (UTC) 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 0AFD316A720 for ; Mon, 26 Jun 2006 18:52:11 +0000 (UTC) (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 02A8245842 for ; Mon, 26 Jun 2006 18:05:04 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QI4ZEv003695 for ; Mon, 26 Jun 2006 18:04:35 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QI4Yxm003692 for perforce@freebsd.org; Mon, 26 Jun 2006 18:04:34 GMT (envelope-from jhb@freebsd.org) Date: Mon, 26 Jun 2006 18:04:34 GMT Message-Id: <200606261804.k5QI4Yxm003692@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 100076 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, 26 Jun 2006 18:52:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=100076 Change 100076 by jhb@jhb_mutex on 2006/06/26 18:04:13 svr4_sys_semsys() is MPSAFE. Affected files ... .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#13 edit Differences ... ==== //depot/projects/smpng/sys/compat/svr4/syscalls.master#13 (text+ko) ==== @@ -102,7 +102,7 @@ 51 AUE_NULL UNIMPL acct 52 AUE_NULL MSTD { int svr4_sys_shmsys(int what, int a2, \ int a3, int a4, int a5); } -53 AUE_NULL STD { int svr4_sys_semsys(int what, int a2, \ +53 AUE_NULL MSTD { int svr4_sys_semsys(int what, int a2, \ int a3, int a4, int a5); } 54 AUE_NULL STD { int svr4_sys_ioctl(int fd, u_long com, \ caddr_t data); } From owner-p4-projects@FreeBSD.ORG Mon Jun 26 19:40:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6365716A5C3; Mon, 26 Jun 2006 19:40:44 +0000 (UTC) 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 1C9EA16A59B for ; Mon, 26 Jun 2006 19:40:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76EA64610B for ; Mon, 26 Jun 2006 19:22:17 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QJMH8W009394 for ; Mon, 26 Jun 2006 19:22:17 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QJMH33009391 for perforce@freebsd.org; Mon, 26 Jun 2006 19:22:17 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 26 Jun 2006 19:22:17 GMT Message-Id: <200606261922.k5QJMH33009391@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100084 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, 26 Jun 2006 19:40:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=100084 Change 100084 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/26 19:21:27 avoid deadlock in interrupts, don't profile WITNESS lock Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_witness.c#9 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/subr_witness.c#9 (text+ko) ==== @@ -491,7 +491,7 @@ CTR1(KTR_WITNESS, "%s: initializing witness", __func__); mtx_init(&w_mtx, "witness lock", NULL, MTX_SPIN | MTX_QUIET | - MTX_NOWITNESS); + MTX_NOWITNESS | MTX_NOPROFILE); for (i = 0; i < WITNESS_COUNT; i++) witness_free(&w_data[i]); for (i = 0; i < WITNESS_CHILDCOUNT; i++) From owner-p4-projects@FreeBSD.ORG Mon Jun 26 19:40:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2533816A797; Mon, 26 Jun 2006 19:40:51 +0000 (UTC) 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 9901E16A74A for ; Mon, 26 Jun 2006 19:40:50 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A99A845D6F for ; Mon, 26 Jun 2006 19:08:58 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QJ8wMv008779 for ; Mon, 26 Jun 2006 19:08:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QJ8wDp008776 for perforce@freebsd.org; Mon, 26 Jun 2006 19:08:58 GMT (envelope-from imp@freebsd.org) Date: Mon, 26 Jun 2006 19:08:58 GMT Message-Id: <200606261908.k5QJ8wDp008776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 100083 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, 26 Jun 2006 19:40:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=100083 Change 100083 by imp@imp_lighthouse on 2006/06/26 19:08:07 Mask out all interrupts when we initialize for console use. Start to sort out the interrupt enable/disable mess. TXRDY appears to be level rather than edge in its nature. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#25 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#25 (text+ko) ==== @@ -212,13 +212,14 @@ cr = USART_CR_RSTSTA | USART_CR_RSTRX | USART_CR_RSTTX; WR4(bas, USART_CR, cr); WR4(bas, USART_CR, USART_CR_RXEN | USART_CR_TXEN); + WR4(bas, USART_IDR, 0xffffffff); #if 0 WR4(bas, USART_IER, USART_CSR_TIMEOUT | USART_CSR_TXRDY | USART_CSR_RXRDY | USART_CSR_RXBRK | USART_CSR_ENDRX | USART_CSR_ENDTX); -#endif /* Set the receive timeout to be 1.5 character times. */ WR4(bas, USART_RTOR, 12); +#endif } /* @@ -336,9 +337,11 @@ WR4(&sc->sc_bas, USART_CR, cr); WR4(&sc->sc_bas, USART_CR, USART_CR_RXEN | USART_CR_TXEN); WR4(&sc->sc_bas, USART_IDR, 0xffffffff); +#if 0 WR4(&sc->sc_bas, USART_IER, USART_CSR_TIMEOUT | USART_CSR_TXRDY | USART_CSR_RXRDY | USART_CSR_RXBRK | USART_CSR_ENDRX | USART_CSR_ENDTX); +#endif /* Set the receive timeout to be 1.5 character times. */ WR4(&sc->sc_bas, USART_RTOR, 12); errout:; @@ -383,6 +386,7 @@ WR4(&sc->sc_bas, PDC_TPR, addr); WR4(&sc->sc_bas, PDC_TCR, sc->sc_txdatasz); WR4(&sc->sc_bas, PDC_PTCR, PDC_PTCR_TXTEN); + WR4(&sc->sc_bas, USART_IER, USART_CSR_TXRDY); uart_unlock(sc->sc_hwmtx); if (device_get_unit(sc->sc_dev)) device_printf(sc->sc_dev, "transmit %d bytes\n", sc->sc_txdatasz); @@ -460,8 +464,10 @@ bus_dmamap_unload(atsc->dmatag, atsc->tx_map); } uart_lock(sc->sc_hwmtx); - if (csr & USART_CSR_TXRDY && sc->sc_txbusy) + if (csr & USART_CSR_TXRDY && sc->sc_txbusy) { ipend |= SER_INT_TXIDLE; + WR4(&sc->sc_bas, USART_IDR, USART_CSR_TXRDY); + } if (csr & USART_CSR_ENDTX && sc->sc_txbusy) ipend |= SER_INT_TXIDLE; if (csr & (USART_CSR_RXRDY /* | USART_CSR_ENDRX | USART_CSR_TIMEOUT */)) From owner-p4-projects@FreeBSD.ORG Mon Jun 26 20:13:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A489216A6FD; Mon, 26 Jun 2006 20:13:17 +0000 (UTC) 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 9F47316A6F1 for ; Mon, 26 Jun 2006 20:13:17 +0000 (UTC) (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 4A1F7448B3 for ; Mon, 26 Jun 2006 13:57:14 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QDvEnB072076 for ; Mon, 26 Jun 2006 13:57:14 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QDvDKZ072073 for perforce@freebsd.org; Mon, 26 Jun 2006 13:57:13 GMT (envelope-from scottl@freebsd.org) Date: Mon, 26 Jun 2006 13:57:13 GMT Message-Id: <200606261357.k5QDvDKZ072073@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 100057 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, 26 Jun 2006 20:13:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=100057 Change 100057 by scottl@scottl-wv1u on 2006/06/26 13:56:19 First cut at ahd driver locking Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.h#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.c#4 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.h#5 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#8 (text+ko) ==== @@ -95,7 +95,7 @@ /* Hook up our interrupt handler */ error = bus_setup_intr(ahd->dev_softc, ahd->platform_data->irq, - INTR_TYPE_CAM, ahd_platform_intr, ahd, + INTR_TYPE_CAM|INTR_MPSAFE, ahd_platform_intr, ahd, &ahd->platform_data->ih); if (error != 0) device_printf(ahd->dev_softc, "bus_setup_intr() failed: %d\n", @@ -114,13 +114,17 @@ struct cam_devq *devq; struct cam_sim *sim; struct cam_path *path; - long s; + u_long s; int count; count = 0; devq = NULL; sim = NULL; + ahd_lockinit(ahd); + ahd_done_lockinit(ahd); + ahd_list_lockinit(); + /* * Create a thread to perform all recovery. */ @@ -143,7 +147,7 @@ */ sim = cam_sim_alloc(ahd_action, ahd_poll, "ahd", ahd, device_get_unit(ahd->dev_softc), - &Giant, M_NOWAIT, 1, /*XXX*/256, devq); + &ahd->platform_data->mtx, M_NOWAIT, 1, /*XXX*/256, devq); if (sim == NULL) { cam_simq_free(devq); goto fail; @@ -348,7 +352,6 @@ #endif u_int target_id; u_int our_id; - long s; CAM_DEBUG(ccb->ccb_h.path, CAM_DEBUG_TRACE, ("ahd_action\n")); @@ -382,13 +385,11 @@ } if (ccb->ccb_h.func_code == XPT_ACCEPT_TARGET_IO) { - ahd_lock(ahd, &s); SLIST_INSERT_HEAD(&lstate->accept_tios, &ccb->ccb_h, sim_links.sle); ccb->ccb_h.status = CAM_REQ_INPROG; if ((ahd->flags & AHD_TQINFIFO_BLOCKED) != 0) ahd_run_tqinfifo(ahd, /*paused*/FALSE); - ahd_unlock(ahd, &s); break; } @@ -422,7 +423,6 @@ /* * get an scb to use. */ - ahd_lock(ahd, &s); tinfo = ahd_fetch_transinfo(ahd, 'A', our_id, target_id, &tstate); if ((ccb->ccb_h.flags & CAM_TAG_ACTION_VALID) == 0 @@ -437,12 +437,10 @@ xpt_freeze_simq(sim, /*count*/1); ahd->flags |= AHD_RESOURCE_SHORTAGE; - ahd_unlock(ahd, &s); ccb->ccb_h.status = CAM_REQUEUE_REQ; xpt_done(ccb); return; } - ahd_unlock(ahd, &s); hscb = scb->hscb; @@ -530,20 +528,16 @@ } case XPT_SET_TRAN_SETTINGS: { - ahd_lock(ahd, &s); ahd_set_tran_settings(ahd, SIM_SCSI_ID(ahd, sim), SIM_CHANNEL(ahd, sim), &ccb->cts); - ahd_unlock(ahd, &s); xpt_done(ccb); break; } case XPT_GET_TRAN_SETTINGS: /* Get default/user set transfer settings for the target */ { - ahd_lock(ahd, &s); ahd_get_tran_settings(ahd, SIM_SCSI_ID(ahd, sim), SIM_CHANNEL(ahd, sim), &ccb->cts); - ahd_unlock(ahd, &s); xpt_done(ccb); break; } @@ -557,10 +551,8 @@ { int found; - ahd_lock(ahd, &s); found = ahd_reset_channel(ahd, SIM_CHANNEL(ahd, sim), /*initiate reset*/TRUE); - ahd_unlock(ahd, &s); if (bootverbose) { xpt_print_path(SIM_PATH(ahd, sim)); printf("SCSI bus reset delivered. " @@ -978,7 +970,6 @@ case AC_LOST_DEVICE: { struct ahd_devinfo devinfo; - long s; ahd_compile_devinfo(&devinfo, SIM_SCSI_ID(ahd, sim), xpt_path_target_id(path), @@ -990,13 +981,11 @@ * Revert to async/narrow transfers * for the next device. */ - ahd_lock(ahd, &s); ahd_set_width(ahd, &devinfo, MSG_EXT_WDTR_BUS_8_BIT, AHD_TRANS_GOAL|AHD_TRANS_CUR, /*paused*/FALSE); ahd_set_syncrate(ahd, &devinfo, /*period*/0, /*offset*/0, /*ppr_options*/0, AHD_TRANS_GOAL|AHD_TRANS_CUR, /*paused*/FALSE); - ahd_unlock(ahd, &s); break; } default: @@ -1014,7 +1003,6 @@ struct ahd_initiator_tinfo *tinfo; struct ahd_tmode_tstate *tstate; u_int mask; - u_long s; scb = (struct scb *)arg; ccb = scb->io_ctx; @@ -1027,9 +1015,7 @@ aic_set_transaction_status(scb, CAM_REQ_CMP_ERR); if (nsegments != 0) bus_dmamap_unload(ahd->buffer_dmat, scb->dmamap); - ahd_lock(ahd, &s); ahd_free_scb(ahd, scb); - ahd_unlock(ahd, &s); xpt_done(ccb); return; } @@ -1067,8 +1053,6 @@ } } - ahd_lock(ahd, &s); - /* * Last time we need to check if this SCB needs to * be aborted. @@ -1078,7 +1062,6 @@ bus_dmamap_unload(ahd->buffer_dmat, scb->dmamap); ahd_free_scb(ahd, scb); - ahd_unlock(ahd, &s); xpt_done(ccb); return; } @@ -1128,7 +1111,6 @@ ahd_queue_scb(ahd, scb); } - ahd_unlock(ahd, &s); } static void @@ -1155,7 +1137,6 @@ if (hscb->cdb_len > MAX_CDB_LEN && (ccb_h->flags & CAM_CDB_PHYS) == 0) { - u_long s; /* * Should CAM start to support CDB sizes @@ -1164,9 +1145,7 @@ */ aic_set_transaction_status(scb, CAM_REQ_INVALID); - ahd_lock(ahd, &s); ahd_free_scb(ahd, scb); - ahd_unlock(ahd, &s); xpt_done((union ccb *)csio); return; } @@ -1183,13 +1162,10 @@ } } else { if (hscb->cdb_len > MAX_CDB_LEN) { - u_long s; aic_set_transaction_status(scb, CAM_REQ_INVALID); - ahd_lock(ahd, &s); ahd_free_scb(ahd, scb); - ahd_unlock(ahd, &s); xpt_done((union ccb *)csio); return; } @@ -1468,7 +1444,6 @@ { struct ahd_softc *ahd; u_long l; - u_long s; ahd_list_lock(&l); device_printf(dev, "detaching device\n"); @@ -1481,10 +1456,8 @@ } TAILQ_REMOVE(&ahd_tailq, ahd, links); ahd_list_unlock(&l); - ahd_lock(ahd, &s); ahd_intr_enable(ahd, FALSE); bus_teardown_intr(dev, ahd->platform_data->irq, ahd->platform_data->ih); - ahd_unlock(ahd, &s); ahd_free(ahd); return (0); } ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.h#8 (text+ko) ==== @@ -137,6 +137,7 @@ void *ih; eventhandler_tag eh; struct proc *recovery_thread; + struct mtx mtx; }; struct scb_platform_data { @@ -209,18 +210,19 @@ static __inline void ahd_lockinit(struct ahd_softc *ahd) { + mtx_init(&ahd->platform_data->mtx, "ahd_lock", NULL, MTX_DEF); } static __inline void ahd_lock(struct ahd_softc *ahd, unsigned long *flags) { - *flags = splcam(); + mtx_lock(&ahd->platform_data->mtx); } static __inline void ahd_unlock(struct ahd_softc *ahd, unsigned long *flags) { - splx(*flags); + mtx_unlock(&ahd->platform_data->mtx); } /* Lock held during command compeletion to the upper layer */ ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.c#4 (text+ko) ==== @@ -106,7 +106,7 @@ * Sleep on a slightly different location * for this interlock just for added safety. */ - tsleep(aic->platform_data, PUSER, "thtrm", 0); + msleep(aic->platform_data, &aic->platform_data->mtx, PUSER, "thtrm", 0); aic_unlock(aic, &s); } @@ -125,7 +125,7 @@ if (LIST_EMPTY(&aic->timedout_scbs) != 0 && (aic->flags & AIC_SHUTDOWN_RECOVERY) == 0) - tsleep(aic, PUSER, "idle", 0); + msleep(aic, &aic->platform_data->mtx, PUSER, "idle", 0); if ((aic->flags & AIC_SHUTDOWN_RECOVERY) != 0) break; ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.h#5 (text+ko) ==== @@ -143,7 +143,7 @@ bus_dma_tag_create(parent_tag, alignment, boundary, \ lowaddr, highaddr, filter, filterarg, \ maxsize, nsegments, maxsegsz, flags, \ - busdma_lock_mutex, &Giant, \ + busdma_lock_mutex, &aic->platform_data->mtx, \ dma_tagp) #else #define aic_dma_tag_create(aic, parent_tag, alignment, boundary, \ From owner-p4-projects@FreeBSD.ORG Mon Jun 26 20:14:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8B6516A61C; Mon, 26 Jun 2006 20:14:12 +0000 (UTC) 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 5C25D16A677 for ; Mon, 26 Jun 2006 20:14:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD45C4424B for ; Mon, 26 Jun 2006 18:47:31 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QIlVxh006591 for ; Mon, 26 Jun 2006 18:47:31 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QIlVMK006588 for perforce@freebsd.org; Mon, 26 Jun 2006 18:47:31 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 26 Jun 2006 18:47:31 GMT Message-Id: <200606261847.k5QIlVMK006588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100082 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, 26 Jun 2006 20:14:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=100082 Change 100082 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/26 18:47:29 undo locking changes from 99969 as it causes an LOR a real fix for the locking overhead in sleepq would require a re-write Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_synch.c#10 edit .. //depot/projects/kmacy_sun4v/src/sys/kern/sys_generic.c#6 edit .. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_subr.c#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_synch.c#10 (text+ko) ==== @@ -159,9 +159,7 @@ * sleeps. */ if (TD_ON_SLEEPQ(td)) { - TD_SLOCK(td); sleepq_remove(td, td->td_wchan); - TD_SUNLOCK(td); } flags = SLEEPQ_MSLEEP; if (catch) ==== //depot/projects/kmacy_sun4v/src/sys/kern/sys_generic.c#6 (text+ko) ==== @@ -1136,12 +1136,10 @@ } TAILQ_REMOVE(&td->td_selq, sip, si_thrlist); sip->si_thread = NULL; - mtx_unlock(&sellock); atomic_clear_int(&td->td_flags, TDF_SELECT); - TD_SLOCK(td); sleepq_remove(td, &selwait); - TD_SUNLOCK(td); + mtx_unlock(&sellock); } ==== //depot/projects/kmacy_sun4v/src/sys/kern/vfs_subr.c#8 (text+ko) ==== @@ -1731,9 +1731,7 @@ int ret = 0; td = FIRST_THREAD_IN_PROC(updateproc); - TD_SLOCK(td); sleepq_remove(td, &lbolt); - TD_SUNLOCK(td); mtx_lock(&sync_mtx); if (rushjob < syncdelay / 2) { rushjob += 1; From owner-p4-projects@FreeBSD.ORG Mon Jun 26 20:51:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84D0916A407; Mon, 26 Jun 2006 20:51:09 +0000 (UTC) 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 4815716A404 for ; Mon, 26 Jun 2006 20:51:09 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE5D2449E6 for ; Mon, 26 Jun 2006 20:51:08 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QKp8QG022220 for ; Mon, 26 Jun 2006 20:51:08 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QKp8b3022216 for perforce@freebsd.org; Mon, 26 Jun 2006 20:51:08 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 26 Jun 2006 20:51:08 GMT Message-Id: <200606262051.k5QKp8b3022216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100088 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, 26 Jun 2006 20:51:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=100088 Change 100088 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/26 20:50:54 allow turnstiles to handle sleeping for us Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sys/filedesc.h#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sys/filedesc.h#5 (text+ko) ==== @@ -96,60 +96,11 @@ #ifdef _KERNEL /* Lock a file descriptor table. */ -#define FILEDESC_LOCK(fd) \ - do { \ - mtx_lock(&(fd)->fd_mtx); \ - (fd)->fd_wanted++; \ - while ((fd)->fd_locked) \ - msleep(&(fd)->fd_locked, &(fd)->fd_mtx, PLOCK, "fdesc", 0); \ - (fd)->fd_locked = 2; \ - (fd)->fd_wanted--; \ - mtx_unlock(&(fd)->fd_mtx); \ - } while (0) - -#define FILEDESC_UNLOCK(fd) \ - do { \ - mtx_lock(&(fd)->fd_mtx); \ - KASSERT((fd)->fd_locked == 2, \ - ("fdesc locking mistake %d should be %d", (fd)->fd_locked, 2)); \ - (fd)->fd_locked = 0; \ - if ((fd)->fd_wanted) \ - wakeup_one(&(fd)->fd_locked); \ - mtx_unlock(&(fd)->fd_mtx); \ - } while (0) - -#define FILEDESC_LOCK_FAST(fd) \ - do { \ - mtx_lock(&(fd)->fd_mtx); \ - (fd)->fd_wanted++; \ - while ((fd)->fd_locked) \ - msleep(&(fd)->fd_locked, &(fd)->fd_mtx, PLOCK, "fdesc", 0); \ - (fd)->fd_locked = 1; \ - (fd)->fd_wanted--; \ - } while (0) - -#define FILEDESC_UNLOCK_FAST(fd) \ - do { \ - KASSERT((fd)->fd_locked == 1, \ - ("fdesc locking mistake %d should be %d", (fd)->fd_locked, 1)); \ - (fd)->fd_locked = 0; \ - if ((fd)->fd_wanted) \ - wakeup_one(&(fd)->fd_locked); \ - mtx_unlock(&(fd)->fd_mtx); \ - } while (0) - -#ifdef INVARIANT_SUPPORT -#define FILEDESC_LOCK_ASSERT(fd, arg) \ - do { \ - if ((arg) == MA_OWNED) \ - KASSERT((fd)->fd_locked != 0, ("fdesc locking mistake")); \ - else \ - KASSERT((fd)->fd_locked == 0, ("fdesc locking mistake")); \ - } while (0) -#else -#define FILEDESC_LOCK_ASSERT(fd, arg) -#endif - +#define FILEDESC_LOCK(fd) mtx_lock(&(fd)->fd_mtx); +#define FILEDESC_LOCK_FAST(fd) mtx_lock(&(fd)->fd_mtx); +#define FILEDESC_UNLOCK(fd) mtx_unlock(&(fd)->fd_mtx); +#define FILEDESC_UNLOCK_FAST(fd) mtx_unlock(&(fd)->fd_mtx); +#define FILEDESC_LOCK_ASSERT(fd, arg) mtx_assert(&(fd)->fd_mtx, arg) #define FILEDESC_LOCK_DESC "filedesc structure" struct thread; From owner-p4-projects@FreeBSD.ORG Mon Jun 26 20:54:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88D5216A404; Mon, 26 Jun 2006 20:54:14 +0000 (UTC) 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 4674916A402 for ; Mon, 26 Jun 2006 20:54:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11634449F5 for ; Mon, 26 Jun 2006 20:54:14 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QKsD7K022305 for ; Mon, 26 Jun 2006 20:54:13 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QKsDq7022302 for perforce@freebsd.org; Mon, 26 Jun 2006 20:54:13 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 26 Jun 2006 20:54:13 GMT Message-Id: <200606262054.k5QKsDq7022302@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100089 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, 26 Jun 2006 20:54:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=100089 Change 100089 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/26 20:53:51 add profiling for rwlocks not convinced of correctness as there don't appear to be any contended rwlocks on my workloads Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_rwlock.c#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_rwlock.c#4 (text+ko) ==== @@ -44,7 +44,7 @@ #include #include #include - +#include #include #ifdef DDB @@ -80,12 +80,19 @@ #define _rw_assert(rw, what, file, line) #endif +#ifdef SMP +#define smp_turnstile_valid(obj) (turnstile_lookup((obj)) != NULL) +#else +#define smp_turnstile(obj) +#endif + void rw_init(struct rwlock *rw, const char *name) { rw->rw_lock = RW_UNLOCKED; + lock_profile_init(&rw->rw_object, name); lock_init(&rw->rw_object, &lock_class_rw, name, NULL, LO_WITNESS | LO_RECURSABLE | LO_UPGRADABLE); } @@ -95,6 +102,7 @@ { KASSERT(rw->rw_lock == RW_UNLOCKED, ("rw lock not unlocked")); + lock_profile_destroy(&rw->rw_object); lock_destroy(&rw->rw_object); } @@ -109,14 +117,17 @@ void _rw_wlock(struct rwlock *rw, const char *file, int line) { - + uint64_t waitstart; + MPASS(curthread != NULL); KASSERT(rw_wowner(rw) != curthread, ("%s (%s): wlock already held @ %s:%d", __func__, rw->rw_object.lo_name, file, line)); WITNESS_CHECKORDER(&rw->rw_object, LOP_NEWORDER | LOP_EXCLUSIVE, file, line); + lock_profile_waitstart(&waitstart); __rw_wlock(rw, curthread, file, line); + lock_profile_obtain_lock_success(&rw->rw_object, waitstart, file, line); LOCK_LOG_LOCK("WLOCK", &rw->rw_object, 0, 0, file, line); WITNESS_LOCK(&rw->rw_object, LOP_EXCLUSIVE, file, line); } @@ -129,6 +140,7 @@ _rw_assert(rw, RA_WLOCKED, file, line); WITNESS_UNLOCK(&rw->rw_object, LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("WUNLOCK", &rw->rw_object, 0, 0, file, line); + lock_profile_release_lock(&rw->rw_object); __rw_wunlock(rw, curthread, file, line); } @@ -139,6 +151,8 @@ volatile struct thread *owner; #endif uintptr_t x; + uint64_t waitstart; + int contested; KASSERT(rw_wowner(rw) != curthread, ("%s (%s): wlock already held @ %s:%d", __func__, @@ -156,6 +170,7 @@ * be blocked on the writer, and the writer would be blocked * waiting for the reader to release its original read lock. */ + lock_profile_waitstart(&waitstart); for (;;) { /* * Handle the easy case. If no other thread has a write @@ -169,7 +184,6 @@ */ x = rw->rw_lock; if (x & RW_LOCK_READ) { - /* * The RW_LOCK_READ_WAITERS flag should only be set * if another thread currently holds a write lock, @@ -178,6 +192,9 @@ MPASS((x & RW_LOCK_READ_WAITERS) == 0); if (atomic_cmpset_acq_ptr(&rw->rw_lock, x, x + RW_ONE_READER)) { + if ((x & ((1<rw_object, waitstart, file, line); + if (LOCK_LOG_TEST(&rw->rw_object, 0)) CTR4(KTR_LOCK, "%s: %p succeed %p -> %p", __func__, @@ -186,6 +203,7 @@ break; } cpu_spinwait(); + lock_profile_obtain_lock_failed(&rw->rw_object, &contested); continue; } @@ -234,6 +252,7 @@ */ owner = (struct thread *)RW_OWNER(x); if (TD_IS_RUNNING(owner)) { + lock_profile_obtain_lock_failed(&rw->rw_object, &contested); turnstile_release(&rw->rw_object); if (LOCK_LOG_TEST(&rw->rw_object, 0)) CTR3(KTR_LOCK, "%s: spinning on %p held by %p", @@ -279,7 +298,6 @@ LOCK_LOG_LOCK("RUNLOCK", &rw->rw_object, 0, 0, file, line); /* TODO: drop "owner of record" here. */ - for (;;) { /* * See if there is more than one read lock held. If so, @@ -297,7 +315,8 @@ break; } continue; - } + } else + lock_profile_release_lock(&rw->rw_object); /* * We should never have read waiters while at least one @@ -328,7 +347,8 @@ break; } continue; - } + } + /* * There should just be one reader with one or more @@ -394,6 +414,7 @@ volatile struct thread *owner; #endif uintptr_t v; + int contested; if (LOCK_LOG_TEST(&rw->rw_object, 0)) CTR5(KTR_LOCK, "%s: %s contested (lock=%p) at %s:%d", __func__, @@ -434,6 +455,7 @@ } turnstile_release(&rw->rw_object); cpu_spinwait(); + lock_profile_obtain_lock_failed(&rw->rw_object, &contested); continue; } @@ -447,6 +469,7 @@ v | RW_LOCK_WRITE_WAITERS)) { turnstile_release(&rw->rw_object); cpu_spinwait(); + lock_profile_obtain_lock_failed(&rw->rw_object, &contested); continue; } if (LOCK_LOG_TEST(&rw->rw_object, 0)) @@ -462,6 +485,7 @@ */ owner = (struct thread *)RW_OWNER(v); if (!(v & RW_LOCK_READ) && TD_IS_RUNNING(owner)) { + lock_profile_obtain_lock_failed(&rw->rw_object, &contested); turnstile_release(&rw->rw_object); if (LOCK_LOG_TEST(&rw->rw_object, 0)) CTR3(KTR_LOCK, "%s: spinning on %p held by %p", @@ -629,11 +653,7 @@ v = rw->rw_lock & RW_LOCK_WRITE_WAITERS; success = atomic_cmpset_acq_ptr(&rw->rw_lock, RW_READERS_LOCK(1) | v, tid | v); -#ifdef SMP - if (success && v && turnstile_lookup(&rw->rw_object) != NULL) -#else - if (success && v) -#endif + if (success && v && smp_turnstile_valid(&rw->rw_object)) turnstile_claim(&rw->rw_object); else turnstile_release(&rw->rw_object); From owner-p4-projects@FreeBSD.ORG Mon Jun 26 20:55:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3011716A403; Mon, 26 Jun 2006 20:55:16 +0000 (UTC) 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 0ED8416A400 for ; Mon, 26 Jun 2006 20:55:16 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC2F344679 for ; Mon, 26 Jun 2006 20:55:15 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QKtFuj022383 for ; Mon, 26 Jun 2006 20:55:15 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QKtF9l022380 for perforce@freebsd.org; Mon, 26 Jun 2006 20:55:15 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 26 Jun 2006 20:55:15 GMT Message-Id: <200606262055.k5QKtF9l022380@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100090 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, 26 Jun 2006 20:55:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=100090 Change 100090 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/26 20:55:08 fix missing lock acquisitions of threads Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_turnstile.c#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/subr_turnstile.c#8 (text+ko) ==== @@ -88,8 +88,7 @@ */ #define TC_TABLESIZE 128 /* Must be power of 2. */ #define TC_MASK (TC_TABLESIZE - 1) -#define TC_SHIFT 8 -#define TC_HASH(lock) (((uintptr_t)(lock) >> TC_SHIFT) & TC_MASK) +#define TC_HASH(lock) ((lock)->lo_id & TC_MASK) #define TC_LOOKUP(lock) &turnstile_chains[TC_HASH(lock)] /* @@ -837,7 +836,6 @@ */ td = curthread; pri = PRI_MAX; - TD_SLOCK(td); mtx_lock_spin(&td_contested_lock); LIST_FOREACH(ts, &td->td_contested, ts_link) { cp = turnstile_first_waiter(ts)->td_priority; @@ -845,8 +843,10 @@ pri = cp; } mtx_unlock_spin(&td_contested_lock); + TD_SLOCK(td); sched_unlend_prio(td, pri); - + TD_SUNLOCK(td); + /* * Wake up all the pending threads. If a thread is not blocked * on a lock, then it is currently executing on another CPU in @@ -866,14 +866,15 @@ #endif TD_CLR_LOCK(td); MPASS(TD_CAN_RUN(td)); + TD_SLOCK(td); setrunqueue(td, SRQ_BORING); + TD_SUNLOCK(td); } else { atomic_set_int(&td->td_flags, TDF_TSNOBLOCK); MPASS(TD_IS_RUNNING(td) || TD_ON_RUNQ(td)); } } critical_exit(); - TD_SUNLOCK(td); } /* From owner-p4-projects@FreeBSD.ORG Mon Jun 26 21:08:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3475C16A4D4; Mon, 26 Jun 2006 21:08:36 +0000 (UTC) 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 E7F3216A4C8 for ; Mon, 26 Jun 2006 21:08:35 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C1F844195 for ; Mon, 26 Jun 2006 20:33:45 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QKXjdj013476 for ; Mon, 26 Jun 2006 20:33:45 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QKXjsh013473 for perforce@freebsd.org; Mon, 26 Jun 2006 20:33:45 GMT (envelope-from imp@freebsd.org) Date: Mon, 26 Jun 2006 20:33:45 GMT Message-Id: <200606262033.k5QKXjsh013473@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 100085 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, 26 Jun 2006 21:08:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=100085 Change 100085 by imp@imp_lighthouse on 2006/06/26 20:32:48 Style(9) window dressing. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#26 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#26 (text+ko) ==== @@ -240,8 +240,8 @@ at91_usart_putc(struct uart_bas *bas, int c) { - while (!(RD4(bas, USART_CSR) & - USART_CSR_TXRDY)); + while (!(RD4(bas, USART_CSR) & USART_CSR_TXRDY)) + continue; WR4(bas, USART_THR, c); } @@ -266,7 +266,7 @@ int c; while (!(RD4(bas, USART_CSR) & USART_CSR_RXRDY)) - ; + continue; c = RD4(bas, USART_RHR); c &= 0xff; return (c); From owner-p4-projects@FreeBSD.ORG Mon Jun 26 21:13:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20EBB16A47E; Mon, 26 Jun 2006 21:13:39 +0000 (UTC) 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 C9D2C16A401 for ; Mon, 26 Jun 2006 21:13:38 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 715F844218 for ; Mon, 26 Jun 2006 21:10:35 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QLAZPt024298 for ; Mon, 26 Jun 2006 21:10:35 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QLAZ3G024295 for perforce@freebsd.org; Mon, 26 Jun 2006 21:10:35 GMT (envelope-from clem1@FreeBSD.org) Date: Mon, 26 Jun 2006 21:10:35 GMT Message-Id: <200606262110.k5QLAZ3G024295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 100092 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, 26 Jun 2006 21:13:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=100092 Change 100092 by clem1@clem1_ipv6vulns on 2006/06/26 21:10:20 fix bad encoding when field size is lower than 1 bytes. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/pcs.py#5 edit Differences ... ==== //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/pcs.py#5 (text+ko) ==== @@ -268,7 +268,7 @@ if fieldBR < byteBR: shift = byteBR - fieldBR byteBR -= fieldBR - mask = ((2 ** shift) - 1) << shift + mask = ((2 ** fieldBR) - 1) << shift byte = (byte | ((value << shift) & mask)) # Done with the field, not with the byte get new field break @@ -289,7 +289,6 @@ byteBR = 8 # Done with the byte and the field have a nice day break - self._bytes = ''.join(bytearray) # Install the new value class Chain(list): From owner-p4-projects@FreeBSD.ORG Mon Jun 26 22:23:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3820816A405; Mon, 26 Jun 2006 22:23:08 +0000 (UTC) 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 EE89416A403 for ; Mon, 26 Jun 2006 22:23:07 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A046244752 for ; Mon, 26 Jun 2006 22:23:07 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QMN7vS040064 for ; Mon, 26 Jun 2006 22:23:07 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QMN6fQ040043 for perforce@freebsd.org; Mon, 26 Jun 2006 22:23:06 GMT (envelope-from cognet@freebsd.org) Date: Mon, 26 Jun 2006 22:23:06 GMT Message-Id: <200606262223.k5QMN6fQ040043@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 100095 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, 26 Jun 2006 22:23:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=100095 Change 100095 by cognet@cognet on 2006/06/26 22:22:28 IFC Affected files ... .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#16 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#13 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#8 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#8 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#8 integrate .. //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#8 integrate .. //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#10 integrate .. //depot/projects/arm/src/sys/arm/at91/files.at91#7 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt.c#7 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#10 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#10 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/arm/src/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_syscall.h#3 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_syscallnames.c#3 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/arm/src/sys/compat/svr4/syscalls.master#3 integrate .. //depot/projects/arm/src/sys/conf/NOTES#24 integrate .. //depot/projects/arm/src/sys/conf/options#22 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#14 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athioctl.h#5 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athvar.h#10 integrate .. //depot/projects/arm/src/sys/dev/mii/rgephy.c#4 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.c#15 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.h#15 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#18 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_pci.c#13 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfe.c#1 branch .. //depot/projects/arm/src/sys/dev/nfe/if_nfereg.h#1 branch .. //depot/projects/arm/src/sys/dev/nfe/if_nfevar.h#1 branch .. //depot/projects/arm/src/sys/dev/re/if_re.c#12 integrate .. //depot/projects/arm/src/sys/fs/udf/udf_vfsops.c#7 integrate .. //depot/projects/arm/src/sys/geom/geom_gpt.c#6 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC#12 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#13 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_proto.h#9 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_syscall.h#9 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysent.c#9 integrate .. //depot/projects/arm/src/sys/i386/linux/syscalls.master#9 integrate .. //depot/projects/arm/src/sys/ia64/conf/GENERIC#8 integrate .. //depot/projects/arm/src/sys/ia64/disasm/disasm.h#2 integrate .. //depot/projects/arm/src/sys/ia64/disasm/disasm_decode.c#2 integrate .. //depot/projects/arm/src/sys/ia64/disasm/disasm_extract.c#2 integrate .. //depot/projects/arm/src/sys/ia64/disasm/disasm_format.c#2 integrate .. //depot/projects/arm/src/sys/ia64/disasm/disasm_int.h#2 integrate .. //depot/projects/arm/src/sys/kern/vfs_vnops.c#10 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_freebsd.c#5 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#14 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#13 integrate .. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#11 integrate .. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#9 integrate .. //depot/projects/arm/src/sys/netinet/tcp_var.h#8 integrate .. //depot/projects/arm/src/sys/netinet6/raw_ip6.c#5 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/arm/src/sys/nfsserver/nfsrvcache.h#3 integrate .. //depot/projects/arm/src/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/arm/src/sys/pci/agp_i810.c#7 integrate .. //depot/projects/arm/src/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/mmu_oea.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#15 integrate .. //depot/projects/arm/src/sys/sys/gpt.h#3 integrate .. //depot/projects/arm/src/sys/sys/rwlock.h#3 integrate .. //depot/projects/arm/src/sys/vm/vm_pageq.c#8 integrate Differences ... ==== //depot/projects/arm/src/sys/amd64/amd64/pmap.c#16 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.558 2006/06/20 20:52:10 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.559 2006/06/25 22:22:37 alc Exp $"); /* * Manages physical address maps. @@ -2697,11 +2697,6 @@ * we only virtual copy managed pages */ if ((ptetemp & PG_MANAGED) != 0) { - /* - * We have to check after allocpte for the - * pte still being around... allocpte can - * block. - */ dstmpte = pmap_allocpte(dst_pmap, addr, M_NOWAIT); if (dstmpte == NULL) @@ -2720,7 +2715,8 @@ *dst_pte = ptetemp & ~(PG_M | PG_A); dst_pmap->pm_stats.resident_count++; } else - pmap_unwire_pte_hold(dst_pmap, addr, dstmpte); + pmap_unwire_pte_hold(dst_pmap, addr, + dstmpte); if (dstmpte->wire_count >= srcmpte->wire_count) break; } ==== //depot/projects/arm/src/sys/amd64/conf/GENERIC#13 (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.460 2006/06/15 19:58:52 netchild Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.462 2006/06/26 22:03:20 babkin Exp $ cpu HAMMER ident GENERIC ==== //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.13 2006/06/20 20:41:28 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.14 2006/06/26 18:37:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.13 2006/06/20 20:41:28 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.14 2006/06/26 18:37:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.13 2006/06/20 20:41:28 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.14 2006/06/26 18:37:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp */ #include @@ -65,7 +65,7 @@ { SYF_MPSAFE | AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = prof */ - { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ + { SYF_MPSAFE | AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ { SYF_MPSAFE | AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ { SYF_MPSAFE | AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ ==== //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#8 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -103,7 +103,7 @@ 42 AUE_PIPE MSTD { int linux_pipe(l_ulong *pipefds); } 43 AUE_NULL MSTD { int linux_times(struct l_times_argv *buf); } 44 AUE_NULL UNIMPL prof -45 AUE_NULL STD { int linux_brk(l_ulong dsend); } +45 AUE_NULL MSTD { int linux_brk(l_ulong dsend); } 46 AUE_SETGID MSTD { int linux_setgid16(l_gid16_t gid); } 47 AUE_GETGID MSTD { int linux_getgid16(void); } 48 AUE_NULL MSTD { int linux_signal(l_int sig, \ ==== //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#10 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.8 2006/06/18 22:46:30 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.11 2006/06/23 22:45:35 cognet Exp $"); #include #include #include @@ -131,6 +131,8 @@ } } +static void arm9_setup(void); + void _start(void) { @@ -174,7 +176,6 @@ __start(); } -#ifdef KZIP static void get_cachetype_cp15() { @@ -255,6 +256,7 @@ } +#ifdef KZIP static unsigned char *orig_input, *i_input, *i_output; @@ -348,8 +350,8 @@ int d) { Elf32_Ehdr *eh; - Elf32_Phdr phdr[512] /* XXX */, *php; - Elf32_Shdr shdr[512] /* XXX */; + Elf32_Phdr phdr[64] /* XXX */, *php; + Elf32_Shdr shdr[64] /* XXX */; int i,j; void *entry_point; int symtabindex = -1; ==== //depot/projects/arm/src/sys/arm/at91/files.at91#7 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/at91/files.at91,v 1.3 2006/03/24 07:36:23 imp Exp $ +# $FreeBSD: src/sys/arm/at91/files.at91,v 1.5 2006/06/23 23:07:11 cognet Exp $ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91.c standard ==== //depot/projects/arm/src/sys/cam/cam_xpt.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.160 2006/06/05 22:22:14 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.162 2006/06/26 05:41:11 mjacob Exp $"); #include #include @@ -387,6 +387,11 @@ /*quirks*/0, /*mintags*/0, /*maxtags*/0 }, { + /* Does not support other than LUN 0 */ + { T_DIRECT, SIP_MEDIA_FIXED, "VMware*", "*", "*" }, + CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0 + }, + { /* * Broken tagged queuing drive. * Submitted by: ==== //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#10 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.54 2006/03/30 07:43:01 ps Exp $ - * created from FreeBSD + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.55 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.66 2006/06/26 18:35:57 jhb Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#10 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.52 2006/03/30 07:43:01 ps Exp $ - * created from FreeBSD + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.53 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.66 2006/06/26 18:35:57 jhb Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#10 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.43 2006/03/30 07:43:01 ps Exp $ - * created from FreeBSD + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.44 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.66 2006/06/26 18:35:57 jhb Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#10 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.53 2006/03/30 07:43:01 ps Exp $ - * created from FreeBSD + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.54 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.66 2006/06/26 18:35:57 jhb Exp */ #include "opt_compat.h" @@ -168,9 +168,9 @@ { SYF_MPSAFE | AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO }, /* 133 = sendto */ { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN }, /* 134 = shutdown */ { SYF_MPSAFE | AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR }, /* 135 = socketpair */ - { AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR }, /* 136 = mkdir */ - { AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR }, /* 137 = rmdir */ - { AS(freebsd32_utimes_args), (sy_call_t *)freebsd32_utimes, AUE_UTIMES }, /* 138 = freebsd32_utimes */ + { SYF_MPSAFE | AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR }, /* 136 = mkdir */ + { SYF_MPSAFE | AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR }, /* 137 = rmdir */ + { SYF_MPSAFE | AS(freebsd32_utimes_args), (sy_call_t *)freebsd32_utimes, AUE_UTIMES }, /* 138 = freebsd32_utimes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = obsolete 4.2 sigreturn */ { SYF_MPSAFE | AS(freebsd32_adjtime_args), (sy_call_t *)freebsd32_adjtime, AUE_ADJTIME }, /* 140 = freebsd32_adjtime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 141 = obsolete ogetpeername */ @@ -387,10 +387,10 @@ { SYF_MPSAFE | AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL }, /* 352 = __acl_delete_fd */ { SYF_MPSAFE | AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL }, /* 353 = __acl_aclcheck_file */ { SYF_MPSAFE | AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL }, /* 354 = __acl_aclcheck_fd */ - { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_NULL }, /* 355 = extattrctl */ - { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_NULL }, /* 356 = extattr_set_file */ - { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_NULL }, /* 357 = extattr_get_file */ - { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_NULL }, /* 358 = extattr_delete_file */ + { SYF_MPSAFE | AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_NULL }, /* 355 = extattrctl */ + { SYF_MPSAFE | AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_NULL }, /* 356 = extattr_set_file */ + { SYF_MPSAFE | AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_NULL }, /* 357 = extattr_get_file */ + { SYF_MPSAFE | AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_NULL }, /* 358 = extattr_delete_file */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 359 = aio_waitcomplete */ { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 360 = getresuid */ { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL }, /* 361 = getresgid */ @@ -403,9 +403,9 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 368 = __cap_set_fd */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 369 = __cap_set_file */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 370 = lkmressys */ - { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_NULL }, /* 371 = extattr_set_fd */ - { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_NULL }, /* 372 = extattr_get_fd */ - { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_NULL }, /* 373 = extattr_delete_fd */ + { SYF_MPSAFE | AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_NULL }, /* 371 = extattr_set_fd */ + { SYF_MPSAFE | AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_NULL }, /* 372 = extattr_get_fd */ + { SYF_MPSAFE | AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_NULL }, /* 373 = extattr_delete_fd */ { SYF_MPSAFE | AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL }, /* 374 = __setugid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 375 = nfsclnt */ { SYF_MPSAFE | AS(eaccess_args), (sy_call_t *)eaccess, AUE_NULL }, /* 376 = eaccess */ ==== //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#10 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.65 2006/03/30 07:42:32 ps Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.66 2006/06/26 18:35:57 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -251,9 +251,9 @@ 134 AUE_SHUTDOWN MNOPROTO { int shutdown(int s, int how); } 135 AUE_SOCKETPAIR MNOPROTO { int socketpair(int domain, int type, \ int protocol, int *rsv); } -136 AUE_MKDIR NOPROTO { int mkdir(char *path, int mode); } -137 AUE_RMDIR NOPROTO { int rmdir(char *path); } -138 AUE_UTIMES STD { int freebsd32_utimes(char *path, \ +136 AUE_MKDIR MNOPROTO { int mkdir(char *path, int mode); } +137 AUE_RMDIR MNOPROTO { int rmdir(char *path); } +138 AUE_UTIMES MSTD { int freebsd32_utimes(char *path, \ struct timeval32 *tptr); } 139 AUE_NULL OBSOL 4.2 sigreturn 140 AUE_ADJTIME MSTD { int freebsd32_adjtime( \ @@ -601,16 +601,16 @@ acl_type_t type, struct acl *aclp); } 354 AUE_NULL MNOPROTO { int __acl_aclcheck_fd(int filedes, \ acl_type_t type, struct acl *aclp); } -355 AUE_NULL NOPROTO { int extattrctl(const char *path, int cmd, \ +355 AUE_NULL MNOPROTO { int extattrctl(const char *path, int cmd, \ const char *filename, int attrnamespace, \ const char *attrname); } -356 AUE_NULL NOPROTO { int extattr_set_file(const char *path, \ +356 AUE_NULL MNOPROTO { int extattr_set_file(const char *path, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -357 AUE_NULL NOPROTO { ssize_t extattr_get_file(const char *path, \ +357 AUE_NULL MNOPROTO { ssize_t extattr_get_file(const char *path, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -358 AUE_NULL NOPROTO { int extattr_delete_file(const char *path, \ +358 AUE_NULL MNOPROTO { int extattr_delete_file(const char *path, \ int attrnamespace, \ const char *attrname); } 359 AUE_NULL UNIMPL aio_waitcomplete @@ -631,13 +631,13 @@ 368 AUE_NULL UNIMPL __cap_set_fd 369 AUE_NULL UNIMPL __cap_set_file 370 AUE_NULL UNIMPL lkmressys -371 AUE_NULL NOPROTO { int extattr_set_fd(int fd, \ +371 AUE_NULL MNOPROTO { int extattr_set_fd(int fd, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -372 AUE_NULL NOPROTO { ssize_t extattr_get_fd(int fd, \ +372 AUE_NULL MNOPROTO { ssize_t extattr_get_fd(int fd, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -373 AUE_NULL NOPROTO { int extattr_delete_fd(int fd, \ +373 AUE_NULL MNOPROTO { int extattr_delete_fd(int fd, \ int attrnamespace, \ const char *attrname); } 374 AUE_NULL MNOPROTO { int __setugid(int flag); } ==== //depot/projects/arm/src/sys/compat/linux/linux_misc.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.178 2006/05/10 20:38:16 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.179 2006/06/23 18:49:38 netchild Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -661,20 +661,22 @@ printf(ARGS(times, "*")); #endif - p = td->td_proc; - PROC_LOCK(p); - calcru(p, &utime, &stime); - calccru(p, &cutime, &cstime); - PROC_UNLOCK(p); + if (args->buf != NULL) { + p = td->td_proc; + PROC_LOCK(p); + calcru(p, &utime, &stime); + calccru(p, &cutime, &cstime); + PROC_UNLOCK(p); - tms.tms_utime = CONVTCK(utime); - tms.tms_stime = CONVTCK(stime); + tms.tms_utime = CONVTCK(utime); + tms.tms_stime = CONVTCK(stime); - tms.tms_cutime = CONVTCK(cutime); - tms.tms_cstime = CONVTCK(cstime); + tms.tms_cutime = CONVTCK(cutime); + tms.tms_cstime = CONVTCK(cstime); - if ((error = copyout(&tms, args->buf, sizeof(tms)))) - return error; + if ((error = copyout(&tms, args->buf, sizeof(tms)))) + return error; + } microuptime(&tv); td->td_retval[0] = (int)CONVTCK(tv); ==== //depot/projects/arm/src/sys/compat/ndis/kern_ndis.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.91 2005/11/02 18:01:04 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.92 2006/06/22 13:11:36 dds Exp $"); #include #include @@ -405,13 +405,16 @@ cfg->ndis_oid = #if __FreeBSD_version < 502113 SYSCTL_ADD_STRING(&sc->ndis_ctx, SYSCTL_CHILDREN(sc->ndis_tree), + OID_AUTO, cfg->ndis_cfg.nc_cfgkey, flag, + cfg->ndis_cfg.nc_val, sizeof(cfg->ndis_cfg.nc_val), + cfg->ndis_cfg.nc_cfgdesc); #else SYSCTL_ADD_STRING(device_get_sysctl_ctx(sc->ndis_dev), SYSCTL_CHILDREN(device_get_sysctl_tree(sc->ndis_dev)), -#endif OID_AUTO, cfg->ndis_cfg.nc_cfgkey, flag, cfg->ndis_cfg.nc_val, sizeof(cfg->ndis_cfg.nc_val), cfg->ndis_cfg.nc_cfgdesc); +#endif return(0); } ==== //depot/projects/arm/src/sys/compat/svr4/svr4_misc.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.84 2006/02/06 22:06:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.85 2006/06/26 18:36:57 jhb Exp $"); #include "opt_mac.h" @@ -792,58 +792,10 @@ struct thread *td; struct svr4_sys_break_args *uap; { - struct proc *p = td->td_proc; - struct vmspace *vm = p->p_vmspace; - vm_offset_t new, old, base, ns; - int rv; + struct obreak_args ap; - base = round_page((vm_offset_t) vm->vm_daddr); - ns = (vm_offset_t)uap->nsize; - new = round_page(ns); - if (new > base) { - PROC_LOCK(p); - if ((new - base) > (unsigned)lim_cur(p, RLIMIT_DATA)) { - PROC_UNLOCK(p); - return ENOMEM; - } - PROC_UNLOCK(p); - if (new >= VM_MAXUSER_ADDRESS) - return (ENOMEM); - } else if (new < base) { - /* - * This is simply an invalid value. If someone wants to - * do fancy address space manipulations, mmap and munmap - * can do most of what the user would want. - */ - return EINVAL; - } - - old = base + ctob(vm->vm_dsize); - - if (new > old) { - vm_size_t diff; - diff = new - old; - PROC_LOCK(p); - if (vm->vm_map.size + diff > lim_cur(p, RLIMIT_VMEM)) { - PROC_UNLOCK(p); - return(ENOMEM); - } - PROC_UNLOCK(p); - rv = vm_map_find(&vm->vm_map, NULL, 0, &old, diff, FALSE, - VM_PROT_ALL, VM_PROT_ALL, 0); - if (rv != KERN_SUCCESS) { - return (ENOMEM); - } - vm->vm_dsize += btoc(diff); - } else if (new < old) { - rv = vm_map_remove(&vm->vm_map, new, old); - if (rv != KERN_SUCCESS) { - return (ENOMEM); - } - vm->vm_dsize -= btoc(old - new); - } - - return (0); + ap.nsize = uap->nsize; + return (obreak(td, &ap)); } static __inline clock_t ==== //depot/projects/arm/src/sys/compat/svr4/svr4_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.19 2005/07/13 20:35:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.20 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp */ #ifndef _SVR4_SYSPROTO_H_ ==== //depot/projects/arm/src/sys/compat/svr4/svr4_syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.17 2005/07/13 20:35:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.18 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp */ #define SVR4_SYS_exit 1 ==== //depot/projects/arm/src/sys/compat/svr4/svr4_syscallnames.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.17 2005/07/13 20:35:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.18 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp */ const char *svr4_syscallnames[] = { ==== //depot/projects/arm/src/sys/compat/svr4/svr4_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.18 2005/07/13 20:35:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.19 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp */ #include @@ -37,7 +37,7 @@ { SYF_MPSAFE | AS(svr4_sys_mknod_args), (sy_call_t *)svr4_sys_mknod, AUE_NULL }, /* 14 = svr4_sys_mknod */ { SYF_MPSAFE | AS(chmod_args), (sy_call_t *)chmod, AUE_NULL }, /* 15 = chmod */ { SYF_MPSAFE | AS(chown_args), (sy_call_t *)chown, AUE_NULL }, /* 16 = chown */ - { AS(svr4_sys_break_args), (sy_call_t *)svr4_sys_break, AUE_NULL }, /* 17 = svr4_sys_break */ + { SYF_MPSAFE | AS(svr4_sys_break_args), (sy_call_t *)svr4_sys_break, AUE_NULL }, /* 17 = svr4_sys_break */ { SYF_MPSAFE | AS(svr4_sys_stat_args), (sy_call_t *)svr4_sys_stat, AUE_NULL }, /* 18 = svr4_sys_stat */ { SYF_MPSAFE | AS(lseek_args), (sy_call_t *)lseek, AUE_NULL }, /* 19 = lseek */ { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ ==== //depot/projects/arm/src/sys/compat/svr4/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp $ + $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp $ ; from: @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; ; System call name/number master file (or rather, slave, from SVR4). @@ -57,7 +57,7 @@ 14 AUE_NULL MSTD { int svr4_sys_mknod(char* path, int mode, int dev); } 15 AUE_NULL MNOPROTO { int chmod(char *path, int mode); } 16 AUE_NULL MNOPROTO { int chown(char *path, uid_t uid, gid_t gid); } -17 AUE_NULL STD { int svr4_sys_break(caddr_t nsize); } +17 AUE_NULL MSTD { int svr4_sys_break(caddr_t nsize); } 18 AUE_NULL MSTD { int svr4_sys_stat(char* path, \ struct svr4_stat* ub); } 19 AUE_NULL MNOPROTO { int lseek(int filedes, off_t *offset, \ ==== //depot/projects/arm/src/sys/conf/NOTES#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1367 2006/06/19 22:11:44 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1369 2006/06/26 22:03:21 babkin Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # ==== //depot/projects/arm/src/sys/conf/options#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.546 2006/06/13 13:12:55 davidxu Exp $ +# $FreeBSD: src/sys/conf/options,v 1.548 2006/06/26 22:03:21 babkin Exp $ # # On the handling of kernel options # ==== //depot/projects/arm/src/sys/dev/acpica/acpi_dock.c#3 (text) ==== @@ -23,25 +23,20 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_dock.c,v 1.2 2006/04/16 15:35:12 maxim Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_dock.c,v 1.3 2006/06/22 06:34:05 njl Exp $ */ #include "opt_acpi.h" #include +#include #include -#include - -#include - -#include #include #include +#include #include #include -#include - /* Hooks for the ACPI CA debugging infrastructure */ #define _COMPONENT ACPI_DOCK ACPI_MODULE_NAME("DOCK") @@ -56,6 +51,10 @@ #define ACPI_DOCK_STATUS_UNDOCKED 0 #define ACPI_DOCK_STATUS_DOCKED 1 +/* Prevent the device from being removed or not. */ +#define ACPI_DOCK_UNLOCK 0 +#define ACPI_DOCK_LOCK 1 + struct acpi_dock_softc { int _sta; int _bdn; @@ -68,10 +67,10 @@ /* Global docking status, for avoiding duplicated docking */ static int acpi_dock_status = ACPI_DOCK_STATUS_UNKNOWN; -ACPI_SERIAL_DECL(dock, "ACPI Dock Station"); +ACPI_SERIAL_DECL(dock, "ACPI Docking Station"); /* - * Utility + * Utility functions */ static void @@ -83,23 +82,15 @@ sc = device_get_softc(dev); h = acpi_get_handle(dev); - if (ACPI_FAILURE(acpi_GetInteger(h, "_STA", &sc->_sta))) { + if (ACPI_FAILURE(acpi_GetInteger(h, "_STA", &sc->_sta))) sc->_sta = ACPI_DOCK_STATUS_UNKNOWN; - } - ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), - "_STA = %04x\n", sc->_sta); - - if (ACPI_FAILURE(acpi_GetInteger(h, "_BDN", &sc->_bdn))) { + if (ACPI_FAILURE(acpi_GetInteger(h, "_BDN", &sc->_bdn))) sc->_bdn = ACPI_DOCK_STATUS_UNKNOWN; - } - ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), - "_BDN = %04x\n", sc->_bdn); - - if (ACPI_FAILURE(acpi_GetInteger(h, "_UID", &sc->_uid))) { + if (ACPI_FAILURE(acpi_GetInteger(h, "_UID", &sc->_uid))) sc->_uid = ACPI_DOCK_STATUS_UNKNOWN; - } ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), - "_UID = %04x\n", sc->_uid); + "_STA: %04x, _BDN: %04x, _UID: %04x\n", sc->_sta, + sc->_bdn, sc->_uid); } static int @@ -122,23 +113,21 @@ buf.Length = sizeof(retobj); status = AcpiEvaluateObject(h, "_DCK", &args, &buf); - if (dock == ACPI_DOCK_STATUS_UNDOCKED) { - /* - * When _DCK is called with 0, OSPM will ignore the return value. - */ + /* + * When _DCK is called with 0, OSPM will ignore the return value. + */ + if (dock == ACPI_DOCK_STATUS_UNDOCKED) return (0); - } - if (ACPI_SUCCESS(status)) { - if (retobj.Type == ACPI_TYPE_INTEGER && - retobj.Integer.Value == 1) { - return (0); - } - } + /* If _DCK returned 1, the request succeeded. */ + if (ACPI_SUCCESS(status) && retobj.Type == ACPI_TYPE_INTEGER && + retobj.Integer.Value == 1) + return (0); return (-1); } +/* Lock devices while docked. */ static void acpi_dock_execute_lck(device_t dev, int lock) { @@ -158,10 +147,8 @@ h = acpi_get_handle(dev); snprintf(ejx, sizeof(ejx), "_EJ%d", state); status = acpi_SetInteger(h, ejx, eject); - - if (ACPI_SUCCESS(status)) { + if (ACPI_SUCCESS(status)) return (0); - } return (-1); } @@ -179,17 +166,12 @@ ejd_buffer.Pointer = NULL; ejd_buffer.Length = ACPI_ALLOCATE_BUFFER; ret_status = AcpiEvaluateObject(handle, "_EJD", NULL, &ejd_buffer); - - if (ACPI_FAILURE(ret_status)) { + if (ACPI_FAILURE(ret_status)) goto out; - } obj = (ACPI_OBJECT *)ejd_buffer.Pointer; - if (dock_handle != acpi_GetReference(NULL, obj)) { - goto out; - } - - ret = 1; + if (dock_handle == acpi_GetReference(NULL, obj)) + ret = 1; out: if (ejd_buffer.Pointer != NULL) @@ -199,7 +181,7 @@ } /* - * Dock + * Docking functions */ static void @@ -209,9 +191,8 @@ dev = (device_t)context; - if (!device_is_enabled(dev)) { + if (!device_is_enabled(dev)) device_enable(dev); - } mtx_lock(&Giant); device_probe_and_attach(dev); @@ -219,7 +200,8 @@ } static ACPI_STATUS -acpi_dock_insert_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status) +acpi_dock_insert_child(ACPI_HANDLE handle, UINT32 level, void *context, + void **status) { device_t dock_dev, dev; ACPI_HANDLE dock_handle; @@ -227,9 +209,8 @@ dock_dev = (device_t)context; dock_handle = acpi_get_handle(dock_dev); - if (!acpi_dock_is_ejd_device(dock_handle, handle)) { + if (!acpi_dock_is_ejd_device(dock_handle, handle)) goto out; - } ACPI_VPRINT(dock_dev, acpi_device_get_parent_softc(dock_dev), "inserting device for %s\n", acpi_name(handle)); @@ -251,8 +232,7 @@ dev = acpi_get_device(handle); if (dev == NULL) { - ACPI_VPRINT(dock_dev, acpi_device_get_parent_softc(dock_dev), - "%s has no device, something wrong\n", + device_printf(dock_dev, "error: %s has no associated device\n", acpi_name(handle)); goto out; } @@ -266,9 +246,11 @@ static void acpi_dock_insert_children(device_t dev) { + ACPI_STATUS status; ACPI_HANDLE sb_handle; - if (ACPI_SUCCESS(AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_SB_", &sb_handle))) { + status = AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_SB_", &sb_handle); + if (ACPI_SUCCESS(status)) { AcpiWalkNamespace(ACPI_TYPE_DEVICE, sb_handle, 100, acpi_dock_insert_child, dev, NULL); } @@ -287,26 +269,25 @@ if (acpi_dock_status == ACPI_DOCK_STATUS_UNDOCKED || acpi_dock_status == ACPI_DOCK_STATUS_UNKNOWN) { - acpi_dock_execute_lck(dev, 1); + acpi_dock_execute_lck(dev, ACPI_DOCK_LOCK); if (acpi_dock_execute_dck(dev, 1) != 0) { device_printf(dev, "_DCK failed\n"); return; } - if (!cold) { + if (!cold) acpi_dock_insert_children(dev); - } sc->status = acpi_dock_status = ACPI_DOCK_STATUS_DOCKED; } } - /* * Undock */ static ACPI_STATUS -acpi_dock_eject_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status) +acpi_dock_eject_child(ACPI_HANDLE handle, UINT32 level, void *context, + void **status) { device_t dock_dev, dev; ACPI_HANDLE dock_handle; @@ -314,12 +295,11 @@ dock_dev = *(device_t *)context; dock_handle = acpi_get_handle(dock_dev); - if (!acpi_dock_is_ejd_device(dock_handle, handle)) { + if (!acpi_dock_is_ejd_device(dock_handle, handle)) goto out; - } ACPI_VPRINT(dock_dev, acpi_device_get_parent_softc(dock_dev), - "ejecting device for %s\n", acpi_name(handle)); + "ejecting device for %s\n", acpi_name(handle)); dev = acpi_get_device(handle); if (dev != NULL && device_is_attached(dev)) { @@ -337,8 +317,10 @@ acpi_dock_eject_children(device_t dev) { ACPI_HANDLE sb_handle; + ACPI_STATUS status; - if (ACPI_SUCCESS(AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_SB_", &sb_handle))) { + status = AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_SB_", &sb_handle); + if (ACPI_SUCCESS(status)) { AcpiWalkNamespace(ACPI_TYPE_DEVICE, sb_handle, 100, acpi_dock_eject_child, &dev, NULL); } @@ -355,11 +337,10 @@ if (acpi_dock_status == ACPI_DOCK_STATUS_DOCKED || acpi_dock_status == ACPI_DOCK_STATUS_UNKNOWN) { acpi_dock_eject_children(dev); - if (acpi_dock_execute_dck(dev, 0) != 0) { + if (acpi_dock_execute_dck(dev, 0) != 0) return; - } - acpi_dock_execute_lck(dev, 0); + acpi_dock_execute_lck(dev, ACPI_DOCK_UNLOCK); if (acpi_dock_execute_ejx(dev, 1, 0) != 0) { device_printf(dev, "_EJ0 failed\n"); @@ -370,9 +351,8 @@ } acpi_dock_get_info(dev); - if (sc->_sta != 0) { - device_printf(dev, "mechanical failures (%#x).\n", sc->_sta); - } + if (sc->_sta != 0) + device_printf(dev, "mechanical failure (%#x).\n", sc->_sta); } /* @@ -393,12 +373,10 @@ * If the _STA indicates 'present' and 'functioning', * the system is docked. */ - if (ACPI_DEVICE_PRESENT(sc->_sta)) { + if (ACPI_DEVICE_PRESENT(sc->_sta)) acpi_dock_insert(dev); - } - if (sc->_sta == 0x0) { + if (sc->_sta == 0) acpi_dock_removal(dev); - } } /* @@ -420,11 +398,9 @@ case ACPI_DOCK_NOTIFY_DEVICE_CHECK: acpi_dock_device_check(dev); break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 26 22:29:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2329416A52A; Mon, 26 Jun 2006 22:29:55 +0000 (UTC) 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 C4D7E16A51D; Mon, 26 Jun 2006 22:29:54 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E8A3446CF; Mon, 26 Jun 2006 22:05:19 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k5QM5FvJ086648; Mon, 26 Jun 2006 18:05:18 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Kip Macy Date: Mon, 26 Jun 2006 17:59:22 -0400 User-Agent: KMail/1.9.1 References: <200606262051.k5QKp8b3022216@repoman.freebsd.org> In-Reply-To: <200606262051.k5QKp8b3022216@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200606261759.23136.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Mon, 26 Jun 2006 18:05:18 -0400 (EDT) X-Virus-Scanned: ClamAV 0.87.1/1564/Mon Jun 26 10:55:16 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 100088 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, 26 Jun 2006 22:29:55 -0000 On Monday 26 June 2006 16:51, Kip Macy wrote: > http://perforce.freebsd.org/chv.cgi?CH=100088 > > Change 100088 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/26 20:50:54 > > allow turnstiles to handle sleeping for us I thought this wasn't safe as some places wanted to sleep while holding the filedesc lock. Maybe in select? > Affected files ... > > .. //depot/projects/kmacy_sun4v/src/sys/sys/filedesc.h#5 edit > > Differences ... > > ==== //depot/projects/kmacy_sun4v/src/sys/sys/filedesc.h#5 (text+ko) ==== > > @@ -96,60 +96,11 @@ > #ifdef _KERNEL > > /* Lock a file descriptor table. */ > -#define FILEDESC_LOCK(fd) \ > - do { \ > - mtx_lock(&(fd)->fd_mtx); \ > - (fd)->fd_wanted++; \ > - while ((fd)->fd_locked) \ > - msleep(&(fd)->fd_locked, &(fd)->fd_mtx, PLOCK, "fdesc", 0); \ > - (fd)->fd_locked = 2; \ > - (fd)->fd_wanted--; \ > - mtx_unlock(&(fd)->fd_mtx); \ > - } while (0) > - > -#define FILEDESC_UNLOCK(fd) \ > - do { \ > - mtx_lock(&(fd)->fd_mtx); \ > - KASSERT((fd)->fd_locked == 2, \ > - ("fdesc locking mistake %d should be %d", (fd)->fd_locked, 2)); \ > - (fd)->fd_locked = 0; \ > - if ((fd)->fd_wanted) \ > - wakeup_one(&(fd)->fd_locked); \ > - mtx_unlock(&(fd)->fd_mtx); \ > - } while (0) > - > -#define FILEDESC_LOCK_FAST(fd) \ > - do { \ > - mtx_lock(&(fd)->fd_mtx); \ > - (fd)->fd_wanted++; \ > - while ((fd)->fd_locked) \ > - msleep(&(fd)->fd_locked, &(fd)->fd_mtx, PLOCK, "fdesc", 0); \ > - (fd)->fd_locked = 1; \ > - (fd)->fd_wanted--; \ > - } while (0) > - > -#define FILEDESC_UNLOCK_FAST(fd) \ > - do { \ > - KASSERT((fd)->fd_locked == 1, \ > - ("fdesc locking mistake %d should be %d", (fd)->fd_locked, 1)); \ > - (fd)->fd_locked = 0; \ > - if ((fd)->fd_wanted) \ > - wakeup_one(&(fd)->fd_locked); \ > - mtx_unlock(&(fd)->fd_mtx); \ > - } while (0) > - > -#ifdef INVARIANT_SUPPORT > -#define FILEDESC_LOCK_ASSERT(fd, arg) \ > - do { \ > - if ((arg) == MA_OWNED) \ > - KASSERT((fd)->fd_locked != 0, ("fdesc locking mistake")); \ > - else \ > - KASSERT((fd)->fd_locked == 0, ("fdesc locking mistake")); \ > - } while (0) > -#else > -#define FILEDESC_LOCK_ASSERT(fd, arg) > -#endif > - > +#define FILEDESC_LOCK(fd) mtx_lock(&(fd)->fd_mtx); > +#define FILEDESC_LOCK_FAST(fd) mtx_lock(&(fd)->fd_mtx); > +#define FILEDESC_UNLOCK(fd) mtx_unlock(&(fd)->fd_mtx); > +#define FILEDESC_UNLOCK_FAST(fd) mtx_unlock(&(fd)->fd_mtx); > +#define FILEDESC_LOCK_ASSERT(fd, arg) mtx_assert(&(fd)->fd_mtx, arg) > #define FILEDESC_LOCK_DESC "filedesc structure" > > struct thread; > -- John Baldwin From owner-p4-projects@FreeBSD.ORG Mon Jun 26 22:29:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6088216A4CE; Mon, 26 Jun 2006 22:29:55 +0000 (UTC) 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 E272D16A51F; Mon, 26 Jun 2006 22:29:54 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B3E7446F8; Mon, 26 Jun 2006 22:05:20 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k5QM5FvK086648; Mon, 26 Jun 2006 18:05:19 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Kip Macy Date: Mon, 26 Jun 2006 17:59:41 -0400 User-Agent: KMail/1.9.1 References: <200606262054.k5QKsDq7022302@repoman.freebsd.org> In-Reply-To: <200606262054.k5QKsDq7022302@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200606261759.41541.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Mon, 26 Jun 2006 18:05:19 -0400 (EDT) X-Virus-Scanned: ClamAV 0.87.1/1564/Mon Jun 26 10:55:16 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 100089 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, 26 Jun 2006 22:29:55 -0000 On Monday 26 June 2006 16:54, Kip Macy wrote: > http://perforce.freebsd.org/chv.cgi?CH=100089 > > Change 100089 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/26 20:53:51 > > add profiling for rwlocks > not convinced of correctness as there don't appear to be any contended rwlocks on my workloads Few things use them currently. I have a patch to make the name cache use them if you want it. > Affected files ... > > .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_rwlock.c#4 edit > > Differences ... > > ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_rwlock.c#4 (text+ko) ==== > > @@ -44,7 +44,7 @@ > #include > #include > #include > - > +#include > #include > > #ifdef DDB > @@ -80,12 +80,19 @@ > #define _rw_assert(rw, what, file, line) > #endif > > +#ifdef SMP > +#define smp_turnstile_valid(obj) (turnstile_lookup((obj)) != NULL) > +#else > +#define smp_turnstile(obj) > +#endif > + > void > rw_init(struct rwlock *rw, const char *name) > { > > rw->rw_lock = RW_UNLOCKED; > > + lock_profile_init(&rw->rw_object, name); > lock_init(&rw->rw_object, &lock_class_rw, name, NULL, LO_WITNESS | > LO_RECURSABLE | LO_UPGRADABLE); > } > @@ -95,6 +102,7 @@ > { > > KASSERT(rw->rw_lock == RW_UNLOCKED, ("rw lock not unlocked")); > + lock_profile_destroy(&rw->rw_object); > lock_destroy(&rw->rw_object); > } > > @@ -109,14 +117,17 @@ > void > _rw_wlock(struct rwlock *rw, const char *file, int line) > { > - > + uint64_t waitstart; > + > MPASS(curthread != NULL); > KASSERT(rw_wowner(rw) != curthread, > ("%s (%s): wlock already held @ %s:%d", __func__, > rw->rw_object.lo_name, file, line)); > WITNESS_CHECKORDER(&rw->rw_object, LOP_NEWORDER | LOP_EXCLUSIVE, file, > line); > + lock_profile_waitstart(&waitstart); > __rw_wlock(rw, curthread, file, line); > + lock_profile_obtain_lock_success(&rw->rw_object, waitstart, file, line); > LOCK_LOG_LOCK("WLOCK", &rw->rw_object, 0, 0, file, line); > WITNESS_LOCK(&rw->rw_object, LOP_EXCLUSIVE, file, line); > } > @@ -129,6 +140,7 @@ > _rw_assert(rw, RA_WLOCKED, file, line); > WITNESS_UNLOCK(&rw->rw_object, LOP_EXCLUSIVE, file, line); > LOCK_LOG_LOCK("WUNLOCK", &rw->rw_object, 0, 0, file, line); > + lock_profile_release_lock(&rw->rw_object); > __rw_wunlock(rw, curthread, file, line); > } > > @@ -139,6 +151,8 @@ > volatile struct thread *owner; > #endif > uintptr_t x; > + uint64_t waitstart; > + int contested; > > KASSERT(rw_wowner(rw) != curthread, > ("%s (%s): wlock already held @ %s:%d", __func__, > @@ -156,6 +170,7 @@ > * be blocked on the writer, and the writer would be blocked > * waiting for the reader to release its original read lock. > */ > + lock_profile_waitstart(&waitstart); > for (;;) { > /* > * Handle the easy case. If no other thread has a write > @@ -169,7 +184,6 @@ > */ > x = rw->rw_lock; > if (x & RW_LOCK_READ) { > - > /* > * The RW_LOCK_READ_WAITERS flag should only be set > * if another thread currently holds a write lock, > @@ -178,6 +192,9 @@ > MPASS((x & RW_LOCK_READ_WAITERS) == 0); > if (atomic_cmpset_acq_ptr(&rw->rw_lock, x, > x + RW_ONE_READER)) { > + if ((x & ((1< + lock_profile_obtain_lock_success(&rw->rw_object, waitstart, file, line); > + > if (LOCK_LOG_TEST(&rw->rw_object, 0)) > CTR4(KTR_LOCK, > "%s: %p succeed %p -> %p", __func__, > @@ -186,6 +203,7 @@ > break; > } > cpu_spinwait(); > + lock_profile_obtain_lock_failed(&rw->rw_object, &contested); > continue; > } > > @@ -234,6 +252,7 @@ > */ > owner = (struct thread *)RW_OWNER(x); > if (TD_IS_RUNNING(owner)) { > + lock_profile_obtain_lock_failed(&rw->rw_object, &contested); > turnstile_release(&rw->rw_object); > if (LOCK_LOG_TEST(&rw->rw_object, 0)) > CTR3(KTR_LOCK, "%s: spinning on %p held by %p", > @@ -279,7 +298,6 @@ > LOCK_LOG_LOCK("RUNLOCK", &rw->rw_object, 0, 0, file, line); > > /* TODO: drop "owner of record" here. */ > - > for (;;) { > /* > * See if there is more than one read lock held. If so, > @@ -297,7 +315,8 @@ > break; > } > continue; > - } > + } else > + lock_profile_release_lock(&rw->rw_object); > > /* > * We should never have read waiters while at least one > @@ -328,7 +347,8 @@ > break; > } > continue; > - } > + } > + > > /* > * There should just be one reader with one or more > @@ -394,6 +414,7 @@ > volatile struct thread *owner; > #endif > uintptr_t v; > + int contested; > > if (LOCK_LOG_TEST(&rw->rw_object, 0)) > CTR5(KTR_LOCK, "%s: %s contested (lock=%p) at %s:%d", __func__, > @@ -434,6 +455,7 @@ > } > turnstile_release(&rw->rw_object); > cpu_spinwait(); > + lock_profile_obtain_lock_failed(&rw->rw_object, &contested); > continue; > } > > @@ -447,6 +469,7 @@ > v | RW_LOCK_WRITE_WAITERS)) { > turnstile_release(&rw->rw_object); > cpu_spinwait(); > + lock_profile_obtain_lock_failed(&rw->rw_object, &contested); > continue; > } > if (LOCK_LOG_TEST(&rw->rw_object, 0)) > @@ -462,6 +485,7 @@ > */ > owner = (struct thread *)RW_OWNER(v); > if (!(v & RW_LOCK_READ) && TD_IS_RUNNING(owner)) { > + lock_profile_obtain_lock_failed(&rw->rw_object, &contested); > turnstile_release(&rw->rw_object); > if (LOCK_LOG_TEST(&rw->rw_object, 0)) > CTR3(KTR_LOCK, "%s: spinning on %p held by %p", > @@ -629,11 +653,7 @@ > v = rw->rw_lock & RW_LOCK_WRITE_WAITERS; > success = atomic_cmpset_acq_ptr(&rw->rw_lock, RW_READERS_LOCK(1) | v, > tid | v); > -#ifdef SMP > - if (success && v && turnstile_lookup(&rw->rw_object) != NULL) > -#else > - if (success && v) > -#endif > + if (success && v && smp_turnstile_valid(&rw->rw_object)) > turnstile_claim(&rw->rw_object); > else > turnstile_release(&rw->rw_object); > -- John Baldwin From owner-p4-projects@FreeBSD.ORG Mon Jun 26 23:14:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE90B16A409; Mon, 26 Jun 2006 23:14:37 +0000 (UTC) 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 9968116A405; Mon, 26 Jun 2006 23:14:37 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2EC7743D62; Mon, 26 Jun 2006 23:14:33 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id B2A0946B9B; Mon, 26 Jun 2006 19:14:32 -0400 (EDT) Date: Tue, 27 Jun 2006 00:14:32 +0100 (BST) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: John Baldwin In-Reply-To: <200606261759.41541.jhb@freebsd.org> Message-ID: <20060627001336.T79454@fledge.watson.org> References: <200606262054.k5QKsDq7022302@repoman.freebsd.org> <200606261759.41541.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews , Kip Macy Subject: Re: PERFORCE change 100089 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, 26 Jun 2006 23:14:38 -0000 On Mon, 26 Jun 2006, John Baldwin wrote: > On Monday 26 June 2006 16:54, Kip Macy wrote: >> http://perforce.freebsd.org/chv.cgi?CH=100089 >> >> Change 100089 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/26 > 20:53:51 >> >> add profiling for rwlocks >> not convinced of correctness as there don't appear to be any contended > rwlocks on my workloads > > Few things use them currently. I have a patch to make the name cache use > them if you want it. You may already have seen this, but I have a UNIX domain socket re-locking in //depot/user/rwatson/proto/src/sys/kern/uipc_usrreq.c that uses rwlocks and finer-grained mutexes, among other things. Ideally this can generate some contention (although perhaps not too much). Robert N M Watson Computer Laboratory University of Cambridge From owner-p4-projects@FreeBSD.ORG Mon Jun 26 23:15:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB3A916A406; Mon, 26 Jun 2006 23:15:21 +0000 (UTC) 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 8915D16A401; Mon, 26 Jun 2006 23:15:21 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D9CB43D62; Mon, 26 Jun 2006 23:15:17 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id ED8BC46B9B; Mon, 26 Jun 2006 19:15:16 -0400 (EDT) Date: Tue, 27 Jun 2006 00:15:16 +0100 (BST) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: John Baldwin In-Reply-To: <200606261759.23136.jhb@freebsd.org> Message-ID: <20060627001445.P79454@fledge.watson.org> References: <200606262051.k5QKp8b3022216@repoman.freebsd.org> <200606261759.23136.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews , Kip Macy Subject: Re: PERFORCE change 100088 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, 26 Jun 2006 23:15:21 -0000 On Mon, 26 Jun 2006, John Baldwin wrote: > On Monday 26 June 2006 16:51, Kip Macy wrote: >> http://perforce.freebsd.org/chv.cgi?CH=100088 >> >> Change 100088 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/26 > 20:50:54 >> >> allow turnstiles to handle sleeping for us > > I thought this wasn't safe as some places wanted to sleep while holding the > filedesc lock. Maybe in select? The only case I explicitly know of where a sleep might be attempted in select() is a bug in MAC. However, I could remember, last time Kip and I chatted, if there were other places or not. Robert N M Watson Computer Laboratory University of Cambridge From owner-p4-projects@FreeBSD.ORG Mon Jun 26 23:37:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA81416A4D0; Mon, 26 Jun 2006 23:37:09 +0000 (UTC) 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 943CE16A4CA for ; Mon, 26 Jun 2006 23:37:09 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 618964497B for ; Mon, 26 Jun 2006 14:04:24 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QE4OOh073578 for ; Mon, 26 Jun 2006 14:04:24 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QE4NGX073575 for perforce@freebsd.org; Mon, 26 Jun 2006 14:04:23 GMT (envelope-from piso@freebsd.org) Date: Mon, 26 Jun 2006 14:04:23 GMT Message-Id: <200606261404.k5QE4NGX073575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 100058 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, 26 Jun 2006 23:37:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=100058 Change 100058 by piso@piso_newluxor on 2006/06/26 14:03:38 Add a filter parameter to nexus_setup_intr() and ia64_setup_intr(). Affected files ... .. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#3 edit .. //depot/projects/soc2006/intr_filter/ia64/ia64/nexus.c#2 edit .. //depot/projects/soc2006/intr_filter/ia64/include/intr.h#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#3 (text+ko) ==== @@ -283,8 +283,9 @@ } int -ia64_setup_intr(const char *name, int irq, driver_intr_t handler, void *arg, - enum intr_type flags, void **cookiep, volatile long *cntp) +ia64_setup_intr(const char *name, int irq, driver_intr_t handler, + driver_filter_t filter,void *arg, enum intr_type flags, + void **cookiep, volatile long *cntp) { struct ia64_intr *i; int errcode; @@ -331,7 +332,7 @@ } /* Second, add this handler. */ - errcode = intr_event_add_handler(i->event, name, handler, arg, + errcode = intr_event_add_handler(i->event, name, filter, handler, arg, intr_priority(flags), flags, cookiep); if (errcode) return errcode; ==== //depot/projects/soc2006/intr_filter/ia64/ia64/nexus.c#2 (text+ko) ==== @@ -92,7 +92,7 @@ static int nexus_release_resource(device_t, device_t, int, int, struct resource *); static int nexus_setup_intr(device_t, device_t, struct resource *, int flags, - void (*)(void *), void *, void **); + driver_filter_t filter, void (*)(void *), void *, void **); static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); static struct resource_list *nexus_get_reslist(device_t dev, device_t child); @@ -467,7 +467,8 @@ */ static int nexus_setup_intr(device_t bus, device_t child, struct resource *irq, - int flags, void (*ihand)(void *), void *arg, void **cookiep) + int flags, driver_filter_t filter, void (*ihand)(void *), + void *arg, void **cookiep) { driver_t *driver; int error; @@ -490,7 +491,7 @@ return (error); error = ia64_setup_intr(device_get_nameunit(child), - rman_get_start(irq), ihand, arg, flags, cookiep, 0); + rman_get_start(irq), filter, ihand, arg, flags, cookiep, 0); return (error); } ==== //depot/projects/soc2006/intr_filter/ia64/include/intr.h#2 (text+ko) ==== @@ -51,9 +51,9 @@ struct sapic; void ia64_add_sapic(struct sapic *sa); -int ia64_setup_intr(const char *name, int irq, driver_intr_t handler, - void *arg, enum intr_type flags, void **cookiep, - volatile long *cntp); +int ia64_setup_intr(const char *name, int irq, driver_intr_t handler, + driver_filter_t filter, void *arg, enum intr_type flags, + void **cookiep, volatile long *cntp); int ia64_teardown_intr(void *cookie); void ia64_dispatch_intr(void *frame, unsigned long vector); From owner-p4-projects@FreeBSD.ORG Mon Jun 26 23:38:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9CC816A403; Mon, 26 Jun 2006 23:38:40 +0000 (UTC) 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 74EA316A401 for ; Mon, 26 Jun 2006 23:38:40 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03A3843F8E for ; Mon, 26 Jun 2006 23:17:19 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QNHIBd047015 for ; Mon, 26 Jun 2006 23:17:18 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QNHIl9047012 for perforce@freebsd.org; Mon, 26 Jun 2006 23:17:18 GMT (envelope-from imp@freebsd.org) Date: Mon, 26 Jun 2006 23:17:18 GMT Message-Id: <200606262317.k5QNHIl9047012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 100100 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, 26 Jun 2006 23:38:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=100100 Change 100100 by imp@imp_lighthouse on 2006/06/26 23:16:23 Enter dumbass mode... Oh, wait, Exit dumbass mode... Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_piovar.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jun 27 00:06:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7ACF616A5A1; Tue, 27 Jun 2006 00:06:12 +0000 (UTC) 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 B5F0616A586 for ; Tue, 27 Jun 2006 00:06:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 97C2843F3F for ; Mon, 26 Jun 2006 23:42:22 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QNg5X0048317 for ; Mon, 26 Jun 2006 23:42:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QNg49O048314 for perforce@freebsd.org; Mon, 26 Jun 2006 23:42:04 GMT (envelope-from jb@freebsd.org) Date: Mon, 26 Jun 2006 23:42:04 GMT Message-Id: <200606262342.k5QNg49O048314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100102 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, 27 Jun 2006 00:06:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=100102 Change 100102 by jb@jb_freebsd2 on 2006/06/26 23:41:41 Integrate OpenSolaris ON (OS/Net) Consolidation - 20060619 Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/debug.h#4 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pexecname.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#20 integrate Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/debug.h#4 (text) ==== @@ -27,7 +27,7 @@ #ifndef _DEBUG_H #define _DEBUG_H -#pragma ident "@(#)debug.h 1.137 06/05/09 SMI" +#pragma ident "@(#)debug.h 1.138 06/06/07 SMI" /* * Global include file for lddbg debugging. @@ -642,7 +642,7 @@ extern void Dbg_file_reuse(Lm_list *, const char *, const char *); extern void Dbg_file_skip(Lm_list *, const char *, const char *); -extern void Dbg_got_display(Ofl_desc *, Gottable *); +extern void Dbg_got_display(Ofl_desc *, Off, int); extern void Dbg_libs_audit(Lm_list *, const char *, const char *); extern void Dbg_libs_find(Lm_list *, const char *); @@ -767,7 +767,8 @@ extern void Dbg_syms_up_title(Lm_list *); extern void Dbg_tls_modactivity(Lm_list *, void *, uint_t); -extern void Dbg_tls_static_block(Lm_list *, void *, ulong_t); +extern void Dbg_tls_static_block(Lm_list *, void *, ulong_t, ulong_t); +extern void Dbg_tls_static_resv(Rt_map *, ulong_t, ulong_t); extern void Dbg_util_broadcast(Rt_map *); extern void Dbg_util_call_array(Rt_map *, void *, int, Word); ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pexecname.c#2 (text) ==== @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,11 +19,11 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "@(#)Pexecname.c 1.4 05/06/08 SMI" +#pragma ident "@(#)Pexecname.c 1.5 06/06/14 SMI" #define __EXTENSIONS__ #include @@ -127,8 +126,8 @@ if (try_exec(cwd, path, buf, isexec, isdata)) goto found; - if (strchr(path, '/') != NULL && basename(path) != NULL && - try_exec(cwd, path, buf, isexec, isdata)) + if (strchr(path, '/') != NULL && (p = basename(path)) != NULL && + try_exec(cwd, p, buf, isexec, isdata)) goto found; } @@ -146,8 +145,8 @@ if (try_exec(cwd, path, buf, isexec, isdata)) goto found; - if (strchr(path, '/') != NULL && basename(path) != NULL && - try_exec(cwd, path, buf, isexec, isdata)) + if (strchr(path, '/') != NULL && (p = basename(path)) != NULL && + try_exec(cwd, p, buf, isexec, isdata)) goto found; } @@ -162,8 +161,8 @@ if (try_exec(cwd, path, buf, isexec, isdata)) goto found; - if (strchr(path, '/') != NULL && basename(path) != NULL && - try_exec(cwd, path, buf, isexec, isdata)) + if (strchr(path, '/') != NULL && (p = basename(path)) != NULL && + try_exec(cwd, p, buf, isexec, isdata)) goto found; } ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#20 (text) ==== @@ -28,7 +28,7 @@ #define _SYS_DTRACE_H #if defined(sun) -#pragma ident "@(#)dtrace.h 1.30 06/03/30 SMI" +#pragma ident "@(#)dtrace.h 1.31 06/06/12 SMI" #endif #ifdef __cplusplus @@ -2202,7 +2202,6 @@ struct regs; extern int (*dtrace_pid_probe_ptr)(struct regs *); -extern int (*dtrace_fasttrap_probe_ptr)(struct regs *); extern int (*dtrace_return_probe_ptr)(struct regs *); extern void (*dtrace_fasttrap_fork_ptr)(proc_t *, proc_t *); extern void (*dtrace_fasttrap_exec_ptr)(proc_t *); From owner-p4-projects@FreeBSD.ORG Tue Jun 27 00:06:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7080816A88E; Tue, 27 Jun 2006 00:06:27 +0000 (UTC) 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 0CAFB16A851; Tue, 27 Jun 2006 00:06:27 +0000 (UTC) (envelope-from arr@watson.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAAB14416A; Mon, 26 Jun 2006 23:46:59 +0000 (GMT) (envelope-from arr@watson.org) Received: from fledge.watson.org (localhost.watson.org [127.0.0.1]) by fledge.watson.org (8.13.6/8.13.6) with ESMTP id k5QNkvbp070638; Mon, 26 Jun 2006 19:46:57 -0400 (EDT) (envelope-from arr@watson.org) Received: from localhost (arr@localhost) by fledge.watson.org (8.13.6/8.13.6/Submit) with ESMTP id k5QNkv63070635; Mon, 26 Jun 2006 19:46:57 -0400 (EDT) (envelope-from arr@watson.org) X-Authentication-Warning: fledge.watson.org: arr owned process doing -bs Date: Mon, 26 Jun 2006 19:46:57 -0400 (EDT) From: "Andrew R. Reiter" To: Warner Losh In-Reply-To: <200606262317.k5QNHIl9047012@repoman.freebsd.org> Message-ID: <20060626194642.F69381@fledge.watson.org> References: <200606262317.k5QNHIl9047012@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Perforce Change Reviews Subject: Re: PERFORCE change 100100 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, 27 Jun 2006 00:06:32 -0000 On Mon, 26 Jun 2006, Warner Losh wrote: :http://perforce.freebsd.org/chv.cgi?CH=100100 : :Change 100100 by imp@imp_lighthouse on 2006/06/26 23:16:23 : : Enter dumbass mode... Oh, wait, Exit dumbass mode... Suree.... you just wanted 100100 :-P : :Affected files ... : :.. //depot/projects/arm/src/sys/arm/at91/at91_piovar.h#1 add : :Differences ... : : -- arr@watson.org From owner-p4-projects@FreeBSD.ORG Tue Jun 27 00:42:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E97E216A40B; Tue, 27 Jun 2006 00:42:24 +0000 (UTC) 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 A721D16A409 for ; Tue, 27 Jun 2006 00:42:24 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5603943D53 for ; Tue, 27 Jun 2006 00:42:22 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5R0gMpl052105 for ; Tue, 27 Jun 2006 00:42:22 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5R0gMHn052102 for perforce@freebsd.org; Tue, 27 Jun 2006 00:42:22 GMT (envelope-from imp@freebsd.org) Date: Tue, 27 Jun 2006 00:42:22 GMT Message-Id: <200606270042.k5R0gMHn052102@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 100106 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, 27 Jun 2006 00:42:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=100106 Change 100106 by imp@imp_lighthouse on 2006/06/27 00:42:05 This is the wrong thing to enable. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#27 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#27 (text+ko) ==== @@ -386,7 +386,6 @@ WR4(&sc->sc_bas, PDC_TPR, addr); WR4(&sc->sc_bas, PDC_TCR, sc->sc_txdatasz); WR4(&sc->sc_bas, PDC_PTCR, PDC_PTCR_TXTEN); - WR4(&sc->sc_bas, USART_IER, USART_CSR_TXRDY); uart_unlock(sc->sc_hwmtx); if (device_get_unit(sc->sc_dev)) device_printf(sc->sc_dev, "transmit %d bytes\n", sc->sc_txdatasz); From owner-p4-projects@FreeBSD.ORG Tue Jun 27 00:49:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FE0C16A404; Tue, 27 Jun 2006 00:49:43 +0000 (UTC) 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 F266816A400 for ; Tue, 27 Jun 2006 00:49:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27BE243D96 for ; Tue, 27 Jun 2006 00:49:32 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5R0nWJ9060104 for ; Tue, 27 Jun 2006 00:49:32 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5R0nWp5060101 for perforce@freebsd.org; Tue, 27 Jun 2006 00:49:32 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 27 Jun 2006 00:49:32 GMT Message-Id: <200606270049.k5R0nWp5060101@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100107 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, 27 Jun 2006 00:49:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=100107 Change 100107 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/27 00:48:36 move out error checking out of the lock held path in _fget Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_descrip.c#9 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_descrip.c#9 (text+ko) ==== @@ -1965,30 +1965,35 @@ if (td == NULL || (fdp = td->td_proc->p_fd) == NULL) return (EBADF); FILEDESC_LOCK(fdp); - if ((fp = fget_locked(fdp, fd)) == NULL || fp->f_ops == &badfileops) { + if ((fp = fget_locked(fdp, fd)) == NULL) { + hold = 0; + goto fail; + } + if (hold) { + fhold(fp); FILEDESC_UNLOCK(fdp); - return (EBADF); } - + *fpp = fp; + if (fp->f_ops == &badfileops) + goto fail; /* * FREAD and FWRITE failure return EBADF as per POSIX. * * Only one flag, or 0, may be specified. */ - if (flags == FREAD && (fp->f_flag & FREAD) == 0) { + if (flags == FREAD && (fp->f_flag & FREAD) == 0) + goto fail; + if (flags == FWRITE && (fp->f_flag & FWRITE) == 0) + goto fail; + return (0); + fail: + if (hold) { + FILEDESC_LOCK(fdp); + fdrop(fp, curthread); FILEDESC_UNLOCK(fdp); - return (EBADF); - } - if (flags == FWRITE && (fp->f_flag & FWRITE) == 0) { + } else FILEDESC_UNLOCK(fdp); - return (EBADF); - } - if (hold) { - fhold(fp); - FILEDESC_UNLOCK(fdp); - } - *fpp = fp; - return (0); + return (EBADF); } int From owner-p4-projects@FreeBSD.ORG Tue Jun 27 01:38:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AE3A16A405; Tue, 27 Jun 2006 01:38:33 +0000 (UTC) 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 DA5D116A401 for ; Tue, 27 Jun 2006 01:38:32 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA48F43D49 for ; Tue, 27 Jun 2006 01:38:32 +0000 (GMT) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5R1cWOn064695 for ; Tue, 27 Jun 2006 01:38:32 GMT (envelope-from ryanb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5R1cWL9064692 for perforce@freebsd.org; Tue, 27 Jun 2006 01:38:32 GMT (envelope-from ryanb@FreeBSD.org) Date: Tue, 27 Jun 2006 01:38:32 GMT Message-Id: <200606270138.k5R1cWL9064692@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ryanb@FreeBSD.org using -f From: Ryan Beasley To: Perforce Change Reviews Cc: Subject: PERFORCE change 100108 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, 27 Jun 2006 01:38:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=100108 Change 100108 by ryanb@ryanb_yuki on 2006/06/27 01:37:40 Minor alteration to "oss_mixer_enuminfo too small" warning. Affected files ... .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/mixer.c#6 edit Differences ... ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/mixer.c#6 (text+ko) ==== @@ -326,10 +326,13 @@ * XXX I don't think this should ever be possible. * Even with a move to dynamic device/channel names, * each label is limited to ~16 characters, so that'd - * take a LOT to fill this buffer. panic()? + * take a LOT to fill this buffer. */ if ((nleft <= 0) || (nvalues >= OSS_ENUM_MAXVALUE)) { - printf("mix_setrecdevs: enuminfo too small"); + device_printf(m->dev, + "mix_setrecdevs: Not enough room to store device names--please file a bug report.\n"); + device_printf(m->dev, + "mix_setrecdevs: Please include details about your sound hardware, OS version, etc.\n"); break; } From owner-p4-projects@FreeBSD.ORG Tue Jun 27 02:55:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEE3F16A4C9; Tue, 27 Jun 2006 02:55:34 +0000 (UTC) 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 7A45116A4A6 for ; Tue, 27 Jun 2006 02:55:34 +0000 (UTC) (envelope-from kip.macy@gmail.com) Received: from nz-out-0102.google.com (nz-out-0102.google.com [64.233.162.201]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9114A43D6A for ; Tue, 27 Jun 2006 02:55:28 +0000 (GMT) (envelope-from kip.macy@gmail.com) Received: by nz-out-0102.google.com with SMTP id 13so1503300nzp for ; Mon, 26 Jun 2006 19:55:28 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=hiZeXYuiZ/HY+FiZy6q+TXDmluPqAWXWtYM5ZgGdN7tJ24f8jnDJ1wGTEEafAFRGsvM5NrUGXZE8JBForkO8BX3ihIEacGe8wQQ9PCAGxyTzAkCNwXAEW3cm3vvzZtWHokn3ukssL2OCWStcDHVExOV2K+/JrNALOk0mt2cXbbw= Received: by 10.65.244.14 with SMTP id w14mr2142852qbr; Mon, 26 Jun 2006 19:55:27 -0700 (PDT) Received: by 10.65.225.9 with HTTP; Mon, 26 Jun 2006 19:55:27 -0700 (PDT) Message-ID: Date: Mon, 26 Jun 2006 19:55:27 -0700 From: "Kip Macy" To: "Robert Watson" In-Reply-To: <20060627001336.T79454@fledge.watson.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200606262054.k5QKsDq7022302@repoman.freebsd.org> <200606261759.41541.jhb@freebsd.org> <20060627001336.T79454@fledge.watson.org> Cc: Perforce Change Reviews , Kip Macy , John Baldwin Subject: Re: PERFORCE change 100089 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: kmacy@fsmware.com List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jun 2006 02:55:35 -0000 I've mapped your uipc_usrreq.c into my tree and have seen a measurable boost. I actually see no contention on it. If I go into overload (16 threads) I see the following: 65 13580255 555960120 4332486 3 128 22050892 4323043 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/kern_synch.c:217 (lockbuilder mtxpool) 13 24053476 160697931 92708398 0 1 30726211 0 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/kern_switch.c:522 (runq lock) 371 63389470 27487168 936871 67 29 5918460 640938 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/kern_lock.c:163 (lockbuilder mtxpool) 39 36405448 10970117 4748316 7 2 4132590 0 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/kern_switch.c:221 (runq lock) 361 85861725 10866103 5699832 15 1 3813907 0 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/subr_sleepqueue.c:223 (sleepq chain) lockmgr is my biggest problem now. On 6/26/06, Robert Watson wrote: > On Mon, 26 Jun 2006, John Baldwin wrote: > > > On Monday 26 June 2006 16:54, Kip Macy wrote: > >> http://perforce.freebsd.org/chv.cgi?CH=100089 > >> > >> Change 100089 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/26 > > 20:53:51 > >> > >> add profiling for rwlocks > >> not convinced of correctness as there don't appear to be any contended > > rwlocks on my workloads > > > > Few things use them currently. I have a patch to make the name cache use > > them if you want it. > > You may already have seen this, but I have a UNIX domain socket re-locking in > //depot/user/rwatson/proto/src/sys/kern/uipc_usrreq.c that uses rwlocks and > finer-grained mutexes, among other things. Ideally this can generate some > contention (although perhaps not too much). > > Robert N M Watson > Computer Laboratory > University of Cambridge > From owner-p4-projects@FreeBSD.ORG Tue Jun 27 04:23:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1752F16A407; Tue, 27 Jun 2006 04:23:58 +0000 (UTC) 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 D04CE16A405 for ; Tue, 27 Jun 2006 04:23:57 +0000 (UTC) (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 80FD2444EA for ; Tue, 27 Jun 2006 04:23:57 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5R4Nv3k076107 for ; Tue, 27 Jun 2006 04:23:57 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5R4Nvha076104 for perforce@freebsd.org; Tue, 27 Jun 2006 04:23:57 GMT (envelope-from scottl@freebsd.org) Date: Tue, 27 Jun 2006 04:23:57 GMT Message-Id: <200606270423.k5R4Nvha076104@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 100110 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, 27 Jun 2006 04:23:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=100110 Change 100110 by scottl@scottl-wv1u on 2006/06/27 04:23:02 Anonymous ccbs allocated through xpt_alloc_ccb() were not getting their callout and callout_handle objects initialized. Make these calls slightly less anonymous by passing in the SIM object so that the MPSAFE status can be determined for callout_init. Drop some locks into the bus scan path to satisfy the locking protocol. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#39 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#8 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#8 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#11 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#39 (text+ko) ==== @@ -1062,7 +1062,7 @@ case XPT_ENG_INQ: case XPT_SCAN_LUN: - ccb = xpt_alloc_ccb(); + ccb = xpt_alloc_ccb(bus->sim); CAM_SIM_LOCK(bus->sim); @@ -4405,7 +4405,7 @@ struct ccb_pathinq cpi; int s; - GIANT_REQUIRED; + mtx_assert(sim->mtx, MA_OWNED); sim->bus_id = bus; new_bus = (struct cam_eb *)malloc(sizeof(*new_bus), @@ -4971,20 +4971,26 @@ } union ccb * -xpt_alloc_ccb() +xpt_alloc_ccb(struct cam_sim *sim) { union ccb *new_ccb; new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_WAITOK); + callout_handle_init(&new_ccb->ccb_h.timeout_ch); + callout_init(&new_ccb->ccb_h.callout, + (sim->flags & CAM_SIM_MPSAFE) ? 1 : 0); return (new_ccb); } union ccb * -xpt_alloc_ccb_nowait() +xpt_alloc_ccb_nowait(struct cam_sim *sim) { union ccb *new_ccb; new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_NOWAIT); + callout_handle_init(&new_ccb->ccb_h.timeout_ch); + callout_init(&new_ccb->ccb_h.callout, + (sim->flags & CAM_SIM_MPSAFE) ? 1 : 0); return (new_ccb); } @@ -5015,12 +5021,11 @@ s = splsoftcam(); sim = device->sim; if ((new_ccb = (union ccb *)SLIST_FIRST(&sim->ccb_freeq)) == NULL) { - new_ccb = xpt_alloc_ccb_nowait(); + new_ccb = xpt_alloc_ccb_nowait(sim); if (new_ccb == NULL) { splx(s); return (NULL); } - callout_handle_init(&new_ccb->ccb_h.timeout_ch); SLIST_INSERT_HEAD(&sim->ccb_freeq, &new_ccb->ccb_h, xpt_links.sle); sim->ccb_count++; @@ -5344,7 +5349,7 @@ u_int initiator_id; /* Find out the characteristics of the bus */ - work_ccb = xpt_alloc_ccb(); + work_ccb = xpt_alloc_ccb_nowait(periph->sim); xpt_setup_ccb(&work_ccb->ccb_h, request_ccb->ccb_h.path, request_ccb->ccb_h.pinfo.priority); work_ccb->ccb_h.func_code = XPT_PATH_INQ; @@ -5369,7 +5374,7 @@ /* Save some state for use while we probe for devices */ scan_info = (xpt_scan_bus_info *) - malloc(sizeof(xpt_scan_bus_info), M_TEMP, M_WAITOK); + malloc(sizeof(xpt_scan_bus_info), M_TEMP, M_NOWAIT); scan_info->request_ccb = request_ccb; scan_info->cpi = &work_ccb->cpi; @@ -5409,7 +5414,7 @@ xpt_done(request_ccb); break; } - work_ccb = xpt_alloc_ccb(); + work_ccb = xpt_alloc_ccb_nowait(periph->sim); xpt_setup_ccb(&work_ccb->ccb_h, path, request_ccb->ccb_h.pinfo.priority); work_ccb->ccb_h.func_code = XPT_SCAN_LUN; @@ -6932,6 +6937,7 @@ static int xptconfigbuscountfunc(struct cam_eb *bus, void *arg) { + mtx_lock(bus->sim->mtx); if (bus->path_id != CAM_XPT_PATH_ID) { struct cam_path path; struct ccb_pathinq cpi; @@ -6950,6 +6956,7 @@ busses_to_reset++; xpt_release_path(&path); } + mtx_unlock(bus->sim->mtx); return(1); } @@ -6960,11 +6967,12 @@ struct cam_path *path; union ccb *work_ccb; + mtx_lock(bus->sim->mtx); if (bus->path_id != CAM_XPT_PATH_ID) { cam_status status; int can_negotiate; - work_ccb = xpt_alloc_ccb(); + work_ccb = xpt_alloc_ccb_nowait(bus->sim); if ((status = xpt_create_path(&path, xpt_periph, bus->path_id, CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD)) !=CAM_REQ_CMP){ @@ -6974,6 +6982,7 @@ xpt_free_ccb(work_ccb); busses_to_config--; xpt_finishconfig(xpt_periph, NULL); + mtx_unlock(bus->sim->mtx); return(0); } xpt_setup_ccb(&work_ccb->ccb_h, path, /*priority*/1); @@ -6984,6 +6993,7 @@ "with status %d\n", bus->path_id, work_ccb->ccb_h.status); xpt_finishconfig(xpt_periph, work_ccb); + mtx_unlock(bus->sim->mtx); return(1); } @@ -7005,6 +7015,7 @@ } } + mtx_unlock(bus->sim->mtx); return(1); } ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#8 (text+ko) ==== @@ -38,8 +38,8 @@ /* Functions accessed by the peripheral drivers */ #ifdef _KERNEL void xpt_polled_action(union ccb *ccb); -union ccb *xpt_alloc_ccb(void); -union ccb *xpt_alloc_ccb_nowait(void); +union ccb *xpt_alloc_ccb(struct cam_sim *sim); +union ccb *xpt_alloc_ccb_nowait(struct cam_sim *sim); void xpt_free_ccb(union ccb *free_ccb); void xpt_release_ccb(union ccb *released_ccb); void xpt_schedule(struct cam_periph *perph, u_int32_t new_priority); ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#8 (text+ko) ==== @@ -966,7 +966,7 @@ struct scsi_low_softc *slp; { struct cam_path *path; - union ccb *ccb = xpt_alloc_ccb(); + union ccb *ccb = xpt_alloc_ccb(path->sim); cam_status status; bzero(ccb, sizeof(union ccb)); ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#11 (text+ko) ==== @@ -503,7 +503,7 @@ inccb->ccb_h.pinfo.priority); ccb_malloced = 0; } else { - ccb = xpt_alloc_ccb(); + ccb = xpt_alloc_ccb(periph->sim); if (ccb != NULL) xpt_setup_ccb(&ccb->ccb_h, periph->path, From owner-p4-projects@FreeBSD.ORG Tue Jun 27 05:11:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6A4D16A401; Tue, 27 Jun 2006 05:11:02 +0000 (UTC) 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 8A98216A407 for ; Tue, 27 Jun 2006 05:11:02 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D3B443D7D for ; Tue, 27 Jun 2006 05:10:57 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5R5Avba087602 for ; Tue, 27 Jun 2006 05:10:57 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5R5Aur0087599 for perforce@freebsd.org; Tue, 27 Jun 2006 05:10:56 GMT (envelope-from als@FreeBSD.org) Date: Tue, 27 Jun 2006 05:10:56 GMT Message-Id: <200606270510.k5R5Aur0087599@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100113 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, 27 Jun 2006 05:11:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=100113 Change 100113 by als@als_head on 2006/06/27 05:10:22 first variant of init modules for jail Affected files ... .. //depot/projects/jail2/sys/sys/jail2_init.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jun 27 05:11:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9C8216A40F; Tue, 27 Jun 2006 05:11:59 +0000 (UTC) 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 6FB9D16A405 for ; Tue, 27 Jun 2006 05:11:59 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E649343D90 for ; Tue, 27 Jun 2006 05:11:58 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5R5BwCF087695 for ; Tue, 27 Jun 2006 05:11:58 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5R5BwZN087692 for perforce@freebsd.org; Tue, 27 Jun 2006 05:11:58 GMT (envelope-from als@FreeBSD.org) Date: Tue, 27 Jun 2006 05:11:58 GMT Message-Id: <200606270511.k5R5BwZN087692@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100114 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, 27 Jun 2006 05:11:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=100114 Change 100114 by als@als_head on 2006/06/27 05:11:37 whitespace fixes. introduce storage for pointers to private module data. Affected files ... .. //depot/projects/jail2/sys/sys/jail.h#3 edit Differences ... ==== //depot/projects/jail2/sys/sys/jail.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ int pr_version; int pr_id; char pr_path[MAXPATHLEN]; - char pr_host[MAXHOSTNAMELEN]; + char pr_host[MAXHOSTNAMELEN]; u_int32_t pr_ip; /* network order */ }; #define XPRISON_VERSION 1 @@ -56,6 +56,7 @@ #include #include +#include #include #include #include @@ -73,29 +74,30 @@ * required to read * (d) set only during destruction of jail, no mutex needed * (n) not need locking or atomic operation - * (i) have internal locker + * (i) have internal locker */ struct prison { - LIST_ENTRY(prison) pr_list; /* (a) all prisons */ - int pr_id; /* (c) prison id */ - int pr_refcnt; /* (p) refcount */ + LIST_ENTRY(prison) pr_list; /* (a) all prisons */ + int pr_id; /* (c) prison id */ + int pr_refcnt; /* (p) refcount */ - uint32_t pr_flags; /* (n) flags for jails restructions + uint32_t pr_flags; /* (n) flags for jails restructions * see J_*_FL in jail_flags.h */ - char pr_host[MAXHOSTNAMELEN]; /* (p) jail hostname */ + char pr_host[MAXHOSTNAMELEN]; /* (p) jail hostname */ void *pr_linux; /* (p) linux abi */ - int pr_securelevel; /* (p) securelevel */ - struct task pr_task; /* (d) destroy task */ - struct mtx pr_mtx; - struct jail_tasks pr_tasks; /* (i) tasks in jail */ - struct jail_disks pr_disk; /* (i) disk usage */ - struct jail_network pr_network; /* (i) network for jail */ - struct jail_sysvipc pr_ipc; /* (n) SYSV IPC for jail */ - struct jail_limits pr_limits; /* (n) various limits for jail */ + int pr_securelevel; /* (p) securelevel */ + struct task pr_task; /* (d) destroy task */ + struct mtx pr_mtx; + struct jail_tasks pr_tasks; /* (i) tasks in jail */ + struct jail_disks pr_disk; /* (i) disk usage */ + struct jail_network pr_network; /* (i) network for jail */ + struct jail_sysvipc pr_ipc; /* (n) SYSV IPC for jail */ + struct jail_limits pr_limits; /* (n) various limits for jail */ /* (c) per jail uid info */ LIST_HEAD(uihashhead, uidinfo) *uihashtbl; /* (i) also protected with uihash mutex */ - u_long uihash; /* (c) size of hash table - 1 */ + u_long uihash; /* (c) size of hash table - 1 */ + void *mod_data[JMODULE_COUNT] /* (i) modules private data */ }; #endif /* _KERNEL || _WANT_PRISON */ @@ -127,7 +129,7 @@ int prison_canseemount(struct ucred *cred, struct mount *mp); void prison_enforce_statfs(struct ucred *cred, struct mount *mp, struct statfs *sp); - + /* jails control */ struct prison *prison_alloc(uint32_t ctx_id); struct prison *prison_find(int prid); @@ -136,7 +138,7 @@ /* task control */ int jail_migrate(struct thread *td, struct prison *pr); - + /* network */ int prison_if(struct ucred *cred, struct sockaddr *sa); int prison_ip(struct ucred *cred, uint32_t *ip); From owner-p4-projects@FreeBSD.ORG Tue Jun 27 05:15:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B340416A405; Tue, 27 Jun 2006 05:15:04 +0000 (UTC) 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 60BCD16A400 for ; Tue, 27 Jun 2006 05:15:04 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 099CF43D4C for ; Tue, 27 Jun 2006 05:15:04 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5R5F3xQ087899 for ; Tue, 27 Jun 2006 05:15:03 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5R5F3b0087896 for perforce@freebsd.org; Tue, 27 Jun 2006 05:15:03 GMT (envelope-from als@FreeBSD.org) Date: Tue, 27 Jun 2006 05:15:03 GMT Message-Id: <200606270515.k5R5F3b0087896@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100115 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, 27 Jun 2006 05:15:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=100115 Change 100115 by als@als_head on 2006/06/27 05:14:20 whitespace fixes Affected files ... .. //depot/projects/jail2/sys/kern/kern_jail.c#3 edit Differences ... ==== //depot/projects/jail2/sys/kern/kern_jail.c#3 (text+ko) ==== @@ -52,12 +52,12 @@ struct prisonlist allprison; struct mtx allprison_mtx; int lastprid = 0; -int prisoncount = 1; /* root jail */ +int prisoncount = 1; /* root jail */ struct prison jail_0 = { - .pr_id = 0, + .pr_id = 0, .pr_flags = J_START_FL | J_SYSVIPC_ALLOW_FL, - .pr_linux = NULL, + .pr_linux = NULL, .pr_securelevel = -1, }; @@ -78,7 +78,7 @@ LIST_INIT(&allprison); /* init jail0 */ mtx_init(&jail_0.pr_mtx, "jail mutex", NULL, MTX_DEF); - LIST_INSERT_HEAD(&allprison, &jail_0, pr_list); + LIST_INSERT_HEAD(&allprison, &jail_0, pr_list); JAIL_DISKS_INIT(&jail_0); JAIL_TASKS_INIT(&jail_0); JAIL_IPC_INIT(&jail_0); @@ -134,7 +134,7 @@ JAIL_TASKS_INIT(pr); JAIL_IPC_INIT(pr); JAIL_LIMITS_INIT(pr); - + /* Determine next pr_id and add prison to allprison list. */ mtx_lock(&allprison_mtx); tryprid = lastprid + 1; @@ -152,7 +152,7 @@ goto next; } } - + pr->pr_id = jaa.jid = lastprid = tryprid; LIST_INSERT_HEAD(&allprison, pr, pr_list); prisoncount++; @@ -161,7 +161,7 @@ error = jail_attach(td, &jaa); if (error) goto e_dropprref; - + prison_free(pr); td->td_retval[0] = jaa.jid; return (0); @@ -191,16 +191,19 @@ return (error); switch( JAIL2_CLASS(j.cmd) ) { - case J_COMMON: + case J_COMMON: error = jail2_common(td, &j); break; - case J_NETWORK: + case J_NETWORK: error = jail2_network(td, &j); break; - case J_RESOURCE: + case J_RESOURCE: error = jail2_resource(td, &j); break; - default: + case J_DISK: + error = jail2_disk(td, &j); + break; + default: printf("wrong jail2 cmd class %d\n", JAIL2_CLASS(j.cmd) ); error = EOPNOTSUPP; break; @@ -215,7 +218,7 @@ uint32_t ver; int error; struct prison *jail = td->td_ucred->cr_prison; - + if (jail != &jail_0) return (EPERM); @@ -224,7 +227,7 @@ return (error); jprint("jail cmd v. %d\n", ver); switch( ver ) { - case 0: + case 0: case 1: error = jail_1(td, uap); break; @@ -238,7 +241,7 @@ return (error); } -int +int jail_migrate(struct thread *td, struct prison *pr) { int error = 0; @@ -253,7 +256,7 @@ vn_lock(JAIL_VROOT(pr), LK_EXCLUSIVE | LK_RETRY, td); if ((error = change_dir(JAIL_VROOT(pr), td)) != 0) goto e_unlock; - + #ifdef MAC if ((error = mac_check_vnode_chroot(td->td_ucred, JAIL_VROOT(pr)))) goto e_unlock; @@ -262,10 +265,10 @@ if((error = change_root(JAIL_VROOT(pr), td)) != 0) goto e_unlock1; VFS_UNLOCK_GIANT(vfslocked); - + if((error = kern_chdir(td, "/", UIO_SYSSPACE)) != 0) return (error); - + p = td->td_proc; newcred = crget(); PROC_LOCK(p); @@ -277,9 +280,9 @@ prison_hold(pr); PROC_UNLOCK(p); crfree(oldcred); - + return (0); - + e_unlock: VOP_UNLOCK(JAIL_VROOT(pr), 0, td); e_unlock1: @@ -298,7 +301,7 @@ { struct prison *pr; int error; - + /* * XXX: Note that there is a slight race here if two threads * in the same privileged process attempt to attach to two @@ -315,7 +318,7 @@ if (pr == NULL) { return (ESRCH); } - + error = jail_migrate(td, pr); prison_free(pr); @@ -336,7 +339,7 @@ jprint("Already have prisons"); goto found; } - + LIST_INSERT_HEAD(&allprison, pr, pr_list); prisoncount++; mtx_unlock(&allprison_mtx); @@ -381,7 +384,7 @@ { jprint("destroy prison %d\n",pr->pr_id); - mtx_lock(&allprison_mtx); + mtx_lock(&allprison_mtx); LIST_REMOVE(pr, pr_list); prisoncount--; TASK_INIT(&pr->pr_task, 0, prison_complete, pr); @@ -409,12 +412,12 @@ { uint32_t tmp; - if (!jailed(cred)) - return (0); + if (!jailed(cred)) + return (0); tmp = *ip; jprint("prison_ip %x - %x - %x - %x - ", - tmp, htonl(INADDR_ANY), htonl(INADDR_LOOPBACK), + tmp, htonl(INADDR_ANY), htonl(INADDR_LOOPBACK), cred->cr_prison->pr_network.pr_ip); if (tmp == htonl(INADDR_ANY)) { jprint("any\n"); @@ -444,13 +447,13 @@ tmp = *ip; jprint("prison_remote_ip %x - %x - ", tmp, htonl(INADDR_LOOPBACK)); - + if (tmp == htonl(INADDR_LOOPBACK)) { *ip = cred->cr_prison->pr_network.pr_ip; jprint("loopback\n"); return; } - jprint("other\n"); + jprint("other\n"); return; } @@ -603,7 +606,7 @@ free(sxp, M_TEMP); goto retry; } - + LIST_FOREACH(pr, &allprison, pr_list) { mtx_lock(&pr->pr_mtx); xp->pr_version = XPRISON_VERSION; From owner-p4-projects@FreeBSD.ORG Tue Jun 27 05:21:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2B9516A403; Tue, 27 Jun 2006 05:21:18 +0000 (UTC) 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 9C51916A400 for ; Tue, 27 Jun 2006 05:21:18 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 14F1343D4C for ; Tue, 27 Jun 2006 05:21:14 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5R5LEWm088260 for ; Tue, 27 Jun 2006 05:21:14 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5R5LB0J088239 for perforce@freebsd.org; Tue, 27 Jun 2006 05:21:11 GMT (envelope-from als@FreeBSD.org) Date: Tue, 27 Jun 2006 05:21:11 GMT Message-Id: <200606270521.k5R5LB0J088239@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100116 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, 27 Jun 2006 05:21:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=100116 Change 100116 by als@als_head on 2006/06/27 05:20:41 merge from HEAD Affected files ... .. //depot/projects/jail2/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/jail2/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/jail2/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/jail2/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/jail2/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/jail2/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/jail2/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/jail2/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/jail2/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/jail2/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/jail2/sys/arm/arm/locore.S#2 integrate .. //depot/projects/jail2/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/jail2/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/jail2/sys/arm/at91/files.at91#2 integrate .. //depot/projects/jail2/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/jail2/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/jail2/sys/arm/conf/KB920X#2 integrate .. //depot/projects/jail2/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/jail2/sys/boot/Makefile#2 integrate .. //depot/projects/jail2/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/jail2/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/jail2/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/jail2/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/jail2/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/jail2/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/jail2/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/jail2/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/jail2/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/jail2/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/jail2/sys/compat/svr4/syscalls.master#2 integrate .. //depot/projects/jail2/sys/conf/Makefile.arm#2 integrate .. //depot/projects/jail2/sys/conf/NOTES#3 integrate .. //depot/projects/jail2/sys/conf/files#3 edit .. //depot/projects/jail2/sys/conf/files.amd64#2 integrate .. //depot/projects/jail2/sys/conf/files.i386#2 integrate .. //depot/projects/jail2/sys/conf/kern.post.mk#2 integrate .. //depot/projects/jail2/sys/conf/options#3 integrate .. //depot/projects/jail2/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/jail2/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/jail2/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/jail2/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/jail2/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/jail2/sys/dev/digi/digi.c#2 integrate .. //depot/projects/jail2/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/jail2/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/jail2/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/jail2/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/jail2/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/nfe/if_nfe.c#1 branch .. //depot/projects/jail2/sys/dev/nfe/if_nfereg.h#1 branch .. //depot/projects/jail2/sys/dev/nfe/if_nfevar.h#1 branch .. //depot/projects/jail2/sys/dev/re/if_re.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/driver.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/ak452x.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/jail2/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/jail2/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/jail2/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/jail2/sys/geom/geom_dev.c#2 integrate .. //depot/projects/jail2/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/jail2/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/jail2/sys/i386/conf/NOTES#2 integrate .. //depot/projects/jail2/sys/i386/i386/db_trace.c#3 integrate .. //depot/projects/jail2/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/jail2/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/jail2/sys/i386/i386/trap.c#2 integrate .. //depot/projects/jail2/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/jail2/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/jail2/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/jail2/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/jail2/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/jail2/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/jail2/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/jail2/sys/ia64/disasm/disasm.h#2 integrate .. //depot/projects/jail2/sys/ia64/disasm/disasm_decode.c#2 integrate .. //depot/projects/jail2/sys/ia64/disasm/disasm_extract.c#2 integrate .. //depot/projects/jail2/sys/ia64/disasm/disasm_format.c#2 integrate .. //depot/projects/jail2/sys/ia64/disasm/disasm_int.h#2 integrate .. //depot/projects/jail2/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/jail2/sys/kern/kern_linker.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_module.c#2 integrate .. //depot/projects/jail2/sys/kern/link_elf.c#2 integrate .. //depot/projects/jail2/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/jail2/sys/kern/subr_bus.c#2 integrate .. //depot/projects/jail2/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/jail2/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/jail2/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/jail2/sys/kern/uipc_socket2.c#2 integrate .. //depot/projects/jail2/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/jail2/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/jail2/sys/kern/vfs_init.c#2 integrate .. //depot/projects/jail2/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/jail2/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/jail2/sys/modules/Makefile#3 integrate .. //depot/projects/jail2/sys/modules/nfe/Makefile#1 branch .. //depot/projects/jail2/sys/modules/ppc/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/jail2/sys/net/if.c#3 integrate .. //depot/projects/jail2/sys/net/if.h#2 integrate .. //depot/projects/jail2/sys/net/if_bridge.c#2 integrate .. //depot/projects/jail2/sys/net/if_clone.c#2 integrate .. //depot/projects/jail2/sys/net/if_enc.c#1 branch .. //depot/projects/jail2/sys/net/if_types.h#2 integrate .. //depot/projects/jail2/sys/net/if_var.h#2 integrate .. //depot/projects/jail2/sys/net/if_vlan.c#2 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/jail2/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/jail2/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/jail2/sys/netinet/tcp_seq.h#2 integrate .. //depot/projects/jail2/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/jail2/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/jail2/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/jail2/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/jail2/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/jail2/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/jail2/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/jail2/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/jail2/sys/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/jail2/sys/nfsserver/nfsrvcache.h#2 integrate .. //depot/projects/jail2/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/jail2/sys/pci/agp_i810.c#2 integrate .. //depot/projects/jail2/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/jail2/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/jail2/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/jail2/sys/sys/gpt.h#2 integrate .. //depot/projects/jail2/sys/sys/linker.h#2 integrate .. //depot/projects/jail2/sys/sys/rwlock.h#2 integrate .. //depot/projects/jail2/sys/sys/socketvar.h#2 integrate .. //depot/projects/jail2/sys/sys/sockio.h#2 integrate .. //depot/projects/jail2/sys/sys/sx.h#2 integrate .. //depot/projects/jail2/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/jail2/sys/vm/vm_page.c#2 integrate .. //depot/projects/jail2/sys/vm/vm_pageq.c#2 integrate Differences ... ==== //depot/projects/jail2/sys/amd64/amd64/fpu.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.158 2006/04/19 07:00:19 cperciva Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.159 2006/06/19 22:36:01 davidxu Exp $"); #include #include @@ -125,6 +125,10 @@ mxcsr = __INITIAL_MXCSR__; ldmxcsr(mxcsr); fxsave(&fpu_cleanstate); + if (fpu_cleanstate.sv_env.en_mxcsr_mask) + cpu_mxcsr_mask = fpu_cleanstate.sv_env.en_mxcsr_mask; + else + cpu_mxcsr_mask = 0xFFBF; start_emulating(); bzero(fpu_cleanstate.sv_fp, sizeof(fpu_cleanstate.sv_fp)); bzero(fpu_cleanstate.sv_xmm, sizeof(fpu_cleanstate.sv_xmm)); ==== //depot/projects/jail2/sys/amd64/amd64/initcpu.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.49 2005/10/14 22:52:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.50 2006/06/19 22:59:28 davidxu Exp $"); #include "opt_cpu.h" @@ -60,6 +60,7 @@ u_int cpu_procinfo2; /* Multicore info */ char cpu_vendor[20]; /* CPU Origin code */ u_int cpu_fxsr; /* SSE enabled */ +u_int cpu_mxcsr_mask; /* Valid bits in mxcsr */ /* * Initialize CPU control registers ==== //depot/projects/jail2/sys/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.649 2006/05/11 17:29:22 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.650 2006/06/19 22:36:01 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1507,7 +1507,7 @@ penv_xmm->en_rip = penv_fpreg->en_rip; penv_xmm->en_rdp = penv_fpreg->en_rdp; penv_xmm->en_mxcsr = penv_fpreg->en_mxcsr; - penv_xmm->en_mxcsr_mask = penv_fpreg->en_mxcsr_mask; + penv_xmm->en_mxcsr_mask = penv_fpreg->en_mxcsr_mask & cpu_mxcsr_mask; /* FPU registers */ for (i = 0; i < 8; ++i) @@ -1634,6 +1634,7 @@ static int set_fpcontext(struct thread *td, const mcontext_t *mcp) { + struct savefpu *fpstate; if (mcp->mc_fpformat == _MC_FPFMT_NODEV) return (0); @@ -1649,7 +1650,9 @@ * be called with interrupts disabled. * XXX obsolete on trap-16 systems? */ - fpusetregs(td, (struct savefpu *)&mcp->mc_fpstate); + fpstate = (struct savefpu *)&mcp->mc_fpstate; + fpstate->sv_env.en_mxcsr &= cpu_mxcsr_mask; + fpusetregs(td, fpstate); } else return (EINVAL); return (0); ==== //depot/projects/jail2/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.557 2006/06/15 01:01:05 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.559 2006/06/25 22:22:37 alc Exp $"); /* * Manages physical address maps. @@ -1664,7 +1664,7 @@ static const struct timeval printinterval = { 60, 0 }; static struct timeval lastprint; static vm_pindex_t colour; - int bit, field; + int bit, field, page_req; pv_entry_t pv; struct pv_chunk *pc; vm_page_t m; @@ -1697,7 +1697,8 @@ } } /* No free items, allocate another chunk */ - m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + page_req = try ? VM_ALLOC_NORMAL : VM_ALLOC_SYSTEM; + m = vm_page_alloc(NULL, colour, page_req | VM_ALLOC_NOOBJ); if (m == NULL) { if (try) { pv_entry_count--; @@ -2335,6 +2336,7 @@ vm_page_t m, mpte; vm_pindex_t diff, psize; + VM_OBJECT_LOCK_ASSERT(m_start->object, MA_OWNED); psize = atop(end - start); mpte = NULL; m = m_start; @@ -2376,7 +2378,6 @@ (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0, ("pmap_enter_quick_locked: managed mapping within the clean submap")); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); PMAP_LOCK_ASSERT(pmap, MA_OWNED); /* @@ -2394,7 +2395,6 @@ if (mpte && (mpte->pindex == ptepindex)) { mpte->wire_count++; } else { - retry: /* * Get the page directory entry */ @@ -2412,18 +2412,8 @@ } else { mpte = _pmap_allocpte(pmap, ptepindex, M_NOWAIT); - if (mpte == NULL) { - PMAP_UNLOCK(pmap); - vm_page_busy(m); - vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(m->object); - VM_WAIT; - VM_OBJECT_LOCK(m->object); - vm_page_lock_queues(); - vm_page_wakeup(m); - PMAP_LOCK(pmap); - goto retry; - } + if (mpte == NULL) + return (mpte); } } } else { @@ -2446,12 +2436,16 @@ } /* - * Enter on the PV list if part of our managed memory. Note that we - * raise IPL while manipulating pv_table since pmap_enter can be - * called at interrupt time. + * Enter on the PV list if part of our managed memory. */ - if ((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) - pmap_insert_entry(pmap, va, m); + if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0 && + !pmap_try_insert_pv_entry(pmap, va, m)) { + if (mpte != NULL) { + pmap_unwire_pte_hold(pmap, va, mpte); + mpte = NULL; + } + return (mpte); + } /* * Increment counters @@ -2703,11 +2697,6 @@ * we only virtual copy managed pages */ if ((ptetemp & PG_MANAGED) != 0) { - /* - * We have to check after allocpte for the - * pte still being around... allocpte can - * block. - */ dstmpte = pmap_allocpte(dst_pmap, addr, M_NOWAIT); if (dstmpte == NULL) @@ -2726,7 +2715,8 @@ *dst_pte = ptetemp & ~(PG_M | PG_A); dst_pmap->pm_stats.resident_count++; } else - pmap_unwire_pte_hold(dst_pmap, addr, dstmpte); + pmap_unwire_pte_hold(dst_pmap, addr, + dstmpte); if (dstmpte->wire_count >= srcmpte->wire_count) break; } ==== //depot/projects/jail2/sys/amd64/amd64/trap.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.303 2006/03/13 23:55:31 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.304 2006/06/20 12:44:21 yar Exp $"); /* * AMD64 Trap and System call handling @@ -681,15 +681,9 @@ } #ifdef KDB - if (debugger_on_panic || kdb_active) { - register_t rflags; - rflags = intr_disable(); - if (kdb_trap(type, 0, frame)) { - intr_restore(rflags); + if (debugger_on_panic || kdb_active) + if (kdb_trap(type, 0, frame)) return; - } - intr_restore(rflags); - } #endif printf("trap number = %d\n", type); if (type <= MAX_TRAP_MSG) ==== //depot/projects/jail2/sys/amd64/conf/GENERIC#2 (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.460 2006/06/15 19:58:52 netchild Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.462 2006/06/26 22:03:20 babkin Exp $ cpu HAMMER ident GENERIC ==== //depot/projects/jail2/sys/amd64/conf/NOTES#2 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.56 2006/06/12 20:38:17 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.57 2006/06/26 23:41:06 obrien Exp $ # # @@ -223,6 +223,7 @@ # (requires miibus) # ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter # iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters +# nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking # ral: Ralink Technology IEEE 802.11 wireless adapter # ural: Ralink Technology RT2500USB IEEE 802.11 wireless adapter @@ -233,6 +234,7 @@ options ED_SIC device iwi device ipw +device nfe # nVidia nForce MCP on-board Ethernet Networking device nve # nVidia nForce MCP on-board Ethernet Networking device ral device ural ==== //depot/projects/jail2/sys/amd64/include/md_var.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.77 2006/04/21 04:24:50 peter Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.78 2006/06/19 22:36:01 davidxu Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -47,6 +47,7 @@ extern u_int cpu_fxsr; extern u_int cpu_high; extern u_int cpu_id; +extern u_int cpu_mxcsr_mask; extern u_int cpu_procinfo; extern u_int cpu_procinfo2; extern char cpu_vendor[]; ==== //depot/projects/jail2/sys/amd64/linux32/linux32_dummy.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.2 2006/05/10 18:17:28 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.3 2006/06/21 08:45:40 netchild Exp $"); #include #include @@ -67,6 +67,62 @@ DUMMY(fadvise64); DUMMY(ptrace); DUMMY(settimeofday); +DUMMY(lookup_dcookie); +DUMMY(epoll_create); +DUMMY(epoll_ctl); +DUMMY(epoll_wait); +DUMMY(remap_file_pages); +DUMMY(set_tid_address); +DUMMY(timer_create); +DUMMY(timer_settime); +DUMMY(timer_gettime); +DUMMY(timer_getoverrun); +DUMMY(timer_delete); +DUMMY(clock_settime); +DUMMY(clock_gettime); +DUMMY(clock_getres); +DUMMY(clock_nanosleep); +DUMMY(statfs64); +DUMMY(fstatfs64); +DUMMY(tgkill); +DUMMY(utimes); +DUMMY(fadvise64_64); +DUMMY(mbind); +DUMMY(get_mempolicy); +DUMMY(set_mempolicy); +DUMMY(mq_open); +DUMMY(mq_unlink); +DUMMY(mq_timedsend); +DUMMY(mq_timedreceive); +DUMMY(mq_notify); +DUMMY(mq_getsetattr); +DUMMY(kexec_load); +DUMMY(waitid); +DUMMY(add_key); +DUMMY(request_key); +DUMMY(keyctl); +DUMMY(ioprio_set); +DUMMY(ioprio_get); +DUMMY(inotify_init); +DUMMY(inotify_add_watch); +DUMMY(inotify_rm_watch); +DUMMY(migrate_pages); +DUMMY(openat); +DUMMY(mkdirat); +DUMMY(mknodat); +DUMMY(fchownat); +DUMMY(futimesat); +DUMMY(fstatat64); +DUMMY(unlinkat); +DUMMY(renameat); +DUMMY(linkat); +DUMMY(symlinkat); +DUMMY(readlinkat); +DUMMY(fchmodat); +DUMMY(faccessat); +DUMMY(pselect6); +DUMMY(ppoll); +DUMMY(unshare); #define DUMMY_XATTR(s) \ int \ ==== //depot/projects/jail2/sys/amd64/linux32/linux32_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.12 2006/06/13 18:48:29 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.14 2006/06/26 18:37:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -707,6 +707,174 @@ struct linux_fadvise64_args { register_t dummy; }; +struct linux_lookup_dcookie_args { + register_t dummy; +}; +struct linux_epoll_create_args { + register_t dummy; +}; +struct linux_epoll_ctl_args { + register_t dummy; +}; +struct linux_epoll_wait_args { + register_t dummy; +}; +struct linux_remap_file_pages_args { + register_t dummy; +}; +struct linux_set_tid_address_args { + register_t dummy; +}; +struct linux_timer_create_args { + register_t dummy; +}; +struct linux_timer_settime_args { + register_t dummy; +}; +struct linux_timer_gettime_args { + register_t dummy; +}; +struct linux_timer_getoverrun_args { + register_t dummy; +}; +struct linux_timer_delete_args { + register_t dummy; +}; +struct linux_clock_settime_args { + register_t dummy; +}; +struct linux_clock_gettime_args { + register_t dummy; +}; +struct linux_clock_getres_args { + register_t dummy; +}; +struct linux_clock_nanosleep_args { + register_t dummy; +}; +struct linux_statfs64_args { + register_t dummy; +}; +struct linux_fstatfs64_args { + register_t dummy; +}; +struct linux_tgkill_args { + register_t dummy; +}; +struct linux_utimes_args { + register_t dummy; +}; +struct linux_fadvise64_64_args { + register_t dummy; +}; +struct linux_mbind_args { + register_t dummy; +}; +struct linux_get_mempolicy_args { + register_t dummy; +}; +struct linux_set_mempolicy_args { + register_t dummy; +}; +struct linux_mq_open_args { + register_t dummy; +}; +struct linux_mq_unlink_args { + register_t dummy; +}; +struct linux_mq_timedsend_args { + register_t dummy; +}; +struct linux_mq_timedreceive_args { + register_t dummy; +}; +struct linux_mq_notify_args { + register_t dummy; +}; +struct linux_mq_getsetattr_args { + register_t dummy; +}; +struct linux_kexec_load_args { + register_t dummy; +}; +struct linux_waitid_args { + register_t dummy; +}; +struct linux_add_key_args { + register_t dummy; +}; +struct linux_request_key_args { + register_t dummy; +}; +struct linux_keyctl_args { + register_t dummy; +}; +struct linux_ioprio_set_args { + register_t dummy; +}; +struct linux_ioprio_get_args { + register_t dummy; +}; +struct linux_inotify_init_args { + register_t dummy; +}; +struct linux_inotify_add_watch_args { + register_t dummy; +}; +struct linux_inotify_rm_watch_args { + register_t dummy; +}; +struct linux_migrate_pages_args { + register_t dummy; +}; +struct linux_openat_args { + register_t dummy; +}; +struct linux_mkdirat_args { + register_t dummy; +}; +struct linux_mknodat_args { + register_t dummy; +}; +struct linux_fchownat_args { + register_t dummy; +}; +struct linux_futimesat_args { + register_t dummy; +}; +struct linux_fstatat64_args { + register_t dummy; +}; +struct linux_unlinkat_args { + register_t dummy; +}; +struct linux_renameat_args { + register_t dummy; +}; +struct linux_linkat_args { + register_t dummy; +}; +struct linux_symlinkat_args { + register_t dummy; +}; +struct linux_readlinkat_args { + register_t dummy; +}; +struct linux_fchmodat_args { + register_t dummy; +}; +struct linux_faccessat_args { + register_t dummy; +}; +struct linux_pselect6_args { + register_t dummy; +}; +struct linux_ppoll_args { + register_t dummy; +}; +struct linux_unshare_args { + register_t dummy; +}; #define nosys linux_nosys int linux_fork(struct thread *, struct linux_fork_args *); int linux_open(struct thread *, struct linux_open_args *); @@ -878,6 +1046,62 @@ int linux_lremovexattr(struct thread *, struct linux_lremovexattr_args *); int linux_fremovexattr(struct thread *, struct linux_fremovexattr_args *); int linux_fadvise64(struct thread *, struct linux_fadvise64_args *); +int linux_lookup_dcookie(struct thread *, struct linux_lookup_dcookie_args *); +int linux_epoll_create(struct thread *, struct linux_epoll_create_args *); +int linux_epoll_ctl(struct thread *, struct linux_epoll_ctl_args *); +int linux_epoll_wait(struct thread *, struct linux_epoll_wait_args *); +int linux_remap_file_pages(struct thread *, struct linux_remap_file_pages_args *); +int linux_set_tid_address(struct thread *, struct linux_set_tid_address_args *); +int linux_timer_create(struct thread *, struct linux_timer_create_args *); +int linux_timer_settime(struct thread *, struct linux_timer_settime_args *); +int linux_timer_gettime(struct thread *, struct linux_timer_gettime_args *); +int linux_timer_getoverrun(struct thread *, struct linux_timer_getoverrun_args *); +int linux_timer_delete(struct thread *, struct linux_timer_delete_args *); +int linux_clock_settime(struct thread *, struct linux_clock_settime_args *); +int linux_clock_gettime(struct thread *, struct linux_clock_gettime_args *); +int linux_clock_getres(struct thread *, struct linux_clock_getres_args *); +int linux_clock_nanosleep(struct thread *, struct linux_clock_nanosleep_args *); +int linux_statfs64(struct thread *, struct linux_statfs64_args *); +int linux_fstatfs64(struct thread *, struct linux_fstatfs64_args *); +int linux_tgkill(struct thread *, struct linux_tgkill_args *); +int linux_utimes(struct thread *, struct linux_utimes_args *); +int linux_fadvise64_64(struct thread *, struct linux_fadvise64_64_args *); +int linux_mbind(struct thread *, struct linux_mbind_args *); +int linux_get_mempolicy(struct thread *, struct linux_get_mempolicy_args *); +int linux_set_mempolicy(struct thread *, struct linux_set_mempolicy_args *); +int linux_mq_open(struct thread *, struct linux_mq_open_args *); +int linux_mq_unlink(struct thread *, struct linux_mq_unlink_args *); +int linux_mq_timedsend(struct thread *, struct linux_mq_timedsend_args *); +int linux_mq_timedreceive(struct thread *, struct linux_mq_timedreceive_args *); +int linux_mq_notify(struct thread *, struct linux_mq_notify_args *); +int linux_mq_getsetattr(struct thread *, struct linux_mq_getsetattr_args *); +int linux_kexec_load(struct thread *, struct linux_kexec_load_args *); +int linux_waitid(struct thread *, struct linux_waitid_args *); +int linux_add_key(struct thread *, struct linux_add_key_args *); +int linux_request_key(struct thread *, struct linux_request_key_args *); +int linux_keyctl(struct thread *, struct linux_keyctl_args *); +int linux_ioprio_set(struct thread *, struct linux_ioprio_set_args *); +int linux_ioprio_get(struct thread *, struct linux_ioprio_get_args *); +int linux_inotify_init(struct thread *, struct linux_inotify_init_args *); +int linux_inotify_add_watch(struct thread *, struct linux_inotify_add_watch_args *); +int linux_inotify_rm_watch(struct thread *, struct linux_inotify_rm_watch_args *); +int linux_migrate_pages(struct thread *, struct linux_migrate_pages_args *); +int linux_openat(struct thread *, struct linux_openat_args *); +int linux_mkdirat(struct thread *, struct linux_mkdirat_args *); +int linux_mknodat(struct thread *, struct linux_mknodat_args *); +int linux_fchownat(struct thread *, struct linux_fchownat_args *); +int linux_futimesat(struct thread *, struct linux_futimesat_args *); +int linux_fstatat64(struct thread *, struct linux_fstatat64_args *); +int linux_unlinkat(struct thread *, struct linux_unlinkat_args *); +int linux_renameat(struct thread *, struct linux_renameat_args *); +int linux_linkat(struct thread *, struct linux_linkat_args *); +int linux_symlinkat(struct thread *, struct linux_symlinkat_args *); +int linux_readlinkat(struct thread *, struct linux_readlinkat_args *); +int linux_fchmodat(struct thread *, struct linux_fchmodat_args *); +int linux_faccessat(struct thread *, struct linux_faccessat_args *); +int linux_pselect6(struct thread *, struct linux_pselect6_args *); +int linux_ppoll(struct thread *, struct linux_ppoll_args *); +int linux_unshare(struct thread *, struct linux_unshare_args *); #ifdef COMPAT_43 ==== //depot/projects/jail2/sys/amd64/linux32/linux32_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.12 2006/06/13 18:48:29 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.14 2006/06/26 18:37:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp */ #define LINUX_SYS_exit 1 @@ -221,4 +221,60 @@ #define LINUX_SYS_linux_fremovexattr 237 #define LINUX_SYS_linux_fadvise64 250 #define LINUX_SYS_exit_group 252 +#define LINUX_SYS_linux_lookup_dcookie 253 +#define LINUX_SYS_linux_epoll_create 254 +#define LINUX_SYS_linux_epoll_ctl 255 +#define LINUX_SYS_linux_epoll_wait 256 +#define LINUX_SYS_linux_remap_file_pages 257 +#define LINUX_SYS_linux_set_tid_address 258 +#define LINUX_SYS_linux_timer_create 259 +#define LINUX_SYS_linux_timer_settime 260 +#define LINUX_SYS_linux_timer_gettime 261 +#define LINUX_SYS_linux_timer_getoverrun 262 +#define LINUX_SYS_linux_timer_delete 263 +#define LINUX_SYS_linux_clock_settime 264 +#define LINUX_SYS_linux_clock_gettime 265 +#define LINUX_SYS_linux_clock_getres 266 +#define LINUX_SYS_linux_clock_nanosleep 267 +#define LINUX_SYS_linux_statfs64 268 +#define LINUX_SYS_linux_fstatfs64 269 +#define LINUX_SYS_linux_tgkill 270 +#define LINUX_SYS_linux_utimes 271 +#define LINUX_SYS_linux_fadvise64_64 272 +#define LINUX_SYS_linux_mbind 274 +#define LINUX_SYS_linux_get_mempolicy 275 +#define LINUX_SYS_linux_set_mempolicy 276 +#define LINUX_SYS_linux_mq_open 277 +#define LINUX_SYS_linux_mq_unlink 278 +#define LINUX_SYS_linux_mq_timedsend 279 +#define LINUX_SYS_linux_mq_timedreceive 280 +#define LINUX_SYS_linux_mq_notify 281 +#define LINUX_SYS_linux_mq_getsetattr 282 +#define LINUX_SYS_linux_kexec_load 283 +#define LINUX_SYS_linux_waitid 284 +#define LINUX_SYS_linux_add_key 286 +#define LINUX_SYS_linux_request_key 287 +#define LINUX_SYS_linux_keyctl 288 +#define LINUX_SYS_linux_ioprio_set 289 +#define LINUX_SYS_linux_ioprio_get 290 +#define LINUX_SYS_linux_inotify_init 291 +#define LINUX_SYS_linux_inotify_add_watch 292 +#define LINUX_SYS_linux_inotify_rm_watch 293 +#define LINUX_SYS_linux_migrate_pages 294 +#define LINUX_SYS_linux_openat 295 +#define LINUX_SYS_linux_mkdirat 296 +#define LINUX_SYS_linux_mknodat 297 +#define LINUX_SYS_linux_fchownat 298 +#define LINUX_SYS_linux_futimesat 299 +#define LINUX_SYS_linux_fstatat64 300 +#define LINUX_SYS_linux_unlinkat 301 +#define LINUX_SYS_linux_renameat 302 +#define LINUX_SYS_linux_linkat 303 +#define LINUX_SYS_linux_symlinkat 304 +#define LINUX_SYS_linux_readlinkat 305 +#define LINUX_SYS_linux_fchmodat 306 +#define LINUX_SYS_linux_faccessat 307 +#define LINUX_SYS_linux_pselect6 308 +#define LINUX_SYS_linux_ppoll 309 +#define LINUX_SYS_linux_unshare 310 #define LINUX_SYS_MAXSYSCALL 311 ==== //depot/projects/jail2/sys/amd64/linux32/linux32_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.12 2006/06/13 18:48:29 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.14 2006/06/26 18:37:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp */ #include @@ -65,7 +65,7 @@ { SYF_MPSAFE | AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = prof */ - { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ + { SYF_MPSAFE | AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ { SYF_MPSAFE | AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ { SYF_MPSAFE | AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ @@ -273,62 +273,62 @@ { SYF_MPSAFE | 0, (sy_call_t *)linux_fadvise64, AUE_NULL }, /* 250 = linux_fadvise64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 251 = */ { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 252 = exit_group */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 253 = linux_lookup_dcookie */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 254 = linux_epoll_create */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 255 = linux_epoll_ctl */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 256 = linux_epoll_wait */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 257 = linux_remap_file_pages */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 258 = linux_set_tid_address */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 259 = linux_timer_create */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 260 = linux_timer_settime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 261 = linux_timer_gettime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 262 = linux_timer_getoverrun */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 263 = linux_timer_delete */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 264 = linux_clock_settime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 265 = linux_clock_gettime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 266 = linux_clock_getres */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 267 = linux_clock_nanosleep */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 268 = linux_statfs64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 269 = linux_fstatfs64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 270 = linux_tgkill */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 271 = linux_utimes */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 272 = linux_fadvise64_64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = linux_ni_syscall */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 274 = linux_mbind */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 275 = linux_get_mempolicy */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 276 = linux_set_mempolicy */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 277 = linux_mq_open */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 278 = linux_mq_unlink */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 279 = linux_mq_timedsend */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 280 = linux_mq_timedreceive */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 281 = linux_mq_notify */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 282 = linux_mq_getsetattr */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 283 = linux_kexec_load */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 284 = linux_waitid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = linux_ni_syscall */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 286 = linux_add_key */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 287 = linux_request_key */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 288 = linux_keyctl */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 289 = linux_ioprio_set */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 290 = linux_ioprio_get */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 291 = linux_inotify_init */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 292 = linux_inotify_add_watch */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 293 = linux_inotify_rm_watch */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 294 = linux_migrate_pages */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 295 = linux_openat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 296 = linux_mkdirat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 297 = linux_mknodat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 298 = linux_fchownat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 299 = linux_futimesat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 300 = linux_fstatat64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 301 = linux_unlinkat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 302 = linux_renameat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 303 = linux_linkat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 304 = linux_symlinkat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 305 = linux_readlinkat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 306 = linux_fchmodat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 307 = linux_faccessat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 308 = linux_pselect6 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 309 = linux_ppoll */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 310 = linux_unshare */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL }, /* 253 = linux_lookup_dcookie */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_epoll_create, AUE_NULL }, /* 254 = linux_epoll_create */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL }, /* 255 = linux_epoll_ctl */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_epoll_wait, AUE_NULL }, /* 256 = linux_epoll_wait */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL }, /* 257 = linux_remap_file_pages */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_set_tid_address, AUE_NULL }, /* 258 = linux_set_tid_address */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_create, AUE_NULL }, /* 259 = linux_timer_create */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_settime, AUE_NULL }, /* 260 = linux_timer_settime */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_gettime, AUE_NULL }, /* 261 = linux_timer_gettime */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL }, /* 262 = linux_timer_getoverrun */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_delete, AUE_NULL }, /* 263 = linux_timer_delete */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME }, /* 264 = linux_clock_settime */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_clock_gettime, AUE_NULL }, /* 265 = linux_clock_gettime */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_clock_getres, AUE_NULL }, /* 266 = linux_clock_getres */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_clock_nanosleep, AUE_NULL }, /* 267 = linux_clock_nanosleep */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_statfs64, AUE_NULL }, /* 268 = linux_statfs64 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fstatfs64, AUE_NULL }, /* 269 = linux_fstatfs64 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_tgkill, AUE_NULL }, /* 270 = linux_tgkill */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_utimes, AUE_NULL }, /* 271 = linux_utimes */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL }, /* 272 = linux_fadvise64_64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mbind, AUE_NULL }, /* 274 = linux_mbind */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL }, /* 275 = linux_get_mempolicy */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL }, /* 276 = linux_set_mempolicy */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_open, AUE_NULL }, /* 277 = linux_mq_open */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_unlink, AUE_NULL }, /* 278 = linux_mq_unlink */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL }, /* 279 = linux_mq_timedsend */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL }, /* 280 = linux_mq_timedreceive */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_notify, AUE_NULL }, /* 281 = linux_mq_notify */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL }, /* 282 = linux_mq_getsetattr */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_kexec_load, AUE_NULL }, /* 283 = linux_kexec_load */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_waitid, AUE_NULL }, /* 284 = linux_waitid */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_add_key, AUE_NULL }, /* 286 = linux_add_key */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_request_key, AUE_NULL }, /* 287 = linux_request_key */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_keyctl, AUE_NULL }, /* 288 = linux_keyctl */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_ioprio_set, AUE_NULL }, /* 289 = linux_ioprio_set */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_ioprio_get, AUE_NULL }, /* 290 = linux_ioprio_get */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_inotify_init, AUE_NULL }, /* 291 = linux_inotify_init */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL }, /* 292 = linux_inotify_add_watch */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL }, /* 293 = linux_inotify_rm_watch */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_migrate_pages, AUE_NULL }, /* 294 = linux_migrate_pages */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_openat, AUE_NULL }, /* 295 = linux_openat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mkdirat, AUE_NULL }, /* 296 = linux_mkdirat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mknodat, AUE_NULL }, /* 297 = linux_mknodat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fchownat, AUE_NULL }, /* 298 = linux_fchownat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_futimesat, AUE_NULL }, /* 299 = linux_futimesat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fstatat64, AUE_NULL }, /* 300 = linux_fstatat64 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_unlinkat, AUE_NULL }, /* 301 = linux_unlinkat */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 27 06:44:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3198C16A403; Tue, 27 Jun 2006 06:44:00 +0000 (UTC) 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 0DADE16A401 for ; Tue, 27 Jun 2006 06:44:00 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A083043D48 for ; Tue, 27 Jun 2006 06:43:59 +0000 (GMT) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5R6hxRH092988 for ; Tue, 27 Jun 2006 06:43:59 GMT (envelope-from ryanb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5R6hxxU092985 for perforce@freebsd.org; Tue, 27 Jun 2006 06:43:59 GMT (envelope-from ryanb@FreeBSD.org) Date: Tue, 27 Jun 2006 06:43:59 GMT Message-Id: <200606270643.k5R6hxxU092985@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ryanb@FreeBSD.org using -f From: Ryan Beasley To: Perforce Change Reviews Cc: Subject: PERFORCE change 100119 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, 27 Jun 2006 06:44:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=100119 Change 100119 by ryanb@ryanb_yuki on 2006/06/27 06:43:43 Install stub ioctls for SNDCTL_DSP_GET_PLAYTGT_NAMES SNDCTL_DSP_GET_PLAYTGT SNDCTL_DSP_SET_PLAYTGT Affected files ... .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/dsp.c#7 edit Differences ... ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/dsp.c#7 (text+ko) ==== @@ -408,6 +408,7 @@ int kill; int ret = 0, *arg_i = (int *)arg, tmp; #ifdef OSSV4_EXPERIMENT + oss_mixer_enuminfo *ei; int xcmd; xcmd = 0; @@ -1082,6 +1083,42 @@ /** @todo verify error correctness */ ret = EINVAL; break; + + /* + * The following 3 ioctls aren't very useful at the moment. For + * now, only a single channel is associated with a cdev (/dev/dspN + * instance), so there's only a single output routing to use (i.e., + * the wrch bound to this cdev). + */ + case SNDCTL_DSP_GET_PLAYTGT_NAMES: + ei = (oss_mixer_enuminfo *)arg; + ei->dev = 0; + ei->ctrl = 0; + ei->version = 0; /* static for now */ + ei->strindex[0] = 0; + + if (wrch != NULL) { + ei->nvalues = 1; + strlcpy(ei->strings, wrch->name, sizeof(ei->strings)); + } else { + ei->nvalues = 0; + ei->strings[0] = '\0'; + } + break; + case SNDCTL_DSP_GET_PLAYTGT: + case SNDCTL_DSP_SET_PLAYTGT: /* yes, they are the same for now */ + /* + * Re: SET_PLAYTGT + * OSSv4: "The value that was accepted by the device will + * be returned back in the variable pointed by the + * argument." + */ + if (wrch != NULL) + *arg_i = 0; + else + ret = EINVAL; + break; + #endif /* !OSSV4_EXPERIMENT */ case SNDCTL_DSP_MAPINBUF: case SNDCTL_DSP_MAPOUTBUF: From owner-p4-projects@FreeBSD.ORG Tue Jun 27 07:42:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D22016A4B3; Tue, 27 Jun 2006 07:42:31 +0000 (UTC) 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 197DD16A4A0 for ; Tue, 27 Jun 2006 07:42:31 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7658943D5C for ; Tue, 27 Jun 2006 07:42:23 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5R7gCMg001313 for ; Tue, 27 Jun 2006 07:42:12 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5R7gCfT001310 for perforce@freebsd.org; Tue, 27 Jun 2006 07:42:12 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 27 Jun 2006 07:42:12 GMT Message-Id: <200606270742.k5R7gCfT001310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100121 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, 27 Jun 2006 07:42:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=100121 Change 100121 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/27 07:41:14 avoid pointless turnstile contention if mutex owner is running Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#20 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#20 (text+ko) ==== @@ -176,7 +176,7 @@ static int mutex_prof_maxrecords = MPROF_HASH_SIZE; SYSCTL_INT(_debug_mutex_prof, OID_AUTO, maxrecords, CTLFLAG_RD, &mutex_prof_maxrecords, 0, "Maximum number of profiling records"); -int mutex_prof_rejected; +int mutex_prof_rejected = 0; SYSCTL_INT(_debug_mutex_prof, OID_AUTO, rejected, CTLFLAG_RD, &mutex_prof_rejected, 0, "Number of rejected profiling records"); static int mutex_prof_hashsize = MPROF_HASH_SIZE; @@ -418,6 +418,16 @@ while (!_obtain_lock(m, tid)) { lock_profile_obtain_lock_failed(&m->mtx_object, &contested); +#if defined(SMP) && !defined(NO_ADAPTIVE_MUTEXES) + /* + * If the current owner of the lock is executing on another + * CPU, spin instead of blocking. + */ + for (owner = mtx_owner(m); owner && TD_IS_RUNNING(owner); owner = mtx_owner(m)) + cpu_spinwait(); + if (mtx_unowned(m)) + continue; +#endif /* SMP && !NO_ADAPTIVE_MUTEXES */ turnstile_lock(&m->mtx_object); v = m->mtx_lock; @@ -425,7 +435,7 @@ * Check if the lock has been released while spinning for * the turnstile chain lock. */ - if (v == MTX_UNOWNED) { + if (mtx_unowned(m)) { turnstile_release(&m->mtx_object); cpu_spinwait(); continue; @@ -837,6 +847,8 @@ mtx_validate(m); #endif + + /* Determine lock class and lock flags. */ if (opts & MTX_SPIN) class = &lock_class_mtx_spin; From owner-p4-projects@FreeBSD.ORG Tue Jun 27 07:50:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1736516A40D; Tue, 27 Jun 2006 07:50:34 +0000 (UTC) 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 CCC2516A408 for ; Tue, 27 Jun 2006 07:50:33 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C1C143D79 for ; Tue, 27 Jun 2006 07:50:24 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5R7oOIX001906 for ; Tue, 27 Jun 2006 07:50:24 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5R7oOOi001903 for perforce@freebsd.org; Tue, 27 Jun 2006 07:50:24 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 27 Jun 2006 07:50:24 GMT Message-Id: <200606270750.k5R7oOOi001903@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100123 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, 27 Jun 2006 07:50:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=100123 Change 100123 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/27 07:49:30 add lock profiling (MUTEX_PROFILING is now a misnomer) to lockmgr don't call wakeup while we're holding the interlock mutex I could go into whats wrong with lockmgr: - priority inversion - excessive wakeups - convoluted control flow - waking up all waiters (including exclusive) on a lock downgrade but life is too short I wish I could say that I'm surprised that NFS is one of the top 3 most contended locks BLAH BLAH BLAH Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_lock.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/lock_profile.h#8 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/lockmgr.h#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_lock.c#3 (text+ko) ==== @@ -43,6 +43,7 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.96 2005/12/23 21:32:40 jeff Exp $"); +#include "opt_global.h" #include #include #include @@ -52,6 +53,7 @@ #include #include #include +#include #ifdef DEBUG_LOCKS #include #endif @@ -143,22 +145,21 @@ * accepted shared locks and shared-to-exclusive upgrades to go away. */ int -lockmgr(lkp, flags, interlkp, td) - struct lock *lkp; - u_int flags; - struct mtx *interlkp; - struct thread *td; +_lockmgr(struct lock *lkp, u_int flags, struct mtx *interlkp, struct thread *td, char *file, int line) { int error; struct thread *thr; - int extflags, lockflags; + int extflags, lockflags, needwakeup; + uint64_t waitstart; error = 0; + needwakeup = 0; if (td == NULL) thr = LK_KERNPROC; else thr = td; + lock_profile_waitstart(&waitstart); if ((flags & LK_INTERNAL) == 0) mtx_lock(lkp->lk_interlock); CTR6(KTR_LOCK, @@ -210,10 +211,13 @@ lockflags = LK_HAVE_EXCL; if (td != NULL && !(td->td_pflags & TDP_DEADLKTREAT)) lockflags |= LK_WANT_EXCL | LK_WANT_UPGRADE; + error = acquire(&lkp, extflags, lockflags); if (error) break; sharelock(td, lkp, 1); + if (lkp->lk_sharecount == 1) + lock_profile_obtain_lock_success(&lkp->lk_object, waitstart, file, line); #if defined(DEBUG_LOCKS) stack_save(&lkp->lk_stack); #endif @@ -224,6 +228,9 @@ * An alternative would be to fail with EDEADLK. */ sharelock(td, lkp, 1); + if (lkp->lk_sharecount == 1) + lock_profile_obtain_lock_success(&lkp->lk_object, waitstart, file, line); + /* FALLTHROUGH downgrade */ case LK_DOWNGRADE: @@ -237,7 +244,7 @@ lkp->lk_flags &= ~LK_HAVE_EXCL; lkp->lk_lockholder = LK_NOPROC; if (lkp->lk_waitcount) - wakeup((void *)lkp); + needwakeup = 1; break; case LK_EXCLUPGRADE: @@ -267,6 +274,9 @@ if (lkp->lk_sharecount <= 0) panic("lockmgr: upgrade without shared"); shareunlock(td, lkp, 1); + if (lkp->lk_sharecount == 0) + lock_profile_release_lock(&lkp->lk_object); + /* * If we are just polling, check to see if we will block. */ @@ -288,7 +298,7 @@ if (error) { if ((lkp->lk_flags & ( LK_WANT_EXCL | LK_WAIT_NONZERO)) == (LK_WANT_EXCL | LK_WAIT_NONZERO)) - wakeup((void *)lkp); + needwakeup = 1; break; } if (lkp->lk_exclusivecount != 0) @@ -297,6 +307,7 @@ lkp->lk_lockholder = thr; lkp->lk_exclusivecount = 1; COUNT(td, 1); + lock_profile_obtain_lock_success(&lkp->lk_object, waitstart, file, line); #if defined(DEBUG_LOCKS) stack_save(&lkp->lk_stack); #endif @@ -309,7 +320,7 @@ */ if ( (lkp->lk_flags & (LK_SHARE_NONZERO|LK_WAIT_NONZERO)) == LK_WAIT_NONZERO) - wakeup((void *)lkp); + needwakeup = 1; /* FALLTHROUGH exclusive request */ case LK_EXCLUSIVE: @@ -347,7 +358,7 @@ lkp->lk_flags &= ~LK_WANT_EXCL; if (error) { if (lkp->lk_flags & LK_WAIT_NONZERO) - wakeup((void *)lkp); + needwakeup = 1; break; } lkp->lk_flags |= LK_HAVE_EXCL; @@ -356,6 +367,7 @@ panic("lockmgr: non-zero exclusive count"); lkp->lk_exclusivecount = 1; COUNT(td, 1); + lock_profile_obtain_lock_success(&lkp->lk_object, waitstart, file, line); #if defined(DEBUG_LOCKS) stack_save(&lkp->lk_stack); #endif @@ -375,19 +387,24 @@ lkp->lk_flags &= ~LK_HAVE_EXCL; lkp->lk_lockholder = LK_NOPROC; lkp->lk_exclusivecount = 0; + lock_profile_release_lock(&lkp->lk_object); + if (lkp->lk_flags & LK_WAIT_NONZERO) + needwakeup = 1; } else { lkp->lk_exclusivecount--; } - } else if (lkp->lk_flags & LK_SHARE_NONZERO) + } else if (lkp->lk_flags & LK_SHARE_NONZERO) { shareunlock(td, lkp, 1); - else { + if (!(lkp->lk_flags & LK_SHARE_NONZERO)) { + lock_profile_release_lock(&lkp->lk_object); + if (lkp->lk_flags & LK_WAIT_NONZERO) + needwakeup = 1; + } + } else { printf("lockmgr: thread %p unlocking unheld lock\n", thr); kdb_backtrace(); } - - if (lkp->lk_flags & LK_WAIT_NONZERO) - wakeup((void *)lkp); break; case LK_DRAIN: @@ -422,9 +439,11 @@ (lkp->lk_flags & (LK_HAVE_EXCL | LK_WANT_EXCL | LK_WANT_UPGRADE | LK_SHARE_NONZERO | LK_WAIT_NONZERO)) == 0) { lkp->lk_flags &= ~LK_WAITDRAIN; - wakeup((void *)&lkp->lk_flags); + needwakeup = 1; } mtx_unlock(lkp->lk_interlock); + if (needwakeup) + wakeup((void *)lkp); return (error); } @@ -504,17 +523,18 @@ #ifdef DEBUG_LOCKS stack_zero(&lkp->lk_stack); #endif + lock_profile_init(&lkp->lk_object, wmesg); } /* * Destroy a lock. */ void -lockdestroy(lkp) - struct lock *lkp; +lockdestroy(struct lock *lkp) { CTR2(KTR_LOCK, "lockdestroy(): lkp == %p (lk_wmesg == \"%s\")", lkp, lkp->lk_wmesg); + lock_profile_destroy(&lkp->lk_object); } /* ==== //depot/projects/kmacy_sun4v/src/sys/sys/lock_profile.h#8 (text+ko) ==== @@ -50,6 +50,8 @@ u_int hash = 0; struct lock_profile_object *l = &lo->lo_profile_obj; + lo->lo_flags = 0; + lo->lo_name = name; l->lpo_acqtime = 0; l->lpo_waittime = 0; l->lpo_filename = NULL; @@ -73,7 +75,7 @@ { #if 0 struct lock_profile_object *l = &lo->lo_profile_obj; - if (m->mtx_object.lo_flags & LO_PROFILE) + if (lo->lo_flags & LO_PROFILE) stack_destroy(l->lpo_stack); #endif } ==== //depot/projects/kmacy_sun4v/src/sys/sys/lockmgr.h#3 (text+ko) ==== @@ -40,6 +40,7 @@ #ifdef DEBUG_LOCKS #include /* XXX */ #endif +#include struct mtx; @@ -59,6 +60,9 @@ int lk_timo; /* maximum sleep time (for tsleep) */ struct thread *lk_lockholder; /* thread of exclusive lock holder */ struct lock *lk_newlock; /* lock taking over this lock */ +#ifdef MUTEX_PROFILING + struct lock_object lk_object; +#endif #ifdef DEBUG_LOCKS struct stack lk_stack; #endif @@ -197,11 +201,13 @@ int timo, int flags); void lockdestroy(struct lock *); -int lockmgr(struct lock *, u_int flags, - struct mtx *, struct thread *p); +int _lockmgr(struct lock *, u_int flags, struct mtx *, struct thread *p, char *file, int line); void transferlockers(struct lock *, struct lock *); void lockmgr_printinfo(struct lock *); int lockstatus(struct lock *, struct thread *); int lockcount(struct lock *); +#define lockmgr(lock, flags, mtx, td) _lockmgr((lock), (flags), (mtx), (td), __FILE__, __LINE__) + + #endif /* !_SYS_LOCKMGR_H_ */ From owner-p4-projects@FreeBSD.ORG Tue Jun 27 08:27:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C84E816A407; Tue, 27 Jun 2006 08:27:28 +0000 (UTC) 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 8B5B616A405 for ; Tue, 27 Jun 2006 08:27:28 +0000 (UTC) (envelope-from kip.macy@gmail.com) Received: from nz-out-0102.google.com (nz-out-0102.google.com [64.233.162.194]) by mx1.FreeBSD.org (Postfix) with ESMTP id E0D0743D55 for ; Tue, 27 Jun 2006 08:27:25 +0000 (GMT) (envelope-from kip.macy@gmail.com) Received: by nz-out-0102.google.com with SMTP id o1so130201nzf for ; Tue, 27 Jun 2006 01:27:25 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=LhvdC2TmTnXXrhM4jx7Mfw3Fc/cd0l2o96ynwdXhkODzRVUEMDZdwrQNb+8QJ7K+P7ietPtv2/+xcbq+cOXjRqiItzD2BnExFW1tRcJIuDzMqGwKvm6Y26bzHz4ZSBuX46TcteAIO8rjcrD/NPvHIczAI6huxJRk6INMkt/6SzE= Received: by 10.65.182.16 with SMTP id j16mr7252008qbp; Tue, 27 Jun 2006 01:27:25 -0700 (PDT) Received: by 10.65.225.9 with HTTP; Tue, 27 Jun 2006 01:27:25 -0700 (PDT) Message-ID: Date: Tue, 27 Jun 2006 01:27:25 -0700 From: "Kip Macy" To: "Robert Watson" In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200606262054.k5QKsDq7022302@repoman.freebsd.org> <200606261759.41541.jhb@freebsd.org> <20060627001336.T79454@fledge.watson.org> Cc: Perforce Change Reviews , Kip Macy , John Baldwin Subject: Re: PERFORCE change 100089 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: kmacy@fsmware.com List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jun 2006 08:27:29 -0000 actually it shows up - assuming I haven't missed any cases its pretty uncontended: t1# sort -nrk 3 foo33 | grep -n rwlock 111: 1 26 553 38 0 14 1 0 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/uipc_usrreq.c:311 (unp_global_rwlock) 126: 2 42 349 38 1 9 0 0 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/uipc_usrreq.c:482 (unp_global_rwlock) 130: 7 184 282 38 4 7 2 0 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/uipc_usrreq.c:836 (unp_global_rwlock) 135: 2 33 240 19 1 12 0 0 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/uipc_usrreq.c:1196 (unp_global_rwlock) 137: 0 6 234 19 0 12 0 0 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/uipc_usrreq.c:446 (unp_global_rwlock) 155: 21 305 120 19 16 6 1 0 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/uipc_usrreq.c:496 (unp_global_rwlock) 161: 1 14 89 19 0 4 0 0 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/uipc_usrreq.c:1101 (unp_global_rwlock) 428: 61 808 1 19 42 0 2 0 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/uipc_usrreq.c:1125 (unp_global_rwlock) On 6/26/06, Kip Macy wrote: > I've mapped your uipc_usrreq.c into my tree and have seen a measurable > boost. I actually see no contention on it. If I go into overload (16 > threads) I see the following: > > 65 13580255 555960120 4332486 3 128 22050892 > 4323043 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/kern_synch.c:217 > (lockbuilder mtxpool) > 13 24053476 160697931 92708398 0 1 30726211 > 0 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/kern_switch.c:522 > (runq lock) > 371 63389470 27487168 936871 67 29 5918460 > 640938 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/kern_lock.c:163 > (lockbuilder mtxpool) > 39 36405448 10970117 4748316 7 2 4132590 > 0 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/kern_switch.c:221 > (runq lock) > 361 85861725 10866103 5699832 15 1 3813907 > 0 /flatstor/shared/p4/sun4v/work_sleepq/src/sys/kern/subr_sleepqueue.c:223 > (sleepq chain) > > lockmgr is my biggest problem now. > > On 6/26/06, Robert Watson wrote: > > On Mon, 26 Jun 2006, John Baldwin wrote: > > > > > On Monday 26 June 2006 16:54, Kip Macy wrote: > > >> http://perforce.freebsd.org/chv.cgi?CH=100089 > > >> > > >> Change 100089 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/26 > > > 20:53:51 > > >> > > >> add profiling for rwlocks > > >> not convinced of correctness as there don't appear to be any contended > > > rwlocks on my workloads > > > > > > Few things use them currently. I have a patch to make the name cache use > > > them if you want it. > > > > You may already have seen this, but I have a UNIX domain socket re-locking in > > //depot/user/rwatson/proto/src/sys/kern/uipc_usrreq.c that uses rwlocks and > > finer-grained mutexes, among other things. Ideally this can generate some > > contention (although perhaps not too much). > > > > Robert N M Watson > > Computer Laboratory > > University of Cambridge > > > From owner-p4-projects@FreeBSD.ORG Tue Jun 27 08:28:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAC4516A407; Tue, 27 Jun 2006 08:28:12 +0000 (UTC) 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 C8A3A16A401 for ; Tue, 27 Jun 2006 08:28:12 +0000 (UTC) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73DFF43D45 for ; Tue, 27 Jun 2006 08:28:12 +0000 (GMT) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5R8SCZs004856 for ; Tue, 27 Jun 2006 08:28:12 GMT (envelope-from dongmei@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5R8SBTS004853 for perforce@freebsd.org; Tue, 27 Jun 2006 08:28:11 GMT (envelope-from dongmei@FreeBSD.org) Date: Tue, 27 Jun 2006 08:28:11 GMT Message-Id: <200606270828.k5R8SBTS004853@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dongmei@FreeBSD.org using -f From: dongmei To: Perforce Change Reviews Cc: Subject: PERFORCE change 100124 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, 27 Jun 2006 08:28:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=100124 Change 100124 by dongmei@soc-dongmei-sebsd on 2006/06/27 08:27:32 Modify part of c files in contrib/sebsd/setools/libapol to complie on Freebsd environment and write a Makefile file for libapol under lib directory in source tree Affected files ... .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/Makefile#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/VERSION#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/analysis.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/analysis.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol-perm-mapping#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol_tcl.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol_tcl.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol_tcl_render.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol_tcl_render.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apolicy_parse.y#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apolicy_scan.l#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/avl-util.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/avl-util.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/binpol.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/binpol.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/borrowed.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/bpmaps.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/bpmaps.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/ebitmap.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/ebitmap.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/fbuf.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/fbuf.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/clone.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/clone.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/cond.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/cond.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/dta.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/dta.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/flowassert.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/flowassert.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/flowassert_parse.y#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/flowassert_scan.l#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/infoflow.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/infoflow.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/perm-map.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/perm-map.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/poldiff.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/poldiff.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-avl.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-avl.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-io.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-io.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-query.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-query.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/queue.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/queue.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/relabel_analysis.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/relabel_analysis.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/render.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/render.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/symtable.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/symtable.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/util.c#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/util.h#2 edit .. //depot/projects/soc2006/dongmei_sebsd/etc/mtree/BSD.include.dist#2 edit .. //depot/projects/soc2006/dongmei_sebsd/lib/libapol/Makefile#1 add Differences ... ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/VERSION#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/analysis.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/analysis.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol-perm-mapping#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol_tcl.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol_tcl.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol_tcl_render.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol_tcl_render.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apolicy_parse.y#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apolicy_scan.l#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/avl-util.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/avl-util.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/binpol.c#2 (text+ko) ==== @@ -11,7 +11,7 @@ */ #include -#include +//#include #include "binpol.h" #include "fbuf.h" #include "borrowed.h" ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/binpol.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/borrowed.h#2 (text+ko) ==== @@ -8,8 +8,8 @@ #ifndef _APOLICY_BINPOL_BORROWED_H_ #define _APOLICY_BINPOL_BORROWED_H_ -#include -#include +//#include +#include #include ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/bpmaps.c#2 (text+ko) ==== @@ -9,7 +9,7 @@ * * Also contains our ebitmap unique functions */ -#include +//#include #include #include #include "ebitmap.h" ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/bpmaps.h#2 (text+ko) ==== @@ -11,7 +11,7 @@ #ifndef _APOLICY_BINPOL_BMAPS_H_ #define _APOLICY_BINPOL_BMAPS_H_ -#include +#include #include "ebitmap.h" #include "../policy.h" ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/ebitmap.c#2 (text+ko) ==== @@ -13,7 +13,7 @@ #include "borrowed.h" #include "fbuf.h" #include -#include +#include #include #define EBITMAP_ERR -8 ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/ebitmap.h#2 (text+ko) ==== @@ -21,8 +21,8 @@ #define _APOL_EBITMAP_H_ #include -#include -#include +//#include +#include #include #include "fbuf.h" ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/fbuf.c#2 (text+ko) ==== @@ -10,7 +10,7 @@ #include #include -#include +#include #include "fbuf.h" int ap_init_fbuf(ap_fbuf_t **fb) ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/fbuf.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/clone.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/clone.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/cond.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/cond.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/dta.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/dta.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/flowassert.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/flowassert.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/flowassert_parse.y#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/flowassert_scan.l#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/infoflow.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/infoflow.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/perm-map.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/perm-map.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/poldiff.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/poldiff.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-avl.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-avl.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-io.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-io.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-query.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-query.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ #include "perm-map.h" #include "util.h" #include "cond.h" -#include +#include #include #include ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy.h#2 (text+ko) ==== @@ -21,7 +21,7 @@ #include "avl-util.h" #include "util.h" #include "semantic/avhash.h" -#include +#include #include #include ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/queue.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/queue.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/relabel_analysis.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/relabel_analysis.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/render.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/render.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/symtable.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/symtable.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/util.c#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/util.h#2 (text+ko) ==== ==== //depot/projects/soc2006/dongmei_sebsd/etc/mtree/BSD.include.dist#2 (text+ko) ==== @@ -233,6 +233,16 @@ .. semanage .. + libapol + semantic + .. + binpol + .. + .. + libsefs + sqlite + .. + .. sepol .. sys From owner-p4-projects@FreeBSD.ORG Tue Jun 27 09:03:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3ED916A403; Tue, 27 Jun 2006 09:03:59 +0000 (UTC) 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 77D8F16A400 for ; Tue, 27 Jun 2006 09:03:59 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF1D843D67 for ; Tue, 27 Jun 2006 09:03:58 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5R93wLv015304 for ; Tue, 27 Jun 2006 09:03:58 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5R93wub015301 for perforce@freebsd.org; Tue, 27 Jun 2006 09:03:58 GMT (envelope-from clem1@FreeBSD.org) Date: Tue, 27 Jun 2006 09:03:58 GMT Message-Id: <200606270903.k5R93wub015301@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 100127 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, 27 Jun 2006 09:03:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=100127 Change 100127 by clem1@clem1_ipv6vulns on 2006/06/27 09:03:40 improvements around ipv6 fragmentation extension header. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-functions.h#5 edit .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-headers.h#4 edit .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_ip.c#2 edit Differences ... ==== //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-functions.h#5 (text+ko) ==== @@ -1095,7 +1095,8 @@ * Builds a version 6 RFC 2460 Internet Protocol (IP) fragmentation header. * @param nh next header * @param reserved unused value... OR IS IT! - * @param frag fragmentation bits (ala ipv4) + * @param offset fragmentation bits (ala ipv4) + * @param m flag (more fragment or NOT) * @param id packet identification * @param payload optional payload or NULL * @param payload_s payload length or 0 @@ -1104,8 +1105,8 @@ * @return protocol tag value on success, -1 on error */ libnet_ptag_t -libnet_build_ipv6_frag(u_int8_t nh, u_int8_t reserved, u_int16_t frag, -u_int32_t id, u_int8_t *payload, u_int32_t payload_s, libnet_t *l, +libnet_build_ipv6_frag(u_int8_t nh, u_int8_t reserved, u_int16_t offset, +u_int8_t m, u_int32_t id, u_int8_t *payload, u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag); /** ==== //depot/projects/soc2006/clem1_ipv6vulns/libnet/include/libnet/libnet-headers.h#4 (text+ko) ==== ==== //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_ip.c#2 (text+ko) ==== @@ -528,9 +528,9 @@ } libnet_ptag_t -libnet_build_ipv6_frag(u_int8_t nh, u_int8_t reserved, u_int16_t frag, -u_int32_t id, u_int8_t *payload, u_int32_t payload_s, libnet_t *l, -libnet_ptag_t ptag) +libnet_build_ipv6_frag(u_int8_t nh, u_int8_t reserved, u_int16_t offset, +u_int8_t m, u_int32_t id, u_int8_t *payload, u_int32_t payload_s, +libnet_t *l, libnet_ptag_t ptag) { u_int32_t n; u_int16_t h; @@ -565,8 +565,8 @@ memset(&ipv6_frag_hdr, 0 , sizeof(ipv6_frag_hdr)); ipv6_frag_hdr.ip_nh = nh; ipv6_frag_hdr.ip_reserved = reserved; - ipv6_frag_hdr.ip_frag = frag; - ipv6_frag_hdr.ip_id = id; + ipv6_frag_hdr.ip_frag = htons((offset << 3) + (m)); + ipv6_frag_hdr.ip_id = htonl(id); /* * Appened the protocol unit to the list. From owner-p4-projects@FreeBSD.ORG Tue Jun 27 10:01:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9114716A404; Tue, 27 Jun 2006 10:01:18 +0000 (UTC) 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 6BB9F16A402 for ; Tue, 27 Jun 2006 10:01:18 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD3E843D69 for ; Tue, 27 Jun 2006 10:01:10 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RA19RM018001 for ; Tue, 27 Jun 2006 10:01:09 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RA19aY017998 for perforce@freebsd.org; Tue, 27 Jun 2006 10:01:09 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 27 Jun 2006 10:01:09 GMT Message-Id: <200606271001.k5RA19aY017998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 100128 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, 27 Jun 2006 10:01:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=100128 Change 100128 by rdivacky@rdivacky_witten on 2006/06/27 10:00:32 Non-functional change - add some real args handler and comment to linux_set_thread_area(), note that this is actually a regression and WIP. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#5 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#5 (text+ko) ==== @@ -848,11 +848,33 @@ int linux_set_thread_area(struct thread *td, struct linux_set_thread_area_args *args) { - /* - * Return an error code instead of raising a SIGSYS so that - * the caller will fall back to simpler LDT methods. + struct l_user_desc info; + int error; + int idx; + + error = copyin(args->desc, &info, sizeof(struct l_user_desc)); + if (error) + return (error); + + idx = info.entry_number; + /* Semantics of linux version: every thread in the system has array + * of 3 tls descriptors. 1st is GLIBC TLS, 2nd is WINE, 3rd unknown. This + * syscall loads one of the selected tls decriptors with a value + * and also loads GDT descriptors 6, 7 and 8 with the content of the per-thread + * descriptors. + * + * Semantics of fbsd version: I think we can ignore that linux has 3 per-thread + * descriptors and use just the 1st one (TODO: davidxu will report us where we get this). + * The tls_array[] is used only in set/get-thread_area() syscalls and for loading the + * GDT descriptors. In fbsd we use just one GDT descriptor for TLS so we will load + * just one. */ - return (ENOSYS); + + /* we support just GLIBC TLS now */ + if (idx != 6 && idx != -1) + return (EINVAL); + + return (0); } int From owner-p4-projects@FreeBSD.ORG Tue Jun 27 10:08:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CC9216A40F; Tue, 27 Jun 2006 10:08:25 +0000 (UTC) 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 092AA16A403 for ; Tue, 27 Jun 2006 10:08:25 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 79E8943D67 for ; Tue, 27 Jun 2006 10:08:21 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RA8LHw019567 for ; Tue, 27 Jun 2006 10:08:21 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RA8JVx019564 for perforce@freebsd.org; Tue, 27 Jun 2006 10:08:19 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 27 Jun 2006 10:08:19 GMT Message-Id: <200606271008.k5RA8JVx019564@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 100130 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, 27 Jun 2006 10:08:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=100130 Change 100130 by rdivacky@rdivacky_witten on 2006/06/27 10:07:39 IFC Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/pmap.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/conf/GENERIC#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/conf/NOTES#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/locore.S#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/files.at91#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/cam/cam_xpt.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/syscalls.master#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/NOTES#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files.amd64#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files.i386#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/options#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ath/if_ath.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ath/if_athvar.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/rgephy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mpt/mpt.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mpt/mpt.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/nfe/if_nfe.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/nfe/if_nfereg.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/nfe/if_nfevar.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/re/if_re.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/geom/geom_gpt.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/conf/GENERIC#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/conf/NOTES#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/pmap.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/conf/GENERIC#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/disasm/disasm.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/disasm/disasm_decode.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/disasm/disasm_extract.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/disasm/disasm_format.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/disasm/disasm_int.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/ia64/machdep.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/ia64/pmap.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_linker.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_module.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/link_elf.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/link_elf_obj.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/subr_bus.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/subr_firmware.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_usrreq.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/vfs_init.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/vfs_subr.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/vfs_vnops.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/Makefile#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/nfe/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_enc.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_types.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_vlan.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/ip_fw2.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/tcp_input.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/tcp_syncache.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/tcp_var.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet6/raw_ip6.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netipsec/ipsec.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netipsec/ipsec_input.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netipsec/ipsec_output.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netipsec/xform_ipip.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/nfsserver/nfsrvcache.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/pc98/conf/GENERIC#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/pci/agp_i810.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/pci/if_rlreg.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/powerpc/conf/GENERIC#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/powerpc/powerpc/mmu_oea.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sparc64/conf/GENERIC#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/gpt.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/rwlock.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/sx.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/vm_page.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/vm_pageq.c#2 integrate Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/pmap.c#3 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.558 2006/06/20 20:52:10 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.560 2006/06/27 04:28:22 alc Exp $"); /* * Manages physical address maps. @@ -2674,7 +2674,7 @@ PHYS_TO_DMAP(VM_PAGE_TO_PHYS(dstmpde)); pde = &pde[pmap_pde_index(addr)]; if (*pde == 0) { - *pde = srcptepaddr; + *pde = srcptepaddr & ~PG_W; dst_pmap->pm_stats.resident_count += NBPDR / PAGE_SIZE; } else @@ -2697,11 +2697,6 @@ * we only virtual copy managed pages */ if ((ptetemp & PG_MANAGED) != 0) { - /* - * We have to check after allocpte for the - * pte still being around... allocpte can - * block. - */ dstmpte = pmap_allocpte(dst_pmap, addr, M_NOWAIT); if (dstmpte == NULL) @@ -2713,14 +2708,16 @@ pmap_try_insert_pv_entry(dst_pmap, addr, PHYS_TO_VM_PAGE(ptetemp & PG_FRAME))) { /* - * Clear the modified and + * Clear the wired, modified, and * accessed (referenced) bits * during the copy. */ - *dst_pte = ptetemp & ~(PG_M | PG_A); + *dst_pte = ptetemp & ~(PG_W | PG_M | + PG_A); dst_pmap->pm_stats.resident_count++; } else - pmap_unwire_pte_hold(dst_pmap, addr, dstmpte); + pmap_unwire_pte_hold(dst_pmap, addr, + dstmpte); if (dstmpte->wire_count >= srcmpte->wire_count) break; } ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/conf/GENERIC#3 (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.460 2006/06/15 19:58:52 netchild Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.462 2006/06/26 22:03:20 babkin Exp $ cpu HAMMER ident GENERIC ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/conf/NOTES#3 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.56 2006/06/12 20:38:17 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.57 2006/06/26 23:41:06 obrien Exp $ # # @@ -223,6 +223,7 @@ # (requires miibus) # ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter # iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters +# nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking # ral: Ralink Technology IEEE 802.11 wireless adapter # ural: Ralink Technology RT2500USB IEEE 802.11 wireless adapter @@ -233,6 +234,7 @@ options ED_SIC device iwi device ipw +device nfe # nVidia nForce MCP on-board Ethernet Networking device nve # nVidia nForce MCP on-board Ethernet Networking device ral device ural ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.13 2006/06/20 20:41:28 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.14 2006/06/26 18:37:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.13 2006/06/20 20:41:28 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.14 2006/06/26 18:37:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.13 2006/06/20 20:41:28 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.14 2006/06/26 18:37:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp */ #include @@ -65,7 +65,7 @@ { SYF_MPSAFE | AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = prof */ - { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ + { SYF_MPSAFE | AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ { SYF_MPSAFE | AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ { SYF_MPSAFE | AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#6 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -103,7 +103,7 @@ 42 AUE_PIPE MSTD { int linux_pipe(l_ulong *pipefds); } 43 AUE_NULL MSTD { int linux_times(struct l_times_argv *buf); } 44 AUE_NULL UNIMPL prof -45 AUE_NULL STD { int linux_brk(l_ulong dsend); } +45 AUE_NULL MSTD { int linux_brk(l_ulong dsend); } 46 AUE_SETGID MSTD { int linux_setgid16(l_gid16_t gid); } 47 AUE_GETGID MSTD { int linux_getgid16(void); } 48 AUE_NULL MSTD { int linux_signal(l_int sig, \ ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/elf_trampoline.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.8 2006/06/18 22:46:30 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.11 2006/06/23 22:45:35 cognet Exp $"); #include #include #include @@ -131,6 +131,8 @@ } } +static void arm9_setup(void); + void _start(void) { @@ -174,7 +176,6 @@ __start(); } -#ifdef KZIP static void get_cachetype_cp15() { @@ -255,6 +256,7 @@ } +#ifdef KZIP static unsigned char *orig_input, *i_input, *i_output; @@ -348,8 +350,8 @@ int d) { Elf32_Ehdr *eh; - Elf32_Phdr phdr[512] /* XXX */, *php; - Elf32_Shdr shdr[512] /* XXX */; + Elf32_Phdr phdr[64] /* XXX */, *php; + Elf32_Shdr shdr[64] /* XXX */; int i,j; void *entry_point; int symtabindex = -1; ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/locore.S#2 (text+ko) ==== @@ -37,9 +37,9 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.13 2005/12/21 15:02:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.14 2006/06/21 23:47:25 imp Exp $"); -/* What size should this really be ? It is only used by init_arm() */ +/* What size should this really be ? It is only used by initarm() */ #define INIT_ARM_STACK_SIZE 2048 /* ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/files.at91#2 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/at91/files.at91,v 1.3 2006/03/24 07:36:23 imp Exp $ +# $FreeBSD: src/sys/arm/at91/files.at91,v 1.5 2006/06/23 23:07:11 cognet Exp $ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91.c standard ==== //depot/projects/soc2006/rdivacky_linuxolator/cam/cam_xpt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.160 2006/06/05 22:22:14 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.162 2006/06/26 05:41:11 mjacob Exp $"); #include #include @@ -387,6 +387,11 @@ /*quirks*/0, /*mintags*/0, /*maxtags*/0 }, { + /* Does not support other than LUN 0 */ + { T_DIRECT, SIP_MEDIA_FIXED, "VMware*", "*", "*" }, + CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0 + }, + { /* * Broken tagged queuing drive. * Submitted by: ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.54 2006/03/30 07:43:01 ps Exp $ - * created from FreeBSD + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.55 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.66 2006/06/26 18:35:57 jhb Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.52 2006/03/30 07:43:01 ps Exp $ - * created from FreeBSD + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.53 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.66 2006/06/26 18:35:57 jhb Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_syscalls.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.43 2006/03/30 07:43:01 ps Exp $ - * created from FreeBSD + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.44 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.66 2006/06/26 18:35:57 jhb Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.53 2006/03/30 07:43:01 ps Exp $ - * created from FreeBSD + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.54 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.66 2006/06/26 18:35:57 jhb Exp */ #include "opt_compat.h" @@ -168,9 +168,9 @@ { SYF_MPSAFE | AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO }, /* 133 = sendto */ { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN }, /* 134 = shutdown */ { SYF_MPSAFE | AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR }, /* 135 = socketpair */ - { AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR }, /* 136 = mkdir */ - { AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR }, /* 137 = rmdir */ - { AS(freebsd32_utimes_args), (sy_call_t *)freebsd32_utimes, AUE_UTIMES }, /* 138 = freebsd32_utimes */ + { SYF_MPSAFE | AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR }, /* 136 = mkdir */ + { SYF_MPSAFE | AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR }, /* 137 = rmdir */ + { SYF_MPSAFE | AS(freebsd32_utimes_args), (sy_call_t *)freebsd32_utimes, AUE_UTIMES }, /* 138 = freebsd32_utimes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = obsolete 4.2 sigreturn */ { SYF_MPSAFE | AS(freebsd32_adjtime_args), (sy_call_t *)freebsd32_adjtime, AUE_ADJTIME }, /* 140 = freebsd32_adjtime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 141 = obsolete ogetpeername */ @@ -387,10 +387,10 @@ { SYF_MPSAFE | AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL }, /* 352 = __acl_delete_fd */ { SYF_MPSAFE | AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL }, /* 353 = __acl_aclcheck_file */ { SYF_MPSAFE | AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL }, /* 354 = __acl_aclcheck_fd */ - { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_NULL }, /* 355 = extattrctl */ - { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_NULL }, /* 356 = extattr_set_file */ - { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_NULL }, /* 357 = extattr_get_file */ - { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_NULL }, /* 358 = extattr_delete_file */ + { SYF_MPSAFE | AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_NULL }, /* 355 = extattrctl */ + { SYF_MPSAFE | AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_NULL }, /* 356 = extattr_set_file */ + { SYF_MPSAFE | AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_NULL }, /* 357 = extattr_get_file */ + { SYF_MPSAFE | AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_NULL }, /* 358 = extattr_delete_file */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 359 = aio_waitcomplete */ { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 360 = getresuid */ { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL }, /* 361 = getresgid */ @@ -403,9 +403,9 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 368 = __cap_set_fd */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 369 = __cap_set_file */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 370 = lkmressys */ - { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_NULL }, /* 371 = extattr_set_fd */ - { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_NULL }, /* 372 = extattr_get_fd */ - { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_NULL }, /* 373 = extattr_delete_fd */ + { SYF_MPSAFE | AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_NULL }, /* 371 = extattr_set_fd */ + { SYF_MPSAFE | AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_NULL }, /* 372 = extattr_get_fd */ + { SYF_MPSAFE | AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_NULL }, /* 373 = extattr_delete_fd */ { SYF_MPSAFE | AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL }, /* 374 = __setugid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 375 = nfsclnt */ { SYF_MPSAFE | AS(eaccess_args), (sy_call_t *)eaccess, AUE_NULL }, /* 376 = eaccess */ ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/syscalls.master#2 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.65 2006/03/30 07:42:32 ps Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.66 2006/06/26 18:35:57 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -251,9 +251,9 @@ 134 AUE_SHUTDOWN MNOPROTO { int shutdown(int s, int how); } 135 AUE_SOCKETPAIR MNOPROTO { int socketpair(int domain, int type, \ int protocol, int *rsv); } -136 AUE_MKDIR NOPROTO { int mkdir(char *path, int mode); } -137 AUE_RMDIR NOPROTO { int rmdir(char *path); } -138 AUE_UTIMES STD { int freebsd32_utimes(char *path, \ +136 AUE_MKDIR MNOPROTO { int mkdir(char *path, int mode); } +137 AUE_RMDIR MNOPROTO { int rmdir(char *path); } +138 AUE_UTIMES MSTD { int freebsd32_utimes(char *path, \ struct timeval32 *tptr); } 139 AUE_NULL OBSOL 4.2 sigreturn 140 AUE_ADJTIME MSTD { int freebsd32_adjtime( \ @@ -601,16 +601,16 @@ acl_type_t type, struct acl *aclp); } 354 AUE_NULL MNOPROTO { int __acl_aclcheck_fd(int filedes, \ acl_type_t type, struct acl *aclp); } -355 AUE_NULL NOPROTO { int extattrctl(const char *path, int cmd, \ +355 AUE_NULL MNOPROTO { int extattrctl(const char *path, int cmd, \ const char *filename, int attrnamespace, \ const char *attrname); } -356 AUE_NULL NOPROTO { int extattr_set_file(const char *path, \ +356 AUE_NULL MNOPROTO { int extattr_set_file(const char *path, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -357 AUE_NULL NOPROTO { ssize_t extattr_get_file(const char *path, \ +357 AUE_NULL MNOPROTO { ssize_t extattr_get_file(const char *path, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -358 AUE_NULL NOPROTO { int extattr_delete_file(const char *path, \ +358 AUE_NULL MNOPROTO { int extattr_delete_file(const char *path, \ int attrnamespace, \ const char *attrname); } 359 AUE_NULL UNIMPL aio_waitcomplete @@ -631,13 +631,13 @@ 368 AUE_NULL UNIMPL __cap_set_fd 369 AUE_NULL UNIMPL __cap_set_file 370 AUE_NULL UNIMPL lkmressys -371 AUE_NULL NOPROTO { int extattr_set_fd(int fd, \ +371 AUE_NULL MNOPROTO { int extattr_set_fd(int fd, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -372 AUE_NULL NOPROTO { ssize_t extattr_get_fd(int fd, \ +372 AUE_NULL MNOPROTO { ssize_t extattr_get_fd(int fd, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -373 AUE_NULL NOPROTO { int extattr_delete_fd(int fd, \ +373 AUE_NULL MNOPROTO { int extattr_delete_fd(int fd, \ int attrnamespace, \ const char *attrname); } 374 AUE_NULL MNOPROTO { int __setugid(int flag); } ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.178 2006/05/10 20:38:16 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.179 2006/06/23 18:49:38 netchild Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -661,20 +661,22 @@ printf(ARGS(times, "*")); #endif - p = td->td_proc; - PROC_LOCK(p); - calcru(p, &utime, &stime); - calccru(p, &cutime, &cstime); - PROC_UNLOCK(p); + if (args->buf != NULL) { + p = td->td_proc; + PROC_LOCK(p); + calcru(p, &utime, &stime); + calccru(p, &cutime, &cstime); + PROC_UNLOCK(p); - tms.tms_utime = CONVTCK(utime); - tms.tms_stime = CONVTCK(stime); + tms.tms_utime = CONVTCK(utime); + tms.tms_stime = CONVTCK(stime); - tms.tms_cutime = CONVTCK(cutime); - tms.tms_cstime = CONVTCK(cstime); + tms.tms_cutime = CONVTCK(cutime); + tms.tms_cstime = CONVTCK(cstime); - if ((error = copyout(&tms, args->buf, sizeof(tms)))) - return error; + if ((error = copyout(&tms, args->buf, sizeof(tms)))) + return error; + } microuptime(&tv); td->td_retval[0] = (int)CONVTCK(tv); ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/ndis/kern_ndis.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.91 2005/11/02 18:01:04 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.92 2006/06/22 13:11:36 dds Exp $"); #include #include @@ -405,13 +405,16 @@ cfg->ndis_oid = #if __FreeBSD_version < 502113 SYSCTL_ADD_STRING(&sc->ndis_ctx, SYSCTL_CHILDREN(sc->ndis_tree), + OID_AUTO, cfg->ndis_cfg.nc_cfgkey, flag, + cfg->ndis_cfg.nc_val, sizeof(cfg->ndis_cfg.nc_val), + cfg->ndis_cfg.nc_cfgdesc); #else SYSCTL_ADD_STRING(device_get_sysctl_ctx(sc->ndis_dev), SYSCTL_CHILDREN(device_get_sysctl_tree(sc->ndis_dev)), -#endif OID_AUTO, cfg->ndis_cfg.nc_cfgkey, flag, cfg->ndis_cfg.nc_val, sizeof(cfg->ndis_cfg.nc_val), cfg->ndis_cfg.nc_cfgdesc); +#endif return(0); } ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_misc.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.84 2006/02/06 22:06:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.85 2006/06/26 18:36:57 jhb Exp $"); #include "opt_mac.h" @@ -792,58 +792,10 @@ struct thread *td; struct svr4_sys_break_args *uap; { - struct proc *p = td->td_proc; - struct vmspace *vm = p->p_vmspace; - vm_offset_t new, old, base, ns; - int rv; + struct obreak_args ap; - base = round_page((vm_offset_t) vm->vm_daddr); - ns = (vm_offset_t)uap->nsize; - new = round_page(ns); - if (new > base) { - PROC_LOCK(p); - if ((new - base) > (unsigned)lim_cur(p, RLIMIT_DATA)) { - PROC_UNLOCK(p); - return ENOMEM; - } - PROC_UNLOCK(p); - if (new >= VM_MAXUSER_ADDRESS) - return (ENOMEM); - } else if (new < base) { - /* - * This is simply an invalid value. If someone wants to - * do fancy address space manipulations, mmap and munmap - * can do most of what the user would want. - */ - return EINVAL; - } - - old = base + ctob(vm->vm_dsize); - - if (new > old) { - vm_size_t diff; - diff = new - old; - PROC_LOCK(p); - if (vm->vm_map.size + diff > lim_cur(p, RLIMIT_VMEM)) { - PROC_UNLOCK(p); - return(ENOMEM); - } - PROC_UNLOCK(p); - rv = vm_map_find(&vm->vm_map, NULL, 0, &old, diff, FALSE, - VM_PROT_ALL, VM_PROT_ALL, 0); - if (rv != KERN_SUCCESS) { - return (ENOMEM); - } - vm->vm_dsize += btoc(diff); - } else if (new < old) { - rv = vm_map_remove(&vm->vm_map, new, old); - if (rv != KERN_SUCCESS) { - return (ENOMEM); - } - vm->vm_dsize -= btoc(old - new); - } - - return (0); + ap.nsize = uap->nsize; + return (obreak(td, &ap)); } static __inline clock_t ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.19 2005/07/13 20:35:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.20 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp */ #ifndef _SVR4_SYSPROTO_H_ ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.17 2005/07/13 20:35:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.18 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp */ #define SVR4_SYS_exit 1 ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_syscallnames.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.17 2005/07/13 20:35:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.18 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp */ const char *svr4_syscallnames[] = { ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.18 2005/07/13 20:35:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.19 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp */ #include @@ -37,7 +37,7 @@ { SYF_MPSAFE | AS(svr4_sys_mknod_args), (sy_call_t *)svr4_sys_mknod, AUE_NULL }, /* 14 = svr4_sys_mknod */ { SYF_MPSAFE | AS(chmod_args), (sy_call_t *)chmod, AUE_NULL }, /* 15 = chmod */ { SYF_MPSAFE | AS(chown_args), (sy_call_t *)chown, AUE_NULL }, /* 16 = chown */ - { AS(svr4_sys_break_args), (sy_call_t *)svr4_sys_break, AUE_NULL }, /* 17 = svr4_sys_break */ + { SYF_MPSAFE | AS(svr4_sys_break_args), (sy_call_t *)svr4_sys_break, AUE_NULL }, /* 17 = svr4_sys_break */ { SYF_MPSAFE | AS(svr4_sys_stat_args), (sy_call_t *)svr4_sys_stat, AUE_NULL }, /* 18 = svr4_sys_stat */ { SYF_MPSAFE | AS(lseek_args), (sy_call_t *)lseek, AUE_NULL }, /* 19 = lseek */ { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/syscalls.master#2 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp $ + $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp $ ; from: @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; ; System call name/number master file (or rather, slave, from SVR4). @@ -57,7 +57,7 @@ 14 AUE_NULL MSTD { int svr4_sys_mknod(char* path, int mode, int dev); } 15 AUE_NULL MNOPROTO { int chmod(char *path, int mode); } 16 AUE_NULL MNOPROTO { int chown(char *path, uid_t uid, gid_t gid); } -17 AUE_NULL STD { int svr4_sys_break(caddr_t nsize); } +17 AUE_NULL MSTD { int svr4_sys_break(caddr_t nsize); } 18 AUE_NULL MSTD { int svr4_sys_stat(char* path, \ struct svr4_stat* ub); } 19 AUE_NULL MNOPROTO { int lseek(int filedes, off_t *offset, \ ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/NOTES#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1367 2006/06/19 22:11:44 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1369 2006/06/26 22:03:21 babkin Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/files#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1125 2006/06/14 03:03:08 marcel Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1126 2006/06/26 22:30:07 thompsa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1459,6 +1459,7 @@ net/if_clone.c standard net/if_disc.c optional disc net/if_ef.c optional ef +net/if_enc.c optional enc net/if_ethersubr.c optional ether net/if_faith.c optional faith net/if_fddisubr.c optional fddi ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/files.amd64#2 (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.amd64,v 1.89 2006/05/18 23:30:47 ambrisko Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.90 2006/06/26 23:41:06 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -177,6 +177,7 @@ dev/hwpmc/hwpmc_x86.c optional hwpmc dev/kbd/kbd.c optional atkbd | sc | ukbd dev/mem/memutil.c optional mem +dev/nfe/if_nfe.c optional nfe pci dev/nve/if_nve.c optional nve pci dev/rr232x/os_bsd.c optional rr232x dev/rr232x/osm_bsd.c optional rr232x ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/files.i386#2 (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.561 2006/05/17 21:25:22 marius Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.562 2006/06/26 23:41:07 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -198,6 +198,7 @@ dev/mem/memutil.c optional mem dev/mse/mse.c optional mse dev/mse/mse_isa.c optional mse isa +dev/nfe/if_nfe.c optional nfe pci dev/nve/if_nve.c optional nve pci dev/pcf/pcf_isa.c optional pcf dev/random/nehemiah.c optional random ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/options#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.546 2006/06/13 13:12:55 davidxu Exp $ +# $FreeBSD: src/sys/conf/options,v 1.549 2006/06/26 22:30:07 thompsa Exp $ # # On the handling of kernel options # @@ -340,6 +340,7 @@ BOOTP_NFSV3 opt_bootp.h BOOTP_WIRED_TO opt_bootp.h DEVICE_POLLING +DEV_ENC opt_enc.h DEV_PF opt_pf.h DEV_PFLOG opt_pf.h DEV_PFSYNC opt_pf.h ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/acpica/acpi_dock.c#2 (text) ==== @@ -23,25 +23,20 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_dock.c,v 1.2 2006/04/16 15:35:12 maxim Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_dock.c,v 1.3 2006/06/22 06:34:05 njl Exp $ */ #include "opt_acpi.h" #include +#include #include -#include - -#include - -#include #include #include +#include #include #include -#include - /* Hooks for the ACPI CA debugging infrastructure */ #define _COMPONENT ACPI_DOCK ACPI_MODULE_NAME("DOCK") @@ -56,6 +51,10 @@ #define ACPI_DOCK_STATUS_UNDOCKED 0 #define ACPI_DOCK_STATUS_DOCKED 1 +/* Prevent the device from being removed or not. */ +#define ACPI_DOCK_UNLOCK 0 +#define ACPI_DOCK_LOCK 1 + struct acpi_dock_softc { int _sta; int _bdn; @@ -68,10 +67,10 @@ /* Global docking status, for avoiding duplicated docking */ static int acpi_dock_status = ACPI_DOCK_STATUS_UNKNOWN; -ACPI_SERIAL_DECL(dock, "ACPI Dock Station"); +ACPI_SERIAL_DECL(dock, "ACPI Docking Station"); /* - * Utility + * Utility functions */ static void @@ -83,23 +82,15 @@ sc = device_get_softc(dev); h = acpi_get_handle(dev); - if (ACPI_FAILURE(acpi_GetInteger(h, "_STA", &sc->_sta))) { + if (ACPI_FAILURE(acpi_GetInteger(h, "_STA", &sc->_sta))) sc->_sta = ACPI_DOCK_STATUS_UNKNOWN; - } - ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), - "_STA = %04x\n", sc->_sta); - - if (ACPI_FAILURE(acpi_GetInteger(h, "_BDN", &sc->_bdn))) { + if (ACPI_FAILURE(acpi_GetInteger(h, "_BDN", &sc->_bdn))) sc->_bdn = ACPI_DOCK_STATUS_UNKNOWN; - } - ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), - "_BDN = %04x\n", sc->_bdn); - - if (ACPI_FAILURE(acpi_GetInteger(h, "_UID", &sc->_uid))) { + if (ACPI_FAILURE(acpi_GetInteger(h, "_UID", &sc->_uid))) sc->_uid = ACPI_DOCK_STATUS_UNKNOWN; - } ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), - "_UID = %04x\n", sc->_uid); + "_STA: %04x, _BDN: %04x, _UID: %04x\n", sc->_sta, + sc->_bdn, sc->_uid); } static int @@ -122,23 +113,21 @@ buf.Length = sizeof(retobj); status = AcpiEvaluateObject(h, "_DCK", &args, &buf); - if (dock == ACPI_DOCK_STATUS_UNDOCKED) { - /* - * When _DCK is called with 0, OSPM will ignore the return value. - */ + /* + * When _DCK is called with 0, OSPM will ignore the return value. + */ + if (dock == ACPI_DOCK_STATUS_UNDOCKED) return (0); - } - if (ACPI_SUCCESS(status)) { - if (retobj.Type == ACPI_TYPE_INTEGER && - retobj.Integer.Value == 1) { - return (0); - } - } + /* If _DCK returned 1, the request succeeded. */ + if (ACPI_SUCCESS(status) && retobj.Type == ACPI_TYPE_INTEGER && + retobj.Integer.Value == 1) + return (0); return (-1); } +/* Lock devices while docked. */ static void acpi_dock_execute_lck(device_t dev, int lock) { @@ -158,10 +147,8 @@ h = acpi_get_handle(dev); snprintf(ejx, sizeof(ejx), "_EJ%d", state); status = acpi_SetInteger(h, ejx, eject); - - if (ACPI_SUCCESS(status)) { + if (ACPI_SUCCESS(status)) return (0); - } return (-1); } @@ -179,17 +166,12 @@ ejd_buffer.Pointer = NULL; ejd_buffer.Length = ACPI_ALLOCATE_BUFFER; ret_status = AcpiEvaluateObject(handle, "_EJD", NULL, &ejd_buffer); - - if (ACPI_FAILURE(ret_status)) { + if (ACPI_FAILURE(ret_status)) goto out; - } obj = (ACPI_OBJECT *)ejd_buffer.Pointer; - if (dock_handle != acpi_GetReference(NULL, obj)) { - goto out; - } - - ret = 1; + if (dock_handle == acpi_GetReference(NULL, obj)) + ret = 1; out: if (ejd_buffer.Pointer != NULL) @@ -199,7 +181,7 @@ } /* - * Dock + * Docking functions */ static void @@ -209,9 +191,8 @@ dev = (device_t)context; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 27 12:15:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F8A116A406; Tue, 27 Jun 2006 12:15:05 +0000 (UTC) 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 64F0A16A400 for ; Tue, 27 Jun 2006 12:15:05 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA1AE43D45 for ; Tue, 27 Jun 2006 12:15:00 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RCF0of028002 for ; Tue, 27 Jun 2006 12:15:00 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RCF0i1027991 for perforce@freebsd.org; Tue, 27 Jun 2006 12:15:00 GMT (envelope-from clem1@FreeBSD.org) Date: Tue, 27 Jun 2006 12:15:00 GMT Message-Id: <200606271215.k5RCF0i1027991@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 100136 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, 27 Jun 2006 12:15:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=100136 Change 100136 by clem1@clem1_ipv6vulns on 2006/06/27 12:14:08 libnet improvements around extension headers and checksum calculation. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_ip.c#3 edit .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_internal.c#3 edit .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_link_bpf.c#2 edit .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_pblock.c#4 edit .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_write.c#2 edit Differences ... ==== //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_build_ip.c#3 (text+ko) ==== @@ -519,6 +519,8 @@ } } + libnet_pblock_record_ip_offset(l, l->total_size); + /* no checksum for IPv6 */ return (ptag ? ptag : libnet_pblock_update(l, p, LIBNET_IPV6_H, LIBNET_PBLOCK_IPV6_H)); @@ -599,6 +601,8 @@ } } + libnet_pblock_record_ip_offset(l, l->total_size); + /* * Update the protocol block's meta information and return the protocol * tag id of this pblock. This tag will be used to locate the pblock @@ -686,6 +690,8 @@ } } + libnet_pblock_record_ip_offset(l, l->total_size); + /* * Update the protocol block's meta information and return the protocol * tag id of this pblock. This tag will be used to locate the pblock @@ -770,6 +776,8 @@ } } + libnet_pblock_record_ip_offset(l, l->total_size); + /* * Update the protocol block's meta information and return the protocol * tag id of this pblock. This tag will be used to locate the pblock @@ -854,6 +862,8 @@ } } + libnet_pblock_record_ip_offset(l, l->total_size); + /* * Update the protocol block's meta information and return the protocol * tag id of this pblock. This tag will be used to locate the pblock ==== //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_internal.c#3 (text+ko) ==== ==== //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_link_bpf.c#2 (text+ko) ==== ==== //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_pblock.c#4 (text+ko) ==== @@ -389,37 +389,8 @@ { if ((q->flags) & LIBNET_PBLOCK_DO_CHECKSUM) { - int offset; - if (l->injection_type != LIBNET_LINK) - { - offset = (l->total_size + l->aligner) - q->ip_offset; - } - else - { - offset = l->aligner; - switch(l->pblock_end->type){ - case LIBNET_PBLOCK_ETH_H: - offset += LIBNET_ETH_H; - break; - case LIBNET_PBLOCK_TOKEN_RING_H: - offset += LIBNET_TOKEN_RING_H; - break; - case LIBNET_PBLOCK_FDDI_H: - offset += LIBNET_FDDI_H; - break; - case LIBNET_PBLOCK_802_1Q_H: - offset += LIBNET_802_1Q_H; - break; - case LIBNET_PBLOCK_ISL_H: - offset += LIBNET_ISL_H; - break; - case LIBNET_PBLOCK_802_3_H: - offset += LIBNET_802_3_H; - break; - default: - break; - } - } + int offset = (l->total_size + l->aligner) - q->ip_offset; + c = libnet_do_checksum(l, *packet + offset, libnet_pblock_p2p(q->type), q->h_len); if (c == -1) @@ -546,9 +517,20 @@ do { - p->ip_offset = offset; + /* + * update ip offset only if it was not set before. + */ + if (p->ip_offset == 0) + { + p->ip_offset = offset; + } p = p->prev; - } while (p && p->type != LIBNET_PBLOCK_IPV4_H); + } while (p && (p->type != LIBNET_PBLOCK_IPV4_H || + p->type != LIBNET_PBLOCK_IPV6_H || + p->type != LIBNET_PBLOCK_IPV6_FRAG_H || + p->type != LIBNET_PBLOCK_IPV6_ROUTING_H || + p->type != LIBNET_PBLOCK_IPV6_DESTOPTS_H || + p->type != LIBNET_PBLOCK_IPV6_HBHOPTS_H)); } ==== //depot/projects/soc2006/clem1_ipv6vulns/libnet/src/libnet_write.c#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Jun 27 13:49:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F215916A409; Tue, 27 Jun 2006 13:49:05 +0000 (UTC) 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 B447E16A406 for ; Tue, 27 Jun 2006 13:49:05 +0000 (UTC) (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 98D1543D66 for ; Tue, 27 Jun 2006 13:48:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RDmwbS042267 for ; Tue, 27 Jun 2006 13:48:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RDmwBc042264 for perforce@freebsd.org; Tue, 27 Jun 2006 13:48:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 27 Jun 2006 13:48:58 GMT Message-Id: <200606271348.k5RDmwBc042264@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 100139 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, 27 Jun 2006 13:49:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=100139 Change 100139 by rwatson@rwatson_sesame on 2006/06/27 13:48:35 Upgrade configure bits. Update version number. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/ltmain.sh#3 edit .. //depot/projects/trustedbsd/openbsm/configure#22 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#24 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/ltmain.sh#3 (xtext) ==== @@ -43,8 +43,8 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.20 -TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)" +VERSION=1.5.22 +TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" # See if we are running on zsh, and set the options which allow our # commands through without removal of \ escapes. @@ -132,6 +132,8 @@ show="$echo" show_help= execute_dlfiles= +duplicate_deps=no +preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" @@ -139,6 +141,43 @@ # Shell function definitions: # This seems to be the best place for them +# func_mktempdir [string] +# Make a temporary directory that won't clash with other running +# libtool processes, and avoids race conditions if possible. If +# given, STRING is the basename for that directory. +func_mktempdir () +{ + my_template="${TMPDIR-/tmp}/${1-$progname}" + + if test "$run" = ":"; then + # Return a directory name, but don't create it in dry-run mode + my_tmpdir="${my_template}-$$" + else + + # If mktemp works, use that first and foremost + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + + if test ! -d "$my_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" + + save_mktempdir_umask=`umask` + umask 0077 + $mkdir "$my_tmpdir" + umask $save_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$my_tmpdir" || { + $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 + exit $EXIT_FAILURE + } + fi + + $echo "X$my_tmpdir" | $Xsed +} + + # func_win32_libid arg # return the library type of file 'arg' # @@ -157,12 +196,11 @@ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ - sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` - if test "X$win32_nmres" = "Ximport" ; then - win32_libid_type="x86 archive import" - else - win32_libid_type="x86 archive static" - fi + $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac fi ;; *DLL*) @@ -188,6 +226,20 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { + # FreeBSD-specific: where we install compilers with non-standard names + tag_compilers_CC="*cc cc* *gcc gcc*" + tag_compilers_CXX="*c++ c++* *g++ g++*" + base_compiler=`set -- "$@"; echo $1` + + # If $tagname isn't set, then try to infer if the default "CC" tag applies + if test -z "$tagname"; then + for zp in $tag_compilers_CC; do + case $base_compiler in + $zp) tagname="CC"; break;; + esac + done + fi + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -228,7 +280,22 @@ break ;; esac - fi + + # FreeBSD-specific: try compilers based on inferred tag + if test -z "$tagname"; then + eval "tag_compilers=\$tag_compilers_${z}" + if test -n "$tag_compilers"; then + for zp in $tag_compilers; do + case $base_compiler in + $zp) tagname=$z; break;; + esac + done + if test -n "$tagname"; then + break + fi + fi + fi + fi done # If $tagname still isn't set, then no tagged configuration # was found and let the user know that the "--tag" command @@ -295,9 +362,9 @@ $run ${rm}r "$my_xdir" $show "$mkdir $my_xdir" $run $mkdir "$my_xdir" - status=$? - if test "$status" -ne 0 && test ! -d "$my_xdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then + exit $exit_status fi case $host in *-darwin*) @@ -352,6 +419,8 @@ # Darwin sucks eval std_shrext=\"$shrext_cmds\" +disable_libs=no + # Parse our command line options once, thoroughly. while test "$#" -gt 0 do @@ -468,7 +537,11 @@ preserve_args="$preserve_args $arg" ;; - --tag) prevopt="--tag" prev=tag ;; + --tag) + prevopt="--tag" + prev=tag + preserve_args="$preserve_args --tag" + ;; --tag=*) set tag "$optarg" ${1+"$@"} shift @@ -500,6 +573,18 @@ exit $EXIT_FAILURE fi +case $disable_libs in +no) + ;; +shared) + build_libtool_libs=no + build_old_libs=yes + ;; +static) + build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` + ;; +esac + # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. @@ -856,9 +941,9 @@ if test ! -d "${xdir}$objdir"; then $show "$mkdir ${xdir}$objdir" $run $mkdir ${xdir}$objdir - status=$? - if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then + exit $exit_status fi fi @@ -1061,6 +1146,7 @@ no_install=no objs= non_pic_objects= + notinst_path= # paths that contain not-installed libtool libraries precious_files_regex= prefer_static_libs=no preload=no @@ -1089,14 +1175,15 @@ if test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=yes else if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=built fi build_libtool_libs=no build_old_libs=yes - prefer_static_libs=yes break ;; esac @@ -1271,6 +1358,11 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1354,8 +1446,8 @@ prev= continue ;; - darwin_framework) - compiler_flags="$compiler_flags $arg" + darwin_framework|darwin_framework_skip) + test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" prev= @@ -1419,13 +1511,17 @@ continue ;; - -framework|-arch) - prev=darwin_framework - compiler_flags="$compiler_flags $arg" + -framework|-arch|-isysroot) + case " $CC " in + *" ${arg} ${1} "* | *" ${arg} ${1} "*) + prev=darwin_framework_skip ;; + *) compiler_flags="$compiler_flags $arg" + prev=darwin_framework ;; + esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - continue - ;; + continue + ;; -inst-prefix-dir) prev=inst_prefix @@ -1453,7 +1549,8 @@ absdir=`cd "$dir" && pwd` if test -z "$absdir"; then $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit $EXIT_FAILURE + absdir="$dir" + notinst_path="$notinst_path $dir" fi dir="$absdir" ;; @@ -1467,10 +1564,15 @@ esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; *) dllsearchpath="$dllsearchpath:$dir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac continue @@ -1479,11 +1581,11 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-pw32* | *-*-beos*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) # These systems don't actually have a C or math library (as such) continue ;; - *-*-mingw* | *-*-os2*) + *-*-os2*) # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; @@ -1495,6 +1597,15 @@ # Rhapsody C and math libraries are in the System framework deplibs="$deplibs -framework System" continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + test "X$arg" = "X-lc" && continue + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; esac elif test "X$arg" = "X-lc_r"; then case $host in @@ -1522,6 +1633,7 @@ compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" + deplibs="$deplibs $arg" continue ;; @@ -1536,7 +1648,12 @@ # +DA*, +DD* enable 64-bit mode on the HP compiler # -q* pass through compiler args for the IBM compiler # -m* pass through architecture-specific compiler args for GCC - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*) + # -m*, -t[45]*, -txscale* pass through architecture-specific + # compiler args for GCC + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ + -t[45]*|-txscale*|@*) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. @@ -1548,9 +1665,7 @@ esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" - fi + compiler_flags="$compiler_flags $arg" continue ;; @@ -1788,6 +1903,11 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1893,9 +2013,9 @@ if test ! -d "$output_objdir"; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir - status=$? - if test "$status" -ne 0 && test ! -d "$output_objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then + exit $exit_status fi fi @@ -1958,7 +2078,6 @@ newlib_search_path= need_relink=no # whether we're linking any uninstalled libtool libraries notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries case $linkmode in lib) passes="conv link" @@ -2012,6 +2131,29 @@ else compiler_flags="$compiler_flags $deplib" fi + + case $linkmode in + lib) + deplibs="$deplib $deplibs" + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + ;; + prog) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + ;; + *) + ;; + esac # linkmode + continue ;; -l*) @@ -2194,7 +2336,7 @@ esac # case $deplib if test "$found" = yes || test -f "$lib"; then : else - $echo "$modename: cannot find the library \`$lib'" 1>&2 + $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 exit $EXIT_FAILURE fi @@ -2445,8 +2587,12 @@ fi link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs + if test "$use_static_libs" = built && test "$installed" = yes ; then + use_static_libs=no + fi if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + { test "$use_static_libs" = no || test -z "$old_library"; }; then if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" need_relink=yes @@ -2559,11 +2705,15 @@ if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5* ) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; + *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) add_dir="-L$dir" ;; *-*-darwin* ) # if the lib is a module then we can not link against # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then + if /usr/bin/file -L $add 2> /dev/null | + $EGREP ": [^:]* bundle" >/dev/null ; then $echo "** Warning, lib $linklib is a module, not a shared library" if test -z "$old_library" ; then $echo @@ -3314,9 +3464,9 @@ # Eliminate all temporary directories. for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` - deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` + lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` + deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` + dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` done if test -n "$xrpath"; then @@ -3369,7 +3519,12 @@ ;; *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work ;; *) # Add libc to deplibs on all other systems if necessary. @@ -3413,7 +3568,7 @@ int main() { return 0; } EOF $rm conftest - $LTCC -o conftest conftest.c $deplibs + $LTCC $LTCFLAGS -o conftest conftest.c $deplibs if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do @@ -3458,7 +3613,7 @@ # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - $LTCC -o conftest conftest.c $i + $LTCC $LTCFLAGS -o conftest conftest.c $i # Did it work? if test "$?" -eq 0 ; then ldd_output=`ldd conftest` @@ -3705,6 +3860,35 @@ deplibs=$newdeplibs fi + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + deplibs="$new_libs" + + # All the library-specific variables (install_libdir is set above). library_names= old_library= @@ -3788,6 +3972,7 @@ fi lib="$output_objdir/$realname" + linknames= for link do linknames="$linknames $link" @@ -4219,6 +4404,35 @@ ;; esac + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" @@ -4263,10 +4477,15 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; *) dllsearchpath="$dllsearchpath:$libdir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac done @@ -4383,10 +4602,22 @@ export_symbols="$output_objdir/$outputname.exp" $run $rm $export_symbols $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac else - $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac fi fi @@ -4503,16 +4734,32 @@ esac # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" + $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? # Clean up the generated files. $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" # Transform the symbol file into the correct name. - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + case $host in + *cygwin* | *mingw* ) + if test -f "$output_objdir/${outputname}.def" ; then + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + else + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + fi + ;; + * ) + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + ;; + esac + ;; + *-*-freebsd*) + # FreeBSD doesn't need this... ;; *) $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 @@ -4537,7 +4784,7 @@ # We have no uninstalled library dependencies, so finalize right now. $show "$link_command" $run eval "$link_command" - status=$? + exit_status=$? # Delete the generated files. if test -n "$dlsyms"; then @@ -4545,7 +4792,7 @@ $run $rm "$output_objdir/${outputname}S.${objext}" fi - exit $status + exit $exit_status fi if test -n "$shlibpath_var"; then @@ -4685,10 +4932,12 @@ esac case $host in *cygwin* | *mingw* ) - cwrappersource=`$echo ${objdir}/lt-${outputname}.c` - cwrapper=`$echo ${output}.exe` - $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + output_name=`basename $output` + output_path=`dirname $output` + cwrappersource="$output_path/$objdir/lt-$output_name.c" + cwrapper="$output_path/$output_name.exe" + $rm $cwrappersource $cwrapper + trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 cat > $cwrappersource < #include #include +#include +#include +#include #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX @@ -4723,16 +4975,20 @@ #endif #ifndef DIR_SEPARATOR -#define DIR_SEPARATOR '/' +# define DIR_SEPARATOR '/' +# define PATH_SEPARATOR ':' #endif #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ defined (__OS2__) -#define HAVE_DOS_BASED_FILE_SYSTEM -#ifndef DIR_SEPARATOR_2 -#define DIR_SEPARATOR_2 '\\' +# define HAVE_DOS_BASED_FILE_SYSTEM +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +# ifndef PATH_SEPARATOR_2 +# define PATH_SEPARATOR_2 ';' +# endif #endif -#endif #ifndef DIR_SEPARATOR_2 # define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) @@ -4741,17 +4997,32 @@ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) #endif /* DIR_SEPARATOR_2 */ +#ifndef PATH_SEPARATOR_2 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +#else /* PATH_SEPARATOR_2 */ +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +#endif /* PATH_SEPARATOR_2 */ + #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ if (stale) { free ((void *) stale); stale = 0; } \ } while (0) +/* -DDEBUG is fairly common in CFLAGS. */ +#undef DEBUG +#if defined DEBUGWRAPPER +# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) +#else +# define DEBUG(format, ...) +#endif + const char *program_name = NULL; void * xmalloc (size_t num); char * xstrdup (const char *string); -char * basename (const char *name); -char * fnqualify(const char *path); +const char * base_name (const char *name); +char * find_executable(const char *wrapper); +int check_executable(const char *path); char * strendzap(char *str, const char *pat); void lt_fatal (const char *message, ...); @@ -4761,29 +5032,50 @@ char **newargz; int i; - program_name = (char *) xstrdup ((char *) basename (argv[0])); + program_name = (char *) xstrdup (base_name (argv[0])); + DEBUG("(main) argv[0] : %s\n",argv[0]); + DEBUG("(main) program_name : %s\n",program_name); newargz = XMALLOC(char *, argc+2); EOF - cat >> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" - newargz[1] = fnqualify(argv[0]); + cat >> $cwrappersource <<"EOF" + newargz[1] = find_executable(argv[0]); + if (newargz[1] == NULL) + lt_fatal("Couldn't find %s", argv[0]); + DEBUG("(main) found exe at : %s\n",newargz[1]); /* we know the script has the same name, without the .exe */ /* so make sure newargz[1] doesn't end in .exe */ strendzap(newargz[1],".exe"); for (i = 1; i < argc; i++) newargz[i+1] = xstrdup(argv[i]); newargz[argc+1] = NULL; + + for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" + cat >> $cwrappersource <<"EOF" return 127; } @@ -4804,48 +5096,148 @@ ; } -char * -basename (const char *name) +const char * +base_name (const char *name) { const char *base; #if defined (HAVE_DOS_BASED_FILE_SYSTEM) /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha (name[0]) && name[1] == ':') + if (isalpha ((unsigned char)name[0]) && name[1] == ':') name += 2; #endif for (base = name; *name; name++) if (IS_DIR_SEPARATOR (*name)) base = name + 1; - return (char *) base; + return base; +} + +int +check_executable(const char * path) +{ + struct stat st; + + DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); + if ((!path) || (!*path)) + return 0; + + if ((stat (path, &st) >= 0) && + ( + /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ +#if defined (S_IXOTH) + ((st.st_mode & S_IXOTH) == S_IXOTH) || +#endif +#if defined (S_IXGRP) + ((st.st_mode & S_IXGRP) == S_IXGRP) || +#endif + ((st.st_mode & S_IXUSR) == S_IXUSR)) + ) + return 1; + else + return 0; } +/* Searches for the full path of the wrapper. Returns + newly allocated full path name if found, NULL otherwise */ char * -fnqualify(const char *path) +find_executable (const char* wrapper) { - size_t size; - char *p; + int has_slash = 0; + const char* p; + const char* p_next; + /* static buffer for getcwd */ char tmp[LT_PATHMAX + 1]; + int tmp_len; + char* concat_name; - assert(path != NULL); + DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); + + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; - /* Is it qualified already? */ + /* Absolute path? */ +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + } + else + { +#endif + if (IS_DIR_SEPARATOR (wrapper[0])) + { + concat_name = xstrdup (wrapper); + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + } #if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha (path[0]) && path[1] == ':') - return xstrdup (path); + } #endif - if (IS_DIR_SEPARATOR (path[0])) - return xstrdup (path); - /* prepend the current directory */ - /* doesn't handle '~' */ + for (p = wrapper; *p; p++) + if (*p == '/') + { + has_slash = 1; + break; + } + if (!has_slash) + { + /* no slashes; search PATH */ + const char* path = getenv ("PATH"); + if (path != NULL) + { + for (p = path; *p; p = p_next) + { + const char* q; + size_t p_len; + for (q = p; *q; q++) + if (IS_PATH_SEPARATOR(*q)) + break; + p_len = q - p; + p_next = (*q == '\0' ? q : q + 1); + if (p_len == 0) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); + tmp_len = strlen(tmp); + concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + } + else + { + concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); + memcpy (concat_name, p, p_len); + concat_name[p_len] = '/'; + strcpy (concat_name + p_len + 1, wrapper); + } + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + } + } + /* not found in PATH; assume curdir */ + } + /* Relative path | not found in path: prepend cwd */ if (getcwd (tmp, LT_PATHMAX) == NULL) lt_fatal ("getcwd failed"); - size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ - p = XMALLOC(char, size); - sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); - return p; + tmp_len = strlen(tmp); + concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 27 14:04:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 606F916A40B; Tue, 27 Jun 2006 14:04:25 +0000 (UTC) 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 3D96216A408 for ; Tue, 27 Jun 2006 14:04:25 +0000 (UTC) (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 8BB9B43D6B for ; Tue, 27 Jun 2006 14:04:18 +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.6/8.13.6) with ESMTP id k5RE4IIB044122 for ; Tue, 27 Jun 2006 14:04:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RE4HSK044119 for perforce@freebsd.org; Tue, 27 Jun 2006 14:04:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 27 Jun 2006 14:04:17 GMT Message-Id: <200606271404.k5RE4HSK044119@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 100140 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, 27 Jun 2006 14:04:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=100140 Change 100140 by rwatson@rwatson_fledge on 2006/06/27 14:03:58 OpenBSM 1.0a7 release. Affected files ... .. //depot/projects/trustedbsd/www/openbsm.page#9 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#9 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#8 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#9 $ @@ -81,6 +81,13 @@ created by McAfee Research under contract to Apple Computer, and has since been extended by the volunteer TrustedBSD team.

+

2006-06-27 - OpenBSM 1.0 alpha 7 release is a test release of the + OpenBSM code base, and matches what is present in FreeBSD CVS at + this date. In this revision, the primary changes involve + improvements in the creation of subject tokens, and portability + improvements. Download. +

+

2006-06-02 - OpenBSM 1.0 alpha 6 release is a test release of the OpenBSM code base, and matches what is present in FreeBSD CVS at this date. In this revision, the primary changes are the From owner-p4-projects@FreeBSD.ORG Tue Jun 27 14:06:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83A8216A412; Tue, 27 Jun 2006 14:06:25 +0000 (UTC) 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 49FD016A410 for ; Tue, 27 Jun 2006 14:06:25 +0000 (UTC) (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 6846B43D58 for ; Tue, 27 Jun 2006 14:06:21 +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.6/8.13.6) with ESMTP id k5RE6L16044385 for ; Tue, 27 Jun 2006 14:06:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RE6LKN044382 for perforce@freebsd.org; Tue, 27 Jun 2006 14:06:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 27 Jun 2006 14:06:21 GMT Message-Id: <200606271406.k5RE6LKN044382@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 100143 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, 27 Jun 2006 14:06:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=100143 Change 100143 by rwatson@rwatson_fledge on 2006/06/27 14:06:05 Add OpenBSM tarballs for history's sake. Affected files ... .. //depot/projects/trustedbsd/www/downloads/openbsm-1.0-alpha4.tgz#1 add .. //depot/projects/trustedbsd/www/downloads/openbsm-1.0-alpha5.tgz#1 add .. //depot/projects/trustedbsd/www/downloads/openbsm-1.0-alpha6.tgz#1 add .. //depot/projects/trustedbsd/www/downloads/openbsm-1.0-alpha7.tgz#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jun 27 14:20:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2735516A407; Tue, 27 Jun 2006 14:20:46 +0000 (UTC) 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 DDF5516A411 for ; Tue, 27 Jun 2006 14:20:45 +0000 (UTC) (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 C5E5F43D70 for ; Tue, 27 Jun 2006 14:20:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5REKdRD045008 for ; Tue, 27 Jun 2006 14:20:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5REKdj7045005 for perforce@freebsd.org; Tue, 27 Jun 2006 14:20:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 27 Jun 2006 14:20:39 GMT Message-Id: <200606271420.k5REKdj7045005@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 100144 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, 27 Jun 2006 14:20:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=100144 Change 100144 by rwatson@rwatson_zoo on 2006/06/27 14:20:38 Integrate OpenBSM branch into audit3 branch to bring in remaining unintegrated changes from OpenBSM 1.0a7. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#12 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/ltmain.sh#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#5 (text+ko) ==== @@ -1,3 +1,13 @@ +OpenBSM 1.0 alpha 7 + +- Adopted Solaris-compatible format for subject32_ex and subject64_ex + tokens, which previously did not correctly implement variable length + address storage. +- Prefer inttypes.h to stdint.h; enhance queue.h detection to test for + TAILQ_FOREACH_SAFE(), which is present in recent BSD queue.h's, but not + older ones. OpenBSM now builds on some FreeBSD 4.x version. +- New event types for extended attributes, ACLs, and scheduling. + OpenBSM 1.0 alpha 6 - Use AU_TO_WRITE and AU_NO_TO_WRITE for the 'keep' argument to au_close(); @@ -165,4 +175,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#4 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#5 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#8 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_6 +OPENBSM_1_0_ALPHA_7 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#10 (text+ko) ==== @@ -30,12 +30,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#10 $ */ #ifndef _BSM_AUDIT_RECORD_H_ #define _BSM_AUDIT_RECORD_H_ +#include /* struct timeval */ + /* * Token type identifiers. */ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#12 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#11 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#12 $ */ #ifndef _LIBBSM_H_ @@ -43,7 +43,7 @@ #include #include -#include /* Required for audit.h. */ +#include /* Required for audit.h. */ #include /* Required for clock_t on Linux. */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/ltmain.sh#4 (text+ko) ==== @@ -43,8 +43,8 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.20 -TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)" +VERSION=1.5.22 +TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" # See if we are running on zsh, and set the options which allow our # commands through without removal of \ escapes. @@ -132,6 +132,8 @@ show="$echo" show_help= execute_dlfiles= +duplicate_deps=no +preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" @@ -139,6 +141,43 @@ # Shell function definitions: # This seems to be the best place for them +# func_mktempdir [string] +# Make a temporary directory that won't clash with other running +# libtool processes, and avoids race conditions if possible. If +# given, STRING is the basename for that directory. +func_mktempdir () +{ + my_template="${TMPDIR-/tmp}/${1-$progname}" + + if test "$run" = ":"; then + # Return a directory name, but don't create it in dry-run mode + my_tmpdir="${my_template}-$$" + else + + # If mktemp works, use that first and foremost + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + + if test ! -d "$my_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" + + save_mktempdir_umask=`umask` + umask 0077 + $mkdir "$my_tmpdir" + umask $save_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$my_tmpdir" || { + $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 + exit $EXIT_FAILURE + } + fi + + $echo "X$my_tmpdir" | $Xsed +} + + # func_win32_libid arg # return the library type of file 'arg' # @@ -157,12 +196,11 @@ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ - sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` - if test "X$win32_nmres" = "Ximport" ; then - win32_libid_type="x86 archive import" - else - win32_libid_type="x86 archive static" - fi + $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac fi ;; *DLL*) @@ -188,6 +226,20 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { + # FreeBSD-specific: where we install compilers with non-standard names + tag_compilers_CC="*cc cc* *gcc gcc*" + tag_compilers_CXX="*c++ c++* *g++ g++*" + base_compiler=`set -- "$@"; echo $1` + + # If $tagname isn't set, then try to infer if the default "CC" tag applies + if test -z "$tagname"; then + for zp in $tag_compilers_CC; do + case $base_compiler in + $zp) tagname="CC"; break;; + esac + done + fi + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -228,7 +280,22 @@ break ;; esac - fi + + # FreeBSD-specific: try compilers based on inferred tag + if test -z "$tagname"; then + eval "tag_compilers=\$tag_compilers_${z}" + if test -n "$tag_compilers"; then + for zp in $tag_compilers; do + case $base_compiler in + $zp) tagname=$z; break;; + esac + done + if test -n "$tagname"; then + break + fi + fi + fi + fi done # If $tagname still isn't set, then no tagged configuration # was found and let the user know that the "--tag" command @@ -295,9 +362,9 @@ $run ${rm}r "$my_xdir" $show "$mkdir $my_xdir" $run $mkdir "$my_xdir" - status=$? - if test "$status" -ne 0 && test ! -d "$my_xdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then + exit $exit_status fi case $host in *-darwin*) @@ -352,6 +419,8 @@ # Darwin sucks eval std_shrext=\"$shrext_cmds\" +disable_libs=no + # Parse our command line options once, thoroughly. while test "$#" -gt 0 do @@ -468,7 +537,11 @@ preserve_args="$preserve_args $arg" ;; - --tag) prevopt="--tag" prev=tag ;; + --tag) + prevopt="--tag" + prev=tag + preserve_args="$preserve_args --tag" + ;; --tag=*) set tag "$optarg" ${1+"$@"} shift @@ -500,6 +573,18 @@ exit $EXIT_FAILURE fi +case $disable_libs in +no) + ;; +shared) + build_libtool_libs=no + build_old_libs=yes + ;; +static) + build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` + ;; +esac + # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. @@ -856,9 +941,9 @@ if test ! -d "${xdir}$objdir"; then $show "$mkdir ${xdir}$objdir" $run $mkdir ${xdir}$objdir - status=$? - if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then + exit $exit_status fi fi @@ -1061,6 +1146,7 @@ no_install=no objs= non_pic_objects= + notinst_path= # paths that contain not-installed libtool libraries precious_files_regex= prefer_static_libs=no preload=no @@ -1089,14 +1175,15 @@ if test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=yes else if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=built fi build_libtool_libs=no build_old_libs=yes - prefer_static_libs=yes break ;; esac @@ -1271,6 +1358,11 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1354,8 +1446,8 @@ prev= continue ;; - darwin_framework) - compiler_flags="$compiler_flags $arg" + darwin_framework|darwin_framework_skip) + test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" prev= @@ -1419,13 +1511,17 @@ continue ;; - -framework|-arch) - prev=darwin_framework - compiler_flags="$compiler_flags $arg" + -framework|-arch|-isysroot) + case " $CC " in + *" ${arg} ${1} "* | *" ${arg} ${1} "*) + prev=darwin_framework_skip ;; + *) compiler_flags="$compiler_flags $arg" + prev=darwin_framework ;; + esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - continue - ;; + continue + ;; -inst-prefix-dir) prev=inst_prefix @@ -1453,7 +1549,8 @@ absdir=`cd "$dir" && pwd` if test -z "$absdir"; then $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit $EXIT_FAILURE + absdir="$dir" + notinst_path="$notinst_path $dir" fi dir="$absdir" ;; @@ -1467,10 +1564,15 @@ esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; *) dllsearchpath="$dllsearchpath:$dir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac continue @@ -1479,11 +1581,11 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-pw32* | *-*-beos*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) # These systems don't actually have a C or math library (as such) continue ;; - *-*-mingw* | *-*-os2*) + *-*-os2*) # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; @@ -1495,6 +1597,15 @@ # Rhapsody C and math libraries are in the System framework deplibs="$deplibs -framework System" continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + test "X$arg" = "X-lc" && continue + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; esac elif test "X$arg" = "X-lc_r"; then case $host in @@ -1522,6 +1633,7 @@ compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" + deplibs="$deplibs $arg" continue ;; @@ -1536,7 +1648,12 @@ # +DA*, +DD* enable 64-bit mode on the HP compiler # -q* pass through compiler args for the IBM compiler # -m* pass through architecture-specific compiler args for GCC - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*) + # -m*, -t[45]*, -txscale* pass through architecture-specific + # compiler args for GCC + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ + -t[45]*|-txscale*|@*) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. @@ -1548,9 +1665,7 @@ esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" - fi + compiler_flags="$compiler_flags $arg" continue ;; @@ -1788,6 +1903,11 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1893,9 +2013,9 @@ if test ! -d "$output_objdir"; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir - status=$? - if test "$status" -ne 0 && test ! -d "$output_objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then + exit $exit_status fi fi @@ -1958,7 +2078,6 @@ newlib_search_path= need_relink=no # whether we're linking any uninstalled libtool libraries notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries case $linkmode in lib) passes="conv link" @@ -2012,6 +2131,29 @@ else compiler_flags="$compiler_flags $deplib" fi + + case $linkmode in + lib) + deplibs="$deplib $deplibs" + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + ;; + prog) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + ;; + *) + ;; + esac # linkmode + continue ;; -l*) @@ -2194,7 +2336,7 @@ esac # case $deplib if test "$found" = yes || test -f "$lib"; then : else - $echo "$modename: cannot find the library \`$lib'" 1>&2 + $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 exit $EXIT_FAILURE fi @@ -2445,8 +2587,12 @@ fi link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs + if test "$use_static_libs" = built && test "$installed" = yes ; then + use_static_libs=no + fi if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + { test "$use_static_libs" = no || test -z "$old_library"; }; then if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" need_relink=yes @@ -2559,11 +2705,15 @@ if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5* ) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; + *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) add_dir="-L$dir" ;; *-*-darwin* ) # if the lib is a module then we can not link against # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then + if /usr/bin/file -L $add 2> /dev/null | + $EGREP ": [^:]* bundle" >/dev/null ; then $echo "** Warning, lib $linklib is a module, not a shared library" if test -z "$old_library" ; then $echo @@ -3314,9 +3464,9 @@ # Eliminate all temporary directories. for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` - deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` + lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` + deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` + dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` done if test -n "$xrpath"; then @@ -3369,7 +3519,12 @@ ;; *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work ;; *) # Add libc to deplibs on all other systems if necessary. @@ -3413,7 +3568,7 @@ int main() { return 0; } EOF $rm conftest - $LTCC -o conftest conftest.c $deplibs + $LTCC $LTCFLAGS -o conftest conftest.c $deplibs if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do @@ -3458,7 +3613,7 @@ # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - $LTCC -o conftest conftest.c $i + $LTCC $LTCFLAGS -o conftest conftest.c $i # Did it work? if test "$?" -eq 0 ; then ldd_output=`ldd conftest` @@ -3705,6 +3860,35 @@ deplibs=$newdeplibs fi + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + deplibs="$new_libs" + + # All the library-specific variables (install_libdir is set above). library_names= old_library= @@ -3788,6 +3972,7 @@ fi lib="$output_objdir/$realname" + linknames= for link do linknames="$linknames $link" @@ -4219,6 +4404,35 @@ ;; esac + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" @@ -4263,10 +4477,15 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; *) dllsearchpath="$dllsearchpath:$libdir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac done @@ -4383,10 +4602,22 @@ export_symbols="$output_objdir/$outputname.exp" $run $rm $export_symbols $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac else - $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac fi fi @@ -4503,16 +4734,32 @@ esac # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" + $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? # Clean up the generated files. $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" # Transform the symbol file into the correct name. - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + case $host in + *cygwin* | *mingw* ) + if test -f "$output_objdir/${outputname}.def" ; then + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + else + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + fi + ;; + * ) + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + ;; + esac + ;; + *-*-freebsd*) + # FreeBSD doesn't need this... ;; *) $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 @@ -4537,7 +4784,7 @@ # We have no uninstalled library dependencies, so finalize right now. $show "$link_command" $run eval "$link_command" - status=$? + exit_status=$? # Delete the generated files. if test -n "$dlsyms"; then @@ -4545,7 +4792,7 @@ $run $rm "$output_objdir/${outputname}S.${objext}" fi - exit $status + exit $exit_status fi if test -n "$shlibpath_var"; then @@ -4685,10 +4932,12 @@ esac case $host in *cygwin* | *mingw* ) - cwrappersource=`$echo ${objdir}/lt-${outputname}.c` - cwrapper=`$echo ${output}.exe` - $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + output_name=`basename $output` + output_path=`dirname $output` + cwrappersource="$output_path/$objdir/lt-$output_name.c" + cwrapper="$output_path/$output_name.exe" + $rm $cwrappersource $cwrapper + trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 cat > $cwrappersource < #include #include +#include +#include +#include #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX @@ -4723,16 +4975,20 @@ #endif #ifndef DIR_SEPARATOR -#define DIR_SEPARATOR '/' +# define DIR_SEPARATOR '/' +# define PATH_SEPARATOR ':' #endif #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ defined (__OS2__) -#define HAVE_DOS_BASED_FILE_SYSTEM -#ifndef DIR_SEPARATOR_2 -#define DIR_SEPARATOR_2 '\\' +# define HAVE_DOS_BASED_FILE_SYSTEM +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +# ifndef PATH_SEPARATOR_2 +# define PATH_SEPARATOR_2 ';' +# endif #endif -#endif #ifndef DIR_SEPARATOR_2 # define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) @@ -4741,17 +4997,32 @@ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) #endif /* DIR_SEPARATOR_2 */ +#ifndef PATH_SEPARATOR_2 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +#else /* PATH_SEPARATOR_2 */ +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +#endif /* PATH_SEPARATOR_2 */ + #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ if (stale) { free ((void *) stale); stale = 0; } \ } while (0) +/* -DDEBUG is fairly common in CFLAGS. */ +#undef DEBUG +#if defined DEBUGWRAPPER +# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) +#else +# define DEBUG(format, ...) +#endif + const char *program_name = NULL; void * xmalloc (size_t num); char * xstrdup (const char *string); -char * basename (const char *name); -char * fnqualify(const char *path); +const char * base_name (const char *name); +char * find_executable(const char *wrapper); +int check_executable(const char *path); char * strendzap(char *str, const char *pat); void lt_fatal (const char *message, ...); @@ -4761,29 +5032,50 @@ char **newargz; int i; - program_name = (char *) xstrdup ((char *) basename (argv[0])); + program_name = (char *) xstrdup (base_name (argv[0])); + DEBUG("(main) argv[0] : %s\n",argv[0]); + DEBUG("(main) program_name : %s\n",program_name); newargz = XMALLOC(char *, argc+2); EOF - cat >> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" - newargz[1] = fnqualify(argv[0]); + cat >> $cwrappersource <<"EOF" + newargz[1] = find_executable(argv[0]); + if (newargz[1] == NULL) + lt_fatal("Couldn't find %s", argv[0]); + DEBUG("(main) found exe at : %s\n",newargz[1]); /* we know the script has the same name, without the .exe */ /* so make sure newargz[1] doesn't end in .exe */ strendzap(newargz[1],".exe"); for (i = 1; i < argc; i++) newargz[i+1] = xstrdup(argv[i]); newargz[argc+1] = NULL; + + for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" + cat >> $cwrappersource <<"EOF" return 127; } @@ -4804,48 +5096,148 @@ ; } -char * -basename (const char *name) +const char * +base_name (const char *name) { const char *base; #if defined (HAVE_DOS_BASED_FILE_SYSTEM) /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha (name[0]) && name[1] == ':') + if (isalpha ((unsigned char)name[0]) && name[1] == ':') name += 2; #endif for (base = name; *name; name++) if (IS_DIR_SEPARATOR (*name)) base = name + 1; - return (char *) base; + return base; +} + +int +check_executable(const char * path) +{ + struct stat st; + + DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); + if ((!path) || (!*path)) + return 0; + + if ((stat (path, &st) >= 0) && + ( + /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ +#if defined (S_IXOTH) + ((st.st_mode & S_IXOTH) == S_IXOTH) || +#endif +#if defined (S_IXGRP) + ((st.st_mode & S_IXGRP) == S_IXGRP) || +#endif + ((st.st_mode & S_IXUSR) == S_IXUSR)) + ) + return 1; + else + return 0; } +/* Searches for the full path of the wrapper. Returns + newly allocated full path name if found, NULL otherwise */ char * -fnqualify(const char *path) +find_executable (const char* wrapper) { - size_t size; - char *p; + int has_slash = 0; + const char* p; + const char* p_next; + /* static buffer for getcwd */ char tmp[LT_PATHMAX + 1]; + int tmp_len; + char* concat_name; - assert(path != NULL); + DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); + + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; - /* Is it qualified already? */ + /* Absolute path? */ +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + } + else + { +#endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 27 14:25:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3507316A4C2; Tue, 27 Jun 2006 14:25:47 +0000 (UTC) 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 EA6B516A4A6 for ; Tue, 27 Jun 2006 14:25:46 +0000 (UTC) (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 9139343D7E for ; Tue, 27 Jun 2006 14:25: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.6/8.13.6) with ESMTP id k5REPklH045330 for ; Tue, 27 Jun 2006 14:25:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5REPkU8045327 for perforce@freebsd.org; Tue, 27 Jun 2006 14:25:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 27 Jun 2006 14:25:46 GMT Message-Id: <200606271425.k5REPkU8045327@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 100145 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, 27 Jun 2006 14:25:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=100145 Change 100145 by rwatson@rwatson_zoo on 2006/06/27 14:24:50 Integrate OpenBSM 1.0a7 from audit3 userspace to audit3 kernel. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#29 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#15 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#18 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#29 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#28 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#29 $ * $FreeBSD: src/sys/bsm/audit.h,v 1.4 2006/06/05 12:55:45 rwatson Exp $ */ ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#15 (text+ko) ==== @@ -30,13 +30,15 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#14 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#15 $ * $FreeBSD: src/sys/bsm/audit_record.h,v 1.2 2006/06/05 13:00:52 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ #define _BSM_AUDIT_RECORD_H_ +#include /* struct timeval */ + /* * Token type identifiers. */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#18 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#17 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#18 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.3 2006/06/05 13:13:02 rwatson Exp $ */ @@ -618,12 +618,14 @@ token_t *t; u_char *dptr = NULL; - if (tid->at_type == AU_IPv6) - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * - sizeof(u_int32_t)); + if (tid->at_type == AU_IPv4) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 10 * sizeof(u_int32_t)); + else if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 13 * sizeof(u_int32_t)); else - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * - sizeof(u_int32_t)); + return (NULL); ADD_U_CHAR(dptr, AUT_PROCESS32_EX); ADD_U_INT32(dptr, auid); @@ -953,12 +955,14 @@ token_t *t; u_char *dptr = NULL; - if (tid->at_type == AU_IPv6) + if (tid->at_type == AU_IPv4) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * + sizeof(u_int32_t)); + else if (tid->at_type == AU_IPv6) GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * sizeof(u_int32_t)); else - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * - sizeof(u_int32_t)); + return (NULL); ADD_U_CHAR(dptr, AUT_SUBJECT32_EX); ADD_U_INT32(dptr, auid); From owner-p4-projects@FreeBSD.ORG Tue Jun 27 15:54:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D82F16A40F; Tue, 27 Jun 2006 15:54:30 +0000 (UTC) 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 D9A5F16A407 for ; Tue, 27 Jun 2006 15:54:29 +0000 (UTC) (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 DC020449C0 for ; Tue, 27 Jun 2006 15:54:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RFsSb3051052 for ; Tue, 27 Jun 2006 15:54:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RFrdlc050950 for perforce@freebsd.org; Tue, 27 Jun 2006 15:53:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 27 Jun 2006 15:53:39 GMT Message-Id: <200606271553.k5RFrdlc050950@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 100149 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, 27 Jun 2006 15:54:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=100149 Change 100149 by rwatson@rwatson_zoo on 2006/06/27 15:52:53 Integrate trustedbsd base branch: - much mucking with make world - file update - sendmail update - traceroute icmp support - geli authentication - interface groups - enc, mxge, nfe - ng_tag - sched_core - snd_envy24 - linux emulator updates, including more linux audit support - !COMPAT_43 - ath hal update - xfs update - suser fixes - kernel linker relocked, cleanup - sched_relinquish - tcp syncache cleanup + relock - loop back of audit locking fixes and cleanup, process tokens - conditional giant locking on audit log rotation - sbinsertoob removed, sodealloc hidden - usual plethora of bug fixes, driver updates, etc. Affected files ... .. //depot/projects/trustedbsd/base/Makefile#45 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#73 integrate .. //depot/projects/trustedbsd/base/README#6 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.1#8 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.c#8 integrate .. //depot/projects/trustedbsd/base/bin/sh/cd.c#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/eval.c#16 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#24 integrate .. //depot/projects/trustedbsd/base/bin/sh/var.c#14 integrate .. //depot/projects/trustedbsd/base/bin/sh/var.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-sparc.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/file/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/adventure#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/amigaos#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/animation#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/apple#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/archive#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/audio#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/basis#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/bflt#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/bout#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/btsnoop#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/c64#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/cad#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/commands#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/compress#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/console#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/cracklib#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/ctags#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/database#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/diff#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/digital#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/dump#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/elf#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/filesystems#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/flash#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/gnu#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/iff#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/images#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/java#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/linux#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/lisp#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/mach#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/macintosh#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/mail.news#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/maple#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/msdos#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/mup#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/ncr#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/perl#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/printer#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/psion#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/python#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/riff#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/scientific#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/sgi#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/sql#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/varied.out#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Makefile.am#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/aclocal.m4#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/apprentice.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/ascmagic.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/compress.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/config.h.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/configure#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/configure.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.man#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/fsmagic.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/funcs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/libmagic.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.man#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.mime#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic2mime#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/patchlevel.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/print.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/readelf.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/readelf.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/softmagic.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pfsync.4#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#20 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/PGPKEYS#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/RELEASE_NOTES#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/README#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.cf#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.mc#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/dnsbl.m4#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/enhdnsbl.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/proto.m4#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/version.m4#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/mfapi.h#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_header.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/engine.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-memstat.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/README#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/bf.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/collect.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.c#18 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/daemon.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/deliver.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/domain.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/envelope.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/headers.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/helpfile#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/main.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/map.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mci.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mime.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/parseaddr.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/queue.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/savemail.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.h#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sfsasl.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sfsasl.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/srvrsmtp.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/tls.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/util.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/version.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.1#8 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.8#7 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.h#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.c#14 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#55 integrate .. //depot/projects/trustedbsd/base/etc/periodic/daily/470.status-named#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/abi#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/auditd#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/cached#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ldconfig#13 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#27 integrate .. //depot/projects/trustedbsd/base/etc/sendmail/freebsd.mc#11 integrate .. //depot/projects/trustedbsd/base/etc/sendmail/freebsd.submit.mc#3 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#51 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libgcc_r/Makefile#2 delete .. //depot/projects/trustedbsd/base/lib/libc/gen/glob.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#27 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/tsearch.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strlcpy.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mincore.2#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/stat.2#12 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/ftp.c#19 integrate .. //depot/projects/trustedbsd/base/lib/libmagic/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libmagic/config.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#27 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#20 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigaction.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libsdp/sdp.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libsdp/util.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libutil/Makefile#15 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_class.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libutil/pidfile.c#3 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/Makefile#13 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpcmd.y#22 integrate .. //depot/projects/trustedbsd/base/release/Makefile#76 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#68 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#102 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#14 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#9 integrate .. //depot/projects/trustedbsd/base/sbin/devfs/devfs.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.c#25 integrate .. //depot/projects/trustedbsd/base/sbin/ffsinfo/ffsinfo.8#10 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geli.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geom_eli.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/ggatec/ggatec.8#8 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/add.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.8#12 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.h#9 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/label.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/remove.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/show.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/Makefile#11 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#39 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifgroup.c#1 branch .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#19 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifpfsync.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/init/init.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#46 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#40 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.c#23 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#68 integrate .. //depot/projects/trustedbsd/base/share/man/man4/aac.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#26 integrate .. //depot/projects/trustedbsd/base/share/man/man4/adv.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/adw.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/altq.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/amd.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/amr.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/auditpipe.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/bge.4#17 integrate .. //depot/projects/trustedbsd/base/share/man/man4/bt.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/carp.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/cpufreq.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/dpt.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/enc.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/esp.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fast_ipsec.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/geom_fox.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/if_bridge.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/iir.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ips.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.alpha/Makefile#2 delete .. //depot/projects/trustedbsd/base/share/man/man4/man4.alpha/linux.4#4 delete .. //depot/projects/trustedbsd/base/share/man/man4/man4.alpha/osf1.4#4 delete .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/linux.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/padlock.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mpt.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mxge.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/myri10ge.4#2 delete .. //depot/projects/trustedbsd/base/share/man/man4/ncr.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ncv.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/nfe.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ng_tag.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/nsp.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/re.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sched_4bsd.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sched_core.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/sched_ule.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_csa.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_envy24.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/snd_gusc.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_ich.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_sbc.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/stg.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sym.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/umodem.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uscanner.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uvisor.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vinum.4#14 integrate .. //depot/projects/trustedbsd/base/share/man/man5/mailer.conf.5#4 integrate .. //depot/projects/trustedbsd/base/share/man/man7/build.7#13 integrate .. //depot/projects/trustedbsd/base/share/man/man8/rc.subr.8#9 integrate .. //depot/projects/trustedbsd/base/share/man/man9/lock.9#8 integrate .. //depot/projects/trustedbsd/base/share/man/man9/vflush.9#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/vgone.9#5 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.README#12 integrate .. //depot/projects/trustedbsd/base/share/monetdef/pt_PT.ISO8859-1.src#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/fpu.c#11 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/initcpu.c#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#26 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#29 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#26 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#23 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/NOTES#15 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/md_var.h#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_dummy.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/inckern.S#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/locore.S#8 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#15 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#14 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/files.at91#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/IQ31244#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/KB920X#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/SIMICS#8 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/SKYEYE#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pmap.h#13 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/assabet_machdep.c#8 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/uart_cpu_sa1110.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/uart_dev_sa1110.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/iq31244_machdep.c#10 integrate .. //depot/projects/trustedbsd/base/sys/boot/Makefile#16 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_ccb.h#9 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#26 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#21 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#33 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#41 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/kern_ndis.c#14 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_ndis.c#14 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/winx32_wrap.S#3 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#30 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_proto.h#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscall.h#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscallnames.c#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_sysent.c#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/syscalls.master#7 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.arm#11 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#73 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#101 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#29 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.arm#6 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#63 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.powerpc#22 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#48 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#72 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.arm#9 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/COPYRIGHT#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/README#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah.h#8 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah_desc.h#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah_devid.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah_soc.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_if.m#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_osdep.c#8 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_osdep.h#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap30.hal.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap30.inc#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap30.opt_ah.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap43.hal.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap43.inc#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap43.opt_ah.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap51.hal.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap51.inc#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap51.opt_ah.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap61.hal.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap61.inc#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap61.opt_ah.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/i386-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc-be-elf.inc#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/x86_64-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/version.h#8 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pfsync.c#14 integrate .. //depot/projects/trustedbsd/base/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_sym.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_pci.c#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_panasonic.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#49 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_battery.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_thermal.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpivar.h#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath_pci.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athioctl.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athvar.h#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/atkbdc/atkbdc_isa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#54 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/cardbus/cardbus.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/cardbus/cardbus_cis.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/cm/if_cm_isa.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/cm/smc90cx6.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/cm/smc90cx6reg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cm/smc90cx6var.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/if_dc.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/if_dcreg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/digi/digi.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_novell.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_edvar.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#52 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci_pci.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipw.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipwvar.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi_disk.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfivar.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/rgephy.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/mxge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mxge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mxge/if_mxge.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mxge/if_mxge_var.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mxge/mcp_gen_header.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mxge/mxge_mcp.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/my/if_my.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/eth_z8e.dat.gz.uu#2 delete .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#2 delete .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/if_myri10ge.c#3 delete .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/if_myri10ge_var.h#2 delete .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/mcp_gen_header.h#2 delete .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/myri10ge_mcp.h#2 delete .. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfe.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfereg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfevar.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/puc/pucdata.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/driver.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/midi.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/sequencer.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ak452x.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ak452x.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/cmi.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/envy24.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/envy24.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/es137x.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/maestro.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via8233.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder_rate.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/vchan.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsec.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhid.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umodem.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#52 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uscanner.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uvisor.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#55 integrate .. //depot/projects/trustedbsd/base/sys/dev/wl/if_wl.c#23 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs.c#12 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#25 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.c#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.h#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_ctl.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_integrity.c#1 branch .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_key.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_privacy.c#1 branch .. //depot/projects/trustedbsd/base/sys/geom/geom.h#40 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#40 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_gpt.c#25 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#31 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/debug.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/sv.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#1 branch .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#3 delete .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_acl.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_acl.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_ag.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_alloc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_alloc.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_alloc_btree.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_alloc_btree.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_arch.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_attr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_attr.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_attr_leaf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_attr_leaf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_attr_sf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_behavior.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_behavior.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bit.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bit.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bmap.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bmap_btree.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_btree.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_btree.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_buf_item.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_buf_item.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_cap.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_clnt.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_da_btree.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_da_btree.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dfrag.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dfrag.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dinode.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_block.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_block.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_data.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_data.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_leaf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_leaf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_node.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_node.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_sf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_sf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_trace.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_trace.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir_leaf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir_leaf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir_sf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dmapi.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dmops.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_error.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_error.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_extfree_item.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_extfree_item.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_fs.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_fsops.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_fsops.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_ialloc.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_ialloc_btree.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_ialloc_btree.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_iget.c#1 branch .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_imap.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_inode.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_inode.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_inode_item.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_inode_item.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_inum.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_iocore.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_iomap.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_iomap.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_itable.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_itable.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_log.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_log_priv.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_log_recover.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_mac.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_macros.c#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_macros.h#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_mount.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_mount.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_qmops.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_quota.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_refcache.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_refcache.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_rename.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_rtalloc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_rw.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_rw.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_sb.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_ail.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_buf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_extfree.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_inode.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_item.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_priv.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_space.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_types.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_utils.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_utils.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_vnodeops.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfsidbg.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_machdep.c#21 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakecode.S#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakeup.c#26 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/DEFAULTS#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#55 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#67 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/XBOX#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/db_trace.c#20 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#38 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#64 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#48 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/specialreg.h#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_dummy.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_proto.h#21 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_syscall.h#21 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysent.c#22 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/syscalls.master#20 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/GENERIC#37 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/SKI#19 integrate .. //depot/projects/trustedbsd/base/sys/ia64/disasm/disasm.h#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/disasm/disasm_decode.c#4 integrate .. //depot/projects/trustedbsd/base/sys/ia64/disasm/disasm_extract.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/disasm/disasm_format.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/disasm/disasm_int.h#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#60 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#52 integrate .. //depot/projects/trustedbsd/base/sys/isa/isa_common.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_clock.c#34 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#64 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_event.c#40 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#54 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_linker.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_module.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_switch.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#49 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_tc.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/link_elf.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/link_elf_obj.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_4bsd.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_core.c#1 branch .. //depot/projects/trustedbsd/base/sys/kern/sched_ule.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_bus.c#41 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_kdb.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_rman.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#48 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_msg.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_sem.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_shm.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#34 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#48 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#54 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#40 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_cache.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_init.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#76 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#59 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#77 integrate .. //depot/projects/trustedbsd/base/sys/modules/ath_hal/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/geom/geom_bde/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/geom/geom_eli/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_bridge/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/mxge/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/mxge/mxge/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/mxge/mxge_eth_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/mxge/mxge_ethp_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/myri10ge/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/modules/myri10ge/myri10ge/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/modules/netgraph/Makefile#17 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/tag/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/nfe/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/ppc/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/sound/driver/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sys/modules/sound/driver/ak452x/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/sound/driver/envy24/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/xfs/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.c#41 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.h#18 integrate .. //depot/projects/trustedbsd/base/sys/net/if.c#45 integrate .. //depot/projects/trustedbsd/base/sys/net/if.h#26 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#12 integrate .. //depot/projects/trustedbsd/base/sys/net/if_clone.c#7 integrate .. //depot/projects/trustedbsd/base/sys/net/if_enc.c#1 branch .. //depot/projects/trustedbsd/base/sys/net/if_types.h#9 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#38 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#35 integrate .. //depot/projects/trustedbsd/base/sys/net/route.c#24 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_freebsd.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/netgraph.h#18 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_base.c#26 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_socket.c#25 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_tag.c#1 branch .. //depot/projects/trustedbsd/base/sys/netgraph/ng_tag.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/if_ether.c#32 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#40 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.c#37 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#47 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#62 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_seq.h#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#40 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#35 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#32 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6.c#20 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_pcb.c#28 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ipsec.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/nd6.c#24 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/raw_ip6.c#23 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec.h#8 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_input.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_osdep.h#3 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_output.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/xform_ipip.c#12 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvcache.c#10 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfsrvcache.h#6 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/crypto.c#17 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/DEFAULTS#4 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#46 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#35 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_i810.c#22 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_rlreg.h#22 integrate .. //depot/projects/trustedbsd/base/sys/posix4/ksched.c#13 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/conf/GENERIC#30 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/mmu_if.m#4 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/mmu_oea.c#3 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/pmap_dispatch.c#4 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#8 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_token.c#4 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_trigger.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#53 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/_bus.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/bus.h#23 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/isa/isa.c#14 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sbus/sbus.c#23 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#56 integrate .. //depot/projects/trustedbsd/base/sys/sys/firmware.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/gpt.h#7 integrate .. //depot/projects/trustedbsd/base/sys/sys/linker.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/protosw.h#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/rman.h#13 integrate .. //depot/projects/trustedbsd/base/sys/sys/rwlock.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/sched.h#12 integrate .. //depot/projects/trustedbsd/base/sys/sys/socketvar.h#45 integrate .. //depot/projects/trustedbsd/base/sys/sys/sockio.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/sx.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscallsubr.h#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysctl.h#29 integrate .. //depot/projects/trustedbsd/base/sys/tools/fw_stub.awk#2 integrate .. //depot/projects/trustedbsd/base/sys/vm/pmap.h#30 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#45 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#49 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_meter.c#21 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_mmap.c#34 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#61 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageq.c#19 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/init-a.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/init.t#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/integrity-copy.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/integrity-data.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/integrity-hmac.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/onetime-a.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/onetime.t#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/ath/athstats/athstats.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/ipw/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/tools/ipw/ipwstats.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/mfc/mfc.pl#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#49 integrate .. //depot/projects/trustedbsd/base/usr.bin/file/config.h#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/locate/locate/locate.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/top/machine.c#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/adduser/adduser.8#19 integrate .. //depot/projects/trustedbsd/base/usr.sbin/asf/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/asf/asf.8#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/asf/asf.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/asf/asf.h#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/asf/asf_kld.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/asf/asf_kvm.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/asf/asf_prog.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/config/config.y#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/main.c#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/mkmakefile.c#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/mkoptions.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/cron/cron/do_command.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/cron/cron/popen.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/jail/jail.8#31 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mailwrapper/Makefile#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mailwrapper/mailwrapper.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mountd/mountd.c#15 integrate .. //depot/projects/trustedbsd/base/usr.sbin/newsyslog/newsyslog.c#26 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/add/main.c#16 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/create/main.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/delete/main.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/main.c#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/global.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/lib.h#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/version/main.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/Makefile.yp#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_server.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/ypinit.8#5 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile#45 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.330 2006/05/26 18:10:06 netchild Exp $ +# $FreeBSD: src/Makefile,v 1.334 2006/06/22 16:52:53 imp Exp $ # # The user-driven targets are: # @@ -8,7 +8,7 @@ # buildworld - Rebuild *everything*, including glue to help do # upgrades. # installworld - Install everything built by "buildworld". -# world - buildworld + installworld. +# world - buildworld + installworld, no kernel. # buildkernel - Rebuild the kernel and the kernel-modules. # installkernel - Install the kernel and the kernel-modules. # installkernel.debug @@ -37,7 +37,8 @@ # system, the simple instructions are: # # 1. `cd /usr/src' (or to the directory containing your source tree). -# 2. `make world' +# 2. Define `HISTORICAL_MAKE_WORLD' variable (see README). +# 3. `make world' # # For individuals wanting to upgrade their sources (even if only a # delta of a few days): @@ -46,6 +47,7 @@ # 2. `make buildworld' # 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). # 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). +# [steps 3. & 4. can be combined by using the "kernel" target] # 5. `reboot' (in single user mode: boot -s from the loader prompt). # 6. `mergemaster -p' # 7. `make installworld' @@ -68,9 +70,9 @@ # developer convenience only. They are intentionally not documented and # completely subject to change without notice. # -TGTS= all all-man buildenv buildkernel buildworld check-old checkdpadd \ - clean cleandepend cleandir delete-old delete-old-libs depend \ - distribute distributeworld distrib-dirs distribution doxygen \ +TGTS= all all-man buildenv buildenvvars buildkernel buildworld check-old \ + checkdpadd clean cleandepend cleandir delete-old delete-old-libs \ + depend distribute distributeworld distrib-dirs distribution doxygen \ everything hierarchy install installcheck installkernel \ installkernel.debug reinstallkernel reinstallkernel.debug \ installworld kernel-toolchain libraries lint maninstall \ @@ -204,9 +206,6 @@ @echo "'Rebuilding world', for how to upgrade your system." @echo "Define DESTDIR to where you want to install FreeBSD," @echo "including /, to override this warning and proceed as usual." - @echo "You may get the historical 'make world' behavior by defining" - @echo "HISTORICAL_MAKE_WORLD. You should understand the implications" - @echo "before doing this." @echo "" @echo "Bailing out now..." @false ==== //depot/projects/trustedbsd/base/Makefile.inc1#73 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.547 2006/05/26 18:10:06 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.549 2006/06/06 18:07:58 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -468,6 +468,16 @@ buildworld: ${WMAKE_TGTS} .ORDER: ${WMAKE_TGTS} + +# +# We need to have this as a target because the indirection between Makefile +# and Makefile.inc1 causes the correct PATH to be used, rather than a +# modification of the current environment's PATH. In addition, we need +# to quote multiword values. +# +buildenvvars: + @echo ${WMAKEENV:Q} + buildenv: @echo Entering world for ${TARGET_ARCH}:${TARGET} @cd ${.CURDIR} && env ${WMAKEENV} sh || true ==== //depot/projects/trustedbsd/base/README#6 (text+ko) ==== @@ -1,6 +1,6 @@ This is the top level of the FreeBSD source directory. This file was last revised on: -$FreeBSD: src/README,v 1.23 2006/03/01 20:14:55 ceri Exp $ +$FreeBSD: src/README,v 1.24 2006/06/07 03:33:48 trhodes Exp $ For copyright information, please see the file COPYRIGHT in this directory (additional copyright information also exists for some @@ -11,8 +11,13 @@ building components (or all) of the FreeBSD source tree, the most commonly used one being ``world'', which rebuilds and installs everything in the FreeBSD system from the source tree except the -kernel, the kernel-modules and the contents of /etc. The -``buildkernel'' and ``installkernel'' targets build and install +kernel, the kernel-modules and the contents of /etc. The ``world'' +target should only be used in cases where the source tree has not +changed from the currently running version. See: +http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html +for more information, including setting make(1) variables. + +The ``buildkernel'' and ``installkernel'' targets build and install the kernel and the modules (see below). Please see the top of the Makefile in this directory for more information on the standard build targets and compile-time flags. ==== //depot/projects/trustedbsd/base/bin/setfacl/setfacl.1#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.14 2005/12/13 17:07:52 ru Exp $ +.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.16 2006/06/09 17:03:24 maxim Exp $ .\" .Dd January 7, 2001 .Dt SETFACL 1 @@ -44,6 +44,8 @@ .Nm utility sets discretionary access control information on the specified file(s). +If no files are specified, or the list consists of the >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 27 15:56:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00A6116A531; Tue, 27 Jun 2006 15:56:01 +0000 (UTC) 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 B678B16A50D for ; Tue, 27 Jun 2006 15:56:00 +0000 (UTC) (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 1AF15446C7 for ; Tue, 27 Jun 2006 15:27:03 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RFR2q0049562 for ; Tue, 27 Jun 2006 15:27:03 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RFR265049559 for perforce@freebsd.org; Tue, 27 Jun 2006 15:27:02 GMT (envelope-from millert@freebsd.org) Date: Tue, 27 Jun 2006 15:27:02 GMT Message-Id: <200606271527.k5RFR265049559@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 100147 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, 27 Jun 2006 15:56:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=100147 Change 100147 by millert@millert_ibook on 2006/06/27 15:27:01 Add security.mac.sebsd.mls sysctl Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_sysctl.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_sysctl.c#10 (text+ko) ==== @@ -368,6 +368,8 @@ SYSCTL_INT(_security_mac_sebsd, OID_AUTO, verbose, CTLFLAG_RW, &sebsd_verbose, 0, " SEBSD Verbose Debug Stuff"); +SYSCTL_INT(_security_mac_sebsd, OID_AUTO, mls, CTLFLAG_RD, + &selinux_mls_enabled, 0, " SEBSD MLS enabled"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, sids, CTLTYPE_STRING|CTLFLAG_RD, NULL, 0, sysctl_list_sids, "A", "SEBSD SIDs"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, user_sids, CTLTYPE_STRING | @@ -403,4 +405,5 @@ sysctl_register_oid(&sysctl__security_mac_sebsd_auditing); sysctl_register_oid(&sysctl__security_mac_sebsd_enforcing); sysctl_register_oid(&sysctl__security_mac_sebsd_policyvers); + sysctl_register_oid(&sysctl__security_mac_sebsd_mls); } From owner-p4-projects@FreeBSD.ORG Tue Jun 27 15:56:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E061916A55E; Tue, 27 Jun 2006 15:56:07 +0000 (UTC) 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 BC0E616A53D; Tue, 27 Jun 2006 15:56:07 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9523D446D7; Tue, 27 Jun 2006 15:27:18 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k5RFRHwn008756; Tue, 27 Jun 2006 11:27:17 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Kip Macy Date: Tue, 27 Jun 2006 11:27:12 -0400 User-Agent: KMail/1.9.1 References: <200606270742.k5R7gCfT001310@repoman.freebsd.org> In-Reply-To: <200606270742.k5R7gCfT001310@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200606271127.13228.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Tue, 27 Jun 2006 11:27:17 -0400 (EDT) X-Virus-Scanned: ClamAV 0.87.1/1564/Mon Jun 26 10:55:16 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: kris@freebsd.org, Perforce Change Reviews Subject: Re: PERFORCE change 100121 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, 27 Jun 2006 15:56:08 -0000 On Tuesday 27 June 2006 03:42, Kip Macy wrote: > http://perforce.freebsd.org/chv.cgi?CH=100121 > > Change 100121 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/27 07:41:14 > > avoid pointless turnstile contention if mutex owner is running Yes, I did this already in jhb_lock for both mutexes and rwlocks at BSDCan. Kris said my patch panic'd for him at BSDCan but I don't have an SMP machine I can test it on now to debug it. :( > > Affected files ... > > .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#20 edit > > Differences ... > > ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#20 (text+ko) ==== > > @@ -176,7 +176,7 @@ > static int mutex_prof_maxrecords = MPROF_HASH_SIZE; > SYSCTL_INT(_debug_mutex_prof, OID_AUTO, maxrecords, CTLFLAG_RD, > &mutex_prof_maxrecords, 0, "Maximum number of profiling records"); > -int mutex_prof_rejected; > +int mutex_prof_rejected = 0; > SYSCTL_INT(_debug_mutex_prof, OID_AUTO, rejected, CTLFLAG_RD, > &mutex_prof_rejected, 0, "Number of rejected profiling records"); > static int mutex_prof_hashsize = MPROF_HASH_SIZE; > @@ -418,6 +418,16 @@ > > while (!_obtain_lock(m, tid)) { > lock_profile_obtain_lock_failed(&m->mtx_object, &contested); > +#if defined(SMP) && !defined(NO_ADAPTIVE_MUTEXES) > + /* > + * If the current owner of the lock is executing on another > + * CPU, spin instead of blocking. > + */ > + for (owner = mtx_owner(m); owner && TD_IS_RUNNING(owner); owner = mtx_owner(m)) > + cpu_spinwait(); > + if (mtx_unowned(m)) > + continue; > +#endif /* SMP && !NO_ADAPTIVE_MUTEXES */ > turnstile_lock(&m->mtx_object); > v = m->mtx_lock; > > @@ -425,7 +435,7 @@ > * Check if the lock has been released while spinning for > * the turnstile chain lock. > */ > - if (v == MTX_UNOWNED) { > + if (mtx_unowned(m)) { > turnstile_release(&m->mtx_object); > cpu_spinwait(); > continue; > @@ -837,6 +847,8 @@ > mtx_validate(m); > #endif > > + > + > /* Determine lock class and lock flags. */ > if (opts & MTX_SPIN) > class = &lock_class_mtx_spin; > -- John Baldwin From owner-p4-projects@FreeBSD.ORG Tue Jun 27 16:18:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C818016A403; Tue, 27 Jun 2006 16:17:59 +0000 (UTC) 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 8666C16A409 for ; Tue, 27 Jun 2006 16:17:59 +0000 (UTC) (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 2390A44B56 for ; Tue, 27 Jun 2006 16:17:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RGHxIL062443 for ; Tue, 27 Jun 2006 16:17:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RGGvvc061579 for perforce@freebsd.org; Tue, 27 Jun 2006 16:16:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 27 Jun 2006 16:16:57 GMT Message-Id: <200606271616.k5RGGvvc061579@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 100150 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, 27 Jun 2006 16:18:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=100150 Change 100150 by rwatson@rwatson_zoo on 2006/06/27 16:16:13 Integrate Trustedbsd audit3 branch from TrustedBSD base branch. Merges changes described in @100149. Affected files ... .. //depot/projects/trustedbsd/audit3/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/Makefile.inc1#10 integrate .. //depot/projects/trustedbsd/audit3/README#3 integrate .. //depot/projects/trustedbsd/audit3/bin/setfacl/setfacl.1#5 integrate .. //depot/projects/trustedbsd/audit3/bin/setfacl/setfacl.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/cd.c#2 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/eval.c#6 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/sh.1#7 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/var.c#6 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/var.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/binutils/bfd/elf64-sparc.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/ChangeLog#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/adventure#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/amigaos#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/animation#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/apple#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/archive#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/audio#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/basis#1 branch .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/bflt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/bout#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/btsnoop#1 branch .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/c64#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/cad#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/commands#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/compress#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/console#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/cracklib#1 branch .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/database#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/diff#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/digital#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/dump#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/elf#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/filesystems#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/flash#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/gnu#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/iff#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/images#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/java#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/linux#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/mach#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/macintosh#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/mail.news#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/maple#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/msdos#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/mup#1 branch .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/ncr#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/perl#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/printer#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/psion#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/python#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/riff#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/scientific#1 branch .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/sgi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/sql#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/varied.out#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Makefile.am#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/apprentice.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/ascmagic.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/compress.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/config.h.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/configure#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/configure.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/file.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/file.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/file.man#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/fsmagic.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/funcs.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/libmagic.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/magic.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/magic.man#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/magic.mime#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/magic2mime#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/patchlevel.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/print.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/readelf.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/readelf.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/softmagic.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/man/pfsync.4#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/FREEBSD-upgrade#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/PGPKEYS#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/RELEASE_NOTES#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/README#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/cf/submit.cf#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/cf/submit.mc#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/dnsbl.m4#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/enhdnsbl.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/m4/proto.m4#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/m4/version.m4#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/libmilter/mfapi.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_header.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/engine.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/t-memstat.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/README#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/bf.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/collect.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/conf.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/daemon.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/deliver.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/domain.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/envelope.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/headers.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/helpfile#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/main.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/map.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/mci.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/mime.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/parseaddr.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/queue.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/savemail.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sendmail.h#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sfsasl.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sfsasl.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/srvrsmtp.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/tls.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/util.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/version.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tcpdump.1#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/traceroute/traceroute.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/traceroute/traceroute.c#5 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/config.h#5 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/loginrec.c#5 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#13 integrate .. //depot/projects/trustedbsd/audit3/etc/periodic/daily/470.status-named#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/abi#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#11 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/cached#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ldconfig#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.subr#8 integrate .. //depot/projects/trustedbsd/audit3/etc/sendmail/freebsd.mc#4 integrate .. //depot/projects/trustedbsd/audit3/etc/sendmail/freebsd.submit.mc#3 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#12 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libgcc_r/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/gen/glob.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/tsearch.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/string/strlcpy.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mincore.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/stat.2#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libfetch/ftp.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libmagic/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libmagic/config.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_private.h#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_sig.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_sigaction.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libsdp/sdp.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libsdp/util.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/login_class.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/pidfile.c#3 integrate .. //depot/projects/trustedbsd/audit3/libexec/ftpd/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/libexec/ftpd/ftpcmd.y#4 integrate .. //depot/projects/trustedbsd/audit3/release/Makefile#10 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#9 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#11 integrate .. //depot/projects/trustedbsd/audit3/release/doc/share/misc/dev.archlist.txt#8 integrate .. //depot/projects/trustedbsd/audit3/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/devfs/devfs.c#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/fdisk/fdisk.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/ffsinfo/ffsinfo.8#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geli.8#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geom_eli.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/ggate/ggatec/ggatec.8#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/add.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/gpt.8#7 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/gpt.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/gpt.h#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/label.c#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/remove.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/show.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.8#11 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifgroup.c#1 branch .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifieee80211.c#8 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifpfsync.c#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/init/init.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw.8#10 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw2.c#9 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount/mount.c#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#12 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/aac.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/acpi.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/adv.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/adw.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/altq.4#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/amd.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/amr.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/bge.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/bt.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/carp.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/cpufreq.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/dpt.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/enc.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/esp.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/fast_ipsec.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/geom_fox.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/if_bridge.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/iir.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ips.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.alpha/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.alpha/linux.4#2 delete .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.alpha/osf1.4#4 delete .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.i386/linux.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.i386/padlock.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/mpt.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/mxge.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/myri10ge.4#2 delete .. //depot/projects/trustedbsd/audit3/share/man/man4/ncr.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ncv.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/nfe.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_tag.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/nsp.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/re.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/sched_4bsd.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/sched_core.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/sched_ule.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_csa.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_envy24.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_gusc.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_ich.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_sbc.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/stg.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/sym.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/umodem.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uscanner.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uvisor.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/vinum.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/mailer.conf.5#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man7/build.7#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man8/rc.subr.8#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/lock.9#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/vflush.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/vgone.9#3 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.README#6 integrate .. //depot/projects/trustedbsd/audit3/share/monetdef/pt_PT.ISO8859-1.src#2 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/fpu.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/trap.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/md_var.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_dummy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/inckern.S#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/locore.S#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/vm_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/files.at91#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/conf/IQ31244#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/conf/KB920X#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/conf/SIMICS#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/conf/SKYEYE#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/pmap.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/sa11x0/assabet_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/sa11x0/uart_cpu_sa1110.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/sa11x0/uart_dev_sa1110.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_ccb.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_xpt.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#16 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#16 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#18 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/kern_ndis.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/winx32_wrap.S#3 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_misc.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_proto.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_syscall.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_syscallnames.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_sysent.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/syscalls.master#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/Makefile.arm#8 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#13 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#22 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.amd64#8 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.arm#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.i386#10 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.powerpc#7 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kern.post.mk#8 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options#12 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.arm#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/COPYRIGHT#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/README#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/ah.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/ah_desc.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/ah_devid.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/ah_soc.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/freebsd/ah_if.m#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/freebsd/ah_osdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/freebsd/ah_osdep.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap30.hal.o.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap30.inc#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap30.opt_ah.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap43.hal.o.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap43.inc#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap43.opt_ah.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap51.hal.o.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap51.inc#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap51.opt_ah.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap61.hal.o.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap61.inc#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap61.opt_ah.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/i386-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sparc-be-elf.inc#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/x86_64-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/version.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/if_pfsync.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ddb/db_sym.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aac/aac_pci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpi_support/acpi_panasonic.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_battery.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_thermal.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpivar.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath_pci.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_athioctl.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_athvar.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/atkbdc/atkbdc_isa.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cardbus/cardbus.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cardbus/cardbus_cis.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cm/if_cm_isa.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cm/smc90cx6.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cm/smc90cx6reg.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cm/smc90cx6var.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/dc/if_dcreg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/digi/digi.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed_novell.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_edvar.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/firewire/fwohci_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ipw/if_ipw.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ipw/if_ipwvar.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/rgephy.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_pci.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/if_mxge.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/if_mxge_var.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/mcp_gen_header.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/mxge_mcp.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/my/if_my.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/eth_z8e.dat.gz.uu#2 delete .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#2 delete .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/if_myri10ge.c#3 delete .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/if_myri10ge_var.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/mcp_gen_header.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/myri10ge_mcp.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/dev/nfe/if_nfe.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/nfe/if_nfereg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/nfe/if_nfevar.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/puc/pucdata.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/re/if_re.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/driver.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/midi/midi.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/midi/sequencer.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/ak452x.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/ak452x.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/cmi.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/envy24.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/envy24.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/es137x.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/ich.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/maestro.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/via8233.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/feeder_rate.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/sound.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/vchan.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ubsec/ubsec.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uhid.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/umodem.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uplcom.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uscanner.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uvisor.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/wi/if_wi.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/wl/if_wl.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/procfs/procfs.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/udf/udf_vfsops.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli_ctl.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli_integrity.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli_key.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli_privacy.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/geom/geom.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_dev.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_gpt.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_io.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/support/debug.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/support/sv.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#3 delete .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_acl.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_acl.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_ag.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_alloc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_alloc.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_alloc_btree.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_alloc_btree.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_arch.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_attr.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_attr.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_attr_leaf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_attr_leaf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_attr_sf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_behavior.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_behavior.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bit.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bit.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bmap.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bmap_btree.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_btree.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_btree.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_buf_item.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_buf_item.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_cap.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_clnt.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_da_btree.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_da_btree.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dfrag.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dfrag.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dinode.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_block.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_block.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_data.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_data.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_leaf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_leaf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_node.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_node.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_sf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_sf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_trace.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_trace.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir_leaf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir_leaf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir_sf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dmapi.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dmops.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_error.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_error.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_extfree_item.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_extfree_item.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_fs.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_fsops.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_fsops.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_ialloc.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_ialloc_btree.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_ialloc_btree.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_iget.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_imap.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_inode.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_inode.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_inode_item.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_inode_item.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_inum.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_iocore.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_iomap.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_iomap.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_itable.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_itable.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_log.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_log_priv.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_log_recover.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_mac.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_macros.c#2 delete .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_macros.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_mount.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_mount.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_qmops.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_quota.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_refcache.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_refcache.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_rename.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_rtalloc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_rw.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_rw.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_sb.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans_ail.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans_buf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans_extfree.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans_inode.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans_item.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans_priv.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans_space.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_types.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_utils.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_utils.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_vnodeops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfsidbg.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/acpica/acpi_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/acpica/acpi_wakecode.S#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/acpica/acpi_wakeup.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/NOTES#10 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/XBOX#4 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/db_trace.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/identcpu.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/pmap.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/trap.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_dummy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_proto.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_syscall.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#15 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/conf/GENERIC#7 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/conf/SKI#5 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/disasm/disasm.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/disasm/disasm_decode.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/disasm/disasm_extract.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/disasm/disasm_format.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/disasm/disasm_int.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/machdep.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/isa/isa_common.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_clock.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_descrip.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_event.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_ktrace.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_linker.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mbuf.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_module.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_switch.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_synch.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sysctl.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_tc.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/link_elf.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/link_elf_obj.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sched_core.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/kern/sched_ule.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_bus.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_kdb.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_rman.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sys_pipe.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sysv_msg.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sysv_sem.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sysv_shm.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_mbuf.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_socket.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_socket2.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_init.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_subr.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_vnops.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#11 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/ath_hal/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/geom/geom_bde/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/geom/geom_eli/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/if_bridge/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/mxge/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/mxge/mxge/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/mxge/mxge_eth_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/mxge/mxge_ethp_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/myri10ge/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/sys/modules/myri10ge/myri10ge/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/tag/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/nfe/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/ppc/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/sound/driver/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/sound/driver/ak452x/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/sound/driver/envy24/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/xfs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bpf.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bpf.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_bridge.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_clone.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_enc.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/net/if_types.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_var.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_vlan.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/net/route.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netatalk/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/netgraph.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_socket.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_tag.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_tag.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/netinet/if_ether.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/in_pcb.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_dummynet.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_seq.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_syncache.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_usrreq.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_var.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/in6.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/in6_pcb.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/ipsec.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/nd6.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/raw_ip6.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec_input.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec_osdep.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec_output.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/xform_ipip.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs_srvcache.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfsrvcache.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/opencrypto/crypto.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/conf/GENERIC#8 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/conf/NOTES#11 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_i810.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_rlreg.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/posix4/ksched.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#33 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_trigger.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/include/_bus.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/include/bus.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/isa/isa.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sbus/sbus.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/pmap.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/firmware.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/gpt.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/linker.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/protosw.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/rman.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/rwlock.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sched.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/socketvar.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sockio.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sx.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscallsubr.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysctl.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/tools/fw_stub.awk#2 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/pmap.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_fault.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_map.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_meter.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_mmap.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_pageq.c#8 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/init-a.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/init.t#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/integrity-copy.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/integrity-data.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/integrity-hmac.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/onetime-a.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/onetime.t#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/athstats.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/ipw/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/ipw/ipwstats.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/mfc/mfc.pl#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/calendar/calendars/calendar.freebsd#11 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/file/config.h#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/locate/locate/locate.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/top/machine.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/adduser/adduser.8#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/asf/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/asf/asf.8#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/asf/asf.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/asf/asf.h#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/asf/asf_kld.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/asf/asf_kvm.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/asf/asf_prog.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/config/config.y#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/config/main.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/config/mkmakefile.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/config/mkoptions.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/cron/cron/do_command.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/cron/cron/popen.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/jail/jail.8#8 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mailwrapper/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mailwrapper/mailwrapper.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mountd/mountd.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/newsyslog/newsyslog.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/add/main.c#8 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/create/main.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/delete/main.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/info/main.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/lib/global.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/lib/lib.h#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/version/main.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ypserv/Makefile.yp#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ypserv/yp_server.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ypserv/ypinit.8#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.330 2006/05/26 18:10:06 netchild Exp $ +# $FreeBSD: src/Makefile,v 1.334 2006/06/22 16:52:53 imp Exp $ # # The user-driven targets are: # @@ -8,7 +8,7 @@ # buildworld - Rebuild *everything*, including glue to help do # upgrades. # installworld - Install everything built by "buildworld". -# world - buildworld + installworld. +# world - buildworld + installworld, no kernel. # buildkernel - Rebuild the kernel and the kernel-modules. # installkernel - Install the kernel and the kernel-modules. # installkernel.debug @@ -37,7 +37,8 @@ # system, the simple instructions are: # # 1. `cd /usr/src' (or to the directory containing your source tree). -# 2. `make world' +# 2. Define `HISTORICAL_MAKE_WORLD' variable (see README). +# 3. `make world' # # For individuals wanting to upgrade their sources (even if only a # delta of a few days): @@ -46,6 +47,7 @@ # 2. `make buildworld' # 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). # 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). +# [steps 3. & 4. can be combined by using the "kernel" target] # 5. `reboot' (in single user mode: boot -s from the loader prompt). # 6. `mergemaster -p' # 7. `make installworld' @@ -68,9 +70,9 @@ # developer convenience only. They are intentionally not documented and # completely subject to change without notice. # -TGTS= all all-man buildenv buildkernel buildworld check-old checkdpadd \ - clean cleandepend cleandir delete-old delete-old-libs depend \ - distribute distributeworld distrib-dirs distribution doxygen \ +TGTS= all all-man buildenv buildenvvars buildkernel buildworld check-old \ + checkdpadd clean cleandepend cleandir delete-old delete-old-libs \ + depend distribute distributeworld distrib-dirs distribution doxygen \ everything hierarchy install installcheck installkernel \ installkernel.debug reinstallkernel reinstallkernel.debug \ installworld kernel-toolchain libraries lint maninstall \ @@ -204,9 +206,6 @@ @echo "'Rebuilding world', for how to upgrade your system." @echo "Define DESTDIR to where you want to install FreeBSD," @echo "including /, to override this warning and proceed as usual." - @echo "You may get the historical 'make world' behavior by defining" - @echo "HISTORICAL_MAKE_WORLD. You should understand the implications" - @echo "before doing this." @echo "" @echo "Bailing out now..." @false ==== //depot/projects/trustedbsd/audit3/Makefile.inc1#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.547 2006/05/26 18:10:06 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.549 2006/06/06 18:07:58 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -468,6 +468,16 @@ buildworld: ${WMAKE_TGTS} .ORDER: ${WMAKE_TGTS} + +# +# We need to have this as a target because the indirection between Makefile +# and Makefile.inc1 causes the correct PATH to be used, rather than a +# modification of the current environment's PATH. In addition, we need +# to quote multiword values. +# +buildenvvars: + @echo ${WMAKEENV:Q} + buildenv: @echo Entering world for ${TARGET_ARCH}:${TARGET} @cd ${.CURDIR} && env ${WMAKEENV} sh || true ==== //depot/projects/trustedbsd/audit3/README#3 (text+ko) ==== @@ -1,6 +1,6 @@ This is the top level of the FreeBSD source directory. This file was last revised on: -$FreeBSD: src/README,v 1.23 2006/03/01 20:14:55 ceri Exp $ +$FreeBSD: src/README,v 1.24 2006/06/07 03:33:48 trhodes Exp $ For copyright information, please see the file COPYRIGHT in this directory (additional copyright information also exists for some @@ -11,8 +11,13 @@ building components (or all) of the FreeBSD source tree, the most commonly used one being ``world'', which rebuilds and installs everything in the FreeBSD system from the source tree except the -kernel, the kernel-modules and the contents of /etc. The -``buildkernel'' and ``installkernel'' targets build and install +kernel, the kernel-modules and the contents of /etc. The ``world'' +target should only be used in cases where the source tree has not +changed from the currently running version. See: +http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html +for more information, including setting make(1) variables. + +The ``buildkernel'' and ``installkernel'' targets build and install the kernel and the modules (see below). Please see the top of the Makefile in this directory for more information on the standard build targets and compile-time flags. ==== //depot/projects/trustedbsd/audit3/bin/setfacl/setfacl.1#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.14 2005/12/13 17:07:52 ru Exp $ +.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.16 2006/06/09 17:03:24 maxim Exp $ .\" .Dd January 7, 2001 .Dt SETFACL 1 @@ -44,6 +44,8 @@ .Nm utility sets discretionary access control information on the specified file(s). +If no files are specified, or the list consists of the +only "-", the file names are taken from the standard input. .Pp The following options are available: .Bl -tag -width indent ==== //depot/projects/trustedbsd/audit3/bin/setfacl/setfacl.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.11 2005/02/09 17:37:39 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.12 2006/06/09 16:09:26 kib Exp $"); #include #include @@ -109,6 +109,7 @@ int local_error, carried_error, ch, i; struct sf_file *file; struct sf_entry *entry; + const char *fn_dup; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 27 16:27:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2457616A40B; Tue, 27 Jun 2006 16:27:11 +0000 (UTC) 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 00E2D16A403 for ; Tue, 27 Jun 2006 16:27:11 +0000 (UTC) (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 A9A7444B5A for ; Tue, 27 Jun 2006 16:27:10 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RGRAjX067430 for ; Tue, 27 Jun 2006 16:27:10 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RGRAsR067427 for perforce@freebsd.org; Tue, 27 Jun 2006 16:27:10 GMT (envelope-from millert@freebsd.org) Date: Tue, 27 Jun 2006 16:27:10 GMT Message-Id: <200606271627.k5RGRAsR067427@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 100151 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, 27 Jun 2006 16:27:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=100151 Change 100151 by millert@millert_g4tower on 2006/06/27 16:26:16 Remove unneeded file. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/Makefile.orig#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jun 27 16:31:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 867B016A4A0; Tue, 27 Jun 2006 16:31:05 +0000 (UTC) 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 0DA8D16A47B for ; Tue, 27 Jun 2006 16:31:05 +0000 (UTC) (envelope-from kip.macy@gmail.com) Received: from nz-out-0102.google.com (nz-out-0102.google.com [64.233.162.193]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CC0B43D53 for ; Tue, 27 Jun 2006 16:31:03 +0000 (GMT) (envelope-from kip.macy@gmail.com) Received: by nz-out-0102.google.com with SMTP id o1so238815nzf for ; Tue, 27 Jun 2006 09:31:02 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=DVU+9IONal8GBB0nBRvBP/bnogFdry2LNtQULsgN1Ey2E723JqaoFsHyEVD2qBQOXk36KI7z8kK6VsGCGd15ZpXzz4HKjGrvrd8R8cHAuj3HIHSl6Dqf5Q8TYn6qvA4H4JNePo7msKIonv50Rz5w2HumRhJzrngd6kK3wncoERA= Received: by 10.65.224.7 with SMTP id b7mr7770328qbr; Tue, 27 Jun 2006 09:31:02 -0700 (PDT) Received: by 10.65.225.9 with HTTP; Tue, 27 Jun 2006 09:31:02 -0700 (PDT) Message-ID: Date: Tue, 27 Jun 2006 09:31:02 -0700 From: "Kip Macy" To: "John Baldwin" In-Reply-To: <200606271127.13228.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200606270742.k5R7gCfT001310@repoman.freebsd.org> <200606271127.13228.jhb@freebsd.org> Cc: kris@freebsd.org, Perforce Change Reviews , Kip Macy Subject: Re: PERFORCE change 100121 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: kmacy@fsmware.com List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jun 2006 16:31:05 -0000 Point me at your tree. I do :-). -Kip On 6/27/06, John Baldwin wrote: > On Tuesday 27 June 2006 03:42, Kip Macy wrote: > > http://perforce.freebsd.org/chv.cgi?CH=100121 > > > > Change 100121 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/27 > 07:41:14 > > > > avoid pointless turnstile contention if mutex owner is running > > Yes, I did this already in jhb_lock for both mutexes and rwlocks at BSDCan. > Kris said my patch panic'd for him at BSDCan but I don't have an SMP machine > I can test it on now to debug it. :( > > > > > Affected files ... > > > > .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#20 edit > > > > Differences ... > > > > ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#20 (text+ko) > ==== > > > > @@ -176,7 +176,7 @@ > > static int mutex_prof_maxrecords = MPROF_HASH_SIZE; > > SYSCTL_INT(_debug_mutex_prof, OID_AUTO, maxrecords, CTLFLAG_RD, > > &mutex_prof_maxrecords, 0, "Maximum number of profiling records"); > > -int mutex_prof_rejected; > > +int mutex_prof_rejected = 0; > > SYSCTL_INT(_debug_mutex_prof, OID_AUTO, rejected, CTLFLAG_RD, > > &mutex_prof_rejected, 0, "Number of rejected profiling records"); > > static int mutex_prof_hashsize = MPROF_HASH_SIZE; > > @@ -418,6 +418,16 @@ > > > > while (!_obtain_lock(m, tid)) { > > lock_profile_obtain_lock_failed(&m->mtx_object, &contested); > > +#if defined(SMP) && !defined(NO_ADAPTIVE_MUTEXES) > > + /* > > + * If the current owner of the lock is executing on another > > + * CPU, spin instead of blocking. > > + */ > > + for (owner = mtx_owner(m); owner && TD_IS_RUNNING(owner); owner = > mtx_owner(m)) > > + cpu_spinwait(); > > + if (mtx_unowned(m)) > > + continue; > > +#endif /* SMP && !NO_ADAPTIVE_MUTEXES */ > > turnstile_lock(&m->mtx_object); > > v = m->mtx_lock; > > > > @@ -425,7 +435,7 @@ > > * Check if the lock has been released while spinning for > > * the turnstile chain lock. > > */ > > - if (v == MTX_UNOWNED) { > > + if (mtx_unowned(m)) { > > turnstile_release(&m->mtx_object); > > cpu_spinwait(); > > continue; > > @@ -837,6 +847,8 @@ > > mtx_validate(m); > > #endif > > > > + > > + > > /* Determine lock class and lock flags. */ > > if (opts & MTX_SPIN) > > class = &lock_class_mtx_spin; > > > > -- > John Baldwin > From owner-p4-projects@FreeBSD.ORG Tue Jun 27 16:45:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81D0416A531; Tue, 27 Jun 2006 16:45:56 +0000 (UTC) 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 43E0116A506 for ; Tue, 27 Jun 2006 16:45:56 +0000 (UTC) (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 99DC144943 for ; Tue, 27 Jun 2006 15:39:20 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RFdKbX050318 for ; Tue, 27 Jun 2006 15:39:20 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RFdIZn050313 for perforce@freebsd.org; Tue, 27 Jun 2006 15:39:18 GMT (envelope-from jhb@freebsd.org) Date: Tue, 27 Jun 2006 15:39:18 GMT Message-Id: <200606271539.k5RFdIZn050313@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 100148 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, 27 Jun 2006 16:45:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=100148 Change 100148 by jhb@jhb_mutex on 2006/06/27 15:38:27 IFC @100146. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#61 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#48 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#33 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#9 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#9 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#9 integrate .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#13 integrate .. //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#9 integrate .. //depot/projects/smpng/sys/arm/at91/files.at91#3 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#36 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#30 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#30 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#30 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#30 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#33 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#65 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#47 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#11 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#10 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#10 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#10 integrate .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#14 integrate .. //depot/projects/smpng/sys/conf/NOTES#122 integrate .. //depot/projects/smpng/sys/conf/files#178 integrate .. //depot/projects/smpng/sys/conf/files.amd64#44 integrate .. //depot/projects/smpng/sys/conf/files.i386#98 integrate .. //depot/projects/smpng/sys/conf/options#122 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#41 integrate .. //depot/projects/smpng/sys/dev/ath/if_athioctl.h#13 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#25 integrate .. //depot/projects/smpng/sys/dev/mii/rgephy.c#7 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.c#17 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#14 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#10 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#21 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#1 branch .. //depot/projects/smpng/sys/dev/nfe/if_nfereg.h#1 branch .. //depot/projects/smpng/sys/dev/nfe/if_nfevar.h#1 branch .. //depot/projects/smpng/sys/dev/re/if_re.c#40 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#28 integrate .. //depot/projects/smpng/sys/geom/geom_gpt.c#25 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#78 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#122 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#100 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#27 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#26 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#27 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#31 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#51 integrate .. //depot/projects/smpng/sys/ia64/disasm/disasm.h#3 integrate .. //depot/projects/smpng/sys/ia64/disasm/disasm_decode.c#4 integrate .. //depot/projects/smpng/sys/ia64/disasm/disasm_extract.c#3 integrate .. //depot/projects/smpng/sys/ia64/disasm/disasm_format.c#3 integrate .. //depot/projects/smpng/sys/ia64/disasm/disasm_int.h#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#79 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#92 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#99 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#52 integrate .. //depot/projects/smpng/sys/kern/kern_module.c#21 integrate .. //depot/projects/smpng/sys/kern/subr_firmware.c#13 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#74 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#60 integrate .. //depot/projects/smpng/sys/kern/vfs_init.c#25 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#63 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#129 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#74 integrate .. //depot/projects/smpng/sys/modules/Makefile#125 integrate .. //depot/projects/smpng/sys/modules/netgraph/Makefile#24 integrate .. //depot/projects/smpng/sys/modules/netgraph/tag/Makefile#1 branch .. //depot/projects/smpng/sys/modules/nfe/Makefile#1 branch .. //depot/projects/smpng/sys/net/if_enc.c#1 branch .. //depot/projects/smpng/sys/net/if_types.h#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_tag.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_tag.h#1 branch .. //depot/projects/smpng/sys/netinet/in_pcb.c#64 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#87 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#51 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#50 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#44 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#43 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.c#24 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#39 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.h#10 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_input.c#11 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_osdep.h#3 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_output.c#11 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipip.c#12 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#63 integrate .. //depot/projects/smpng/sys/pci/agp_i810.c#23 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#30 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#35 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mmu_oea.c#4 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#70 integrate .. //depot/projects/smpng/sys/sys/rwlock.h#4 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#61 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.558 2006/06/20 20:52:10 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.560 2006/06/27 04:28:22 alc Exp $"); /* * Manages physical address maps. @@ -2674,7 +2674,7 @@ PHYS_TO_DMAP(VM_PAGE_TO_PHYS(dstmpde)); pde = &pde[pmap_pde_index(addr)]; if (*pde == 0) { - *pde = srcptepaddr; + *pde = srcptepaddr & ~PG_W; dst_pmap->pm_stats.resident_count += NBPDR / PAGE_SIZE; } else @@ -2697,11 +2697,6 @@ * we only virtual copy managed pages */ if ((ptetemp & PG_MANAGED) != 0) { - /* - * We have to check after allocpte for the - * pte still being around... allocpte can - * block. - */ dstmpte = pmap_allocpte(dst_pmap, addr, M_NOWAIT); if (dstmpte == NULL) @@ -2713,14 +2708,16 @@ pmap_try_insert_pv_entry(dst_pmap, addr, PHYS_TO_VM_PAGE(ptetemp & PG_FRAME))) { /* - * Clear the modified and + * Clear the wired, modified, and * accessed (referenced) bits * during the copy. */ - *dst_pte = ptetemp & ~(PG_M | PG_A); + *dst_pte = ptetemp & ~(PG_W | PG_M | + PG_A); dst_pmap->pm_stats.resident_count++; } else - pmap_unwire_pte_hold(dst_pmap, addr, dstmpte); + pmap_unwire_pte_hold(dst_pmap, addr, + dstmpte); if (dstmpte->wire_count >= srcmpte->wire_count) break; } ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#48 (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.460 2006/06/15 19:58:52 netchild Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.462 2006/06/26 22:03:20 babkin Exp $ cpu HAMMER ident GENERIC ==== //depot/projects/smpng/sys/amd64/conf/NOTES#33 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.56 2006/06/12 20:38:17 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.57 2006/06/26 23:41:06 obrien Exp $ # # @@ -223,6 +223,7 @@ # (requires miibus) # ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter # iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters +# nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking # ral: Ralink Technology IEEE 802.11 wireless adapter # ural: Ralink Technology RT2500USB IEEE 802.11 wireless adapter @@ -233,6 +234,7 @@ options ED_SIC device iwi device ipw +device nfe # nVidia nForce MCP on-board Ethernet Networking device nve # nVidia nForce MCP on-board Ethernet Networking device ral device ural ==== //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.13 2006/06/20 20:41:28 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.15 2006/06/27 14:47:07 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.13 2006/06/27 14:46:30 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.13 2006/06/20 20:41:28 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.15 2006/06/27 14:47:07 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.13 2006/06/27 14:46:30 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.13 2006/06/20 20:41:28 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.15 2006/06/27 14:47:07 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.13 2006/06/27 14:46:30 jhb Exp */ #include @@ -41,8 +41,8 @@ { SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT }, /* 18 = linux_stat */ { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_GETPID }, /* 20 = linux_getpid */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 21 = linux_mount */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 22 = linux_oldumount */ + { SYF_MPSAFE | AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 21 = linux_mount */ + { SYF_MPSAFE | AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 22 = linux_oldumount */ { SYF_MPSAFE | AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID }, /* 23 = linux_setuid16 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid16, AUE_GETUID }, /* 24 = linux_getuid16 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY }, /* 25 = linux_stime */ @@ -65,14 +65,14 @@ { SYF_MPSAFE | AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = prof */ - { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ + { SYF_MPSAFE | AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ { SYF_MPSAFE | AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ { SYF_MPSAFE | AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ { SYF_MPSAFE | 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID }, /* 49 = linux_geteuid16 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getegid16, AUE_GETEGID }, /* 50 = linux_getegid16 */ { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */ + { SYF_MPSAFE | AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = lock */ { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 55 = linux_fcntl */ ==== //depot/projects/smpng/sys/amd64/linux32/syscalls.master#13 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.13 2006/06/27 14:46:30 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.9 2006/06/22 22:33:21 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.11 2006/06/23 22:45:35 cognet Exp $"); #include #include #include @@ -131,6 +131,8 @@ } } +static void arm9_setup(void); + void _start(void) { @@ -348,8 +350,8 @@ int d) { Elf32_Ehdr *eh; - Elf32_Phdr phdr[512] /* XXX */, *php; - Elf32_Shdr shdr[512] /* XXX */; + Elf32_Phdr phdr[64] /* XXX */, *php; + Elf32_Shdr shdr[64] /* XXX */; int i,j; void *entry_point; int symtabindex = -1; ==== //depot/projects/smpng/sys/arm/at91/files.at91#3 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/at91/files.at91,v 1.3 2006/03/24 07:36:23 imp Exp $ +# $FreeBSD: src/sys/arm/at91/files.at91,v 1.5 2006/06/23 23:07:11 cognet Exp $ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91.c standard ==== //depot/projects/smpng/sys/cam/cam_xpt.c#36 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.160 2006/06/05 22:22:14 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.162 2006/06/26 05:41:11 mjacob Exp $"); #include #include @@ -387,6 +387,11 @@ /*quirks*/0, /*mintags*/0, /*maxtags*/0 }, { + /* Does not support other than LUN 0 */ + { T_DIRECT, SIP_MEDIA_FIXED, "VMware*", "*", "*" }, + CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0 + }, + { /* * Broken tagged queuing drive. * Submitted by: ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#30 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.54 2006/03/30 07:43:01 ps Exp $ - * created from FreeBSD + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.56 2006/06/27 14:47:07 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.67 2006/06/27 14:46:30 jhb Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#30 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.52 2006/03/30 07:43:01 ps Exp $ - * created from FreeBSD + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.54 2006/06/27 14:47:07 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.67 2006/06/27 14:46:30 jhb Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#30 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.43 2006/03/30 07:43:01 ps Exp $ - * created from FreeBSD + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.45 2006/06/27 14:47:08 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.67 2006/06/27 14:46:30 jhb Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#30 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.53 2006/03/30 07:43:01 ps Exp $ - * created from FreeBSD + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.55 2006/06/27 14:47:08 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.67 2006/06/27 14:46:30 jhb Exp */ #include "opt_compat.h" @@ -53,8 +53,8 @@ { compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_getfsstat_args),freebsd32_getfsstat), AUE_GETFSSTAT }, /* 18 = old freebsd32_getfsstat */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 19 = obsolete olseek */ { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_GETPID }, /* 20 = getpid */ - { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT }, /* 21 = mount */ - { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT }, /* 22 = unmount */ + { SYF_MPSAFE | AS(mount_args), (sy_call_t *)mount, AUE_MOUNT }, /* 21 = mount */ + { SYF_MPSAFE | AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT }, /* 22 = unmount */ { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 23 = setuid */ { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 25 = geteuid */ @@ -168,9 +168,9 @@ { SYF_MPSAFE | AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO }, /* 133 = sendto */ { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN }, /* 134 = shutdown */ { SYF_MPSAFE | AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR }, /* 135 = socketpair */ - { AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR }, /* 136 = mkdir */ - { AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR }, /* 137 = rmdir */ - { AS(freebsd32_utimes_args), (sy_call_t *)freebsd32_utimes, AUE_UTIMES }, /* 138 = freebsd32_utimes */ + { SYF_MPSAFE | AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR }, /* 136 = mkdir */ + { SYF_MPSAFE | AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR }, /* 137 = rmdir */ + { SYF_MPSAFE | AS(freebsd32_utimes_args), (sy_call_t *)freebsd32_utimes, AUE_UTIMES }, /* 138 = freebsd32_utimes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = obsolete 4.2 sigreturn */ { SYF_MPSAFE | AS(freebsd32_adjtime_args), (sy_call_t *)freebsd32_adjtime, AUE_ADJTIME }, /* 140 = freebsd32_adjtime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 141 = obsolete ogetpeername */ @@ -387,10 +387,10 @@ { SYF_MPSAFE | AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL }, /* 352 = __acl_delete_fd */ { SYF_MPSAFE | AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL }, /* 353 = __acl_aclcheck_file */ { SYF_MPSAFE | AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL }, /* 354 = __acl_aclcheck_fd */ - { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_NULL }, /* 355 = extattrctl */ - { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_NULL }, /* 356 = extattr_set_file */ - { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_NULL }, /* 357 = extattr_get_file */ - { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_NULL }, /* 358 = extattr_delete_file */ + { SYF_MPSAFE | AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_NULL }, /* 355 = extattrctl */ + { SYF_MPSAFE | AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_NULL }, /* 356 = extattr_set_file */ + { SYF_MPSAFE | AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_NULL }, /* 357 = extattr_get_file */ + { SYF_MPSAFE | AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_NULL }, /* 358 = extattr_delete_file */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 359 = aio_waitcomplete */ { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 360 = getresuid */ { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL }, /* 361 = getresgid */ @@ -403,14 +403,14 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 368 = __cap_set_fd */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 369 = __cap_set_file */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 370 = lkmressys */ - { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_NULL }, /* 371 = extattr_set_fd */ - { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_NULL }, /* 372 = extattr_get_fd */ - { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_NULL }, /* 373 = extattr_delete_fd */ + { SYF_MPSAFE | AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_NULL }, /* 371 = extattr_set_fd */ + { SYF_MPSAFE | AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_NULL }, /* 372 = extattr_get_fd */ + { SYF_MPSAFE | AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_NULL }, /* 373 = extattr_delete_fd */ { SYF_MPSAFE | AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL }, /* 374 = __setugid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 375 = nfsclnt */ { SYF_MPSAFE | AS(eaccess_args), (sy_call_t *)eaccess, AUE_NULL }, /* 376 = eaccess */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 377 = afs_syscall */ - { AS(nmount_args), (sy_call_t *)nmount, AUE_NULL }, /* 378 = nmount */ + { SYF_MPSAFE | AS(nmount_args), (sy_call_t *)nmount, AUE_NULL }, /* 378 = nmount */ { SYF_MPSAFE | 0, (sy_call_t *)kse_exit, AUE_NULL }, /* 379 = kse_exit */ { SYF_MPSAFE | AS(kse_wakeup_args), (sy_call_t *)kse_wakeup, AUE_NULL }, /* 380 = kse_wakeup */ { SYF_MPSAFE | AS(kse_create_args), (sy_call_t *)kse_create, AUE_NULL }, /* 381 = kse_create */ ==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#33 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.65 2006/03/30 07:42:32 ps Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.67 2006/06/27 14:46:30 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#65 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.178 2006/05/10 20:38:16 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.179 2006/06/23 18:49:38 netchild Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -661,20 +661,22 @@ printf(ARGS(times, "*")); #endif - p = td->td_proc; - PROC_LOCK(p); - calcru(p, &utime, &stime); - calccru(p, &cutime, &cstime); - PROC_UNLOCK(p); + if (args->buf != NULL) { + p = td->td_proc; + PROC_LOCK(p); + calcru(p, &utime, &stime); + calccru(p, &cutime, &cstime); + PROC_UNLOCK(p); - tms.tms_utime = CONVTCK(utime); - tms.tms_stime = CONVTCK(stime); + tms.tms_utime = CONVTCK(utime); + tms.tms_stime = CONVTCK(stime); - tms.tms_cutime = CONVTCK(cutime); - tms.tms_cstime = CONVTCK(cstime); + tms.tms_cutime = CONVTCK(cutime); + tms.tms_cstime = CONVTCK(cstime); - if ((error = copyout(&tms, args->buf, sizeof(tms)))) - return error; + if ((error = copyout(&tms, args->buf, sizeof(tms)))) + return error; + } microuptime(&tv); td->td_retval[0] = (int)CONVTCK(tv); ==== //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#47 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.84 2006/02/06 22:06:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.85 2006/06/26 18:36:57 jhb Exp $"); #include "opt_mac.h" ==== //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.19 2005/07/13 20:35:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.20 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp */ #ifndef _SVR4_SYSPROTO_H_ ==== //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#10 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.17 2005/07/13 20:35:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.18 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp */ #define SVR4_SYS_exit 1 ==== //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#10 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.17 2005/07/13 20:35:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.18 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp */ const char *svr4_syscallnames[] = { ==== //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#10 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.18 2005/07/13 20:35:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.19 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp */ #include @@ -37,7 +37,7 @@ { SYF_MPSAFE | AS(svr4_sys_mknod_args), (sy_call_t *)svr4_sys_mknod, AUE_NULL }, /* 14 = svr4_sys_mknod */ { SYF_MPSAFE | AS(chmod_args), (sy_call_t *)chmod, AUE_NULL }, /* 15 = chmod */ { SYF_MPSAFE | AS(chown_args), (sy_call_t *)chown, AUE_NULL }, /* 16 = chown */ - { AS(svr4_sys_break_args), (sy_call_t *)svr4_sys_break, AUE_NULL }, /* 17 = svr4_sys_break */ + { SYF_MPSAFE | AS(svr4_sys_break_args), (sy_call_t *)svr4_sys_break, AUE_NULL }, /* 17 = svr4_sys_break */ { SYF_MPSAFE | AS(svr4_sys_stat_args), (sy_call_t *)svr4_sys_stat, AUE_NULL }, /* 18 = svr4_sys_stat */ { SYF_MPSAFE | AS(lseek_args), (sy_call_t *)lseek, AUE_NULL }, /* 19 = lseek */ { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ ==== //depot/projects/smpng/sys/compat/svr4/syscalls.master#14 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp $ + $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp $ ; from: @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; ; System call name/number master file (or rather, slave, from SVR4). ==== //depot/projects/smpng/sys/conf/NOTES#122 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1367 2006/06/19 22:11:44 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1370 2006/06/27 12:45:27 glebius Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -567,6 +567,7 @@ options NETGRAPH_SOCKET options NETGRAPH_SPLIT options NETGRAPH_SPPP +options NETGRAPH_TAG options NETGRAPH_TCPMSS options NETGRAPH_TEE options NETGRAPH_TTY ==== //depot/projects/smpng/sys/conf/files#178 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1125 2006/06/14 03:03:08 marcel Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1127 2006/06/27 12:45:27 glebius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1459,6 +1459,7 @@ net/if_clone.c standard net/if_disc.c optional disc net/if_ef.c optional ef +net/if_enc.c optional enc net/if_ethersubr.c optional ether net/if_faith.c optional faith net/if_fddisubr.c optional fddi @@ -1661,6 +1662,7 @@ netgraph/ng_socket.c optional netgraph_socket netgraph/ng_split.c optional netgraph_split netgraph/ng_sppp.c optional netgraph_sppp +netgraph/ng_tag.c optional netgraph_tag netgraph/ng_tcpmss.c optional netgraph_tcpmss netgraph/ng_tee.c optional netgraph_tee netgraph/ng_tty.c optional netgraph_tty ==== //depot/projects/smpng/sys/conf/files.amd64#44 (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.amd64,v 1.89 2006/05/18 23:30:47 ambrisko Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.90 2006/06/26 23:41:06 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -177,6 +177,7 @@ dev/hwpmc/hwpmc_x86.c optional hwpmc dev/kbd/kbd.c optional atkbd | sc | ukbd dev/mem/memutil.c optional mem +dev/nfe/if_nfe.c optional nfe pci dev/nve/if_nve.c optional nve pci dev/rr232x/os_bsd.c optional rr232x dev/rr232x/osm_bsd.c optional rr232x ==== //depot/projects/smpng/sys/conf/files.i386#98 (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.561 2006/05/17 21:25:22 marius Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.562 2006/06/26 23:41:07 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -198,6 +198,7 @@ dev/mem/memutil.c optional mem dev/mse/mse.c optional mse dev/mse/mse_isa.c optional mse isa +dev/nfe/if_nfe.c optional nfe pci dev/nve/if_nve.c optional nve pci dev/pcf/pcf_isa.c optional pcf dev/random/nehemiah.c optional random ==== //depot/projects/smpng/sys/conf/options#122 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.546 2006/06/13 13:12:55 davidxu Exp $ +# $FreeBSD: src/sys/conf/options,v 1.550 2006/06/27 12:45:27 glebius Exp $ # # On the handling of kernel options # @@ -340,6 +340,7 @@ BOOTP_NFSV3 opt_bootp.h BOOTP_WIRED_TO opt_bootp.h DEVICE_POLLING +DEV_ENC opt_enc.h DEV_PF opt_pf.h DEV_PFLOG opt_pf.h DEV_PFSYNC opt_pf.h @@ -438,6 +439,7 @@ NETGRAPH_SOCKET opt_netgraph.h NETGRAPH_SPLIT opt_netgraph.h NETGRAPH_SPPP opt_netgraph.h +NETGRAPH_TAG opt_netgraph.h NETGRAPH_TCPMSS opt_netgraph.h NETGRAPH_TEE opt_netgraph.h NETGRAPH_TTY opt_netgraph.h ==== //depot/projects/smpng/sys/dev/ath/if_ath.c#41 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.147 2006/06/05 17:51:20 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.149 2006/06/26 04:31:36 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -150,6 +150,7 @@ int subtype, int rssi, u_int32_t rstamp); static void ath_setdefantenna(struct ath_softc *, u_int); static void ath_rx_proc(void *, int); +static void ath_txq_init(struct ath_softc *sc, struct ath_txq *, int); static struct ath_txq *ath_txq_setup(struct ath_softc*, int qtype, int subtype); static int ath_tx_setup(struct ath_softc *, int, int); static int ath_wme_update(struct ieee80211com *); @@ -422,6 +423,7 @@ error = EIO; goto bad2; } + ath_txq_init(sc, &sc->sc_mcastq, -1); /* NB: s/w q, qnum not used */ /* NB: insure BK queue is the lowest priority h/w queue */ if (!ath_tx_setup(sc, WME_AC_BK, HAL_WME_AC_BK)) { if_printf(ifp, "unable to setup xmit queue for %s traffic!\n", @@ -1697,6 +1699,8 @@ * - when operating in station mode for collecting rssi data when * the station is otherwise quiet, or * - when scanning + * o accept control frames: + * - when in monitor mode */ static u_int32_t ath_calcrxfilter(struct ath_softc *sc, enum ieee80211_state state) @@ -1718,6 +1722,8 @@ ic->ic_opmode == IEEE80211_M_IBSS || state == IEEE80211_S_SCAN) rfilt |= HAL_RX_FILTER_BEACON; + if (ic->ic_opmode == IEEE80211_M_MONITOR) + rfilt |= HAL_RX_FILTER_CONTROL; return rfilt; #undef RX_FILTER_PRESERVE } @@ -1988,6 +1994,20 @@ } /* + * Append the contents of src to dst; both queues + * are assumed to be locked. + */ +static void +ath_txqmove(struct ath_txq *dst, struct ath_txq *src) +{ + STAILQ_CONCAT(&dst->axq_q, &src->axq_q); + dst->axq_link = src->axq_link; + src->axq_link = NULL; + dst->axq_depth += src->axq_depth; + src->axq_depth = 0; +} + +/* * Transmit a beacon frame at SWBA. Dynamic updates to the * frame contents are done as needed and the slot time is * also adjusted based on current state. @@ -2000,8 +2020,9 @@ struct ieee80211_node *ni = bf->bf_node; struct ieee80211com *ic = ni->ni_ic; struct ath_hal *ah = sc->sc_ah; + struct ath_txq *cabq = sc->sc_cabq; struct mbuf *m; - int ncabq, error, otherant; + int ncabq, nmcastq, error, otherant; DPRINTF(sc, ATH_DEBUG_BEACON_PROC, "%s: pending %u\n", __func__, pending); @@ -2043,8 +2064,9 @@ * of the TIM bitmap). */ m = bf->bf_m; - ncabq = sc->sc_cabq->axq_depth; - if (ieee80211_beacon_update(ic, bf->bf_node, &sc->sc_boff, m, ncabq)) { + nmcastq = sc->sc_mcastq.axq_depth; + ncabq = ath_hal_numtxpending(ah, cabq->axq_qnum); + if (ieee80211_beacon_update(ic, bf->bf_node, &sc->sc_boff, m, ncabq+nmcastq)) { /* XXX too conservative? */ bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); error = bus_dmamap_load_mbuf_sg(sc->sc_dmat, bf->bf_dmamap, m, @@ -2057,6 +2079,18 @@ return; } } + if (ncabq && (sc->sc_boff.bo_tim[4] & 1)) { + /* + * CABQ traffic from the previous DTIM is still pending. + * This is ok for now but when there are multiple vap's + * and we are using staggered beacons we'll want to drain + * the cabq before loading frames for the different vap. + */ + DPRINTF(sc, ATH_DEBUG_BEACON, + "%s: cabq did not drain, mcastq %u cabq %u/%u\n", + __func__, nmcastq, ncabq, cabq->axq_depth); + sc->sc_stats.ast_cabq_busy++; + } /* * Handle slot time change when a non-ERP station joins/leaves @@ -2103,8 +2137,30 @@ * Enable the CAB queue before the beacon queue to * insure cab frames are triggered by this beacon. */ - if (sc->sc_boff.bo_tim[4] & 1) /* NB: only at DTIM */ - ath_hal_txstart(ah, sc->sc_cabq->axq_qnum); + if (sc->sc_boff.bo_tim[4] & 1) { /* NB: only at DTIM */ + ATH_TXQ_LOCK(cabq); + ATH_TXQ_LOCK(&sc->sc_mcastq); + if (nmcastq) { + struct ath_buf *bfm; + + /* + * Move frames from the s/w mcast q to the h/w cab q. + */ + bfm = STAILQ_FIRST(&sc->sc_mcastq.axq_q); + if (cabq->axq_link != NULL) { + *cabq->axq_link = bfm->bf_daddr; + } else + ath_hal_puttxbuf(ah, cabq->axq_qnum, + bfm->bf_daddr); + ath_txqmove(cabq, &sc->sc_mcastq); + + sc->sc_stats.ast_cabq_xmit += nmcastq; + } + /* NB: gated by beacon so safe to start here */ + ath_hal_txstart(ah, cabq->axq_qnum); + ATH_TXQ_UNLOCK(cabq); + ATH_TXQ_UNLOCK(&sc->sc_mcastq); + } ath_hal_puttxbuf(ah, sc->sc_bhalq, bf->bf_daddr); ath_hal_txstart(ah, sc->sc_bhalq); DPRINTF(sc, ATH_DEBUG_BEACON_PROC, @@ -3031,6 +3087,17 @@ #undef PA2DESC } +static void +ath_txq_init(struct ath_softc *sc, struct ath_txq *txq, int qnum) +{ + txq->axq_qnum = qnum; + txq->axq_depth = 0; + txq->axq_intrcnt = 0; + txq->axq_link = NULL; + STAILQ_INIT(&txq->axq_q); + ATH_TXQ_LOCK_INIT(sc, txq); +} + /* * Setup a h/w transmit queue. */ @@ -3076,14 +3143,7 @@ return NULL; } if (!ATH_TXQ_SETUP(sc, qnum)) { - struct ath_txq *txq = &sc->sc_txq[qnum]; - - txq->axq_qnum = qnum; - txq->axq_depth = 0; - txq->axq_intrcnt = 0; - txq->axq_link = NULL; - STAILQ_INIT(&txq->axq_q); - ATH_TXQ_LOCK_INIT(sc, txq); + ath_txq_init(sc, &sc->sc_txq[qnum], qnum); sc->sc_txqsetup |= 1<sc_txq[qnum]; @@ -3190,6 +3250,7 @@ for (i = 0; i < HAL_NUM_TX_QUEUES; i++) if (ATH_TXQ_SETUP(sc, i)) ath_tx_cleanupq(sc, &sc->sc_txq[i]); + ATH_TXQ_LOCK_DESTROY(&sc->sc_mcastq); } /* @@ -3529,11 +3590,12 @@ /* * When servicing one or more stations in power-save mode - * multicast frames must be buffered until after the beacon. - * We use the CAB queue for that. + * (or) if there is some mcast data waiting on the mcast + * queue (to prevent out of order delivery) multicast + * frames must be buffered until after the beacon. */ - if (ismcast && ic->ic_ps_sta) { - txq = sc->sc_cabq; + if (ismcast && (ic->ic_ps_sta || sc->sc_mcastq.axq_depth)) { + txq = &sc->sc_mcastq; /* XXX? more bit in 802.11 frame header */ } @@ -3722,31 +3784,36 @@ ds->ds_ctl0, ds->ds_ctl1, ds->ds_hw[0], ds->ds_hw[1]); } /* - * Insert the frame on the outbound list and - * pass it on to the hardware. + * Insert the frame on the outbound list and pass it on + * to the hardware. Multicast frames buffered for power + * save stations and transmit from the CAB queue are stored + * on a s/w only queue and loaded on to the CAB queue in + * the SWBA handler since frames only go out on DTIM and + * to avoid possible races. */ ATH_TXQ_LOCK(txq); ATH_TXQ_INSERT_TAIL(txq, bf, bf_list); - if (txq->axq_link == NULL) { - ath_hal_puttxbuf(ah, txq->axq_qnum, bf->bf_daddr); - DPRINTF(sc, ATH_DEBUG_XMIT, - "%s: TXDP[%u] = %p (%p) depth %d\n", __func__, - txq->axq_qnum, (caddr_t)bf->bf_daddr, bf->bf_desc, - txq->axq_depth); + if (txq != &sc->sc_mcastq) { + if (txq->axq_link == NULL) { + ath_hal_puttxbuf(ah, txq->axq_qnum, bf->bf_daddr); + DPRINTF(sc, ATH_DEBUG_XMIT, + "%s: TXDP[%u] = %p (%p) depth %d\n", __func__, + txq->axq_qnum, (caddr_t)bf->bf_daddr, bf->bf_desc, + txq->axq_depth); + } else { + *txq->axq_link = bf->bf_daddr; + DPRINTF(sc, ATH_DEBUG_XMIT, + "%s: link[%u](%p)=%p (%p) depth %d\n", __func__, + txq->axq_qnum, txq->axq_link, + (caddr_t)bf->bf_daddr, bf->bf_desc, txq->axq_depth); + } + txq->axq_link = &bf->bf_desc[bf->bf_nseg - 1].ds_link; + ath_hal_txstart(ah, txq->axq_qnum); } else { - *txq->axq_link = bf->bf_daddr; - DPRINTF(sc, ATH_DEBUG_XMIT, - "%s: link[%u](%p)=%p (%p) depth %d\n", __func__, - txq->axq_qnum, txq->axq_link, - (caddr_t)bf->bf_daddr, bf->bf_desc, txq->axq_depth); + if (txq->axq_link != NULL) + *txq->axq_link = bf->bf_daddr; + txq->axq_link = &bf->bf_desc[bf->bf_nseg - 1].ds_link; } - txq->axq_link = &bf->bf_desc[bf->bf_nseg - 1].ds_link; - /* - * The CAB queue is started from the SWBA handler since - * frames only go out on DTIM and to avoid possible races. - */ - if (txq != sc->sc_cabq) - ath_hal_txstart(ah, txq->axq_qnum); ATH_TXQ_UNLOCK(txq); return 0; @@ -4044,6 +4111,7 @@ for (i = 0; i < HAL_NUM_TX_QUEUES; i++) if (ATH_TXQ_SETUP(sc, i)) ath_tx_draintxq(sc, &sc->sc_txq[i]); + ath_tx_draintxq(sc, &sc->sc_mcastq); #ifdef ATH_DEBUG if (sc->sc_debug & ATH_DEBUG_RESET) { struct ath_buf *bf = STAILQ_FIRST(&sc->sc_bbuf); ==== //depot/projects/smpng/sys/dev/ath/if_athioctl.h#13 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.14 2006/02/09 22:37:33 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.15 2006/06/23 18:48:08 sam Exp $ */ /* @@ -106,7 +106,9 @@ u_int32_t ast_ant_txswitch;/* tx antenna switches */ u_int32_t ast_ant_rx[8]; /* rx frames with antenna */ u_int32_t ast_ant_tx[8]; /* tx frames with antenna */ - u_int32_t ast_pad[32]; + u_int32_t ast_cabq_xmit; /* cabq frames transmitted */ + u_int32_t ast_cabq_busy; /* cabq found busy */ + u_int32_t ast_pad[30]; }; #define SIOCGATHSTATS _IOWR('i', 137, struct ifreq) ==== //depot/projects/smpng/sys/dev/ath/if_athvar.h#25 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 27 18:36:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A73A16A49E; Tue, 27 Jun 2006 18:36:00 +0000 (UTC) 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 15A5E16A4F4; Tue, 27 Jun 2006 18:36:00 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B74544F55; Tue, 27 Jun 2006 18:35:59 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k5RIZvWx009917; Tue, 27 Jun 2006 14:35:58 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: kmacy@fsmware.com Date: Tue, 27 Jun 2006 13:51:43 -0400 User-Agent: KMail/1.9.1 References: <200606270742.k5R7gCfT001310@repoman.freebsd.org> <200606271127.13228.jhb@freebsd.org> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200606271351.43665.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Tue, 27 Jun 2006 14:35:58 -0400 (EDT) X-Virus-Scanned: ClamAV 0.87.1/1567/Tue Jun 27 12:42:11 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: kris@freebsd.org, Perforce Change Reviews , Kip Macy Subject: Re: PERFORCE change 100121 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, 27 Jun 2006 18:36:00 -0000 On Tuesday 27 June 2006 12:31, Kip Macy wrote: > Point me at your tree. I do :-). > > -Kip Heh. The tree is at //depot/user/jhb/lock/... I can also just generate a diff if you'd prefer. > On 6/27/06, John Baldwin wrote: > > On Tuesday 27 June 2006 03:42, Kip Macy wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=100121 > > > > > > Change 100121 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/27 > > 07:41:14 > > > > > > avoid pointless turnstile contention if mutex owner is running > > > > Yes, I did this already in jhb_lock for both mutexes and rwlocks at BSDCan. > > Kris said my patch panic'd for him at BSDCan but I don't have an SMP machine > > I can test it on now to debug it. :( > > > > > > > > Affected files ... > > > > > > .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#20 edit > > > > > > Differences ... > > > > > > ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#20 (text+ko) > > ==== > > > > > > @@ -176,7 +176,7 @@ > > > static int mutex_prof_maxrecords = MPROF_HASH_SIZE; > > > SYSCTL_INT(_debug_mutex_prof, OID_AUTO, maxrecords, CTLFLAG_RD, > > > &mutex_prof_maxrecords, 0, "Maximum number of profiling records"); > > > -int mutex_prof_rejected; > > > +int mutex_prof_rejected = 0; > > > SYSCTL_INT(_debug_mutex_prof, OID_AUTO, rejected, CTLFLAG_RD, > > > &mutex_prof_rejected, 0, "Number of rejected profiling records"); > > > static int mutex_prof_hashsize = MPROF_HASH_SIZE; > > > @@ -418,6 +418,16 @@ > > > > > > while (!_obtain_lock(m, tid)) { > > > lock_profile_obtain_lock_failed(&m->mtx_object, &contested); > > > +#if defined(SMP) && !defined(NO_ADAPTIVE_MUTEXES) > > > + /* > > > + * If the current owner of the lock is executing on another > > > + * CPU, spin instead of blocking. > > > + */ > > > + for (owner = mtx_owner(m); owner && TD_IS_RUNNING(owner); owner = > > mtx_owner(m)) > > > + cpu_spinwait(); > > > + if (mtx_unowned(m)) > > > + continue; > > > +#endif /* SMP && !NO_ADAPTIVE_MUTEXES */ > > > turnstile_lock(&m->mtx_object); > > > v = m->mtx_lock; > > > > > > @@ -425,7 +435,7 @@ > > > * Check if the lock has been released while spinning for > > > * the turnstile chain lock. > > > */ > > > - if (v == MTX_UNOWNED) { > > > + if (mtx_unowned(m)) { > > > turnstile_release(&m->mtx_object); > > > cpu_spinwait(); > > > continue; > > > @@ -837,6 +847,8 @@ > > > mtx_validate(m); > > > #endif > > > > > > + > > > + > > > /* Determine lock class and lock flags. */ > > > if (opts & MTX_SPIN) > > > class = &lock_class_mtx_spin; > > > > > > > -- > > John Baldwin > > > -- John Baldwin From owner-p4-projects@FreeBSD.ORG Tue Jun 27 18:40:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EFF816A409; Tue, 27 Jun 2006 18:40:13 +0000 (UTC) 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 E606016A407 for ; Tue, 27 Jun 2006 18:40:12 +0000 (UTC) (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 DB46E44F67 for ; Tue, 27 Jun 2006 18:40:02 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RIe2s3085591 for ; Tue, 27 Jun 2006 18:40:02 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RIe1B8085588 for perforce@freebsd.org; Tue, 27 Jun 2006 18:40:01 GMT (envelope-from jhb@freebsd.org) Date: Tue, 27 Jun 2006 18:40:01 GMT Message-Id: <200606271840.k5RIe1B8085588@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 100161 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, 27 Jun 2006 18:40:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=100161 Change 100161 by jhb@jhb_mutex on 2006/06/27 18:39:27 IFC @100159 - loopback. Affected files ... .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#10 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#10 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#10 integrate .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#14 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#25 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.h#16 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#14 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#12 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#11 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#11 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#11 integrate .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#15 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#28 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#27 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#28 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#32 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#37 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#30 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#10 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.15 2006/06/27 14:47:07 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.13 2006/06/27 14:46:30 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.16 2006/06/27 18:32:16 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.14 2006/06/27 18:28:49 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#10 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.15 2006/06/27 14:47:07 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.13 2006/06/27 14:46:30 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.16 2006/06/27 18:32:16 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.14 2006/06/27 18:28:49 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#10 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.15 2006/06/27 14:47:07 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.13 2006/06/27 14:46:30 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.16 2006/06/27 18:32:16 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.14 2006/06/27 18:28:49 jhb Exp */ #include @@ -137,7 +137,7 @@ { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */ { SYF_MPSAFE | AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */ - { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ + { SYF_MPSAFE | AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */ { SYF_MPSAFE | AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */ { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */ ==== //depot/projects/smpng/sys/amd64/linux32/syscalls.master#14 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.13 2006/06/27 14:46:30 jhb Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.14 2006/06/27 18:28:49 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/smpng/sys/compat/linux/linux_ipc.c#25 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.46 2006/03/19 11:10:33 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.47 2006/06/27 18:28:49 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/compat/linux/linux_util.h#16 (text+ko) ==== @@ -28,7 +28,7 @@ * * from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp * from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp - * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.27 2006/05/05 16:10:45 ambrisko Exp $ + * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.28 2006/06/27 18:30:49 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#14 (text+ko) ==== @@ -71,7 +71,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ipc.c,v 1.19 2005/09/28 07:03:02 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ipc.c,v 1.21 2006/06/27 18:31:36 jhb Exp $"); #include "opt_sysvipc.h" ==== //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#12 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.20 2006/06/26 18:37:36 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.21 2006/06/27 18:32:16 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.22 2006/06/27 18:31:36 jhb Exp */ #ifndef _SVR4_SYSPROTO_H_ ==== //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.18 2006/06/26 18:37:36 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.19 2006/06/27 18:32:16 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.22 2006/06/27 18:31:36 jhb Exp */ #define SVR4_SYS_exit 1 ==== //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.18 2006/06/26 18:37:36 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.19 2006/06/27 18:32:16 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.22 2006/06/27 18:31:36 jhb Exp */ const char *svr4_syscallnames[] = { ==== //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.19 2006/06/26 18:37:36 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.20 2006/06/27 18:32:16 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.22 2006/06/27 18:31:36 jhb Exp */ #include @@ -72,8 +72,8 @@ { SYF_MPSAFE | AS(svr4_sys_msgsys_args), (sy_call_t *)svr4_sys_msgsys, AUE_NULL }, /* 49 = svr4_sys_msgsys */ { SYF_MPSAFE | AS(svr4_sys_sysarch_args), (sy_call_t *)svr4_sys_sysarch, AUE_NULL }, /* 50 = svr4_sys_sysarch */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 51 = acct */ - { AS(svr4_sys_shmsys_args), (sy_call_t *)svr4_sys_shmsys, AUE_NULL }, /* 52 = svr4_sys_shmsys */ - { AS(svr4_sys_semsys_args), (sy_call_t *)svr4_sys_semsys, AUE_NULL }, /* 53 = svr4_sys_semsys */ + { SYF_MPSAFE | AS(svr4_sys_shmsys_args), (sy_call_t *)svr4_sys_shmsys, AUE_NULL }, /* 52 = svr4_sys_shmsys */ + { SYF_MPSAFE | AS(svr4_sys_semsys_args), (sy_call_t *)svr4_sys_semsys, AUE_NULL }, /* 53 = svr4_sys_semsys */ { AS(svr4_sys_ioctl_args), (sy_call_t *)svr4_sys_ioctl, AUE_NULL }, /* 54 = svr4_sys_ioctl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 55 = uadmin */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = exch */ ==== //depot/projects/smpng/sys/compat/svr4/syscalls.master#15 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp $ + $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.22 2006/06/27 18:31:36 jhb Exp $ ; from: @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; ; System call name/number master file (or rather, slave, from SVR4). ==== //depot/projects/smpng/sys/i386/linux/linux_proto.h#28 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.73 2006/06/27 14:47:08 jhb Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.70 2006/06/27 14:46:30 jhb Exp + * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.74 2006/06/27 18:32:16 jhb Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.71 2006/06/27 18:28:50 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/smpng/sys/i386/linux/linux_syscall.h#27 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.67 2006/06/27 14:47:08 jhb Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.70 2006/06/27 14:46:30 jhb Exp + * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.68 2006/06/27 18:32:16 jhb Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.71 2006/06/27 18:28:50 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/smpng/sys/i386/linux/linux_sysent.c#28 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.74 2006/06/27 14:47:08 jhb Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.70 2006/06/27 14:46:30 jhb Exp + * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.75 2006/06/27 18:32:16 jhb Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.71 2006/06/27 18:28:50 jhb Exp */ #include @@ -136,7 +136,7 @@ { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */ { SYF_MPSAFE | AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */ - { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ + { SYF_MPSAFE | AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */ { SYF_MPSAFE | AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */ { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */ ==== //depot/projects/smpng/sys/i386/linux/syscalls.master#32 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.70 2006/06/27 14:46:30 jhb Exp $ + $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.71 2006/06/27 18:28:50 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/smpng/sys/kern/sysv_sem.c#37 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sysv_sem.c,v 1.79 2006/06/10 14:34:07 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sysv_sem.c,v 1.80 2006/06/27 18:28:50 jhb Exp $"); #include "opt_sysvipc.h" #include "opt_mac.h" ==== //depot/projects/smpng/sys/sys/syscallsubr.h#30 (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/sys/syscallsubr.h,v 1.37 2006/06/13 21:28:18 jhb Exp $ + * $FreeBSD: src/sys/sys/syscallsubr.h,v 1.38 2006/06/27 18:28:50 jhb Exp $ */ #ifndef _SYS_SYSCALLSUBR_H_ From owner-p4-projects@FreeBSD.ORG Tue Jun 27 18:43:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43F8A16A649; Tue, 27 Jun 2006 18:43:12 +0000 (UTC) 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 05A8D16A5FD for ; Tue, 27 Jun 2006 18:43:12 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 559B444A3B for ; Tue, 27 Jun 2006 17:50:55 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RHotc0080449 for ; Tue, 27 Jun 2006 17:50:55 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RHotgv080446 for perforce@freebsd.org; Tue, 27 Jun 2006 17:50:55 GMT (envelope-from clem1@FreeBSD.org) Date: Tue, 27 Jun 2006 17:50:55 GMT Message-Id: <200606271750.k5RHotgv080446@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 100153 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, 27 Jun 2006 18:43:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=100153 Change 100153 by clem1@clem1_ipv6vulns on 2006/06/27 17:50:07 - ping6_of_death.c : ipv6 implementation of the ping6 of the death attack. KAME is not vulnerable. - tinyfragments6.c : ipv6 implementation of the tiny fragments. KAME seems to accept fragments with a fragmentable part of 40 bytes. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/ping6_of_death.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/tinyfragments6.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jun 27 18:45:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE49016A52E; Tue, 27 Jun 2006 18:45:09 +0000 (UTC) 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 99CD116A524 for ; Tue, 27 Jun 2006 18:45:09 +0000 (UTC) (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 4F0D643DC1 for ; Tue, 27 Jun 2006 18:45:09 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RIj9NR085840 for ; Tue, 27 Jun 2006 18:45:09 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RIj9bk085837 for perforce@freebsd.org; Tue, 27 Jun 2006 18:45:09 GMT (envelope-from jhb@freebsd.org) Date: Tue, 27 Jun 2006 18:45:09 GMT Message-Id: <200606271845.k5RIj9bk085837@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 100162 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, 27 Jun 2006 18:45:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=100162 Change 100162 by jhb@jhb_mutex on 2006/06/27 18:44:32 - Grab Giant around sysinit's as we don't know if they are all safe yet. - Actually remove Giant from the kernel linker (grrrr). Affected files ... .. //depot/projects/smpng/sys/kern/kern_linker.c#77 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_linker.c#77 (text+ko) ==== @@ -62,10 +62,13 @@ int kld_debug = 0; #endif -#define KLD_LOCK() do { sx_xlock(&kld_sx); mtx_lock(&Giant); } while (0) -#define KLD_UNLOCK() do { mtx_unlock(&Giant); sx_xunlock(&kld_sx); } while (0) +#define KLD_LOCK() sx_xlock(&kld_sx) +#define KLD_UNLOCK() sx_xunlock(&kld_sx) #define KLD_LOCKED() sx_xlocked(&kld_sx) -#define KLD_LOCK_ASSERT() do { if (!cold) sx_assert(&kld_sx, SX_XLOCKED); } while (0) +#define KLD_LOCK_ASSERT() do { \ + if (!cold) \ + sx_assert(&kld_sx, SX_XLOCKED); \ +} while (0) /* * static char *linker_search_path(const char *name, struct mod_depend @@ -212,6 +215,7 @@ * Traverse the (now) ordered list of system initialization tasks. * Perform each task, and continue on to the next task. */ + mtx_lock(&Giant); for (sipp = start; sipp < stop; sipp++) { if ((*sipp)->subsystem == SI_SUB_DUMMY) continue; /* skip dummy task(s) */ @@ -219,6 +223,7 @@ /* Call function */ (*((*sipp)->func)) ((*sipp)->udata); } + mtx_unlock(&Giant); } static void @@ -256,6 +261,7 @@ * Traverse the (now) ordered list of system initialization tasks. * Perform each task, and continue on to the next task. */ + mtx_lock(&Giant); for (sipp = start; sipp < stop; sipp++) { if ((*sipp)->subsystem == SI_SUB_DUMMY) continue; /* skip dummy task(s) */ @@ -263,6 +269,7 @@ /* Call function */ (*((*sipp)->func)) ((*sipp)->udata); } + mtx_unlock(&Giant); } static void From owner-p4-projects@FreeBSD.ORG Tue Jun 27 20:55:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8760216A40E; Tue, 27 Jun 2006 20:55:54 +0000 (UTC) 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 4554716A409 for ; Tue, 27 Jun 2006 20:55:54 +0000 (UTC) (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 F1F2545B31 for ; Tue, 27 Jun 2006 20:55:53 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RKtr1n004721 for ; Tue, 27 Jun 2006 20:55:53 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RKtrEL004718 for perforce@freebsd.org; Tue, 27 Jun 2006 20:55:53 GMT (envelope-from jhb@freebsd.org) Date: Tue, 27 Jun 2006 20:55:53 GMT Message-Id: <200606272055.k5RKtrEL004718@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 100171 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, 27 Jun 2006 20:55:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=100171 Change 100171 by jhb@jhb_mutex on 2006/06/27 20:55:43 Revert last. All the other places that do getdirentries() do things differently. It's going to be simpler to just add the VFS Giant locking I think. Affected files ... .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#108 edit .. //depot/projects/smpng/sys/sys/syscallsubr.h#32 edit Differences ... ==== //depot/projects/smpng/sys/kern/vfs_syscalls.c#108 (text+ko) ==== @@ -3563,67 +3563,144 @@ long *basep; } */ *uap; { + struct vnode *vp; + struct file *fp; + struct uio auio, kuio; + struct iovec aiov, kiov; struct dirent *dp, *edp; - char *dirbuf; - int error, readcnt, ufs_43; - long base; + caddr_t dirbuf; + int error, eofflag, readcnt, vfslocked; + long loff; /* XXX arbitrary sanity limit on `count'. */ if (uap->count > 64 * 1024) return (EINVAL); - - dirbuf = malloc(uap->count, M_TEMP, M_WAITOK); - error = kern_getdirentries(td, uap->fd, dirbuf, uap->count, &base, - UIO_SYSSPACE, &ufs_43); + if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) + return (error); + if ((fp->f_flag & FREAD) == 0) { + fdrop(fp, td); + return (EBADF); + } + vp = fp->f_vnode; +unionread: + vfslocked = VFS_LOCK_GIANT(vp->v_mount); + if (vp->v_type != VDIR) { + VFS_UNLOCK_GIANT(vfslocked); + fdrop(fp, td); + return (EINVAL); + } + aiov.iov_base = uap->buf; + aiov.iov_len = uap->count; + auio.uio_iov = &aiov; + auio.uio_iovcnt = 1; + auio.uio_rw = UIO_READ; + auio.uio_segflg = UIO_USERSPACE; + auio.uio_td = td; + auio.uio_resid = uap->count; + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + loff = auio.uio_offset = fp->f_offset; +#ifdef MAC + error = mac_check_vnode_readdir(td->td_ucred, vp); if (error) { - free(dirbuf, M_TEMP); + VOP_UNLOCK(vp, 0, td); + VFS_UNLOCK_GIANT(vfslocked); + fdrop(fp, td); return (error); } - - readcnt = td->td_retval[0]; +#endif # if (BYTE_ORDER != LITTLE_ENDIAN) - /* - * On big endian systems, we can return the contents from a 4.3 - * UFS without performing a fixup. - */ - if (!ufs_43) { -# else + if (vp->v_mount->mnt_maxsymlinklen <= 0) { + error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, + NULL, NULL); + fp->f_offset = auio.uio_offset; + } else +# endif { -# endif - edp = (struct dirent *)&dirbuf[readcnt]; - for (dp = (struct dirent *)dirbuf; dp < edp; ) { -# if (BYTE_ORDER == LITTLE_ENDIAN) - /* - * The expected low byte of - * dp->d_namlen is our dp->d_type. - * The high MBZ byte of dp->d_namlen - * is our dp->d_namlen. - */ - dp->d_type = dp->d_namlen; - dp->d_namlen = 0; -# else - /* - * The dp->d_type is the high byte - * of the expected dp->d_namlen, - * so must be zero'ed. - */ - dp->d_type = 0; -# endif - if (dp->d_reclen > 0) { - dp = (struct dirent *) - ((char *)dp + dp->d_reclen); - } else { - error = EIO; - break; + kuio = auio; + kuio.uio_iov = &kiov; + kuio.uio_segflg = UIO_SYSSPACE; + kiov.iov_len = uap->count; + MALLOC(dirbuf, caddr_t, uap->count, M_TEMP, M_WAITOK); + kiov.iov_base = dirbuf; + error = VOP_READDIR(vp, &kuio, fp->f_cred, &eofflag, + NULL, NULL); + fp->f_offset = kuio.uio_offset; + if (error == 0) { + readcnt = uap->count - kuio.uio_resid; + edp = (struct dirent *)&dirbuf[readcnt]; + for (dp = (struct dirent *)dirbuf; dp < edp; ) { +# if (BYTE_ORDER == LITTLE_ENDIAN) + /* + * The expected low byte of + * dp->d_namlen is our dp->d_type. + * The high MBZ byte of dp->d_namlen + * is our dp->d_namlen. + */ + dp->d_type = dp->d_namlen; + dp->d_namlen = 0; +# else + /* + * The dp->d_type is the high byte + * of the expected dp->d_namlen, + * so must be zero'ed. + */ + dp->d_type = 0; +# endif + if (dp->d_reclen > 0) { + dp = (struct dirent *) + ((char *)dp + dp->d_reclen); + } else { + error = EIO; + break; + } + } + if (dp >= edp) + error = uiomove(dirbuf, readcnt, &auio); + } + FREE(dirbuf, M_TEMP); + } + VOP_UNLOCK(vp, 0, td); + if (error) { + VFS_UNLOCK_GIANT(vfslocked); + fdrop(fp, td); + return (error); + } + if (uap->count == auio.uio_resid) { + if (union_dircheckp) { + error = union_dircheckp(td, &vp, fp); + if (error == -1) { + VFS_UNLOCK_GIANT(vfslocked); + goto unionread; + } + if (error) { + VFS_UNLOCK_GIANT(vfslocked); + fdrop(fp, td); + return (error); } } + /* + * XXX We could delay dropping the lock above but + * union_dircheckp complicates things. + */ + vn_lock(vp, LK_EXCLUSIVE|LK_RETRY, td); + if ((vp->v_vflag & VV_ROOT) && + (vp->v_mount->mnt_flag & MNT_UNION)) { + struct vnode *tvp = vp; + vp = vp->v_mount->mnt_vnodecovered; + VREF(vp); + fp->f_vnode = vp; + fp->f_data = vp; + fp->f_offset = 0; + vput(tvp); + VFS_UNLOCK_GIANT(vfslocked); + goto unionread; + } + VOP_UNLOCK(vp, 0, td); } - - if (error == 0) - error = copyout(dirbuf, uap->buf, readcnt); - free(dirbuf, M_TEMP); - if (error == 0) - error = copyout(&base, uap->basep, sizeof(long)); + VFS_UNLOCK_GIANT(vfslocked); + error = copyout(&loff, uap->basep, sizeof(long)); + fdrop(fp, td); + td->td_retval[0] = uap->count - auio.uio_resid; return (error); } #endif /* COMPAT_43 */ @@ -3649,20 +3726,6 @@ long *basep; } */ *uap; { - long base; - int error; - - error = kern_getdirentries(td, uap->fd, uap->buf, uap->count, &base, - UIO_USERSPACE, NULL); - if (error == 0 && uap->basep != NULL) - error = copyout(&base, uap->basep, sizeof(long)); - return (error); -} - -int -kern_getdirentries(struct thread *td, int fd, char *buf, u_int count, - long *basep, enum uio_seg bufseg, int *ufs_43) -{ struct vnode *vp; struct file *fp; struct uio auio; @@ -3671,38 +3734,28 @@ long loff; int error, eofflag; - AUDIT_ARG(fd, fd); - if ((error = getvnode(td->td_proc->p_fd, fd, &fp)) != 0) + AUDIT_ARG(fd, uap->fd); + if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); if ((fp->f_flag & FREAD) == 0) { fdrop(fp, td); return (EBADF); } vp = fp->f_vnode; -#ifdef COMPAT_43 - /* - * This is for ogetdirentries() as it returns the contents of a - * 4.3 UFS directly but has to massage the entries of a 4.4 UFS - * to 4.3 binaries. Can one even run any 4.3 binaries on any - * version of FreeBSD? - */ - if (ufs_43 != NULL) - *ufs_43 = vp->v_mount->mnt_maxsymlinklen <= 0; -#endif unionread: vfslocked = VFS_LOCK_GIANT(vp->v_mount); if (vp->v_type != VDIR) { error = EINVAL; goto fail; } - aiov.iov_base = buf; - aiov.iov_len = count; + aiov.iov_base = uap->buf; + aiov.iov_len = uap->count; auio.uio_iov = &aiov; auio.uio_iovcnt = 1; auio.uio_rw = UIO_READ; - auio.uio_segflg = bufseg; + auio.uio_segflg = UIO_USERSPACE; auio.uio_td = td; - auio.uio_resid = count; + auio.uio_resid = uap->count; /* vn_lock(vp, LK_SHARED | LK_RETRY, td); */ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); AUDIT_ARG(vnode, vp, ARG_VNODE1); @@ -3717,7 +3770,7 @@ VOP_UNLOCK(vp, 0, td); if (error) goto fail; - if (count == auio.uio_resid) { + if (uap->count == auio.uio_resid) { if (union_dircheckp) { error = union_dircheckp(td, &vp, fp); if (error == -1) { @@ -3746,9 +3799,10 @@ } VOP_UNLOCK(vp, 0, td); } - if (basep != NULL) - *basep = loff; - td->td_retval[0] = count - auio.uio_resid; + if (uap->basep != NULL) { + error = copyout(&loff, uap->basep, sizeof(long)); + } + td->td_retval[0] = uap->count - auio.uio_resid; fail: VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); @@ -3770,9 +3824,12 @@ u_int count; } */ *uap; { - - return (kern_getdirentries(td, uap->fd, uap->buf, uap->count, NULL, - UIO_USERSPACE, NULL)); + struct getdirentries_args ap; + ap.fd = uap->fd; + ap.buf = uap->buf; + ap.count = uap->count; + ap.basep = NULL; + return (getdirentries(td, &ap)); } /* ==== //depot/projects/smpng/sys/sys/syscallsubr.h#32 (text+ko) ==== @@ -79,8 +79,6 @@ int kern_fstatfs(struct thread *td, int fd, struct statfs *buf); int kern_futimes(struct thread *td, int fd, struct timeval *tptr, enum uio_seg tptrseg); -int kern_getdirentries(struct thread *td, int fd, char *buf, u_int count, - long *basep, enum uio_seg bufseg, int *ufs_43); int kern_getfsstat(struct thread *td, struct statfs **buf, size_t bufsize, enum uio_seg bufseg, int flags); int kern_getitimer(struct thread *, u_int, struct itimerval *); From owner-p4-projects@FreeBSD.ORG Tue Jun 27 20:56:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4704016AA1E; Tue, 27 Jun 2006 20:56:49 +0000 (UTC) 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 E395D16A64C for ; Tue, 27 Jun 2006 20:56:48 +0000 (UTC) (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 378E145236 for ; Tue, 27 Jun 2006 19:51:33 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RJpXk1092472 for ; Tue, 27 Jun 2006 19:51:33 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RJpWPr092469 for perforce@freebsd.org; Tue, 27 Jun 2006 19:51:32 GMT (envelope-from jhb@freebsd.org) Date: Tue, 27 Jun 2006 19:51:32 GMT Message-Id: <200606271951.k5RJpWPr092469@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 100167 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, 27 Jun 2006 20:56:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=100167 Change 100167 by jhb@jhb_mutex on 2006/06/27 19:50:52 Add a kern_getdirentries() and convert getdirentries(), getdents(), and ogetdirentries() to use it. ogetdirentries() is crufty and involved some mild pain. Affected files ... .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#107 edit .. //depot/projects/smpng/sys/sys/syscallsubr.h#31 edit Differences ... ==== //depot/projects/smpng/sys/kern/vfs_syscalls.c#107 (text+ko) ==== @@ -3563,144 +3563,67 @@ long *basep; } */ *uap; { - struct vnode *vp; - struct file *fp; - struct uio auio, kuio; - struct iovec aiov, kiov; struct dirent *dp, *edp; - caddr_t dirbuf; - int error, eofflag, readcnt, vfslocked; - long loff; + char *dirbuf; + int error, readcnt, ufs_43; + long base; /* XXX arbitrary sanity limit on `count'. */ if (uap->count > 64 * 1024) return (EINVAL); - if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) - return (error); - if ((fp->f_flag & FREAD) == 0) { - fdrop(fp, td); - return (EBADF); - } - vp = fp->f_vnode; -unionread: - vfslocked = VFS_LOCK_GIANT(vp->v_mount); - if (vp->v_type != VDIR) { - VFS_UNLOCK_GIANT(vfslocked); - fdrop(fp, td); - return (EINVAL); - } - aiov.iov_base = uap->buf; - aiov.iov_len = uap->count; - auio.uio_iov = &aiov; - auio.uio_iovcnt = 1; - auio.uio_rw = UIO_READ; - auio.uio_segflg = UIO_USERSPACE; - auio.uio_td = td; - auio.uio_resid = uap->count; - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - loff = auio.uio_offset = fp->f_offset; -#ifdef MAC - error = mac_check_vnode_readdir(td->td_ucred, vp); + + dirbuf = malloc(uap->count, M_TEMP, M_WAITOK); + error = kern_getdirentries(td, uap->fd, dirbuf, uap->count, &base, + UIO_SYSSPACE, &ufs_43); if (error) { - VOP_UNLOCK(vp, 0, td); - VFS_UNLOCK_GIANT(vfslocked); - fdrop(fp, td); + free(dirbuf, M_TEMP); return (error); } -#endif + + readcnt = td->td_retval[0]; # if (BYTE_ORDER != LITTLE_ENDIAN) - if (vp->v_mount->mnt_maxsymlinklen <= 0) { - error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, - NULL, NULL); - fp->f_offset = auio.uio_offset; - } else + /* + * On big endian systems, we can return the contents from a 4.3 + * UFS without performing a fixup. + */ + if (!ufs_43) { +# else + { # endif - { - kuio = auio; - kuio.uio_iov = &kiov; - kuio.uio_segflg = UIO_SYSSPACE; - kiov.iov_len = uap->count; - MALLOC(dirbuf, caddr_t, uap->count, M_TEMP, M_WAITOK); - kiov.iov_base = dirbuf; - error = VOP_READDIR(vp, &kuio, fp->f_cred, &eofflag, - NULL, NULL); - fp->f_offset = kuio.uio_offset; - if (error == 0) { - readcnt = uap->count - kuio.uio_resid; - edp = (struct dirent *)&dirbuf[readcnt]; - for (dp = (struct dirent *)dirbuf; dp < edp; ) { -# if (BYTE_ORDER == LITTLE_ENDIAN) - /* - * The expected low byte of - * dp->d_namlen is our dp->d_type. - * The high MBZ byte of dp->d_namlen - * is our dp->d_namlen. - */ - dp->d_type = dp->d_namlen; - dp->d_namlen = 0; -# else - /* - * The dp->d_type is the high byte - * of the expected dp->d_namlen, - * so must be zero'ed. - */ - dp->d_type = 0; -# endif - if (dp->d_reclen > 0) { - dp = (struct dirent *) - ((char *)dp + dp->d_reclen); - } else { - error = EIO; - break; - } + edp = (struct dirent *)&dirbuf[readcnt]; + for (dp = (struct dirent *)dirbuf; dp < edp; ) { +# if (BYTE_ORDER == LITTLE_ENDIAN) + /* + * The expected low byte of + * dp->d_namlen is our dp->d_type. + * The high MBZ byte of dp->d_namlen + * is our dp->d_namlen. + */ + dp->d_type = dp->d_namlen; + dp->d_namlen = 0; +# else + /* + * The dp->d_type is the high byte + * of the expected dp->d_namlen, + * so must be zero'ed. + */ + dp->d_type = 0; +# endif + if (dp->d_reclen > 0) { + dp = (struct dirent *) + ((char *)dp + dp->d_reclen); + } else { + error = EIO; + break; } - if (dp >= edp) - error = uiomove(dirbuf, readcnt, &auio); } - FREE(dirbuf, M_TEMP); } - VOP_UNLOCK(vp, 0, td); - if (error) { - VFS_UNLOCK_GIANT(vfslocked); - fdrop(fp, td); - return (error); - } - if (uap->count == auio.uio_resid) { - if (union_dircheckp) { - error = union_dircheckp(td, &vp, fp); - if (error == -1) { - VFS_UNLOCK_GIANT(vfslocked); - goto unionread; - } - if (error) { - VFS_UNLOCK_GIANT(vfslocked); - fdrop(fp, td); - return (error); - } - } - /* - * XXX We could delay dropping the lock above but - * union_dircheckp complicates things. - */ - vn_lock(vp, LK_EXCLUSIVE|LK_RETRY, td); - if ((vp->v_vflag & VV_ROOT) && - (vp->v_mount->mnt_flag & MNT_UNION)) { - struct vnode *tvp = vp; - vp = vp->v_mount->mnt_vnodecovered; - VREF(vp); - fp->f_vnode = vp; - fp->f_data = vp; - fp->f_offset = 0; - vput(tvp); - VFS_UNLOCK_GIANT(vfslocked); - goto unionread; - } - VOP_UNLOCK(vp, 0, td); - } - VFS_UNLOCK_GIANT(vfslocked); - error = copyout(&loff, uap->basep, sizeof(long)); - fdrop(fp, td); - td->td_retval[0] = uap->count - auio.uio_resid; + + if (error == 0) + error = copyout(dirbuf, uap->buf, readcnt); + free(dirbuf, M_TEMP); + if (error == 0) + error = copyout(&base, uap->basep, sizeof(long)); return (error); } #endif /* COMPAT_43 */ @@ -3726,6 +3649,20 @@ long *basep; } */ *uap; { + long base; + int error; + + error = kern_getdirentries(td, uap->fd, uap->buf, uap->count, &base, + UIO_USERSPACE, NULL); + if (error == 0 && uap->basep != NULL) + error = copyout(&base, uap->basep, sizeof(long)); + return (error); +} + +int +kern_getdirentries(struct thread *td, int fd, char *buf, u_int count, + long *basep, enum uio_seg bufseg, int *ufs_43) +{ struct vnode *vp; struct file *fp; struct uio auio; @@ -3734,28 +3671,38 @@ long loff; int error, eofflag; - AUDIT_ARG(fd, uap->fd); - if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) + AUDIT_ARG(fd, fd); + if ((error = getvnode(td->td_proc->p_fd, fd, &fp)) != 0) return (error); if ((fp->f_flag & FREAD) == 0) { fdrop(fp, td); return (EBADF); } vp = fp->f_vnode; +#ifdef COMPAT_43 + /* + * This is for ogetdirentries() as it returns the contents of a + * 4.3 UFS directly but has to massage the entries of a 4.4 UFS + * to 4.3 binaries. Can one even run any 4.3 binaries on any + * version of FreeBSD? + */ + if (ufs_43 != NULL) + *ufs_43 = vp->v_mount->mnt_maxsymlinklen <= 0; +#endif unionread: vfslocked = VFS_LOCK_GIANT(vp->v_mount); if (vp->v_type != VDIR) { error = EINVAL; goto fail; } - aiov.iov_base = uap->buf; - aiov.iov_len = uap->count; + aiov.iov_base = buf; + aiov.iov_len = count; auio.uio_iov = &aiov; auio.uio_iovcnt = 1; auio.uio_rw = UIO_READ; - auio.uio_segflg = UIO_USERSPACE; + auio.uio_segflg = bufseg; auio.uio_td = td; - auio.uio_resid = uap->count; + auio.uio_resid = count; /* vn_lock(vp, LK_SHARED | LK_RETRY, td); */ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); AUDIT_ARG(vnode, vp, ARG_VNODE1); @@ -3770,7 +3717,7 @@ VOP_UNLOCK(vp, 0, td); if (error) goto fail; - if (uap->count == auio.uio_resid) { + if (count == auio.uio_resid) { if (union_dircheckp) { error = union_dircheckp(td, &vp, fp); if (error == -1) { @@ -3799,10 +3746,9 @@ } VOP_UNLOCK(vp, 0, td); } - if (uap->basep != NULL) { - error = copyout(&loff, uap->basep, sizeof(long)); - } - td->td_retval[0] = uap->count - auio.uio_resid; + if (basep != NULL) + *basep = loff; + td->td_retval[0] = count - auio.uio_resid; fail: VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); @@ -3824,12 +3770,9 @@ u_int count; } */ *uap; { - struct getdirentries_args ap; - ap.fd = uap->fd; - ap.buf = uap->buf; - ap.count = uap->count; - ap.basep = NULL; - return (getdirentries(td, &ap)); + + return (kern_getdirentries(td, uap->fd, uap->buf, uap->count, NULL, + UIO_USERSPACE, NULL)); } /* ==== //depot/projects/smpng/sys/sys/syscallsubr.h#31 (text+ko) ==== @@ -79,6 +79,8 @@ int kern_fstatfs(struct thread *td, int fd, struct statfs *buf); int kern_futimes(struct thread *td, int fd, struct timeval *tptr, enum uio_seg tptrseg); +int kern_getdirentries(struct thread *td, int fd, char *buf, u_int count, + long *basep, enum uio_seg bufseg, int *ufs_43); int kern_getfsstat(struct thread *td, struct statfs **buf, size_t bufsize, enum uio_seg bufseg, int flags); int kern_getitimer(struct thread *, u_int, struct itimerval *); From owner-p4-projects@FreeBSD.ORG Tue Jun 27 20:58:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 367FF16A71F; Tue, 27 Jun 2006 20:58:01 +0000 (UTC) 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 EDC5D16A71B for ; Tue, 27 Jun 2006 20:58:00 +0000 (UTC) (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 399EF43E38 for ; Tue, 27 Jun 2006 20:57:58 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RKvu7Z004829 for ; Tue, 27 Jun 2006 20:57:56 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RKvudR004826 for perforce@freebsd.org; Tue, 27 Jun 2006 20:57:56 GMT (envelope-from jhb@freebsd.org) Date: Tue, 27 Jun 2006 20:57:56 GMT Message-Id: <200606272057.k5RKvudR004826@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 100172 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, 27 Jun 2006 20:58:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=100172 Change 100172 by jhb@jhb_mutex on 2006/06/27 20:56:57 Do cheap error checking sooner. Affected files ... .. //depot/projects/smpng/sys/compat/linux/linux_file.c#30 edit Differences ... ==== //depot/projects/smpng/sys/compat/linux/linux_file.c#30 (text+ko) ==== @@ -261,6 +261,16 @@ u_long *cookies = NULL, *cookiep; int ncookies, vfslocked; + nbytes = args->count; + if (nbytes == 1) { + /* readdir(2) case. Always struct dirent. */ + if (is64bit) + return (EINVAL); + nbytes = sizeof(linux_dirent); + justone = 1; + } else + justone = 0; + if ((error = getvnode(td->td_proc->p_fd, args->fd, &fp)) != 0) return (error); @@ -277,19 +287,6 @@ return (EINVAL); } - nbytes = args->count; - if (nbytes == 1) { - /* readdir(2) case. Always struct dirent. */ - if (is64bit) { - VFS_UNLOCK_GIANT(vfslocked); - fdrop(fp, td); - return (EINVAL); - } - nbytes = sizeof(linux_dirent); - justone = 1; - } else - justone = 0; - off = fp->f_offset; buflen = max(LINUX_DIRBLKSIZ, nbytes); From owner-p4-projects@FreeBSD.ORG Tue Jun 27 21:08:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F24816A40F; Tue, 27 Jun 2006 21:08:20 +0000 (UTC) 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 32E1A16A407 for ; Tue, 27 Jun 2006 21:08:20 +0000 (UTC) (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 1617D43E6F for ; Tue, 27 Jun 2006 21:08:10 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RL895V006495 for ; Tue, 27 Jun 2006 21:08:09 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RL89wd006492 for perforce@freebsd.org; Tue, 27 Jun 2006 21:08:09 GMT (envelope-from jhb@freebsd.org) Date: Tue, 27 Jun 2006 21:08:09 GMT Message-Id: <200606272108.k5RL89wd006492@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 100173 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, 27 Jun 2006 21:08:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=100173 Change 100173 by jhb@jhb_mutex on 2006/06/27 21:07:11 Add VFS Giant locking to svr4 getdents functions and mark MPSAFE. Affected files ... .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#48 edit .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#16 edit Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#48 (text+ko) ==== @@ -240,7 +240,7 @@ struct iovec aiov; off_t off; struct svr4_dirent64 svr4_dirent; - int buflen, error, eofflag, nbytes, justone; + int buflen, error, eofflag, nbytes, justone, vfslocked; u_long *cookies = NULL, *cookiep; int ncookies; @@ -256,8 +256,9 @@ } vp = fp->f_vnode; - + vfslocked = VFS_LOCK_GIANT(vp->v_mount); if (vp->v_type != VDIR) { + VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); return (EINVAL); } @@ -394,6 +395,7 @@ td->td_retval[0] = nbytes - resid; out: VOP_UNLOCK(vp, 0, td); + VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); if (cookies) free(cookies, M_TEMP); @@ -418,7 +420,7 @@ struct iovec aiov; struct svr4_dirent idb; off_t off; /* true file offset */ - int buflen, error, eofflag; + int buflen, error, eofflag, vfslocked; u_long *cookiebuf = NULL, *cookie; int ncookies = 0, *retval = td->td_retval; @@ -434,7 +436,9 @@ } vp = fp->f_vnode; + vfslocked = VFS_LOCK_GIANT(vp->v_mount); if (vp->v_type != VDIR) { + VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); return (EINVAL); } @@ -524,6 +528,7 @@ *retval = uap->nbytes - resid; out: VOP_UNLOCK(vp, 0, td); + VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); if (cookiebuf) free(cookiebuf, M_TEMP); ==== //depot/projects/smpng/sys/compat/svr4/syscalls.master#16 (text+ko) ==== @@ -136,7 +136,7 @@ 78 AUE_NULL UNIMPL rfsys 79 AUE_NULL MNOPROTO { int rmdir(char *path); } 80 AUE_NULL MNOPROTO { int mkdir(char *path, int mode); } -81 AUE_NULL STD { int svr4_sys_getdents(int fd, char *buf, \ +81 AUE_NULL MSTD { int svr4_sys_getdents(int fd, char *buf, \ int nbytes); } 82 AUE_NULL UNIMPL libattach 83 AUE_NULL UNIMPL libdetach @@ -325,7 +325,7 @@ 210 AUE_NULL UNIMPL signotifywait 211 AUE_NULL UNIMPL lwp_sigredirect 212 AUE_NULL UNIMPL lwp_alarm -213 AUE_NULL STD { int svr4_sys_getdents64(int fd, \ +213 AUE_NULL MSTD { int svr4_sys_getdents64(int fd, \ struct svr4_dirent64 *dp, int nbytes); } ;213 AUE_NULL UNIMPL getdents64 214 AUE_NULL MSTD { caddr_t svr4_sys_mmap64(void *addr, \ From owner-p4-projects@FreeBSD.ORG Tue Jun 27 21:39:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6443A16A407; Tue, 27 Jun 2006 21:39:50 +0000 (UTC) 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 2981A16A40B for ; Tue, 27 Jun 2006 21:39:50 +0000 (UTC) (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 E928E45745 for ; Tue, 27 Jun 2006 21:39:49 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RLdn8j007744 for ; Tue, 27 Jun 2006 21:39:49 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RLdnkG007741 for perforce@freebsd.org; Tue, 27 Jun 2006 21:39:49 GMT (envelope-from jhb@freebsd.org) Date: Tue, 27 Jun 2006 21:39:49 GMT Message-Id: <200606272139.k5RLdnkG007741@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 100175 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, 27 Jun 2006 21:39:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=100175 Change 100175 by jhb@jhb_mutex on 2006/06/27 21:39:30 Use kern_bind(). Affected files ... .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#28 edit Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#28 (text+ko) ==== @@ -989,8 +989,7 @@ struct svr4_strm *st = svr4_stream_get(fp); struct sockaddr_in sain; struct sockaddr_un saun; - caddr_t sg; - void *skp, *sup = NULL; + struct sockaddr *skp; int sasize; struct svr4_strmcmd bnd; struct bind_args ba; @@ -1017,7 +1016,7 @@ sasize = sizeof(sain); if (bnd.offs == 0) - goto reply; + goto error; netaddr_to_sockaddr_in(&sain, &bnd); @@ -1030,12 +1029,12 @@ skp = &saun; sasize = sizeof(saun); if (bnd.offs == 0) - goto reply; + goto error; netaddr_to_sockaddr_un(&saun, &bnd); if (saun.sun_path[0] == '\0') - goto reply; + goto error; DPRINTF(("TI_BIND: fam %d, path %s\n", saun.sun_family, saun.sun_path)); @@ -1052,29 +1051,20 @@ return ENOSYS; } - sg = stackgap_init(); - sup = stackgap_alloc(&sg, sasize); - - if ((error = copyout(skp, sup, sasize)) != 0) - return error; - - ba.s = fd; DPRINTF(("TI_BIND: fileno %d\n", fd)); - ba.name = (void *) sup; - ba.namelen = sasize; - if ((error = bind(td, &ba)) != 0) { + if ((error = kern_bind(td, fd, skp)) != 0) { DPRINTF(("TI_BIND: bind failed %d\n", error)); return error; } + goto reply; + +error: + memset(&bnd, 0, sizeof(bnd)); + bnd.len = sasize + 4; + bnd.offs = 0x10; /* XXX */ reply: - if (sup == NULL) { - memset(&bnd, 0, sizeof(bnd)); - bnd.len = sasize + 4; - bnd.offs = 0x10; /* XXX */ - } - bnd.cmd = SVR4_TI_BIND_REPLY; if ((error = copyout(&bnd, ioc->buf, ioc->len)) != 0) From owner-p4-projects@FreeBSD.ORG Wed Jun 28 00:35:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8423016A412; Wed, 28 Jun 2006 00:35:34 +0000 (UTC) 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 600F316A411 for ; Wed, 28 Jun 2006 00:35:34 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8137043D46 for ; Wed, 28 Jun 2006 00:35:29 +0000 (GMT) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5S0ZSOD019332 for ; Wed, 28 Jun 2006 00:35:28 GMT (envelope-from adamartin@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5S0ZSBa019329 for perforce@freebsd.org; Wed, 28 Jun 2006 00:35:28 GMT (envelope-from adamartin@FreeBSD.org) Date: Wed, 28 Jun 2006 00:35:28 GMT Message-Id: <200606280035.k5S0ZSBa019329@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adamartin@FreeBSD.org using -f From: Adam Martin To: Perforce Change Reviews Cc: Subject: PERFORCE change 100178 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, 28 Jun 2006 00:35:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=100178 Change 100178 by adamartin@adamartin_tethys on 2006/06/28 00:34:54 Initial checkin of AutoFS protocol header, to give everyone an idea of where I want to head with this. Affected files ... .. //depot/projects/soc2006/adamartin_autofs/AutoFS-Proposal/protocol_datatypes.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 28 00:44:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F6CB16A416; Wed, 28 Jun 2006 00:44:47 +0000 (UTC) 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 47D8916A408 for ; Wed, 28 Jun 2006 00:44:47 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 478DC43D86 for ; Wed, 28 Jun 2006 00:44:41 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5S0ifpM019859 for ; Wed, 28 Jun 2006 00:44:41 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5S0iea1019856 for perforce@freebsd.org; Wed, 28 Jun 2006 00:44:40 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 28 Jun 2006 00:44:40 GMT Message-Id: <200606280044.k5S0iea1019856@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100179 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, 28 Jun 2006 00:44:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=100179 Change 100179 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/28 00:44:36 my token of defiance against the most foul, kludgeish artifact in the entire kernel, the lockmgr - remove the LK_INTERNAL flag as the serialization provided by the interlock is not meaningful for those already holding the lock Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_lock.c#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/buf.h#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/lockmgr.h#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_lock.c#4 (text+ko) ==== @@ -174,11 +174,6 @@ } #endif - if (flags & LK_INTERLOCK) { - mtx_assert(interlkp, MA_OWNED | MA_NOTRECURSED); - mtx_unlock(interlkp); - } - if ((flags & (LK_NOWAIT|LK_RELEASE)) == 0) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &lkp->lk_interlock->mtx_object, @@ -468,33 +463,6 @@ return 0; } -/* - * Transfer any waiting processes from one lock to another. - */ -void -transferlockers(from, to) - struct lock *from; - struct lock *to; -{ - - KASSERT(from != to, ("lock transfer to self")); - KASSERT((from->lk_flags&LK_WAITDRAIN) == 0, ("transfer draining lock")); - - mtx_lock(from->lk_interlock); - if (from->lk_waitcount == 0) { - mtx_unlock(from->lk_interlock); - return; - } - from->lk_newlock = to; - wakeup((void *)from); - msleep(&from->lk_newlock, from->lk_interlock, from->lk_prio, - "lkxfer", 0); - from->lk_newlock = NULL; - from->lk_flags &= ~(LK_WANT_EXCL | LK_WANT_UPGRADE); - KASSERT(from->lk_waitcount == 0, ("active lock")); - mtx_unlock(from->lk_interlock); -} - /* * Initialize a lock; required before use. ==== //depot/projects/kmacy_sun4v/src/sys/sys/buf.h#4 (text+ko) ==== @@ -273,8 +273,10 @@ int s, ret; s = splbio(); - mtx_lock(bp->b_lock.lk_interlock); - locktype |= LK_INTERNAL; + /* XXX having the mutex didn't really remove the race for wmesg change + * as there may still be other sleeping on the lock even when the interlock + * mutex is held + */ bp->b_lock.lk_wmesg = buf_wmesg; bp->b_lock.lk_prio = PRIBIO + 4; ret = lockmgr(&(bp)->b_lock, locktype, interlock, curthread); @@ -293,8 +295,11 @@ int s, ret; s = splbio(); - mtx_lock(bp->b_lock.lk_interlock); - locktype |= LK_INTERNAL | LK_TIMELOCK; + /* XXX having the mutex didn't really remove the race for wmesg change + * as there may still be other sleeping on the lock even when the interlock + * mutex is held + */ + locktype |= LK_TIMELOCK; bp->b_lock.lk_wmesg = wmesg; bp->b_lock.lk_prio = (PRIBIO + 4) | catch; bp->b_lock.lk_timo = timo; ==== //depot/projects/kmacy_sun4v/src/sys/sys/lockmgr.h#4 (text+ko) ==== @@ -141,7 +141,7 @@ #define LK_HAVE_EXCL 0x00040000 /* exclusive lock obtained */ #define LK_WAITDRAIN 0x00080000 /* process waiting for lock to drain */ #define LK_DRAINING 0x00100000 /* lock is being drained */ -#define LK_INTERNAL 0x00200000/* The internal lock is already held */ +/*#define LK_INTERNAL 0x00200000 The internal lock is already held */ /* * Internal state flags corresponding to lk_sharecount, and lk_waitcount */ From owner-p4-projects@FreeBSD.ORG Wed Jun 28 01:10:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5ED0016A50A; Wed, 28 Jun 2006 01:10:23 +0000 (UTC) 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 383A316A4CA for ; Wed, 28 Jun 2006 01:10:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C13FA43DD9 for ; Wed, 28 Jun 2006 01:09:11 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5S19BUA029841 for ; Wed, 28 Jun 2006 01:09:11 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5S19B5Y029838 for perforce@freebsd.org; Wed, 28 Jun 2006 01:09:11 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 28 Jun 2006 01:09:11 GMT Message-Id: <200606280109.k5S19B5Y029838@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100180 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, 28 Jun 2006 01:10:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=100180 Change 100180 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/28 01:08:31 Whoops! Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_lock.c#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_lock.c#5 (text+ko) ==== @@ -160,8 +160,8 @@ thr = td; lock_profile_waitstart(&waitstart); - if ((flags & LK_INTERNAL) == 0) - mtx_lock(lkp->lk_interlock); + mtx_lock(lkp->lk_interlock); + CTR6(KTR_LOCK, "lockmgr(): lkp == %p (lk_wmesg == \"%s\"), owner == %p, exclusivecount == %d, flags == 0x%x, " "td == %p", lkp, lkp->lk_wmesg, lkp->lk_lockholder, @@ -174,6 +174,10 @@ } #endif + if (flags & LK_INTERLOCK) { + mtx_assert(interlkp, MA_OWNED | MA_NOTRECURSED); + mtx_unlock(interlkp); + } if ((flags & (LK_NOWAIT|LK_RELEASE)) == 0) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &lkp->lk_interlock->mtx_object, From owner-p4-projects@FreeBSD.ORG Wed Jun 28 03:36:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42F7516A505; Wed, 28 Jun 2006 03:36:10 +0000 (UTC) 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 1A8CF16A4DF for ; Wed, 28 Jun 2006 03:36:10 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B84644830 for ; Wed, 28 Jun 2006 03:11:44 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5S3Bi7t037334 for ; Wed, 28 Jun 2006 03:11:44 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5S3Bhia037331 for perforce@freebsd.org; Wed, 28 Jun 2006 03:11:43 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 28 Jun 2006 03:11:43 GMT Message-Id: <200606280311.k5S3Bhia037331@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100181 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, 28 Jun 2006 03:36:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=100181 Change 100181 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/28 03:11:09 Check-in copy of kern_sx.c as basis for lockmgr replacement Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_sxu.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 28 03:37:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CFE216A4A7; Wed, 28 Jun 2006 03:37:18 +0000 (UTC) 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 D73B016A414 for ; Wed, 28 Jun 2006 03:37:17 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A50543D48 for ; Wed, 28 Jun 2006 03:37:17 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5S3bH2X038510 for ; Wed, 28 Jun 2006 03:37:17 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5S3bHh3038507 for perforce@freebsd.org; Wed, 28 Jun 2006 03:37:17 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 28 Jun 2006 03:37:17 GMT Message-Id: <200606280337.k5S3bHh3038507@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100182 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, 28 Jun 2006 03:37:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=100182 Change 100182 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/28 03:36:26 add timeout functionality to sxu locks and sxu.h header as a base Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_sxu.c#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/sxu.h#1 add Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_sxu.c#2 (text+ko) ==== @@ -110,13 +110,16 @@ lock_destroy(&sx->sx_object); } -void -_sx_slock(struct sx *sx, const char *file, int line) +int +_sx_slock(struct sx *sx, int timo, const char *file, int line) { - int contested; - uint64_t waittime = 0; - + int contested, error; + uint64_t waittime; + + waittime = 0; + error = 0; + mtx_lock(sx->sx_lock); KASSERT(sx->sx_xholder != curthread, ("%s (%s): slock while xlock is held @ %s:%d\n", __func__, @@ -131,8 +134,13 @@ while (sx->sx_cnt < 0) { sx->sx_shrd_wcnt++; lock_profile_obtain_lock_failed(&sx->sx_object, &contested); - cv_wait(&sx->sx_shrd_cv, sx->sx_lock); + if (timo) + error = cv_timedwait(&sx->sx_shrd_cv, sx->sx_lock, timo); + else + cv_wait(&sx->sx_shrd_cv, sx->sx_lock); sx->sx_shrd_wcnt--; + if (error) + goto fail; } @@ -145,7 +153,9 @@ LOCK_LOG_LOCK("SLOCK", &sx->sx_object, 0, 0, file, line); WITNESS_LOCK(&sx->sx_object, 0, file, line); + fail: mtx_unlock(sx->sx_lock); + return (error); } int @@ -166,12 +176,15 @@ } } -void -_sx_xlock(struct sx *sx, const char *file, int line) +int +_sx_xlock(struct sx *sx, int timo, const char *file, int line) { - int contested; - uint64_t waittime = 0; + int contested, error; + uint64_t waittime; + + error = 0; + waittime= 0; mtx_lock(sx->sx_lock); @@ -194,8 +207,14 @@ while (sx->sx_cnt != 0) { sx->sx_excl_wcnt++; lock_profile_obtain_lock_failed(&sx->sx_object, &contested); - cv_wait(&sx->sx_excl_cv, sx->sx_lock); + if (timo) + error = cv_timedwait(&sx->sx_excl_cv, sx->sx_lock, timo); + else + cv_wait(&sx->sx_excl_cv, sx->sx_lock); sx->sx_excl_wcnt--; + + if (error) + goto fail; } MPASS(sx->sx_cnt == 0); @@ -208,7 +227,9 @@ LOCK_LOG_LOCK("XLOCK", &sx->sx_object, 0, 0, file, line); WITNESS_LOCK(&sx->sx_object, LOP_EXCLUSIVE, file, line); + fail: mtx_unlock(sx->sx_lock); + return (error); } int @@ -255,7 +276,7 @@ if (sx->sx_excl_wcnt > 0) { if (sx->sx_cnt == 0) cv_signal(&sx->sx_excl_cv); - } else if (sx->sx_shrd_wcnt > 0) + } else if (sx->sx_shrd_wcnt > 0) /* XXX why would shrd_wcnt be > 0 if the holder is shared? */ cv_broadcast(&sx->sx_shrd_cv); LOCK_LOG_LOCK("SUNLOCK", &sx->sx_object, 0, 0, file, line); From owner-p4-projects@FreeBSD.ORG Wed Jun 28 03:54:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A0DF16A413; Wed, 28 Jun 2006 03:54:44 +0000 (UTC) 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 244AA16A40F for ; Wed, 28 Jun 2006 03:54:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB3CC43D77 for ; Wed, 28 Jun 2006 03:54:39 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5S3sdjg039394 for ; Wed, 28 Jun 2006 03:54:39 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5S3sdtZ039391 for perforce@freebsd.org; Wed, 28 Jun 2006 03:54:39 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 28 Jun 2006 03:54:39 GMT Message-Id: <200606280354.k5S3sdtZ039391@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100183 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, 28 Jun 2006 03:54:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=100183 Change 100183 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/28 03:54:19 rename sx to sxu add condition variable for drain waiter Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_sxu.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/sxu.h#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_sxu.c#3 (text+ko) ==== @@ -54,11 +54,11 @@ #include #ifdef DDB -static void db_show_sx(struct lock_object *lock); +static void db_show_sxu(struct lock_object *lock); #endif -struct lock_class lock_class_sx = { - "sx", +struct lock_class lock_class_sxu = { + "sxu", LC_SLEEPLOCK | LC_SLEEPABLE | LC_RECURSABLE | LC_UPGRADABLE, #ifdef DDB db_show_sx @@ -66,52 +66,52 @@ }; #ifndef INVARIANTS -#define _sx_assert(sx, what, file, line) +#define _sxu_assert(sx, what, file, line) #endif void -sx_sysinit(void *arg) +sxu_sysinit(void *arg) { - struct sx_args *sargs = arg; + struct sxu_args *sargs = arg; - sx_init(sargs->sa_sx, sargs->sa_desc); + sxu_init(sargs->sa_sxu, sargs->sa_desc); } void -sx_init(struct sx *sx, const char *description) +sxu_init(struct sxu *sx, const char *description) { - sx->sx_lock = mtx_pool_find(mtxpool_lockbuilder, sx); - sx->sx_cnt = 0; - cv_init(&sx->sx_shrd_cv, description); - sx->sx_shrd_wcnt = 0; - cv_init(&sx->sx_excl_cv, description); - sx->sx_excl_wcnt = 0; - sx->sx_xholder = NULL; + sx->sxu_lock = mtx_pool_find(mtxpool_lockbuilder, sx); + sx->sxu_cnt = 0; + cv_init(&sx->sxu_shrd_cv, description); + sx->sxu_shrd_wcnt = 0; + cv_init(&sx->sxu_excl_cv, description); + sx->sxu_excl_wcnt = 0; + sx->sxu_xholder = NULL; - lock_profile_init(&sx->sx_object, description); - lock_init(&sx->sx_object, &lock_class_sx, description, NULL, + lock_profile_init(&sx->sxu_object, description); + lock_init(&sx->sxu_object, &lock_class_sxu, description, NULL, LO_WITNESS | LO_RECURSABLE | LO_SLEEPABLE | LO_UPGRADABLE); } void -sx_destroy(struct sx *sx) +sxu_destroy(struct sxu *sx) { - KASSERT((sx->sx_cnt == 0 && sx->sx_shrd_wcnt == 0 && sx->sx_excl_wcnt == + KASSERT((sx->sxu_cnt == 0 && sx->sxu_shrd_wcnt == 0 && sx->sxu_excl_wcnt == 0), ("%s (%s): holders or waiters\n", __func__, - sx->sx_object.lo_name)); + sx->sxu_object.lo_name)); - sx->sx_lock = NULL; - cv_destroy(&sx->sx_shrd_cv); - cv_destroy(&sx->sx_excl_cv); + sx->sxu_lock = NULL; + cv_destroy(&sx->sxu_shrd_cv); + cv_destroy(&sx->sxu_excl_cv); - lock_profile_destroy(&sx->sx_object); - lock_destroy(&sx->sx_object); + lock_profile_destroy(&sx->sxu_object); + lock_destroy(&sx->sxu_object); } int -_sx_slock(struct sx *sx, int timo, const char *file, int line) +_sxu_slock(struct sxu *sx, int timo, const char *file, int line) { int contested, error; @@ -120,64 +120,64 @@ waittime = 0; error = 0; - mtx_lock(sx->sx_lock); - KASSERT(sx->sx_xholder != curthread, + mtx_lock(sx->sxu_lock); + KASSERT(sx->sxu_xholder != curthread, ("%s (%s): slock while xlock is held @ %s:%d\n", __func__, - sx->sx_object.lo_name, file, line)); - WITNESS_CHECKORDER(&sx->sx_object, LOP_NEWORDER, file, line); + sx->sxu_object.lo_name, file, line)); + WITNESS_CHECKORDER(&sx->sxu_object, LOP_NEWORDER, file, line); /* * Loop in case we lose the race for lock acquisition. */ - if (sx->sx_cnt < 0) + if (sx->sxu_cnt < 0) lock_profile_waitstart(&waittime); - while (sx->sx_cnt < 0) { - sx->sx_shrd_wcnt++; - lock_profile_obtain_lock_failed(&sx->sx_object, &contested); + while (sx->sxu_cnt < 0) { + sx->sxu_shrd_wcnt++; + lock_profile_obtain_lock_failed(&sx->sxu_object, &contested); if (timo) - error = cv_timedwait(&sx->sx_shrd_cv, sx->sx_lock, timo); + error = cv_timedwait(&sx->sxu_shrd_cv, sx->sxu_lock, timo); else - cv_wait(&sx->sx_shrd_cv, sx->sx_lock); - sx->sx_shrd_wcnt--; + cv_wait(&sx->sxu_shrd_cv, sx->sxu_lock); + sx->sxu_shrd_wcnt--; if (error) goto fail; } /* Acquire a shared lock. */ - sx->sx_cnt++; + sx->sxu_cnt++; - if (sx->sx_cnt == 1) - lock_profile_obtain_lock_success(&sx->sx_object, waittime, file, line); + if (sx->sxu_cnt == 1) + lock_profile_obtain_lock_success(&sx->sxu_object, waittime, file, line); - LOCK_LOG_LOCK("SLOCK", &sx->sx_object, 0, 0, file, line); - WITNESS_LOCK(&sx->sx_object, 0, file, line); + LOCK_LOG_LOCK("SLOCK", &sx->sxu_object, 0, 0, file, line); + WITNESS_LOCK(&sx->sxu_object, 0, file, line); fail: - mtx_unlock(sx->sx_lock); + mtx_unlock(sx->sxu_lock); return (error); } int -_sx_try_slock(struct sx *sx, const char *file, int line) +_sxu_try_slock(struct sxu *sx, const char *file, int line) { - mtx_lock(sx->sx_lock); - if (sx->sx_cnt >= 0) { - sx->sx_cnt++; - LOCK_LOG_TRY("SLOCK", &sx->sx_object, 0, 1, file, line); - WITNESS_LOCK(&sx->sx_object, LOP_TRYLOCK, file, line); - mtx_unlock(sx->sx_lock); + mtx_lock(sx->sxu_lock); + if (sx->sxu_cnt >= 0) { + sx->sxu_cnt++; + LOCK_LOG_TRY("SLOCK", &sx->sxu_object, 0, 1, file, line); + WITNESS_LOCK(&sx->sxu_object, LOP_TRYLOCK, file, line); + mtx_unlock(sx->sxu_lock); return (1); } else { - LOCK_LOG_TRY("SLOCK", &sx->sx_object, 0, 0, file, line); - mtx_unlock(sx->sx_lock); + LOCK_LOG_TRY("SLOCK", &sx->sxu_object, 0, 0, file, line); + mtx_unlock(sx->sxu_lock); return (0); } } int -_sx_xlock(struct sx *sx, int timo, const char *file, int line) +_sxu_xlock(struct sxu *sx, int timo, const char *file, int line) { int contested, error; @@ -186,7 +186,7 @@ error = 0; waittime= 0; - mtx_lock(sx->sx_lock); + mtx_lock(sx->sxu_lock); /* * With sx locks, we're absolutely not permitted to recurse on @@ -195,74 +195,74 @@ * xlock while in here, we consider it API abuse and put it under * INVARIANTS. */ - KASSERT(sx->sx_xholder != curthread, + KASSERT(sx->sxu_xholder != curthread, ("%s (%s): xlock already held @ %s:%d", __func__, - sx->sx_object.lo_name, file, line)); - WITNESS_CHECKORDER(&sx->sx_object, LOP_NEWORDER | LOP_EXCLUSIVE, file, + sx->sxu_object.lo_name, file, line)); + WITNESS_CHECKORDER(&sx->sxu_object, LOP_NEWORDER | LOP_EXCLUSIVE, file, line); /* Loop in case we lose the race for lock acquisition. */ - if (sx->sx_cnt) + if (sx->sxu_cnt) lock_profile_waitstart(&waittime); - while (sx->sx_cnt != 0) { - sx->sx_excl_wcnt++; - lock_profile_obtain_lock_failed(&sx->sx_object, &contested); + while (sx->sxu_cnt != 0) { + sx->sxu_excl_wcnt++; + lock_profile_obtain_lock_failed(&sx->sxu_object, &contested); if (timo) - error = cv_timedwait(&sx->sx_excl_cv, sx->sx_lock, timo); + error = cv_timedwait(&sx->sxu_excl_cv, sx->sxu_lock, timo); else - cv_wait(&sx->sx_excl_cv, sx->sx_lock); - sx->sx_excl_wcnt--; + cv_wait(&sx->sxu_excl_cv, sx->sxu_lock); + sx->sxu_excl_wcnt--; if (error) goto fail; } - MPASS(sx->sx_cnt == 0); + MPASS(sx->sxu_cnt == 0); /* Acquire an exclusive lock. */ - sx->sx_cnt--; - sx->sx_xholder = curthread; + sx->sxu_cnt--; + sx->sxu_xholder = curthread; - lock_profile_obtain_lock_success(&sx->sx_object, waittime, file, line); - LOCK_LOG_LOCK("XLOCK", &sx->sx_object, 0, 0, file, line); - WITNESS_LOCK(&sx->sx_object, LOP_EXCLUSIVE, file, line); + lock_profile_obtain_lock_success(&sx->sxu_object, waittime, file, line); + LOCK_LOG_LOCK("XLOCK", &sx->sxu_object, 0, 0, file, line); + WITNESS_LOCK(&sx->sxu_object, LOP_EXCLUSIVE, file, line); fail: - mtx_unlock(sx->sx_lock); + mtx_unlock(sx->sxu_lock); return (error); } int -_sx_try_xlock(struct sx *sx, const char *file, int line) +_sxu_try_xlock(struct sxu *sx, const char *file, int line) { - mtx_lock(sx->sx_lock); - if (sx->sx_cnt == 0) { - sx->sx_cnt--; - sx->sx_xholder = curthread; - LOCK_LOG_TRY("XLOCK", &sx->sx_object, 0, 1, file, line); - WITNESS_LOCK(&sx->sx_object, LOP_EXCLUSIVE | LOP_TRYLOCK, file, + mtx_lock(sx->sxu_lock); + if (sx->sxu_cnt == 0) { + sx->sxu_cnt--; + sx->sxu_xholder = curthread; + LOCK_LOG_TRY("XLOCK", &sx->sxu_object, 0, 1, file, line); + WITNESS_LOCK(&sx->sxu_object, LOP_EXCLUSIVE | LOP_TRYLOCK, file, line); - mtx_unlock(sx->sx_lock); + mtx_unlock(sx->sxu_lock); return (1); } else { - LOCK_LOG_TRY("XLOCK", &sx->sx_object, 0, 0, file, line); - mtx_unlock(sx->sx_lock); + LOCK_LOG_TRY("XLOCK", &sx->sxu_object, 0, 0, file, line); + mtx_unlock(sx->sxu_lock); return (0); } } void -_sx_sunlock(struct sx *sx, const char *file, int line) +_sxu_sunlock(struct sxu *sx, const char *file, int line) { - _sx_assert(sx, SX_SLOCKED, file, line); - mtx_lock(sx->sx_lock); + _sxu_assert(sx, SXU_SLOCKED, file, line); + mtx_lock(sx->sxu_lock); - WITNESS_UNLOCK(&sx->sx_object, 0, file, line); + WITNESS_UNLOCK(&sx->sxu_object, 0, file, line); /* Release. */ - sx->sx_cnt--; + sx->sxu_cnt--; /* * If we just released the last shared lock, wake any waiters up, giving @@ -270,143 +270,143 @@ * lockers won't be blocked forever, don't wake shared lock waiters if * there are exclusive lock waiters. */ - if (sx->sx_cnt == 0) - lock_profile_release_lock(&sx->sx_object); + if (sx->sxu_cnt == 0) + lock_profile_release_lock(&sx->sxu_object); - if (sx->sx_excl_wcnt > 0) { - if (sx->sx_cnt == 0) - cv_signal(&sx->sx_excl_cv); - } else if (sx->sx_shrd_wcnt > 0) /* XXX why would shrd_wcnt be > 0 if the holder is shared? */ - cv_broadcast(&sx->sx_shrd_cv); + if (sx->sxu_excl_wcnt > 0) { + if (sx->sxu_cnt == 0) + cv_signal(&sx->sxu_excl_cv); + } else if (sx->sxu_shrd_wcnt > 0) /* XXX why would shrd_wcnt be > 0 if the holder is shared? */ + cv_broadcast(&sx->sxu_shrd_cv); - LOCK_LOG_LOCK("SUNLOCK", &sx->sx_object, 0, 0, file, line); + LOCK_LOG_LOCK("SUNLOCK", &sx->sxu_object, 0, 0, file, line); - mtx_unlock(sx->sx_lock); + mtx_unlock(sx->sxu_lock); } void -_sx_xunlock(struct sx *sx, const char *file, int line) +_sxu_xunlock(struct sxu *sx, const char *file, int line) { - _sx_assert(sx, SX_XLOCKED, file, line); - mtx_lock(sx->sx_lock); - MPASS(sx->sx_cnt == -1); + _sxu_assert(sx, SXU_XLOCKED, file, line); + mtx_lock(sx->sxu_lock); + MPASS(sx->sxu_cnt == -1); - WITNESS_UNLOCK(&sx->sx_object, LOP_EXCLUSIVE, file, line); + WITNESS_UNLOCK(&sx->sxu_object, LOP_EXCLUSIVE, file, line); /* Release. */ - sx->sx_cnt++; - sx->sx_xholder = NULL; + sx->sxu_cnt++; + sx->sxu_xholder = NULL; - lock_profile_release_lock(&sx->sx_object); + lock_profile_release_lock(&sx->sxu_object); /* * Wake up waiters if there are any. Give precedence to slock waiters. */ - if (sx->sx_shrd_wcnt > 0) - cv_broadcast(&sx->sx_shrd_cv); - else if (sx->sx_excl_wcnt > 0) - cv_signal(&sx->sx_excl_cv); + if (sx->sxu_shrd_wcnt > 0) + cv_broadcast(&sx->sxu_shrd_cv); + else if (sx->sxu_excl_wcnt > 0) + cv_signal(&sx->sxu_excl_cv); - LOCK_LOG_LOCK("XUNLOCK", &sx->sx_object, 0, 0, file, line); + LOCK_LOG_LOCK("XUNLOCK", &sx->sxu_object, 0, 0, file, line); - mtx_unlock(sx->sx_lock); + mtx_unlock(sx->sxu_lock); } int -_sx_try_upgrade(struct sx *sx, const char *file, int line) +_sxu_try_upgrade(struct sxu *sx, const char *file, int line) { - _sx_assert(sx, SX_SLOCKED, file, line); - mtx_lock(sx->sx_lock); + _sxu_assert(sx, SXU_SLOCKED, file, line); + mtx_lock(sx->sxu_lock); - if (sx->sx_cnt == 1) { - sx->sx_cnt = -1; - sx->sx_xholder = curthread; + if (sx->sxu_cnt == 1) { + sx->sxu_cnt = -1; + sx->sxu_xholder = curthread; - LOCK_LOG_TRY("XUPGRADE", &sx->sx_object, 0, 1, file, line); - WITNESS_UPGRADE(&sx->sx_object, LOP_EXCLUSIVE | LOP_TRYLOCK, + LOCK_LOG_TRY("XUPGRADE", &sx->sxu_object, 0, 1, file, line); + WITNESS_UPGRADE(&sx->sxu_object, LOP_EXCLUSIVE | LOP_TRYLOCK, file, line); - mtx_unlock(sx->sx_lock); + mtx_unlock(sx->sxu_lock); return (1); } else { - LOCK_LOG_TRY("XUPGRADE", &sx->sx_object, 0, 0, file, line); - mtx_unlock(sx->sx_lock); + LOCK_LOG_TRY("XUPGRADE", &sx->sxu_object, 0, 0, file, line); + mtx_unlock(sx->sxu_lock); return (0); } } void -_sx_downgrade(struct sx *sx, const char *file, int line) +_sxu_downgrade(struct sxu *sx, const char *file, int line) { - _sx_assert(sx, SX_XLOCKED, file, line); - mtx_lock(sx->sx_lock); - MPASS(sx->sx_cnt == -1); + _sxu_assert(sx, SXU_XLOCKED, file, line); + mtx_lock(sx->sxu_lock); + MPASS(sx->sxu_cnt == -1); - WITNESS_DOWNGRADE(&sx->sx_object, 0, file, line); + WITNESS_DOWNGRADE(&sx->sxu_object, 0, file, line); - sx->sx_cnt = 1; - sx->sx_xholder = NULL; - if (sx->sx_shrd_wcnt > 0) - cv_broadcast(&sx->sx_shrd_cv); + sx->sxu_cnt = 1; + sx->sxu_xholder = NULL; + if (sx->sxu_shrd_wcnt > 0) + cv_broadcast(&sx->sxu_shrd_cv); - LOCK_LOG_LOCK("XDOWNGRADE", &sx->sx_object, 0, 0, file, line); + LOCK_LOG_LOCK("XDOWNGRADE", &sx->sxu_object, 0, 0, file, line); - mtx_unlock(sx->sx_lock); + mtx_unlock(sx->sxu_lock); } #ifdef INVARIANT_SUPPORT #ifndef INVARIANTS -#undef _sx_assert +#undef _sxu_assert #endif /* - * In the non-WITNESS case, sx_assert() can only detect that at least + * In the non-WITNESS case, sxu_assert() can only detect that at least * *some* thread owns an slock, but it cannot guarantee that *this* * thread owns an slock. */ void -_sx_assert(struct sx *sx, int what, const char *file, int line) +_sxu_assert(struct sxu *sx, int what, const char *file, int line) { if (panicstr != NULL) return; switch (what) { - case SX_LOCKED: - case SX_SLOCKED: + case SXU_LOCKED: + case SXU_SLOCKED: #ifdef WITNESS - witness_assert(&sx->sx_object, what, file, line); + witness_assert(&sx->sxu_object, what, file, line); #else - mtx_lock(sx->sx_lock); - if (sx->sx_cnt <= 0 && - (what == SX_SLOCKED || sx->sx_xholder != curthread)) + mtx_lock(sx->sxu_lock); + if (sx->sxu_cnt <= 0 && + (what == SXU_SLOCKED || sx->sxu_xholder != curthread)) panic("Lock %s not %slocked @ %s:%d\n", - sx->sx_object.lo_name, (what == SX_SLOCKED) ? + sx->sxu_object.lo_name, (what == SXU_SLOCKED) ? "share " : "", file, line); - mtx_unlock(sx->sx_lock); + mtx_unlock(sx->sxu_lock); #endif break; - case SX_XLOCKED: - mtx_lock(sx->sx_lock); - if (sx->sx_xholder != curthread) + case SXU_XLOCKED: + mtx_lock(sx->sxu_lock); + if (sx->sxu_xholder != curthread) panic("Lock %s not exclusively locked @ %s:%d\n", - sx->sx_object.lo_name, file, line); - mtx_unlock(sx->sx_lock); + sx->sxu_object.lo_name, file, line); + mtx_unlock(sx->sxu_lock); break; - case SX_UNLOCKED: + case SXU_UNLOCKED: #ifdef WITNESS - witness_assert(&sx->sx_object, what, file, line); + witness_assert(&sx->sxu_object, what, file, line); #else /* * We are able to check only exclusive lock here, * we cannot assert that *this* thread owns slock. */ - mtx_lock(sx->sx_lock); - if (sx->sx_xholder == curthread) + mtx_lock(sx->sxu_lock); + if (sx->sxu_xholder == curthread) panic("Lock %s exclusively locked @ %s:%d\n", - sx->sx_object.lo_name, file, line); - mtx_unlock(sx->sx_lock); + sx->sxu_object.lo_name, file, line); + mtx_unlock(sx->sxu_lock); #endif break; default: @@ -418,23 +418,23 @@ #ifdef DDB void -db_show_sx(struct lock_object *lock) +db_show_sxu(struct lock_object *lock) { struct thread *td; - struct sx *sx; + struct sxu *sx; - sx = (struct sx *)lock; + sx = (struct sxu *)lock; db_printf(" state: "); - if (sx->sx_cnt < 0) { - td = sx->sx_xholder; + if (sx->sxu_cnt < 0) { + td = sx->sxu_xholder; db_printf("XLOCK: %p (tid %d, pid %d, \"%s\")\n", td, td->td_tid, td->td_proc->p_pid, td->td_proc->p_comm); - } else if (sx->sx_cnt > 0) - db_printf("SLOCK: %d locks\n", sx->sx_cnt); + } else if (sx->sxu_cnt > 0) + db_printf("SLOCK: %d locks\n", sx->sxu_cnt); else db_printf("UNLOCKED\n"); - db_printf(" waiters: %d shared, %d exclusive\n", sx->sx_shrd_wcnt, - sx->sx_excl_wcnt); + db_printf(" waiters: %d shared, %d exclusive\n", sx->sxu_shrd_wcnt, + sx->sxu_excl_wcnt); } #endif ==== //depot/projects/kmacy_sun4v/src/sys/sys/sxu.h#2 (text+ko) ==== @@ -34,35 +34,36 @@ #include #include /* XXX */ -struct sx { - struct lock_object sx_object; /* Common lock properties. */ - struct mtx *sx_lock; /* General protection lock. */ - int sx_cnt; /* -1: xlock, > 0: slock count. */ - struct cv sx_shrd_cv; /* slock waiters. */ - int sx_shrd_wcnt; /* Number of slock waiters. */ - struct cv sx_excl_cv; /* xlock waiters. */ - int sx_excl_wcnt; /* Number of xlock waiters. */ - struct thread *sx_xholder; /* Thread presently holding xlock. */ +struct sxu { + struct lock_object sxu_object; /* Common lock properties. */ + struct mtx *sxu_lock; /* General protection lock. */ + int sxu_cnt; /* -1: xlock, > 0: slock count. */ + struct cv sxu_shrd_cv; /* slock waiters. */ + int sxu_shrd_wcnt; /* Number of slock waiters. */ + struct cv sxu_excl_cv; /* xlock waiters. */ + int sxu_excl_wcnt; /* Number of xlock waiters. */ + struct thread *sxu_xholder; /* Thread presently holding xlock. */ + struct cv sxu_drain_cv; /* drain waiter. */ }; #ifdef _KERNEL -void sx_sysinit(void *arg); -void sx_init(struct sx *sx, const char *description); -void sx_destroy(struct sx *sx); -void _sx_slock(struct sx *sx, const char *file, int line); -void _sx_xlock(struct sx *sx, const char *file, int line); -int _sx_try_slock(struct sx *sx, const char *file, int line); -int _sx_try_xlock(struct sx *sx, const char *file, int line); -void _sx_sunlock(struct sx *sx, const char *file, int line); -void _sx_xunlock(struct sx *sx, const char *file, int line); -int _sx_try_upgrade(struct sx *sx, const char *file, int line); -void _sx_downgrade(struct sx *sx, const char *file, int line); +void sxu_sysinit(void *arg); +void sxu_init(struct sxu *sx, const char *description); +void sxu_destroy(struct sxu *sx); +void _sxu_slock(struct sxu *sx, int timo, const char *file, int line); +void _sxu_xlock(struct sxu *sx, int timo, const char *file, int line); +int _sxu_try_slock(struct sxu *sx, const char *file, int line); +int _sxu_try_xlock(struct sxu *sx, const char *file, int line); +void _sxu_sunlock(struct sxu *sx, const char *file, int line); +void _sxu_xunlock(struct sxu *sx, const char *file, int line); +int _sxu_try_upgrade(struct sxu *sx, const char *file, int line); +void _sxu_downgrade(struct sxu *sx, const char *file, int line); #ifdef INVARIANT_SUPPORT -void _sx_assert(struct sx *sx, int what, const char *file, int line); +void _sxu_assert(struct sxu *sxu, int what, const char *file, int line); #endif struct sx_args { - struct sx *sa_sx; + struct sxu *sa_sxu; const char *sa_desc; }; @@ -71,24 +72,26 @@ (sxa), \ (desc) \ }; \ - SYSINIT(name##_sx_sysinit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \ - sx_sysinit, &name##_args); \ - SYSUNINIT(name##_sx_sysuninit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \ - sx_destroy, (sxa)) + SYSINIT(name##_sxu_sysinit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \ + sxu_sysinit, &name##_args); \ + SYSUNINIT(name##_sxu_sysuninit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \ + sxu_destroy, (sxa)) -#define sx_slock(sx) _sx_slock((sx), LOCK_FILE, LOCK_LINE) -#define sx_xlock(sx) _sx_xlock((sx), LOCK_FILE, LOCK_LINE) -#define sx_try_slock(sx) _sx_try_slock((sx), LOCK_FILE, LOCK_LINE) -#define sx_try_xlock(sx) _sx_try_xlock((sx), LOCK_FILE, LOCK_LINE) -#define sx_sunlock(sx) _sx_sunlock((sx), LOCK_FILE, LOCK_LINE) -#define sx_xunlock(sx) _sx_xunlock((sx), LOCK_FILE, LOCK_LINE) -#define sx_try_upgrade(sx) _sx_try_upgrade((sx), LOCK_FILE, LOCK_LINE) -#define sx_downgrade(sx) _sx_downgrade((sx), LOCK_FILE, LOCK_LINE) -#define sx_unlock(sx) do { \ +#define sxu_slock(sx) _sxu_slock((sx), (0), LOCK_FILE, LOCK_LINE) +#define sxu_xlock(sx) _sxu_xlock((sx), (0), LOCK_FILE, LOCK_LINE) +#define sxu_slock_timedwait(sx, timo) _sxu_slock((sx), (timo), LOCK_FILE, LOCK_LINE) +#define sxu_xlock_timedwait(sx, timo) _sxu_xlock((sx), (timo), LOCK_FILE, LOCK_LINE) +#define sxu_try_slock(sx) _sxu_try_slock((sx), LOCK_FILE, LOCK_LINE) +#define sxu_try_xlock(sx) _sxu_try_xlock((sx), LOCK_FILE, LOCK_LINE) +#define sxu_sunlock(sx) _sxu_sunlock((sx), LOCK_FILE, LOCK_LINE) +#define sxu_xunlock(sx) _sxu_xunlock((sx), LOCK_FILE, LOCK_LINE) +#define sxu_try_upgrade(sx) _sxu_try_upgrade((sx), LOCK_FILE, LOCK_LINE) +#define sxu_downgrade(sx) _sxu_downgrade((sx), LOCK_FILE, LOCK_LINE) +#define sxu_unlock(sx) do { \ if ((sx)->sx_cnt < 0) \ - sx_xunlock(sx); \ + sxu_xunlock(sx); \ else \ - sx_sunlock(sx); \ + sxu_sunlock(sx); \ } while (0) #if defined(INVARIANTS) || defined(INVARIANT_SUPPORT) @@ -99,11 +102,11 @@ #endif #ifdef INVARIANTS -#define sx_assert(sx, what) _sx_assert((sx), (what), LOCK_FILE, LOCK_LINE) +#define sxu_assert(sx, what) _sxu_assert((sx), (what), LOCK_FILE, LOCK_LINE) #else -#define sx_assert(sx, what) +#define sxu_assert(sx, what) #endif #endif /* _KERNEL */ -#endif /* !_SYS_SX_H_ */ +#endif /* !_SYS_SXU_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jun 28 04:17:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 80D3116A407 for ; Wed, 28 Jun 2006 04:17:23 +0000 (UTC) (envelope-from streamsendbouncer@me21507.mailengine1.com) Received: from me21507.mailengine1.com (me21507.mailengine1.com [66.59.24.112]) by mx1.FreeBSD.org (Postfix) with ESMTP id D836D43D7E for ; Wed, 28 Jun 2006 04:17:16 +0000 (GMT) (envelope-from streamsendbouncer@me21507.mailengine1.com) Received: by me21507.mailengine1.com (PowerMTA(TM) v3.0r29) id hk83u80anbgu for ; Tue, 27 Jun 2006 21:38:01 -0700 (envelope-from ) MIME-Version: 1.0 X-Mailer: StreamSend X-Streamsendid: 3326+5+511603+4+me21507.mailengine1.com Date: Tue, 27 Jun 2006 21:12:26 -0700 From: "CISSE" To: p4-projects@freebsd.org Message-Id: <20060628041716.D836D43D7E@mx1.FreeBSD.org> Content-Type: text/plain Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Subject: CISSE 2006 -- The Second International Joint Conferences on Computer, Information, and Systems Sciences, and Engineering 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, 28 Jun 2006 04:17:23 -0000 Dear Colleagues, If you received this email in error, please forward it to the appropriate department at your institution. If you wish to unsubscribe please follow the unsubscribe link at bottom of the email. Please do not reply to this message. If you need to contact us please email us at info@cisse2006.org ********************************************************************* * The Second International Joint Conferences on Computer, * * Information, and Systems Sciences, and Engineering (CISSE 2006) * * * * * * * * http://www.cisse2006.org * * * * * * * ********************************************************************* December 4-14, 2006 Technically Co-Sponsored by: Institute of Electrical & Electronics Engineers (IEEE); University of Bridgeport --------------------------------------------------------------------- CONFERENCE OVERVIEW --------------------------------------------------------------------- CISSE 2006 provides a virtual forum for presentation and discussion of the state-of the-art research on computers, information and systems sciences and engineering. CISSE 2006 is the second conference of the CISSE series of e-conferences. CISSE 2005 was the World's first Engineering/Computing and Systems Research E-Conference. CISSE 2005 was the first high-caliber Research Conference in the world to be completely conducted online in real-time via the internet. The CISSE 2006 virtual conference will be conducted through the Internet using web-conferencing tools, made available by the conference. Authors will be presenting their PowerPoint, audio or video presentations using web-conferencing tools without the need for travel. Conference sessions will be broadcast to all the conference participants, where session participants can interact with the presenter during the presentation and (or) during the Q&A slot that follows the presentation. This international conference will be held entirely on-line. The accepted and presented papers will be made available after the conference both on a CD and as a book publication. CISSE's publisher for the book proceedings is Springer. Conference participants - authors, presenters and attendees - only need an internet connection and sound available on their computers in order to be able to contribute and participate in this international ground-breaking conference. The on-line structure of this high-quality event will allow academic professionals and industry participants to contribute work and attend world-class technical presentations based on rigorously refereed submissions, live, without the need for investing significant travel funds or time out of the office. Potential non-author conference attendees who cannot make the on-line conference dates are encouraged to register, as the entire joint conferences will be archived for future viewing. CISSE 2005 received 255 research paper submissions and the final program included 140 accepted papers, from more than 45 countries. The concept and format of CISSE 2005 were very exciting and ground-breaking. The PowerPoint presentations, final paper manuscripts and time schedule for live presentations over the web had been available for 3 weeks prior to the start of the conference for all registrants, so they could choose the presentations they want to attend and think about questions that they might want to ask. The live audio presentations were also recorded and were part of the permanent CISSE archive, which also included all power point presentations and papers. The CISSE conference audio room provided superb audio even over low speed internet connections, the ability to display PowerPoint presentations, and cross-platform compatibility (the conferencing software runs on Windows, Mac, and any other operating system that supports Java). In addition, the conferencing system allowed for an unlimited number of participants, which in turn granted us the opportunity to allow all CISSE participants to attend all presentations, as opposed to limiting the number of available seats for each session. CISSE 2006 is composed of the following four conferences: International Conference on Industrial Electronics, Technology & Automation (IETA 06) Topics: Advanced and Distributed Control Systems, Intelligent Control Systems (NN, FL, GA, .etc), Expert Systems, Man Machine Interaction, Data Fusion, Factory Automation, Robotics, Motion Control, Machine Vision, MEMS Sensors and Actuators, Sensors Fusion, Power Electronics, High Frequency Converters, Motors and Drives, Power Converters, Power Devices and Components, Electric Vehicles and Intelligent Transportation, Process Automation, Factory Communication, Manufacturing Information System Advances in Manufacturing Systems, Industrial Applications of Multi Media, Intelligent Systems Instrumentation, Industrial Instrumentation, Modeling and Simulation, Signal Processing, Image and Data Processing, VR and Parallel systems.. International Conference on Telecommunications and Networking (TeNe 06) Topics: Optical Networks and Switching, Computer Networks, Network architectures and Equipment, Access Technologies, Telecommunication Technology, Coding and Modulation technique, Modeling and Simulation, Spread Spectrum and CDMA Systems, OFDM technology, Space-time Coding, Ultra Wideband Communications, Medium Access Control, Spread Spectrum, Wireless LAN: IEEE 802.11, HIPERLAN, Bluetooth, Cellular Wireless Networks, Cordless Systems and Wireless Local Loop, Mobile Network Layer, Mobile Transport Layer, Support for Mobility, Conventional Encryption and Message Confidentiality, Block Ciphers Design Principles, Block Ciphers Modes of Operation, Public-Key Cryptography and Message Authentication, Authentication Application, Stenography, Electronic Mail Security, Web Security, IP Security, Firewalls, Computer Forensics. International Conference on Systems, Computing Sciences and Software Engineering (SCS2 06) Topics: Grid Computing, Internet-based Computing Models, Resource Discovery, Programming Models and tools, e-Science and Virtual Instrumentation, Biometric Authentication, Computers for People of Special Needs, Human Computer Interaction, Information and Knowledge Engineering, Algorithms, Parallel and Distributed processing, Modeling and Simulation, Services and Applications, Embedded Systems and Applications, Databases, Programming Languages, Signal Processing Theory and Methods, Signal Processing for Communication, Signal Processing Architectures and Implementation, Information Processing, Geographical Information Systems,Object Based Software Engineering, Parallel and Distributed Computing, Real Time Systems, Multiprocessing, File Systems and I/O, Kernel and OS Structures. International Conference on Engineering Education, Instructional Technology, Assessment, and E-learning (EIAE 06) Topics: Instructional Design, Accreditation, Curriculum Design, Educational Tools, 2-2-2 Platforms, Teaching Capstone Design, Teaching Design at the Lower Levels, Design and Development of e-Learning tools, Assessment Methods in Engineering, Development and Implementation of E-learning tools, Economical and Social Impacts of E-learning. Paper Submission ================= Prospective authors are invited to submit full papers electronically in Microsoft Word format through the website of the conference at http://www.cisse2006.org. Accepted papers must be presented in the virtual conference by one of the authors. To submit your paper, visit http://www.cisse2006.org. Paper submission Deadline: October 13th, 2006 Notification of Acceptance: November 7th, 2006 Final Manuscript and Registration: November 24th, 2006 Click here on http://server1.streamsend.com/streamsend/unsubscribe.php?md=4&cd=3326&ud=1a837b6a9f3592909bae3f1e53174ce1 to update your profile or Unsubscribe From owner-p4-projects@FreeBSD.ORG Wed Jun 28 04:45:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75B5316A408; Wed, 28 Jun 2006 04:45:45 +0000 (UTC) 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 9C11A16A400 for ; Wed, 28 Jun 2006 04:45:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44C3544624 for ; Wed, 28 Jun 2006 04:45:44 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5S4jiS0042732 for ; Wed, 28 Jun 2006 04:45:44 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5S4jhjT042729 for perforce@freebsd.org; Wed, 28 Jun 2006 04:45:43 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 28 Jun 2006 04:45:43 GMT Message-Id: <200606280445.k5S4jhjT042729@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100185 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, 28 Jun 2006 04:45:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=100185 Change 100185 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/28 04:44:46 add support for LK_DRAIN semantics Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_sxu.c#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/sxu.h#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_sxu.c#4 (text+ko) ==== @@ -110,6 +110,30 @@ lock_destroy(&sx->sxu_object); } + +void +_sxu_drain(struct sxu *sx, struct cv *cv_drain, const char *file, int line) +{ + mtx_lock(sx->sxu_lock); + KASSERT(sx->sxu_drain_cvp == NULL, ("sxu lock already being drained")); + KASSERT(sx->sx->sxu_xholder != curthread ("sxu draining against myself")); + WITNESS_CHECKORDER(&sx->sxu_object, LOP_NEWORDER, file, line); + + sx->sxu_drain_cvp = cv_drain; + cv_wait(cv_drain, sx->sxu_lock); + + + /* Acquire an exclusive lock. */ + sx->sxu_cnt--; + sx->sxu_xholder = curthread; + sx->sxu_drain_cvp = NULL; + + LOCK_LOG_LOCK("SLOCK", &sx->sxu_object, 0, 0, file, line); + WITNESS_LOCK(&sx->sxu_object, 0, file, line); + mtx_unlock(sx->sxu_lock); +} + + int _sxu_slock(struct sxu *sx, int timo, const char *file, int line) { @@ -132,8 +156,8 @@ if (sx->sxu_cnt < 0) lock_profile_waitstart(&waittime); while (sx->sxu_cnt < 0) { + lock_profile_obtain_lock_failed(&sx->sxu_object, &contested); sx->sxu_shrd_wcnt++; - lock_profile_obtain_lock_failed(&sx->sxu_object, &contested); if (timo) error = cv_timedwait(&sx->sxu_shrd_cv, sx->sxu_lock, timo); else @@ -273,11 +297,13 @@ if (sx->sxu_cnt == 0) lock_profile_release_lock(&sx->sxu_object); - if (sx->sxu_excl_wcnt > 0) { - if (sx->sxu_cnt == 0) - cv_signal(&sx->sxu_excl_cv); - } else if (sx->sxu_shrd_wcnt > 0) /* XXX why would shrd_wcnt be > 0 if the holder is shared? */ + + if (sx->sxu_excl_wcnt > 0 && sx->sxu_cnt == 0) + cv_signal(&sx->sxu_excl_cv); + else if (sx->sxu_shrd_wcnt > 0) /* XXX why would shrd_wcnt be > 0 if the holder is shared? */ cv_broadcast(&sx->sxu_shrd_cv); + else if (sx->sxu_drain_cvp && (sx->sx_cnt == 0)) + cv_signal(sx->sxu_drain_cvp); LOCK_LOG_LOCK("SUNLOCK", &sx->sxu_object, 0, 0, file, line); @@ -306,9 +332,10 @@ cv_broadcast(&sx->sxu_shrd_cv); else if (sx->sxu_excl_wcnt > 0) cv_signal(&sx->sxu_excl_cv); + else if (sx->sxu_drain_cvp) + cv_signal(sx->sxu_drain_cvp); LOCK_LOG_LOCK("XUNLOCK", &sx->sxu_object, 0, 0, file, line); - mtx_unlock(sx->sxu_lock); } ==== //depot/projects/kmacy_sun4v/src/sys/sys/sxu.h#3 (text+ko) ==== @@ -43,7 +43,7 @@ struct cv sxu_excl_cv; /* xlock waiters. */ int sxu_excl_wcnt; /* Number of xlock waiters. */ struct thread *sxu_xholder; /* Thread presently holding xlock. */ - struct cv sxu_drain_cv; /* drain waiter. */ + struct cv *sxu_drain_cvp; /* pointer to drain waiter (if any). */ }; #ifdef _KERNEL @@ -58,6 +58,8 @@ void _sxu_xunlock(struct sxu *sx, const char *file, int line); int _sxu_try_upgrade(struct sxu *sx, const char *file, int line); void _sxu_downgrade(struct sxu *sx, const char *file, int line); +void _sxu_drain(struct sxu *sx, struct cv *cv_drain, const char *file, int line); + #ifdef INVARIANT_SUPPORT void _sxu_assert(struct sxu *sxu, int what, const char *file, int line); #endif @@ -87,6 +89,8 @@ #define sxu_xunlock(sx) _sxu_xunlock((sx), LOCK_FILE, LOCK_LINE) #define sxu_try_upgrade(sx) _sxu_try_upgrade((sx), LOCK_FILE, LOCK_LINE) #define sxu_downgrade(sx) _sxu_downgrade((sx), LOCK_FILE, LOCK_LINE) +#define sxu_drain(sx, cv) _sxu_drain((sx), (cv), LOCK_FILE, LOCK_LINE) + #define sxu_unlock(sx) do { \ if ((sx)->sx_cnt < 0) \ sxu_xunlock(sx); \ From owner-p4-projects@FreeBSD.ORG Wed Jun 28 06:12:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A32816A40E; Wed, 28 Jun 2006 06:12:34 +0000 (UTC) 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 EEF7C16A407 for ; Wed, 28 Jun 2006 06:12:33 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66A6B447C8 for ; Wed, 28 Jun 2006 06:12:33 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5S6CXSo060934 for ; Wed, 28 Jun 2006 06:12:33 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5S6CWch060931 for perforce@freebsd.org; Wed, 28 Jun 2006 06:12:32 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 28 Jun 2006 06:12:32 GMT Message-Id: <200606280612.k5S6CWch060931@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100186 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, 28 Jun 2006 06:12:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=100186 Change 100186 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/28 06:11:51 add LK_INTERLOCK and LK_CANRECURSE semantics - finally earning the name SX but Uglier Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_sxu.c#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sys/sxu.h#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_sxu.c#5 (text+ko) ==== @@ -135,7 +135,7 @@ int -_sxu_slock(struct sxu *sx, int timo, const char *file, int line) +_sxu_slock(struct sxu *sx, int timo, struct mtx *interlkp, const char *file, int line) { int contested, error; @@ -145,6 +145,10 @@ error = 0; mtx_lock(sx->sxu_lock); + if (interlkp) { + mxt_assert(m, MA_OWNED); + mtx_unlock(m); + } KASSERT(sx->sxu_xholder != curthread, ("%s (%s): slock while xlock is held @ %s:%d\n", __func__, sx->sxu_object.lo_name, file, line)); @@ -183,25 +187,30 @@ } int -_sxu_try_slock(struct sxu *sx, const char *file, int line) +_sxu_try_slock(struct sxu *sx, struct mtx *interlkp, const char *file, int line) { - + int error; mtx_lock(sx->sxu_lock); + if (interlkp) { + mxt_assert(interlkp, MA_OWNED); + mtx_unlock(interlkp); + } if (sx->sxu_cnt >= 0) { sx->sxu_cnt++; LOCK_LOG_TRY("SLOCK", &sx->sxu_object, 0, 1, file, line); WITNESS_LOCK(&sx->sxu_object, LOP_TRYLOCK, file, line); - mtx_unlock(sx->sxu_lock); - return (1); + error = 1; + } else { LOCK_LOG_TRY("SLOCK", &sx->sxu_object, 0, 0, file, line); - mtx_unlock(sx->sxu_lock); - return (0); + error = 0; } + mtx_unlock(sx->sxu_lock); + return (error); } int -_sxu_xlock(struct sxu *sx, int timo, const char *file, int line) +_sxu_xlock(struct sxu *sx, int timo, struct mtx *interlkp, int canrecurse, const char *file, int line) { int contested, error; @@ -211,7 +220,10 @@ waittime= 0; mtx_lock(sx->sxu_lock); - + if (interlkp) { + mxt_assert(interlkp, MA_OWNED); + mtx_unlock(interlkp); + } /* * With sx locks, we're absolutely not permitted to recurse on * xlocks, as it is fatal (deadlock). Normally, recursion is handled @@ -219,15 +231,20 @@ * xlock while in here, we consider it API abuse and put it under * INVARIANTS. */ - KASSERT(sx->sxu_xholder != curthread, - ("%s (%s): xlock already held @ %s:%d", __func__, - sx->sxu_object.lo_name, file, line)); + if (!canrecurse) { + KASSERT(sx->sxu_xholder != curthread, + ("%s (%s): xlock already held @ %s:%d", __func__, + sx->sxu_object.lo_name, file, line)); + + } else if (canrecurse && sx->sxu_xholder == curthread) { + sx->sxu_cnt--; + goto done; + } WITNESS_CHECKORDER(&sx->sxu_object, LOP_NEWORDER | LOP_EXCLUSIVE, file, - line); + line); + /* Loop in case we lose the race for lock acquisition. */ - /* Loop in case we lose the race for lock acquisition. */ - if (sx->sxu_cnt) - lock_profile_waitstart(&waittime); + lock_profile_waitstart(&waittime); while (sx->sxu_cnt != 0) { sx->sxu_excl_wcnt++; lock_profile_obtain_lock_failed(&sx->sxu_object, &contested); @@ -238,7 +255,7 @@ sx->sxu_excl_wcnt--; if (error) - goto fail; + goto done; } MPASS(sx->sxu_cnt == 0); @@ -251,29 +268,38 @@ LOCK_LOG_LOCK("XLOCK", &sx->sxu_object, 0, 0, file, line); WITNESS_LOCK(&sx->sxu_object, LOP_EXCLUSIVE, file, line); - fail: + done: mtx_unlock(sx->sxu_lock); return (error); } int -_sxu_try_xlock(struct sxu *sx, const char *file, int line) +_sxu_try_xlock(struct sxu *sx, struct mtx *interlkp, int canrecurse, const char *file, int line) { + int error; mtx_lock(sx->sxu_lock); - if (sx->sxu_cnt == 0) { + if (interlkp) { + mxt_assert(interlkp, MA_OWNED); + mtx_unlock(interlkp); + } + KASSERT((sx->sxu_cnt >= 0) || canrecurse, ("recursing on non-recursable lock")); + if (sx->sxu_cnt <= 0) { sx->sxu_cnt--; sx->sxu_xholder = curthread; - LOCK_LOG_TRY("XLOCK", &sx->sxu_object, 0, 1, file, line); - WITNESS_LOCK(&sx->sxu_object, LOP_EXCLUSIVE | LOP_TRYLOCK, file, - line); - mtx_unlock(sx->sxu_lock); - return (1); + if (!canrecurse) { + LOCK_LOG_TRY("XLOCK", &sx->sxu_object, 0, 1, file, line); + WITNESS_LOCK(&sx->sxu_object, LOP_EXCLUSIVE | LOP_TRYLOCK, file, + line); + } + error = 1; } else { LOCK_LOG_TRY("XLOCK", &sx->sxu_object, 0, 0, file, line); - mtx_unlock(sx->sxu_lock); - return (0); + error = 0; } + mtx_unlock(sx->sxu_lock); + + return (error); } void @@ -322,6 +348,9 @@ /* Release. */ sx->sxu_cnt++; + if (sx->sxu_cnt < 0) + goto done; + sx->sxu_xholder = NULL; lock_profile_release_lock(&sx->sxu_object); @@ -336,6 +365,7 @@ cv_signal(sx->sxu_drain_cvp); LOCK_LOG_LOCK("XUNLOCK", &sx->sxu_object, 0, 0, file, line); + done: mtx_unlock(sx->sxu_lock); } ==== //depot/projects/kmacy_sun4v/src/sys/sys/sxu.h#4 (text+ko) ==== @@ -50,10 +50,10 @@ void sxu_sysinit(void *arg); void sxu_init(struct sxu *sx, const char *description); void sxu_destroy(struct sxu *sx); -void _sxu_slock(struct sxu *sx, int timo, const char *file, int line); -void _sxu_xlock(struct sxu *sx, int timo, const char *file, int line); -int _sxu_try_slock(struct sxu *sx, const char *file, int line); -int _sxu_try_xlock(struct sxu *sx, const char *file, int line); +void _sxu_slock(struct sxu *sx, int timo, struct mtx *interlkp, const char *file, int line); +void _sxu_xlock(struct sxu *sx, int timo, int interlkp, int canrecurse, const char *file, int line); +int _sxu_try_slock(struct sxu *sx, mtx *interlkp, const char *file, int line); +int _sxu_try_xlock(struct sxu *sx, struct mtx *interlkp, int canrecurse, const char *file, int line); void _sxu_sunlock(struct sxu *sx, const char *file, int line); void _sxu_xunlock(struct sxu *sx, const char *file, int line); int _sxu_try_upgrade(struct sxu *sx, const char *file, int line); @@ -79,18 +79,33 @@ SYSUNINIT(name##_sxu_sysuninit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \ sxu_destroy, (sxa)) -#define sxu_slock(sx) _sxu_slock((sx), (0), LOCK_FILE, LOCK_LINE) -#define sxu_xlock(sx) _sxu_xlock((sx), (0), LOCK_FILE, LOCK_LINE) -#define sxu_slock_timedwait(sx, timo) _sxu_slock((sx), (timo), LOCK_FILE, LOCK_LINE) -#define sxu_xlock_timedwait(sx, timo) _sxu_xlock((sx), (timo), LOCK_FILE, LOCK_LINE) -#define sxu_try_slock(sx) _sxu_try_slock((sx), LOCK_FILE, LOCK_LINE) -#define sxu_try_xlock(sx) _sxu_try_xlock((sx), LOCK_FILE, LOCK_LINE) +#define sxu_slock(sx) \ + _sxu_slock((sx), (0), NULL, LOCK_FILE, LOCK_LINE) +#define sxu_xlock(sx, canrecurse) \ + _sxu_xlock((sx), (0), NULL, (canrecurse), LOCK_FILE, LOCK_LINE) +#define sxu_slock_interlocked(sx, interlkp) \ + _sxu_slock((sx), (0), interlkp, LOCK_FILE, LOCK_LINE) +#define sxu_xlock_interlocked(sx, interlkp, canrecurse) \ + _sxu_xlock((sx), (0), interlkp, LOCK_FILE, LOCK_LINE) +#define sxu_try_slock(sx) \ + _sxu_try_slock((sx), (NULL), LOCK_FILE, LOCK_LINE) +#define sxu_try_xlock(sx, int canrecurse) \ + _sxu_try_xlock((sx), (NULL), (canrecurse), LOCK_FILE, LOCK_LINE) +#define sxu_try_slock_interlocked(sx, interlkp) \ + _sxu_try_slock((sx), (interlkp), LOCK_FILE, LOCK_LINE) +#define sxu_try_xlock_interlocked(sx, interlkp, int canrecurse) \ + _sxu_try_xlock((sx), (interlkp), (canrecurse), LOCK_FILE, LOCK_LINE) + +#define sxu_xlock_interlock_timedwait(sx, timo, interlkp, canrecurse) \ + _sxu_xlock((sx), (timo), (interlkp), (canrecurse), LOCK_FILE, LOCK_LINE) + #define sxu_sunlock(sx) _sxu_sunlock((sx), LOCK_FILE, LOCK_LINE) #define sxu_xunlock(sx) _sxu_xunlock((sx), LOCK_FILE, LOCK_LINE) #define sxu_try_upgrade(sx) _sxu_try_upgrade((sx), LOCK_FILE, LOCK_LINE) #define sxu_downgrade(sx) _sxu_downgrade((sx), LOCK_FILE, LOCK_LINE) #define sxu_drain(sx, cv) _sxu_drain((sx), (cv), LOCK_FILE, LOCK_LINE) + #define sxu_unlock(sx) do { \ if ((sx)->sx_cnt < 0) \ sxu_xunlock(sx); \ From owner-p4-projects@FreeBSD.ORG Wed Jun 28 06:41:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCCA116A4AB; Wed, 28 Jun 2006 06:41:12 +0000 (UTC) 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 A6AF416A4A0 for ; Wed, 28 Jun 2006 06:41:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7574243D69 for ; Wed, 28 Jun 2006 06:41:10 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5S6fAql062133 for ; Wed, 28 Jun 2006 06:41:10 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5S6fAi2062130 for perforce@freebsd.org; Wed, 28 Jun 2006 06:41:10 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 28 Jun 2006 06:41:10 GMT Message-Id: <200606280641.k5S6fAi2062130@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100187 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, 28 Jun 2006 06:41:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=100187 Change 100187 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/28 06:41:05 add empty kern_lock.c copy as base line for re-implementing lockmgr Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_lock_sxu.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 28 07:08:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4611C16A40F; Wed, 28 Jun 2006 07:08:47 +0000 (UTC) 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 20F4316A40B for ; Wed, 28 Jun 2006 07:08:47 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F208D43D5D for ; Wed, 28 Jun 2006 07:08:45 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5S78j3c064520 for ; Wed, 28 Jun 2006 07:08:45 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5S78jI8064517 for perforce@freebsd.org; Wed, 28 Jun 2006 07:08:45 GMT (envelope-from imp@freebsd.org) Date: Wed, 28 Jun 2006 07:08:45 GMT Message-Id: <200606280708.k5S78jI8064517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 100188 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, 28 Jun 2006 07:08:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=100188 Change 100188 by imp@imp_lighthouse on 2006/06/28 07:08:42 Functionality: o auto detect if the device has TIMEOUT. o if it has TIMEOUT, then use ping-pong buffers to keep the interrupt load down. o If not, then use single character buffer, but move its harvesting into the ISR rather than scheduling a task that takes a while to run (this not losing characters). Deck chairs: o move to SET, CLR, ISSET Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#28 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#28 (text+ko) ==== @@ -45,19 +45,34 @@ #include "uart_if.h" +/* Macros to clear/set/test flags. */ +#define SET(t, f) (t) |= (f) +#define CLR(t, f) (t) &= ~(f) +#define ISSET(t, f) ((t) & (f)) + +#define DEFAULT_RCLK AT91C_MASTER_CLOCK +#define USART_BUFFER_SIZE 128 + /* * High-level UART interface. */ +struct at91_usart_rx { + bus_addr_t pa; + uint8_t buffer[USART_BUFFER_SIZE]; + bus_dmamap_t map; +}; + struct at91_usart_softc { struct uart_softc base; bus_dma_tag_t dmatag; /* bus dma tag for mbufs */ bus_dmamap_t tx_map; - bus_dmamap_t rx_map; + uint32_t flags; +#define HAS_TIMEOUT 1 + struct at91_usart_rx ping_pong[2]; + struct at91_usart_rx *ping; + struct at91_usart_rx *pong; }; -#define DEFAULT_RCLK AT91C_MASTER_CLOCK -#define USART_BUFFER_SIZE 128 - #define RD4(bas, reg) \ bus_space_read_4((bas)->bst, (bas)->bsh, uart_regofs(bas, reg)) #define WR4(bas, reg, value) \ @@ -213,13 +228,6 @@ WR4(bas, USART_CR, cr); WR4(bas, USART_CR, USART_CR_RXEN | USART_CR_TXEN); WR4(bas, USART_IDR, 0xffffffff); -#if 0 - WR4(bas, USART_IER, USART_CSR_TIMEOUT | - USART_CSR_TXRDY | USART_CSR_RXRDY | - USART_CSR_RXBRK | USART_CSR_ENDRX | USART_CSR_ENDTX); - /* Set the receive timeout to be 1.5 character times. */ - WR4(bas, USART_RTOR, 12); -#endif } /* @@ -240,7 +248,7 @@ at91_usart_putc(struct uart_bas *bas, int c) { - while (!(RD4(bas, USART_CSR) & USART_CSR_TXRDY)) + while (!(ISSET(RD4(bas, USART_CSR), USART_CSR_TXRDY))) continue; WR4(bas, USART_THR, c); } @@ -252,7 +260,7 @@ at91_usart_poll(struct uart_bas *bas) { - if (!(RD4(bas, USART_CSR) & USART_CSR_RXRDY)) + if (!ISSET(RD4(bas, USART_CSR), USART_CSR_RXRDY)) return (-1); return (RD4(bas, USART_RHR) & 0xff); } @@ -265,7 +273,7 @@ { int c; - while (!(RD4(bas, USART_CSR) & USART_CSR_RXRDY)) + while (!ISSET(RD4(bas, USART_CSR), USART_CSR_RXRDY)) continue; c = RD4(bas, USART_RHR); c &= 0xff; @@ -304,15 +312,35 @@ return (0); } +#ifndef SKYEYE_WORKAROUNDS +static void +at91_getaddr(void *arg, bus_dma_segment_t *segs, int nsegs, int error) +{ + if (error != 0) + return; + *(bus_addr_t *)arg = segs[0].ds_addr; +} +#endif + static int at91_usart_bus_attach(struct uart_softc *sc) { - int err; + int err, i; uint32_t cr; struct at91_usart_softc *atsc; atsc = (struct at91_usart_softc *)sc; + /* + * See if we have a TIMEOUT bit. We disable all interrupts to + * minimize interference. + */ + WR4(&sc->sc_bas, USART_IDR, 0xffffffff); + WR4(&sc->sc_bas, USART_IER, USART_CSR_TIMEOUT); + if (ISSET(RD4(&sc->sc_bas, USART_IMR), USART_CSR_TIMEOUT)) + SET(atsc->flags, HAS_TIMEOUT); + WR4(&sc->sc_bas, USART_IDR, 0xffffffff); + sc->sc_txfifosz = USART_BUFFER_SIZE; sc->sc_rxfifosz = USART_BUFFER_SIZE; sc->sc_hwiflow = 0; @@ -328,38 +356,63 @@ err = bus_dmamap_create(atsc->dmatag, 0, &atsc->tx_map); if (err != 0) goto errout; - err = bus_dmamap_create(atsc->dmatag, 0, &atsc->rx_map); - if (err != 0) - goto errout; + if (ISSET(atsc->flags, HAS_TIMEOUT)) { + for (i = 0; i < 2; i++) { + err = bus_dmamap_create(atsc->dmatag, 0, + &atsc->ping_pong[i].map); + if (err != 0) + goto errout; + err = bus_dmamap_load(atsc->dmatag, + atsc->ping_pong[i].map, + atsc->ping_pong[i].buffer, sc->sc_rxfifosz, + at91_getaddr, &atsc->ping_pong[i].pa, 0); + if (err != 0) + goto errout; + bus_dmamap_sync(atsc->dmatag, atsc->ping_pong[i].map, + BUS_DMASYNC_PREREAD); + } + atsc->ping = &atsc->ping_pong[0]; + atsc->pong = &atsc->ping_pong[1]; + } + + /* + * Prime the pump with the RX buffer. We use two 64 byte bounce + * buffers here to avoid data overflow. + */ /* Turn on rx and tx */ cr = USART_CR_RSTSTA | USART_CR_RSTRX | USART_CR_RSTTX; WR4(&sc->sc_bas, USART_CR, cr); WR4(&sc->sc_bas, USART_CR, USART_CR_RXEN | USART_CR_TXEN); - WR4(&sc->sc_bas, USART_IDR, 0xffffffff); -#if 0 - WR4(&sc->sc_bas, USART_IER, USART_CSR_TIMEOUT | - USART_CSR_TXRDY | USART_CSR_RXRDY | - USART_CSR_RXBRK | USART_CSR_ENDRX | USART_CSR_ENDTX); -#endif - /* Set the receive timeout to be 1.5 character times. */ - WR4(&sc->sc_bas, USART_RTOR, 12); + + /* + * Setup the PDC to receive data. We use the ping-pong buffers + * so that we can more easily bounce between the two and so that + * we get an interrupt 1/2 way through the software 'fifo' we have + * to avoid overruns. + */ + if (ISSET(atsc->flags, HAS_TIMEOUT)) { + WR4(&sc->sc_bas, PDC_RPR, atsc->ping->pa); + WR4(&sc->sc_bas, PDC_RCR, sc->sc_rxfifosz); + WR4(&sc->sc_bas, PDC_RNPR, atsc->pong->pa); + WR4(&sc->sc_bas, PDC_RNCR, sc->sc_rxfifosz); + WR4(&sc->sc_bas, PDC_PTCR, PDC_PTCR_RXTEN); + + /* Set the receive timeout to be 1.5 character times. */ + WR4(&sc->sc_bas, USART_RTOR, 12); + WR4(&sc->sc_bas, USART_CR, USART_CR_STTTO); + + WR4(&sc->sc_bas, USART_IER, USART_CSR_TIMEOUT | + USART_CSR_RXBUFF | USART_CSR_ENDRX); + } else { + WR4(&sc->sc_bas, USART_IER, USART_CSR_RXRDY); + } + WR4(&sc->sc_bas, USART_IER, USART_CSR_RXBRK); errout:; // XXX bad return (err); } -#ifndef SKYEYE_WORKAROUNDS -static void -at91_getaddr(void *arg, bus_dma_segment_t *segs, int nsegs, int error) -{ - if (error != 0) - return; - *(bus_addr_t *)arg = segs[0].ds_addr; -} -#endif - - static int at91_usart_bus_transmit(struct uart_softc *sc) { @@ -387,8 +440,6 @@ WR4(&sc->sc_bas, PDC_TCR, sc->sc_txdatasz); WR4(&sc->sc_bas, PDC_PTCR, PDC_PTCR_TXTEN); uart_unlock(sc->sc_hwmtx); - if (device_get_unit(sc->sc_dev)) - device_printf(sc->sc_dev, "transmit %d bytes\n", sc->sc_txdatasz); #else for (int i = 0; i < sc->sc_txdatasz; i++) at91_usart_putc(&sc->sc_bas, sc->sc_txbuf[i]); @@ -409,24 +460,22 @@ do { old = sc->sc_hwsig; new = old; - if (sig & SER_DDTR) + if (ISSET(sig, SER_DDTR)) SIGCHG(sig & SER_DTR, new, SER_DTR, SER_DDTR); - if (sig & SER_DRTS) + if (ISSET(sig, SER_DRTS)) SIGCHG(sig & SER_RTS, new, SER_RTS, SER_DRTS); } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); bas = &sc->sc_bas; uart_lock(sc->sc_hwmtx); - cr = RD4(bas, USART_CR); - cr &= ~(USART_CR_DTREN | USART_CR_DTRDIS | USART_CR_RTSEN | - USART_CR_RTSDIS); - if (new & SER_DTR) - cr |= USART_CR_DTREN; + cr = 0; + if (ISSET(new, SER_DTR)) + SET(cr, USART_CR_DTREN); else - cr |= USART_CR_DTRDIS; - if (new & SER_RTS) - cr |= USART_CR_RTSEN; + SET(cr, USART_CR_DTRDIS); + if (ISSET(new, SER_RTS)) + SET(cr, USART_CR_RTSEN); else - cr |= USART_CR_RTSDIS; + SET(cr, USART_CR_RTSDIS); WR4(bas, USART_CR, cr); uart_unlock(sc->sc_hwmtx); return (0); @@ -434,16 +483,14 @@ static int at91_usart_bus_receive(struct uart_softc *sc) { - - uart_lock(sc->sc_hwmtx); - uart_rx_put(sc, at91_usart_getc(&sc->sc_bas, NULL)); - uart_unlock(sc->sc_hwmtx); + return (0); } static int at91_usart_bus_param(struct uart_softc *sc, int baudrate, int databits, int stopbits, int parity) { + return (at91_usart_param(&sc->sc_bas, baudrate, databits, stopbits, parity)); } @@ -451,27 +498,91 @@ at91_usart_bus_ipend(struct uart_softc *sc) { int csr = RD4(&sc->sc_bas, USART_CSR); - int ipend = 0; + int ipend = 0, i, len; struct at91_usart_softc *atsc; + struct at91_usart_rx *p; - if (device_get_unit(sc->sc_dev)) - device_printf(sc->sc_dev, "ipend csr %#x\n", csr); atsc = (struct at91_usart_softc *)sc; - if (csr & USART_CSR_ENDTX) { + if (ISSET(csr, USART_CSR_ENDTX)) { bus_dmamap_sync(atsc->dmatag, atsc->tx_map, BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(atsc->dmatag, atsc->tx_map); } uart_lock(sc->sc_hwmtx); - if (csr & USART_CSR_TXRDY && sc->sc_txbusy) { + if (ISSET(csr, USART_CSR_TXRDY) && sc->sc_txbusy) { ipend |= SER_INT_TXIDLE; WR4(&sc->sc_bas, USART_IDR, USART_CSR_TXRDY); } - if (csr & USART_CSR_ENDTX && sc->sc_txbusy) + if (ISSET(csr, USART_CSR_ENDTX) && sc->sc_txbusy) ipend |= SER_INT_TXIDLE; - if (csr & (USART_CSR_RXRDY /* | USART_CSR_ENDRX | USART_CSR_TIMEOUT */)) + /* + * Due to the contraints of the DMA engine present in the + * atmel chip, I can't just say I have a rx interrupt pending + * and do all the work elsewhere. I need to look at the CSR + * bits right now and do things based on them to avoid races. + */ + if (ISSET(atsc->flags, HAS_TIMEOUT) && ISSET(csr, USART_CSR_RXBUFF)) { + // Have a buffer overflow. Copy all data from both + // ping and pong. Insert overflow character. Reset + // ping and pong and re-enable the PDC to receive + // characters again. + bus_dmamap_sync(atsc->dmatag, atsc->ping->map, + BUS_DMASYNC_POSTREAD); + bus_dmamap_sync(atsc->dmatag, atsc->pong->map, + BUS_DMASYNC_POSTREAD); + for (i = 0; i < sc->sc_rxfifosz; i++) + uart_rx_put(sc, atsc->ping->buffer[i]); + for (i = 0; i < sc->sc_rxfifosz; i++) + uart_rx_put(sc, atsc->pong->buffer[i]); + uart_rx_put(sc, UART_STAT_OVERRUN); + CLR(csr, USART_CSR_ENDRX | USART_CSR_TIMEOUT); + WR4(&sc->sc_bas, PDC_RPR, atsc->ping->pa); + WR4(&sc->sc_bas, PDC_RCR, sc->sc_rxfifosz); + WR4(&sc->sc_bas, PDC_RNPR, atsc->pong->pa); + WR4(&sc->sc_bas, PDC_RNCR, sc->sc_rxfifosz); + WR4(&sc->sc_bas, PDC_PTCR, PDC_PTCR_RXTEN); + ipend |= SER_INT_RXREADY; + } + if (ISSET(atsc->flags, HAS_TIMEOUT) && ISSET(csr, USART_CSR_ENDRX)) { + // Shuffle data from 'ping' of ping pong buffer, but + // leave current 'pong' in place, as it has become the + // new 'ping'. We need to copy data and setup the old + // 'ping' as the new 'pong' when we're done. + bus_dmamap_sync(atsc->dmatag, atsc->ping->map, + BUS_DMASYNC_POSTREAD); + for (i = 0; i < sc->sc_rxfifosz; i++) + uart_rx_put(sc, atsc->ping->buffer[i]); + p = atsc->ping; + atsc->ping = atsc->pong; + atsc->pong = p; + WR4(&sc->sc_bas, PDC_RNPR, atsc->pong->pa); + WR4(&sc->sc_bas, PDC_RNCR, sc->sc_rxfifosz); + ipend |= SER_INT_RXREADY; + } + if (ISSET(atsc->flags, HAS_TIMEOUT) && ISSET(csr, USART_CSR_TIMEOUT)) { + // We have one partial buffer. We need to stop the + // PDC, get the number of characters left and from + // that compute number of valid characters. We then + // need to reset ping and pong and reenable the PDC. + // Not sure if there's a race here at fast baud rates + // we need to worry about. + WR4(&sc->sc_bas, PDC_PTCR, PDC_PTCR_RXTDIS); + len = sc->sc_rxfifosz - RD4(&sc->sc_bas, PDC_RCR); + for (i = 0; i < len; i++) + uart_rx_put(sc, atsc->ping->buffer[i]); + WR4(&sc->sc_bas, PDC_RPR, atsc->ping->pa); + WR4(&sc->sc_bas, PDC_RCR, sc->sc_rxfifosz); + WR4(&sc->sc_bas, PDC_PTCR, PDC_PTCR_RXTEN); + ipend |= SER_INT_RXREADY; + } + if (!ISSET(atsc->flags, HAS_TIMEOUT) && ISSET(csr, USART_CSR_RXRDY)) { + // We have another charater in a device that doesn't support + // timeouts, so we do it one character at a time. + uart_rx_put(sc, RD4(&sc->sc_bas, USART_RHR) & 0xff); ipend |= SER_INT_RXREADY; - if (csr & USART_CSR_RXBRK) { + } + + if (ISSET(csr, USART_CSR_RXBRK)) { unsigned int cr = USART_CR_RSTSTA; ipend |= SER_INT_BREAK; @@ -495,14 +606,14 @@ uart_lock(sc->sc_hwmtx); csr = RD4(&sc->sc_bas, USART_CSR); sig = 0; - if (csr & USART_CSR_CTS) - sig |= SER_CTS; - if (csr & USART_CSR_DCD) - sig |= SER_DCD; - if (csr & USART_CSR_DSR) - sig |= SER_DSR; - if (csr & USART_CSR_RI) - sig |= SER_RI; + if (ISSET(csr, USART_CSR_CTS)) + SET(sig, SER_CTS); + if (ISSET(csr, USART_CSR_DCD)) + SET(sig, SER_DCD); + if (ISSET(csr, USART_CSR_DSR)) + SET(sig, SER_DSR); + if (ISSET(csr, USART_CSR_RI)) + SET(sig, SER_RI); new = sig & ~SER_MASK_DELTA; sc->sc_hwsig = new; uart_unlock(sc->sc_hwmtx); From owner-p4-projects@FreeBSD.ORG Wed Jun 28 07:59:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFC7816A411; Wed, 28 Jun 2006 07:59:52 +0000 (UTC) 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 83F8B16A40F for ; Wed, 28 Jun 2006 07:59:52 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A0E543D94 for ; Wed, 28 Jun 2006 07:59:49 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5S7xnXY066726 for ; Wed, 28 Jun 2006 07:59:49 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5S7xnmw066723 for perforce@freebsd.org; Wed, 28 Jun 2006 07:59:49 GMT (envelope-from cdjones@FreeBSD.org) Date: Wed, 28 Jun 2006 07:59:49 GMT Message-Id: <200606280759.k5S7xnmw066723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 100189 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, 28 Jun 2006 07:59:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=100189 Change 100189 by cdjones@cdjones-impulse on 2006/06/28 07:59:04 Put sched.h's prototypes in place. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#2 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#3 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#2 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include #include +#include #ifdef KTRACE #include #include @@ -54,3 +55,195 @@ #ifdef HWPMC_HOOKS #include #endif + +/* +static struct kproc_desc sched_kp = { + "schedcpu", + schedcpu_thread, + NULL +}; +SYSINIT(schedcpu, SI_SUB_RUN_SCHEDULER, SI_ORDER_FIRST, kproc_start, &sched_kp) +*/ + +static void sched_setup(void *dummy); +SYSINIT(sched_setup, SI_SUB_RUN_QUEUE, SI_ORDER_FIRST, sched_setup, NULL) + +SYSCTL_NODE(_kern, OID_AUTO, sched, CTLFLAG_RD, 0, "Scheduler"); + +SYSCTL_STRING(_kern_sched, OID_AUTO, name, CTLFLAG_RD, "hier", 0, + "Scheduler name"); + +void +sched_setup(void *dummy) +{ + /* TODO */ +} + +/* Common external interface stuff goes here. + (from sys/sched.h) +*/ + +void +schedinit(void) +{ + + proc0.p_sched = NULL; + ksegrp0.kg_sched = &kg_sched0; + thread0.td_sched = &kse0; + kse0.ke_thread = &thread0; + kse0.ke_state = KES_THREAD; + kg_sched0.skg_concurrency = 1; + kg_sched0.skg_avail_openings = 0; /* we are already running */ +} + +int +sched_load(void) +{ + +} + +int +sched_rr_internal(void) +{ + +} + +int +sched_runnable(void) +{ + +} + +void +sched_exit(struct proc *p, struct thread *childtd) +{ +} + + +void +sched_fork(struct thread *td, struct thread *childtd) +{ +} + +void +sched_class(struct ksegrp *kg, int class) +{ +} + +void +sched_exit_ksegrp(struct ksegrp *kg, struct thread *childtd) +{ +} + +void +sched_fork_ksegrp(struct ksegrp *kg, struct thread *childtd) +{ +} + +void +sched_nice(struct proc *p, int nice) +{ +} + +void +sched_exit_thread(struct thread *td, struct thread *child) +{ +} + +void +sched_fork_thread(struct thread *td, struct thread *child) +{ +} + +fixpt_t +sched_pctcpu(struct thread *td) +{ +} + +void +sched_prio(struct thread *td, u_char prio) +{ +} + +void +sched_lend_prio(struct thread *td, u_char prio) +{ +} + +void +sched_sleep(struct thread *td) +{ +} + +void +sched_switch(struct thread *td, struct thread *newtd, int flags) +{ +} + +void +sched_unlend_prio(struct thread *td, u_char prio) +{ +} + +void +sched_userret(struct thread *td) +{ +} + +void +sched_wakeup(struct thread *td) +{ +} + +void +sched_add(struct thread *td, int flags) +{ +} + +void +sched_clock(struct thread *td) +{ +} + +void +sched_rem(struct thread *td) +{ +} + +void +sched_tick(void) +{ +} + +void +sched_relinquish(struct thread *td) +{ +} + +void +sched_bind(struct thread *td, int cpu) +{ +} + +void +sched_unbind(struct thread *td) +{ +} + +void +sched_sizeof_ksegrp(void) +{ + return (sizeof(struct ksegrp) + sizeof(struct kg_sched)); +} + +void +sched_sizeof_proc(void) +{ + return (sizeof(struct proc)); +} + +void +sched_sizeof_thread(void) +{ + return (sizeof(struct thread) + sizeof(struct td_sched)); +} ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Jun 28 09:30:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB45D16A408; Wed, 28 Jun 2006 09:30:44 +0000 (UTC) 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 8F78016A403 for ; Wed, 28 Jun 2006 09:30:44 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A3D143D8C for ; Wed, 28 Jun 2006 09:30:44 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5S9UiVb080813 for ; Wed, 28 Jun 2006 09:30:44 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5S9UhBi080810 for perforce@freebsd.org; Wed, 28 Jun 2006 09:30:43 GMT (envelope-from bushman@freebsd.org) Date: Wed, 28 Jun 2006 09:30:43 GMT Message-Id: <200606280930.k5S9UhBi080810@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100191 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, 28 Jun 2006 09:30:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=100191 Change 100191 by bushman@bushman_nss_ldap_cached on 2006/06/28 09:29:47 copynetent.c mistakenly was not added during previous commits Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libnssutil/copynetent.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 28 10:31:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9D7516A40B; Wed, 28 Jun 2006 10:31:01 +0000 (UTC) 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 A5A8416A408 for ; Wed, 28 Jun 2006 10:31:01 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 746B844637 for ; Wed, 28 Jun 2006 10:31:01 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SAV1Q6084503 for ; Wed, 28 Jun 2006 10:31:01 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SAV1q8084500 for perforce@freebsd.org; Wed, 28 Jun 2006 10:31:01 GMT (envelope-from piso@freebsd.org) Date: Wed, 28 Jun 2006 10:31:01 GMT Message-Id: <200606281031.k5SAV1q8084500@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 100195 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, 28 Jun 2006 10:31:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=100195 Change 100195 by piso@piso_newluxor on 2006/06/28 10:30:51 Fixed compilation of em. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/em/if_em.c#5 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/em/if_em.c#5 (text+ko) ==== @@ -1993,7 +1993,7 @@ taskqueue_start_threads(&sc->tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->dev)); if ((error = bus_setup_intr(dev, sc->res_interrupt, - INTR_TYPE_NET | INTR_FAST, em_intr_fast, NULL, NULL, sc, + INTR_TYPE_NET | INTR_FAST, em_intr_fast, NULL, sc, &sc->int_handler_tag)) != 0) { device_printf(dev, "Failed to register fast interrupt " "handler: %d\n", error); From owner-p4-projects@FreeBSD.ORG Wed Jun 28 13:08:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B87A216A515; Wed, 28 Jun 2006 13:08:51 +0000 (UTC) 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 7BF3616A504 for ; Wed, 28 Jun 2006 13:08:51 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B755B43E3E for ; Wed, 28 Jun 2006 13:07:39 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SD7I8I006622 for ; Wed, 28 Jun 2006 13:07:18 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SD7INs006619 for perforce@freebsd.org; Wed, 28 Jun 2006 13:07:18 GMT (envelope-from bushman@freebsd.org) Date: Wed, 28 Jun 2006 13:07:18 GMT Message-Id: <200606281307.k5SD7INs006619@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100201 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, 28 Jun 2006 13:08:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=100201 Change 100201 by bushman@bushman_nss_ldap_cached on 2006/06/28 13:06:34 Some getusershell() further development. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/tests/getusershell_test/Makefile#2 edit .. //depot/projects/soc2006/nss_ldap_cached/tests/getusershell_test/getusershell_test.c#2 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/tests/getusershell_test/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/tests/getusershell_test/getusershell_test.c#2 (text+ko) ==== @@ -1,3 +1,6 @@ +#define YP +#define HESIOD + #include "namespace.h" #include #include @@ -22,17 +25,40 @@ #include #endif #include "un-namespace.h" +#include "reentrant.h" +#include "nss_tls.h" #define DECORATED(x) __my_##x +static void usershell_endstate(void *); + +struct usershell_state { + char *buffer; + size_t bufsize; +}; + +NSS_TLS_HANDLING(usershell); + +static void usershell_endstate(void *st) +{ + if (st == NULL) + return; + + free(((struct usershell_state *)st)->buffer); + free(st); +} + + +static const ns_src defaultsrc[] = { + { NSSRC_FILES, NS_SUCCESS }, + { NULL, 0} +}; + /* * Local shells should NOT be added here. They should be added in * /etc/shells. */ -#define YP -#define HESIOD - static const char *const okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL }; static const char *const *curshell; static StringList *sl; @@ -47,7 +73,7 @@ #ifdef YP struct nis_usershell_state { - char *yp_domain; + char yp_domain[MAXHOSTNAMELEN]; char *key; int keylen; }; @@ -56,8 +82,8 @@ #endif #ifdef HESIOD -struct dns_usershell_data { - long counter; +struct dns_usershell_state { + int counter; }; static void dns_usershell_endstate(void *); NSS_TLS_HANDLING(dns_usershell); @@ -72,7 +98,7 @@ if (st == NULL) return; - state = (files_usershell_state *)st; + state = (struct files_usershell_state *)st; if (state->fp != NULL) { fclose(state->fp); state->fp = NULL; @@ -90,8 +116,7 @@ if (st == NULL) return; - state = (nis_usershell_state *)st; - free(state->ypdomain); + state = (struct nis_usershell_state *)st; free(state->key); free(state); } @@ -101,6 +126,7 @@ static void dns_usershell_endstate(void *st) { + free(st); } #endif @@ -111,14 +137,14 @@ char *buffer; size_t buflen; int *errnop; - char * const *retval; + char **retval; char *cp, *sp; buffer = va_arg(ap, char *); buflen = va_arg(ap, size_t); errnop = va_arg(ap, int *); - retval = (char * const *)rv; + retval = (char **)rv; assert(buffer != NULL); assert(buflen != 0); @@ -128,11 +154,11 @@ if (*errnop != 0) return (NS_UNAVAIL); - if ((st->fp == NULL) && ((fp = fopen(_PATH_SHELLS, "r")) == NULL)) + if ((st->fp == NULL) && ((st->fp = fopen(_PATH_SHELLS, "r")) == NULL)) return NS_UNAVAIL; cp = buffer; - if (fgets(cp, buflen - 1, st->fp) != NULL) { + while (fgets(cp, buflen - 1, st->fp) != NULL) { while (*cp != '#' && *cp != '/' && *cp != '\0') cp++; if (*cp == '#' || *cp == '\0') @@ -142,15 +168,14 @@ cp++; *cp++ = '\0'; - retval = cp; + *retval = sp; return (NS_SUCCESS); - } else { - (void)fclose(st->fp); - st->fp = NULL; + } + + (void)fclose(st->fp); + st->fp = NULL; - return (NS_UNAVAIL); - } - + return (NS_UNAVAIL); } static int @@ -197,18 +222,14 @@ assert(buflen != 0); assert(rv != NULL); - *errnop = files_usershell_getstate(&st); + *errnop = nis_usershell_getstate(&st); if (*errnop != 0) return (NS_UNAVAIL); - if (st->ypdomain == NULL) { - switch (yp_get_default_domain(&st->ypdomain)) { - case 0: - break; - case YPERR_RESRC: - return NS_TRYAGAIN; - default: - return NS_UNAVAIL; + if (st->yp_domain[0] == '\0') { + if (getdomainname(st->yp_domain, sizeof st->yp_domain)) { + *errnop = errno; + return (NS_UNAVAIL); } } @@ -219,11 +240,11 @@ */ key = data = NULL; if (st->key == NULL) { - if (yp_first(ypdomain, "shells", &st->key, &st->keylen, &data, - &datalen)) + if (yp_first(st->yp_domain, "shells", &st->key, &st->keylen, + &data, &datalen)) return (NS_UNAVAIL); } else { - r = yp_next(ypdomain, "shells", st->key, st->keylen, + r = yp_next(st->yp_domain, "shells", st->key, st->keylen, &key, &keylen, &data, &datalen); /* @@ -238,7 +259,7 @@ free(key); free(data); *errnop = ERANGE; - return (NSRETURN); + return (NS_RETURN); } strncpy(buffer, data, datalen); @@ -251,60 +272,186 @@ static int __nis_setusershell(void *rv, void *cb_data, va_list ap) -[ -] +{ + struct nis_usershell_state *st; + int r; + + r = nis_usershell_getstate(&st); + if (r != 0) + return (NS_UNAVAIL); + + free(st->key); + st->key = NULL; + + return (NS_UNAVAIL); +} #endif #ifdef HESIOD static int __dns_getusershell_r(void *rv, void *cb_data, va_list ap) { + struct dns_usershell_state *st; + char *buffer; + size_t buflen; + int *errnop; + char * const *retval; + + char shellname[] = "shells-XXXXX"; + int hpi, r; + char **hp; + void *context; + size_t linesize; + + buffer = va_arg(ap, char *); + buflen = va_arg(ap, size_t); + errnop = va_arg(ap, int *); + retval = (char * const *)rv; + + assert(buffer != NULL); + assert(buflen != 0); + assert(rv != NULL); + + *errnop = dns_usershell_getstate(&st); + if (*errnop != 0) + return (NS_UNAVAIL); + + if (st->counter == -1) + return (NS_NOTFOUND); + + r = NS_UNAVAIL; + if (hesiod_init(&context) == -1) + return (r); + + snprintf(shellname, sizeof(shellname)-1, "shells-%d", st->counter++); + hp = hesiod_resolve(context, shellname, "shells"); + if (hp == NULL) { + st->counter = -1; + + if (errno == ENOENT) + r = NS_NOTFOUND; + else { + *errnop = errno; + r = NS_UNAVAIL; + } + } else { + linesize = strlcpy(buffer, hp[0], buflen); + hesiod_free_list(context, hp); + + if (linesize >= buflen) { + *errnop = ERANGE; + r = NS_RETURN; + } + } + + hesiod_end(context); + return (r); } static int __dns_setusershell(void *rv, void *cb_data, va_list ap) { + struct dns_usershell_state *st; + int r; + + r = dns_usershell_getstate(&st); + if (r != 0) + return (NS_UNAVAIL); + + st->counter = 0; + + return (NS_UNAVAIL); } #endif static int -getusershell_r(char * const *retval, char *buffer, size_t bufsize, int *error) +getusershell_r(char **retval, char *buffer, size_t bufsize) { + static const ns_dtab dtab[] = { + { NSSRC_FILES, __files_getusershell_r, NULL }, + { NSSRC_NIS, __nis_getusershell_r, NULL }, + { NSSRC_DNS, __dns_getusershell_r, NULL }, + { NULL, NULL, NULL } + }; + int rv, ret_errno; + + ret_errno = 0; + *retval = NULL; + rv = nsdispatch(retval, dtab, NSDB_SHELLS, "getusershell_r", + defaultsrc, buffer, bufsize, &ret_errno); + + if (rv == NS_SUCCESS) + return (0); + else + return (ret_errno); } static void __setusershell() { - static const ns_dtab dtab[] = { - NS_FILES_CB(_local_initshells, NULL) +/* static const ns_dtab dtab[] = { + NS_FILES_CB(_files_initshells, NULL) NS_DNS_CB(_dns_initshells, NULL) NS_NIS_CB(_nis_initshells, NULL) { 0 } - }; + };*/ } static void __endusershell() { + } /* * Get a list of shells from "shells" nsswitch database */ +enum constants +{ + USERSHELL_STORAGE_INITIAL = 1 << 10, /* 1 KByte */ + USERSHELL_STORAGE_MAX = 1 << 20, /* 1 MByte */ +}; + char * DECORATED(getusershell)(void) { - char *ret; + int rv; + char *res; + struct usershell_state *st; + + rv = usershell_getstate(&st); + if (rv != 0) { + errno = rv; + return NULL; + } + + if (st->buffer == NULL) { + st->buffer = malloc(USERSHELL_STORAGE_INITIAL); + if (st->buffer == NULL) + return (NULL); + st->bufsize = USERSHELL_STORAGE_INITIAL; + } + do { + rv = getusershell_r(&res, st->buffer, st->bufsize); + if (res == NULL && rv == ERANGE) { + free(st->buffer); + if ((st->bufsize << 1) > USERSHELL_STORAGE_MAX) { + st->buffer = NULL; + errno = ERANGE; + return (NULL); + } + st->bufsize <<= 1; + st->buffer = malloc(st->bufsize); + if (st->buffer == NULL) + return (NULL); + } + } while (res == NULL && rv == ERANGE); + if (rv != 0) + errno = rv; - if (curshell == NULL) - curshell = initshells(); - /*LINTED*/ - ret = (char *)*curshell; - if (ret != NULL) - curshell++; - return (ret); + return (res); } void From owner-p4-projects@FreeBSD.ORG Wed Jun 28 15:26:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7391316A410; Wed, 28 Jun 2006 15:26:13 +0000 (UTC) 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 4FFDB16A407 for ; Wed, 28 Jun 2006 15:26:13 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D53844AA7 for ; Wed, 28 Jun 2006 15:26:13 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SFQC9u015796 for ; Wed, 28 Jun 2006 15:26:12 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SFQCXn015793 for perforce@freebsd.org; Wed, 28 Jun 2006 15:26:12 GMT (envelope-from piso@freebsd.org) Date: Wed, 28 Jun 2006 15:26:12 GMT Message-Id: <200606281526.k5SFQCXn015793@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 100208 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, 28 Jun 2006 15:26:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=100208 Change 100208 by piso@piso_newluxor on 2006/06/28 15:25:52 Various fixes for pc98 and ia64: mostly are bus_setup_intr() that i missed to convert in the previous commits, and in one case i mistakenly inverted the filter/driver parameter. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/aic/aic_cbus.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/ata/ata-cbus.c#3 edit .. //depot/projects/soc2006/intr_filter/dev/ct/ct_isa.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/ed/if_ed_cbus.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/le/if_le_cbus.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/snc/if_snc_cbus.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/snc/if_snc_pccard.c#2 edit .. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#4 edit .. //depot/projects/soc2006/intr_filter/ia64/ia64/nexus.c#3 edit .. //depot/projects/soc2006/intr_filter/ia64/include/intr.h#3 edit .. //depot/projects/soc2006/intr_filter/pc98/cbus/fdc.c#2 edit .. //depot/projects/soc2006/intr_filter/pc98/cbus/pckbd.c#2 edit .. //depot/projects/soc2006/intr_filter/pc98/cbus/sio.c#4 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/aic/aic_cbus.c#2 (text+ko) ==== @@ -211,7 +211,7 @@ } error = bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_CAM|INTR_ENTROPY, - aic_intr, aic, &sc->sc_ih); + NULL, aic_intr, aic, &sc->sc_ih); if (error) { device_printf(dev, "failed to register interrupt handler\n"); aic_isa_release_resources(dev); ==== //depot/projects/soc2006/intr_filter/dev/ata/ata-cbus.c#3 (text+ko) ==== @@ -144,7 +144,7 @@ } if ((bus_setup_intr(dev, ctlr->irq, ATA_INTR_FLAGS, - ata_cbus_intr, ctlr, &ctlr->ih))) { + NULL, ata_cbus_intr, ctlr, &ctlr->ih))) { device_printf(dev, "unable to setup interrupt\n"); bus_release_resource(dev, SYS_RES_IOPORT, ATA_IOADDR_RID, ctlr->io); bus_release_resource(dev, SYS_RES_IOPORT, ATA_CTLADDR_RID, ctlr->ctlio); ==== //depot/projects/soc2006/intr_filter/dev/ct/ct_isa.c#2 (text+ko) ==== @@ -330,7 +330,7 @@ splx(s); if (bus_setup_intr(dev, ct->irq_res, INTR_TYPE_CAM, - (driver_intr_t *)ctintr, ct, &ct->sc_ih)) { + NULL, (driver_intr_t *)ctintr, ct, &ct->sc_ih)) { ct_space_unmap(dev, ct); return ENXIO; } ==== //depot/projects/soc2006/intr_filter/dev/ed/if_ed_cbus.c#2 (text+ko) ==== @@ -243,7 +243,7 @@ ed_alloc_irq(dev, sc->irq_rid, 0); error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE, - edintr, sc, &sc->irq_handle); + NULL, edintr, sc, &sc->irq_handle); if (error) { ed_release_resources(dev); return (error); ==== //depot/projects/soc2006/intr_filter/dev/le/if_le_cbus.c#2 (text) ==== @@ -377,7 +377,7 @@ } error = bus_setup_intr(dev, lesc->sc_ires, INTR_TYPE_NET | INTR_MPSAFE, - am7990_intr, sc, &lesc->sc_ih); + NULL, am7990_intr, sc, &lesc->sc_ih); if (error != 0) { device_printf(dev, "cannot set up interrupt\n"); goto fail_am7990; ==== //depot/projects/soc2006/intr_filter/dev/snc/if_snc_cbus.c#2 (text+ko) ==== @@ -190,7 +190,7 @@ snc_alloc_irq(dev, 0, 0); error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, - sncintr, sc, &sc->irq_handle); + NULL, sncintr, sc, &sc->irq_handle); if (error) { printf("snc_isa_attach: bus_setup_intr() failed\n"); snc_release_resources(dev); ==== //depot/projects/soc2006/intr_filter/dev/snc/if_snc_pccard.c#2 (text+ko) ==== @@ -135,7 +135,7 @@ snc_alloc_irq(dev, 0, 0); error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, - sncintr, sc, &sc->irq_handle); + NULL, sncintr, sc, &sc->irq_handle); if (error) { printf("snc_isa_attach: bus_setup_intr() failed\n"); snc_release_resources(dev); ==== //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#4 (text+ko) ==== @@ -283,8 +283,8 @@ } int -ia64_setup_intr(const char *name, int irq, driver_intr_t handler, - driver_filter_t filter,void *arg, enum intr_type flags, +ia64_setup_intr(const char *name, int irq, driver_filter_t filter, + driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep, volatile long *cntp) { struct ia64_intr *i; ==== //depot/projects/soc2006/intr_filter/ia64/ia64/nexus.c#3 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/ia64/include/intr.h#3 (text+ko) ==== @@ -51,8 +51,8 @@ struct sapic; void ia64_add_sapic(struct sapic *sa); -int ia64_setup_intr(const char *name, int irq, driver_intr_t handler, - driver_filter_t filter, void *arg, enum intr_type flags, +int ia64_setup_intr(const char *name, int irq, driver_filter_t filter, + driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep, volatile long *cntp); int ia64_teardown_intr(void *cookie); void ia64_dispatch_intr(void *frame, unsigned long vector); ==== //depot/projects/soc2006/intr_filter/pc98/cbus/fdc.c#2 (text+ko) ==== @@ -821,7 +821,7 @@ fdc = device_get_softc(dev); fdc->fdc_dev = dev; error = bus_setup_intr(dev, fdc->res_irq, - INTR_TYPE_BIO | INTR_ENTROPY, fdc_intr, fdc, + INTR_TYPE_BIO | INTR_ENTROPY, NULL, fdc_intr, fdc, &fdc->fdc_intr); if (error) { device_printf(dev, "cannot setup interrupt\n"); ==== //depot/projects/soc2006/intr_filter/pc98/cbus/pckbd.c#2 (text+ko) ==== @@ -136,7 +136,7 @@ res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); if (res == NULL) return ENXIO; - bus_setup_intr(dev, res, INTR_TYPE_TTY, pckbd_isa_intr, kbd, &ih); + bus_setup_intr(dev, res, INTR_TYPE_TTY, NULL, pckbd_isa_intr, kbd, &ih); return 0; } ==== //depot/projects/soc2006/intr_filter/pc98/cbus/sio.c#4 (text+ko) ==== @@ -1745,7 +1745,7 @@ if (ret) { ret = bus_setup_intr(dev, com->irqres, INTR_TYPE_TTY, - siointr, com, &com->cookie); + NULL, siointr, com, &com->cookie); if (ret == 0) device_printf(dev, "unable to activate interrupt in fast mode - using normal mode\n"); } From owner-p4-projects@FreeBSD.ORG Wed Jun 28 15:34:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F24EB16A75D; Wed, 28 Jun 2006 15:34:08 +0000 (UTC) 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 A212116A6A7 for ; Wed, 28 Jun 2006 15:34:08 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3DBE943E6F for ; Wed, 28 Jun 2006 15:33:22 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SFXM2a016348 for ; Wed, 28 Jun 2006 15:33:22 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SFXLhK016345 for perforce@freebsd.org; Wed, 28 Jun 2006 15:33:21 GMT (envelope-from gabor@FreeBSD.org) Date: Wed, 28 Jun 2006 15:33:21 GMT Message-Id: <200606281533.k5SFXLhK016345@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 100209 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, 28 Jun 2006 15:34:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=100209 Change 100209 by gabor@gabor_server on 2006/06/28 15:32:22 IFC Affected files ... .. //depot/projects/soc2006/gabor_ports/KNOBS#2 integrate .. //depot/projects/soc2006/gabor_ports/MOVED#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.database.mk#2 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#9 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.python.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackagestats#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processonelog#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/scripts/tindex#3 integrate .. //depot/projects/soc2006/gabor_ports/UPDATING#3 integrate Differences ... ==== //depot/projects/soc2006/gabor_ports/KNOBS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # KNOBS - A list of popular knobs and descriptions # -# $FreeBSD: ports/KNOBS,v 1.11 2006/05/15 12:18:14 lawrance Exp $ +# $FreeBSD: ports/KNOBS,v 1.12 2006/06/23 14:14:49 skv Exp $ # # Rules to adding knobs: # @@ -62,6 +62,7 @@ MAD Mad MP3 audio decoder support MATROSKA Matroska multimedia container support MMX Adds support for x86 MMX optimizations +MODPERL2 Use www/mod_perl2 port MPEG4IP MPEG4 multimedia support MUSEPACK Musepack (MPC, musicpd, libmpcdec) support MYSQL MySQL database support ==== //depot/projects/soc2006/gabor_ports/MOVED#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1075 2006/06/20 22:35:59 glewis Exp $ +# $FreeBSD: ports/MOVED,v 1.1084 2006/06/27 18:17:49 garga Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2384,3 +2384,13 @@ devel/p5-Filesys-Statvfs_Df|sysutils/p5-Filesys-Statvfs|2006-06-19|Vendor split port into 2 separate modules: sysutils/p5-Filesys-Statvfs and sysutils/p5-Filesys-Df www/opera-devel|www/opera|2006-06-20|Merged into the stable port archivers/bsdtar|archivers/libarchive|2006-06-20|Merged into the libarchive port +lang/fpc2||2006-06-21|Removed because lang/fpc will be updated to 2.x +devel/fpc-gdb||2006-06-21|Obsoleted after lang/fpc was updated to 2.0.2 +net/fpc-inet||2006-06-21|Obsoleted after lang/fpc was updated to 2.0.2 +audio/ruby-snett|audio/snett|2006-06|Because it's a application, not a library +audio/py-shellac|audio/shellac|2006-06|Because it's a application, not a library +print/cups-lpr|print/cups-base|2006-06|Merged cups-lpr into cups-base +audio/mpck|audio/checkmate|2006-06-24|project was renamed +www/xpi-tablesort|www/xpi-tabletools|2006-06-27|Extension renamed +mail/rssyl|mail/sylpheed-claws-rssyl|2006-06-27|Moved to follow the rest of sypheed-claws nameing scheme +net/rwhois|net/rwhoisd/2006-06-27|Moved to an accurate name ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.database.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.database.mk,v 1.12 2006/06/16 04:53:43 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.database.mk,v 1.13 2006/06/28 11:38:42 rafan Exp $ # .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) @@ -19,10 +19,10 @@ # If no version is given (by the maintainer via the port or # by the user via defined variable), try to find the # currently installed version. Fall back to default if -# necessary (MySQL4.1 = 41). +# necessary (MySQL5.0 = 50). # DEFAULT_MYSQL_VER # - MySQL default version. Can be overriden within a port. -# Default: 41. +# Default: 50. # WANT_MYSQL_VER # - Maintainer can set an arbitrary version of MySQL by using it. # BROKEN_WITH_MYSQL ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#9 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.534 2006/06/16 04:53:43 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.535 2006/06/26 23:39:09 linimon Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -3045,6 +3045,12 @@ DEPENDS_TARGET+= clean DEPENDS_ARGS+= NOCLEANDEPENDS=yes .endif +.else +DEPENDS_ARGS+= FORCE_PKG_REGISTER=yes +.endif +.if defined(DEPENDS) +# pretty much guarantees overwrite of existing installation +.MAKEFLAGS: FORCE_PKG_REGISTER=yes .endif ################################################################ ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.python.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.python.mk,v 1.77 2006/06/16 15:43:52 perky Exp $ +# $FreeBSD: ports/Mk/bsd.python.mk,v 1.79 2006/06/23 03:35:14 perky Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include) @@ -288,7 +288,7 @@ 2> /dev/null || ${ECHO_CMD} ${LOCALBASE}) | ${TAIL} -1 DEPENDS_ARGS+= PYTHON_VERSION=${PYTHON_VERSION} _PYTHON_PORTVERSION!= (${PYTHON_CMD} -c 'import string, sys; \ - print string.split(sys.version)[0]' 2> /dev/null || ${ECHO_CMD} ${_PYTHON_PORTBRANCH}) | ${TAIL} -1 + print string.split(sys.version)[0].replace("b",".b")' 2> /dev/null) | ${TAIL} -1 .if !defined(PYTHON_NO_DEPENDS) && !empty(_PYTHON_PORTVERSION) PYTHON_PORTVERSION= ${_PYTHON_PORTVERSION} .endif @@ -298,7 +298,7 @@ # Python-2.5 .if ${PYTHON_VERSION} == "python2.5" -PYTHON_PORTVERSION?=2.5.a0.20060326 +PYTHON_PORTVERSION?=2.5.b1 PYTHON_PORTSDIR= ${PORTSDIR}/lang/python-devel PYTHON_REL= 250 PYTHON_SUFFIX= 25 @@ -353,15 +353,16 @@ .endif .if defined(PYTHON_REL) && ${PYTHON_REL} == 250 -PYTHON_MASTER_SITES= ${MASTER_SITE_LOCAL} -PYTHON_MASTER_SITE_SUBDIR= perky -PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION}.tgz +PYTHON_MASTER_SITES= ${MASTER_SITE_PYTHON} +PYTHON_MASTER_SITE_SUBDIR= ftp/python/2.5 +PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION:S/5.b/5b/}.tgz +PYTHON_WRKSRC= ${WRKDIR}/Python-${PYTHON_PORTVERSION:S/5.b/5b/} .else PYTHON_MASTER_SITES= ${MASTER_SITE_PYTHON} PYTHON_MASTER_SITE_SUBDIR= ftp/python/${PYTHON_PORTVERSION} PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION}.tgz +PYTHON_WRKSRC= ${WRKDIR}/Python-${PYTHON_PORTVERSION} .endif # defined(PYTHON_REL) && ${PYTHON_REL} == 250 -PYTHON_WRKSRC= ${WRKDIR}/Python-${PYTHON_PORTVERSION} PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/${PYTHON_VERSION} PYTHON_LIBDIR= ${PYTHONBASE}/lib/${PYTHON_VERSION} ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#2 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.371 2006/06/07 17:45:45 dougb Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.372 2006/06/23 02:25:30 ahze Exp $ # # Where to put distfiles that don't have any other master site @@ -700,31 +700,6 @@ ftp://melanoma.cs.rmit.edu.au/pub/NetBSD/packages/distfiles/%SUBDIR%/ .endif -.if !defined(IGNORE_MASTER_SITE_NETSCAPE) -MASTER_SITE_NETSCAPE+= \ - ftp://ftp.ciril.fr/pub2/netscape/%SUBDIR%/ \ - ftp://ftp.fu-berlin.de/unix/network/www/netscape/%SUBDIR%/ \ - ftp://ftp.sunet.se/pub/www/Netscape/%SUBDIR%/ \ - ftp://ftp.uit.no/pub/www/Netscape/%SUBDIR%/ \ - ftp://ftp.uni-bielefeld.de/pub/netscape/%SUBDIR%/ \ - ftp://ftp.uniovi.es/pub/netscape/%SUBDIR%/ \ - ftp://sunsite.cnlab-switch.ch/mirror/netscape/%SUBDIR%/ \ - ftp://ftp.mirrorservice.org/sites/ftp.netscape.com/pub/%SUBDIR%/ \ - ftp://ftp.ntua.gr/pub/www/Netscape/%SUBDIR%/ \ - ftp://sunsite.tut.fi/pub/Mirror/mirrorsite.netscape.com/pub/%SUBDIR%/ \ - ftp://ftp.fh-wolfenbuettel.de/pub/www/netscape/%SUBDIR%/ \ - ftp://ftp.cyf-kr.edu.pl/pub/mirror/netscape/%SUBDIR%/ \ - ftp://ftp.rz.uni-karlsruhe.de/pub/mirror/ftp.netscape.com/pub/%SUBDIR%/ \ - ftp://ftp.gftp.netscape.com/pub/%SUBDIR%/ \ - ftp://ftpnscp.newaol.com/pub/%SUBDIR%/ \ - ftp://ftp.hu-berlin.de/pub/www/netscape/%SUBDIR%/ \ - ftp://ftp.nsysu.edu.tw/Netscape/%SUBDIR%/ \ - ftp://ftp.uniroma2.it/%7bC/Netscape/%SUBDIR%/ \ - ftp://ftp.ut.ee/pub/WWW/netscape/%SUBDIR%/ \ - ftp://ftp.uni-bremen.de/pub/mirrors/ftp.netscape.com/pub/%SUBDIR%/ \ - ftp://ftp.informatik.rwth-aachen.de/pub/mirror/ftp.netscape.com/pub/%SUBDIR%/ -.endif - .if !defined(IGNORE_MASTER_SITE_OSSP) MASTER_SITE_OSSP+= \ ftp://ftp.ossp.org/pkg/%SUBDIR%/ \ ==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processonelog#2 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: ports/Tools/portbuild/scripts/processonelog,v 1.5 2004/12/09 04:14:51 linimon Exp $ +# $FreeBSD: ports/Tools/portbuild/scripts/processonelog,v 1.6 2006/06/24 19:51:53 linimon Exp $ # # Read a single errorlogfile and output a line of the format # $filename|$portname|$affected|$logsize|$dir|$maintainer|\ @@ -64,34 +64,16 @@ else reason="configure_error"; tag="configure" fi -elif grep -qE '(bison:.*(No such file|not found)|multiple definition of `yy)' $1; then - reason="bison"; tag="bison" elif grep -q "Couldn't fetch it - please try" $1; then reason="fetch"; tag="fetch" elif grep -q "out of .* hunks .*--saving rejects to" $1; then reason="patch"; tag="patch" elif grep -q 'Error: category .* not in list of valid categories' $1; then reason="CATEGORIES"; tag="categories" -elif grep -q 'make: don.t know how to make .*\.man. Stop' $1; then - reason="X_manpage"; tag="xfree4man" -elif grep -q 'Xm/Xm\.h: No such file' $1; then - reason="MOTIF"; tag="motif" -elif grep -q 'undefined reference to `Xp' $1; then - reason="MOTIFLIB"; tag="motiflib" elif grep -qi 'read-only file system' $1; then reason="WRKDIR"; tag="wrkdir" -elif grep -q 'makeinfo: .* use --force' $1; then - reason="texinfo"; tag="texinfo" -elif grep -q 'means that you did not run the h2ph script' $1; then - reason="perl5"; tag="perl5" elif grep -q "Error: shared library \".*\" does not exist" $1; then reason="LIB_DEPENDS"; tag="libdepends" -elif grep -qE "(crt0|c\+\+rt0)\.o: No such file" $1; then - reason="ELF"; tag="elf" -elif grep -q "machine/soundcard.h: No such file or directory" $1; then - reason="soundcard.h"; tag="soundcard.h" -elif grep -q "values.h: No such file or directory" $1; then - reason="values.h"; tag="values.h" elif grep -q ".*\.h: No such file" $1; then if grep -qE "(X11/.*|Xosdefs)\.h: No such file" $1; then if grep -q "XFree86-.*\.tgz" $1; then @@ -110,11 +92,11 @@ reason="runaway_process"; tag="runaway" elif grep -qE "pkg_add: (can't find enough temporary space|projected size of .* exceeds available free space)" $1; then reason="disk_full"; tag="df" -elif grep -qE '(parse error|too (many|few) arguments to|argument.*doesn.*prototype|incompatible type for argument|conflicting types for|undeclared \(first use (in |)this function\)|incorrect number of parameters|has incomplete type and cannot be initialized)' $1; then +elif grep -qE '(parse error|too (many|few) arguments to|argument.*doesn.*prototype|incompatible type for argument|conflicting types for|undeclared \(first use (in |)this function\)|incorrect number of parameters|has incomplete type and cannot be initialized|error: storage size.* isn.t known)' $1; then reason="compiler_error"; tag="cc" -elif grep -qE '(ANSI C.. forbids|is a contravariance violation|changed for new ANSI .for. scoping|[0-9]: passing .* changes signedness|discards qualifiers|lacks a cast|redeclared as different kind of symbol|invalid type .* for default argument to|wrong type argument to unary exclamation mark|duplicate explicit instantiation of|incompatible types in assignment|assuming . on overloaded member function|call of overloaded .* is ambiguous|declaration of C function .* conflicts with|initialization of non-const reference type|using typedef-name .* after|[0-9]: implicit declaration of function|[0-9]: size of array .* is too large|fixed or forbidden register .* for class)' $1; then +elif grep -qE '(ANSI C.. forbids|is a contravariance violation|changed for new ANSI .for. scoping|[0-9]: passing .* changes signedness|discards qualifiers|lacks a cast|redeclared as different kind of symbol|invalid type .* for default argument to|wrong type argument to unary exclamation mark|duplicate explicit instantiation of|incompatible types in assignment|assuming . on overloaded member function|call of overloaded .* is ambiguous|declaration of C function .* conflicts with|initialization of non-const reference type|using typedef-name .* after|[0-9]: implicit declaration of function|[0-9]: size of array .* is too large|fixed or forbidden register .* for class|assignment of read-only variable|error: label at end of compound statement|error:.*(has no|is not a) member|error:.*is (private|protected)|error: uninitialized member|error: unrecognized command line option)' $1; then reason="new_compiler_error"; tag="newgcc" -elif grep -qE '(syntax error before|ISO C\+\+ forbids|friend declaration|no matching function for call to|.main. must return .int.|invalid conversion from|cannot be used as a macro name as it is an operator in C\+\+|is not a member of type|after previous specification in|no class template named|because worst conversion for the former|better than worst conversion|no match for.*operator|no match for call to|undeclared in namespace|is used as a type, but is not)' $1; then +elif grep -qE '(syntax error before|ISO C\+\+ forbids|friend declaration|no matching function for call to|.main. must return .int.|invalid conversion from|cannot be used as a macro name as it is an operator in C\+\+|is not a member of type|after previous specification in|no class template named|because worst conversion for the former|better than worst conversion|no match for.*operator|no match for call to|undeclared in namespace|is used as a type, but is not|error: array bound forbidden|error: class definition|error: expected constructor|error: there are no arguments|error:.*cast.*loses precision|ISO C\+\+ does not support)' $1; then reason="bad_C++_code"; tag="badc++" elif grep -qE '(/usr/libexec/elf/ld: cannot find|undefined reference to|cannot open -l.*: No such file)' $1; then reason="linker_error"; tag="ld" @@ -132,20 +114,18 @@ reason="manpage"; tag="manpage" elif grep -qE "(Can't|unable to) open display" $1; then reason="DISPLAY"; tag="display" +elif grep -q "conflicts with installed package" $1; then + reason="depend_object"; tag="dependobj" elif grep -q " is already installed - perhaps an older version" $1; then reason="depend_object"; tag="dependobj" elif grep -q "You may wish to ..make deinstall.. and install this port again" $1; then reason="depend_object"; tag="dependobj" elif grep -q "error in dependency .*, exiting" $1; then reason="depend_package"; tag="dependpkg" -elif grep -q "#error \" has been replaced by \"" $1; then - reason="malloc.h"; tag="malloc.h" elif grep -q "core dumped" $1; then reason="coredump"; tag="coredump" elif grep -q "Segmentation fault" $1; then reason="segfault"; tag="segfault" -elif egrep -q "storage size of.*isn't known" $1; then - reason="union_wait"; tag="wait" elif grep -q "initializer element is not constant" $1; then reason="stdio"; tag="stdio" elif grep -q "structure has no member named" $1; then @@ -182,6 +162,8 @@ reason="arch"; tag="arch" elif grep -qE "inconsistent operand constraints in an .asm" $1; then reason="arch"; tag="arch" +elif grep -qE "Invalid configuration.*unknown.*machine.*unknown not recognized" $1; then + reason="arch"; tag="arch" elif grep -q "invalid lvalue in asm statement" $1; then reason="arch"; tag="arch" elif grep -qE "is only for.*, and you are running" $1; then @@ -192,6 +174,8 @@ reason="arch"; tag="arch" elif grep -q "relocation truncated to fit: " $1; then reason="arch"; tag="arch" +elif grep -q "shminit failed: Function not implemented" $1; then + reason="arch"; tag="arch" elif grep -qE "The target cpu, .*, is not currently supported." $1; then reason="arch"; tag="arch" elif grep -q "This architecture seems to be neither big endian nor little endian" $1; then @@ -214,14 +198,6 @@ reason="autoheader"; tag="autoheader" elif grep -qE "automake(.*): not found" $1; then reason="automake"; tag="automake" -elif grep -q "awk: empty regular expression" $1; then - reason="awk"; tag="awk" -elif grep -qE "(mv:|mv: rename|cannot open) y.tab.c(.*): No such file or directory" $1; then - reason="bison"; tag="bison" -elif grep -q "sorry, cannot determine the header file bison generates" $1; then - reason="bison"; tag="bison" -elif grep -q "usage: yacc" $1; then - reason="bison"; tag="bison" elif grep -q "/usr/local/www/cgi-bin does not exist" $1; then reason="cgi-bin"; tag="cgi-bin" elif grep -q "Cannot open /dev/tty for read" $1; then @@ -230,46 +206,40 @@ reason="DISPLAY"; tag="display" elif grep -q "You must run this program under the X-Window System" $1; then reason="DISPLAY"; tag="display" -elif grep -q "ld: unrecognised emulation mode: elf_i386" $1; then - reason="ELF"; tag="elf" elif grep -qE "Member name contains .\.\." $1; then reason="fetch"; tag="fetch" elif grep -q "fetch: transfer timed out" $1; then reason="fetch_timeout"; tag="fetch-timeout" elif grep -q "fetch: transfer timed out" $1; then reason="fetch_timeout"; tag="fetch-timeout" -elif grep -q "strings.h:.* previous declaration of .int ffs" $1; then - reason="ffs_conflict"; tag="ffs_conflict" -elif grep -q "is forbidden: FreeBSD-SA-" $1; then - reason="forbidden"; tag="forbidden" -elif grep -q "/usr/bin/ld: cannot find -lgnugetopt" $1; then - reason="getopt"; tag="getopt" -elif grep -qE "previous declaration.*int getopt" $1; then - reason="getopt.h"; tag="getopt.h" -elif grep -q "imake: Exit code 1" $1; then - reason="imake"; tag="imake" elif grep -q 'Run-time system build failed for some reason' $1; then reason="install_error"; tag="install" -elif grep -q "/usr/bin/ld: cannot find -lc_r" $1; then - reason="lc_r"; tag="lc_r" +elif grep -q 'tar: Error opening archive: Failed to open.*No such file or directory' $1; then + reason="install_error"; tag="install" elif grep -q "cc: .*libintl.*: No such file or directory" $1; then reason="linker_error"; tag="ld" elif grep -qE "cc: ndbm\.so: No such file or directory" $1; then reason="linker_error"; tag="ld" elif grep -q "error: The X11 shared library could not be loaded" $1; then reason="linker_error"; tag="ld" +elif grep -q "libtool: link: cannot find the library" $1; then + reason="linker_error"; tag="ld" elif grep -q "relocation against dynamic symbol" $1; then reason="linker_error"; tag="ld" -elif grep -qE "make.*(don.t know how to make|fatal errors encountered|No rule to make target|built-in)" $1; then +elif grep -q "Shared object.*not found, required by" $1; then + reason="linker_error"; tag="ld" +elif grep -q "Could not create Makefile" $1; then + reason="makefile"; tag="makefile" +elif grep -v "regression-test.continuing" $1 | grep -qE "make.*(cannot open [Mm]akefile|don.t know how to make|fatal errors encountered|No rule to make target|built-in)"; then reason="makefile"; tag="makefile" -elif grep -qE "Error: mtree file ./etc/mtree/BSD.local.dist. is missing" $1; then +elif grep -qE "(Error: mtree file ./etc/mtree/BSD.local.dist. is missing|error in pkg_delete|filesystem was touched prior to .make install|list of files present before this port was installed|list of filesystem changes from before and after)" $1; then reason="mtree"; tag="mtree" elif grep -qE "cp:.*site_perl: No such file or directory" $1; then reason="perl"; tag="perl" elif grep -q "Perl .* required--this is only version" $1; then reason="perl"; tag="perl" -elif grep -q "pod2man: not found" $1; then - reason="pod2man"; tag="pod2man" +elif grep -q 'BEGIN failed--compilation aborted at ..Makefile.PL line' $1; then + reason="perl5"; tag="perl5" elif grep -q "Syntax error: .(. unexpected (expecting .fi.)" $1; then reason="portcomment"; tag="portcomment" elif grep -q "Abort trap" $1; then @@ -280,12 +250,6 @@ reason="process_failed"; tag="process" elif grep -q "python: not found" $1; then reason="python"; tag="python" -elif grep -qE "sed: illegal option" $1; then - reason="sed"; tag="sed" -elif grep -qE "sed: [0-9]*:.*(RE error:|not defined in the RE|bad flag in substitute command|unescaped newline inside substitute pattern|invalid command code)" $1; then - reason="sed"; tag="sed" -elif grep -q "Your STL string implementation is unusable" $1; then - reason="stl"; tag="stl" elif grep -q ': The -pthread option is deprecated' $1; then reason="threads"; tag="threads" elif grep -q "Error: pthreads are required to build this package" $1; then @@ -306,6 +270,8 @@ # types of errors, and thus need to be evaluated after all the specific # cases. +elif grep -qE '(gmake:.*Error [12]|tar: Error exit delayed from previous errors)' $1; then + reason="install_error"; tag="install" elif grep -q "Cannot stat: " $1; then reason="configure_error"; tag="configure" elif grep -q "cd: can't cd to" $1; then ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/tindex#3 (text+ko) ==== @@ -112,7 +112,7 @@ } createtmpdir() { - TMPDIR=`ssh ${SCP_DEST_HOST} "mktemp -qd /tmp/tindex.XXXXXX"` + TMPDIR=`ssh ${SCP_DEST_HOST} "mktemp -qd ${SCP_DEST_TMP}/tindex.XXXXXX"` if [ $? -ne 0 ]; then echo "$0: Can't create temp file, exiting..." exit 1 ==== //depot/projects/soc2006/gabor_ports/UPDATING#3 (text+ko) ==== @@ -6,11 +6,48 @@ time you update your ports collection, before attempting any port upgrades. -20060616 +20060624: + AFFECTS: users of audio/mt-daapd + AUTHOR: alex@foxybanana.com + + The default database directory has been changed to /var/db/mt-daapd. The + default mp3 dir has been changed to ${PREFIX}/share/mt-daapd. Old + configuration files will be maintained, if present, so no updating should + be required. + +20060624: + AFFECTS: users of net/py-bittorrent-devel and net/py-bittorrent-core-devel + AUTHOR: lioux@FreeBSD.org + + This version has been specially patched to enable + launchmany-{console,curses}. This is experimental. + +20060624: + AFFECTS: users of net/py-bittorrent and net/py-bittorrent-core + AUTHOR: lioux@FreeBSD.org + + launchmany-{console,curses} do not work under this version. + +20060622: + AFFECTS: users of www/dokuwiki + AUTHOR: miwi@freebsd.org + + The default install location has changed from + ${PREFIX}/www/data/dokuwiki to ${PREFIX}/www/dokuwiki. + +20060622: + AFFECTS: users of databases/mysql-client + AUTHOR: ale@FreeBSD.org + + MySQL version 5.0 is now the default. If you have only the client + port, you can upgrade all ports with: + portupgrade -rfo databases/mysql50-client mysql-client + +20060616: AFFECTS users of all pfpro ports AUTHOR: aaron@FreeBSD.org - The default certificate location has been changed to respect hier(7). + The default certificate location has been changed to respect hier(7). The new default location is LOCALBASE/etc/pfpro/certs. 20060616: @@ -3675,4 +3712,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.345 2006/06/20 19:24:32 linimon Exp $ +$FreeBSD: ports/UPDATING,v 1.350 2006/06/25 13:19:27 itetcu Exp $ From owner-p4-projects@FreeBSD.ORG Wed Jun 28 15:49:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21ED416A4C2; Wed, 28 Jun 2006 15:49:29 +0000 (UTC) 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 D9E9A16A494 for ; Wed, 28 Jun 2006 15:49:28 +0000 (UTC) (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 10E4844A94 for ; Wed, 28 Jun 2006 15:17:01 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SFH0R9015341 for ; Wed, 28 Jun 2006 15:17:00 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SFH01v015337 for perforce@freebsd.org; Wed, 28 Jun 2006 15:17:00 GMT (envelope-from jhb@freebsd.org) Date: Wed, 28 Jun 2006 15:17:00 GMT Message-Id: <200606281517.k5SFH01v015337@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 100207 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, 28 Jun 2006 15:49:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=100207 Change 100207 by jhb@jhb_mutex on 2006/06/28 15:16:02 - Add kern_getsockname() and kern_getpeername() and use them to eliminate some stackgap usage in svr4. Affected files ... .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#29 edit .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#78 edit .. //depot/projects/smpng/sys/sys/syscallsubr.h#33 edit Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#29 (text+ko) ==== @@ -992,7 +992,6 @@ struct sockaddr *skp; int sasize; struct svr4_strmcmd bnd; - struct bind_args ba; if (st == NULL) { DPRINTF(("ti_bind: bad file descriptor\n")); @@ -1012,7 +1011,7 @@ switch (st->s_family) { case AF_INET: - skp = &sain; + skp = (struct sockaddr *)&sain; sasize = sizeof(sain); if (bnd.offs == 0) @@ -1026,7 +1025,7 @@ break; case AF_LOCAL: - skp = &saun; + skp = (struct sockaddr *)&saun; sasize = sizeof(saun); if (bnd.offs == 0) goto error; @@ -1117,13 +1116,9 @@ struct svr4_strbuf skb, *sub = (struct svr4_strbuf *) dat; struct svr4_strm *st = svr4_stream_get(fp); int error; - void *skp, *sup; - struct sockaddr_in sain; - struct sockaddr_un saun; + struct sockaddr *sa; + socklen_t sasize, oldsasize; struct svr4_strmcmd sc; - int sasize, oldsasize; - caddr_t sg; - int *lenp; DPRINTF(("svr4_stream_ti_ioctl\n")); @@ -1139,13 +1134,11 @@ switch (st->s_family) { case AF_INET: - skp = &sain; - sasize = sizeof(sain); + sasize = sizeof(struct sockaddr_in); break; case AF_LOCAL: - skp = &saun; - sasize = sizeof(saun); + sasize = sizeof(struct sockaddr_un); break; default: @@ -1153,25 +1146,14 @@ st->s_family)); return ENOSYS; } - - sg = stackgap_init(); - sup = stackgap_alloc(&sg, sasize); - lenp = stackgap_alloc(&sg, sizeof(*lenp)); - - if ((error = copyout(&sasize, lenp, sizeof(*lenp))) != 0) { - DPRINTF(("ti_ioctl: error copying out lenp\n")); - return error; - } + oldsasize = sasize; switch (cmd) { case SVR4_TI_GETMYNAME: DPRINTF(("TI_GETMYNAME\n")); { - struct getsockname_args ap; - ap.fdes = fd; - ap.asa = sup; - ap.alen = lenp; - if ((error = getsockname(td, &ap)) != 0) { + error = kern_getsockname(td, fd, &sa, &sasize); + if (error) { DPRINTF(("ti_ioctl: getsockname error\n")); return error; } @@ -1181,11 +1163,8 @@ case SVR4_TI_GETPEERNAME: DPRINTF(("TI_GETPEERNAME\n")); { - struct getpeername_args ap; - ap.fdes = fd; - ap.asa = sup; - ap.alen = lenp; - if ((error = getpeername(td, &ap)) != 0) { + error = kern_getpeername(td, fd, &sa, &sasize); + if (error) { DPRINTF(("ti_ioctl: getpeername error\n")); return error; } @@ -1204,36 +1183,27 @@ return ENOSYS; } - if ((error = copyin(sup, skp, sasize)) != 0) { - DPRINTF(("ti_ioctl: error copying in socket data\n")); - return error; + if (sasize < 0 || sasize > oldsasize) { + free(sa, M_SONAME); + return EINVAL; } - oldsasize = sasize; - - if ((error = copyin(lenp, &sasize, sizeof(*lenp))) != 0) { - DPRINTF(("ti_ioctl: error copying in socket size\n")); - return error; - } - - if (sasize < 0 || sasize > oldsasize) - return EINVAL; - switch (st->s_family) { case AF_INET: - sockaddr_to_netaddr_in(&sc, &sain); + sockaddr_to_netaddr_in(&sc, (struct sockaddr_in *)sa); skb.len = sasize; break; case AF_LOCAL: - sockaddr_to_netaddr_un(&sc, &saun); + sockaddr_to_netaddr_un(&sc, (struct sockaddr_un *)sa); skb.len = sasize + 4; break; default: + free(sa, M_SONAME); return ENOSYS; } - + free(sa, M_SONAME); if ((error = copyout(SVR4_ADDROF(&sc), skb.buf, sasize)) != 0) { DPRINTF(("ti_ioctl: error copying out socket data\n")); ==== //depot/projects/smpng/sys/kern/uipc_syscalls.c#78 (text+ko) ==== @@ -1459,48 +1459,64 @@ } */ *uap; int compat; { + struct sockaddr *sa; + socklen_t len; + int error; + + error = copyin(uap->alen, &len, sizeof(len)); + if (error) + return (error); + + error = kern_getsockname(td, uap->fdes, &sa, &len); + if (error) + return (error); + + if (len != 0) { +#ifdef COMPAT_OLDSOCK + if (compat) + ((struct osockaddr *)sa)->sa_family = sa->sa_family; +#endif + error = copyout(sa, uap->asa, (u_int)len); + } + free(sa, M_SONAME); + if (error == 0) + error = copyout(&len, uap->alen, sizeof(len)); + return (error); +} + +int +kern_getsockname(struct thread *td, int fd, struct sockaddr **sa, + socklen_t *alen) +{ struct socket *so; - struct sockaddr *sa; struct file *fp; socklen_t len; int error; + if (*alen < 0) + return (EINVAL); + NET_LOCK_GIANT(); - error = getsock(td->td_proc->p_fd, uap->fdes, &fp, NULL); + error = getsock(td->td_proc->p_fd, fd, &fp, NULL); if (error) - goto done2; + goto done; so = fp->f_data; - error = copyin(uap->alen, &len, sizeof (len)); - if (error) - goto done1; - if (len < 0) { - error = EINVAL; - goto done1; - } - sa = 0; - error = (*so->so_proto->pr_usrreqs->pru_sockaddr)(so, &sa); + *sa = NULL; + error = (*so->so_proto->pr_usrreqs->pru_sockaddr)(so, sa); if (error) goto bad; - if (sa == 0) { + if (*sa == NULL) len = 0; - goto gotnothing; - } - - len = MIN(len, sa->sa_len); -#ifdef COMPAT_OLDSOCK - if (compat) - ((struct osockaddr *)sa)->sa_family = sa->sa_family; -#endif - error = copyout(sa, uap->asa, (u_int)len); - if (error == 0) -gotnothing: - error = copyout(&len, uap->alen, sizeof (len)); + else + len = MIN(*alen, (*sa)->sa_len); + *alen = len; bad: - if (sa) - FREE(sa, M_SONAME); -done1: fdrop(fp, td); -done2: + if (error && *sa) { + free(*sa, M_SONAME); + *sa = NULL; + } +done: NET_UNLOCK_GIANT(); return (error); } @@ -1547,14 +1563,45 @@ } */ *uap; int compat; { + struct sockaddr *sa; + socklen_t len; + int error; + + error = copyin(uap->alen, &len, sizeof (len)); + if (error) + return (error); + + error = kern_getpeername(td, uap->fdes, &sa, &len); + if (error) + return (error); + + if (len != 0) { +#ifdef COMPAT_OLDSOCK + if (compat) + ((struct osockaddr *)sa)->sa_family = sa->sa_family; +#endif + error = copyout(sa, uap->asa, (u_int)len); + } + free(sa, M_SONAME); + if (error == 0) + error = copyout(&len, uap->alen, sizeof(len)); + return (error); +} + +int +kern_getpeername(struct thread *td, int fd, struct sockaddr **sa, + socklen_t *alen) +{ struct socket *so; - struct sockaddr *sa; struct file *fp; socklen_t len; int error; + if (*alen < 0) + return (EINVAL); + NET_LOCK_GIANT(); - error = getsock(td->td_proc->p_fd, uap->fdes, &fp, NULL); + error = getsock(td->td_proc->p_fd, fd, &fp, NULL); if (error) goto done2; so = fp->f_data; @@ -1562,35 +1609,20 @@ error = ENOTCONN; goto done1; } - error = copyin(uap->alen, &len, sizeof (len)); - if (error) - goto done1; - if (len < 0) { - error = EINVAL; - goto done1; - } - sa = 0; - error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, &sa); + *sa = NULL; + error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, sa); if (error) goto bad; - if (sa == 0) { + if (*sa == NULL) len = 0; - goto gotnothing; + else + len = MIN(*alen, (*sa)->sa_len); + *alen = len; +bad: + if (error && *sa) { + free(*sa, M_SONAME); + *sa = NULL; } - len = MIN(len, sa->sa_len); -#ifdef COMPAT_OLDSOCK - if (compat) - ((struct osockaddr *)sa)->sa_family = - sa->sa_family; -#endif - error = copyout(sa, uap->asa, (u_int)len); - if (error) - goto bad; -gotnothing: - error = copyout(&len, uap->alen, sizeof (len)); -bad: - if (sa) - FREE(sa, M_SONAME); done1: fdrop(fp, td); done2: ==== //depot/projects/smpng/sys/sys/syscallsubr.h#33 (text+ko) ==== @@ -82,7 +82,11 @@ int kern_getfsstat(struct thread *td, struct statfs **buf, size_t bufsize, enum uio_seg bufseg, int flags); int kern_getitimer(struct thread *, u_int, struct itimerval *); +int kern_getpeername(struct thread *td, int fd, struct sockaddr **sa, + socklen_t *alen); int kern_getrusage(struct thread *td, int who, struct rusage *rup); +int kern_getsockname(struct thread *td, int fd, struct sockaddr **sa, + socklen_t *alen); int kern_getsockopt(struct thread *td, int s, int level, int name, void *optval, enum uio_seg valseg, socklen_t *valsize); int kern_kevent(struct thread *td, int fd, int nchanges, int nevents, From owner-p4-projects@FreeBSD.ORG Wed Jun 28 17:19:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1351E16A412; Wed, 28 Jun 2006 17:19:40 +0000 (UTC) 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 E47CD16A40F for ; Wed, 28 Jun 2006 17:19:39 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FFE244DE3 for ; Wed, 28 Jun 2006 17:19:39 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SHJdkI034428 for ; Wed, 28 Jun 2006 17:19:39 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SHJdBF034425 for perforce@freebsd.org; Wed, 28 Jun 2006 17:19:39 GMT (envelope-from imp@freebsd.org) Date: Wed, 28 Jun 2006 17:19:39 GMT Message-Id: <200606281719.k5SHJdBF034425@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 100217 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, 28 Jun 2006 17:19:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=100217 Change 100217 by imp@imp_lighthouse on 2006/06/28 17:18:56 Camelot is a silly place. Let's not go there. After looking at the code, I've convinced myself that these macros obfuscate things too much. punt! Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#30 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#30 (text+ko) ==== @@ -45,11 +45,6 @@ #include "uart_if.h" -/* Macros to clear/set/test flags. */ -#define SET(t, f) (t) |= (f) -#define CLR(t, f) (t) &= ~(f) -#define ISSET(t, f) ((t) & (f)) - #define DEFAULT_RCLK AT91C_MASTER_CLOCK #define USART_BUFFER_SIZE 128 @@ -246,7 +241,7 @@ at91_usart_putc(struct uart_bas *bas, int c) { - while (!(ISSET(RD4(bas, USART_CSR), USART_CSR_TXRDY))) + while (!(RD4(bas, USART_CSR) & USART_CSR_TXRDY)) continue; WR4(bas, USART_THR, c); } @@ -258,7 +253,7 @@ at91_usart_poll(struct uart_bas *bas) { - if (!ISSET(RD4(bas, USART_CSR), USART_CSR_RXRDY)) + if (!(RD4(bas, USART_CSR) & USART_CSR_RXRDY)) return (-1); return (RD4(bas, USART_RHR) & 0xff); } @@ -271,7 +266,7 @@ { int c; - while (!ISSET(RD4(bas, USART_CSR), USART_CSR_RXRDY)) + while (!(RD4(bas, USART_CSR) & USART_CSR_RXRDY)) continue; c = RD4(bas, USART_RHR); c &= 0xff; @@ -335,8 +330,8 @@ */ WR4(&sc->sc_bas, USART_IDR, 0xffffffff); WR4(&sc->sc_bas, USART_IER, USART_CSR_TIMEOUT); - if (ISSET(RD4(&sc->sc_bas, USART_IMR), USART_CSR_TIMEOUT)) - SET(atsc->flags, HAS_TIMEOUT); + if (RD4(&sc->sc_bas, USART_IMR) & USART_CSR_TIMEOUT) + atsc->flags |= HAS_TIMEOUT; WR4(&sc->sc_bas, USART_IDR, 0xffffffff); sc->sc_txfifosz = USART_BUFFER_SIZE; @@ -354,7 +349,7 @@ err = bus_dmamap_create(atsc->dmatag, 0, &atsc->tx_map); if (err != 0) goto errout; - if (ISSET(atsc->flags, HAS_TIMEOUT)) { + if (atsc->flags & HAS_TIMEOUT) { for (i = 0; i < 2; i++) { err = bus_dmamap_create(atsc->dmatag, 0, &atsc->ping_pong[i].map); @@ -389,7 +384,7 @@ * we get an interrupt 1/2 way through the software 'fifo' we have * to avoid overruns. */ - if (ISSET(atsc->flags, HAS_TIMEOUT)) { + if (atsc->flags & HAS_TIMEOUT) { WR4(&sc->sc_bas, PDC_RPR, atsc->ping->pa); WR4(&sc->sc_bas, PDC_RCR, sc->sc_rxfifosz); WR4(&sc->sc_bas, PDC_RNPR, atsc->pong->pa); @@ -458,22 +453,22 @@ do { old = sc->sc_hwsig; new = old; - if (ISSET(sig, SER_DDTR)) + if (sig & SER_DDTR) SIGCHG(sig & SER_DTR, new, SER_DTR, SER_DDTR); - if (ISSET(sig, SER_DRTS)) + if (sig & SER_DRTS) SIGCHG(sig & SER_RTS, new, SER_RTS, SER_DRTS); } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); bas = &sc->sc_bas; uart_lock(sc->sc_hwmtx); cr = 0; - if (ISSET(new, SER_DTR)) - SET(cr, USART_CR_DTREN); + if (new & SER_DTR) + cr |= USART_CR_DTREN; else - SET(cr, USART_CR_DTRDIS); - if (ISSET(new, SER_RTS)) - SET(cr, USART_CR_RTSEN); + cr |= USART_CR_DTRDIS; + if (new & SER_RTS) + cr |= USART_CR_RTSEN; else - SET(cr, USART_CR_RTSDIS); + cr |= USART_CR_RTSDIS; WR4(bas, USART_CR, cr); uart_unlock(sc->sc_hwmtx); return (0); @@ -501,17 +496,17 @@ struct at91_usart_rx *p; atsc = (struct at91_usart_softc *)sc; - if (ISSET(csr, USART_CSR_ENDTX)) { + if (csr & USART_CSR_ENDTX) { bus_dmamap_sync(atsc->dmatag, atsc->tx_map, BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(atsc->dmatag, atsc->tx_map); } uart_lock(sc->sc_hwmtx); - if (ISSET(csr, USART_CSR_TXRDY) && sc->sc_txbusy) { + if ((csr & USART_CSR_TXRDY) && sc->sc_txbusy) { ipend |= SER_INT_TXIDLE; WR4(&sc->sc_bas, USART_IDR, USART_CSR_TXRDY); } - if (ISSET(csr, USART_CSR_ENDTX) && sc->sc_txbusy) + if ((csr & USART_CSR_ENDTX) && sc->sc_txbusy) ipend |= SER_INT_TXIDLE; /* * Due to the contraints of the DMA engine present in the @@ -519,7 +514,7 @@ * and do all the work elsewhere. I need to look at the CSR * bits right now and do things based on them to avoid races. */ - if (ISSET(atsc->flags, HAS_TIMEOUT) && ISSET(csr, USART_CSR_RXBUFF)) { + if ((atsc->flags & HAS_TIMEOUT) && (csr & USART_CSR_RXBUFF)) { // Have a buffer overflow. Copy all data from both // ping and pong. Insert overflow character. Reset // ping and pong and re-enable the PDC to receive @@ -533,7 +528,7 @@ for (i = 0; i < sc->sc_rxfifosz; i++) uart_rx_put(sc, atsc->pong->buffer[i]); uart_rx_put(sc, UART_STAT_OVERRUN); - CLR(csr, USART_CSR_ENDRX | USART_CSR_TIMEOUT); + csr &= ~(USART_CSR_ENDRX | USART_CSR_TIMEOUT); WR4(&sc->sc_bas, PDC_RPR, atsc->ping->pa); WR4(&sc->sc_bas, PDC_RCR, sc->sc_rxfifosz); WR4(&sc->sc_bas, PDC_RNPR, atsc->pong->pa); @@ -541,7 +536,7 @@ WR4(&sc->sc_bas, PDC_PTCR, PDC_PTCR_RXTEN); ipend |= SER_INT_RXREADY; } - if (ISSET(atsc->flags, HAS_TIMEOUT) && ISSET(csr, USART_CSR_ENDRX)) { + if ((atsc->flags & HAS_TIMEOUT) && (csr & USART_CSR_ENDRX)) { // Shuffle data from 'ping' of ping pong buffer, but // leave current 'pong' in place, as it has become the // new 'ping'. We need to copy data and setup the old @@ -557,7 +552,7 @@ WR4(&sc->sc_bas, PDC_RNCR, sc->sc_rxfifosz); ipend |= SER_INT_RXREADY; } - if (ISSET(atsc->flags, HAS_TIMEOUT) && ISSET(csr, USART_CSR_TIMEOUT)) { + if ((atsc->flags & HAS_TIMEOUT) && (csr & USART_CSR_TIMEOUT)) { // We have one partial buffer. We need to stop the // PDC, get the number of characters left and from // that compute number of valid characters. We then @@ -573,14 +568,14 @@ WR4(&sc->sc_bas, PDC_PTCR, PDC_PTCR_RXTEN); ipend |= SER_INT_RXREADY; } - if (!ISSET(atsc->flags, HAS_TIMEOUT) && ISSET(csr, USART_CSR_RXRDY)) { + if (!(atsc->flags & HAS_TIMEOUT) && (csr & USART_CSR_RXRDY)) { // We have another charater in a device that doesn't support // timeouts, so we do it one character at a time. uart_rx_put(sc, RD4(&sc->sc_bas, USART_RHR) & 0xff); ipend |= SER_INT_RXREADY; } - if (ISSET(csr, USART_CSR_RXBRK)) { + if (csr & USART_CSR_RXBRK) { unsigned int cr = USART_CR_RSTSTA; ipend |= SER_INT_BREAK; @@ -604,14 +599,14 @@ uart_lock(sc->sc_hwmtx); csr = RD4(&sc->sc_bas, USART_CSR); sig = 0; - if (ISSET(csr, USART_CSR_CTS)) - SET(sig, SER_CTS); - if (ISSET(csr, USART_CSR_DCD)) - SET(sig, SER_DCD); - if (ISSET(csr, USART_CSR_DSR)) - SET(sig, SER_DSR); - if (ISSET(csr, USART_CSR_RI)) - SET(sig, SER_RI); + if (csr & USART_CSR_CTS) + sig |= SER_CTS; + if (csr & USART_CSR_DCD) + sig |= SER_DCD; + if (csr & USART_CSR_DSR) + sig |= SER_DSR; + if (csr & USART_CSR_RI) + sig |= SER_RI; new = sig & ~SER_MASK_DELTA; sc->sc_hwsig = new; uart_unlock(sc->sc_hwmtx); From owner-p4-projects@FreeBSD.ORG Wed Jun 28 17:31:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87E9416A416; Wed, 28 Jun 2006 17:31:43 +0000 (UTC) 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 4AFFD16A408 for ; Wed, 28 Jun 2006 17:31:43 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1182F44CDE for ; Wed, 28 Jun 2006 17:09:26 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SH9PeG031006 for ; Wed, 28 Jun 2006 17:09:25 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SH9PTl030995 for perforce@freebsd.org; Wed, 28 Jun 2006 17:09:25 GMT (envelope-from imp@freebsd.org) Date: Wed, 28 Jun 2006 17:09:25 GMT Message-Id: <200606281709.k5SH9PTl030995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 100215 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, 28 Jun 2006 17:31:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=100215 Change 100215 by imp@imp_lighthouse on 2006/06/28 17:08:42 Minor nits Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#29 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#29 (text+ko) ==== @@ -213,19 +213,17 @@ } /* - * Initialize this device (I think as the console) + * Initialize this device for use as a console. */ static void at91_usart_init(struct uart_bas *bas, int baudrate, int databits, int stopbits, int parity) { - int cr; at91_usart_param(bas, baudrate, databits, stopbits, parity); - /* Turn on rx and tx */ - cr = USART_CR_RSTSTA | USART_CR_RSTRX | USART_CR_RSTTX; - WR4(bas, USART_CR, cr); + /* Reset the rx and tx buffers and turn on rx and tx */ + WR4(bas, USART_CR, USART_CR_RSTSTA | USART_CR_RSTRX | USART_CR_RSTTX); WR4(bas, USART_CR, USART_CR_RXEN | USART_CR_TXEN); WR4(bas, USART_IDR, 0xffffffff); } From owner-p4-projects@FreeBSD.ORG Wed Jun 28 18:03:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B75BE16A4D4; Wed, 28 Jun 2006 18:03:00 +0000 (UTC) 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 128E016A53C for ; Wed, 28 Jun 2006 18:03:00 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 935C844C8C for ; Wed, 28 Jun 2006 17:07:22 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SH7MZ9030924 for ; Wed, 28 Jun 2006 17:07:22 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SH7M4Z030921 for perforce@freebsd.org; Wed, 28 Jun 2006 17:07:22 GMT (envelope-from piso@freebsd.org) Date: Wed, 28 Jun 2006 17:07:22 GMT Message-Id: <200606281707.k5SH7M4Z030921@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 100214 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, 28 Jun 2006 18:03:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=100214 Change 100214 by piso@piso_newluxor on 2006/06/28 17:07:18 Sparc64 compiles again now: while here fixes a bunch of unconverted drivers. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/esp/esp_sbus.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/gem/if_gem_pci.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/hme/if_hme_sbus.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/isp/isp_sbus.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/le/if_le_ledma.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/pcf/envctrl.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/pcf/pcf_ebus.c#2 edit .. //depot/projects/soc2006/intr_filter/sparc64/include/intr_machdep.h#3 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/esp/esp_sbus.c#2 (text+ko) ==== @@ -687,7 +687,7 @@ return (ENXIO); } if (bus_setup_intr(esc->sc_dev, esc->sc_irqres, - INTR_TYPE_BIO|INTR_MPSAFE, ncr53c9x_intr, sc, &esc->sc_irq)) { + INTR_TYPE_BIO|INTR_MPSAFE, NULL, ncr53c9x_intr, sc, &esc->sc_irq)) { device_printf(esc->sc_dev, "cannot set up interrupt\n"); error = ENXIO; goto fail_ires; ==== //depot/projects/soc2006/intr_filter/dev/gem/if_gem_pci.c#2 (text+ko) ==== @@ -210,7 +210,7 @@ } if (bus_setup_intr(dev, gsc->gsc_ires, INTR_TYPE_NET | INTR_MPSAFE, - gem_intr, sc, &gsc->gsc_ih) != 0) { + NULL, gem_intr, sc, &gsc->gsc_ih) != 0) { device_printf(dev, "failed to set up interrupt\n"); gem_detach(sc); goto fail_ires; ==== //depot/projects/soc2006/intr_filter/dev/hme/if_hme_sbus.c#2 (text+ko) ==== @@ -269,7 +269,7 @@ } if ((error = bus_setup_intr(dev, hsc->hsc_ires, INTR_TYPE_NET | - INTR_MPSAFE, hme_intr, sc, &hsc->hsc_ih)) != 0) { + INTR_MPSAFE, NULL, hme_intr, sc, &hsc->hsc_ih)) != 0) { device_printf(dev, "couldn't establish interrupt\n"); hme_detach(sc); goto fail_ires; ==== //depot/projects/soc2006/intr_filter/dev/isp/isp_sbus.c#2 (text+ko) ==== @@ -294,7 +294,7 @@ locksetup++; if (bus_setup_intr(dev, sbs->sbus_ires, ISP_IFLAGS, - isp_sbus_intr, isp, &sbs->ih)) { + NULL, isp_sbus_intr, isp, &sbs->ih)) { device_printf(dev, "could not setup interrupt\n"); goto bad; } ==== //depot/projects/soc2006/intr_filter/dev/le/if_le_ledma.c#2 (text+ko) ==== @@ -419,7 +419,7 @@ } error = bus_setup_intr(dev, lesc->sc_ires, INTR_TYPE_NET | INTR_MPSAFE, - am7990_intr, sc, &lesc->sc_ih); + NULL, am7990_intr, sc, &lesc->sc_ih); if (error != 0) { device_printf(dev, "cannot set up interrupt\n"); goto fail_am7990; ==== //depot/projects/soc2006/intr_filter/dev/pcf/envctrl.c#2 (text+ko) ==== @@ -135,7 +135,7 @@ rv = bus_setup_intr(dev, sc->res_irq, INTR_TYPE_NET /* | INTR_ENTROPY */, - pcf_intr, sc, &sc->intr_cookie); + NULL, pcf_intr, sc, &sc->intr_cookie); if (rv) { device_printf(dev, "could not setup IRQ\n"); goto error; ==== //depot/projects/soc2006/intr_filter/dev/pcf/pcf_ebus.c#2 (text+ko) ==== @@ -194,7 +194,7 @@ if (sc->res_irq) { rv = bus_setup_intr(dev, sc->res_irq, - INTR_TYPE_NET /* | INTR_ENTROPY */, pcf_intr, sc, + INTR_TYPE_NET /* | INTR_ENTROPY */, NULL, pcf_intr, sc, &sc->intr_cookie); if (rv) { device_printf(dev, "could not setup IRQ\n"); ==== //depot/projects/soc2006/intr_filter/sparc64/include/intr_machdep.h#3 (text+ko) ==== @@ -79,7 +79,7 @@ void *iva); void intr_init1(void); void intr_init2(void); -int inthand_add(const char *name, int vec, driver_filter_t *filter, +int inthand_add(const char *name, int vec, int (*filter)(void *), void (*handler)(void *), void *arg, int flags, void **cookiep); int inthand_remove(int vec, void *cookie); From owner-p4-projects@FreeBSD.ORG Wed Jun 28 18:08:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A990E16A416; Wed, 28 Jun 2006 18:08:43 +0000 (UTC) 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 57E7B16A407 for ; Wed, 28 Jun 2006 18:08:43 +0000 (UTC) (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 84E5943EE9 for ; Wed, 28 Jun 2006 18:08:41 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SI8fmP037662 for ; Wed, 28 Jun 2006 18:08:41 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SI8fWk037659 for perforce@freebsd.org; Wed, 28 Jun 2006 18:08:41 GMT (envelope-from jhb@freebsd.org) Date: Wed, 28 Jun 2006 18:08:41 GMT Message-Id: <200606281808.k5SI8fWk037659@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 100220 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, 28 Jun 2006 18:08:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=100220 Change 100220 by jhb@jhb_mutex on 2006/06/28 18:07:51 Make kern_recvit() accept a separate uio_seg to specify where msg_name points to so ABIs can make that a kmem pointer rather than userland. Affected files ... .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#37 edit .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#79 edit .. //depot/projects/smpng/sys/sys/syscallsubr.h#34 edit Differences ... ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#37 (text+ko) ==== @@ -1009,7 +1009,8 @@ msg.msg_iov = iov; controlp = (msg.msg_control != NULL) ? &control : NULL; - error = kern_recvit(td, uap->s, &msg, NULL, UIO_USERSPACE, controlp); + error = kern_recvit(td, uap->s, &msg, NULL, UIO_USERSPACE, + UIO_USERSPACE, controlp); if (error == 0) { msg.msg_iov = uiov; @@ -1150,7 +1151,8 @@ msg.msg_control = 0; msg.msg_flags = uap->flags; error = kern_recvit(td, uap->s, &msg, - (void *)(uintptr_t)uap->fromlenaddr, UIO_USERSPACE, NULL); + (void *)(uintptr_t)uap->fromlenaddr, UIO_USERSPACE, UIO_USERSPACE, + NULL); return (error); } ==== //depot/projects/smpng/sys/kern/uipc_syscalls.c#79 (text+ko) ==== @@ -926,12 +926,12 @@ } int -kern_recvit(td, s, mp, namelenp, segflg, controlp) +kern_recvit(td, s, mp, namelenp, uioseg, fromseg, controlp) struct thread *td; int s; struct msghdr *mp; void *namelenp; - enum uio_seg segflg; + enum uio_seg uioseg, fromseg; struct mbuf **controlp; { struct uio auio; @@ -972,7 +972,7 @@ auio.uio_iov = mp->msg_iov; auio.uio_iovcnt = mp->msg_iovlen; - auio.uio_segflg = segflg; + auio.uio_segflg = uioseg; auio.uio_rw = UIO_READ; auio.uio_td = td; auio.uio_offset = 0; /* XXX */ @@ -1020,9 +1020,13 @@ ((struct osockaddr *)fromsa)->sa_family = fromsa->sa_family; #endif - error = copyout(fromsa, mp->msg_name, (unsigned)len); - if (error) - goto out; + if (fromseg == UIO_USERSPACE) { + error = copyout(fromsa, mp->msg_name, + (unsigned)len); + if (error) + goto out; + } else + bcopy(fromsa, mp->msg_name, len); } mp->msg_namelen = len; if (namelenp && @@ -1103,7 +1107,8 @@ void *namelenp; { - return (kern_recvit(td, s, mp, namelenp, UIO_USERSPACE, NULL)); + return (kern_recvit(td, s, mp, namelenp, UIO_USERSPACE, UIO_USERSPACE, + NULL)); } /* ==== //depot/projects/smpng/sys/sys/syscallsubr.h#34 (text+ko) ==== @@ -121,8 +121,9 @@ int kern_readlink(struct thread *td, char *path, enum uio_seg pathseg, char *buf, enum uio_seg bufseg, int count); int kern_readv(struct thread *td, int fd, struct uio *auio); -int kern_recvit(struct thread *td, int s, struct msghdr *mp, void *namelenp, - enum uio_seg segflg, struct mbuf **controlp); +int kern_recvit(struct thread *td, int s, struct msghdr *mp, + void *namelenp, enum uio_seg uioseg, enum uio_seg fromseg, + struct mbuf **controlp); int kern_rename(struct thread *td, char *from, char *to, enum uio_seg pathseg); int kern_rmdir(struct thread *td, char *path, enum uio_seg pathseg); From owner-p4-projects@FreeBSD.ORG Wed Jun 28 19:28:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D03C216A40F; Wed, 28 Jun 2006 19:28:23 +0000 (UTC) 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 7C72416A403 for ; Wed, 28 Jun 2006 19:28:23 +0000 (UTC) (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 4476744ED2 for ; Wed, 28 Jun 2006 19:28:23 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SJSNIw042138 for ; Wed, 28 Jun 2006 19:28:23 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SJSM2o042135 for perforce@freebsd.org; Wed, 28 Jun 2006 19:28:22 GMT (envelope-from jhb@freebsd.org) Date: Wed, 28 Jun 2006 19:28:22 GMT Message-Id: <200606281928.k5SJSM2o042135@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 100225 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, 28 Jun 2006 19:28:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=100225 Change 100225 by jhb@jhb_mutex on 2006/06/28 19:28:02 Add a kern_accept(). Affected files ... .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#80 edit .. //depot/projects/smpng/sys/sys/syscallsubr.h#35 edit Differences ... ==== //depot/projects/smpng/sys/kern/uipc_syscalls.c#80 (text+ko) ==== @@ -296,10 +296,50 @@ } */ *uap; int compat; { + struct sockaddr *name, **sap; + socklen_t namelen; + int error; + + if (uap->name) { + error = copyin(uap->anamelen, &namelen, sizeof (namelen)); + if (error) + return (error); + sap = &name; + } else + sap = NULL; + + error = kern_accept(td, uap->s, sap, &namelen, compat); + + if (uap->name) { + /* + * return a namelen of zero for older code which might + * ignore the return value from accept. + */ + if (error && name == NULL) { + (void) copyout(&namelen, + uap->anamelen, sizeof(*uap->anamelen)); + return (error); + } + if (error == 0) { + KASSERT(name != NULL, + ("%s: success but no sockaddr", __func__)); + error = copyout(name, uap->name, namelen); + } + if (error == 0) + error = copyout(&namelen, uap->anamelen, + sizeof(namelen)); + } + free(name, M_SONAME); + return (error); +} + +int +kern_accept(struct thread *td, int s, struct sockaddr **name, + socklen_t *namelen, int compat) +{ struct filedesc *fdp; struct file *headfp, *nfp = NULL; struct sockaddr *sa = NULL; - socklen_t namelen; int error; struct socket *head, *so; int fd; @@ -307,16 +347,15 @@ pid_t pgid; int tmp; - fdp = td->td_proc->p_fd; - if (uap->name) { - error = copyin(uap->anamelen, &namelen, sizeof (namelen)); - if(error) - return (error); - if (namelen < 0) + if (name) { + *name = NULL; + if (*namelen < 0) return (EINVAL); } + + fdp = td->td_proc->p_fd; NET_LOCK_GIANT(); - error = getsock(fdp, uap->s, &headfp, &fflag); + error = getsock(fdp, s, &headfp, &fflag); if (error) goto done2; head = headfp->f_data; @@ -407,38 +446,29 @@ * return a namelen of zero for older code which might * ignore the return value from accept. */ - if (uap->name != NULL) { - namelen = 0; - (void) copyout(&namelen, - uap->anamelen, sizeof(*uap->anamelen)); - } + if (name) + *namelen = 0; goto noconnection; } if (sa == NULL) { - namelen = 0; - if (uap->name) - goto gotnoname; - error = 0; + if (name) + *namelen = 0; goto done; } - if (uap->name) { + if (name) { /* check sa_len before it is destroyed */ - if (namelen > sa->sa_len) - namelen = sa->sa_len; + if (*namelen > sa->sa_len) + *namelen = sa->sa_len; #ifdef COMPAT_OLDSOCK if (compat) ((struct osockaddr *)sa)->sa_family = sa->sa_family; #endif - error = copyout(sa, uap->name, (u_int)namelen); - if (!error) -gotnoname: - error = copyout(&namelen, - uap->anamelen, sizeof (*uap->anamelen)); + *name = sa; + sa = NULL; } noconnection: - if (sa) - FREE(sa, M_SONAME); + free(sa, M_SONAME); /* * close the new descriptor, assuming someone hasn't ripped it ==== //depot/projects/smpng/sys/sys/syscallsubr.h#35 (text+ko) ==== @@ -50,6 +50,8 @@ int kern___getcwd(struct thread *td, u_char *buf, enum uio_seg bufseg, u_int buflen); +int kern_accept(struct thread *td, int s, struct sockaddr **name, + socklen_t *namelen, int compat); int kern_access(struct thread *td, char *path, enum uio_seg pathseg, int flags); int kern_adjtime(struct thread *td, struct timeval *delta, From owner-p4-projects@FreeBSD.ORG Wed Jun 28 19:30:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0787616A412; Wed, 28 Jun 2006 19:30:27 +0000 (UTC) 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 A662716A40F for ; Wed, 28 Jun 2006 19:30:26 +0000 (UTC) (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 5B77F44F16 for ; Wed, 28 Jun 2006 19:30:26 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SJUQGP042291 for ; Wed, 28 Jun 2006 19:30:26 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SJUPGF042287 for perforce@freebsd.org; Wed, 28 Jun 2006 19:30:25 GMT (envelope-from jhb@freebsd.org) Date: Wed, 28 Jun 2006 19:30:25 GMT Message-Id: <200606281930.k5SJUPGF042287@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 100226 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, 28 Jun 2006 19:30:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=100226 Change 100226 by jhb@jhb_mutex on 2006/06/28 19:30:07 - Use kern_connect(), kern_getpeername(), and kern_accept(). - Replace svr4_sendit() and svr4_recvit() with calls to kern_sendit() and kern_recvit() eliminating some more stackgap along the way. Affected files ... .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#30 edit Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#30 (text+ko) ==== @@ -133,245 +133,6 @@ struct thread *); static int ti_bind(struct file *, int, struct svr4_strioctl *, struct thread *); -/* infrastructure */ -static int svr4_sendit(struct thread *td, int s, struct msghdr *mp, int flags); - -static int svr4_recvit(struct thread *td, int s, struct msghdr *mp, - caddr_t namelenp); - -/* Ok, so we shouldn't use sendit() in uipc_syscalls.c because - * it isn't part of a "public" interface; We're supposed to use - * pru_sosend instead. Same goes for recvit()/pru_soreceive() for - * that matter. Solution: Suck sendit()/recvit() into here where we - * can do what we like. - * - * I hate code duplication. - * - * I will take out all the #ifdef COMPAT_OLDSOCK gumph, though. - */ -static int -svr4_sendit(td, s, mp, flags) - register struct thread *td; - int s; - register struct msghdr *mp; - int flags; -{ - struct uio auio; - register struct iovec *iov; - register int i; - struct mbuf *control; - struct sockaddr *to; - int len, error; - struct socket *so; -#ifdef KTRACE - struct uio *ktruio = NULL; -#endif - - /* - * XXXRW: Instead of using fgetsock(), just rely on the file - * descriptor reference. - */ - if ((error = fgetsock(td, s, &so, NULL)) != 0) - return (error); - -#ifdef MAC - SOCK_LOCK(so); - error = mac_check_socket_send(td->td_ucred, so); - SOCK_UNLOCK(so); - if (error) - goto done1; -#endif - - auio.uio_iov = mp->msg_iov; - auio.uio_iovcnt = mp->msg_iovlen; - auio.uio_segflg = UIO_USERSPACE; - auio.uio_rw = UIO_WRITE; - auio.uio_td = td; - auio.uio_offset = 0; /* XXX */ - auio.uio_resid = 0; - iov = mp->msg_iov; - for (i = 0; i < mp->msg_iovlen; i++, iov++) { - if ((auio.uio_resid += iov->iov_len) < 0) { - error = EINVAL; - goto done1; - } - } - if (mp->msg_name) { - error = getsockaddr(&to, mp->msg_name, mp->msg_namelen); - if (error) - goto done1; - } else { - to = 0; - } - if (mp->msg_control) { - if (mp->msg_controllen < sizeof(struct cmsghdr)) { - error = EINVAL; - goto bad; - } - error = sockargs(&control, mp->msg_control, - mp->msg_controllen, MT_CONTROL); - if (error) - goto bad; - } else { - control = 0; - } -#ifdef KTRACE - if (KTRPOINT(td, KTR_GENIO)) - ktruio = cloneuio(&auio); -#endif - len = auio.uio_resid; - error = so->so_proto->pr_usrreqs->pru_sosend(so, to, &auio, 0, control, - flags, td); - if (error) { - if (auio.uio_resid != len && (error == ERESTART || - error == EINTR || error == EWOULDBLOCK)) - error = 0; - if (error == EPIPE) { - PROC_LOCK(td->td_proc); - psignal(td->td_proc, SIGPIPE); - PROC_UNLOCK(td->td_proc); - } - } - if (error == 0) - td->td_retval[0] = len - auio.uio_resid; -#ifdef KTRACE - if (ktruio != NULL) { - ktruio->uio_resid = td->td_retval[0]; - ktrgenio(s, UIO_WRITE, ktruio, error); - } -#endif -bad: - if (to) - FREE(to, M_SONAME); -done1: - fputsock(so); - return (error); -} - -static int -svr4_recvit(td, s, mp, namelenp) - register struct thread *td; - int s; - register struct msghdr *mp; - caddr_t namelenp; -{ - struct uio auio; - register struct iovec *iov; - register int i; - int len, error; - struct mbuf *m, *control = 0; - caddr_t ctlbuf; - struct socket *so; - struct sockaddr *fromsa = 0; -#ifdef KTRACE - struct uio *ktruio = NULL; -#endif - - /* - * XXXRW: Instead of using fgetsock(), just rely on the file - * descriptor reference. - */ - if ((error = fgetsock(td, s, &so, NULL)) != 0) - return (error); - -#ifdef MAC - SOCK_LOCK(so); - error = mac_check_socket_receive(td->td_ucred, so); - SOCK_UNLOCK(so); - if (error) - goto done1; -#endif - - auio.uio_iov = mp->msg_iov; - auio.uio_iovcnt = mp->msg_iovlen; - auio.uio_segflg = UIO_USERSPACE; - auio.uio_rw = UIO_READ; - auio.uio_td = td; - auio.uio_offset = 0; /* XXX */ - auio.uio_resid = 0; - iov = mp->msg_iov; - for (i = 0; i < mp->msg_iovlen; i++, iov++) { - if ((auio.uio_resid += iov->iov_len) < 0) { - error = EINVAL; - goto done1; - } - } -#ifdef KTRACE - if (KTRPOINT(td, KTR_GENIO)) - ktruio = cloneuio(&auio); -#endif - len = auio.uio_resid; - error = so->so_proto->pr_usrreqs->pru_soreceive(so, &fromsa, &auio, - (struct mbuf **)0, mp->msg_control ? &control : (struct mbuf **)0, - &mp->msg_flags); - if (error) { - if (auio.uio_resid != len && (error == ERESTART || - error == EINTR || error == EWOULDBLOCK)) - error = 0; - } -#ifdef KTRACE - if (ktruio != NULL) { - ktruio->uio_resid = len - auio.uio_resid; - ktrgenio(s, UIO_READ, ktruio, error); - } -#endif - if (error) - goto out; - td->td_retval[0] = len - auio.uio_resid; - if (mp->msg_name) { - len = mp->msg_namelen; - if (len <= 0 || fromsa == 0) - len = 0; - else { - /* save sa_len before it is destroyed by MSG_COMPAT */ - len = MIN(len, fromsa->sa_len); - error = copyout(fromsa, - (caddr_t)mp->msg_name, (unsigned)len); - if (error) - goto out; - } - mp->msg_namelen = len; - if (namelenp && - (error = copyout((caddr_t)&len, namelenp, sizeof (int)))) { - goto out; - } - } - if (mp->msg_control) { - len = mp->msg_controllen; - m = control; - mp->msg_controllen = 0; - ctlbuf = (caddr_t) mp->msg_control; - - while (m && len > 0) { - unsigned int tocopy; - - if (len >= m->m_len) - tocopy = m->m_len; - else { - mp->msg_flags |= MSG_CTRUNC; - tocopy = len; - } - - if ((error = copyout((caddr_t)mtod(m, caddr_t), - ctlbuf, tocopy)) != 0) - goto out; - - ctlbuf += tocopy; - len -= tocopy; - m = m->m_next; - } - mp->msg_controllen = ctlbuf - (caddr_t)mp->msg_control; - } -out: - if (fromsa) - FREE(fromsa, M_SONAME); - if (control) - m_freem(control); -done1: - fputsock(so); - return (error); -} - #ifdef DEBUG_SVR4 static void bufprint(u_char *, size_t); static int show_ioc(const char *, struct svr4_strioctl *); @@ -1702,11 +1463,10 @@ struct svr4_strmcmd sc; struct sockaddr_in sain; struct sockaddr_un saun; - void *skp, *sup; + struct sockaddr *sa; int sasize, *retval; struct svr4_strm *st; int error; - caddr_t sg; retval = td->td_retval; @@ -1780,9 +1540,10 @@ return EINVAL; } netaddr_to_sockaddr_in(&sain, &sc); - skp = &sain; + sa = (struct sockaddr *)&sain; sasize = sizeof(sain); - error = sain.sin_family != st->s_family; + if (sain.sin_family != st->s_family) + error = EINVAL; break; case AF_LOCAL: @@ -1796,11 +1557,12 @@ /* Maybe we've been given a device/inode pair */ dev_t *dev = SVR4_ADDROF(&sc); ino_t *ino = (ino_t *) &dev[1]; - skp = svr4_find_socket(td, fp, *dev, *ino); - if (skp == NULL) { - skp = &saun; + sa = (struct sockaddr *) + svr4_find_socket(td, fp, *dev, *ino); + if (sa == NULL) { + sa = (struct sockaddr *)&saun; /* I guess we have it by name */ - netaddr_to_sockaddr_un(skp, &sc); + netaddr_to_sockaddr_un(&saun, &sc); } sasize = sizeof(saun); } @@ -1812,22 +1574,11 @@ return ENOSYS; } - sg = stackgap_init(); - sup = stackgap_alloc(&sg, sasize); - - if ((error = copyout(skp, sup, sasize)) != 0) - return error; - switch (st->s_cmd = sc.cmd) { case SVR4_TI_CONNECT_REQUEST: /* connect */ { - struct connect_args co; - co.s = uap->fd; - co.name = (void *) sup; - co.namelen = (int) sasize; - - return connect(td, &co); + return (kern_connect(td, uap->fd, sa)); } case SVR4_TI_SENDTO_REQUEST: /* sendto */ @@ -1835,7 +1586,7 @@ struct msghdr msg; struct iovec aiov; - msg.msg_name = (caddr_t) sup; + msg.msg_name = sa; msg.msg_namelen = sasize; msg.msg_iov = &aiov; msg.msg_iovlen = 1; @@ -1843,12 +1594,8 @@ msg.msg_flags = 0; aiov.iov_base = dat.buf; aiov.iov_len = dat.len; -#if 0 - error = so->so_proto->pr_usrreqs->pru_sosend(so, 0, - uio, 0, 0, 0, uio->uio_td); -#endif - error = svr4_sendit(td, uap->fd, &msg, - uap->flags); + error = kern_sendit(td, uap->fd, &msg, uap->flags, + NULL, UIO_USERSPACE); DPRINTF(("sendto_request error: %d\n", error)); *retval = 0; return error; @@ -1885,8 +1632,6 @@ struct svr4_sys_getmsg_args *uap; struct file *fp; { - struct getpeername_args ga; - struct accept_args aa; struct svr4_strbuf dat, ctl; struct svr4_strmcmd sc; int error, *retval; @@ -1894,14 +1639,13 @@ struct iovec aiov; struct sockaddr_in sain; struct sockaddr_un saun; - void *skp, *sup; - int sasize; + struct sockaddr *sa; + socklen_t sasize; struct svr4_strm *st; - int *flen; int fl; - caddr_t sg; retval = td->td_retval; + error = 0; FILE_LOCK_ASSERT(fp, MA_NOTOWNED); @@ -1947,12 +1691,10 @@ switch (st->s_family) { case AF_INET: - skp = &sain; sasize = sizeof(sain); break; case AF_LOCAL: - skp = &saun; sasize = sizeof(saun); break; @@ -1962,14 +1704,6 @@ return ENOSYS; } - sg = stackgap_init(); - sup = stackgap_alloc(&sg, sasize); - flen = (int *) stackgap_alloc(&sg, sizeof(*flen)); - - fl = sasize; - if ((error = copyout(&fl, flen, sizeof(fl))) != 0) - return error; - switch (st->s_cmd) { case SVR4_TI_CONNECT_REQUEST: DPRINTF(("getmsg: TI_CONNECT_REQUEST\n")); @@ -1993,18 +1727,12 @@ * a connect verification. */ - ga.fdes = uap->fd; - ga.asa = (void *) sup; - ga.alen = flen; - - if ((error = getpeername(td, &ga)) != 0) { + error = kern_getpeername(td, uap->fd, &sa, &sasize); + if (error) { DPRINTF(("getmsg: getpeername failed %d\n", error)); return error; } - if ((error = copyin(sup, skp, sasize)) != 0) - return error; - sc.cmd = SVR4_TI_CONNECT_REPLY; sc.pad[0] = 0x4; sc.offs = 0x18; @@ -2014,17 +1742,19 @@ switch (st->s_family) { case AF_INET: sc.len = sasize; - sockaddr_to_netaddr_in(&sc, &sain); + sockaddr_to_netaddr_in(&sc, (struct sockaddr_in *)sa); break; case AF_LOCAL: sc.len = sasize + 4; - sockaddr_to_netaddr_un(&sc, &saun); + sockaddr_to_netaddr_un(&sc, (struct sockaddr_un *)sa); break; default: + free(sa, M_SONAME); return ENOSYS; } + free(sa, M_SONAME); ctl.len = 40; dat.len = -1; @@ -2052,11 +1782,9 @@ /* * We are after a listen, so we try to accept... */ - aa.s = uap->fd; - aa.name = (void *) sup; - aa.anamelen = flen; - - if ((error = accept(td, &aa)) != 0) { + + error = kern_accept(td, uap->fd, &sa, &sasize, 0); + if (error) { DPRINTF(("getmsg: accept failed %d\n", error)); return error; } @@ -2065,9 +1793,6 @@ DPRINTF(("getmsg: Accept fd = %d\n", st->s_afd)); - if ((error = copyin(sup, skp, sasize)) != 0) - return error; - sc.cmd = SVR4_TI_ACCEPT_REPLY; sc.offs = 0x18; sc.pad[0] = 0x0; @@ -2075,7 +1800,7 @@ switch (st->s_family) { case AF_INET: sc.pad[1] = 0x28; - sockaddr_to_netaddr_in(&sc, &sain); + sockaddr_to_netaddr_in(&sc, (struct sockaddr_in *)&sa); ctl.len = 40; sc.len = sasize; break; @@ -2089,8 +1814,10 @@ break; default: + free(sa, M_SONAME); return ENOSYS; } + free(sa, M_SONAME); dat.len = -1; fl = 0; @@ -2110,10 +1837,12 @@ switch (st->s_family) { case AF_INET: + sa = (struct sockaddr *)&sain; sockaddr_to_netaddr_in(&sc, &sain); break; case AF_LOCAL: + sa = (struct sockaddr *)&saun; sockaddr_to_netaddr_un(&sc, &saun); break; @@ -2121,7 +1850,7 @@ return ENOSYS; } - msg.msg_name = (caddr_t) sup; + msg.msg_name = sa; msg.msg_namelen = sasize; msg.msg_iov = &aiov; msg.msg_iovlen = 1; @@ -2130,16 +1859,14 @@ aiov.iov_len = dat.maxlen; msg.msg_flags = 0; - error = svr4_recvit(td, uap->fd, &msg, (caddr_t) flen); + error = kern_recvit(td, uap->fd, &msg, NULL, UIO_USERSPACE, + UIO_SYSSPACE, NULL); if (error) { DPRINTF(("getmsg: recvit failed %d\n", error)); return error; } - if ((error = copyin(msg.msg_name, skp, sasize)) != 0) - return error; - sc.cmd = SVR4_TI_RECVFROM_IND; switch (st->s_family) { From owner-p4-projects@FreeBSD.ORG Wed Jun 28 19:34:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A62C16A416; Wed, 28 Jun 2006 19:34:32 +0000 (UTC) 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 163F716A40F for ; Wed, 28 Jun 2006 19:34:32 +0000 (UTC) (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 DA29E44F16 for ; Wed, 28 Jun 2006 19:34:31 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SJYVvd042461 for ; Wed, 28 Jun 2006 19:34:31 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SJYV6f042458 for perforce@freebsd.org; Wed, 28 Jun 2006 19:34:31 GMT (envelope-from jhb@freebsd.org) Date: Wed, 28 Jun 2006 19:34:31 GMT Message-Id: <200606281934.k5SJYV6f042458@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 100227 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, 28 Jun 2006 19:34:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=100227 Change 100227 by jhb@jhb_mutex on 2006/06/28 19:33:59 Axe the stackgap macros! There's some scary i386-specific code under #if 0 to try to use the stackgap to set the LDT via sysarch(). If anyone wants to revive that they can come up with a suitable kern_foo() or i386_foo() API to use instead. Affected files ... .. //depot/projects/smpng/sys/compat/svr4/svr4_util.h#9 edit Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_util.h#9 (text+ko) ==== @@ -47,30 +47,6 @@ #define DPRINTF(a) #endif - -static __inline caddr_t stackgap_init(void); -static __inline void *stackgap_alloc(caddr_t *, size_t); - -static __inline caddr_t -stackgap_init() -{ -#define szsigcode (*(curthread->td_proc->p_sysent->sv_szsigcode)) - return (caddr_t)(((caddr_t)PS_STRINGS) - szsigcode - SPARE_USRSPACE); -} - -static __inline void * -stackgap_alloc(sgp, sz) - caddr_t *sgp; - size_t sz; -{ - void *p = (void *) *sgp; - sz = ALIGN(sz); - if (*sgp + sz > (caddr_t)(PS_STRINGS - szsigcode)) - return NULL; - *sgp += sz; - return p; -} - int svr4_emul_find(struct thread *, char *, enum uio_seg, char **, int); #define CHECKALT(td, upath, pathp, i) \ From owner-p4-projects@FreeBSD.ORG Wed Jun 28 19:43:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4048516A50A; Wed, 28 Jun 2006 19:43:05 +0000 (UTC) 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 8527B16A50E for ; Wed, 28 Jun 2006 19:43:04 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98AAE44EF2 for ; Wed, 28 Jun 2006 19:24:17 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SJOHKG041929 for ; Wed, 28 Jun 2006 19:24:17 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SJOHtj041926 for perforce@freebsd.org; Wed, 28 Jun 2006 19:24:17 GMT (envelope-from imp@freebsd.org) Date: Wed, 28 Jun 2006 19:24:17 GMT Message-Id: <200606281924.k5SJOHtj041926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 100224 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, 28 Jun 2006 19:43:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=100224 Change 100224 by imp@imp_lighthouse on 2006/06/28 19:23:33 Enable/disable endtx interrupt as needed. Reset the character timeout by setting STTTO in CR when we get a timeout. We're reading characters now! Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#31 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#31 (text+ko) ==== @@ -394,7 +394,6 @@ /* Set the receive timeout to be 1.5 character times. */ WR4(&sc->sc_bas, USART_RTOR, 12); WR4(&sc->sc_bas, USART_CR, USART_CR_STTTO); - WR4(&sc->sc_bas, USART_IER, USART_CSR_TIMEOUT | USART_CSR_RXBUFF | USART_CSR_ENDRX); } else { @@ -432,6 +431,7 @@ WR4(&sc->sc_bas, PDC_TPR, addr); WR4(&sc->sc_bas, PDC_TCR, sc->sc_txdatasz); WR4(&sc->sc_bas, PDC_PTCR, PDC_PTCR_TXTEN); + WR4(&sc->sc_bas, USART_IER, USART_CSR_ENDTX); uart_unlock(sc->sc_hwmtx); #else for (int i = 0; i < sc->sc_txdatasz; i++) @@ -502,12 +502,17 @@ bus_dmamap_unload(atsc->dmatag, atsc->tx_map); } uart_lock(sc->sc_hwmtx); - if ((csr & USART_CSR_TXRDY) && sc->sc_txbusy) { - ipend |= SER_INT_TXIDLE; + if (csr & USART_CSR_TXRDY) { + if (sc->sc_txbusy) + ipend |= SER_INT_TXIDLE; WR4(&sc->sc_bas, USART_IDR, USART_CSR_TXRDY); } - if ((csr & USART_CSR_ENDTX) && sc->sc_txbusy) - ipend |= SER_INT_TXIDLE; + if (csr & USART_CSR_ENDTX) { + if (sc->sc_txbusy) + ipend |= SER_INT_TXIDLE; + WR4(&sc->sc_bas, USART_IDR, USART_CSR_ENDTX); + } + /* * Due to the contraints of the DMA engine present in the * atmel chip, I can't just say I have a rx interrupt pending @@ -565,6 +570,7 @@ uart_rx_put(sc, atsc->ping->buffer[i]); WR4(&sc->sc_bas, PDC_RPR, atsc->ping->pa); WR4(&sc->sc_bas, PDC_RCR, sc->sc_rxfifosz); + WR4(&sc->sc_bas, USART_CR, USART_CR_STTTO); WR4(&sc->sc_bas, PDC_PTCR, PDC_PTCR_RXTEN); ipend |= SER_INT_RXREADY; } From owner-p4-projects@FreeBSD.ORG Wed Jun 28 20:22:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0152E16A40F; Wed, 28 Jun 2006 20:22:33 +0000 (UTC) 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 B9BB916A407 for ; Wed, 28 Jun 2006 20:22:32 +0000 (UTC) (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 80DE744906 for ; Wed, 28 Jun 2006 20:22:32 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SKMW77049317 for ; Wed, 28 Jun 2006 20:22:32 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SKMWND049314 for perforce@freebsd.org; Wed, 28 Jun 2006 20:22:32 GMT (envelope-from jhb@freebsd.org) Date: Wed, 28 Jun 2006 20:22:32 GMT Message-Id: <200606282022.k5SKMWND049314@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 100229 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, 28 Jun 2006 20:22:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=100229 Change 100229 by jhb@jhb_mutex on 2006/06/28 20:22:10 Similar treatment to ibcs2_semsys() including using kern_semctl() to axe more stackgap usage. Affected files ... .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.c#10 edit Differences ... ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.c#10 (text+ko) ==== @@ -301,77 +301,100 @@ return; } -int -ibcs2_semsys(td, uap) - struct thread *td; - struct ibcs2_semsys_args *uap; +struct ibcs2_semctl_args { + int what; + int semid; + int semnum; + int cmd; + union semun arg; +}; + +static int +ibcs2_semctl(struct thread *td, void *v) { + struct ibcs2_semctl_args *uap = v; + struct ibcs2_semid_ds is; + struct semid_ds bs; + union semun semun; int error; - switch (uap->which) { - case 0: /* semctl */ - switch(uap->a4) { - case IBCS2_IPC_STAT: - { - struct ibcs2_semid_ds *isp; - struct semid_ds *sp; - union semun *sup, ssu; - caddr_t sg = stackgap_init(); + switch(uap->cmd) { + case IBCS2_IPC_STAT: + semun.buf = &bs; + error = kern_semctl(td, uap->semid, uap->semnum, IPC_STAT, + &semun, UIO_SYSSPACE); + if (error) + return (error); + cvt_semid2isemid(&bs, &is); + return (copyout(&is, uap->arg.buf, sizeof(is))); + + case IBCS2_IPC_SET: + error = copyin(uap->arg.buf, &is, sizeof(is)); + if (error) + return (error); + cvt_isemid2semid(&is, &bs); + semun.buf = &bs; + return (kern_semctl(td, uap->semid, uap->semnum, IPC_SET, + &semun, UIO_SYSSPACE)); + } + + return (kern_semctl(td, uap->semid, uap->semnum, uap->cmd, &uap->arg, + UIO_USERSPACE)); +} + +struct ibcs2_semget_args { + int what; + int key; + int nsems; + int semflg; +}; +static int +ibcs2_semget(struct thread *td, void *v) +{ + struct ibcs2_semget_args *uap = v; + struct semget_args ap; - ssu = (union semun) uap->a5; - sp = stackgap_alloc(&sg, sizeof(struct semid_ds)); - sup = stackgap_alloc(&sg, sizeof(union semun)); - sup->buf = sp; - uap->a5 = (int)sup; - error = semsys(td, (struct semsys_args *)uap); - if (!error) { - uap->a5 = (int)ssu.buf; - isp = stackgap_alloc(&sg, sizeof(*isp)); - cvt_semid2isemid(sp, isp); - error = copyout((caddr_t)isp, - (caddr_t)ssu.buf, - sizeof(*isp)); - } - return error; - } - case IBCS2_IPC_SET: - { - struct ibcs2_semid_ds *isp; - struct semid_ds *sp; - caddr_t sg = stackgap_init(); + ap.key = uap->key; + ap.nsems = uap->nsems; + ap.semflg = uap->semflg; + return (semget(td, &ap)); +} - isp = stackgap_alloc(&sg, sizeof(*isp)); - sp = stackgap_alloc(&sg, sizeof(*sp)); - error = copyin((caddr_t)uap->a5, (caddr_t)isp, - sizeof(*isp)); - if (error) - return error; - cvt_isemid2semid(isp, sp); - uap->a5 = (int)sp; - return semsys(td, (struct semsys_args *)uap); - } - case IBCS2_SETVAL: - { - union semun *sp; - caddr_t sg = stackgap_init(); +struct ibcs2_semop_args { + int what; + int semid; + struct sembuf *sops; + size_t nsops; +}; - sp = stackgap_alloc(&sg, sizeof(*sp)); - sp->val = (int) uap->a5; - uap->a5 = (int)sp; - return semsys(td, (struct semsys_args *)uap); - } - } +static int +ibcs2_semop(struct thread *td, void *v) +{ + struct ibcs2_semop_args *uap = v; + struct semop_args ap; - return semsys(td, (struct semsys_args *)uap); + ap.semid = uap->semid; + ap.sops = uap->sops; + ap.nsops = uap->nsops; + return (semop(td, &ap)); +} - case 1: /* semget */ - return semsys(td, (struct semsys_args *)uap); +int +ibcs2_semsys(td, uap) + struct thread *td; + struct ibcs2_semsys_args *uap; +{ - case 2: /* semop */ - return semsys(td, (struct semsys_args *)uap); + switch (uap->which) { + case 0: + return (ibcs2_semctl(td, uap)); + case 1: + return (ibcs2_semget(td, uap)); + case 2: + return (ibcs2_semop(td, uap)); } - return EINVAL; + return (EINVAL); } From owner-p4-projects@FreeBSD.ORG Wed Jun 28 20:25:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31CA016A410; Wed, 28 Jun 2006 20:25:37 +0000 (UTC) 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 EA12616A408 for ; Wed, 28 Jun 2006 20:25:36 +0000 (UTC) (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 B5C07449A2 for ; Wed, 28 Jun 2006 20:25:36 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SKPaUM049446 for ; Wed, 28 Jun 2006 20:25:36 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SKPa7q049443 for perforce@freebsd.org; Wed, 28 Jun 2006 20:25:36 GMT (envelope-from jhb@freebsd.org) Date: Wed, 28 Jun 2006 20:25:36 GMT Message-Id: <200606282025.k5SKPa7q049443@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 100230 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, 28 Jun 2006 20:25:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=100230 Change 100230 by jhb@jhb_mutex on 2006/06/28 20:25:17 Don't copyin a msqid_ds for IPC_RMID. Neither the base system nor ibcs2 do and kern_msgctl() will just ignore it. Affected files ... .. //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#15 edit Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#15 (text+ko) ==== @@ -500,11 +500,7 @@ return (kern_msgctl(td, uap->msqid, IPC_SET, &bs)); case SVR4_IPC_RMID: - error = copyin(uap->buf, &ss, sizeof ss); - if (error) - return error; - svr4_to_bsd_msqid_ds(&ss, &bs); - return (kern_msgctl(td, uap->msqid, IPC_RMID, &bs)); + return (kern_msgctl(td, uap->msqid, IPC_RMID, NULL)); default: return EINVAL; From owner-p4-projects@FreeBSD.ORG Wed Jun 28 20:52:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0FF416A412; Wed, 28 Jun 2006 20:52:10 +0000 (UTC) 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 9CF7416A403 for ; Wed, 28 Jun 2006 20:52:10 +0000 (UTC) (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 6333144CC9 for ; Wed, 28 Jun 2006 20:52:10 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SKqAfB058244 for ; Wed, 28 Jun 2006 20:52:10 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SKqAEY058241 for perforce@freebsd.org; Wed, 28 Jun 2006 20:52:10 GMT (envelope-from jhb@freebsd.org) Date: Wed, 28 Jun 2006 20:52:10 GMT Message-Id: <200606282052.k5SKqAEY058241@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 100232 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, 28 Jun 2006 20:52:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=100232 Change 100232 by jhb@jhb_mutex on 2006/06/28 20:51:34 - Split up ibcs2_shmsys() and use kern_shmctl() to avoid stackgap usage. - Use ibcs2_key_t. Affected files ... .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.c#11 edit .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.h#4 edit Differences ... ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.c#11 (text+ko) ==== @@ -105,7 +105,7 @@ struct ibcs2_msgget_args { int what; - int key; + ibcs2_key_t key; int msgflg; }; @@ -344,7 +344,7 @@ struct ibcs2_semget_args { int what; - int key; + ibcs2_key_t key; int nsems; int semflg; }; @@ -436,66 +436,116 @@ return; } -int -ibcs2_shmsys(td, uap) - struct thread *td; - struct ibcs2_shmsys_args *uap; +struct ibcs2_shmat_args { + int what; + int shmid; + const void *shmaddr; + int shmflg; +}; + +static int +ibcs2_shmat(struct thread *td, void *v) +{ + struct ibcs2_shmat_args *uap = v; + struct shmat_args ap; + + ap.shmid = uap->shmid; + ap.shmaddr = uap->shmaddr; + ap.shmflg = uap->shmflg; + return (shmat(td, &ap)); +} + +struct ibcs2_shmctl_args { + int what; + int shmid; + int cmd; + struct ibcs2_shmid_ds *buf; +}; + +static int +ibcs2_shmctl(struct thread *td, void *v) { + struct ibcs2_shmctl_args *uap = v; + struct ibcs2_shmid_ds is; + struct shmid_ds bs; int error; - switch (uap->which) { - case 0: /* shmat */ - return shmsys(td, (struct shmsys_args *)uap); + switch(uap->cmd) { + case IBCS2_IPC_STAT: + error = kern_shmctl(td, uap->shmid, IPC_STAT, &bs, NULL); + if (error) + return (error); + cvt_shmid2ishmid(&bs, &is); + return (copyout(&is, uap->buf, sizeof(is))); + + case IBCS2_IPC_SET: + error = copyin(uap->buf, &is, sizeof(is)); + if (error) + return (error); + cvt_ishmid2shmid(&is, &bs); + return (kern_shmctl(td, uap->shmid, IPC_SET, &bs, NULL)); + + case IPC_INFO: + case SHM_INFO: + case SHM_STAT: + /* XXX: */ + return (EINVAL); + } + + return (kern_shmctl(td, uap->shmid, uap->cmd, NULL, NULL)); +} + +struct ibcs2_shmdt_args { + int what; + const void *shmaddr; +}; + +static int +ibcs2_shmdt(struct thread *td, void *v) +{ + struct ibcs2_shmdt_args *uap = v; + struct shmdt_args ap; - case 1: /* shmctl */ - switch(uap->a3) { - case IBCS2_IPC_STAT: - { - struct ibcs2_shmid_ds *isp; - struct shmid_ds *sp; - caddr_t sg = stackgap_init(); + ap.shmaddr = uap->shmaddr; + return (shmdt(td, &ap)); +} - isp = (struct ibcs2_shmid_ds *)uap->a4; - sp = stackgap_alloc(&sg, sizeof(*sp)); - uap->a4 = (int)sp; - error = shmsys(td, (struct shmsys_args *)uap); - if (!error) { - uap->a4 = (int)isp; - isp = stackgap_alloc(&sg, sizeof(*isp)); - cvt_shmid2ishmid(sp, isp); - error = copyout((caddr_t)isp, - (caddr_t)uap->a4, - sizeof(*isp)); - } - return error; - } - case IBCS2_IPC_SET: - { - struct ibcs2_shmid_ds *isp; - struct shmid_ds *sp; - caddr_t sg = stackgap_init(); +struct ibcs2_shmget_args { + int what; + ibcs2_key_t key; + size_t size; + int shmflg; +}; - isp = stackgap_alloc(&sg, sizeof(*isp)); - sp = stackgap_alloc(&sg, sizeof(*sp)); - error = copyin((caddr_t)uap->a4, (caddr_t)isp, - sizeof(*isp)); - if (error) - return error; - cvt_ishmid2shmid(isp, sp); - uap->a4 = (int)sp; - return shmsys(td, (struct shmsys_args *)uap); - } - } +static int +ibcs2_shmget(struct thread *td, void *v) +{ + struct ibcs2_shmget_args *uap = v; + struct shmget_args ap; - return shmsys(td, (struct shmsys_args *)uap); + ap.key = uap->key; + ap.size = uap->size; + ap.shmflg = uap->shmflg; + return (shmget(td, &ap)); +} - case 2: /* shmdt */ - return shmsys(td, (struct shmsys_args *)uap); +int +ibcs2_shmsys(td, uap) + struct thread *td; + struct ibcs2_shmsys_args *uap; +{ - case 3: /* shmget */ - return shmsys(td, (struct shmsys_args *)uap); + switch (uap->which) { + case 0: + return (ibcs2_shmat(td, uap)); + case 1: + return (ibcs2_shmctl(td, uap)); + case 2: + return (ibcs2_shmdt(td, uap)); + case 3: + return (ibcs2_shmget(td, uap)); } - return EINVAL; + return (EINVAL); } MODULE_DEPEND(ibcs2, sysvmsg, 1, 1, 1); ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.h#4 (text+ko) ==== @@ -38,7 +38,7 @@ u_short cgid; /* creator group id */ u_short mode; /* r/w permission */ u_short seq; /* sequence # (to generate unique msg/sem/shm id) */ - key_t key; /* user specified msg/sem/shm key */ + ibcs2_key_t key; /* user specified msg/sem/shm key */ }; struct ibcs2_msqid_ds { From owner-p4-projects@FreeBSD.ORG Wed Jun 28 21:06:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A84CB16A509; Wed, 28 Jun 2006 21:06:09 +0000 (UTC) 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 839AA16A4DE for ; Wed, 28 Jun 2006 21:06:09 +0000 (UTC) (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 B0F1044BF5 for ; Wed, 28 Jun 2006 20:43:59 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SKhxP4050120 for ; Wed, 28 Jun 2006 20:43:59 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SKhxU3050117 for perforce@freebsd.org; Wed, 28 Jun 2006 20:43:59 GMT (envelope-from jhb@freebsd.org) Date: Wed, 28 Jun 2006 20:43:59 GMT Message-Id: <200606282043.k5SKhxU3050117@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 100231 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, 28 Jun 2006 21:06:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=100231 Change 100231 by jhb@jhb_mutex on 2006/06/28 20:43:32 Don't copyin the shmid for IPC_RMID. ibcs2 and the base system don't copy one in and the base system won't use it anyway. Affected files ... .. //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#16 edit Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#16 (text+ko) ==== @@ -654,7 +654,6 @@ if (uap->buf != NULL) { switch (uap->cmd) { case SVR4_IPC_SET: - case SVR4_IPC_RMID: case SVR4_SHM_LOCK: case SVR4_SHM_UNLOCK: error = copyin(uap->buf, &ss, sizeof(ss)); From owner-p4-projects@FreeBSD.ORG Wed Jun 28 21:06:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34ACD16A71E; Wed, 28 Jun 2006 21:06:23 +0000 (UTC) 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 0E3DB16A6B8 for ; Wed, 28 Jun 2006 21:06:21 +0000 (UTC) (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 3A34D44304 for ; Wed, 28 Jun 2006 20:05:10 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SK5AL2048579 for ; Wed, 28 Jun 2006 20:05:10 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SK59rK048576 for perforce@freebsd.org; Wed, 28 Jun 2006 20:05:09 GMT (envelope-from jhb@freebsd.org) Date: Wed, 28 Jun 2006 20:05:09 GMT Message-Id: <200606282005.k5SK59rK048576@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 100228 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, 28 Jun 2006 21:06:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=100228 Change 100228 by jhb@jhb_mutex on 2006/06/28 20:04:17 Split up ibcs2_msgsys() into subfunctions similar to svr4_sys_msgsys() and use kern_msgctl() in ibcs2_msgctl() to avoid the stackgap. Affected files ... .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.c#9 edit Differences ... ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.c#9 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -102,50 +103,118 @@ return; } +struct ibcs2_msgget_args { + int what; + int key; + int msgflg; +}; + +static int +ibcs2_msgget(struct thread *td, void *v) +{ + struct ibcs2_msgget_args *uap = v; + struct msgget_args ap; + + ap.key = uap->key; + ap.msgflg = uap->msgflg; + return msgget(td, &ap); +} + +struct ibcs2_msgctl_args { + int what; + int msqid; + int cmd; + struct ibcs2_msqid_ds *buf; +}; + +static int +ibcs2_msgctl(struct thread *td, void *v) +{ + struct ibcs2_msgctl_args *uap = v; + struct ibcs2_msqid_ds is; + struct msqid_ds bs; + int error; + + switch (uap->cmd) { + case IBCS2_IPC_STAT: + error = kern_msgctl(td, uap->msqid, IPC_STAT, &bs); + if (!error) { + cvt_msqid2imsqid(&bs, &is); + error = copyout(&is, uap->buf, sizeof(is)); + } + return (error); + case IBCS2_IPC_SET: + error = copyin(uap->buf, &is, sizeof(is)); + if (error) + return (error); + cvt_imsqid2msqid(&is, &bs); + return (kern_msgctl(td, uap->msqid, IPC_SET, &bs)); + case IBCS2_IPC_RMID: + return (kern_msgctl(td, uap->msqid, IPC_RMID, NULL)); + } + return (EINVAL); +} + +struct ibcs2_msgrcv_args { + int what; + int msqid; + void *msgp; + size_t msgsz; + long msgtyp; + int msgflg; +}; + +static int +ibcs2_msgrcv(struct thread *td, void *v) +{ + struct ibcs2_msgrcv_args *uap = v; + struct msgrcv_args ap; + + ap.msqid = uap->msqid; + ap.msgp = uap->msgp; + ap.msgsz = uap->msgsz; + ap.msgtyp = uap->msgtyp; + ap.msgflg = uap->msgflg; + return (msgrcv(td, &ap)); +} + +struct ibcs2_msgsnd_args { + int what; + int msqid; + void *msgp; + size_t msgsz; + int msgflg; +}; + +static int +ibcs2_msgsnd(struct thread *td, void *v) +{ + struct ibcs2_msgsnd_args *uap = v; + struct msgsnd_args ap; + + ap.msqid = uap->msqid; + ap.msgp = uap->msgp; + ap.msgsz = uap->msgsz; + ap.msgflg = uap->msgflg; + return (msgsnd(td, &ap)); +} + int ibcs2_msgsys(td, uap) struct thread *td; struct ibcs2_msgsys_args *uap; { switch (uap->which) { - case 0: /* msgget */ - uap->which = 1; - return msgsys(td, (struct msgsys_args *)uap); - case 1: { /* msgctl */ - int error; - struct msgsys_args margs; - caddr_t sg = stackgap_init(); - - margs.which = 0; - margs.a2 = uap->a2; - margs.a4 = - (int)stackgap_alloc(&sg, sizeof(struct msqid_ds)); - margs.a3 = uap->a3; - switch (margs.a3) { - case IBCS2_IPC_STAT: - error = msgsys(td, &margs); - if (!error) - cvt_msqid2imsqid( - (struct msqid_ds *)margs.a4, - (struct ibcs2_msqid_ds *)uap->a4); - return error; - case IBCS2_IPC_SET: - cvt_imsqid2msqid((struct ibcs2_msqid_ds *)uap->a4, - (struct msqid_ds *)margs.a4); - return msgsys(td, &margs); - case IBCS2_IPC_RMID: - return msgsys(td, &margs); - } - return EINVAL; - } - case 2: /* msgrcv */ - uap->which = 3; - return msgsys(td, (struct msgsys_args *)uap); - case 3: /* msgsnd */ - uap->which = 2; - return msgsys(td, (struct msgsys_args *)uap); + case 0: + return (ibcs2_msgget(td, uap)); + case 1: + return (ibcs2_msgctl(td, uap)); + case 2: + return (ibcs2_msgrcv(td, uap)); + case 3: + return (ibcs2_msgsnd(td, uap)); default: - return EINVAL; + return (EINVAL); } } From owner-p4-projects@FreeBSD.ORG Wed Jun 28 21:08:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4930816A416; Wed, 28 Jun 2006 21:08:47 +0000 (UTC) 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 0C9F216A412 for ; Wed, 28 Jun 2006 21:08:47 +0000 (UTC) (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 9DDE843E7D for ; Wed, 28 Jun 2006 21:08:33 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SL8WIY060164 for ; Wed, 28 Jun 2006 21:08:32 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SL8Vvt060161 for perforce@freebsd.org; Wed, 28 Jun 2006 21:08:31 GMT (envelope-from jhb@freebsd.org) Date: Wed, 28 Jun 2006 21:08:31 GMT Message-Id: <200606282108.k5SL8Vvt060161@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 100233 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, 28 Jun 2006 21:08:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=100233 Change 100233 by jhb@jhb_mutex on 2006/06/28 21:07:46 Add a kern_getgroups() for ibcs2. Affected files ... .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#23 edit .. //depot/projects/smpng/sys/kern/kern_prot.c#92 edit .. //depot/projects/smpng/sys/sys/syscallsubr.h#36 edit Differences ... ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#23 (text+ko) ==== @@ -651,35 +651,31 @@ struct thread *td; struct ibcs2_getgroups_args *uap; { + ibcs2_gid_t *iset; + gid_t *gp; int error, i; - ibcs2_gid_t *iset = NULL; - struct getgroups_args sa; - gid_t *gp; - caddr_t sg = stackgap_init(); if (uap->gidsetsize < 0) return (EINVAL); if (uap->gidsetsize > NGROUPS_MAX) uap->gidsetsize = NGROUPS_MAX; - sa.gidsetsize = uap->gidsetsize; - if (uap->gidsetsize) { - sa.gidset = stackgap_alloc(&sg, NGROUPS_MAX * - sizeof(gid_t *)); - iset = stackgap_alloc(&sg, uap->gidsetsize * - sizeof(ibcs2_gid_t)); + if (uap->gidsetsize) + gp = malloc(uap->gidsetsize * sizeof(gid_t), M_TEMP, M_WAITOK); + else + gp = NULL; + + error = kern_getgroups(td, uap->gidsetsize, gp, UIO_SYSSPACE); + if (error == 0 && gp != NULL && td->td_retval[0] > 0) { + iset = malloc(td->td_retval[0] * sizeof(ibcs2_gid_t), M_TEMP, + M_WAITOK); + for (i = 0; i < td->td_retval[0]; i++) + iset[i] = (ibcs2_gid_t)gp[i]; + error = copyout(iset, uap->gidset, td->td_retval[0] * + sizeof(ibcs2_gid_t)); + free(iset, M_TEMP); } - if ((error = getgroups(td, &sa)) != 0) - return error; - if (uap->gidsetsize == 0) - return 0; - - for (i = 0, gp = sa.gidset; i < td->td_retval[0]; i++) - iset[i] = (ibcs2_gid_t)*gp++; - if (td->td_retval[0] && (error = copyout((caddr_t)iset, - (caddr_t)uap->gidset, - sizeof(ibcs2_gid_t) * td->td_retval[0]))) - return error; - return 0; + free(gp, M_TEMP); + return (error); } int ==== //depot/projects/smpng/sys/kern/kern_prot.c#92 (text+ko) ==== @@ -63,7 +63,9 @@ #include #include #include +#include #include +#include #include @@ -297,19 +299,32 @@ int getgroups(struct thread *td, register struct getgroups_args *uap) { + return (kern_getgroups(td, uap->gidsetsize, uap->gidset, + UIO_USERSPACE)); +} + +int +kern_getgroups(struct thread *td, u_int gidsetsize, gid_t *gidset, + enum uio_seg gidsetseg) +{ struct ucred *cred; u_int ngrp; int error; cred = td->td_ucred; - if ((ngrp = uap->gidsetsize) == 0) { + if ((ngrp = gidsetsize) == 0) { td->td_retval[0] = cred->cr_ngroups; return (0); } if (ngrp < cred->cr_ngroups) return (EINVAL); ngrp = cred->cr_ngroups; - error = copyout(cred->cr_groups, uap->gidset, ngrp * sizeof(gid_t)); + if (gidsetseg == UIO_USERSPACE) + error = copyout(cred->cr_groups, gidset, ngrp * sizeof(gid_t)); + else { + bcopy(cred->cr_groups, gidset, ngrp * sizeof(gid_t)); + error = 0; + } if (error == 0) td->td_retval[0] = ngrp; return (error); ==== //depot/projects/smpng/sys/sys/syscallsubr.h#36 (text+ko) ==== @@ -83,6 +83,8 @@ enum uio_seg tptrseg); int kern_getfsstat(struct thread *td, struct statfs **buf, size_t bufsize, enum uio_seg bufseg, int flags); +int kern_getgroups(struct thread *td, u_int gidsetsize, gid_t *gidset, + enum uio_seg gidsetseg); int kern_getitimer(struct thread *, u_int, struct itimerval *); int kern_getpeername(struct thread *td, int fd, struct sockaddr **sa, socklen_t *alen); From owner-p4-projects@FreeBSD.ORG Wed Jun 28 21:09:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DAEE16A403; Wed, 28 Jun 2006 21:09:39 +0000 (UTC) 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 06D1D16A415 for ; Wed, 28 Jun 2006 21:09:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7CF943DA5 for ; Wed, 28 Jun 2006 21:09:34 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SL9YGK060200 for ; Wed, 28 Jun 2006 21:09:34 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SL9X6J060197 for perforce@freebsd.org; Wed, 28 Jun 2006 21:09:33 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 28 Jun 2006 21:09:33 GMT Message-Id: <200606282109.k5SL9X6J060197@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100234 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, 28 Jun 2006 21:09:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=100234 Change 100234 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/28 21:08:43 doesn't really help but is a missed dependency Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sys/_lock.h#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sys/_lock.h#5 (text+ko) ==== @@ -56,6 +56,7 @@ const char *lo_name; /* Individual lock name. */ const char *lo_type; /* General lock type. */ u_int lo_flags; + u_int lo_id; /* unique instance id */ #ifdef MUTEX_PROFILING struct lock_profile_object lo_profile_obj; #endif From owner-p4-projects@FreeBSD.ORG Wed Jun 28 21:57:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F213716A52E; Wed, 28 Jun 2006 21:57:09 +0000 (UTC) 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 C5C0616A4D2 for ; Wed, 28 Jun 2006 21:57:09 +0000 (UTC) (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 5C39E444E3 for ; Wed, 28 Jun 2006 21:25:55 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SLPtL3061031 for ; Wed, 28 Jun 2006 21:25:55 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SLPsBI061028 for perforce@freebsd.org; Wed, 28 Jun 2006 21:25:54 GMT (envelope-from jhb@freebsd.org) Date: Wed, 28 Jun 2006 21:25:54 GMT Message-Id: <200606282125.k5SLPsBI061028@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 100235 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, 28 Jun 2006 21:57:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=100235 Change 100235 by jhb@jhb_mutex on 2006/06/28 21:25:03 - Stick group arrays on the stack, they are tiny. - Add a kern_setgroups() for ibcs2. This actually removes a gross hack from setgroups() where we used to allocate an entire credential just to borrow its groups array. Now we copy the groups array into an array on the stack and just pass it to kern_setgroups(). Affected files ... .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#24 edit .. //depot/projects/smpng/sys/kern/kern_prot.c#93 edit .. //depot/projects/smpng/sys/sys/syscallsubr.h#37 edit Differences ... ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#24 (text+ko) ==== @@ -651,31 +651,23 @@ struct thread *td; struct ibcs2_getgroups_args *uap; { - ibcs2_gid_t *iset; - gid_t *gp; + ibcs2_gid_t iset[NGROUPS_MAX]; + gid_t gp[NGROUPS_MAX]; int error, i; if (uap->gidsetsize < 0) return (EINVAL); if (uap->gidsetsize > NGROUPS_MAX) uap->gidsetsize = NGROUPS_MAX; - if (uap->gidsetsize) - gp = malloc(uap->gidsetsize * sizeof(gid_t), M_TEMP, M_WAITOK); - else - gp = NULL; error = kern_getgroups(td, uap->gidsetsize, gp, UIO_SYSSPACE); - if (error == 0 && gp != NULL && td->td_retval[0] > 0) { - iset = malloc(td->td_retval[0] * sizeof(ibcs2_gid_t), M_TEMP, - M_WAITOK); - for (i = 0; i < td->td_retval[0]; i++) - iset[i] = (ibcs2_gid_t)gp[i]; - error = copyout(iset, uap->gidset, td->td_retval[0] * - sizeof(ibcs2_gid_t)); - free(iset, M_TEMP); - } - free(gp, M_TEMP); - return (error); + if (error || uap->gidsetsize == 0 || td->td_retval[0] == 0) + return (error); + + for (i = 0; i < td->td_retval[0]; i++) + iset[i] = (ibcs2_gid_t)gp[i]; + return (copyout(iset, uap->gidset, td->td_retval[0] * + sizeof(ibcs2_gid_t))); } int @@ -683,28 +675,21 @@ struct thread *td; struct ibcs2_setgroups_args *uap; { + ibcs2_gid_t iset[NGROUPS_MAX]; + gid_t gp[NGROUPS_MAX]; int error, i; - ibcs2_gid_t *iset; - struct setgroups_args sa; - gid_t *gp; - caddr_t sg = stackgap_init(); if (uap->gidsetsize < 0 || uap->gidsetsize > NGROUPS_MAX) return (EINVAL); - sa.gidsetsize = uap->gidsetsize; - sa.gidset = stackgap_alloc(&sg, sa.gidsetsize * - sizeof(gid_t *)); - iset = stackgap_alloc(&sg, sa.gidsetsize * - sizeof(ibcs2_gid_t *)); - if (sa.gidsetsize) { - if ((error = copyin((caddr_t)uap->gidset, (caddr_t)iset, - sizeof(ibcs2_gid_t *) * - uap->gidsetsize)) != 0) - return error; + if (uap->gidsetsize && uap->gidset) { + error = copyin(uap->gidset, iset, sizeof(ibcs2_gid_t) * + uap->gidsetsize); + if (error) + return (error); + for (i = 0; i < uap->gidsetsize; i++) + gp[i] = (gid_t)iset[i]; } - for (i = 0, gp = sa.gidset; i < sa.gidsetsize; i++) - *gp++ = (gid_t)iset[i]; - return setgroups(td, &sa); + return (kern_setgroups(td, uap->gidsetsize, gp)); } int ==== //depot/projects/smpng/sys/kern/kern_prot.c#93 (text+ko) ==== @@ -830,28 +830,33 @@ int setgroups(struct thread *td, struct setgroups_args *uap) { + gid_t groups[NGROUPS]; + int error; + + if (uap->gidsetsize > NGROUPS) + return (EINVAL); + error = copyin(uap->gidset, groups, uap->gidsetsize * sizeof(gid_t)); + if (error) + return (error); + return (kern_setgroups(td, uap->gidsetsize, groups)); +} + +int +kern_setgroups(struct thread *td, u_int ngrp, gid_t *groups) +{ struct proc *p = td->td_proc; - struct ucred *newcred, *tempcred, *oldcred; - u_int ngrp; + struct ucred *newcred, *oldcred; int error; - ngrp = uap->gidsetsize; if (ngrp > NGROUPS) return (EINVAL); - tempcred = crget(); - error = copyin(uap->gidset, tempcred->cr_groups, ngrp * sizeof(gid_t)); - if (error != 0) { - crfree(tempcred); - return (error); - } - AUDIT_ARG(groupset, tempcred->cr_groups, ngrp); + AUDIT_ARG(groupset, groups, ngrp); newcred = crget(); PROC_LOCK(p); oldcred = p->p_ucred; #ifdef MAC - error = mac_check_proc_setgroups(p, oldcred, ngrp, - tempcred->cr_groups); + error = mac_check_proc_setgroups(p, oldcred, ngrp, groups); if (error) goto fail; #endif @@ -874,21 +879,18 @@ */ newcred->cr_ngroups = 1; } else { - bcopy(tempcred->cr_groups, newcred->cr_groups, - ngrp * sizeof(gid_t)); + bcopy(groups, newcred->cr_groups, ngrp * sizeof(gid_t)); newcred->cr_ngroups = ngrp; } setsugid(p); p->p_ucred = newcred; PROC_UNLOCK(p); - crfree(tempcred); crfree(oldcred); return (0); fail: PROC_UNLOCK(p); crfree(newcred); - crfree(tempcred); return (error); } ==== //depot/projects/smpng/sys/sys/syscallsubr.h#37 (text+ko) ==== @@ -141,6 +141,7 @@ struct uio *hdr_uio, struct uio *trl_uio, int compat); int kern_sendit(struct thread *td, int s, struct msghdr *mp, int flags, struct mbuf *control, enum uio_seg segflg); +int kern_setgroups(struct thread *td, u_int ngrp, gid_t *groups); int kern_setitimer(struct thread *, u_int, struct itimerval *, struct itimerval *); int kern_setrlimit(struct thread *, u_int, struct rlimit *); From owner-p4-projects@FreeBSD.ORG Wed Jun 28 22:27:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59B6516A510; Wed, 28 Jun 2006 22:27:08 +0000 (UTC) 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 1DAAC16A4DE for ; Wed, 28 Jun 2006 22:27:08 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F38D343EC5 for ; Wed, 28 Jun 2006 22:26:24 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SMQBix069005 for ; Wed, 28 Jun 2006 22:26:11 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SMQB6I069002 for perforce@freebsd.org; Wed, 28 Jun 2006 22:26:11 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 28 Jun 2006 22:26:11 GMT Message-Id: <200606282226.k5SMQB6I069002@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100239 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, 28 Jun 2006 22:27:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=100239 Change 100239 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/28 22:25:25 compile fix Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sys/lockmgr.h#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sys/lockmgr.h#5 (text+ko) ==== @@ -40,6 +40,7 @@ #ifdef DEBUG_LOCKS #include /* XXX */ #endif +#include #include struct mtx; From owner-p4-projects@FreeBSD.ORG Wed Jun 28 23:36:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2E9C16A521; Wed, 28 Jun 2006 23:36:30 +0000 (UTC) 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 5D77316A5C0 for ; Wed, 28 Jun 2006 23:36:30 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D9D245318 for ; Wed, 28 Jun 2006 23:15:14 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SNFEWo072263 for ; Wed, 28 Jun 2006 23:15:14 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SNFEdj072260 for perforce@freebsd.org; Wed, 28 Jun 2006 23:15:14 GMT (envelope-from cdjones@FreeBSD.org) Date: Wed, 28 Jun 2006 23:15:14 GMT Message-Id: <200606282315.k5SNFEdj072260@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 100241 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, 28 Jun 2006 23:36:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=100241 Change 100241 by cdjones@cdjones-impulse on 2006/06/28 23:15:02 Add some notes about who calls what. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#3 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#3 (text+ko) ==== @@ -24,6 +24,7 @@ */ #include +__FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" @@ -79,14 +80,24 @@ /* TODO */ } +/* Internal machinations for hierarchical scheduler go here. + * + * We need an interface for the sub-schedulers to implement. + * + */ + + + /* Common external interface stuff goes here. - (from sys/sched.h) -*/ + * (from sys/sched.h) + */ +/* Initialize the scheduler, called from init_main.c. + * Code taken blindly from sched_4bsd.c. + */ void schedinit(void) { - proc0.p_sched = NULL; ksegrp0.kg_sched = &kg_sched0; thread0.td_sched = &kse0; @@ -96,65 +107,91 @@ kg_sched0.skg_avail_openings = 0; /* we are already running */ } +/* Calculate the load average. + * Called from kern_synch:loadav. + */ int sched_load(void) { } +/* Do we have a runnable process? + * Called from kern_idle:idle_proc. + */ int -sched_rr_internal(void) -{ - -} - -int sched_runnable(void) { } +/* Remove a thread from the scheduler. + * Called from kern_exit:exit1. + */ void sched_exit(struct proc *p, struct thread *childtd) { } - +/* Adjust thread priorities on fork. + * Called from kern_fork:fork1. + */ void sched_fork(struct thread *td, struct thread *childtd) { } +/* Adjust a thread's class. + * Called from kern_idle:idle_setup and kern_resource:rtp_to_pri. + */ void sched_class(struct ksegrp *kg, int class) { } +/* + * Called from kern_thread:thread_exit. + */ void sched_exit_ksegrp(struct ksegrp *kg, struct thread *childtd) { } +/* + * Called from kern_kse:kse_create and kern_thr:create_thread. + */ void sched_fork_ksegrp(struct ksegrp *kg, struct thread *childtd) { } +/* + * Called from kern_resource:donice and kern_sig:tdsigwakeup. + */ void sched_nice(struct proc *p, int nice) { } +/* + * Called from kern_thread:thread_exit. + */ void sched_exit_thread(struct thread *td, struct thread *child) { } +/* + * + */ void sched_fork_thread(struct thread *td, struct thread *child) { } +/* + * Called from kern_proc:fill_kinfo_thread. + */ fixpt_t sched_pctcpu(struct thread *td) { @@ -247,3 +284,6 @@ { return (sizeof(struct thread) + sizeof(struct td_sched)); } + +#define KERN_SWITCH_INCLUDE 1 +#include "kern/kern_switch.c" From owner-p4-projects@FreeBSD.ORG Wed Jun 28 23:53:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0692116A4C8; Wed, 28 Jun 2006 23:53:14 +0000 (UTC) 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 BB16116A492 for ; Wed, 28 Jun 2006 23:53:13 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DD6943F1A for ; Wed, 28 Jun 2006 22:51:44 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SMpilX070079 for ; Wed, 28 Jun 2006 22:51:44 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SMph3v070076 for perforce@freebsd.org; Wed, 28 Jun 2006 22:51:43 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 28 Jun 2006 22:51:43 GMT Message-Id: <200606282251.k5SMph3v070076@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100240 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, 28 Jun 2006 23:53:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=100240 Change 100240 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/28 22:50:47 fix an LOR with Giant in fcntl Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_descrip.c#10 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_descrip.c#10 (text+ko) ==== @@ -365,18 +365,24 @@ flg = F_POSIX; p = td->td_proc; fdp = p->p_fd; + retry: FILEDESC_LOCK(fdp); if ((unsigned)fd >= fdp->fd_nfiles || (fp = fdp->fd_ofiles[fd]) == NULL) { FILEDESC_UNLOCK(fdp); + if (giant_locked) + mtx_unlock(&Giant); error = EBADF; goto done2; } pop = &fdp->fd_ofileflags[fd]; - if ((fp->f_ops->fo_flags & DFLAG_MPSAFE) == 0) { + if ((giant_locked == 0) && ((fp->f_ops->fo_flags & DFLAG_MPSAFE) == 0)) { + FILEDESC_UNLOCK(fdp); mtx_lock(&Giant); giant_locked = 1; + /* we may have lost a race */ + goto retry; } switch (cmd) { case F_DUPFD: From owner-p4-projects@FreeBSD.ORG Thu Jun 29 02:56:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D4E516A621; Thu, 29 Jun 2006 02:56:44 +0000 (UTC) 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 1FFF316A5EE for ; Thu, 29 Jun 2006 02:56:44 +0000 (UTC) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6872B44B68 for ; Thu, 29 Jun 2006 01:56:38 +0000 (GMT) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T1ucKj090163 for ; Thu, 29 Jun 2006 01:56:38 GMT (envelope-from swhitman@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T1ucd8090160 for perforce@freebsd.org; Thu, 29 Jun 2006 01:56:38 GMT (envelope-from swhitman@FreeBSD.org) Date: Thu, 29 Jun 2006 01:56:38 GMT Message-Id: <200606290156.k5T1ucd8090160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swhitman@FreeBSD.org using -f From: Spencer Whitman To: Perforce Change Reviews Cc: Subject: PERFORCE change 100246 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, 29 Jun 2006 02:56:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=100246 Change 100246 by swhitman@swhitman_joecatmini on 2006/06/29 01:56:22 reintegrating branch Affected files ... .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/k.c~#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/obj/.depend#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/obj/fixed_token.c#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/obj/token_data_temp.c#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/obj/token_defs.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 29 02:56:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2DEF16A416; Thu, 29 Jun 2006 02:56:54 +0000 (UTC) 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 8FE0D16A407 for ; Thu, 29 Jun 2006 02:56:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4336943D8D for ; Thu, 29 Jun 2006 02:56:54 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T2us6I093980 for ; Thu, 29 Jun 2006 02:56:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T2ur0a093977 for perforce@freebsd.org; Thu, 29 Jun 2006 02:56:53 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 29 Jun 2006 02:56:53 GMT Message-Id: <200606290256.k5T2ur0a093977@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100248 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, 29 Jun 2006 02:56:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=100248 Change 100248 by kmacy@kmacy_storage:sun4v_work_stable on 2006/06/29 02:56:39 integrate right up prior to bike_sched integration Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/contrib/gcc/config/sparc/sparc.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_idle.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/asi.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/asm.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/frame.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/pcpu.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/exception.S#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/pmap.c#2 integrate Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/contrib/gcc/config/sparc/sparc.h#2 (text+ko) ==== @@ -797,7 +797,7 @@ /* ALIGN FRAMES on double word boundaries */ #define SPARC_STACK_ALIGN(LOC) \ - (TARGET_ARCH64 ? (((LOC)+15) & ~15) : (((LOC)+7) & ~7)) + (TARGET_ARCH64 ? (((LOC)+63) & ~63) : (((LOC)+7) & ~7)) /* Allocation boundary (in *bits*) for the code of a function. */ #define FUNCTION_BOUNDARY 32 ==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_idle.c#2 (text+ko) ==== @@ -78,7 +78,7 @@ mtx_lock_spin(&sched_lock); td = FIRST_THREAD_IN_PROC(p); TD_SET_CAN_RUN(td); - td->td_flags |= TDF_IDLETD; + atomic_set_int(&td->td_flags, TDF_IDLETD); sched_class(td->td_ksegrp, PRI_IDLE); sched_prio(td, PRI_MAX_IDLE); mtx_unlock_spin(&sched_lock); @@ -118,7 +118,8 @@ #ifdef SMP idle_cpus_mask &= ~mycpu; #endif - mi_switch(SW_VOL, NULL); + if ((td = choosethread()) != curthread) + sched_switch(curthread, td, SW_VOL); #ifdef SMP idle_cpus_mask |= mycpu; #endif ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/asi.h#2 (text+ko) ==== @@ -53,13 +53,14 @@ #define ASI_SCRATCHPAD 0x20 #define ASI_MMU_CONTEXTID 0x21 #define ASI_LDTD_AIUP 0x22 /* ASI_LOAD_TWIN_DW_AS_IF_USER_PRIMARY */ +#define ASI_LDSTBI_AIUP 0x22 #define ASI_LDTD_AIUS 0x23 /* ASI_LOAD_TWIN_DW_AS_IF_USER_SECONDARY */ #define ASI_LDSTBI_AIUS 0x23 #define ASI_QUEUE 0x25 #define ASI_LDTD_REAL 0x26 /* ASI_LOAD_TWIN_DW_REAL */ #define ASI_STBI_REAL 0x26 #define ASI_LDTD_N 0x27 /* ASI_LOAD_TWIN_DW_NUCLEUS */ -#define ASI_STBI_N 0x27 +#define ASI_LDSTBI_N 0x27 #define ASI_LDTD_AIUPL 0x2A /* ASI_LD_TWIN_DW_AS_IF_USER_PRIMARY_LITTLE */ #define ASI_LDTD_AIUSL 0x2B /* ASI_LD_TWIN_DW_AS_IF_USER_SECONDARY_LITTLE */ ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/asm.h#2 (text+ko) ==== @@ -95,11 +95,11 @@ #define ENTRY(x) _ENTRY(x) #define END(x) .size x, . - x -#define STACK_ALIGN 16 +#define STACK_ALIGN 64 #define SET_SIZE(x) END(x) #define SA(X) (((X)+(STACK_ALIGN-1)) & ~(STACK_ALIGN-1)) #define WINDOWSIZE64 (16*8) -#define MINFRAME64 (WINDOWSIZE64 + 48) +#define MINFRAME64 (WINDOWSIZE64 + 64) #define MINFRAME MINFRAME64 #define REGOFF SA(MINFRAME) ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/frame.h#2 (text+ko) ==== @@ -52,11 +52,11 @@ uint64_t tf_wstate; uint64_t tf_asi; uint64_t tf_pad3[1]; -}; +} __aligned(64); /* extra padding can go away once we re-shuffle user-land mcontext */ -#define tf_sp tf_out[6] +#define tf_sp tf_out[6] #define TF_DONE(tf) do { \ tf->tf_tpc = tf->tf_tnpc; \ ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/pcpu.h#2 (text+ko) ==== @@ -78,7 +78,8 @@ u_int pc_kwbuf_full; \ struct rwindow pc_tsbwbuf[2]; \ u_int pc_node; \ - uint16_t pc_cpulist[MAXCPU] + uint16_t pc_cpulist[MAXCPU]; \ + uint64_t pad[6]; /* XXX SUN4V_FIXME - as we access the *_ra and *_size fields in quick * succession we _really_ want them to be L1 cache line size aligned ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/exception.S#2 (text+ko) ==== @@ -140,6 +140,26 @@ storer %i6, [%g5 + %g3]asi ;\ storer %i7, [%g5 + %g4]asi +/* 16 instructions */ +#define SPILL_ASI_64 \ + stxa %l0, [%g1 + 0x0]%asi ;\ + stxa %i0, [%g1 + 0x40]%asi ;\ + stxa %l1, [%g1 + 0x8]%asi ;\ + stxa %l2, [%g1 + 0x10]%asi ;\ + stxa %l3, [%g1 + 0x18]%asi ;\ + stxa %l4, [%g1 + 0x20]%asi ;\ + stxa %l5, [%g1 + 0x28]%asi ;\ + stxa %l6, [%g1 + 0x30]%asi ;\ + stxa %l7, [%g1 + 0x38]%asi ;\ + stxa %i1, [%g1 + 0x48]%asi ;\ + stxa %i2, [%g1 + 0x50]%asi ;\ + stxa %i3, [%g1 + 0x58]%asi ;\ + stxa %i4, [%g1 + 0x60]%asi ;\ + stxa %i5, [%g1 + 0x68]%asi ;\ + stxa %i6, [%g1 + 0x70]%asi ;\ + stxa %i7, [%g1 + 0x78]%asi + +/* 23 instructions */ #define FILL(loader, bias, size, asi) \ mov 0 + bias, %g1 ;\ loader [%sp + %g1]asi, %l0 ;\ @@ -165,20 +185,54 @@ loader [%g5 + %g3]asi, %i6 ;\ loader [%g5 + %g4]asi, %i7 -#define FILL_DW(asi) \ - mov 0 + SPOFF, %g1 ;\ - ldda [%sp + %g1]asi, %l0 ;\ - mov 16 + SPOFF, %g2 ;\ - ldda [%sp + %g2]asi, %l2 ;\ - add %sp, 32, %g3 ;\ - ldda [%g3 + %g1]asi, %l4 ;\ - ldda [%g3 + %g2]asi, %l6 ;\ - add %g3, 32, %g3 ;\ - ldda [%g3 + %g1]asi, %i0 ;\ - ldda [%g3 + %g2]asi, %i2 ;\ - add %g3, 32, %g3 ;\ - ldda [%g3 + %g1]asi, %i4 ;\ - ldda [%g3 + %g2]asi, %i6 +#define SPILL_ASI_SET(storer, size) \ + storer %l0, [%g1 + (0 * size)]%asi ;\ + storer %l1, [%g1 + (1 * size)]%asi ;\ + storer %l2, [%g1 + (2 * size)]%asi ;\ + storer %l3, [%g1 + (3 * size)]%asi ;\ + storer %l4, [%g1 + (4 * size)]%asi ;\ + storer %l5, [%g1 + (5 * size)]%asi ;\ + storer %l6, [%g1 + (6 * size)]%asi ;\ + storer %l7, [%g1 + (7 * size)]%asi ;\ + storer %i0, [%g1 + (8 * size)]%asi ;\ + storer %i1, [%g1 + (9 * size)]%asi ;\ + storer %i2, [%g1 + (10 * size)]%asi ;\ + storer %i3, [%g1 + (11 * size)]%asi ;\ + storer %i4, [%g1 + (12 * size)]%asi ;\ + storer %i5, [%g1 + (13 * size)]%asi ;\ + storer %i6, [%g1 + (14 * size)]%asi ;\ + storer %i7, [%g1 + (15 * size)]%asi + +/* 16 instructions */ +#define FILL_ASI_SET(loader, size) \ + loader [%g1 + 0x0]%asi, %l0 ;\ + loader [%g1 + (size * 1)]%asi, %l1 ;\ + loader [%g1 + (size * 2)]%asi, %l2 ;\ + loader [%g1 + (size * 3)]%asi, %l3 ;\ + loader [%g1 + (size * 4)]%asi, %l4 ;\ + loader [%g1 + (size * 5)]%asi, %l5 ;\ + loader [%g1 + (size * 6)]%asi, %l6 ;\ + loader [%g1 + (size * 7)]%asi, %l7 ;\ + loader [%g1 + (size * 8)]%asi, %i0 ;\ + loader [%g1 + (size * 9)]%asi, %i1 ;\ + loader [%g1 + (size * 10)]%asi, %i2 ;\ + loader [%g1 + (size * 11)]%asi, %i3 ;\ + loader [%g1 + (size * 12)]%asi, %i4 ;\ + loader [%g1 + (size * 13)]%asi, %i5 ;\ + loader [%g1 + (size * 14)]%asi, %i6 ;\ + loader [%g1 + (size * 15)]%asi, %i7 + +/* 9 instructions */ +#define FILL_DW \ + prefetch [%g1 + 0x40], #one_read ;\ + ldda [%g1 + 0]%asi, %l0 ;\ + ldda [%g1 + 0x10]%asi, %l2 ;\ + ldda [%g1 + 0x20]%asi, %l4 ;\ + ldda [%g1 + 0x30]%asi, %l6 ;\ + ldda [%g1 + 0x40]%asi, %i0 ;\ + ldda [%g1 + 0x50]%asi, %i2 ;\ + ldda [%g1 + 0x60]%asi, %i4 ;\ + ldda [%g1 + 0x70]%asi, %i6 #include /* @@ -372,8 +426,76 @@ .endm -#define ALIGN_128 .align 128 +#define ALIGN_128 .align 128 +#define SYNC #Sync +#define LOOKASIDE #Lookaside + +#define USE_FAST_SPILLFILL +#ifdef USE_FAST_SPILLFILL +#define spill_64bit_asi(asival, asival_unaligned, target) \ + wr %g0, asival, %asi ; \ + add %sp, SPOFF, %g1 ; \ + SPILL_ASI_64 ; \ + membar LOOKASIDE ; \ + saved ; \ + retry ; \ + .skip (31-21)*4 ; \ + ba,a,pt %xcc, fault_64bit_##target ; \ + ALIGN_128 + +#define spill_64clean(asival, asival_unaligned, target) \ + wr %g0, asival, %asi ; \ + add %sp, SPOFF, %g1 ; \ + SPILL_ASI_64 ; \ + membar LOOKASIDE ; \ + b spill_clean ; \ + mov WSTATE_USER64, %g7 ; \ + .skip (31-21)*4 ; \ + ba,a,pt %xcc, fault_64bit_##target ; \ + ALIGN_128 + +#define fill_64bit_asi(asival, asival_unaligned, target) \ + add %sp, SPOFF, %g1 ; \ + wr %g0, asival, %asi ; \ + FILL_DW ; \ + restored ; \ + retry ; \ + .skip (31-13)*4 ; \ + ba,a,pt %xcc, fault_64bit_##target ; \ + ALIGN_128 +#else +#define spill_64bit_asi(asival, asival_unaligned, target) \ + wr %g0, asival_unaligned, %asi ; \ + add %sp, SPOFF, %g1 ; \ + SPILL_ASI_SET(stxa, 8) ; \ + saved ; \ + retry ; \ + .skip (31-20)*4 ; \ + ba,a,pt %xcc, fault_64bit_##target ; \ + ALIGN_128 + +#define spill_64clean(asival, asival_unaligned, target) \ + wr %g0, asival_unaligned, %asi ; \ + add %sp, SPOFF, %g1 ; \ + SPILL_ASI_SET(stxa, 8) ; \ + b spill_clean ; \ + mov WSTATE_USER64, %g7 ; \ + .skip (31-20)*4 ; \ + ba,a,pt %xcc, fault_64bit_##target ; \ + ALIGN_128 + +#define fill_64bit_asi(asival, asival_unaligned, target) \ + wr %g0, asival_unaligned, %asi ; \ + add %sp, SPOFF, %g1 ; \ + FILL_ASI_SET(ldxa, 8) ; \ + restored ; \ + retry ; \ + .skip (31-20)*4 ; \ + ba,a,pt %xcc, fault_64bit_##target ; \ + ALIGN_128 +#endif + #define spill_32bit_asi(asi, target) \ srl %sp, 0, %sp ; \ SPILL_FILL_MAGIC_TRAP_ON; \ @@ -385,16 +507,6 @@ ba,a,pt %xcc, fault_32bit_##target ; \ ALIGN_128 -#define spill_64bit_asi(asi, target) \ - SPILL_FILL_MAGIC_TRAP_ON ; \ - SPILL_ASI(stxa, SPOFF, 8, asi) ; \ - saved ; \ - SPILL_FILL_MAGIC_TRAP_OFF ; \ - retry ; \ - .skip (31-27)*4 ; \ - ba,a,pt %xcc, fault_64bit_##target ; \ - ALIGN_128 - #define spill_32clean(asi, target) \ srl %sp, 0, %sp ; \ SPILL_FILL_MAGIC_TRAP_ON; \ @@ -405,15 +517,6 @@ ba,a,pt %xcc, fault_32bit_##target ; \ ALIGN_128 -#define spill_64clean(asi, target) \ - SPILL_FILL_MAGIC_TRAP_ON; \ - SPILL_ASI(stxa, SPOFF, 8, asi) ; \ - b spill_clean ; \ - mov WSTATE_USER64, %g7 ; \ - .skip (31-26)*4 ; \ - ba,a,pt %xcc, fault_64bit_##target ; \ - ALIGN_128 - #define fill_32bit_asi(asi, target) \ srl %sp, 0, %sp ; \ SPILL_FILL_MAGIC_TRAP_ON; \ @@ -424,22 +527,32 @@ ba,a,pt %xcc, fault_32bit_##target ; \ ALIGN_128 -#define fill_64bit_asi(asi, target) \ - SPILL_FILL_MAGIC_TRAP_ON; \ - FILL(ldxa, SPOFF, 8, asi) ; \ - restored ; \ - SPILL_FILL_MAGIC_TRAP_OFF ; \ - retry ; \ - .skip (31-27)*4 ; \ - ba,a,pt %xcc, fault_64bit_##target ; \ - .align 128 +.align 128 +ENTRY(fill_64bit_slow_fn0) +fill_slow_start: + FILL_ASI_SET(ldxa, 8); + restored ; + retry ; + .skip (31-18)*4 ; + ba,a,pt %xcc, fault_64bit_fn0 ; + .align 128 +END(fill_64bit_slow_fn0) +ENTRY(fill_64bit_slow_not) + FILL_ASI_SET(ldxa, 8); + restored ; + retry ; + .skip (31-18)*4 ; + ba,a,pt %xcc, fault_64bit_not ; + .align 128 +END(fill_64bit_slow_not) +fill_slow_end: .macro spill_32bit_primary_sn0 spill_32bit_asi(ASI_AIUP, sn0) .endm .macro spill_64bit_primary_sn0 - spill_64bit_asi(ASI_AIUP, sn0) + spill_64bit_asi(ASI_LDSTBI_AIUP, ASI_AIUP, sn0) .endm .macro spill_32clean_primary_sn0 @@ -447,7 +560,7 @@ .endm .macro spill_64clean_primary_sn0 - spill_64clean(ASI_AIUP, sn0) + spill_64clean(ASI_LDSTBI_AIUP, ASI_AIUP, sn0) .endm .macro spill_32bit_nucleus_not @@ -455,7 +568,7 @@ .endm .macro spill_64bit_nucleus_not - spill_64bit_asi(ASI_N,not) + spill_64bit_asi(ASI_LDSTBI_N, ASI_N, not) .endm .macro spill_32bit_secondary_so0 @@ -463,7 +576,7 @@ .endm .macro spill_64bit_secondary_so0 - spill_64bit_asi(ASI_AIUS, so0) + spill_64bit_asi(ASI_LDSTBI_AIUS, ASI_AIUS, so0) .endm .macro fill_32bit_primary_fn0 @@ -471,7 +584,7 @@ .endm .macro fill_64bit_primary_fn0 - fill_64bit_asi(ASI_AIUP, fn0) + fill_64bit_asi(ASI_LDSTBI_AIUP, ASI_AIUP, fn0) .endm .macro fill_32bit_nucleus_not @@ -479,7 +592,7 @@ .endm .macro fill_64bit_nucleus_not - fill_64bit_asi(ASI_N, not) + fill_64bit_asi(ASI_LDSTBI_N, ASI_N, not) .endm .macro spill_32bit_tt1_primary_sn1 @@ -748,12 +861,19 @@ tl0_reserved 4 ! 0xbc tl0_fill_n_normal: tl0_reserved 4 ! 0xc0 +tl0_fill_1_normal: fill_32bit_primary_fn0 ! 0xc4 +tl0_fill_2_normal: fill_64bit_primary_fn0 ! 0xc8 +tl0_fill_3_normal: fill_32bit_primary_fn0 ! 0xcc +tl0_fill_4_normal: fill_64bit_primary_fn0 ! 0xd0 +tl0_fill_5_normal: fill_32bit_nucleus_not ! 0xd4 +tl0_fill_6_normal: fill_64bit_nucleus_not ! 0xd8 +tl0_fill_7_normal: fill_mixed ! 0xdc tl0_fill_n_other_e0: tl0_reserved 32 ! 0xe0-0xff @@ -965,7 +1085,7 @@ mov %l7, %o0 call spinlock_exit nop - b user_rtt + ba,pt %xcc, user_rtt nop common_utrap: jmpl %l3, %o7 ! call trap handler / syscall @@ -976,6 +1096,7 @@ sub %g6, TF_SIZEOF, %sp add %sp, REGOFF + SPOFF, %l7 ENTRY(user_rtt) + nop ! pil handling needs to be re-visited wrpr %g0, PIL_TICK, %pil ldx [PCPU(CURTHREAD)], %l4 @@ -990,7 +1111,7 @@ wrpr %g0, %l0, %pil call ast mov %l7, %o0 - ba,a,pt %xcc, user_rtt + ba,pt %xcc, user_rtt nop 1: @@ -1002,7 +1123,7 @@ mov T_SPILL, %o1 call trap mov %l7, %o0 - ba,a %xcc, user_rtt + ba,pt %xcc, user_rtt nop 2: @@ -1073,6 +1194,7 @@ ba,a 3f #endif 4: + membar #Lookaside fill_64bit_rtt(ASI_AIUP) .global rtt_fill_end rtt_fill_end: @@ -1342,6 +1464,8 @@ #define LOADSTORE #LoadStore #define STORESTORE #StoreStore + +#define WORKING #ifdef WORKING #define ENTER LOADLOAD #define EXIT LOADSTORE|STORESTORE @@ -1740,8 +1864,17 @@ bgeu,pn %xcc, 1f nop set fault_rtt_fn1, %g7 - ba,a 2f + ba,a 4f 1: + set fill_slow_start, %g6 + cmp %g7, %g6 + bleu,a,pn %xcc, 2f + nop + set fill_slow_end, %g6 + cmp %g7, %g6 + blu,a,pn %xcc, 3f + nop +2: set tl1_end, %g6 cmp %g7, %g6 bgeu,a,pn %xcc, ptl1_panic @@ -1755,22 +1888,26 @@ cmp %g6, WTRAP_TYPE bne,a,pn %xcc, ptl1_panic mov PTL1_BAD_TRAP, %g1 +3: andn %g7, WTRAP_ALIGN, %g7 add %g7, WTRAP_FAULTOFF, %g7 -2: +4: wrpr %g0, %g7, %tnpc wrpr %g0, 1, %gl rdpr %tt, %g5 GET_MMFSA_SCRATCH(%g7) - cmp %g5, T_ALIGNMENT - be,pn %xcc, 3f - wr %g0, ASI_REAL, %asi + wr %g0, ASI_REAL, %asi ldxa [%g7 + MMFSA_D_ADDR]%asi, %g6 ldxa [%g7 + MMFSA_D_CTX]%asi, %g7 + cmp %g5, T_ALIGNMENT + be,pn %xcc, 5f + nop srlx %g6, PAGE_SHIFT, %g6 sllx %g6, PAGE_SHIFT, %g6 ! mask off bottom or %g6, %g7, %g6 - -3: - done + done +5: + sllx %g7, TRAP_CTX_SHIFT, %g7 + or %g7, %g5, %g5 + done END(tl1_trap) ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/machdep.c#2 (text+ko) ==== @@ -181,6 +181,7 @@ CTASSERT(sizeof(struct pcb) <= ((KSTACK_PAGES * PAGE_SIZE) / 8)); CTASSERT(sizeof(struct pcpu) <= ((PCPU_PAGES * PAGE_SIZE) / 2)); +CTASSERT((sizeof(struct pcpu) & ((1<<6)-1)) == 0); static void cpu_startup(void *arg) @@ -377,7 +378,9 @@ proc0.p_md.md_utrap = NULL; frame0.tf_tstate = TSTATE_IE | TSTATE_PEF | TSTATE_PRIV; thread0.td_frame = &frame0; - + if ((u_long)thread0.td_frame & 0x3f) { + panic("unaligned frame0"); + } /* * Prime our per-cpu data page for use. Note, we are using it for our * stack, so don't pass the real size (PAGE_SIZE) to pcpu_init or @@ -412,6 +415,11 @@ thread0.td_pcb = (struct pcb *)TLB_PHYS_TO_DIRECT(vtophys((vm_offset_t)thread0.td_pcb)); pc->pc_curpcb = thread0.td_pcb; + if (((thread0.td_pcb->pcb_kstack + SPOFF) & 0x3f) != 0) { + printf("unaligned stack pcb_kstack & 0x3f == 0x%lx\n", + ((thread0.td_pcb->pcb_kstack + SPOFF) & 0x3f)); + } + /* * Update PCPU_REG to point to direct address * to support easy phys <-> virt translation in trap handler @@ -697,10 +705,7 @@ #ifdef SMP cpu_mp_shutdown(); #endif -#ifdef notyet -/* XXX SUN4V_FIXME */ - openfirmware_exit(args); -#endif + OF_exit(); } /* Get current clock frequency for the given cpu id. */ ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/pmap.c#2 (text+ko) ==== @@ -1197,15 +1197,16 @@ while (ackmask != curactive) { DELAY(1); i++; - if (i > 100000000) + if (i > 1000000) panic(" ackmask=0x%x active=0x%x\n", ackmask, curactive); } active_total |= curactive; - if ((active = (pmap->pm_tlbactive & ~(active_total|cpumask))) != 0) + if ((active = ((pmap->pm_tlbactive & all_cpus) & ~(active_total|cpumask))) != 0) { + printf("pmap_ipi: retrying"); goto retry; - + } done: return (active_total); } From owner-p4-projects@FreeBSD.ORG Thu Jun 29 03:01:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 100EE16A412; Thu, 29 Jun 2006 03:01:01 +0000 (UTC) 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 E07DB16A40F for ; Thu, 29 Jun 2006 03:01:00 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 535FD43E0E for ; Thu, 29 Jun 2006 03:01:00 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T310AU094208 for ; Thu, 29 Jun 2006 03:01:00 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T310dD094199 for perforce@freebsd.org; Thu, 29 Jun 2006 03:01:00 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 29 Jun 2006 03:01:00 GMT Message-Id: <200606290301.k5T310dD094199@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100249 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, 29 Jun 2006 03:01:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=100249 Change 100249 by kmacy@kmacy_storage:sun4v_work_stable on 2006/06/29 03:00:01 integrate console and DMA tag fixes Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/hcall.S#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/hvcons.c#2 integrate Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/bge/if_bge.c#2 (text+ko) ==== @@ -1726,7 +1726,7 @@ /* * Allocate the parent bus DMA tag appropriate for PCI. */ - error = bus_dma_tag_create(NULL, /* parent */ + error = bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev),/* parent */ PAGE_SIZE, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/hcall.S#2 (text+ko) ==== @@ -402,9 +402,8 @@ ENTRY(hv_cnputchar) mov CONS_WRITE, %o5 ta FAST_TRAP - tst %o0 retl - movnz %xcc, -1, %o0 + nop SET_SIZE(hv_cnputchar) /* ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/hvcons.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #include #include -#define HVCN_POLL_FREQ 4 +#define HVCN_POLL_FREQ 10 static d_open_t hvcn_open; @@ -60,10 +60,14 @@ .d_flags = D_TTY | D_NEEDGIANT, }; +#define PCBURST 16 static struct tty *hvcn_tp = NULL; static struct resource *hvcn_irq; static void *hvcn_intrhand; +static int bufindex; +static int buflen; +static u_char buf[PCBURST]; static int polltime; static struct callout_handle hvcn_timeouthandle = CALLOUT_HANDLE_INITIALIZER(&hvcn_timeouthandle); @@ -243,7 +247,6 @@ int error; error = 0; - do { if (c == '\n') error = hv_cnputchar('\r'); @@ -266,21 +269,26 @@ static void hvcn_tty_start(struct tty *tp) { - int error; - - if (tp->t_state & (TS_TIMEOUT | TS_BUSY | TS_TTSTOP)) { - ttwwakeup(tp); - return; - } - tp->t_state |= TS_BUSY; - error = 0; - while (tp->t_outq.c_cc != 0 && error != H_EWOULDBLOCK) - error = hv_cnputchar(getc(&tp->t_outq)); + if (!(tp->t_state & (TS_TIMEOUT | TS_BUSY | TS_TTSTOP))) { + tp->t_state |= TS_BUSY; - tp->t_state &= ~TS_BUSY; - - ttwwakeup(tp); + do { + if (buflen == 0) { + buflen = q_to_b(&tp->t_outq, buf, PCBURST); + bufindex = 0; + } + while (buflen) { + if (hv_cnputchar(buf[bufindex]) == H_EWOULDBLOCK) + goto done; + bufindex++; + buflen--; + } + } while (tp->t_outq.c_cc != 0); + done: + tp->t_state &= ~TS_BUSY; + ttwwakeup(tp); + } } static void @@ -303,8 +311,9 @@ while ((c = hvcncheckc(NULL)) != -1) if (tp->t_state & TS_ISOPEN) ttyld_rint(tp, c); - + if (tp->t_outq.c_cc != 0 || buflen != 0) + hvcn_tty_start(tp); } static void From owner-p4-projects@FreeBSD.ORG Thu Jun 29 03:06:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B2FB16A4A6; Thu, 29 Jun 2006 03:06:08 +0000 (UTC) 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 3701216A49E for ; Thu, 29 Jun 2006 03:06:08 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44EBD43D8E for ; Thu, 29 Jun 2006 03:06:07 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T367IN095728 for ; Thu, 29 Jun 2006 03:06:07 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T366qX095725 for perforce@freebsd.org; Thu, 29 Jun 2006 03:06:06 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 29 Jun 2006 03:06:06 GMT Message-Id: <200606290306.k5T366qX095725@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100250 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, 29 Jun 2006 03:06:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=100250 Change 100250 by kmacy@kmacy_storage:sun4v_work_stable on 2006/06/29 03:05:37 KTR compile fix Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/ktr.h#2 integrate Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/ktr.h#2 (text+ko) ==== @@ -38,8 +38,8 @@ #ifndef LOCORE -#define KTR_CPU UPA_CR_GET_MID(ldxa(0, ASI_UPA_CONFIG_REG)) - +#define KTR_CPU PCPU_GET(cpuid) + #else #define AND(var, mask, r1, r2) \ From owner-p4-projects@FreeBSD.ORG Thu Jun 29 04:01:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 286EB16A4C2; Thu, 29 Jun 2006 04:01:24 +0000 (UTC) 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 DDE9316A49E for ; Thu, 29 Jun 2006 04:01:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B682C43DB2 for ; Thu, 29 Jun 2006 04:01:17 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T41H1m098627 for ; Thu, 29 Jun 2006 04:01:17 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T41G21098624 for perforce@freebsd.org; Thu, 29 Jun 2006 04:01:16 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 29 Jun 2006 04:01:16 GMT Message-Id: <200606290401.k5T41G21098624@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100254 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, 29 Jun 2006 04:01:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=100254 Change 100254 by kmacy@kmacy_storage:sun4v_work_stable on 2006/06/29 04:00:50 csjp's socket and filedesc pushdown Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/sys_socket.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/filedesc.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/lock.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/socket.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/unpcb.h#2 integrate Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_descrip.c#2 (text+ko) ==== @@ -359,25 +359,8 @@ struct vnode *vp; u_int newmin; int error, flg, tmp; - int giant_locked; + int giant_locked = 0; - /* - * XXXRW: Some fcntl() calls require Giant -- others don't. Try to - * avoid grabbing Giant for calls we know don't need it. - */ - switch (cmd) { - case F_DUPFD: - case F_GETFD: - case F_SETFD: - case F_GETFL: - giant_locked = 0; - break; - - default: - giant_locked = 1; - mtx_lock(&Giant); - } - error = 0; flg = F_POSIX; p = td->td_proc; @@ -391,9 +374,12 @@ } pop = &fdp->fd_ofileflags[fd]; + if ((fp->f_ops->fo_flags & DFLAG_MPSAFE) == 0) { + mtx_lock(&Giant); + giant_locked = 1; + } switch (cmd) { case F_DUPFD: - /* mtx_assert(&Giant, MA_NOTOWNED); */ FILEDESC_UNLOCK(fdp); newmin = arg; PROC_LOCK(p); @@ -408,20 +394,17 @@ break; case F_GETFD: - /* mtx_assert(&Giant, MA_NOTOWNED); */ td->td_retval[0] = (*pop & UF_EXCLOSE) ? FD_CLOEXEC : 0; FILEDESC_UNLOCK(fdp); break; case F_SETFD: - /* mtx_assert(&Giant, MA_NOTOWNED); */ *pop = (*pop &~ UF_EXCLOSE) | (arg & FD_CLOEXEC ? UF_EXCLOSE : 0); FILEDESC_UNLOCK(fdp); break; case F_GETFL: - /* mtx_assert(&Giant, MA_NOTOWNED); */ FILE_LOCK(fp); td->td_retval[0] = OFLAGS(fp->f_flag); FILE_UNLOCK(fp); @@ -429,7 +412,6 @@ break; case F_SETFL: - mtx_assert(&Giant, MA_OWNED); FILE_LOCK(fp); fhold_locked(fp); fp->f_flag &= ~FCNTLFLAGS; @@ -457,7 +439,6 @@ break; case F_GETOWN: - mtx_assert(&Giant, MA_OWNED); fhold(fp); FILEDESC_UNLOCK(fdp); error = fo_ioctl(fp, FIOGETOWN, &tmp, td->td_ucred, td); @@ -467,7 +448,6 @@ break; case F_SETOWN: - mtx_assert(&Giant, MA_OWNED); fhold(fp); FILEDESC_UNLOCK(fdp); tmp = arg; @@ -476,12 +456,10 @@ break; case F_SETLKW: - mtx_assert(&Giant, MA_OWNED); flg |= F_WAIT; /* FALLTHROUGH F_SETLK */ case F_SETLK: - mtx_assert(&Giant, MA_OWNED); if (fp->f_type != DTYPE_VNODE) { FILEDESC_UNLOCK(fdp); error = EBADF; @@ -555,7 +533,6 @@ break; case F_GETLK: - mtx_assert(&Giant, MA_OWNED); if (fp->f_type != DTYPE_VNODE) { FILEDESC_UNLOCK(fdp); error = EBADF; ==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_umtx.c#2 (text+ko) ==== @@ -97,7 +97,6 @@ static void umtxq_init_chains(void *); static int umtxq_hash(struct umtx_key *key); static struct mtx *umtxq_mtx(int chain); -static void umtxq_lock(struct umtx_key *key); static void umtxq_unlock(struct umtx_key *key); static void umtxq_busy(struct umtx_key *key); static void umtxq_unbusy(struct umtx_key *key); @@ -188,12 +187,20 @@ wakeup_one(&umtxq_chains[chain]); } +#define umtxq_lock(key) \ +do { \ + int chain = umtxq_hash(key); \ + mtx_lock(umtxq_mtx(chain)); \ +} while (0) + +#if 0 static inline void umtxq_lock(struct umtx_key *key) { int chain = umtxq_hash(key); - mtx_lock(umtxq_mtx(chain)); + mtx_lock(umtxq_mtx(chain)); } +#endif static inline void umtxq_unlock(struct umtx_key *key) ==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/sys_pipe.c#2 (text+ko) ==== @@ -153,7 +153,7 @@ .fo_kqfilter = pipe_kqfilter, .fo_stat = pipe_stat, .fo_close = pipe_close, - .fo_flags = DFLAG_PASSABLE + .fo_flags = DFLAG_PASSABLE | DFLAG_MPSAFE }; static void filt_pipedetach(struct knote *kn); ==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/sys_socket.c#2 (text+ko) ==== @@ -63,7 +63,7 @@ .fo_kqfilter = soo_kqfilter, .fo_stat = soo_stat, .fo_close = soo_close, - .fo_flags = DFLAG_PASSABLE + .fo_flags = DFLAG_PASSABLE | DFLAG_MPSAFE }; /* ARGSUSED */ ==== //depot/projects/kmacy_sun4v_stable/src/sys/sys/filedesc.h#2 (text+ko) ==== @@ -114,7 +114,7 @@ ("fdesc locking mistake %d should be %d", (fd)->fd_locked, 2)); \ (fd)->fd_locked = 0; \ if ((fd)->fd_wanted) \ - wakeup(&(fd)->fd_locked); \ + wakeup_one(&(fd)->fd_locked); \ mtx_unlock(&(fd)->fd_mtx); \ } while (0) @@ -134,7 +134,7 @@ ("fdesc locking mistake %d should be %d", (fd)->fd_locked, 1)); \ (fd)->fd_locked = 0; \ if ((fd)->fd_wanted) \ - wakeup(&(fd)->fd_locked); \ + wakeup_one(&(fd)->fd_locked); \ mtx_unlock(&(fd)->fd_mtx); \ } while (0) ==== //depot/projects/kmacy_sun4v_stable/src/sys/sys/lock.h#2 (text+ko) ==== @@ -72,7 +72,7 @@ #define LO_PROFILE 0x10000000 /* Enable per-lock profiling */ /* - * Lock classes are statically assigned an index into the gobal lock_classes + * Lock classes are statically assigned an index into the global lock_classes * array. Debugging code looks up the lock class for a given lock object * by indexing the array. */ ==== //depot/projects/kmacy_sun4v_stable/src/sys/sys/socket.h#2 (text+ko) ==== @@ -208,7 +208,8 @@ #define AF_SCLUSTER 34 /* Sitara cluster protocol */ #define AF_ARP 35 #define AF_BLUETOOTH 36 /* Bluetooth sockets */ -#define AF_MAX 37 +#define AF_STUB 37 /* Stub sample protocol */ +#define AF_MAX 38 #endif /* @@ -293,6 +294,7 @@ #define PF_SCLUSTER AF_SCLUSTER #define PF_ARP AF_ARP #define PF_BLUETOOTH AF_BLUETOOTH +#define PF_STUB AF_STUB #define PF_MAX AF_MAX ==== //depot/projects/kmacy_sun4v_stable/src/sys/sys/unpcb.h#2 (text+ko) ==== @@ -78,6 +78,7 @@ unp_gen_t unp_gencnt; /* generation count of this instance */ int unp_flags; /* flags */ struct xucred unp_peercred; /* peer credentials, if applicable */ + struct mtx unp_mtx; /* mutex */ }; /* @@ -98,6 +99,14 @@ #define UNP_WANTCRED 0x004 /* credentials wanted */ #define UNP_CONNWAIT 0x008 /* connect blocks until accepted */ +/* + * These flags are used to handle non-atomicity in connect() and bind() + * operations on a socket: in particular, to avoid races between multiple + * threads or processes operating simultaneously on the same socket. + */ +#define UNP_CONNECTING 0x010 /* Currently connecting. */ +#define UNP_BINDING 0x020 /* Currently binding. */ + #define sotounpcb(so) ((struct unpcb *)((so)->so_pcb)) /* Hack alert -- this structure depends on . */ From owner-p4-projects@FreeBSD.ORG Thu Jun 29 04:06:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE42316A47C; Thu, 29 Jun 2006 04:06:34 +0000 (UTC) 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 6904116A403 for ; Thu, 29 Jun 2006 04:06:34 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22C4243DB5 for ; Thu, 29 Jun 2006 04:06:25 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T46PdP000156 for ; Thu, 29 Jun 2006 04:06:25 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T46OV3000153 for perforce@freebsd.org; Thu, 29 Jun 2006 04:06:24 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 29 Jun 2006 04:06:24 GMT Message-Id: <200606290406.k5T46OV3000153@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100255 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, 29 Jun 2006 04:06:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=100255 Change 100255 by kmacy@kmacy_storage:sun4v_work_stable on 2006/06/29 04:05:29 csjp's Giant removal from sysctls work Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_mib.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_proc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/sysctl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/vm/vm_meter.c#2 integrate Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_descrip.c#3 (text+ko) ==== @@ -2468,7 +2468,7 @@ return (error); } -SYSCTL_PROC(_kern, KERN_FILE, file, CTLTYPE_OPAQUE|CTLFLAG_RD, +SYSCTL_PROC(_kern, KERN_FILE, file, CTLTYPE_OPAQUE|CTLFLAG_RD|CTLFLAG_MPSAFE, 0, 0, sysctl_kern_file, "S,xfile", "Entire file table"); #ifdef DDB ==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_mib.c#2 (text+ko) ==== @@ -146,7 +146,7 @@ SYSCTL_INT(_hw, HW_BYTEORDER, byteorder, CTLFLAG_RD, 0, BYTE_ORDER, "System byte order"); -SYSCTL_INT(_hw, HW_PAGESIZE, pagesize, CTLFLAG_RD, +SYSCTL_INT(_hw, HW_PAGESIZE, pagesize, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, PAGE_SIZE, "System memory page size"); static int ==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_proc.c#2 (text+ko) ==== @@ -1283,38 +1283,44 @@ static SYSCTL_NODE(_kern, KERN_PROC, proc, CTLFLAG_RD, 0, "Process table"); -SYSCTL_PROC(_kern_proc, KERN_PROC_ALL, all, CTLFLAG_RD|CTLTYPE_STRUCT, +SYSCTL_PROC(_kern_proc, KERN_PROC_ALL, all, + CTLFLAG_RD|CTLTYPE_STRUCT|CTLFLAG_MPSAFE, 0, 0, sysctl_kern_proc, "S,proc", "Return entire process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_GID, gid, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_GID, gid, CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_PGRP, pgrp, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_PGRP, pgrp, + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_RGID, rgid, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_RGID, rgid, + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_SESSION, sid, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_SESSION, sid, + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_TTY, tty, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_TTY, tty, CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_UID, uid, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_UID, uid, CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_RUID, ruid, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_RUID, ruid, + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_PID, pid, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_PID, pid, CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); -static SYSCTL_NODE(_kern_proc, KERN_PROC_PROC, proc, CTLFLAG_RD, +static SYSCTL_NODE(_kern_proc, KERN_PROC_PROC, proc, + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Return process table, no threads"); static SYSCTL_NODE(_kern_proc, KERN_PROC_ARGS, args, - CTLFLAG_RW | CTLFLAG_ANYBODY, + CTLFLAG_RW | CTLFLAG_ANYBODY | CTLFLAG_MPSAFE, sysctl_kern_proc_args, "Process argument list"); static SYSCTL_NODE(_kern_proc, KERN_PROC_PATHNAME, pathname, CTLFLAG_RD, @@ -1324,28 +1330,29 @@ sysctl_kern_proc_sv_name, "Process syscall vector name (ABI type)"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_GID | KERN_PROC_INC_THREAD), gid_td, - CTLFLAG_RD, sysctl_kern_proc, "Process table"); + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_PGRP | KERN_PROC_INC_THREAD), pgrp_td, - CTLFLAG_RD, sysctl_kern_proc, "Process table"); + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_RGID | KERN_PROC_INC_THREAD), rgid_td, - CTLFLAG_RD, sysctl_kern_proc, "Process table"); + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_SESSION | KERN_PROC_INC_THREAD), - sid_td, CTLFLAG_RD, sysctl_kern_proc, "Process table"); + sid_td, CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_TTY | KERN_PROC_INC_THREAD), tty_td, - CTLFLAG_RD, sysctl_kern_proc, "Process table"); + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_UID | KERN_PROC_INC_THREAD), uid_td, - CTLFLAG_RD, sysctl_kern_proc, "Process table"); + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_RUID | KERN_PROC_INC_THREAD), ruid_td, - CTLFLAG_RD, sysctl_kern_proc, "Process table"); + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_PID | KERN_PROC_INC_THREAD), pid_td, - CTLFLAG_RD, sysctl_kern_proc, "Process table"); + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table"); static SYSCTL_NODE(_kern_proc, (KERN_PROC_PROC | KERN_PROC_INC_THREAD), proc_td, - CTLFLAG_RD, sysctl_kern_proc, "Return process table, no threads"); + CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc, + "Return process table, no threads"); ==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_sysctl.c#2 (text+ko) ==== @@ -1229,19 +1229,25 @@ if (error) return (error); + if ((oid->oid_kind & CTLFLAG_MPSAFE) == 0) + mtx_lock(&Giant); if ((oid->oid_kind & CTLTYPE) == CTLTYPE_NODE) { /* * You can't call a sysctl when it's a node, but has * no handler. Inform the user that it's a node. * The indx may or may not be the same as namelen. */ - if (oid->oid_handler == NULL) - return (EISDIR); + if (oid->oid_handler == NULL) { + error = EISDIR; + goto done; + } } /* Is this sysctl writable? */ - if (req->newptr && !(oid->oid_kind & CTLFLAG_WR)) - return (EPERM); + if (req->newptr && !(oid->oid_kind & CTLFLAG_WR)) { + error = EPERM; + goto done; + } KASSERT(req->td != NULL, ("sysctl_root(): req->td == NULL")); @@ -1250,7 +1256,7 @@ lvl = (oid->oid_kind & CTLMASK_SECURE) >> CTLSHIFT_SECURE; error = securelevel_gt(req->td->td_ucred, lvl); if (error) - return (error); + goto done; } /* Is this sysctl writable by only privileged users? */ @@ -1263,11 +1269,13 @@ flags = 0; error = suser_cred(req->td->td_ucred, flags); if (error) - return (error); + goto done; } - if (!oid->oid_handler) - return (EINVAL); + if (!oid->oid_handler) { + error = EINVAL; + goto done; + } if ((oid->oid_kind & CTLTYPE) == CTLTYPE_NODE) { arg1 = (int *)arg1 + indx; @@ -1280,10 +1288,12 @@ error = mac_check_system_sysctl(req->td->td_ucred, oid, arg1, arg2, req); if (error != 0) - return (error); + goto done; #endif error = oid->oid_handler(oid, arg1, arg2, req); - +done: + if ((oid->oid_kind & CTLFLAG_MPSAFE) == 0) + mtx_unlock(&Giant); return (error); } @@ -1314,8 +1324,6 @@ if (error) return (error); - mtx_lock(&Giant); - error = userland_sysctl(td, name, uap->namelen, uap->old, uap->oldlenp, 0, uap->new, uap->newlen, &j, 0); @@ -1327,7 +1335,6 @@ error = i; } done2: - mtx_unlock(&Giant); return (error); } ==== //depot/projects/kmacy_sun4v_stable/src/sys/sys/sysctl.h#2 (text+ko) ==== @@ -84,6 +84,7 @@ #define CTLFLAG_SKIP 0x01000000 /* Skip this sysctl when listing */ #define CTLMASK_SECURE 0x00F00000 /* Secure level */ #define CTLFLAG_TUN 0x00080000 /* Tunable variable */ +#define CTLFLAG_MPSAFE 0x00040000 /* Handler is MP safe */ #define CTLFLAG_RDTUN (CTLFLAG_RD|CTLFLAG_TUN) /* ==== //depot/projects/kmacy_sun4v_stable/src/sys/vm/vm_meter.c#2 (text+ko) ==== @@ -101,7 +101,7 @@ #endif return SYSCTL_OUT(req, &averunnable, sizeof(averunnable)); } -SYSCTL_PROC(_vm, VM_LOADAVG, loadavg, CTLTYPE_STRUCT|CTLFLAG_RD, +SYSCTL_PROC(_vm, VM_LOADAVG, loadavg, CTLTYPE_STRUCT|CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, sysctl_vm_loadavg, "S,loadavg", "Machine loadaverage history"); static int From owner-p4-projects@FreeBSD.ORG Thu Jun 29 04:07:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB23916A417; Thu, 29 Jun 2006 04:07:30 +0000 (UTC) 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 69CDF16A407 for ; Thu, 29 Jun 2006 04:07:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDB0C43DC3 for ; Thu, 29 Jun 2006 04:07:27 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T47R6n000250 for ; Thu, 29 Jun 2006 04:07:27 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T47R4Y000247 for perforce@freebsd.org; Thu, 29 Jun 2006 04:07:27 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 29 Jun 2006 04:07:27 GMT Message-Id: <200606290407.k5T47R4Y000247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100256 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, 29 Jun 2006 04:07:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=100256 Change 100256 by kmacy@kmacy_storage:sun4v_work_stable on 2006/06/29 04:06:58 turn off spill/fill optimization for now Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/exception.S#3 integrate Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/exception.S#3 (text+ko) ==== @@ -430,8 +430,6 @@ #define SYNC #Sync #define LOOKASIDE #Lookaside -#define USE_FAST_SPILLFILL - #ifdef USE_FAST_SPILLFILL #define spill_64bit_asi(asival, asival_unaligned, target) \ wr %g0, asival, %asi ; \ From owner-p4-projects@FreeBSD.ORG Thu Jun 29 04:11:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4923916A47B; Thu, 29 Jun 2006 04:11:33 +0000 (UTC) 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 2427E16A40F for ; Thu, 29 Jun 2006 04:11:33 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8B7F43D5A for ; Thu, 29 Jun 2006 04:11:32 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T4BWO4000514 for ; Thu, 29 Jun 2006 04:11:32 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T4BWuM000511 for perforce@freebsd.org; Thu, 29 Jun 2006 04:11:32 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 29 Jun 2006 04:11:32 GMT Message-Id: <200606290411.k5T4BWuM000511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100257 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, 29 Jun 2006 04:11:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=100257 Change 100257 by kmacy@kmacy_storage:sun4v_work_stable on 2006/06/29 04:10:44 fix an LOR with Giant in fcntl Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_descrip.c#4 integrate Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_descrip.c#4 (text+ko) ==== @@ -365,18 +365,24 @@ flg = F_POSIX; p = td->td_proc; fdp = p->p_fd; + retry: FILEDESC_LOCK(fdp); if ((unsigned)fd >= fdp->fd_nfiles || (fp = fdp->fd_ofiles[fd]) == NULL) { FILEDESC_UNLOCK(fdp); + if (giant_locked) + mtx_unlock(&Giant); error = EBADF; goto done2; } pop = &fdp->fd_ofileflags[fd]; - if ((fp->f_ops->fo_flags & DFLAG_MPSAFE) == 0) { + if ((giant_locked == 0) && ((fp->f_ops->fo_flags & DFLAG_MPSAFE) == 0)) { + FILEDESC_UNLOCK(fdp); mtx_lock(&Giant); giant_locked = 1; + /* we may have lost a race */ + goto retry; } switch (cmd) { case F_DUPFD: From owner-p4-projects@FreeBSD.ORG Thu Jun 29 05:06:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AACBE16A415; Thu, 29 Jun 2006 05:06:43 +0000 (UTC) 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 6303816A40F for ; Thu, 29 Jun 2006 05:06:43 +0000 (UTC) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01B0A4496E for ; Thu, 29 Jun 2006 05:06:43 +0000 (GMT) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T56g67011978 for ; Thu, 29 Jun 2006 05:06:42 GMT (envelope-from swhitman@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T56gKj011975 for perforce@freebsd.org; Thu, 29 Jun 2006 05:06:42 GMT (envelope-from swhitman@FreeBSD.org) Date: Thu, 29 Jun 2006 05:06:42 GMT Message-Id: <200606290506.k5T56gKj011975@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swhitman@FreeBSD.org using -f From: Spencer Whitman To: Perforce Change Reviews Cc: Subject: PERFORCE change 100259 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, 29 Jun 2006 05:06:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=100259 Change 100259 by swhitman@swhitman_joecatmini on 2006/06/29 05:06:05 Delete branch to re integrate Affected files ... .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/README#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/Makefile.inc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/Makefile.inc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/euro/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/euro/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/post#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/pre#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/authors.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/catalog#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/license.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/teams.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/translators.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/Makefile.inc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/contributing/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/laptop/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/new-users/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/Makefile.inc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/faq/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/faq/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/flyer/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/flyer/flyer.tex#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/articles.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/books.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/catalog#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/teams.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/translators.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/Makefile.inc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/java-tomcat/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/java-tomcat/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/laptop/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/new-users/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng/extra.css#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/articles.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/catalog#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/teams.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/Makefile.inc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/building-products/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/building-products/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/console-server/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/console-server/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributing/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributing/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.docproj.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/euro/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/euro/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fonts/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fonts/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/geom-class/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/hats/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/hats/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/hubs/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/hubs/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/laptop/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/laptop/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/linux-comparison/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/mailing-list-faq/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/mh/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/mh/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/multi-os/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/nanobsd/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/nanobsd/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/new-users/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/new-users/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/p4-primer/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pam/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pam/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pam/converse.c#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pam/su.c#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/portbuild/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/install.cfg#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/loader.rc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/post#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/pre#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/relaydelay/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng/extra.css#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/solid-state/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/version-guide/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/vinum/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/vinum/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/vm-design/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/wp-toolbox/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/Makefile.inc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/chapters.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/mac.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/bibliography/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/bibliography/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/dev-model/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/dev-model/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/dev-model/chapters.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/dma/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/faq/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/faq/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/appendix.decl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/audit/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/example-dir1.dot#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/example-dir2.dot#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/example-dir3.dot#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/example-dir4.dot#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/example-dir5.dot#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/chapter.decl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/chapters.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/config/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/firewalls/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/geom/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mac/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/network-servers/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/security/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/users/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/answers/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/chapters.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/intro/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/legalnotice.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/flyer/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/flyer/flyer.tex#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/mk/doc.local.mk#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/authors.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/catalog#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/l10n.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/teams.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/slides.xml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/README#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-5.3.xml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-users.xml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/freebsd-general/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/admin.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/applications.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/includes.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/install.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/misc.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/network.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/preface.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/serial.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/x.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/Makefile.inc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/contributing/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/euro/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/euro/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/laptop/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/p4-primer/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/p4-primer/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/problem-reports/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/releng/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/releng/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/releng/extra.css#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/Makefile.inc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/faq/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/faq/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/authors.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/kernelopts/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/txtfiles.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/flyer/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/flyer/flyer.tex#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/authors.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/catalog#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/l10n.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/teams.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/translators.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/Makefile.inc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ddwg/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ddwg/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/euro/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/mh/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pam/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pam/converse.c#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pam/su.c#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/dhcpd.conf#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/install.cfg#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/loader.rc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/pkgmaker.sh#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/post#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/pre#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng/extra.css#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/Makefile.inc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/faq/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/faq/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/natd.eps#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/net-routing.pic#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/desktop/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/eresources/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/geom/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mac/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mail/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/porters-handbook/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/porters-handbook/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/flyer/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/flyer/flyer.tex#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/builtin.1#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/cat.1#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/chkey.1#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/echo.1#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/head.1#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/intro.1#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/agp.4#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/amd.4#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/cardbus.4#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/man4.i386/aic.4#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/man4.i386/wt.4#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/ncr.4#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/sd.4#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/sn.4#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/spic.4#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/st.4#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/uscanner.4#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man5/intro.5#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man5/publickey.5#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man6/intro.6#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man7/ascii.7#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man7/intro.7#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/bookinfo.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/books.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/catalog#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/copyright.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/disclaimer.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/l10n.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/legalnotice.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/trademarks.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/transtable.xml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/Makefile.inc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/committers-guide/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/committers-guide/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/euro/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/euro/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/explaining-bsd/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/explaining-bsd/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/filtering-bridges/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/multi-os/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/multi-os/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/new-users/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/new-users/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/vm-design/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/vm-design/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/Makefile.inc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/appendix.decl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/audit/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/audit/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/basics/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/basics/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/bibliography/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/bibliography/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/boot/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/boot/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/chapter.decl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/chapters.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/colophon.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/config/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/config/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/desktop/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/desktop/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/disks/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/disks/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/eresources/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/eresources/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/firewalls/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/firewalls/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/geom/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/geom/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/install/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/install/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/introduction/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/introduction/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/l10n/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/l10n/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/linuxemu/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mac/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mac/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mail/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mail/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mirrors/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mirrors/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/multimedia/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/multimedia/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/network-servers/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/network-servers/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/ports/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/ports/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/preface/preface.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/printing/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/printing/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/security/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/security/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/serialcomms/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/txtfiles.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/users/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/users/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/vinum/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/vinum/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/x11/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/x11/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/chapters.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/history/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/flyer/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/flyer/flyer.tex#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/articles.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/bookinfo.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/books.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/catalog#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/freebsd.dsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/glossary/freebsd-glossary.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/l10n.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/legalnotice.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/mailing-lists.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/mirrors-local.xsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/trademarks.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/trademarks.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/translators.ent#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/transtable-local.xsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/transtable.xml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/Makefile.inc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/contributing/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/contributing/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/contributors/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/contributors/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/dialup-firewall/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/dialup-firewall/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/diskless-x/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/diskless-x/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_1.conf.default#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_1.sh#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_2.conf.default#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_2.sh#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_3.mk#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fonts/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fonts/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/ipsec-must/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/ipsec-must/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/multi-os/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/multi-os/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/problem-reports/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/problem-reports/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/zip-drive/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/zip-drive/article.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/Makefile.inc#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/design-44bsd/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/design-44bsd/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/design-44bsd/fig1.eps#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/design-44bsd/fig2.eps#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/design-44bsd/freebsd.dsl#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/faq/Makefile#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/faq/book.sgml#2 delete .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/fdp-primer/Makefile#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 29 05:18:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E338D16A47C; Thu, 29 Jun 2006 05:18:00 +0000 (UTC) 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 A6BBC16A412 for ; Thu, 29 Jun 2006 05:18:00 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4552043DC3 for ; Thu, 29 Jun 2006 05:17:57 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T5HvsJ012407 for ; Thu, 29 Jun 2006 05:17:57 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T5Hvpd012404 for perforce@freebsd.org; Thu, 29 Jun 2006 05:17:57 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 29 Jun 2006 05:17:57 GMT Message-Id: <200606290517.k5T5Hvpd012404@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100260 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, 29 Jun 2006 05:18:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=100260 Change 100260 by kmacy@kmacy_storage:sun4v_work_stable on 2006/06/29 05:17:30 compile fix Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/file.h#2 edit Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/sys/file.h#2 (text+ko) ==== @@ -92,6 +92,7 @@ #define DFLAG_PASSABLE 0x01 /* may be passed via unix sockets. */ #define DFLAG_SEEKABLE 0x02 /* seekable / nonsequential */ +#define DFLAG_MPSAFE 0x04 /* These fileops are MPSAFE */ /* * Kernel descriptor table. From owner-p4-projects@FreeBSD.ORG Thu Jun 29 05:28:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACFEF16A49E; Thu, 29 Jun 2006 05:28:47 +0000 (UTC) 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 3243C16A407 for ; Thu, 29 Jun 2006 05:28:47 +0000 (UTC) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E16043D94 for ; Thu, 29 Jun 2006 05:28:38 +0000 (GMT) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T5Sc1W012725 for ; Thu, 29 Jun 2006 05:28:38 GMT (envelope-from swhitman@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T5SaMF012690 for perforce@freebsd.org; Thu, 29 Jun 2006 05:28:36 GMT (envelope-from swhitman@FreeBSD.org) Date: Thu, 29 Jun 2006 05:28:36 GMT Message-Id: <200606290528.k5T5SaMF012690@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swhitman@FreeBSD.org using -f From: Spencer Whitman To: Perforce Change Reviews Cc: Subject: PERFORCE change 100261 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, 29 Jun 2006 05:28:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=100261 Change 100261 by swhitman@swhitman_joecatmini on 2006/06/29 05:19:18 reintegrated branch Affected files ... .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/README#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/Makefile.inc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/Makefile.inc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/euro/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/euro/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/post#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/pre#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/authors.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/catalog#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/license.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/teams.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/translators.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/Makefile.inc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/contributing/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/laptop/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/new-users/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/Makefile.inc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/faq/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/faq/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/flyer/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/flyer/flyer.tex#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/articles.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/books.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/catalog#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/teams.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/translators.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/Makefile.inc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/java-tomcat/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/java-tomcat/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/laptop/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/new-users/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng/extra.css#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/articles.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/catalog#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/teams.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/Makefile.inc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/building-products/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/building-products/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/console-server/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/console-server/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributing/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributing/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.docproj.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/euro/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/euro/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fonts/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fonts/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/geom-class/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/hats/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/hats/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/hubs/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/hubs/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/laptop/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/laptop/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/linux-comparison/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/mailing-list-faq/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/mh/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/mh/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/multi-os/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/nanobsd/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/nanobsd/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/new-users/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/new-users/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/p4-primer/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pam/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pam/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pam/converse.c#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pam/su.c#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/portbuild/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/install.cfg#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/loader.rc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/post#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/pre#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/relaydelay/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng/extra.css#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/solid-state/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/version-guide/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/vinum/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/vinum/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/vm-design/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/wp-toolbox/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/Makefile.inc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/chapters.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/mac.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/bibliography/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/bibliography/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/dev-model/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/dev-model/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/dev-model/chapters.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/dma/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/faq/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/faq/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/appendix.decl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/audit/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/example-dir1.dot#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/example-dir2.dot#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/example-dir3.dot#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/example-dir4.dot#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/example-dir5.dot#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/chapter.decl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/chapters.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/config/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/firewalls/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/geom/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mac/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/network-servers/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/security/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/users/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/answers/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/chapters.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/intro/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/legalnotice.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/flyer/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/flyer/flyer.tex#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/mk/doc.local.mk#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/authors.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/catalog#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/l10n.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/teams.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/slides.xml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/README#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-5.3.xml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-users.xml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/freebsd-general/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/admin.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/applications.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/includes.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/install.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/misc.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/network.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/preface.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/serial.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/x.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/Makefile.inc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/contributing/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/euro/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/euro/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/laptop/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/p4-primer/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/p4-primer/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/problem-reports/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/releng/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/releng/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/releng/extra.css#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/Makefile.inc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/faq/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/faq/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/authors.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/kernelopts/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/txtfiles.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/flyer/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/flyer/flyer.tex#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/authors.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/catalog#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/l10n.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/teams.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/translators.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/Makefile.inc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ddwg/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ddwg/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/euro/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/mh/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pam/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pam/converse.c#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pam/su.c#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/dhcpd.conf#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/install.cfg#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/loader.rc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/pkgmaker.sh#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/post#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/pre#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng/extra.css#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/Makefile.inc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/faq/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/faq/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/natd.eps#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/net-routing.pic#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/desktop/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/eresources/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/geom/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mac/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mail/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/porters-handbook/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/porters-handbook/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/flyer/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/flyer/flyer.tex#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/builtin.1#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/cat.1#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/chkey.1#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/echo.1#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/head.1#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/intro.1#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/agp.4#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/amd.4#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/cardbus.4#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/man4.i386/aic.4#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/man4.i386/wt.4#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/ncr.4#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/sd.4#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/sn.4#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/spic.4#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/st.4#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/uscanner.4#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man5/intro.5#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man5/publickey.5#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man6/intro.6#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man7/ascii.7#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man7/intro.7#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/bookinfo.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/books.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/catalog#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/copyright.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/disclaimer.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/l10n.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/legalnotice.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/trademarks.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/transtable.xml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/Makefile.inc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/committers-guide/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/committers-guide/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/euro/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/euro/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/explaining-bsd/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/explaining-bsd/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/filtering-bridges/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/multi-os/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/multi-os/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/new-users/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/new-users/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/vm-design/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/vm-design/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/Makefile.inc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/appendix.decl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/audit/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/audit/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/basics/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/basics/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/bibliography/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/bibliography/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/boot/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/boot/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/chapter.decl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/chapters.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/colophon.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/config/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/config/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/desktop/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/desktop/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/disks/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/disks/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/eresources/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/eresources/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/firewalls/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/firewalls/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/geom/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/geom/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/install/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/install/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/introduction/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/introduction/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/l10n/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/l10n/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/linuxemu/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mac/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mac/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mail/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mail/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mirrors/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mirrors/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/multimedia/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/multimedia/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/network-servers/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/network-servers/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/ports/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/ports/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/preface/preface.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/printing/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/printing/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/security/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/security/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/serialcomms/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/txtfiles.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/users/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/users/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/vinum/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/vinum/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/x11/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/x11/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/chapters.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/history/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/flyer/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/flyer/flyer.tex#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/articles.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/bookinfo.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/books.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/catalog#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/freebsd.dsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/glossary/freebsd-glossary.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/l10n.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/legalnotice.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/mailing-lists.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/mirrors-local.xsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/trademarks.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/trademarks.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/translators.ent#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/transtable-local.xsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/transtable.xml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/Makefile.inc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/contributing/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/contributing/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/contributors/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/contributors/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/dialup-firewall/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/dialup-firewall/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/diskless-x/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/diskless-x/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_1.conf.default#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_1.sh#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_2.conf.default#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_2.sh#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_3.mk#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fonts/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fonts/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/ipsec-must/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/ipsec-must/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/multi-os/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/multi-os/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/problem-reports/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/problem-reports/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/zip-drive/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/zip-drive/article.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/Makefile.inc#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/design-44bsd/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/design-44bsd/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/design-44bsd/fig1.eps#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/design-44bsd/fig2.eps#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/design-44bsd/freebsd.dsl#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/faq/Makefile#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/faq/book.sgml#3 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/fdp-primer/Makefile#3 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 29 05:59:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E03016A416; Thu, 29 Jun 2006 05:59:17 +0000 (UTC) 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 620B516A403 for ; Thu, 29 Jun 2006 05:59:17 +0000 (UTC) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2956D43DB2 for ; Thu, 29 Jun 2006 05:59:17 +0000 (GMT) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T5xG1m013965 for ; Thu, 29 Jun 2006 05:59:17 GMT (envelope-from swhitman@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T5xGv7013962 for perforce@freebsd.org; Thu, 29 Jun 2006 05:59:16 GMT (envelope-from swhitman@FreeBSD.org) Date: Thu, 29 Jun 2006 05:59:16 GMT Message-Id: <200606290559.k5T5xGv7013962@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swhitman@FreeBSD.org using -f From: Spencer Whitman To: Perforce Change Reviews Cc: Subject: PERFORCE change 100263 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, 29 Jun 2006 05:59:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=100263 Change 100263 by swhitman@swhitman_joethecat on 2006/06/29 05:58:49 Added K files Affected files ... .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/Makefile#4 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/SocTask1#3 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/SocTask2#3 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/cpp.c#3 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/expr.c#3 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/file.c#3 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/flint.lnt#3 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/gcc.h#3 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/k-soc.tgz#3 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/k.c#4 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/k.h#3 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/lexer.c#3 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/notes#3 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/parser.c#4 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/string.c#3 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/symbol.c#3 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/test.c#3 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/token.tcl#3 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/token_data.c#3 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/types.c#3 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 29 06:26:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C74816A47B; Thu, 29 Jun 2006 06:26:53 +0000 (UTC) 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 68B6B16A40F for ; Thu, 29 Jun 2006 06:26:53 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 34D1244A75 for ; Thu, 29 Jun 2006 06:26:53 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T6Qrcu016479 for ; Thu, 29 Jun 2006 06:26:53 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T6Qqov016476 for perforce@freebsd.org; Thu, 29 Jun 2006 06:26:52 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 29 Jun 2006 06:26:52 GMT Message-Id: <200606290626.k5T6Qqov016476@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100267 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, 29 Jun 2006 06:26:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=100267 Change 100267 by kmacy@kmacy_storage:sun4v_work_stable on 2006/06/29 06:26:48 remove debug options from default config Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/conf/GENERIC#2 edit Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/conf/GENERIC#2 (text+ko) ==== @@ -66,12 +66,12 @@ options KDB_TRACE options DDB # Support DDB. #options GDB # Support remote GDB. -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +#options INVARIANTS # Enable calls of extra sanity checking +#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS # Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options DEBUG_LOCKS -options DEBUG_VFS_LOCKS +#options DEBUG_LOCKS +#options DEBUG_VFS_LOCKS # To make an SMP kernel, the next line is needed options SMP # Symmetric MultiProcessor Kernel From owner-p4-projects@FreeBSD.ORG Thu Jun 29 06:33:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA4A416A540; Thu, 29 Jun 2006 06:33:22 +0000 (UTC) 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 81DC316A51C for ; Thu, 29 Jun 2006 06:33:22 +0000 (UTC) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24FDB44745 for ; Thu, 29 Jun 2006 06:03:23 +0000 (GMT) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T63NnK015467 for ; Thu, 29 Jun 2006 06:03:23 GMT (envelope-from swhitman@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T63MfB015464 for perforce@freebsd.org; Thu, 29 Jun 2006 06:03:22 GMT (envelope-from swhitman@FreeBSD.org) Date: Thu, 29 Jun 2006 06:03:22 GMT Message-Id: <200606290603.k5T63MfB015464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swhitman@FreeBSD.org using -f From: Spencer Whitman To: Perforce Change Reviews Cc: Subject: PERFORCE change 100265 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, 29 Jun 2006 06:33:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=100265 Change 100265 by swhitman@swhitman_joethecat on 2006/06/29 06:03:09 Commented files Affected files ... .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/SocTask1#4 edit .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/cpp.c#4 edit .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/file.c#4 edit .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/k.c#5 edit .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/k.h#4 edit .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/string.c#4 edit Differences ... ==== //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/SocTask1#4 (text+ko) ==== @@ -55,3 +55,163 @@ beneficially in the FreeBSD kernel source code. Implement it + + + +____________________________________________________________________ + +Domain specific languages have been known for over three decades and +has been a widely accepted paradigm for more than half of that time. + +So the time has come to create a DSL for kernel coding. + +Only problem is, we're not quite sure what it should do and migration +is a tricky business on its own, because people are so damned +conservative in this project. + +In FreeBSD we do not want to get any further into the compiler +business than we have to, GCC has always been a major headache for +us over the years, and we just wish we didn't have to even think +about compilers at all. + +So the "real" task for the secret K-language conspiracy (largely +myself as the GodFather with George (gnn@) and Diomedis (dss@) +as my henchmen) is to sneak 'K' in by the backdoor, by making +the developers life a little bit easier by every step we take. + +If we look at the endlösung we're aiming at, it consists of a +"kcc" compiler which compiles .h .c and .k files into C language +which A C-compiler, (likely GCC) will turn into executable code +for us. + +One benefit appears right there: No matter how they screw up +GCC in the future, we have a layer where we can isolate our +source code from these screwups. (Or imagine the STDC people +suddenly making "lock" a reserved word or something). + +It also follows from the above that 'K' itself must be a superset +of 'C', with the footnote that the 'C' we talk about is the subset +of STDC which we have settled on using for the FreeBSD kernel. +(There are things in STDC we don't use in the kernel. Trigraphs, +floating point and wide characters being the most prominent examples.) + +So in order to get anywhere, we need to do is to be able to insert +a program in compiler chain which will not affect the compilation, +but which will give us a place to start implementing and experimenting +with the K extensions to C. + +Inserting such a program will slow compilation down a bit, +so we need to bring some benefit to justify this slowdown. + +But there is another avenue in: In FreeBSD we have the style(9) +coding style, and we could gain some traction if provided +a program which would warn about transgressions on style(9) +in the same way as lint(1) warns about transgressions on C. + +This is a less heavy burden to lift because we do not need to +generate code, only messages based on our analysis. + + +This is where we are right now: trying to write that program +and trying to identify and implement those benefits. + + +The code is basically a small lexer&parser for the FreeBSD subset of STDC. +If you run the FreeBSD kernel sources through a CPP macroprocessor +first, my code will lex and parse the kernel sources correctly. + +It doesn't generate any code at this point, it merely avoids +barfing. + + +So your first task is to implement the necessary CPP macro processor +facilities so that we can avoid using an external CPP to run FreeBSD +kernel sources through. + +This basically means #define, #if, #ifdef ... #endif and macro +expansion. + +The good news is that it shouldn't take too long, CPP is a pretty +simple concept, although some of the STDC decisions fouls up some +corner cases. + +The bad news is that there always seems to be some piece of code +which relies on any particular weird corner case of the CPP language. + + +Next step is to look for tangible benefits. + +The #! expansion is my first guess (but better ideas are very +welcome!) and after that we should probably see if we can detect +unused #include files (a continuing problem in FreeBSD) and after +that look for things in style(9) which we can detect with the +full cpp/lexer/parser combo. + +However, this is merely my ideas, and if you have or come across +better ideas I am all ears. + + +I hope you understand that all these weird restrictions are not +put in place to make your life miserable. Introducing a new +language for kernel coding in a conservative project like FreeBSD +takes some careful planning and there are many toes we need to +avoid stomping on. But 14 years of experience with this crew +has taught me that making their life easier in the long run will +always win the hearts in the end. + + +Now that you have studied the code a bit, I hope you can see how I +tried to avoid copying data around more than necessary, for instance +by pointing from the tokens into the original file rather than copy +them into the to token structure etc. + +This is an attempt to try to drag modern performance programming +practice into the compiler, in the hope that we will end up with +a compiler which can run very efficiently on modern multi-core +cpus. + +A traditionally particioned compiler like GCC runs as three +processes with pipes between them: + + cpp | cc1 | asm + +The pipes means that the process has to dive into the kernel, +fiddle around with locking there etc. + +In the K compiler, I still want to have distinct stages for reasons +of structure, but I want them to live in the same process and hand +data over without bothering the kernel if at all possible. + + +The other thing which is important to me is that we build a graph +so we can track backwards for error reporting. + +Some of the more horrible macros can give quite unhelpful diagnostics +if used wrong, because the error is emitted from one of the middle +layer of a stack of macro expansions. + +I would like the compiler to emit very detailed error messages, showing +step by step how it ended up with the tokens it tried to process. +Something like this mock-up of an error message: + + Syntax error: Identifier expected, found floating number: + 4.56 += 3.14; + ^^^^ + expanded from macro ADDFP(a,b) + defined at fooinclude.h line 8 + called from fooinclude.h line 12 + ADDFP(4.56, 3.14); + expanded from macro PLUSPI(aa) + defined at fooinclude.h line 9 + called from mymacros.h line 123 + g = PLUSPI(4.56); + #included from mysrc.c line 4 + #include "mymacros.h" + +To do this, you have to build a tree for the macro expansions so +that you can backtrack to generate these messages. But do keep in +mind, most of the time the messages will not be emitted, so you +should design the tree to be fast in the normal case where all that +info will never be used. It doesn't matter if linear searches are +necessary to generate the diagnostic message, the programmer will +be wasting far more time to fix the mistake any way. ==== //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/cpp.c#4 (text+ko) ==== ==== //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/file.c#4 (text+ko) ==== @@ -19,9 +19,12 @@ int fd; filename = String(filename, NULL); + + /* Check if this file has been loaded already */ TAILQ_FOREACH(s, &sourcefile_head, list) if (s->filename == filename) return (s); + fd = open(filename, O_RDONLY); if (fd < 0) return (NULL); ==== //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/k.c#5 (text+ko) ==== @@ -111,21 +111,32 @@ struct h *hf, *hg; char *p; + /* Set up print stuff */ register_printf_render('T', printf_render_token, printf_arginfo_token); register_printf_render_std("HVQM"); setbuf(stdout, NULL); + /* Set up string tokens */ InitString(); + /* Create a new list of tokens and initalize the symbol lists*/ hg = NewH(); hg->sym = NewSymScope(); + /* Initalize type information */ InitTypes(); #if 0 CppIarg("-I/usr/include"); #endif - + /* Get command line arguments + * D: Not implemented + * U: Not implemented + * I: Include file optarg + * W: Not implemented + * c: Not implemented + * default: print usage + */ while ((ch = getopt(argc, argv, "cD:U:I:W:")) != -1) { switch (ch) { case 'D': CppDUarg(hg, optarg, 1); break; @@ -140,27 +151,38 @@ } argc -= optind; argv += optind; + /* Exit in case of no file */ if (argc < 1) errx(1, "Missing file argument(s)"); for (ch = 0; ch < argc; ch++) { -printf("argv[%d] = %Q\n", ch, argv[ch]); - p = strrchr(argv[ch], '.'); - if (p == NULL) - errx(1, "No '.' in filename %Q", argv[ch]); - if (p[1] == 'h') { -printf("H file\n"); - hf = hg; - } else if (p[1] == 'c') { -printf("C file\n"); - hf = NewH(); - hf->sym = hg->sym; - PushSymScope(hf); - } else - errx(1, "Unknown filename suffix %Q", p); - Cpp(hf, argv[ch]); - if (0) - DumpRefs(stdout, hf); + printf("argv[%d] = %Q\n", ch, argv[ch]); + + /* Determin what type of file has been passed to K */ + p = strrchr(argv[ch], '.'); + + if (p == NULL) + errx(1, "No '.' in filename %Q", argv[ch]); + + if (p[1] == 'h') { + printf("H file\n"); + /* Use hg's token and symbol lists */ + hf = hg; + } else if (p[1] == 'c') { + printf("C file\n"); + /* Create a new list of tokens */ + hf = NewH(); + /* Set the symbol list to hg's */ + hf->sym = hg->sym; + /* Add a new symbol scope to hf */ + PushSymScope(hf); + } else + errx(1, "Unknown filename suffix %Q", p); + + Cpp(hf, argv[ch]); + + if (0) + DumpRefs(stdout, hf); if (0) DumpTokens(stdout, hf); if (p[1] == 'c') { @@ -169,7 +191,7 @@ PopSymScope(hf); } } - + return (0); } ==== //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/k.h#4 (text+ko) ==== @@ -5,8 +5,8 @@ /* -------------------------------------------------------------------*/ struct s { - const char *b; - const char *e; + const char *b; /* Begining of a file (in file.c) */ + const char *e; /* End of the file (in file.c) */ struct ref *r; }; ==== //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/string.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ { struct string *s; struct string_head *h; - unsigned l, hash; + unsigned l, hash; /* XXX hash is unused here */ assert(b != NULL); if (e == NULL) { @@ -50,6 +50,7 @@ hash = *b; if (l > 1) hash = (hash << 8) | b[1]; + /* Have we already inserted this string into the hash table? */ h = &strings[*b % NHASH]; LIST_FOREACH(s, h, list) { if (b == s->string) From owner-p4-projects@FreeBSD.ORG Thu Jun 29 08:26:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9077216A415; Thu, 29 Jun 2006 08:26:26 +0000 (UTC) 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 5339C16A410 for ; Thu, 29 Jun 2006 08:26:26 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A5A843D79 for ; Thu, 29 Jun 2006 08:26:24 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T8QOpE024665 for ; Thu, 29 Jun 2006 08:26:24 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T8QOLw024662 for perforce@freebsd.org; Thu, 29 Jun 2006 08:26:24 GMT (envelope-from clem1@FreeBSD.org) Date: Thu, 29 Jun 2006 08:26:24 GMT Message-Id: <200606290826.k5T8QOLw024662@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 100273 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, 29 Jun 2006 08:26:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=100273 Change 100273 by clem1@clem1_ipv6vulns on 2006/06/29 08:26:23 pcs ipv6 packet manipulation improvements and bug fix. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/ipv6.py#4 edit Differences ... ==== //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/ipv6.py#4 (text+ko) ==== @@ -41,9 +41,12 @@ from socket import AF_INET6, inet_ntop # extension header next header field. +IPV6_HOPOPTS = 0 +IPV6_RTHDR = 43 IPV6_FRAG = 44 -IPV6_HOPOPTS = 49 -IPV6_RTHDR = 43 +IPV6_ESP = 50 +IPV6_AH = 51 +IPV6_NONE = 59 IPV6_DSTOPTS = 60 class ipv6(pcs.Packet): @@ -74,7 +77,7 @@ value = inet_ntop(AF_INET6, self.__dict__[field.name]) retval += "%s %s\n" % (field.name, value) else: - retval += "%s %s\n" % (field.name, self.__dict__[field.name]) + retval += "%s %d\n" % (field.name, self.__dict__[field.name]) return retval def getipv6(self, iface): @@ -131,6 +134,7 @@ def option(self, len = 0): """add option header to the hop-by-hop extension header""" + # XXX: pad0 option has not this header. global op op += 1 otype = pcs.Field("otype" + str(op), 8) @@ -157,10 +161,11 @@ len = pcs.Field("length", 8) type = pcs.Field("type", 8) pcs.Packet.__init__(self, - [next, len, type, segments_left], bytes) + [next, len, type], bytes) def option(self, len = 0): """add option header to the destination extension header""" + # XXX: pad0 option has not this header. global op op += 1 otype = pcs.Field("otype" + str(op), 8) @@ -186,4 +191,3 @@ identification = pcs.Field("identification", 32) pcs.Packet.__init__(self, [next, reserved, offset, res, m, identification], bytes) - From owner-p4-projects@FreeBSD.ORG Thu Jun 29 08:32:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36D3716A415; Thu, 29 Jun 2006 08:32:43 +0000 (UTC) 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 EF4F116A407 for ; Thu, 29 Jun 2006 08:32:42 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B169844212 for ; Thu, 29 Jun 2006 08:32:32 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T8WWrl024971 for ; Thu, 29 Jun 2006 08:32:32 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T8WWRM024968 for perforce@freebsd.org; Thu, 29 Jun 2006 08:32:32 GMT (envelope-from clem1@FreeBSD.org) Date: Thu, 29 Jun 2006 08:32:32 GMT Message-Id: <200606290832.k5T8WWRM024968@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 100274 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, 29 Jun 2006 08:32:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=100274 Change 100274 by clem1@clem1_ipv6vulns on 2006/06/29 08:32:18 improvements and bug fix around tcp packet manipulation in pcs. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/tcp.py#2 edit .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/tcpv6.py#1 add Differences ... ==== //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/tcp.py#2 (text+ko) ==== @@ -56,6 +56,17 @@ fin = pcs.Field("fin", 1) window = pcs.Field("window", 16) cksum = pcs.Field("checksum", 16) + urgp = pcs.Field("urg_pointer",16) pcs.Packet.__init__(self, [sport, dport, seq, acknum, off, reserved, - urg, ack, psh, rst, syn, fin, window, cksum], + urg, ack, psh, rst, syn, fin, window, cksum, urg_pointer], bytes = bytes) + + def __str__(self): + """Walk the entire packet and pretty print the values of the fields. Addresses are printed if and only if they are set and not 0.""" + retval = "" + for field in self.layout: + if (field.type == str): + retval += "%s %s\n" % (field.name, value) + else: + retval += "%s %d\n" % (field.name, self.__dict__[field.name]) + return retval From owner-p4-projects@FreeBSD.ORG Thu Jun 29 08:36:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB7AB16A49E; Thu, 29 Jun 2006 08:36:41 +0000 (UTC) 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 6CBE116A415 for ; Thu, 29 Jun 2006 08:36:41 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D49843DC8 for ; Thu, 29 Jun 2006 08:36:38 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T8ac2V025189 for ; Thu, 29 Jun 2006 08:36:38 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T8abQf025181 for perforce@freebsd.org; Thu, 29 Jun 2006 08:36:37 GMT (envelope-from clem1@FreeBSD.org) Date: Thu, 29 Jun 2006 08:36:37 GMT Message-Id: <200606290836.k5T8abQf025181@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 100275 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, 29 Jun 2006 08:36:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=100275 Change 100275 by clem1@clem1_ipv6vulns on 2006/06/29 08:35:49 tcp bug fix in pcs again. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/tcp.py#3 edit Differences ... ==== //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/tcp.py#3 (text+ko) ==== @@ -58,7 +58,7 @@ cksum = pcs.Field("checksum", 16) urgp = pcs.Field("urg_pointer",16) pcs.Packet.__init__(self, [sport, dport, seq, acknum, off, reserved, - urg, ack, psh, rst, syn, fin, window, cksum, urg_pointer], + urg, ack, psh, rst, syn, fin, window, cksum, urgp], bytes = bytes) def __str__(self): From owner-p4-projects@FreeBSD.ORG Thu Jun 29 08:40:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82A8F16A4B3; Thu, 29 Jun 2006 08:40:44 +0000 (UTC) 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 45AD516A47B for ; Thu, 29 Jun 2006 08:40:44 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C15BE43DCE for ; Thu, 29 Jun 2006 08:40:43 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5T8ehsa025507 for ; Thu, 29 Jun 2006 08:40:43 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5T8ehBG025504 for perforce@freebsd.org; Thu, 29 Jun 2006 08:40:43 GMT (envelope-from clem1@FreeBSD.org) Date: Thu, 29 Jun 2006 08:40:43 GMT Message-Id: <200606290840.k5T8ehBG025504@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 100276 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, 29 Jun 2006 08:40:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=100276 Change 100276 by clem1@clem1_ipv6vulns on 2006/06/29 08:40:06 udpv6.py packet manipulation and last bug fix for tcp.py. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/tcp.py#4 edit .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/udpv6.py#1 add Differences ... ==== //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/tcp.py#4 (text+ko) ==== @@ -66,7 +66,7 @@ retval = "" for field in self.layout: if (field.type == str): - retval += "%s %s\n" % (field.name, value) + retval += "%s %s\n" % (field.name, self.__dict__[field.name]) else: retval += "%s %d\n" % (field.name, self.__dict__[field.name]) return retval From owner-p4-projects@FreeBSD.ORG Thu Jun 29 11:27:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40E0316A410; Thu, 29 Jun 2006 11:27:15 +0000 (UTC) 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 043BB16A407 for ; Thu, 29 Jun 2006 11:27:15 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7063643D9F for ; Thu, 29 Jun 2006 11:27:14 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5TBRE4U045861 for ; Thu, 29 Jun 2006 11:27:14 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5TBRES3045858 for perforce@freebsd.org; Thu, 29 Jun 2006 11:27:14 GMT (envelope-from piso@freebsd.org) Date: Thu, 29 Jun 2006 11:27:14 GMT Message-Id: <200606291127.k5TBRES3045858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 100281 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, 29 Jun 2006 11:27:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=100281 Change 100281 by piso@piso_newluxor on 2006/06/29 11:26:21 Finished converting pic_setup_intr()&C to support interrupt filtering: now powerpc compiles again, and is in par with all the other archs. Affected files ... .. //depot/projects/soc2006/intr_filter/powerpc/include/intr_machdep.h#3 edit .. //depot/projects/soc2006/intr_filter/powerpc/include/openpicvar.h#2 edit .. //depot/projects/soc2006/intr_filter/powerpc/powermac/hrowpic.c#2 edit .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#4 edit .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/nexus.c#2 edit .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/openpic.c#2 edit .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/pic_if.m#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/powerpc/include/intr_machdep.h#3 (text+ko) ==== @@ -42,8 +42,8 @@ void intr_init(void (*)(void), int, void (*)(uintptr_t), void (*)(uintptr_t)); void intr_setup(u_int, ih_func_t *, void *, u_int); -int inthand_add(const char *, u_int, void (*)(void *), void *, int, - void **); +int inthand_add(const char *, u_int, int (*)(void *), void (*)(void *), + void *, int, void **); int inthand_remove(u_int, void *); void intr_handle(u_int); ==== //depot/projects/soc2006/intr_filter/powerpc/include/openpicvar.h#2 (text+ko) ==== @@ -58,8 +58,8 @@ struct resource *openpic_allocate_intr(device_t, device_t, int *, u_long, u_int); int openpic_setup_intr(device_t, device_t, - struct resource *, int, driver_intr_t, void *, - void **); + struct resource *, int, driver_filter_t, + driver_intr_t, void *, void **); int openpic_teardown_intr(device_t, device_t, struct resource *, void *); int openpic_release_intr(device_t dev, device_t, int, ==== //depot/projects/soc2006/intr_filter/powerpc/powermac/hrowpic.c#2 (text+ko) ==== @@ -79,8 +79,8 @@ static struct resource *hrowpic_allocate_intr(device_t, device_t, int *, u_long, u_int); static int hrowpic_setup_intr(device_t, device_t, - struct resource *, int, driver_intr_t, void *, - void **); + struct resource *, int, driver_filter_t, + driver_intr_t, void *, void **); static int hrowpic_teardown_intr(device_t, device_t, struct resource *, void *); static int hrowpic_release_intr(device_t dev, device_t, int, @@ -221,7 +221,8 @@ static int hrowpic_setup_intr(device_t picdev, device_t child, struct resource *res, - int flags, driver_intr_t *intr, void *arg, void **cookiep) + int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg, + void **cookiep) { struct hrowpic_softc *sc; u_long start; @@ -240,8 +241,8 @@ if (error) return (error); - error = inthand_add(device_get_nameunit(child), start, intr, arg, - flags, cookiep); + error = inthand_add(device_get_nameunit(child), start, filter, intr, + arg, flags, cookiep); if (!error) { /* ==== //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#4 (text+ko) ==== @@ -168,8 +168,8 @@ } int -inthand_add(const char *name, u_int irq, void (*handler)(void *), void *arg, - int flags, void **cookiep) +inthand_add(const char *name, u_int irq, int (*filter)(void *), + void (*handler)(void *), void *arg, int flags, void **cookiep) { struct ppc_intr_handler *ppc_ih; struct intr_event *event, *orphan; @@ -202,7 +202,7 @@ } } - error = intr_event_add_handler(event, name, handler, arg, + error = intr_event_add_handler(event, name, filter, handler, arg, intr_priority(flags), flags, cookiep); if (error) return (error); ==== //depot/projects/soc2006/intr_filter/powerpc/powerpc/nexus.c#2 (text+ko) ==== @@ -112,7 +112,7 @@ static int nexus_read_ivar(device_t, device_t, int, uintptr_t *); static int nexus_write_ivar(device_t, device_t, int, uintptr_t); static int nexus_setup_intr(device_t, device_t, struct resource *, int, - driver_intr_t *, void *, void **); + driver_filter_t *, driver_intr_t *, void *, void **); static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); static struct resource *nexus_alloc_resource(device_t, device_t, int, int *, @@ -290,7 +290,7 @@ static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep) + driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) { struct nexus_softc *sc; @@ -299,8 +299,8 @@ if (device_get_state(sc->sc_pic) != DS_ATTACHED) panic("nexus_setup_intr: no pic attached\n"); - return (PIC_SETUP_INTR(sc->sc_pic, child, res, flags, intr, arg, - cookiep)); + return (PIC_SETUP_INTR(sc->sc_pic, child, res, flags, filter, intr, + arg, cookiep)); } static int ==== //depot/projects/soc2006/intr_filter/powerpc/powerpc/openpic.c#2 (text+ko) ==== @@ -228,7 +228,8 @@ int openpic_setup_intr(device_t dev, device_t child, struct resource *res, - int flags, driver_intr_t *intr, void *arg, void **cookiep) + int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg, + void **cookiep) { struct openpic_softc *sc; u_long start; @@ -253,8 +254,8 @@ if (error) return (error); - error = inthand_add(device_get_nameunit(child), start, intr, arg, - flags, cookiep); + error = inthand_add(device_get_nameunit(child), start, filter, intr, + arg, flags, cookiep); if (sc->sc_hwprobed) openpic_enable_irq(sc, start, IST_LEVEL); ==== //depot/projects/soc2006/intr_filter/powerpc/powerpc/pic_if.m#2 (text+ko) ==== @@ -44,6 +44,7 @@ device_t child; struct resource *res; int flags; + driver_filter_t *filter; driver_intr_t *intr; void *arg; void **cookiep; From owner-p4-projects@FreeBSD.ORG Thu Jun 29 12:48:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 442CB16A539; Thu, 29 Jun 2006 12:48:07 +0000 (UTC) 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 13B0816A51F for ; Thu, 29 Jun 2006 12:48:07 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 337F343E8D for ; Wed, 28 Jun 2006 18:36:17 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SIaH93038775 for ; Wed, 28 Jun 2006 18:36:17 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SIaGhA038772 for perforce@freebsd.org; Wed, 28 Jun 2006 18:36:16 GMT (envelope-from als@FreeBSD.org) Date: Wed, 28 Jun 2006 18:36:16 GMT Message-Id: <200606281836.k5SIaGhA038772@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100222 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, 29 Jun 2006 12:48:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=100222 Change 100222 by als@als_head on 2006/06/28 18:35:51 add man page for jdisk. Affected files ... .. //depot/projects/jail2/j2_tools/jdisk/jdisk.8#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 29 14:39:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DC5216A4D1; Thu, 29 Jun 2006 14:39:19 +0000 (UTC) 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 C0FEB16A47B for ; Thu, 29 Jun 2006 14:39:18 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAEDE43DA8 for ; Thu, 29 Jun 2006 14:37:17 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5TEbHwU070489 for ; Thu, 29 Jun 2006 14:37:17 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5TEbHEr070486 for perforce@freebsd.org; Thu, 29 Jun 2006 14:37:17 GMT (envelope-from clem1@FreeBSD.org) Date: Thu, 29 Jun 2006 14:37:17 GMT Message-Id: <200606291437.k5TEbHEr070486@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 100290 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, 29 Jun 2006 14:39:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=100290 Change 100290 by clem1@clem1_ipv6vulns on 2006/06/29 14:36:40 Some python scripts that test the handling of "too big" icmp message by ipv6 stacks. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/samples/toobig/DESCRIPTION#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/samples/toobig/bigbig6.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/samples/toobig/sillybig6.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/samples/toobig/toosmall6.py#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 29 14:39:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F22C16A47C; Thu, 29 Jun 2006 14:39:38 +0000 (UTC) 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 F14AC16A415 for ; Thu, 29 Jun 2006 14:39:37 +0000 (UTC) (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 333BC440B5 for ; Thu, 29 Jun 2006 14:05:36 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5TE5aYq067617 for ; Thu, 29 Jun 2006 14:05:36 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5TE5aIj067614 for perforce@freebsd.org; Thu, 29 Jun 2006 14:05:36 GMT (envelope-from jhb@freebsd.org) Date: Thu, 29 Jun 2006 14:05:36 GMT Message-Id: <200606291405.k5TE5aIj067614@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 100287 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, 29 Jun 2006 14:39:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=100287 Change 100287 by jhb@jhb_mutex on 2006/06/29 14:05:23 IFC @100285. Affected files ... .. //depot/projects/smpng/sys/kern/sysv_sem.c#38 integrate Differences ... ==== //depot/projects/smpng/sys/kern/sysv_sem.c#38 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sysv_sem.c,v 1.80 2006/06/27 18:28:50 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sysv_sem.c,v 1.81 2006/06/29 13:58:36 jhb Exp $"); #include "opt_sysvipc.h" #include "opt_mac.h" @@ -591,6 +591,7 @@ struct semid_kernel *semakptr; struct mtx *sema_mtxp; u_short usval, count; + int semidx; DPRINTF(("call to semctl(%d, %d, %d, 0x%x)\n", semid, semnum, cmd, arg)); @@ -601,6 +602,10 @@ switch(cmd) { case SEM_STAT: + /* + * For this command we assume semid is an array index + * rather than an IPC id. + */ if (semid < 0 || semid >= seminfo.semmni) return (EINVAL); semakptr = &sema[semid]; @@ -632,12 +637,12 @@ return (error); } - semid = IPCID_TO_IX(semid); - if (semid < 0 || semid >= seminfo.semmni) + semidx = IPCID_TO_IX(semid); + if (semidx < 0 || semidx >= seminfo.semmni) return (EINVAL); - semakptr = &sema[semid]; - sema_mtxp = &sema_mtx[semid]; + semakptr = &sema[semidx]; + sema_mtxp = &sema_mtx[semidx]; #ifdef MAC mtx_lock(sema_mtxp); error = mac_check_sysv_semctl(cred, semakptr, cmd); @@ -674,7 +679,7 @@ mac_cleanup_sysv_sem(semakptr); #endif SEMUNDO_LOCK(); - semundo_clear(semid, -1); + semundo_clear(semidx, -1); SEMUNDO_UNLOCK(); wakeup(semakptr); break; @@ -804,7 +809,7 @@ } semakptr->u.sem_base[semnum].semval = arg->val; SEMUNDO_LOCK(); - semundo_clear(semid, semnum); + semundo_clear(semidx, semnum); SEMUNDO_UNLOCK(); wakeup(semakptr); break; @@ -847,7 +852,7 @@ semakptr->u.sem_base[i].semval = usval; } SEMUNDO_LOCK(); - semundo_clear(semid, -1); + semundo_clear(semidx, -1); SEMUNDO_UNLOCK(); wakeup(semakptr); break; From owner-p4-projects@FreeBSD.ORG Thu Jun 29 14:41:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62F3D16A540; Thu, 29 Jun 2006 14:41:00 +0000 (UTC) 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 0BB5F16A534 for ; Thu, 29 Jun 2006 14:41:00 +0000 (UTC) (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 77F3644A93 for ; Thu, 29 Jun 2006 14:16:51 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5TEGphD068678 for ; Thu, 29 Jun 2006 14:16:51 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5TEGp5N068674 for perforce@freebsd.org; Thu, 29 Jun 2006 14:16:51 GMT (envelope-from jhb@freebsd.org) Date: Thu, 29 Jun 2006 14:16:51 GMT Message-Id: <200606291416.k5TEGp5N068674@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 100288 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, 29 Jun 2006 14:41:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=100288 Change 100288 by jhb@jhb_mutex on 2006/06/29 14:16:06 Make kern_getgroups() saner by pusing the copyout() to the caller and assuming UIO_SYSSPACE. Also, the caller now has to set td->td_retval[0]. I think this should be a general rule that kern_*() should not be setting td->td_retval. Will need to audit that eventually. Affected files ... .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#25 edit .. //depot/projects/smpng/sys/kern/kern_prot.c#94 edit .. //depot/projects/smpng/sys/sys/syscallsubr.h#38 edit Differences ... ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#25 (text+ko) ==== @@ -653,21 +653,22 @@ { ibcs2_gid_t iset[NGROUPS_MAX]; gid_t gp[NGROUPS_MAX]; - int error, i; + int error, i, ngrp; if (uap->gidsetsize < 0) return (EINVAL); - if (uap->gidsetsize > NGROUPS_MAX) - uap->gidsetsize = NGROUPS_MAX; - - error = kern_getgroups(td, uap->gidsetsize, gp, UIO_SYSSPACE); - if (error || uap->gidsetsize == 0 || td->td_retval[0] == 0) + ngrp = MIN(uap->gidsetsize, NGROUPS_MAX); + error = kern_getgroups(td, &ngrp, gp); + if (error) return (error); - - for (i = 0; i < td->td_retval[0]; i++) - iset[i] = (ibcs2_gid_t)gp[i]; - return (copyout(iset, uap->gidset, td->td_retval[0] * - sizeof(ibcs2_gid_t))); + if (uap->gidsetsize > 0) { + for (i = 0; i < ngrp; i++) + iset[i] = (ibcs2_gid_t)gp[i]; + error = copyout(iset, uap->gidset, ngrp * sizeof(ibcs2_gid_t)); + } + if (error == 0) + td->td_retval[0] = ngrp; + return (error); } int ==== //depot/projects/smpng/sys/kern/kern_prot.c#94 (text+ko) ==== @@ -299,35 +299,36 @@ int getgroups(struct thread *td, register struct getgroups_args *uap) { - return (kern_getgroups(td, uap->gidsetsize, uap->gidset, - UIO_USERSPACE)); + gid_t groups[NGROUPS]; + int error, ngrp; + + ngrp = MIN(uap->gidsetsize, NGROUPS); + error = kern_getgroups(td, &ngrp, groups); + if (error) + return (error); + if (uap->gidsetsize > 0) + error = copyout(groups, uap->gidset, ngrp * sizeof(gid_t)); + if (error == 0) + td->td_retval[0] = ngrp; + return (error); } int -kern_getgroups(struct thread *td, u_int gidsetsize, gid_t *gidset, - enum uio_seg gidsetseg) +kern_getgroups(struct thread *td, u_int *ngrp, gid_t *groups) { struct ucred *cred; - u_int ngrp; int error; cred = td->td_ucred; - if ((ngrp = gidsetsize) == 0) { - td->td_retval[0] = cred->cr_ngroups; + if (*ngrp == 0) { + *ngrp = cred->cr_ngroups; return (0); } - if (ngrp < cred->cr_ngroups) + if (*ngrp < cred->cr_ngroups) return (EINVAL); - ngrp = cred->cr_ngroups; - if (gidsetseg == UIO_USERSPACE) - error = copyout(cred->cr_groups, gidset, ngrp * sizeof(gid_t)); - else { - bcopy(cred->cr_groups, gidset, ngrp * sizeof(gid_t)); - error = 0; - } - if (error == 0) - td->td_retval[0] = ngrp; - return (error); + *ngrp = cred->cr_ngroups; + bcopy(cred->cr_groups, gidset, ngrp * sizeof(gid_t)); + return (0); } #ifndef _SYS_SYSPROTO_H_ ==== //depot/projects/smpng/sys/sys/syscallsubr.h#38 (text+ko) ==== @@ -83,8 +83,7 @@ enum uio_seg tptrseg); int kern_getfsstat(struct thread *td, struct statfs **buf, size_t bufsize, enum uio_seg bufseg, int flags); -int kern_getgroups(struct thread *td, u_int gidsetsize, gid_t *gidset, - enum uio_seg gidsetseg); +int kern_getgroups(struct thread *td, u_int *ngrp, gid_t *groups); int kern_getitimer(struct thread *, u_int, struct itimerval *); int kern_getpeername(struct thread *td, int fd, struct sockaddr **sa, socklen_t *alen); From owner-p4-projects@FreeBSD.ORG Thu Jun 29 14:41:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C95E16A5BC; Thu, 29 Jun 2006 14:41:06 +0000 (UTC) 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 D62FB16A563 for ; Thu, 29 Jun 2006 14:41:05 +0000 (UTC) (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 A5BC444C3B for ; Thu, 29 Jun 2006 14:18:54 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5TEIsIV068852 for ; Thu, 29 Jun 2006 14:18:54 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5TEIsLF068849 for perforce@freebsd.org; Thu, 29 Jun 2006 14:18:54 GMT (envelope-from jhb@freebsd.org) Date: Thu, 29 Jun 2006 14:18:54 GMT Message-Id: <200606291418.k5TEIsLF068849@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 100289 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, 29 Jun 2006 14:41:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=100289 Change 100289 by jhb@jhb_mutex on 2006/06/29 14:18:32 Compile and other nits. Affected files ... .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#26 edit .. //depot/projects/smpng/sys/kern/kern_prot.c#95 edit Differences ... ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#26 (text+ko) ==== @@ -653,7 +653,8 @@ { ibcs2_gid_t iset[NGROUPS_MAX]; gid_t gp[NGROUPS_MAX]; - int error, i, ngrp; + u_int i, ngrp; + int error; if (uap->gidsetsize < 0) return (EINVAL); ==== //depot/projects/smpng/sys/kern/kern_prot.c#95 (text+ko) ==== @@ -300,7 +300,8 @@ getgroups(struct thread *td, register struct getgroups_args *uap) { gid_t groups[NGROUPS]; - int error, ngrp; + u_int ngrp; + int error; ngrp = MIN(uap->gidsetsize, NGROUPS); error = kern_getgroups(td, &ngrp, groups); @@ -317,7 +318,6 @@ kern_getgroups(struct thread *td, u_int *ngrp, gid_t *groups) { struct ucred *cred; - int error; cred = td->td_ucred; if (*ngrp == 0) { @@ -327,7 +327,7 @@ if (*ngrp < cred->cr_ngroups) return (EINVAL); *ngrp = cred->cr_ngroups; - bcopy(cred->cr_groups, gidset, ngrp * sizeof(gid_t)); + bcopy(cred->cr_groups, groups, *ngrp * sizeof(gid_t)); return (0); } From owner-p4-projects@FreeBSD.ORG Thu Jun 29 14:42:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBB7F16A407; Thu, 29 Jun 2006 14:42:13 +0000 (UTC) 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 8DFD416A4D1 for ; Thu, 29 Jun 2006 14:42:13 +0000 (UTC) (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 6D9C3440B3 for ; Thu, 29 Jun 2006 14:05:36 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5TE5ach067610 for ; Thu, 29 Jun 2006 14:05:36 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5TE5ZkR067605 for perforce@freebsd.org; Thu, 29 Jun 2006 14:05:35 GMT (envelope-from jhb@freebsd.org) Date: Thu, 29 Jun 2006 14:05:35 GMT Message-Id: <200606291405.k5TE5ZkR067605@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 100286 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, 29 Jun 2006 14:42:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=100286 Change 100286 by jhb@jhb_mutex on 2006/06/29 14:04:43 IFC @100284. Affected files ... .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#48 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#48 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#68 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#63 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#77 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#43 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#41 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#91 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#46 integrate .. //depot/projects/smpng/sys/i386/conf/XBOX#6 integrate .. //depot/projects/smpng/sys/kern/sched_core.c#3 integrate .. //depot/projects/smpng/sys/net/if_enc.c#2 integrate .. //depot/projects/smpng/sys/net/if_gif.c#34 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#49 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#65 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#73 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#85 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#88 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#44 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#31 integrate Differences ... ==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#48 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.95 2006/06/12 18:14:49 des Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.96 2006/06/27 20:11:58 netchild Exp $"); #include #include @@ -63,6 +63,7 @@ #include #include #include +#include #include #include #include @@ -106,6 +107,22 @@ #define P2B(x) ((x) << PAGE_SHIFT) /* pages to bytes */ #define P2K(x) ((x) << (PAGE_SHIFT - 10)) /* pages to kbytes */ +/** + * @brief Mapping of ki_stat in struct kinfo_proc to the linux state + * + * The linux procfs state field displays one of the characters RSDZTW to + * denote running, sleeping in an interruptible wait, waiting in an + * uninteruptible disk sleep, a zombie process, process is being traced + * or stopped, or process is paging respectively. + * + * Our struct kinfo_proc contains the variable ki_stat which contains a + * value out of SIDL, SRUN, SSLEEP, SSTOP, SZOMB, SWAIT and SLOCK. + * + * This character array is used with ki_stati-1 as an index and tries to + * map our states to suitable linux states. + */ +static char *linux_state = "RRSTZDD"; + /* * Filler function for proc/meminfo */ @@ -451,44 +468,51 @@ sbuf_printf(sb, "%d", p->p_pid); #define PS_ADD(name, fmt, arg) sbuf_printf(sb, " " fmt, arg) PS_ADD("comm", "(%s)", p->p_comm); - PS_ADD("statr", "%c", '0'); /* XXX */ + KASSERT(kp.ki_stat <= sizeof(linux_state), + ("linprocfs: don't know how to handle unknown FreeBSD state")); + PS_ADD("state", "%c", linux_state[kp.ki_stat - 1]); PS_ADD("ppid", "%d", p->p_pptr ? p->p_pptr->p_pid : 0); PS_ADD("pgrp", "%d", p->p_pgid); PS_ADD("session", "%d", p->p_session->s_sid); PROC_UNLOCK(p); PS_ADD("tty", "%d", 0); /* XXX */ - PS_ADD("tpgid", "%d", 0); /* XXX */ + PS_ADD("tpgid", "%d", kp.ki_tpgid); PS_ADD("flags", "%u", 0); /* XXX */ - PS_ADD("minflt", "%u", 0); /* XXX */ - PS_ADD("cminflt", "%u", 0); /* XXX */ - PS_ADD("majflt", "%u", 0); /* XXX */ - PS_ADD("cminflt", "%u", 0); /* XXX */ - PS_ADD("utime", "%d", 0); /* XXX */ - PS_ADD("stime", "%d", 0); /* XXX */ - PS_ADD("cutime", "%d", 0); /* XXX */ - PS_ADD("cstime", "%d", 0); /* XXX */ - PS_ADD("counter", "%d", 0); /* XXX */ - PS_ADD("priority", "%d", 0); /* XXX */ - PS_ADD("timeout", "%u", 0); /* XXX */ - PS_ADD("itrealvalue", "%u", 0); /* XXX */ - PS_ADD("starttime", "%d", 0); /* XXX */ - PS_ADD("vsize", "%ju", (uintmax_t)kp.ki_size); - PS_ADD("rss", "%ju", P2K((uintmax_t)kp.ki_rssize)); - PS_ADD("rlim", "%u", 0); /* XXX */ + PS_ADD("minflt", "%lu", kp.ki_rusage.ru_minflt); + PS_ADD("cminflt", "%lu", kp.ki_rusage_ch.ru_minflt); + PS_ADD("majflt", "%lu", kp.ki_rusage.ru_majflt); + PS_ADD("cmajflt", "%lu", kp.ki_rusage_ch.ru_majflt); + PS_ADD("utime", "%ld", T2J(tvtohz(&kp.ki_rusage.ru_utime))); + PS_ADD("stime", "%ld", T2J(tvtohz(&kp.ki_rusage.ru_stime))); + PS_ADD("cutime", "%ld", T2J(tvtohz(&kp.ki_rusage_ch.ru_utime))); + PS_ADD("cstime", "%ld", T2J(tvtohz(&kp.ki_rusage_ch.ru_stime))); + PS_ADD("priority", "%d", kp.ki_pri.pri_user); + PS_ADD("nice", "%d", kp.ki_nice); /* 19 (nicest) to -19 */ + PS_ADD("0", "%d", 0); /* removed field */ + PS_ADD("itrealvalue", "%d", 0); /* XXX */ + /* XXX: starttime is not right, it is the _same_ for _every_ process. + It should be the number of jiffies between system boot and process + start. */ + PS_ADD("starttime", "%lu", T2J(tvtohz(&kp.ki_start))); + PS_ADD("vsize", "%ju", P2K((uintmax_t)kp.ki_size)); + PS_ADD("rss", "%ju", (uintmax_t)kp.ki_rssize); + PS_ADD("rlim", "%lu", kp.ki_rusage.ru_maxrss); PS_ADD("startcode", "%u", (unsigned)0); PS_ADD("endcode", "%u", 0); /* XXX */ PS_ADD("startstack", "%u", 0); /* XXX */ - PS_ADD("esp", "%u", 0); /* XXX */ - PS_ADD("eip", "%u", 0); /* XXX */ - PS_ADD("signal", "%d", 0); /* XXX */ - PS_ADD("blocked", "%d", 0); /* XXX */ - PS_ADD("sigignore", "%d", 0); /* XXX */ - PS_ADD("sigcatch", "%d", 0); /* XXX */ + PS_ADD("kstkesp", "%u", 0); /* XXX */ + PS_ADD("kstkeip", "%u", 0); /* XXX */ + PS_ADD("signal", "%u", 0); /* XXX */ + PS_ADD("blocked", "%u", 0); /* XXX */ + PS_ADD("sigignore", "%u", 0); /* XXX */ + PS_ADD("sigcatch", "%u", 0); /* XXX */ PS_ADD("wchan", "%u", 0); /* XXX */ - PS_ADD("nswap", "%lu", (long unsigned)0); /* XXX */ - PS_ADD("cnswap", "%lu", (long unsigned)0); /* XXX */ + PS_ADD("nswap", "%lu", kp.ki_rusage.ru_nswap); + PS_ADD("cnswap", "%lu", kp.ki_rusage_ch.ru_nswap); PS_ADD("exitsignal", "%d", 0); /* XXX */ - PS_ADD("processor", "%d", 0); /* XXX */ + PS_ADD("processor", "%u", kp.ki_lastcpu); + PS_ADD("rt_priority", "%u", 0); /* XXX */ /* >= 2.5.19 */ + PS_ADD("policy", "%u", kp.ki_pri.pri_class); /* >= 2.5.19 */ #undef PS_ADD sbuf_putc(sb, '\n'); ==== //depot/projects/smpng/sys/dev/ata/ata-all.h#48 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.117 2006/03/31 08:09:04 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.118 2006/06/28 09:59:09 sos Exp $ */ /* ATA register defines */ @@ -149,6 +149,8 @@ /* SATA AHCI v1.0 register defines */ #define ATA_AHCI_CAP 0x00 #define ATA_AHCI_NPMASK 0x1f +#define ATA_AHCI_CAP_CLO 0x01000000 +#define ATA_AHCI_CAP_64BIT 0x80000000 #define ATA_AHCI_GHC 0x04 #define ATA_AHCI_GHC_AE 0x80000000 ==== //depot/projects/smpng/sys/dev/ata/ata-chipset.c#68 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.163 2006/06/19 11:47:57 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.164 2006/06/28 09:59:09 sos Exp $"); #include "opt_ata.h" #include @@ -59,6 +59,7 @@ static void ata_sata_phy_event(void *context, int dummy); static int ata_sata_connect(struct ata_channel *ch); static void ata_sata_setmode(device_t dev, int mode); +static int ata_ahci_chipinit(device_t dev); static int ata_ahci_allocate(device_t dev); static int ata_ahci_status(device_t dev); static int ata_ahci_begin_transaction(struct ata_request *request); @@ -394,6 +395,54 @@ static int +ata_ahci_chipinit(device_t dev) +{ + struct ata_pci_controller *ctlr = device_get_softc(dev); + u_int32_t version; + + /* reset AHCI controller */ + ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, + ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_HR); + DELAY(1000000); + if (ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) & ATA_AHCI_GHC_HR) { + bus_release_resource(dev, ctlr->r_type2, ctlr->r_rid2, ctlr->r_res2); + device_printf(dev, "AHCI controller reset failure\n"); + return ENXIO; + } + + /* enable AHCI mode */ + ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, + ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_AE); + + /* get the number of HW channels */ + ctlr->channels = (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_NPMASK)+1; + + /* clear interrupts */ + ATA_OUTL(ctlr->r_res2, ATA_AHCI_IS, ATA_INL(ctlr->r_res2, ATA_AHCI_IS)); + + /* enable AHCI interrupts */ + ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, + ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_IE); + + ctlr->reset = ata_ahci_reset; + ctlr->dmainit = ata_ahci_dmainit; + ctlr->allocate = ata_ahci_allocate; + ctlr->setmode = ata_sata_setmode; + + /* enable PCI interrupt */ + pci_write_config(dev, PCIR_COMMAND, + pci_read_config(dev, PCIR_COMMAND, 2) & ~0x0400, 2); + + /* announce we support the HW */ + version = ATA_INL(ctlr->r_res2, ATA_AHCI_VS); + device_printf(dev, + "AHCI Version %x%x.%x%x controller with %d ports detected\n", + (version >> 24) & 0xff, (version >> 16) & 0xff, + (version >> 8) & 0xff, version & 0xff, ctlr->channels); + return 0; +} + +static int ata_ahci_allocate(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); @@ -459,7 +508,8 @@ int offset = (ch->unit << 7); int tag = 0; - if ((action = ATA_INL(ctlr->r_res2, ATA_AHCI_IS)) & (1 << ch->unit)) { + action = ATA_INL(ctlr->r_res2, ATA_AHCI_IS); + if (action & (1 << ch->unit)) { istatus = ATA_INL(ctlr->r_res2, ATA_AHCI_P_IS + offset); issued = ATA_INL(ctlr->r_res2, ATA_AHCI_P_CI + offset); sstatus = ATA_INL(ctlr->r_res2, ATA_AHCI_P_SSTS + offset); @@ -472,7 +522,7 @@ /* do we have cold connect surprise */ if (istatus & ATA_AHCI_P_IX_CPD) { - printf("ata_ahci_intr status=%08x sstatus=%08x error=%08x\n", + printf("ata_ahci_status status=%08x sstatus=%08x error=%08x\n", istatus, sstatus, error); } @@ -521,8 +571,8 @@ struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); struct ata_ahci_cmd_tab *ctp; struct ata_ahci_cmd_list *clp; - int fis_size, entries; - int tag = 0; + int tag = 0, entries = 0; + int fis_size; /* get a piece of the workspace for this request */ ctp = (struct ata_ahci_cmd_tab *) @@ -608,15 +658,37 @@ struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); u_int32_t cmd; - int offset = (ch->unit << 7); + int timeout, offset = (ch->unit << 7); /* kill off all activity on this channel */ cmd = ATA_INL(ctlr->r_res2, ATA_AHCI_P_CMD + offset); ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CMD + offset, - cmd & ~(ATA_AHCI_P_CMD_CR | ATA_AHCI_P_CMD_FR | - ATA_AHCI_P_CMD_FRE | ATA_AHCI_P_CMD_ST)); + cmd & ~(ATA_AHCI_P_CMD_FRE | ATA_AHCI_P_CMD_ST)); + + /* XXX SOS this is not entirely wrong */ + timeout = 0; + do { + DELAY(1000); + if (timeout++ > 500) + device_printf(dev, "stopping AHCI engine failed\n"); + break; + } + while (ATA_INL(ctlr->r_res2, ATA_AHCI_P_CMD + offset) & ATA_AHCI_P_CMD_CR); - DELAY(500000); /* XXX SOS this is not entirely wrong */ + /* issue Command List Override if supported */ + if (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_CAP_CLO) { + cmd = ATA_INL(ctlr->r_res2, ATA_AHCI_P_CMD + offset); + cmd |= ATA_AHCI_P_CMD_CLO; + ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CMD + offset, cmd); + timeout = 0; + do { + DELAY(1000); + if (timeout++ > 500) + device_printf(dev, "executing CLO failed\n"); + break; + } + while (ATA_INL(ctlr->r_res2, ATA_AHCI_P_CMD+offset)&ATA_AHCI_P_CMD_CLO); + } /* spin up device */ ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CMD + offset, ATA_AHCI_P_CMD_SUD); @@ -1653,43 +1725,18 @@ ctlr->allocate = ata_intel_allocate; ctlr->reset = ata_intel_reset; - /* if we have AHCI capability and BAR(5) as a memory resource */ - if (ctlr->chip->cfg1 == AHCI) { + /* + * if we have AHCI capability and BAR(5) as a memory resource + * and AHCI or RAID mode enabled in BIOS we go for AHCI mode + */ + if ((ctlr->chip->cfg1 == AHCI) && + (pci_read_config(dev, 0x90, 1) & 0xc0)) { ctlr->r_type2 = SYS_RES_MEMORY; ctlr->r_rid2 = PCIR_BAR(5); if ((ctlr->r_res2 = bus_alloc_resource_any(dev, ctlr->r_type2, &ctlr->r_rid2, - RF_ACTIVE))) { - /* is AHCI or RAID mode enabled in BIOS ? */ - if (pci_read_config(dev, 0x90, 1) & 0xc0) { - - /* reset AHCI controller */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, - ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_HR); - DELAY(1000000); - if (ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) & ATA_AHCI_GHC_HR) { - bus_release_resource(dev, ctlr->r_type2, - ctlr->r_rid2, ctlr->r_res2); - device_printf(dev, "AHCI controller reset failure\n"); - return ENXIO; - } - - /* enable AHCI mode */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, ATA_AHCI_GHC_AE); - - /* get the number of HW channels */ - ctlr->channels = (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & - ATA_AHCI_NPMASK) + 1; - - /* enable AHCI interrupts */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, - ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | - ATA_AHCI_GHC_IE); - ctlr->allocate = ata_ahci_allocate; - ctlr->reset = ata_ahci_reset; - ctlr->dmainit = ata_ahci_dmainit; - } - } + RF_ACTIVE))) + return ata_ahci_chipinit(dev); } ctlr->setmode = ata_sata_setmode; @@ -2091,6 +2138,7 @@ ata_jmicron_chipinit(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(dev); + int error; if (ata_setup_interrupt(dev)) return ENXIO; @@ -2108,30 +2156,8 @@ ctlr->r_rid2 = PCIR_BAR(5); if ((ctlr->r_res2 = bus_alloc_resource_any(dev, ctlr->r_type2, &ctlr->r_rid2, RF_ACTIVE))) { - /* reset AHCI controller */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, - ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_HR); - DELAY(1000000); - if (ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) & ATA_AHCI_GHC_HR) { - bus_release_resource(dev, ctlr->r_type2, ctlr->r_rid2,ctlr->r_res2); - device_printf(dev, "AHCI controller reset failure\n"); - return ENXIO; - } - - /* enable AHCI mode */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, - ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_AE); - - /* clear interrupts */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_IS, ATA_INL(ctlr->r_res2, ATA_AHCI_IS)); - - /* enable AHCI interrupts */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, - ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_IE); - - /* enable PCI interrupt */ - pci_write_config(dev, PCIR_COMMAND, - pci_read_config(dev, PCIR_COMMAND, 2) & ~0x0400, 2); + if ((error = ata_ahci_chipinit(dev))) + return error; } /* set the number of HW channels */ @@ -4612,7 +4638,7 @@ {{ ATA_VIA6410, 0x00, 0, 0x00, ATA_UDMA6, "6410" }, { ATA_VIA6420, 0x00, 7, 0x00, ATA_SA150, "6420" }, { ATA_VIA6421, 0x00, 6, VIABAR, ATA_SA150, "6421" }, - { ATA_VIA8251, 0x00, 0, VIAAHCI, ATA_SA150, "8251" }, + { ATA_VIA8251, 0x00, 0, VIAAHCI, ATA_SA300, "8251" }, { 0, 0, 0, 0, 0, 0 }}; char buffer[64]; @@ -4642,6 +4668,15 @@ return ENXIO; if (ctlr->chip->max_dma >= ATA_SA150) { + if (ctlr->chip->cfg2 == VIAAHCI) { + ctlr->r_type2 = SYS_RES_MEMORY; + ctlr->r_rid2 = PCIR_BAR(5); + if ((ctlr->r_res2 = bus_alloc_resource_any(dev, ctlr->r_type2, + &ctlr->r_rid2, + RF_ACTIVE))) { + return ata_ahci_chipinit(dev); + } + } ctlr->r_type2 = SYS_RES_IOPORT; ctlr->r_rid2 = PCIR_BAR(5); if ((ctlr->r_res2 = bus_alloc_resource_any(dev, ctlr->r_type2, ==== //depot/projects/smpng/sys/dev/ata/atapi-cd.c#63 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.188 2006/03/31 08:09:05 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.189 2006/06/28 15:04:10 sos Exp $"); #include "opt_ata.h" #include @@ -1335,7 +1335,8 @@ error = ata_atapicmd(dev, ccb, (caddr_t)d, length, ai->format == DVD_INVALIDATE_AGID ? 0 : ATA_R_READ,10); if (error) { - free(d, M_ACD); + if (length) + free(d, M_ACD); return error; } @@ -1377,7 +1378,8 @@ default: error = EINVAL; } - free(d, M_ACD); + if (length) + free(d, M_ACD); return error; } ==== //depot/projects/smpng/sys/dev/bge/if_bge.c#77 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.133 2006/06/15 14:35:31 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.135 2006/06/29 06:38:21 glebius Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -171,10 +171,17 @@ { BCOM_VENDORID, BCOM_DEVICEID_BCM5753 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5753F }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5753M }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5754 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5754M }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5755 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5755M }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5780 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5780S }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5781 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5782 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5786 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5787 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5787M }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5788 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5789 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5901 }, @@ -223,6 +230,7 @@ { BGE_CHIPID_BCM5703_A1, "BCM5703 A1" }, { BGE_CHIPID_BCM5703_A2, "BCM5703 A2" }, { BGE_CHIPID_BCM5703_A3, "BCM5703 A3" }, + { BGE_CHIPID_BCM5703_B0, "BCM5703 B0" }, { BGE_CHIPID_BCM5704_A0, "BCM5704 A0" }, { BGE_CHIPID_BCM5704_A1, "BCM5704 A1" }, { BGE_CHIPID_BCM5704_A2, "BCM5704 A2" }, @@ -256,36 +264,19 @@ * that we don't know about have a shot at working. */ static const struct bge_revision bge_majorrevs[] = { - { BGE_ASICREV_BCM5700, - "unknown BCM5700" }, + { BGE_ASICREV_BCM5700, "unknown BCM5700" }, + { BGE_ASICREV_BCM5701, "unknown BCM5701" }, + { BGE_ASICREV_BCM5703, "unknown BCM5703" }, + { BGE_ASICREV_BCM5704, "unknown BCM5704" }, + { BGE_ASICREV_BCM5705, "unknown BCM5705" }, + { BGE_ASICREV_BCM5750, "unknown BCM5750" }, + { BGE_ASICREV_BCM5714_A0, "unknown BCM5714" }, + { BGE_ASICREV_BCM5752, "unknown BCM5752" }, + { BGE_ASICREV_BCM5780, "unknown BCM5780" }, + { BGE_ASICREV_BCM5714, "unknown BCM5714" }, + { BGE_ASICREV_BCM5755, "unknown BCM5755" }, + { BGE_ASICREV_BCM5787, "unknown BCM5787" }, - { BGE_ASICREV_BCM5701, - "unknown BCM5701" }, - - { BGE_ASICREV_BCM5703, - "unknown BCM5703" }, - - { BGE_ASICREV_BCM5704, - "unknown BCM5704" }, - - { BGE_ASICREV_BCM5705, - "unknown BCM5705" }, - - { BGE_ASICREV_BCM5750, - "unknown BCM5750" }, - - { BGE_ASICREV_BCM5714_A0, - "unknown BCM5714" }, - - { BGE_ASICREV_BCM5752, - "unknown BCM5752" }, - - { BGE_ASICREV_BCM5780, - "unknown BCM5780" }, - - { BGE_ASICREV_BCM5714, - "unknown BCM5714" }, - { 0, NULL } }; @@ -295,23 +286,29 @@ (sc)->bge_asicrev == BGE_ASICREV_BCM5714_A0 || \ (sc)->bge_asicrev == BGE_ASICREV_BCM5780 || \ (sc)->bge_asicrev == BGE_ASICREV_BCM5714 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5752) + (sc)->bge_asicrev == BGE_ASICREV_BCM5752 || \ + (sc)->bge_asicrev == BGE_ASICREV_BCM5755 || \ + (sc)->bge_asicrev == BGE_ASICREV_BCM5787) #define BGE_IS_575X_PLUS(sc) \ ((sc)->bge_asicrev == BGE_ASICREV_BCM5750 || \ (sc)->bge_asicrev == BGE_ASICREV_BCM5714_A0 || \ (sc)->bge_asicrev == BGE_ASICREV_BCM5780 || \ (sc)->bge_asicrev == BGE_ASICREV_BCM5714 || \ - (sc)->bge_asicrev == BGE_ASICREV_BCM5752) + (sc)->bge_asicrev == BGE_ASICREV_BCM5752 || \ + (sc)->bge_asicrev == BGE_ASICREV_BCM5755 || \ + (sc)->bge_asicrev == BGE_ASICREV_BCM5787) #define BGE_IS_5714_FAMILY(sc) \ ((sc)->bge_asicrev == BGE_ASICREV_BCM5714_A0 || \ (sc)->bge_asicrev == BGE_ASICREV_BCM5780 || \ (sc)->bge_asicrev == BGE_ASICREV_BCM5714) -#define BGE_IS_JUMBO_CAPABLE(sc) \ - ((sc)->bge_asicrev != BGE_ASICREV_BCM5705 && \ - (sc)->bge_asicrev != BGE_ASICREV_BCM5750) +#define BGE_IS_JUMBO_CAPABLE(sc) \ + ((sc)->bge_asicrev == BGE_ASICREV_BCM5700 || \ + (sc)->bge_asicrev == BGE_ASICREV_BCM5701 || \ + (sc)->bge_asicrev == BGE_ASICREV_BCM5703 || \ + (sc)->bge_asicrev == BGE_ASICREV_BCM5704) const struct bge_revision * bge_lookup_rev(uint32_t); const struct bge_vendor * bge_lookup_vendor(uint16_t); ==== //depot/projects/smpng/sys/dev/bge/if_bgereg.h#43 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.49 2006/06/15 14:31:49 glebius Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.50 2006/06/28 09:12:29 glebius Exp $ */ /* @@ -240,6 +240,7 @@ #define BGE_CHIPID_BCM5703_A1 0x10010000 #define BGE_CHIPID_BCM5703_A2 0x10020000 #define BGE_CHIPID_BCM5703_A3 0x10030000 +#define BGE_CHIPID_BCM5703_B0 0x11000000 #define BGE_CHIPID_BCM5704_A0 0x20000000 #define BGE_CHIPID_BCM5704_A1 0x20010000 #define BGE_CHIPID_BCM5704_A2 0x20020000 @@ -277,6 +278,8 @@ #define BGE_ASICREV_BCM5700 0x07 #define BGE_ASICREV_BCM5780 0x08 #define BGE_ASICREV_BCM5714 0x09 +#define BGE_ASICREV_BCM5755 0x0a +#define BGE_ASICREV_BCM5787 0x0b /* chip revisions */ #define BGE_CHIPREV(x) ((x) >> 24) @@ -1989,10 +1992,17 @@ #define BCOM_DEVICEID_BCM5753 0x16F7 #define BCOM_DEVICEID_BCM5753F 0x16FE #define BCOM_DEVICEID_BCM5753M 0x16FD +#define BCOM_DEVICEID_BCM5754 0x167A +#define BCOM_DEVICEID_BCM5754M 0x1672 +#define BCOM_DEVICEID_BCM5755 0x167B +#define BCOM_DEVICEID_BCM5755M 0x1673 #define BCOM_DEVICEID_BCM5780 0x166A #define BCOM_DEVICEID_BCM5780S 0x166B #define BCOM_DEVICEID_BCM5781 0x16DD #define BCOM_DEVICEID_BCM5782 0x1696 +#define BCOM_DEVICEID_BCM5786 0x169A +#define BCOM_DEVICEID_BCM5787 0x169B +#define BCOM_DEVICEID_BCM5787M 0x1693 #define BCOM_DEVICEID_BCM5788 0x169C #define BCOM_DEVICEID_BCM5789 0x169D #define BCOM_DEVICEID_BCM5901 0x170D ==== //depot/projects/smpng/sys/dev/re/if_re.c#41 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.68 2006/06/26 20:31:31 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.69 2006/06/28 16:04:54 wpaul Exp $"); /* * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver @@ -173,7 +173,9 @@ { RT_VENDORID, RT_DEVICEID_8101E, RL_HWREV_8101E, "RealTek 8101E PCIe 10/100baseTX" }, { RT_VENDORID, RT_DEVICEID_8168, RL_HWREV_8168, - "RealTek 8168B/8111B PCIe Gigabit Ethernet" }, + "RealTek 8168B PCIe Gigabit Ethernet" }, + { RT_VENDORID, RT_DEVICEID_8168, RL_HWREV_8111, + "RealTek 8111B PCIe Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169, "RealTek 8169 Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169S, @@ -210,6 +212,7 @@ { RL_HWREV_8101, RL_8139, "8101"}, { RL_HWREV_8100E, RL_8169, "8100E"}, { RL_HWREV_8101E, RL_8169, "8101E"}, + { RL_HWREV_8111, RL_8169, "8111"}, { 0, 0, NULL } }; ==== //depot/projects/smpng/sys/dev/usb/uplcom.c#25 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uplcom.c,v 1.34 2006/06/19 16:31:58 matteo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uplcom.c,v 1.36 2006/06/29 06:31:13 takawata Exp $"); /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -236,6 +236,8 @@ { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ2, -1, TYPE_PL2303 }, /* I/O DATA USB-RSAQ3 */ { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ3, -1, TYPE_PL2303X }, + /* Willcom W-SIM*/ + { USB_VENDOR_PROLIFIC2, USB_PRODUCT_PROLIFIC2_WSIM, -1, TYPE_PL2303X}, /* PLANEX USB-RS232 URS-03 */ { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A, -1, TYPE_PL2303 }, /* ST Lab USB-SERIAL-4 */ ==== //depot/projects/smpng/sys/dev/usb/usbdevs#91 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.261 2006/06/18 17:55:29 netchild Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.262 2006/06/29 06:17:48 takawata Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -499,6 +499,7 @@ vendor SERVERWORKS 0x1166 ServerWorks vendor ACERCM 0x1189 Acer Communications & Multimedia vendor SIERRA 0x1199 Sierra Wireless +vendor PROLIFIC2 0x11f6 Prolific vendor TWINMOS 0x126f TwinMOS vendor TSUNAMI 0x1241 Tsunami vendor CREATIVE2 0x1292 Creative Labs @@ -1403,7 +1404,7 @@ product PROLIFIC ATAPI4 0x2307 ATAPI-4 Controller product PROLIFIC PL2501 0x2501 PL2501 Host-Host interface product PROLIFIC RSAQ3 0xaaa2 PL2303 Serial adapter (IODATA USB-RSAQ3) - +product PROLIFIC2 WSIM 0x2001 Willcom WSIM /* Putercom products */ product PUTERCOM UPA100 0x047e USB-1284 BRIDGE ==== //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#46 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.59 2006/02/22 18:57:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.60 2006/06/27 20:21:38 netchild Exp $"); #include "opt_pseudofs.h" @@ -515,7 +515,7 @@ if (uio->uio_offset < 0 || uio->uio_resid < 0 || (offset = uio->uio_offset) != uio->uio_offset || (resid = uio->uio_resid) != uio->uio_resid || - (buflen = offset + resid) < offset || buflen > INT_MAX) { + (buflen = offset + resid + 1) < offset || buflen > INT_MAX) { if (proc != NULL) PRELE(proc); PFS_RETURN (EINVAL); ==== //depot/projects/smpng/sys/i386/conf/XBOX#6 (text+ko) ==== @@ -1,7 +1,7 @@ # # XBOX -- kernel for an XBOX # -# $FreeBSD: src/sys/i386/conf/XBOX,v 1.5 2006/06/15 19:58:50 netchild Exp $ +# $FreeBSD: src/sys/i386/conf/XBOX,v 1.6 2006/06/27 20:22:32 rink Exp $ cpu I686_CPU # Celeron ident XBOX @@ -103,4 +103,4 @@ device sound device snd_ich # nForce audio -device nve # nVidia nForce MCP on-board Ethernet Networking +device nfe # nVidia nForce MCP on-board Ethernet Networking ==== //depot/projects/smpng/sys/kern/sched_core.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_core.c,v 1.5 2006/06/15 06:37:39 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_core.c,v 1.9 2006/06/29 12:29:20 davidxu Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_sched.h" @@ -185,24 +185,26 @@ * have several of these. */ struct kse { + struct thread *ke_thread; /* (*) Active associated thread. */ TAILQ_ENTRY(kse) ke_procq; /* (j/z) Run queue. */ int ke_flags; /* (j) KEF_* flags. */ - struct thread *ke_thread; /* (*) Active associated thread. */ fixpt_t ke_pctcpu; /* (j) %cpu during p_swtime. */ u_char ke_rqindex; /* (j) Run queue index. */ enum { KES_THREAD = 0x0, /* slaved to thread state */ KES_ONRUNQ } ke_state; /* (j) thread sched specific status. */ - int ke_slice; - struct krunq *ke_runq; + int ke_slice; /* Time slice in ticks */ + struct kseq *ke_kseq; /* Kseq the thread belongs to */ + struct krunq *ke_runq; /* Assiociated runqueue */ +#ifdef SMP int ke_cpu; /* CPU that we have affinity for. */ - int ke_activated; - uint64_t ke_timestamp; - uint64_t ke_lastran; -#ifdef SMP - int ke_tocpu; + int ke_wakeup_cpu; /* CPU that has activated us. */ #endif + int ke_activated; /* How is the thread activated. */ + uint64_t ke_timestamp; /* Last timestamp dependent on state.*/ + unsigned ke_lastran; /* Last timestamp the thread ran. */ + /* The following variables are only used for pctcpu calculation */ int ke_ltick; /* Last tick that we were running on */ int ke_ftick; /* First tick that we were running on */ @@ -214,19 +216,14 @@ #define ke_ksegrp ke_thread->td_ksegrp /* flags kept in ke_flags */ -#define KEF_ASSIGNED 0x0001 /* Thread is being migrated. */ -#define KEF_BOUND 0x0002 /* Thread can not migrate. */ -#define KEF_XFERABLE 0x0004 /* Thread was added as transferable. */ -#define KEF_HOLD 0x0008 /* Thread is temporarily bound. */ -#define KEF_REMOVED 0x0010 /* Thread was removed while ASSIGNED */ -#define KEF_INTERNAL 0x0020 /* Thread added due to migration. */ -#define KEF_PREEMPTED 0x0040 /* Thread was preempted. */ -#define KEF_MIGRATING 0x0080 /* Thread is migrating. */ -#define KEF_SLEEP 0x0100 /* Thread did sleep. */ -#define KEF_DIDRUN 0x2000 /* Thread actually ran. */ -#define KEF_EXIT 0x4000 /* Thread is being killed. */ -#define KEF_NEXTRQ 0x8000 /* Thread should be in next queue. */ -#define KEF_FIRST_SLICE 0x10000 /* Thread has first time slice left. */ +#define KEF_BOUND 0x0001 /* Thread can not migrate. */ +#define KEF_PREEMPTED 0x0002 /* Thread was preempted. */ +#define KEF_MIGRATING 0x0004 /* Thread is migrating. */ +#define KEF_SLEEP 0x0008 /* Thread did sleep. */ +#define KEF_DIDRUN 0x0010 /* Thread actually ran. */ +#define KEF_EXIT 0x0020 /* Thread is being killed. */ +#define KEF_NEXTRQ 0x0400 /* Thread should be in next queue. */ +#define KEF_FIRST_SLICE 0x0800 /* Thread has first time slice left. */ struct kg_sched { struct thread *skg_last_assigned; /* (j) Last thread assigned to */ @@ -259,47 +256,16 @@ * kseq - per processor runqs and statistics. */ struct kseq { + struct krunq *ksq_curr; /* Current queue. */ + struct krunq *ksq_next; /* Next timeshare queue. */ + struct krunq ksq_timeshare[2]; /* Run queues for !IDLE. */ struct krunq ksq_idle; /* Queue of IDLE threads. */ - struct krunq ksq_timeshare[2]; /* Run queues for !IDLE. */ - struct krunq *ksq_next; /* Next timeshare queue. */ - struct krunq *ksq_curr; /* Current queue. */ - int ksq_load_timeshare; /* Load for timeshare. */ - int ksq_load_idle; - int ksq_load; /* Aggregate load. */ - int ksq_sysload; /* For loadavg, !P_NOLOAD */ - uint64_t ksq_expired_timestamp; - uint64_t ksq_last_timestamp; - signed char ksq_best_expired_nice; -#ifdef SMP - int ksq_transferable; - LIST_ENTRY(kseq) ksq_siblings; /* Next in kseq group. */ - struct kseq_group *ksq_group; /* Our processor group. */ - struct thread *ksq_migrated; - TAILQ_HEAD(,kse) ksq_migrateq; - int ksq_avgload; -#endif + int ksq_load; + uint64_t ksq_last_timestamp; /* Per-cpu last clock tick */ + unsigned ksq_expired_tick; /* First expired tick */ + signed char ksq_expired_nice; /* Lowest nice in nextq */ }; -#ifdef SMP -/* - * kseq groups are groups of processors which can cheaply share threads. When - * one processor in the group goes idle it will check the runqs of the other - * processors in its group prior to halting and waiting for an interrupt. - * These groups are suitable for SMT (Symetric Multi-Threading) and not NUMA. - * In a NUMA environment we'd want an idle bitmap per group and a two tiered - * load balancer. - */ -struct kseq_group { - int ksg_cpus; /* Count of CPUs in this kseq group. */ - cpumask_t ksg_cpumask; /* Mask of cpus in this group. */ - cpumask_t ksg_idlemask; /* Idle cpus in this group. */ - cpumask_t ksg_mask; /* Bit mask for first cpu. */ - int ksg_transferable; /* Transferable load of this group. */ - LIST_HEAD(, kseq) ksg_members; /* Linked list of all members. */ - int ksg_balance_tick; -}; -#endif - static struct kse kse0; static struct kg_sched kg_sched0; @@ -307,33 +273,25 @@ static int def_timeslice = 100; static int granularity = 10; static int realstathz; +static int sched_tdcnt; +static struct kseq kseq_global; /* * One kse queue per processor. */ #ifdef SMP -static cpumask_t kseq_idle; -static int ksg_maxid; -static struct kseq kseq_cpu[MAXCPU]; -static struct kseq_group kseq_groups[MAXCPU]; -static int balance_tick; -static int balance_interval = 1; -static int balance_interval_max = 32; -static int balance_interval_min = 8; -static int balance_busy_factor = 32; -static int imbalance_pct = 25; -static int imbalance_pct2 = 50; -static int ignore_topology = 1; +static struct kseq kseq_cpu[MAXCPU]; #define KSEQ_SELF() (&kseq_cpu[PCPU_GET(cpuid)]) #define KSEQ_CPU(x) (&kseq_cpu[(x)]) #define KSEQ_ID(x) ((x) - kseq_cpu) -#define KSEQ_GROUP(x) (&kseq_groups[(x)]) + +static cpumask_t cpu_sibling[MAXCPU]; + #else /* !SMP */ -static struct kseq kseq_cpu; -#define KSEQ_SELF() (&kseq_cpu) -#define KSEQ_CPU(x) (&kseq_cpu) +#define KSEQ_SELF() (&kseq_global) +#define KSEQ_CPU(x) (&kseq_global) #endif /* decay 95% of `p_pctcpu' in 60 seconds; see CCPU_SHIFT before changing */ @@ -348,46 +306,72 @@ static SYSCTL_NODE(_kern, OID_AUTO, sched, CTLFLAG_RW, 0, "Scheduler"); -SYSCTL_STRING(_kern_sched, OID_AUTO, name, CTLFLAG_RD, "core", 0, +SYSCTL_STRING(_kern_sched, OID_AUTO, name, CTLFLAG_RD, "CORE", 0, "Scheduler name"); #ifdef SMP -SYSCTL_INT(_kern_sched, OID_AUTO, imbalance_pct, CTLFLAG_RW, - &imbalance_pct, 0, ""); +/* Enable forwarding of wakeups to all other cpus */ +SYSCTL_NODE(_kern_sched, OID_AUTO, ipiwakeup, CTLFLAG_RD, NULL, "Kernel SMP"); + +static int runq_fuzz = 0; +SYSCTL_INT(_kern_sched, OID_AUTO, runq_fuzz, CTLFLAG_RW, &runq_fuzz, 0, ""); + +static int forward_wakeup_enabled = 1; +SYSCTL_INT(_kern_sched_ipiwakeup, OID_AUTO, enabled, CTLFLAG_RW, + &forward_wakeup_enabled, 0, + "Forwarding of wakeup to idle CPUs"); + +static int forward_wakeups_requested = 0; +SYSCTL_INT(_kern_sched_ipiwakeup, OID_AUTO, requested, CTLFLAG_RD, + &forward_wakeups_requested, 0, + "Requests for Forwarding of wakeup to idle CPUs"); + +static int forward_wakeups_delivered = 0; +SYSCTL_INT(_kern_sched_ipiwakeup, OID_AUTO, delivered, CTLFLAG_RD, + &forward_wakeups_delivered, 0, + "Completed Forwarding of wakeup to idle CPUs"); + +static int forward_wakeup_use_mask = 1; +SYSCTL_INT(_kern_sched_ipiwakeup, OID_AUTO, usemask, CTLFLAG_RW, + &forward_wakeup_use_mask, 0, + "Use the mask of idle cpus"); -SYSCTL_INT(_kern_sched, OID_AUTO, imbalance_pct2, CTLFLAG_RW, - &imbalance_pct2, 0, ""); +static int forward_wakeup_use_loop = 0; +SYSCTL_INT(_kern_sched_ipiwakeup, OID_AUTO, useloop, CTLFLAG_RW, + &forward_wakeup_use_loop, 0, + "Use a loop to find idle cpus"); -SYSCTL_INT(_kern_sched, OID_AUTO, balance_interval_min, CTLFLAG_RW, - &balance_interval_min, 0, ""); +static int forward_wakeup_use_single = 0; +SYSCTL_INT(_kern_sched_ipiwakeup, OID_AUTO, onecpu, CTLFLAG_RW, + &forward_wakeup_use_single, 0, + "Only signal one idle cpu"); -SYSCTL_INT(_kern_sched, OID_AUTO, balance_interval_max, CTLFLAG_RW, - &balance_interval_max, 0, ""); +static int forward_wakeup_use_htt = 0; +SYSCTL_INT(_kern_sched_ipiwakeup, OID_AUTO, htt2, CTLFLAG_RW, + &forward_wakeup_use_htt, 0, + "account for htt"); #endif static void slot_fill(struct ksegrp *); -static void krunq_add(struct krunq *, struct kse *, int flags); +static void krunq_add(struct krunq *, struct kse *); static struct kse *krunq_choose(struct krunq *); static void krunq_clrbit(struct krunq *rq, int pri); static int krunq_findbit(struct krunq *rq); static void krunq_init(struct krunq *); static void krunq_remove(struct krunq *, struct kse *); -#ifdef SMP -static struct kse *krunq_steal(struct krunq *rq, int my_cpu); -#endif static struct kse * kseq_choose(struct kseq *); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 29 17:20:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B389216A503; Thu, 29 Jun 2006 17:20:31 +0000 (UTC) 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 77E6516A4DF for ; Thu, 29 Jun 2006 17:20:31 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 391EE4434A for ; Thu, 29 Jun 2006 17:20:30 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5THKU2I096960 for ; Thu, 29 Jun 2006 17:20:30 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5THKT31096956 for perforce@freebsd.org; Thu, 29 Jun 2006 17:20:29 GMT (envelope-from bushman@freebsd.org) Date: Thu, 29 Jun 2006 17:20:29 GMT Message-Id: <200606291720.k5THKT31096956@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100298 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, 29 Jun 2006 17:20:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=100298 Change 100298 by bushman@bushman_nss_ldap_cached on 2006/06/29 17:19:49 "shells" nsswitch database reworked to be supported by the caching daemon Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getusershell.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/Makefile#8 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_shells.c#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_shells.h#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/nss_dns.c#8 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/Makefile#7 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_shells.c#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_shells.h#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/nss_files.c#10 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/Makefile#8 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_shells.c#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_shells.h#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nss_nis.c#7 edit .. //depot/projects/soc2006/nss_ldap_cached/tests/getusershell_test/Makefile#3 edit .. //depot/projects/soc2006/nss_ldap_cached/tests/getusershell_test/getusershell_test.c#3 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getusershell.c#2 (text+ko) ==== @@ -39,236 +39,128 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/getusershell.c,v 1.9 2003/04/24 20:16:21 nectar Exp $"); #include "namespace.h" -#include -#include - #include #include #include #include +#include +#include #include #include #include -#include #include +#include "un-namespace.h" -#ifdef HESIOD -#include -#endif -#ifdef YP -#include -#include -#include -#endif -#include "un-namespace.h" +static const ns_src defaultsrc[] = { + { NSSRC_FILES, NS_SUCCESS }, + { NULL, 0} +}; + +enum constants +{ + USERSHELL_STORAGE_INITIAL = 1 << 10, /* 1 KByte */ + USERSHELL_STORAGE_MAX = 1 << 20, /* 1 MByte */ +}; /* * Local shells should NOT be added here. They should be added in * /etc/shells. */ - static const char *const okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL }; -static const char *const *curshell; -static StringList *sl; -static const char *const *initshells(void); +struct usershell_state { + char *buffer; + size_t bufsize; +}; +static void usershell_endstate(void *); +NSS_TLS_HANDLING(usershell); -/* - * Get a list of shells from "shells" nsswitch database - */ -char * -getusershell(void) +static void usershell_endstate(void *st) { - char *ret; - - if (curshell == NULL) - curshell = initshells(); - /*LINTED*/ - ret = (char *)*curshell; - if (ret != NULL) - curshell++; - return (ret); + if (st == NULL) + return; + + free(((struct usershell_state *)st)->buffer); + free(st); } -void -endusershell(void) +static int +getusershell_r(char **retval, char *buffer, size_t bufsize) { - if (sl) { - sl_free(sl, 1); - sl = NULL; - } - curshell = NULL; -} + static const ns_dtab dtab[] = { + { NULL, NULL, NULL } + }; + int rv, ret_errno; -void -setusershell(void) -{ + ret_errno = 0; + *retval = NULL; + rv = nsdispatch(retval, dtab, NSDB_SHELLS, "getusershell_r", + defaultsrc, buffer, bufsize, &ret_errno); - curshell = initshells(); + if (rv == NS_SUCCESS) + return (0); + else + return (ret_errno); + } - -static int _local_initshells(void *, void *, va_list); - -/*ARGSUSED*/ -static int -_local_initshells(rv, cb_data, ap) - void *rv; - void *cb_data; - va_list ap; +char * +getusershell(void) { - char *sp, *cp; - FILE *fp; - char line[MAXPATHLEN + 2]; + int rv; + char *res; + struct usershell_state *st; - if (sl) - sl_free(sl, 1); - sl = sl_init(); + rv = usershell_getstate(&st); + if (rv != 0) { + errno = rv; + return NULL; + } - if ((fp = fopen(_PATH_SHELLS, "r")) == NULL) - return NS_UNAVAIL; - - sp = cp = line; - while (fgets(cp, MAXPATHLEN + 1, fp) != NULL) { - while (*cp != '#' && *cp != '/' && *cp != '\0') - cp++; - if (*cp == '#' || *cp == '\0') - continue; - sp = cp; - while (!isspace(*cp) && *cp != '#' && *cp != '\0') - cp++; - *cp++ = '\0'; - sl_add(sl, strdup(sp)); + if (st->buffer == NULL) { + st->buffer = malloc(USERSHELL_STORAGE_INITIAL); + if (st->buffer == NULL) + return (NULL); + st->bufsize = USERSHELL_STORAGE_INITIAL; } - (void)fclose(fp); - return NS_SUCCESS; -} - -#ifdef HESIOD -static int _dns_initshells(void *, void *, va_list); - -/*ARGSUSED*/ -static int -_dns_initshells(rv, cb_data, ap) - void *rv; - void *cb_data; - va_list ap; -{ - char shellname[] = "shells-XXXXX"; - int hsindex, hpi, r; - char **hp; - void *context; - - if (sl) - sl_free(sl, 1); - sl = sl_init(); - r = NS_UNAVAIL; - if (hesiod_init(&context) == -1) - return (r); - - for (hsindex = 0; ; hsindex++) { - snprintf(shellname, sizeof(shellname)-1, "shells-%d", hsindex); - hp = hesiod_resolve(context, shellname, "shells"); - if (hp == NULL) { - if (errno == ENOENT) { - if (hsindex == 0) - r = NS_NOTFOUND; - else - r = NS_SUCCESS; + do { + rv = getusershell_r(&res, st->buffer, st->bufsize); + if (res == NULL && rv == ERANGE) { + free(st->buffer); + if ((st->bufsize << 1) > USERSHELL_STORAGE_MAX) { + st->buffer = NULL; + errno = ERANGE; + return (NULL); } - break; - } else { - for (hpi = 0; hp[hpi]; hpi++) - sl_add(sl, hp[hpi]); - free(hp); + st->bufsize <<= 1; + st->buffer = malloc(st->bufsize); + if (st->buffer == NULL) + return (NULL); } - } - hesiod_end(context); - return (r); + } while (res == NULL && rv == ERANGE); + if (rv != 0) + errno = rv; + + return (res); } -#endif /* HESIOD */ -#ifdef YP -static int _nis_initshells(void *, void *, va_list); -/*ARGSUSED*/ -static int -_nis_initshells(rv, cb_data, ap) - void *rv; - void *cb_data; - va_list ap; +void +endusershell(void) { - static char *ypdomain; - char *key, *data; - char *lastkey; - int keylen, datalen; - int r; + static const ns_dtab dtab[] = { + { NULL, NULL, NULL } + }; - if (sl) - sl_free(sl, 1); - sl = sl_init(); - - if (ypdomain == NULL) { - switch (yp_get_default_domain(&ypdomain)) { - case 0: - break; - case YPERR_RESRC: - return NS_TRYAGAIN; - default: - return NS_UNAVAIL; - } - } - - /* - * `key' and `data' point to strings dynamically allocated by - * the yp_... functions. - * `data' is directly put into the stringlist of shells. - */ - key = data = NULL; - if (yp_first(ypdomain, "shells", &key, &keylen, &data, &datalen)) - return NS_UNAVAIL; - do { - data[datalen] = '\0'; /* clear trailing \n */ - sl_add(sl, data); - - lastkey = key; - r = yp_next(ypdomain, "shells", lastkey, keylen, - &key, &keylen, &data, &datalen); - free(lastkey); - } while (r == 0); - - if (r == YPERR_NOMORE) { - /* - * `data' and `key' ought to be NULL - do not try to free them. - */ - return NS_SUCCESS; - } - - return NS_UNAVAIL; + nsdispatch(NULL, dtab, NSDB_SHELLS, "setusershell"); } -#endif /* YP */ -static const char *const * -initshells() +void +setusershell(void) { static const ns_dtab dtab[] = { - NS_FILES_CB(_local_initshells, NULL) - NS_DNS_CB(_dns_initshells, NULL) - NS_NIS_CB(_nis_initshells, NULL) - { 0 } + { NULL, NULL, NULL } }; - if (sl) - sl_free(sl, 1); - sl = sl_init(); - if (_nsdispatch(NULL, dtab, NSDB_SHELLS, "initshells", __nsdefaultsrc) - != NS_SUCCESS) { - if (sl) - sl_free(sl, 1); - sl = NULL; - return (okshells); - } - sl_add(sl, NULL); - - return (const char *const *)(sl->sl_str); + nsdispatch(NULL, dtab, NSDB_SHELLS, "setusershell"); } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/Makefile#8 (text+ko) ==== @@ -8,7 +8,7 @@ SHLIBDIR?= /lib SRCS= nss_dns.c dns_hosts_namadr.c dns_hosts_addrinfo.c dns_passwd.c\ - dns_group.c dns_net.c + dns_group.c dns_net.c dns_shells.c CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../libc/gen -I${.CURDIR}/../libc/include\ -I${.CURDIR}/../libc/net -I${.CURDIR}/../libnssutil CFLAGS+=-DINET6 ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/nss_dns.c#8 (text+ko) ==== @@ -36,6 +36,7 @@ #include "dns_net.h" #include "dns_passwd.h" #include "dns_group.h" +#include "dns_shells.h" #include "netdb_private.h" static ns_mtab methods[] = { @@ -64,6 +65,10 @@ {NSDB_NETWORKS_INTERNAL, "setnetent", __dns_setnetent, NULL}, {NSDB_NETWORKS_INTERNAL, "endnetent", __dns_endnetent, NULL}, + {NSDB_SHELLS, "getusershell_r", __dns_getusershell_r, NULL}, + {NSDB_SHELLS, "setusershell", __dns_setusershell, NULL}, + {NSDB_SHELLS, "endusershell", __dns_setusershell, NULL}, + {NSDB_GROUP_COMPAT, "getgrnam_r", __dns_group, (void *)nss_lt_name}, {NSDB_GROUP_COMPAT, "getgrgid_r", __dns_group, (void *)nss_lt_id}, {NSDB_GROUP_COMPAT, "getgrent_r", __dns_group, (void *)nss_lt_all}, ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/Makefile#7 (text+ko) ==== @@ -9,7 +9,7 @@ SRCS= nss_files.c files_passwd.c files_group.c files_hosts_namadr.c\ files_hosts_addrinfo.c files_serv.c files_proto.c\ - files_net.c files_rpc.c + files_net.c files_rpc.c files_shells.c CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../libc/gen -I${.CURDIR}/../libc/include\ -I${.CURDIR}/../libc/net -I${.CURDIR}/../libnssutil CFLAGS+=-DINET6 ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_shells.c#4 (text+ko) ==== @@ -30,3 +30,117 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include + +#include +#include +#include +#include +#include +#include "namespace.h" +#include +#include +#include "un-namespace.h" +#include +#include +#include +#include +#include "reentrant.h" +#include "nss_tls.h" + +struct files_usershell_state { + FILE *fp; +}; +static void files_usershell_endstate(void *); +NSS_TLS_HANDLING(files_usershell); + +static void +files_usershell_endstate(void *st) +{ + struct files_usershell_state *state; + + if (st == NULL) + return; + + state = (struct files_usershell_state *)st; + if (state->fp != NULL) { + fclose(state->fp); + state->fp = NULL; + } + + free(state); +} + +int +__files_getusershell_r(void *rv, void *cb_data, va_list ap) +{ + struct files_usershell_state *st; + char *buffer; + size_t buflen; + int *errnop; + char **retval; + + char *cp, *sp; + + buffer = va_arg(ap, char *); + buflen = va_arg(ap, size_t); + errnop = va_arg(ap, int *); + retval = (char **)rv; + + assert(buffer != NULL); + assert(buflen != 0); + assert(rv != NULL); + + *errnop = files_usershell_getstate(&st); + if (*errnop != 0) + return (NS_UNAVAIL); + + if ((st->fp == NULL) && ((st->fp = fopen(_PATH_SHELLS, "r")) == NULL)) + return NS_UNAVAIL; + + cp = buffer; + while (fgets(cp, buflen - 1, st->fp) != NULL) { + while (*cp != '#' && *cp != '/' && *cp != '\0') + cp++; + if (*cp == '#' || *cp == '\0') + continue; + sp = cp; + while (!isspace(*cp) && *cp != '#' && *cp != '\0') + cp++; + *cp++ = '\0'; + + *retval = sp; + return (NS_SUCCESS); + } + + (void)fclose(st->fp); + st->fp = NULL; + + return (NS_UNAVAIL); +} + +int +__files_setusershell(void *rv, void *cb_data, va_list ap) +{ + struct files_usershell_state *st; + int error; + + error = files_usershell_getstate(&st); + if (error != 0) { + errno = error; + return (NS_UNAVAIL); + } + + if (st->fp != NULL) { + fclose(st->fp); + st->fp = NULL; + } + + return (NS_UNAVAIL); + +} ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_shells.h#3 (text+ko) ==== @@ -26,4 +26,5 @@ * $FreeBSD$ */ -extern int __files_initshells(void *, void *, va_list); +int __files_getusershell_r(void *, void *, va_list); +int __files_setusershell(void *, void *, va_list); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/nss_files.c#10 (text+ko) ==== @@ -41,6 +41,7 @@ #include "files_proto.h" #include "files_rpc.h" #include "files_serv.h" +#include "files_shells.h" #include "netdb_private.h" #include "nss_files.h" @@ -94,6 +95,10 @@ {NSDB_RPC, "getrpcent_r", __files_rpcent, (void *)nss_lt_all}, {NSDB_RPC, "setrpcent", __files_setrpcent, (void *)nss_set_ent}, {NSDB_RPC, "endrpcent", __files_setrpcent, (void *)nss_end_ent}, + + {NSDB_SHELLS, "getusershell_r", __files_getusershell_r, NULL}, + {NSDB_SHELLS, "setusershell", __files_setusershell, NULL}, + {NSDB_SHELLS, "endusershell", __files_setusershell, NULL}, {NSDB_GROUP_COMPAT, "getgrnam_r", __files_group, (void *)nss_lt_name}, {NSDB_GROUP_COMPAT, "getgrgid_r", __files_group, (void *)nss_lt_id}, ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/Makefile#8 (text+ko) ==== @@ -8,7 +8,7 @@ SHLIBDIR?= /lib SRCS= nss_nis.c nis_hosts_namadr.c nis_hosts_addrinfo.c nis_passwd.c\ - nis_group.c nis_net.c nis_rpc.c nis_serv.c + nis_group.c nis_net.c nis_rpc.c nis_serv.c nis_shells.c CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../libc/gen -I${.CURDIR}/../libc/include\ -I${.CURDIR}/../libc/net -I${.CURDIR}/../libnssutil CFLAGS+=-DINET6 ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nss_nis.c#7 (text+ko) ==== @@ -37,6 +37,7 @@ #include "nis_group.h" #include "nis_rpc.h" #include "nis_serv.h" +#include "nis_shells.h" static ns_mtab methods[] = { {NSDB_GROUP, "getgrnam_r", __nis_group, (void *)nss_lt_name}, @@ -65,7 +66,11 @@ {NSDB_RPC, "getrpcbyport_r", __nis_rpcent, (void *)nss_lt_id}, {NSDB_RPC, "getrpcent_r", __nis_rpcent, (void *)nss_lt_all}, {NSDB_RPC, "setrpcent", __nis_setrpcent, NULL}, - {NSDB_RPC, "endrpcent", __nis_setrpcent, NULL}, + {NSDB_RPC, "endrpcent", __nis_setrpcent, NULL}, + + {NSDB_SHELLS, "getusershell_r", __nis_getusershell_r, NULL}, + {NSDB_SHELLS, "setusershell", __nis_setusershell, NULL}, + {NSDB_SHELLS, "endusershell", __nis_setusershell, NULL}, {NSDB_GROUP_COMPAT, "getgrnam_r", __nis_group, (void *)nss_lt_name}, {NSDB_GROUP_COMPAT, "getgrgid_r", __nis_group, (void *)nss_lt_id}, ==== //depot/projects/soc2006/nss_ldap_cached/tests/getusershell_test/Makefile#3 (text+ko) ==== @@ -4,7 +4,8 @@ SRCS= getusershell_test.c CFLAGS+= -g -I${.CURDIR} -I${.CURDIR}/../../src/lib/libc/gen -I${.CURDIR}/../../src/lib/libc/include\ -I${.CURDIR}/../../src/lib/libc/net - +LDFLAGS+= -L/usr/local/lib +#LDADD+= -lhesiod MAN= .include ==== //depot/projects/soc2006/nss_ldap_cached/tests/getusershell_test/getusershell_test.c#3 (text+ko) ==== @@ -1,3 +1,544 @@ +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct hesiod_p { + char *lhs; /* normally ".ns" */ + char *rhs; /* AKA the default hesiod domain */ + int classes[2]; /* The class search order. */ +}; + +#define MAX_HESRESP 1024 + +static int read_config_file(struct hesiod_p *, const char *); +static char **get_txt_records(int, const char *); +static int init_context(void); +static void translate_errors(void); + + +/* + * hesiod_init -- + * initialize a hesiod_p. + */ +int +hesiod_init(context) + void **context; +{ + struct hesiod_p *ctx; + const char *p, *configname; + + ctx = malloc(sizeof(struct hesiod_p)); + if (ctx) { + *context = ctx; + if (!issetugid()) + configname = getenv("HESIOD_CONFIG"); + else + configname = NULL; + if (!configname) + configname = _PATH_HESIOD_CONF; + if (read_config_file(ctx, configname) >= 0) { + /* + * The default rhs can be overridden by an + * environment variable. + */ + if (!issetugid()) + p = getenv("HES_DOMAIN"); + else + p = NULL; + if (p) { + if (ctx->rhs) + free(ctx->rhs); + ctx->rhs = malloc(strlen(p) + 2); + if (ctx->rhs) { + *ctx->rhs = '.'; + strcpy(ctx->rhs + 1, + (*p == '.') ? p + 1 : p); + return 0; + } else + errno = ENOMEM; + } else + return 0; + } + } else + errno = ENOMEM; + + if (ctx->lhs) + free(ctx->lhs); + if (ctx->rhs) + free(ctx->rhs); + if (ctx) + free(ctx); + return -1; +} + +/* + * hesiod_end -- + * Deallocates the hesiod_p. + */ +void +hesiod_end(context) + void *context; +{ + struct hesiod_p *ctx = (struct hesiod_p *) context; + + free(ctx->rhs); + if (ctx->lhs) + free(ctx->lhs); + free(ctx); +} + +/* + * hesiod_to_bind -- + * takes a hesiod (name, type) and returns a DNS + * name which is to be resolved. + */ +char * +hesiod_to_bind(void *context, const char *name, const char *type) +{ + struct hesiod_p *ctx = (struct hesiod_p *) context; + char bindname[MAXDNAME], *p, *ret, **rhs_list = NULL; + const char *rhs; + int len; + + if (strlcpy(bindname, name, sizeof(bindname)) >= sizeof(bindname)) { + errno = EMSGSIZE; + return NULL; + } + + /* + * Find the right right hand side to use, possibly + * truncating bindname. + */ + p = strchr(bindname, '@'); + if (p) { + *p++ = 0; + if (strchr(p, '.')) + rhs = name + (p - bindname); + else { + rhs_list = hesiod_resolve(context, p, "rhs-extension"); + if (rhs_list) + rhs = *rhs_list; + else { + errno = ENOENT; + return NULL; + } + } + } else + rhs = ctx->rhs; + + /* See if we have enough room. */ + len = strlen(bindname) + 1 + strlen(type); + if (ctx->lhs) + len += strlen(ctx->lhs) + ((ctx->lhs[0] != '.') ? 1 : 0); + len += strlen(rhs) + ((rhs[0] != '.') ? 1 : 0); + if (len > sizeof(bindname) - 1) { + if (rhs_list) + hesiod_free_list(context, rhs_list); + errno = EMSGSIZE; + return NULL; + } + /* Put together the rest of the domain. */ + strcat(bindname, "."); + strcat(bindname, type); + /* Only append lhs if it isn't empty. */ + if (ctx->lhs && ctx->lhs[0] != '\0' ) { + if (ctx->lhs[0] != '.') + strcat(bindname, "."); + strcat(bindname, ctx->lhs); + } + if (rhs[0] != '.') + strcat(bindname, "."); + strcat(bindname, rhs); + + /* rhs_list is no longer needed, since we're done with rhs. */ + if (rhs_list) + hesiod_free_list(context, rhs_list); + + /* Make a copy of the result and return it to the caller. */ + ret = strdup(bindname); + if (!ret) + errno = ENOMEM; + return ret; +} + +/* + * hesiod_resolve -- + * Given a hesiod name and type, return an array of strings returned + * by the resolver. + */ +char ** +hesiod_resolve(context, name, type) + void *context; + const char *name; + const char *type; +{ + struct hesiod_p *ctx = (struct hesiod_p *) context; + char *bindname, **retvec; + + bindname = hesiod_to_bind(context, name, type); + if (!bindname) + return NULL; + + retvec = get_txt_records(ctx->classes[0], bindname); + if (retvec == NULL && errno == ENOENT && ctx->classes[1]) + retvec = get_txt_records(ctx->classes[1], bindname); + + free(bindname); + return retvec; +} + +/*ARGSUSED*/ +void +hesiod_free_list(context, list) + void *context; + char **list; +{ + char **p; + + if (list == NULL) + return; + for (p = list; *p; p++) + free(*p); + free(list); +} + + +/* read_config_file -- + * Parse the /etc/hesiod.conf file. Returns 0 on success, + * -1 on failure. On failure, it might leave values in ctx->lhs + * or ctx->rhs which need to be freed by the caller. + */ +static int +read_config_file(ctx, filename) + struct hesiod_p *ctx; + const char *filename; +{ + char *key, *data, *p, **which; + char buf[MAXDNAME + 7]; + int n; + FILE *fp; + + /* Set default query classes. */ + ctx->classes[0] = C_IN; + ctx->classes[1] = C_HS; + + /* Try to open the configuration file. */ + fp = fopen(filename, "r"); + if (!fp) { + /* Use compiled in default domain names. */ + ctx->lhs = strdup(DEF_LHS); + ctx->rhs = strdup(DEF_RHS); + if (ctx->lhs && ctx->rhs) + return 0; + else { + errno = ENOMEM; + return -1; + } + } + ctx->lhs = NULL; + ctx->rhs = NULL; + while (fgets(buf, sizeof(buf), fp) != NULL) { + p = buf; + if (*p == '#' || *p == '\n' || *p == '\r') + continue; + while (*p == ' ' || *p == '\t') + p++; + key = p; + while (*p != ' ' && *p != '\t' && *p != '=') + p++; + *p++ = 0; + + while (isspace(*p) || *p == '=') + p++; + data = p; + while (!isspace(*p)) + p++; + *p = 0; + + if (strcasecmp(key, "lhs") == 0 || + strcasecmp(key, "rhs") == 0) { + which = (strcasecmp(key, "lhs") == 0) + ? &ctx->lhs : &ctx->rhs; + *which = strdup(data); + if (!*which) { + errno = ENOMEM; + return -1; + } + } else { + if (strcasecmp(key, "classes") == 0) { + n = 0; + while (*data && n < 2) { + p = data; + while (*p && *p != ',') + p++; + if (*p) + *p++ = 0; + if (strcasecmp(data, "IN") == 0) + ctx->classes[n++] = C_IN; + else + if (strcasecmp(data, "HS") == 0) + ctx->classes[n++] = + C_HS; + data = p; + } + while (n < 2) + ctx->classes[n++] = 0; + } + } + } + fclose(fp); + + if (!ctx->rhs || ctx->classes[0] == 0 || + ctx->classes[0] == ctx->classes[1]) { + errno = ENOEXEC; + return -1; + } + return 0; +} + +/* + * get_txt_records -- + * Given a DNS class and a DNS name, do a lookup for TXT records, and + * return a list of them. + */ +static char ** +get_txt_records(qclass, name) + int qclass; + const char *name; +{ + HEADER *hp; + unsigned char qbuf[PACKETSZ], abuf[MAX_HESRESP], *p, *eom, *eor; + char *dst, **list; + int ancount, qdcount, i, j, n, skip, type, class, len; + + /* Make sure the resolver is initialized. */ + if ((_res.options & RES_INIT) == 0 && res_init() == -1) + return NULL; + + printf(":::: %d\n", __LINE__); + /* Construct the query. */ + n = res_mkquery(QUERY, name, qclass, T_TXT, NULL, 0, + NULL, qbuf, PACKETSZ); + if (n < 0) + return NULL; + + printf(":::: %d\n", __LINE__); + /* Send the query. */ + n = res_send(qbuf, n, abuf, MAX_HESRESP); + if (n < 0 || n > MAX_HESRESP) { + printf("%s %d %d %d\n", name, errno, h_errno, n); + errno = ECONNREFUSED; /* XXX */ + return NULL; + } + + printf(":::: %d\n", __LINE__); + /* Parse the header of the result. */ + hp = (HEADER *) (void *) abuf; + ancount = ntohs(hp->ancount); + qdcount = ntohs(hp->qdcount); + p = abuf + sizeof(HEADER); + eom = abuf + n; + + printf(":::: %d\n", __LINE__); + /* + * Skip questions, trying to get to the answer section + * which follows. + */ + for (i = 0; i < qdcount; i++) { + skip = dn_skipname(p, eom); + if (skip < 0 || p + skip + QFIXEDSZ > eom) { + errno = EMSGSIZE; + return NULL; + } + p += skip + QFIXEDSZ; + } + + printf(":::: %d\n", __LINE__); + /* Allocate space for the text record answers. */ + list = malloc((ancount + 1) * sizeof(char *)); + if (!list) { + errno = ENOMEM; + return NULL; + } + /* Parse the answers. */ + j = 0; + for (i = 0; i < ancount; i++) { + /* Parse the header of this answer. */ + skip = dn_skipname(p, eom); + if (skip < 0 || p + skip + 10 > eom) + break; + type = p[skip + 0] << 8 | p[skip + 1]; + class = p[skip + 2] << 8 | p[skip + 3]; + len = p[skip + 8] << 8 | p[skip + 9]; + p += skip + 10; + if (p + len > eom) { + errno = EMSGSIZE; + break; + } + /* Skip entries of the wrong class and type. */ + if (class != qclass || type != T_TXT) { + p += len; + continue; + } + /* Allocate space for this answer. */ + list[j] = malloc((size_t)len); + if (!list[j]) { + errno = ENOMEM; + break; + } + dst = list[j++]; + + /* Copy answer data into the allocated area. */ + eor = p + len; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 29 17:23:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8393F16A553; Thu, 29 Jun 2006 17:23:18 +0000 (UTC) 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 46ADF16A53D for ; Thu, 29 Jun 2006 17:23:18 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 442AC440A3 for ; Thu, 29 Jun 2006 16:53:56 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5TGruQ5087911 for ; Thu, 29 Jun 2006 16:53:56 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5TGrtsU087908 for perforce@freebsd.org; Thu, 29 Jun 2006 16:53:55 GMT (envelope-from imp@freebsd.org) Date: Thu, 29 Jun 2006 16:53:55 GMT Message-Id: <200606291653.k5TGrtsU087908@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 100295 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, 29 Jun 2006 17:23:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=100295 Change 100295 by imp@imp_lighthouse on 2006/06/29 16:53:11 Better names. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#12 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pio.c#12 (text+ko) ==== @@ -105,7 +105,26 @@ static int at91_pio_probe(device_t dev) { - device_set_desc(dev, "PIO"); + const char *name; + + switch (device_get_unit(dev)) { + case 0: + name = "PIOA"; + break; + case 1: + name = "PIOB"; + break; + case 2: + name = "PIOC"; + break; + case 3: + name = "PIOD"; + break; + default: + name = "PIO"; + break; + } + device_set_desc(dev, name); return (0); } From owner-p4-projects@FreeBSD.ORG Thu Jun 29 17:29:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E787716A4C2; Thu, 29 Jun 2006 17:29:44 +0000 (UTC) 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 C198C16A494 for ; Thu, 29 Jun 2006 17:29:44 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B14BE43D6B for ; Thu, 29 Jun 2006 17:29:42 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5THTgVN098548 for ; Thu, 29 Jun 2006 17:29:42 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5THTgqp098545 for perforce@freebsd.org; Thu, 29 Jun 2006 17:29:42 GMT (envelope-from clem1@FreeBSD.org) Date: Thu, 29 Jun 2006 17:29:42 GMT Message-Id: <200606291729.k5THTgqp098545@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 100301 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, 29 Jun 2006 17:29:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=100301 Change 100301 by clem1@clem1_ipv6vulns on 2006/06/29 17:29:40 Some pythons that test fragmentation processing of ipv6 stacks. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/samples/frag6/DESCRIPTION#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/samples/frag6/frag-ping6.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/samples/frag6/multifrag.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/samples/frag6/newrose.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/samples/frag6/pingevade.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/samples/frag6/rose.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/samples/frag6/sillyfrag.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/samples/frag6/udpevade.py#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 29 18:51:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 487C916A492; Thu, 29 Jun 2006 18:51:00 +0000 (UTC) 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 01C9B16A47C for ; Thu, 29 Jun 2006 18:51:00 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 712CE44007 for ; Thu, 29 Jun 2006 18:47:20 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5TIlKCf004185 for ; Thu, 29 Jun 2006 18:47:20 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5TIlKr8004182 for perforce@freebsd.org; Thu, 29 Jun 2006 18:47:20 GMT (envelope-from als@FreeBSD.org) Date: Thu, 29 Jun 2006 18:47:20 GMT Message-Id: <200606291847.k5TIlKr8004182@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100305 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, 29 Jun 2006 18:51:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=100305 Change 100305 by als@als_head on 2006/06/29 18:46:45 move jresource(8) into rigth place. add jifconfig(8) man. Affected files ... .. //depot/projects/jail2/j2_tools/jnetwork/jifconfig.8#1 add .. //depot/projects/jail2/j2_tools/jnetwork/jresource.8#2 delete .. //depot/projects/jail2/j2_tools/jresource/jresource.8#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 29 18:54:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2362916A412; Thu, 29 Jun 2006 18:54:00 +0000 (UTC) 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 D982416A50B for ; Thu, 29 Jun 2006 18:53:59 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D10F7447F4 for ; Thu, 29 Jun 2006 18:23:55 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5TINpVx002940 for ; Thu, 29 Jun 2006 18:23:51 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5TINp5s002937 for perforce@freebsd.org; Thu, 29 Jun 2006 18:23:51 GMT (envelope-from als@FreeBSD.org) Date: Thu, 29 Jun 2006 18:23:51 GMT Message-Id: <200606291823.k5TINp5s002937@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100304 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, 29 Jun 2006 18:54:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=100304 Change 100304 by als@als_head on 2006/06/29 18:22:59 first variant of jresource man page. Affected files ... .. //depot/projects/jail2/j2_tools/jnetwork/jresource.8#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 29 20:44:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FCCA16A49E; Thu, 29 Jun 2006 20:44:51 +0000 (UTC) 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 C778C16A403 for ; Thu, 29 Jun 2006 20:44:50 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CAB243D55 for ; Thu, 29 Jun 2006 20:44:50 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5TKioBj012079 for ; Thu, 29 Jun 2006 20:44:50 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5TKio1S012076 for perforce@freebsd.org; Thu, 29 Jun 2006 20:44:50 GMT (envelope-from imp@freebsd.org) Date: Thu, 29 Jun 2006 20:44:50 GMT Message-Id: <200606292044.k5TKio1S012076@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 100311 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, 29 Jun 2006 20:44:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=100311 Change 100311 by imp@imp_lighthouse on 2006/06/29 20:44:15 We can't write or set commands for boot, so don't bother including them. This saves 800 bytes! Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.c#4 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#12 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.c#4 (text+ko) ==== @@ -73,68 +73,6 @@ /* * .KB_C_FN_DEFINITION_START - * void WriteCommandTable(void) - * This global function write the current command table to the non-volatile - * memory. - * .KB_C_FN_DEFINITION_END - */ -void -WriteCommandTable(void) -{ - int i, size = MAX_ENV_SIZE_BYTES, copySize; - char *cPtr = env_table; - - p_memset(env_table, 0, sizeof(env_table)); - - for (i = 0; i < MAX_BOOT_COMMANDS; ++i) { - - copySize = p_strlen(boot_commands[i]); - size -= copySize + 1; - - if (size < 0) { - continue; - } - p_memcpy(cPtr, boot_commands[i], copySize); - cPtr += copySize; - *cPtr++ = 0; - } - - WriteEEPROM((unsigned)&BootCommandSection, env_table, - sizeof(env_table)); -} - - -/* - * .KB_C_FN_DEFINITION_START - * void SetBootCommand(int index, char *command) - * This global function replaces the specified index with the string residing - * at command. Execute this function with a NULL string to clear the - * associated command index. - * .KB_C_FN_DEFINITION_END - */ -void -SetBootCommand(int index, char *command) -{ - int i; - - if ((unsigned)index < MAX_BOOT_COMMANDS) { - - p_memset(boot_commands[index], 0, MAX_INPUT_SIZE); - - if (!command) - return ; - - for (i = 0; i < MAX_INPUT_SIZE; ++i) { - boot_commands[index][i] = command[i]; - if (!(boot_commands[index][i])) - return; - } - } -} - - -/* - * .KB_C_FN_DEFINITION_START * void DumpBootCommands(void) * This global function displays the current boot commands. * .KB_C_FN_DEFINITION_END ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#12 (text+ko) ==== @@ -56,9 +56,7 @@ {COMMAND_LOCAL_IP, "ip"}, {COMMAND_MAC, "m"}, {COMMAND_SERVER_IP, "server_ip"}, - {COMMAND_SET, "s"}, {COMMAND_TFTP, "tftp"}, - {COMMAND_WRITE, "w"}, {COMMAND_XMODEM, "x"}, {COMMAND_RESET, "R"}, {COMMAND_LOAD_SPI_KERNEL, "k"}, @@ -135,26 +133,6 @@ /* * .KB_C_FN_DEFINITION_START - * void RestoreSpace(int) - * This private function restores NULL characters to spaces in order to - * process the remaining args as a string. The number passed is the argc - * of the first entry to begin restoring space in the inputBuffer. - * .KB_C_FN_DEFINITION_END - */ -static void -RestoreSpace(int startArgc) -{ - char *cPtr; - - for (startArgc++; startArgc < MAX_COMMAND_PARAMS; startArgc++) { - if ((cPtr = argv[startArgc])) - *(cPtr - 1) = ' '; - } -} - - -/* - * .KB_C_FN_DEFINITION_START * int BreakCommand(char *) * This private function splits the buffer into separate strings as pointed * by argv and returns the number of parameters (< 0 on failure). @@ -301,25 +279,6 @@ break; } - case COMMAND_SET: - { - // s - // set the boot command at index (0-based) - unsigned index; - - if (argc > 1) { - RestoreSpace(2); - index = p_ASCIIToHex(argv[1]); - SetBootCommand(index, argv[2]); - } - break; - } - - case COMMAND_WRITE: - // write the command table to non-volatile - WriteCommandTable(); - break; - case COMMAND_LOAD_SPI_KERNEL: // "k

" if (argc > 1) From owner-p4-projects@FreeBSD.ORG Thu Jun 29 20:49:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBDAD16A417; Thu, 29 Jun 2006 20:49:01 +0000 (UTC) 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 A6DF016A407 for ; Thu, 29 Jun 2006 20:49:01 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33CE343DB5 for ; Thu, 29 Jun 2006 20:48:56 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5TKmuF0020071 for ; Thu, 29 Jun 2006 20:48:56 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5TKmuaQ020068 for perforce@freebsd.org; Thu, 29 Jun 2006 20:48:56 GMT (envelope-from imp@freebsd.org) Date: Thu, 29 Jun 2006 20:48:56 GMT Message-Id: <200606292048.k5TKmuaQ020068@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 100313 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, 29 Jun 2006 20:49:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=100313 Change 100313 by imp@imp_lighthouse on 2006/06/29 20:48:51 Set number of stop bits correctly, or at least more correctly, rather than always setting it to 2. We note that it appears that the only time 1.5 stop bits were used was on 5-bit BAUDOT, so if 2 stop bits are requested, use 1.5 bits for 5-bit characters. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#32 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#32 (text+ko) ==== @@ -160,16 +160,19 @@ } /* - * Or in the stop bits. Note: The hardware supports - * 1.5 stop bits in async mode, but there's no way to - * specify that AFAICT. + * Or in the stop bits. Note: The hardware supports 1.5 stop + * bits in async mode, but there's no way to specify that + * AFAICT. Instead, rely on the convention documented at + * http://www.lammertbies.nl/comm/info/RS-232_specs.html which + * states that 1.5 stop bits are used for 5 bit bytes and + * 2 stop bits only for longer bytes. */ - if (stopbits > 1) + if (stopbits == 1) + mr |= USART_MR_NBSTOP_1; + else if (databits > 5) mr |= USART_MR_NBSTOP_2; else - mr |= USART_MR_NBSTOP_2; - /* else if (stopbits == 1.5) - mr |= USART_MR_NBSTOP_1_5; */ + mr |= USART_MR_NBSTOP_1_5; /* * We want normal plumbing mode too, none of this fancy From owner-p4-projects@FreeBSD.ORG Thu Jun 29 20:55:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B917416A415; Thu, 29 Jun 2006 20:55:05 +0000 (UTC) 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 950F216A40F for ; Thu, 29 Jun 2006 20:55:05 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44F4843D92 for ; Thu, 29 Jun 2006 20:55:05 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5TKt5b9020295 for ; Thu, 29 Jun 2006 20:55:05 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5TKt49o020292 for perforce@freebsd.org; Thu, 29 Jun 2006 20:55:04 GMT (envelope-from imp@freebsd.org) Date: Thu, 29 Jun 2006 20:55:04 GMT Message-Id: <200606292055.k5TKt49o020292@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 100314 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, 29 Jun 2006 20:55:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=100314 Change 100314 by imp@imp_lighthouse on 2006/06/29 20:54:39 eeprom.h not needed and gone. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.c#10 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#11 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/main.c#12 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.c#5 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#13 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/eeprom.h#5 delete Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.c#10 (text+ko) ==== @@ -22,7 +22,6 @@ #include "env_vars.h" #include "loader_prompt.h" -#include "eeprom.h" #include "lib.h" /******************************* GLOBALS *************************************/ ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#11 (text+ko) ==== @@ -23,7 +23,6 @@ *****************************************************************************/ #include "at91rm9200_lowlevel.h" -#include "eeprom.h" #ifdef SUPPORT_TAG_LIST #include "tag_list.h" #endif ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/main.c#12 (text+ko) ==== @@ -27,7 +27,6 @@ #include "loader_prompt.h" #include "emac.h" #include "lib.h" -#include "eeprom.h" /* * .KB_C_FN_DEFINITION_START ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.c#5 (text+ko) ==== @@ -22,7 +22,6 @@ #include "env_vars.h" #include "loader_prompt.h" -#include "eeprom.h" #include "lib.h" /******************************* GLOBALS *************************************/ ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#13 (text+ko) ==== @@ -24,7 +24,6 @@ #include "at91rm9200_lowlevel.h" #include "at91rm9200.h" -#include "eeprom.h" #include "emac.h" #include "loader_prompt.h" #include "env_vars.h" From owner-p4-projects@FreeBSD.ORG Thu Jun 29 21:23:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5604C16A47C; Thu, 29 Jun 2006 21:23:36 +0000 (UTC) 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 18C8816A416 for ; Thu, 29 Jun 2006 21:23:36 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 076E544EDD for ; Thu, 29 Jun 2006 21:23:33 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5TLNXvQ023135 for ; Thu, 29 Jun 2006 21:23:33 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5TLMeSK023092 for perforce@freebsd.org; Thu, 29 Jun 2006 21:22:40 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 29 Jun 2006 21:22:40 GMT Message-Id: <200606292122.k5TLMeSK023092@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 100318 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, 29 Jun 2006 21:23:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=100318 Change 100318 by mjacob@mjacob_feral on 2006/06/29 21:21:51 Integrate from top of vendor branch. Affected files ... .. //depot/projects/mjscratch/Makefile.inc1#3 integrate .. //depot/projects/mjscratch/README#2 integrate .. //depot/projects/mjscratch/UPDATING#2 integrate .. //depot/projects/mjscratch/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/mjscratch/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/mjscratch/bin/sh/cd.c#2 integrate .. //depot/projects/mjscratch/bin/sh/eval.c#2 integrate .. //depot/projects/mjscratch/bin/sh/sh.1#2 integrate .. //depot/projects/mjscratch/bin/sh/var.c#2 integrate .. //depot/projects/mjscratch/bin/sh/var.h#2 integrate .. //depot/projects/mjscratch/contrib/binutils/bfd/elf64-sparc.c#2 integrate .. //depot/projects/mjscratch/contrib/file/ChangeLog#2 integrate .. //depot/projects/mjscratch/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/amigaos#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/animation#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/apple#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/archive#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/audio#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/basis#1 branch .. //depot/projects/mjscratch/contrib/file/Magdir/bflt#1 branch .. //depot/projects/mjscratch/contrib/file/Magdir/bout#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/btsnoop#1 branch .. //depot/projects/mjscratch/contrib/file/Magdir/c64#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/cad#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/commands#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/compress#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/console#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/cracklib#1 branch .. //depot/projects/mjscratch/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/database#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/diff#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/digital#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/dump#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/elf#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/flash#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/iff#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/images#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/java#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/linux#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/mach#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/maple#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/mup#1 branch .. //depot/projects/mjscratch/contrib/file/Magdir/ncr#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/perl#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/printer#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/psion#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/python#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/riff#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/scientific#1 branch .. //depot/projects/mjscratch/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/sql#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/varied.out#2 integrate .. //depot/projects/mjscratch/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/mjscratch/contrib/file/Makefile.am#2 integrate .. //depot/projects/mjscratch/contrib/file/Makefile.in#2 integrate .. //depot/projects/mjscratch/contrib/file/aclocal.m4#2 integrate .. //depot/projects/mjscratch/contrib/file/apprentice.c#2 integrate .. //depot/projects/mjscratch/contrib/file/ascmagic.c#2 integrate .. //depot/projects/mjscratch/contrib/file/compress.c#2 integrate .. //depot/projects/mjscratch/contrib/file/config.h.in#2 integrate .. //depot/projects/mjscratch/contrib/file/configure#2 integrate .. //depot/projects/mjscratch/contrib/file/configure.in#2 integrate .. //depot/projects/mjscratch/contrib/file/file.c#2 integrate .. //depot/projects/mjscratch/contrib/file/file.h#2 integrate .. //depot/projects/mjscratch/contrib/file/file.man#2 integrate .. //depot/projects/mjscratch/contrib/file/fsmagic.c#2 integrate .. //depot/projects/mjscratch/contrib/file/funcs.c#2 integrate .. //depot/projects/mjscratch/contrib/file/libmagic.man#2 integrate .. //depot/projects/mjscratch/contrib/file/magic.c#2 integrate .. //depot/projects/mjscratch/contrib/file/magic.man#2 integrate .. //depot/projects/mjscratch/contrib/file/magic.mime#2 integrate .. //depot/projects/mjscratch/contrib/file/magic2mime#2 integrate .. //depot/projects/mjscratch/contrib/file/patchlevel.h#2 integrate .. //depot/projects/mjscratch/contrib/file/print.c#2 integrate .. //depot/projects/mjscratch/contrib/file/readelf.c#2 integrate .. //depot/projects/mjscratch/contrib/file/readelf.h#2 integrate .. //depot/projects/mjscratch/contrib/file/softmagic.c#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/FREEBSD-upgrade#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/Makefile.am#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/README#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/TODO#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/VERSION#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/bin/Makefile.am#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/bin/auditfilterd/Makefile.am#1 branch .. //depot/projects/mjscratch/contrib/openbsm/bin/auditfilterd/Makefile.in#1 branch .. //depot/projects/mjscratch/contrib/openbsm/bin/auditfilterd/auditfilterd.8#1 branch .. //depot/projects/mjscratch/contrib/openbsm/bin/auditfilterd/auditfilterd.c#1 branch .. //depot/projects/mjscratch/contrib/openbsm/bin/auditfilterd/auditfilterd.h#1 branch .. //depot/projects/mjscratch/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#1 branch .. //depot/projects/mjscratch/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/bsm/Makefile.am#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/bsm/audit.h#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/bsm/audit_filter.h#1 branch .. //depot/projects/mjscratch/contrib/openbsm/bsm/audit_kevents.h#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/bsm/audit_record.h#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/configure#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/etc/audit_filter#1 branch .. //depot/projects/mjscratch/contrib/openbsm/libbsm/Makefile.am#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/libbsm/au_open.3#1 branch .. //depot/projects/mjscratch/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/libbsm/audit_submit.3#1 branch .. //depot/projects/mjscratch/contrib/openbsm/libbsm/bsm_audit.c#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/man/auditctl.2#2 integrate .. //depot/projects/mjscratch/contrib/openbsm/modules/Makefile.am#1 branch .. //depot/projects/mjscratch/contrib/openbsm/modules/Makefile.in#1 branch .. //depot/projects/mjscratch/contrib/openbsm/modules/auditfilter_noop/Makefile.am#1 branch .. //depot/projects/mjscratch/contrib/openbsm/modules/auditfilter_noop/Makefile.in#1 branch .. //depot/projects/mjscratch/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#1 branch .. //depot/projects/mjscratch/contrib/openbsm/test/Makefile.am#1 branch .. //depot/projects/mjscratch/contrib/openbsm/test/Makefile.in#1 branch .. //depot/projects/mjscratch/contrib/openbsm/test/bsm/Makefile.am#1 branch .. //depot/projects/mjscratch/contrib/openbsm/test/bsm/Makefile.in#1 branch .. //depot/projects/mjscratch/contrib/openbsm/test/bsm/generate.c#1 branch .. //depot/projects/mjscratch/contrib/pf/man/pfsync.4#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/cf/README#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/cf/cf/submit.mc#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/cf/feature/dnsbl.m4#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/libsm/t-memstat.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/README#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/bf.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/domain.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/helpfile#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/mci.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/sfsasl.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/sfsasl.h#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/tls.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/mjscratch/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/mjscratch/contrib/tcpdump/tcpdump.1#2 integrate .. //depot/projects/mjscratch/contrib/traceroute/traceroute.8#2 integrate .. //depot/projects/mjscratch/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/mjscratch/crypto/openssh/config.h#2 integrate .. //depot/projects/mjscratch/crypto/openssh/loginrec.c#2 integrate .. //depot/projects/mjscratch/etc/defaults/rc.conf#3 integrate .. //depot/projects/mjscratch/etc/periodic/daily/470.status-named#2 integrate .. //depot/projects/mjscratch/etc/rc.d/abi#2 integrate .. //depot/projects/mjscratch/etc/rc.d/auditd#2 integrate .. //depot/projects/mjscratch/etc/rc.d/cached#2 integrate .. //depot/projects/mjscratch/etc/rc.d/ldconfig#2 integrate .. //depot/projects/mjscratch/etc/rc.subr#3 integrate .. //depot/projects/mjscratch/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/mjscratch/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/mjscratch/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/mjscratch/gnu/lib/libgcc_r/Makefile#2 delete .. //depot/projects/mjscratch/lib/libbsm/Makefile#2 integrate .. //depot/projects/mjscratch/lib/libc/gen/glob.c#3 integrate .. //depot/projects/mjscratch/lib/libc/i386/gen/_ctx_start.S#2 integrate .. //depot/projects/mjscratch/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/mjscratch/lib/libc/stdlib/tsearch.3#2 integrate .. //depot/projects/mjscratch/lib/libc/string/strlcpy.c#2 integrate .. //depot/projects/mjscratch/lib/libc/sys/mincore.2#2 integrate .. //depot/projects/mjscratch/lib/libc/sys/stat.2#2 integrate .. //depot/projects/mjscratch/lib/libfetch/ftp.c#2 integrate .. //depot/projects/mjscratch/lib/libkvm/kvm_minidump_amd64.c#2 integrate .. //depot/projects/mjscratch/lib/libkvm/kvm_minidump_i386.c#2 integrate .. //depot/projects/mjscratch/lib/libmagic/Makefile#2 integrate .. //depot/projects/mjscratch/lib/libmagic/config.h#2 integrate .. //depot/projects/mjscratch/lib/libpthread/thread/thr_private.h#2 integrate .. //depot/projects/mjscratch/lib/libpthread/thread/thr_sig.c#2 integrate .. //depot/projects/mjscratch/lib/libpthread/thread/thr_sigaction.c#2 integrate .. //depot/projects/mjscratch/lib/libsdp/sdp.h#2 integrate .. //depot/projects/mjscratch/lib/libsdp/util.c#2 integrate .. //depot/projects/mjscratch/lib/libutil/Makefile#3 integrate .. //depot/projects/mjscratch/lib/libutil/login_class.3#2 integrate .. //depot/projects/mjscratch/lib/libutil/pidfile.c#2 integrate .. //depot/projects/mjscratch/libexec/ftpd/Makefile#2 integrate .. //depot/projects/mjscratch/libexec/ftpd/ftpcmd.y#2 integrate .. //depot/projects/mjscratch/release/Makefile#2 integrate .. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#2 integrate .. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate .. //depot/projects/mjscratch/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/mjscratch/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 integrate .. //depot/projects/mjscratch/sbin/devfs/devfs.c#2 integrate .. //depot/projects/mjscratch/sbin/fdisk/fdisk.c#2 integrate .. //depot/projects/mjscratch/sbin/ffsinfo/ffsinfo.8#2 integrate .. //depot/projects/mjscratch/sbin/geom/class/eli/geli.8#2 integrate .. //depot/projects/mjscratch/sbin/geom/class/eli/geom_eli.c#2 integrate .. //depot/projects/mjscratch/sbin/ggate/ggatec/ggatec.8#2 integrate .. //depot/projects/mjscratch/sbin/gpt/add.c#2 integrate .. //depot/projects/mjscratch/sbin/gpt/gpt.8#2 integrate .. //depot/projects/mjscratch/sbin/gpt/gpt.c#2 integrate .. //depot/projects/mjscratch/sbin/gpt/gpt.h#2 integrate .. //depot/projects/mjscratch/sbin/gpt/label.c#2 integrate .. //depot/projects/mjscratch/sbin/gpt/remove.c#2 integrate .. //depot/projects/mjscratch/sbin/gpt/show.c#2 integrate .. //depot/projects/mjscratch/sbin/ifconfig/Makefile#2 integrate .. //depot/projects/mjscratch/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/mjscratch/sbin/ifconfig/ifgroup.c#1 branch .. //depot/projects/mjscratch/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/mjscratch/sbin/ifconfig/ifpfsync.c#2 integrate .. //depot/projects/mjscratch/sbin/init/init.c#2 integrate .. //depot/projects/mjscratch/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/mjscratch/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/mjscratch/sbin/mount/mount.c#3 integrate .. //depot/projects/mjscratch/share/examples/scsi_target/scsi_cmds.c#2 edit .. //depot/projects/mjscratch/share/examples/scsi_target/scsi_target.c#2 edit .. //depot/projects/mjscratch/share/examples/scsi_target/scsi_target.h#2 edit .. //depot/projects/mjscratch/share/man/man4/Makefile#3 integrate .. //depot/projects/mjscratch/share/man/man4/aac.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/acpi.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/adv.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/adw.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/altq.4#3 integrate .. //depot/projects/mjscratch/share/man/man4/amd.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/amr.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/audit.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/auditpipe.4#1 branch .. //depot/projects/mjscratch/share/man/man4/bge.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/bt.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/carp.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/cpufreq.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/dpt.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/enc.4#1 branch .. //depot/projects/mjscratch/share/man/man4/esp.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/fast_ipsec.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/geom_fox.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/if_bridge.4#3 integrate .. //depot/projects/mjscratch/share/man/man4/iir.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/ips.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/man4.alpha/Makefile#2 delete .. //depot/projects/mjscratch/share/man/man4/man4.alpha/linux.4#2 delete .. //depot/projects/mjscratch/share/man/man4/man4.alpha/osf1.4#2 delete .. //depot/projects/mjscratch/share/man/man4/man4.i386/linux.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/man4.i386/padlock.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/mpt.4#3 integrate .. //depot/projects/mjscratch/share/man/man4/mxge.4#1 branch .. //depot/projects/mjscratch/share/man/man4/myri10ge.4#2 delete .. //depot/projects/mjscratch/share/man/man4/ncr.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/ncv.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/nfe.4#1 branch .. //depot/projects/mjscratch/share/man/man4/ng_tag.4#1 branch .. //depot/projects/mjscratch/share/man/man4/nsp.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/re.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/sched_4bsd.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/sched_core.4#1 branch .. //depot/projects/mjscratch/share/man/man4/sched_ule.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/snd_csa.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/snd_envy24.4#1 branch .. //depot/projects/mjscratch/share/man/man4/snd_gusc.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/snd_ich.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/snd_sbc.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/stg.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/sym.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/umodem.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/uplcom.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/uscanner.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/uvisor.4#2 integrate .. //depot/projects/mjscratch/share/man/man4/vinum.4#2 integrate .. //depot/projects/mjscratch/share/man/man5/mailer.conf.5#2 integrate .. //depot/projects/mjscratch/share/man/man7/build.7#3 integrate .. //depot/projects/mjscratch/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/mjscratch/share/man/man9/lock.9#2 integrate .. //depot/projects/mjscratch/share/man/man9/vflush.9#2 integrate .. //depot/projects/mjscratch/share/man/man9/vgone.9#2 integrate .. //depot/projects/mjscratch/share/mk/bsd.README#2 integrate .. //depot/projects/mjscratch/share/monetdef/pt_PT.ISO8859-1.src#2 integrate .. //depot/projects/mjscratch/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/mjscratch/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/mjscratch/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/mjscratch/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/mjscratch/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/mjscratch/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/mjscratch/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/mjscratch/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/mjscratch/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/mjscratch/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/mjscratch/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/mjscratch/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/mjscratch/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/mjscratch/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/mjscratch/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/mjscratch/sys/arm/arm/inckern.S#2 integrate .. //depot/projects/mjscratch/sys/arm/arm/locore.S#2 integrate .. //depot/projects/mjscratch/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/mjscratch/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/mjscratch/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/mjscratch/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/mjscratch/sys/arm/at91/files.at91#2 integrate .. //depot/projects/mjscratch/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/mjscratch/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/mjscratch/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/mjscratch/sys/arm/conf/KB920X#3 integrate .. //depot/projects/mjscratch/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/mjscratch/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/mjscratch/sys/arm/include/pmap.h#3 integrate .. //depot/projects/mjscratch/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/mjscratch/sys/arm/sa11x0/uart_cpu_sa1110.c#3 integrate .. //depot/projects/mjscratch/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/mjscratch/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/mjscratch/sys/boot/Makefile#2 integrate .. //depot/projects/mjscratch/sys/bsm/audit.h#2 integrate .. //depot/projects/mjscratch/sys/bsm/audit_record.h#2 integrate .. //depot/projects/mjscratch/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/mjscratch/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/mjscratch/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/mjscratch/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/mjscratch/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/mjscratch/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/mjscratch/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/mjscratch/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/mjscratch/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/mjscratch/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/mjscratch/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/mjscratch/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/mjscratch/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/mjscratch/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/mjscratch/sys/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/mjscratch/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/mjscratch/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/mjscratch/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/mjscratch/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/mjscratch/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/mjscratch/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/mjscratch/sys/compat/svr4/syscalls.master#2 integrate .. //depot/projects/mjscratch/sys/conf/Makefile.arm#3 integrate .. //depot/projects/mjscratch/sys/conf/NOTES#3 integrate .. //depot/projects/mjscratch/sys/conf/files#3 integrate .. //depot/projects/mjscratch/sys/conf/files.amd64#3 integrate .. //depot/projects/mjscratch/sys/conf/files.arm#2 integrate .. //depot/projects/mjscratch/sys/conf/files.i386#3 integrate .. //depot/projects/mjscratch/sys/conf/files.ia64#2 integrate .. //depot/projects/mjscratch/sys/conf/files.powerpc#2 integrate .. //depot/projects/mjscratch/sys/conf/kern.post.mk#2 integrate .. //depot/projects/mjscratch/sys/conf/options#3 integrate .. //depot/projects/mjscratch/sys/conf/options.arm#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/ah_soc.h#1 branch .. //depot/projects/mjscratch/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/ap30.hal.o.uu#1 branch .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/ap30.inc#1 branch .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/ap30.opt_ah.h#1 branch .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/ap43.hal.o.uu#1 branch .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/ap43.inc#1 branch .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/ap43.opt_ah.h#1 branch .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/ap51.hal.o.uu#1 branch .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/ap51.inc#1 branch .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/ap51.opt_ah.h#1 branch .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/ap61.hal.o.uu#1 branch .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/ap61.inc#1 branch .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/ap61.opt_ah.h#1 branch .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#1 branch .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/sparc-be-elf.inc#1 branch .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#1 branch .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/mjscratch/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/mjscratch/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/mjscratch/sys/ddb/db_sym.c#2 integrate .. //depot/projects/mjscratch/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/mjscratch/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/mjscratch/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/mjscratch/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/mjscratch/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/mjscratch/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/mjscratch/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/mjscratch/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/mjscratch/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/mjscratch/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/mjscratch/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/mjscratch/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/mjscratch/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/mjscratch/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/mjscratch/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/mjscratch/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/mjscratch/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/mjscratch/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/mjscratch/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/mjscratch/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/mjscratch/sys/dev/cm/if_cm_isa.c#2 integrate .. //depot/projects/mjscratch/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/mjscratch/sys/dev/cm/smc90cx6reg.h#2 integrate .. //depot/projects/mjscratch/sys/dev/cm/smc90cx6var.h#2 integrate .. //depot/projects/mjscratch/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/mjscratch/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/mjscratch/sys/dev/digi/digi.c#3 integrate .. //depot/projects/mjscratch/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/mjscratch/sys/dev/ed/if_ed_novell.c#2 integrate .. //depot/projects/mjscratch/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/mjscratch/sys/dev/em/if_em.c#2 integrate .. //depot/projects/mjscratch/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/mjscratch/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/mjscratch/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/mjscratch/sys/dev/isp/isp_freebsd.c#3 edit .. //depot/projects/mjscratch/sys/dev/isp/isp_freebsd.h#3 edit .. //depot/projects/mjscratch/sys/dev/isp/isp_pci.c#3 edit .. //depot/projects/mjscratch/sys/dev/isp/isp_sbus.c#2 edit .. //depot/projects/mjscratch/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/mjscratch/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/mjscratch/sys/dev/mfi/mfi_disk.c#3 integrate .. //depot/projects/mjscratch/sys/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/mjscratch/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/mjscratch/sys/dev/mfi/mfivar.h#3 integrate .. //depot/projects/mjscratch/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/mjscratch/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/mjscratch/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/mjscratch/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/mjscratch/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/mjscratch/sys/dev/mxge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/mjscratch/sys/dev/mxge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/mjscratch/sys/dev/mxge/if_mxge.c#1 branch .. //depot/projects/mjscratch/sys/dev/mxge/if_mxge_var.h#1 branch .. //depot/projects/mjscratch/sys/dev/mxge/mcp_gen_header.h#1 branch .. //depot/projects/mjscratch/sys/dev/mxge/mxge_mcp.h#1 branch .. //depot/projects/mjscratch/sys/dev/my/if_my.c#2 integrate .. //depot/projects/mjscratch/sys/dev/myri10ge/eth_z8e.dat.gz.uu#2 delete .. //depot/projects/mjscratch/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#2 delete .. //depot/projects/mjscratch/sys/dev/myri10ge/if_myri10ge.c#2 delete .. //depot/projects/mjscratch/sys/dev/myri10ge/if_myri10ge_var.h#2 delete .. //depot/projects/mjscratch/sys/dev/myri10ge/mcp_gen_header.h#2 delete .. //depot/projects/mjscratch/sys/dev/myri10ge/myri10ge_mcp.h#2 delete .. //depot/projects/mjscratch/sys/dev/nfe/if_nfe.c#1 branch .. //depot/projects/mjscratch/sys/dev/nfe/if_nfereg.h#1 branch .. //depot/projects/mjscratch/sys/dev/nfe/if_nfevar.h#1 branch .. //depot/projects/mjscratch/sys/dev/puc/puc.c#2 integrate .. //depot/projects/mjscratch/sys/dev/puc/puc_cfg.c#2 integrate .. //depot/projects/mjscratch/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/mjscratch/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/mjscratch/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/mjscratch/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/mjscratch/sys/dev/re/if_re.c#3 integrate .. //depot/projects/mjscratch/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/mjscratch/sys/dev/sound/driver.c#2 integrate .. //depot/projects/mjscratch/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/mjscratch/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/mjscratch/sys/dev/sound/pci/ak452x.c#1 branch .. //depot/projects/mjscratch/sys/dev/sound/pci/ak452x.h#1 branch .. //depot/projects/mjscratch/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/mjscratch/sys/dev/sound/pci/envy24.c#1 branch .. //depot/projects/mjscratch/sys/dev/sound/pci/envy24.h#1 branch .. //depot/projects/mjscratch/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/mjscratch/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/mjscratch/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/mjscratch/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/mjscratch/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/mjscratch/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/mjscratch/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/mjscratch/sys/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/mjscratch/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/mjscratch/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/mjscratch/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/mjscratch/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/mjscratch/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/mjscratch/sys/fs/procfs/procfs.c#3 integrate .. //depot/projects/mjscratch/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/mjscratch/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/mjscratch/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/mjscratch/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/mjscratch/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/mjscratch/sys/geom/eli/g_eli_integrity.c#1 branch .. //depot/projects/mjscratch/sys/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/mjscratch/sys/geom/eli/g_eli_privacy.c#1 branch .. //depot/projects/mjscratch/sys/geom/geom.h#2 integrate .. //depot/projects/mjscratch/sys/geom/geom_dev.c#2 integrate .. //depot/projects/mjscratch/sys/geom/geom_gpt.c#3 integrate .. //depot/projects/mjscratch/sys/geom/geom_io.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/support/debug.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/support/sv.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#1 branch .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#3 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#3 delete .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#3 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_acl.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_acl.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_ag.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_alloc.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_alloc.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_alloc_btree.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_alloc_btree.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_arch.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_attr.c#3 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_attr.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_attr_leaf.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_attr_leaf.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_attr_sf.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_behavior.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_behavior.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_bit.c#3 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_bit.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_bmap.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_bmap_btree.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_btree.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_btree.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_buf_item.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_buf_item.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_cap.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_clnt.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_da_btree.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_da_btree.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dfrag.c#3 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dfrag.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dinode.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir2.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir2.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir2_block.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir2_block.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir2_data.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir2_data.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir2_leaf.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir2_leaf.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir2_node.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir2_node.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir2_sf.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir2_sf.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir2_trace.c#3 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir2_trace.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir_leaf.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir_leaf.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir_sf.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dmapi.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dmops.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_error.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_error.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_extfree_item.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_extfree_item.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_fs.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_fsops.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_fsops.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_ialloc.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_ialloc_btree.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_ialloc_btree.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_iget.c#1 branch .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_imap.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_inode.c#3 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_inode.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_inode_item.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_inode_item.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_inum.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_iocore.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_iomap.c#3 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_iomap.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_itable.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_itable.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_log.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_log_priv.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_log_recover.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_mac.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_macros.c#2 delete .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_macros.h#2 delete .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_mount.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_mount.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_qmops.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_quota.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_refcache.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_refcache.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_rename.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_rtalloc.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_rw.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_rw.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_sb.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_trans.c#3 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_trans.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_trans_ail.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_trans_buf.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_trans_extfree.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_trans_inode.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_trans_item.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_trans_priv.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_trans_space.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_types.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_utils.c#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_utils.h#2 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_vfsops.c#3 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_vnodeops.c#3 integrate .. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfsidbg.c#2 integrate .. //depot/projects/mjscratch/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/mjscratch/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/mjscratch/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/mjscratch/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/mjscratch/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/mjscratch/sys/i386/conf/NOTES#3 integrate .. //depot/projects/mjscratch/sys/i386/conf/XBOX#2 integrate .. //depot/projects/mjscratch/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/mjscratch/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/mjscratch/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/mjscratch/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/mjscratch/sys/i386/i386/trap.c#2 integrate .. //depot/projects/mjscratch/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/mjscratch/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/mjscratch/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/mjscratch/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/mjscratch/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/mjscratch/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/mjscratch/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/mjscratch/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/mjscratch/sys/ia64/conf/SKI#2 integrate .. //depot/projects/mjscratch/sys/ia64/disasm/disasm.h#2 integrate .. //depot/projects/mjscratch/sys/ia64/disasm/disasm_decode.c#2 integrate .. //depot/projects/mjscratch/sys/ia64/disasm/disasm_extract.c#2 integrate .. //depot/projects/mjscratch/sys/ia64/disasm/disasm_format.c#2 integrate .. //depot/projects/mjscratch/sys/ia64/disasm/disasm_int.h#2 integrate .. //depot/projects/mjscratch/sys/ia64/ia64/emulate.c#1 branch .. //depot/projects/mjscratch/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/mjscratch/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/mjscratch/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/mjscratch/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/mjscratch/sys/isa/isa_common.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_acct.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_clock.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_event.c#3 integrate .. //depot/projects/mjscratch/sys/kern/kern_fork.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_linker.c#3 integrate .. //depot/projects/mjscratch/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_module.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_switch.c#3 integrate .. //depot/projects/mjscratch/sys/kern/kern_synch.c#3 integrate .. //depot/projects/mjscratch/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/mjscratch/sys/kern/kern_tc.c#2 integrate .. //depot/projects/mjscratch/sys/kern/link_elf.c#2 integrate .. //depot/projects/mjscratch/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/mjscratch/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/mjscratch/sys/kern/sched_core.c#1 branch .. //depot/projects/mjscratch/sys/kern/sched_ule.c#2 integrate .. //depot/projects/mjscratch/sys/kern/subr_bus.c#2 integrate .. //depot/projects/mjscratch/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/mjscratch/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/mjscratch/sys/kern/subr_rman.c#2 integrate .. //depot/projects/mjscratch/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/mjscratch/sys/kern/syscalls.master#2 integrate .. //depot/projects/mjscratch/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/mjscratch/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/mjscratch/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/mjscratch/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/mjscratch/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/mjscratch/sys/kern/uipc_socket2.c#2 integrate .. //depot/projects/mjscratch/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/mjscratch/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/mjscratch/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/mjscratch/sys/kern/vfs_init.c#2 integrate .. //depot/projects/mjscratch/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/mjscratch/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/mjscratch/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/mjscratch/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/mjscratch/sys/modules/Makefile#3 integrate .. //depot/projects/mjscratch/sys/modules/ath_hal/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/geom/geom_bde/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/geom/geom_eli/Makefile#3 integrate .. //depot/projects/mjscratch/sys/modules/if_bridge/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/mxge/Makefile#1 branch .. //depot/projects/mjscratch/sys/modules/mxge/mxge/Makefile#1 branch .. //depot/projects/mjscratch/sys/modules/mxge/mxge_eth_z8e/Makefile#1 branch .. //depot/projects/mjscratch/sys/modules/mxge/mxge_ethp_z8e/Makefile#1 branch .. //depot/projects/mjscratch/sys/modules/myri10ge/Makefile#2 delete .. //depot/projects/mjscratch/sys/modules/myri10ge/myri10ge/Makefile#2 delete .. //depot/projects/mjscratch/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#2 delete .. //depot/projects/mjscratch/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#2 delete .. //depot/projects/mjscratch/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/netgraph/tag/Makefile#1 branch .. //depot/projects/mjscratch/sys/modules/nfe/Makefile#1 branch .. //depot/projects/mjscratch/sys/modules/ppc/Makefile#1 branch .. //depot/projects/mjscratch/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/mjscratch/sys/modules/sound/driver/ak452x/Makefile#1 branch .. //depot/projects/mjscratch/sys/modules/sound/driver/envy24/Makefile#1 branch .. //depot/projects/mjscratch/sys/modules/xfs/Makefile#2 integrate .. //depot/projects/mjscratch/sys/net/bpf.c#3 integrate .. //depot/projects/mjscratch/sys/net/bpf.h#3 integrate .. //depot/projects/mjscratch/sys/net/if.c#3 integrate .. //depot/projects/mjscratch/sys/net/if.h#2 integrate .. //depot/projects/mjscratch/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/mjscratch/sys/net/if_bridge.c#3 integrate .. //depot/projects/mjscratch/sys/net/if_clone.c#2 integrate .. //depot/projects/mjscratch/sys/net/if_enc.c#1 branch .. //depot/projects/mjscratch/sys/net/if_gif.c#3 integrate .. //depot/projects/mjscratch/sys/net/if_stf.c#3 integrate .. //depot/projects/mjscratch/sys/net/if_tun.c#3 integrate .. //depot/projects/mjscratch/sys/net/if_types.h#2 integrate .. //depot/projects/mjscratch/sys/net/if_var.h#2 integrate .. //depot/projects/mjscratch/sys/net/if_vlan.c#2 integrate .. //depot/projects/mjscratch/sys/net/route.c#2 integrate .. //depot/projects/mjscratch/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/mjscratch/sys/netatalk/COPYRIGHT#2 integrate .. //depot/projects/mjscratch/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/mjscratch/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/mjscratch/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/mjscratch/sys/netgraph/ng_tag.c#1 branch .. //depot/projects/mjscratch/sys/netgraph/ng_tag.h#1 branch .. //depot/projects/mjscratch/sys/netinet/if_ether.c#2 integrate .. //depot/projects/mjscratch/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/mjscratch/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/mjscratch/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/mjscratch/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/mjscratch/sys/netinet/ip_output.c#3 integrate .. //depot/projects/mjscratch/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/mjscratch/sys/netinet/tcp_seq.h#2 integrate .. //depot/projects/mjscratch/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/mjscratch/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/mjscratch/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/mjscratch/sys/netinet6/in6.c#2 integrate .. //depot/projects/mjscratch/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/mjscratch/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/mjscratch/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/mjscratch/sys/netinet6/nd6.c#2 integrate .. //depot/projects/mjscratch/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/mjscratch/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/mjscratch/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/mjscratch/sys/netipsec/ipsec_osdep.h#2 integrate .. //depot/projects/mjscratch/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/mjscratch/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/mjscratch/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/mjscratch/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/mjscratch/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/mjscratch/sys/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/mjscratch/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/mjscratch/sys/nfsserver/nfsrvcache.h#2 integrate .. //depot/projects/mjscratch/sys/opencrypto/crypto.c#3 integrate .. //depot/projects/mjscratch/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/mjscratch/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/mjscratch/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/mjscratch/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/mjscratch/sys/pci/agp_i810.c#2 integrate .. //depot/projects/mjscratch/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/mjscratch/sys/posix4/ksched.c#3 integrate .. //depot/projects/mjscratch/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/mjscratch/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/mjscratch/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/mjscratch/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/mjscratch/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/mjscratch/sys/security/audit/audit.c#2 integrate .. //depot/projects/mjscratch/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/mjscratch/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/mjscratch/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/mjscratch/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/mjscratch/sys/security/audit/audit_ioctl.h#2 integrate .. //depot/projects/mjscratch/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/mjscratch/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/mjscratch/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/mjscratch/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/mjscratch/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/mjscratch/sys/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/mjscratch/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/mjscratch/sys/sparc64/include/_bus.h#2 integrate .. //depot/projects/mjscratch/sys/sparc64/include/bus.h#2 integrate .. //depot/projects/mjscratch/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/mjscratch/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/mjscratch/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/mjscratch/sys/sys/firmware.h#2 integrate .. //depot/projects/mjscratch/sys/sys/gpt.h#2 integrate .. //depot/projects/mjscratch/sys/sys/linker.h#2 integrate .. //depot/projects/mjscratch/sys/sys/protosw.h#2 integrate .. //depot/projects/mjscratch/sys/sys/rman.h#2 integrate .. //depot/projects/mjscratch/sys/sys/rwlock.h#2 integrate .. //depot/projects/mjscratch/sys/sys/sched.h#2 integrate .. //depot/projects/mjscratch/sys/sys/socketvar.h#2 integrate .. //depot/projects/mjscratch/sys/sys/sockio.h#2 integrate .. //depot/projects/mjscratch/sys/sys/sx.h#2 integrate .. //depot/projects/mjscratch/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/mjscratch/sys/sys/sysctl.h#2 integrate .. //depot/projects/mjscratch/sys/tools/fw_stub.awk#2 integrate .. //depot/projects/mjscratch/sys/vm/pmap.h#2 integrate .. //depot/projects/mjscratch/sys/vm/vm_fault.c#2 integrate .. //depot/projects/mjscratch/sys/vm/vm_map.c#3 integrate .. //depot/projects/mjscratch/sys/vm/vm_meter.c#3 integrate .. //depot/projects/mjscratch/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/mjscratch/sys/vm/vm_page.c#3 integrate .. //depot/projects/mjscratch/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/mjscratch/tools/regression/geom_eli/init-a.t#1 branch .. //depot/projects/mjscratch/tools/regression/geom_eli/init.t#2 integrate .. //depot/projects/mjscratch/tools/regression/geom_eli/integrity-copy.t#1 branch .. //depot/projects/mjscratch/tools/regression/geom_eli/integrity-data.t#1 branch .. //depot/projects/mjscratch/tools/regression/geom_eli/integrity-hmac.t#1 branch .. //depot/projects/mjscratch/tools/regression/geom_eli/onetime-a.t#1 branch .. //depot/projects/mjscratch/tools/regression/geom_eli/onetime.t#2 integrate .. //depot/projects/mjscratch/tools/tools/ath/athstats/athstats.c#2 integrate .. //depot/projects/mjscratch/tools/tools/ipw/Makefile#1 branch .. //depot/projects/mjscratch/tools/tools/ipw/ipwstats.c#1 branch .. //depot/projects/mjscratch/tools/tools/mfc/mfc.pl#2 integrate .. //depot/projects/mjscratch/usr.bin/calendar/calendars/calendar.freebsd#2 integrate .. //depot/projects/mjscratch/usr.bin/file/config.h#2 integrate .. //depot/projects/mjscratch/usr.bin/kdump/mkioctls#2 integrate .. //depot/projects/mjscratch/usr.bin/locate/locate/locate.c#2 integrate .. //depot/projects/mjscratch/usr.bin/top/machine.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/adduser/adduser.8#2 integrate .. //depot/projects/mjscratch/usr.sbin/asf/Makefile#2 integrate .. //depot/projects/mjscratch/usr.sbin/asf/asf.8#2 integrate .. //depot/projects/mjscratch/usr.sbin/asf/asf.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/asf/asf.h#1 branch .. //depot/projects/mjscratch/usr.sbin/asf/asf_kld.c#1 branch .. //depot/projects/mjscratch/usr.sbin/asf/asf_kvm.c#1 branch .. //depot/projects/mjscratch/usr.sbin/asf/asf_prog.c#1 branch .. //depot/projects/mjscratch/usr.sbin/config/config.y#2 integrate .. //depot/projects/mjscratch/usr.sbin/config/main.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/config/mkmakefile.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/config/mkoptions.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/cron/cron/do_command.c#3 integrate .. //depot/projects/mjscratch/usr.sbin/cron/cron/popen.c#3 integrate .. //depot/projects/mjscratch/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/mjscratch/usr.sbin/kgmon/kgmon.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/mailwrapper/Makefile#2 integrate .. //depot/projects/mjscratch/usr.sbin/mailwrapper/mailwrapper.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/mountd/mountd.c#3 integrate .. //depot/projects/mjscratch/usr.sbin/newsyslog/newsyslog.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/config.c#3 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/connect.c#3 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/debug.c#3 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/list.c#3 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/main.c#3 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/mkpeer.c#3 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/msg.c#3 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/name.c#3 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/rmhook.c#3 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/show.c#3 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/shutdown.c#3 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/status.c#3 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/types.c#3 integrate .. //depot/projects/mjscratch/usr.sbin/ngctl/write.c#3 integrate .. //depot/projects/mjscratch/usr.sbin/pkg_install/add/main.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/pkg_install/create/main.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/pkg_install/delete/main.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/pkg_install/info/main.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/pkg_install/lib/global.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/mjscratch/usr.sbin/pkg_install/version/main.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ypserv/Makefile.yp#2 integrate .. //depot/projects/mjscratch/usr.sbin/ypserv/yp_server.c#2 integrate .. //depot/projects/mjscratch/usr.sbin/ypserv/ypinit.8#2 integrate Differences ... ==== //depot/projects/mjscratch/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.547 2006/05/26 18:10:06 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.549 2006/06/06 18:07:58 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -468,6 +468,16 @@ buildworld: ${WMAKE_TGTS} .ORDER: ${WMAKE_TGTS} + +# +# We need to have this as a target because the indirection between Makefile +# and Makefile.inc1 causes the correct PATH to be used, rather than a +# modification of the current environment's PATH. In addition, we need +# to quote multiword values. +# +buildenvvars: + @echo ${WMAKEENV:Q} + buildenv: @echo Entering world for ${TARGET_ARCH}:${TARGET} @cd ${.CURDIR} && env ${WMAKEENV} sh || true ==== //depot/projects/mjscratch/README#2 (text+ko) ==== @@ -1,6 +1,6 @@ This is the top level of the FreeBSD source directory. This file was last revised on: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 29 23:14:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39F6E16AB64; Thu, 29 Jun 2006 23:14:44 +0000 (UTC) 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 107A316A623 for ; Thu, 29 Jun 2006 23:14:43 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36551443F4 for ; Thu, 29 Jun 2006 21:05:18 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5TL5IfY022090 for ; Thu, 29 Jun 2006 21:05:18 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5TL5HkW022087 for perforce@freebsd.org; Thu, 29 Jun 2006 21:05:17 GMT (envelope-from imp@freebsd.org) Date: Thu, 29 Jun 2006 21:05:17 GMT Message-Id: <200606292105.k5TL5HkW022087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 100315 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, 29 Jun 2006 23:14:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=100315 Change 100315 by imp@imp_lighthouse on 2006/06/29 21:04:46 Add support for multiple EEPROM devices on the iic bus. Or at least for devices not at address 0. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.c#11 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/eeprom.c#5 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#11 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.c#11 (text+ko) ==== @@ -98,7 +98,7 @@ *cPtr++ = 0; } - WriteEEPROM((unsigned)&BootCommandSection, env_table, + WriteEEPROM(0, (unsigned)&BootCommandSection, env_table, sizeof(env_table)); } ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/eeprom.c#5 (text+ko) ==== @@ -83,7 +83,7 @@ * .KB_C_FN_DEFINITION_END */ void -ReadEEPROM(unsigned ee_addr, char *data_addr, unsigned size) +ReadEEPROM(unsigned addr, unsigned ee_off, char *data_addr, unsigned size) { const AT91PS_TWI twiPtr = AT91C_BASE_TWI; unsigned int status; @@ -92,11 +92,11 @@ status = twiPtr->TWI_RHR; // Set the TWI Master Mode Register - twiPtr->TWI_MMR = (TWSI_EEPROM_ADDRESS << 16) | + twiPtr->TWI_MMR = ((TWSI_EEPROM_ADDRESS | addr) << 16) | AT91C_TWI_IADRSZ_2_BYTE | AT91C_TWI_MREAD; // Set TWI Internal Address Register - twiPtr->TWI_IADR = ee_addr; + twiPtr->TWI_IADR = ee_off; // Start transfer twiPtr->TWI_CR = AT91C_TWI_START; @@ -128,8 +128,8 @@ /* * .KB_C_FN_DEFINITION_START - * void WriteEEPROM(unsigned ee_addr, char *data_addr, unsigned size) - * This global function writes data to the eeprom at ee_addr using data + * void WriteEEPROM(unsigned ee_off, char *data_addr, unsigned size) + * This global function writes data to the eeprom at ee_off using data * from data_addr for size bytes. Assume the TWI has been initialized. * This function does not utilize the page write mode as the write time is * much greater than the time required to access the device for byte-write @@ -137,22 +137,22 @@ * .KB_C_FN_DEFINITION_END */ void -WriteEEPROM(unsigned ee_addr, char *data_addr, unsigned size) +WriteEEPROM(unsigned addr, unsigned ee_off, char *data_addr, unsigned size) { const AT91PS_TWI twiPtr = AT91C_BASE_TWI; unsigned status; char test_data; while (size--) { - if (!(ee_addr & 0x3f)) + if (!(ee_off & 0x3f)) putchar('.'); // Set the TWI Master Mode Register - twiPtr->TWI_MMR = ((TWSI_EEPROM_ADDRESS << 16) | + twiPtr->TWI_MMR = (((TWSI_EEPROM_ADDRESS | addr) << 16) | AT91C_TWI_IADRSZ_2_BYTE) & ~AT91C_TWI_MREAD; // Set TWI Internal Address Register - twiPtr->TWI_IADR = ee_addr++; + twiPtr->TWI_IADR = ee_off++; status = twiPtr->TWI_SR; @@ -173,7 +173,7 @@ continue; // wait for write operation to complete - ReadEEPROM(ee_addr, &test_data, 1); + ReadEEPROM(addr, ee_off, &test_data, 1); } putchar('\r'); ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#11 (text) ==== @@ -33,8 +33,9 @@ /* The following function write eeprom at ee_addr using data */ /* from data_add for size bytes. */ -void ReadEEPROM(unsigned ee_addr, char *data_addr, unsigned size); -void WriteEEPROM(unsigned ee_addr, char *data_addr, unsigned size); +void ReadEEPROM(unsigned addr, unsigned eeoff, char *data_addr, unsigned size); +void WriteEEPROM(unsigned addr, unsigned eeoff, char *data_addr, + unsigned size); void InitEEPROM(void); /* XMODEM protocol */ From owner-p4-projects@FreeBSD.ORG Fri Jun 30 00:17:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C6AF16A40F; Fri, 30 Jun 2006 00:17:06 +0000 (UTC) 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 E5ECB16A403 for ; Fri, 30 Jun 2006 00:17:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F5B34552A for ; Fri, 30 Jun 2006 00:17:05 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5U0H51e037025 for ; Fri, 30 Jun 2006 00:17:05 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5U0H5Kh037022 for perforce@freebsd.org; Fri, 30 Jun 2006 00:17:05 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 30 Jun 2006 00:17:05 GMT Message-Id: <200606300017.k5U0H5Kh037022@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100323 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, 30 Jun 2006 00:17:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=100323 Change 100323 by kmacy@kmacy_storage:sun4v_work_stable on 2006/06/30 00:16:09 IFC Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/uplcom.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/files.ia64#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/kern.mk#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/puc/puc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/puc/puc_cfg.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/ia64/emulate.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/sched_core.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/net/if.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/net/if_gif.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/net/if_stf.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/net/if_tun.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/net/if_vlan.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/netinet/if_ether.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/netinet/ip_output.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/netinet6/in6.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/usr.bin/tail/extern.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/usr.bin/tail/forward.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/usr.bin/tail/tail.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/usr.bin/tail/tail.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/usr.sbin/kgmon/kgmon.c#2 integrate Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/share/man/man4/uplcom.4#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uplcom.4,v 1.12 2005/07/16 09:18:58 hrs Exp $ +.\" $FreeBSD: src/share/man/man4/uplcom.4,v 1.13 2006/06/29 08:28:18 takawata Exp $ .\" .Dd July 16, 2005 .Dt UPLCOM 4 @@ -91,6 +91,8 @@ SOURCENEXT KeikaiDenwa 8 (with and without charger) .It Sony Ericsson USB Cable (Susteen USB Data Cable) +.It +Willcom W-SIM DD PHS terminal.(WS002IN) .El .Sh SEE ALSO .Xr tty 4 , ==== //depot/projects/kmacy_sun4v_stable/src/sys/conf/files.ia64#2 (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.ia64,v 1.86 2006/04/24 23:31:50 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.87 2006/06/29 19:59:16 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -93,6 +93,7 @@ ia64/ia64/dump_machdep.c standard ia64/ia64/efi.c standard ia64/ia64/elf_machdep.c standard +ia64/ia64/emulate.c standard ia64/ia64/exception.S standard ia64/ia64/gdb_machdep.c optional gdb ia64/ia64/in_cksum.c optional inet ==== //depot/projects/kmacy_sun4v_stable/src/sys/conf/kern.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.48 2006/05/30 19:18:01 ru Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.49 2006/06/29 21:15:25 obrien Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -12,7 +12,7 @@ .else CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - ${_wundef} -fformat-extensions -std=c99 + ${_wundef} -fformat-extensions .if !defined(NO_UNDEF) _wundef= -Wundef .endif ==== //depot/projects/kmacy_sun4v_stable/src/sys/conf/kern.pre.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.74 2005/12/12 01:14:59 rodrigc Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.75 2006/06/29 21:15:25 obrien Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -43,6 +43,7 @@ .if ${CC} == "icc" NOSTDINC= -X .else +C_DIALECT= -std=c99 NOSTDINC= -nostdinc .endif @@ -80,7 +81,7 @@ .endif -CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} +CFLAGS= ${COPTFLAGS} ${C_DIALECT} ${DEBUG} ${CWARNFLAGS} CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h .if ${CC} != "icc" CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/puc/puc.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.47 2006/04/28 21:21:52 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.48 2006/06/29 16:27:19 obrien Exp $"); #include #include @@ -42,9 +42,9 @@ #include #include -#include #include #include +#include #define PUC_ISRCCNT 5 ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/puc/puc_cfg.c#2 (text) ==== @@ -25,16 +25,16 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc_cfg.c,v 1.1 2006/04/28 21:21:52 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc_cfg.c,v 1.2 2006/06/29 16:27:19 obrien Exp $"); #include #include #include #include -#include #include #include +#include int puc_config(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port, intptr_t *r) ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/puc/puc_pccard.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pccard.c,v 1.10 2006/04/28 21:21:52 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pccard.c,v 1.11 2006/06/29 16:27:19 obrien Exp $"); #include #include @@ -41,8 +41,8 @@ #include +#include #include -#include /* http://www.argosy.com.tw/product/sp320.htm */ const struct puc_cfg puc_pccard_rscom = { ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/puc/puc_pci.c#2 (text+ko) ==== @@ -58,7 +58,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pci.c,v 1.15 2006/04/28 21:21:52 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pci.c,v 1.16 2006/06/29 16:27:19 obrien Exp $"); #include #include @@ -75,8 +75,8 @@ #include #include +#include #include -#include static const struct puc_cfg * puc_pci_match(device_t dev, const struct puc_cfg *desc) ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/puc/pucdata.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.56 2006/06/12 19:22:44 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.57 2006/06/29 16:27:19 obrien Exp $"); /* * PCI "universal" communications card driver configuration data (used to @@ -43,9 +43,9 @@ #include -#include #include #include +#include static puc_config_f puc_config_amc; static puc_config_f puc_config_cronyx; ==== //depot/projects/kmacy_sun4v_stable/src/sys/ia64/ia64/trap.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.118 2006/05/16 14:32:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.119 2006/06/29 19:59:17 marcel Exp $"); #include "opt_ddb.h" #include "opt_ktrace.h" @@ -608,7 +608,27 @@ break; } - case IA64_VEC_GENERAL_EXCEPTION: + case IA64_VEC_GENERAL_EXCEPTION: { + int code; + + if (!user) + trap_panic(vector, tf); + + code = tf->tf_special.isr & (IA64_ISR_CODE & 0xf0ull); + switch (code) { + case 0x0: /* Illegal Operation Fault. */ + sig = ia64_emulate(tf, td); + break; + default: + sig = SIGILL; + break; + } + if (sig == 0) + goto out; + ucode = vector; + break; + } + case IA64_VEC_NAT_CONSUMPTION: case IA64_VEC_SPECULATION: case IA64_VEC_UNSUPP_DATA_REFERENCE: ==== //depot/projects/kmacy_sun4v_stable/src/sys/ia64/include/md_var.h#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/sys/ia64/include/md_var.h,v 1.22 2005/07/05 17:12:18 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/md_var.h,v 1.23 2006/06/29 19:59:18 marcel Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -77,6 +77,7 @@ int do_ast(struct trapframe *); void ia32_trap(int, struct trapframe *); int ia64_count_cpus(void); +int ia64_emulate(struct trapframe *, struct thread *); int ia64_flush_dirty(struct thread *, struct _special *); uint64_t ia64_get_hcdp(void); int ia64_highfp_drop(struct thread *); ==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/sched_4bsd.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.83 2006/06/15 06:37:39 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.84 2006/06/29 19:37:31 obrien Exp $"); #include "opt_hwpmc_hooks.h" @@ -53,6 +53,7 @@ #include #include #include +#include #include #ifdef HWPMC_HOOKS ==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/sched_core.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_core.c,v 1.7 2006/06/29 05:59:36 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_core.c,v 1.9 2006/06/29 12:29:20 davidxu Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_sched.h" @@ -566,7 +566,7 @@ { kseq->ksq_load--; if ((ke->ke_proc->p_flag & P_NOLOAD) == 0) - sched_tdcnt++; + sched_tdcnt--; } /* @@ -875,11 +875,6 @@ ke->ke_runq = ke->ke_kseq->ksq_curr; krunq_add(ke->ke_runq, ke); } - /* - * Hold this kse on this cpu so that sched_prio() doesn't - * cause excessive migration. We only want migration to - * happen as the result of a wakeup. - */ adjustrunqueue(td, prio); } else td->td_priority = prio; @@ -962,6 +957,7 @@ mtx_assert(&sched_lock, MA_OWNED); + now = sched_timestamp(); ke = td->td_kse; kg = td->td_ksegrp; ksq = KSEQ_SELF(); @@ -974,6 +970,7 @@ if (td == PCPU_GET(idlethread)) { TD_SET_CAN_RUN(td); } else { + sched_update_runtime(ke, now); /* We are ending our run so make our slot available again */ SLOT_RELEASE(td->td_ksegrp); kseq_load_rem(ksq, ke); @@ -1004,16 +1001,14 @@ */ SLOT_USE(newtd->td_ksegrp); newtd->td_kse->ke_flags |= KEF_DIDRUN; + newtd->td_kse->ke_timestamp = now; TD_SET_RUNNING(newtd); kseq_load_add(ksq, newtd->td_kse); - now = newtd->td_kse->ke_timestamp = sched_timestamp(); } else { newtd = choosethread(); /* sched_choose sets ke_timestamp, just reuse it */ - now = newtd->td_kse->ke_timestamp; } if (td != newtd) { - sched_update_runtime(ke, now); ke->ke_lastran = tick; #ifdef HWPMC_HOOKS @@ -1079,9 +1074,9 @@ if (ke->ke_flags & KEF_SLEEP) { ke->ke_flags &= ~KEF_SLEEP; if (sched_is_timeshare(kg)) { + sched_commit_runtime(ke); + now = sched_timestamp(); kseq = KSEQ_CPU(td->td_lastcpu); - now = sched_timestamp(); - sched_commit_runtime(ke); #ifdef SMP if (kseq != mykseq) now = now - mykseq->ksq_last_timestamp + ==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/sysv_sem.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sysv_sem.c,v 1.80 2006/06/27 18:28:50 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sysv_sem.c,v 1.81 2006/06/29 13:58:36 jhb Exp $"); #include "opt_sysvipc.h" #include "opt_mac.h" @@ -591,6 +591,7 @@ struct semid_kernel *semakptr; struct mtx *sema_mtxp; u_short usval, count; + int semidx; DPRINTF(("call to semctl(%d, %d, %d, 0x%x)\n", semid, semnum, cmd, arg)); @@ -601,6 +602,10 @@ switch(cmd) { case SEM_STAT: + /* + * For this command we assume semid is an array index + * rather than an IPC id. + */ if (semid < 0 || semid >= seminfo.semmni) return (EINVAL); semakptr = &sema[semid]; @@ -632,12 +637,12 @@ return (error); } - semid = IPCID_TO_IX(semid); - if (semid < 0 || semid >= seminfo.semmni) + semidx = IPCID_TO_IX(semid); + if (semidx < 0 || semidx >= seminfo.semmni) return (EINVAL); - semakptr = &sema[semid]; - sema_mtxp = &sema_mtx[semid]; + semakptr = &sema[semidx]; + sema_mtxp = &sema_mtx[semidx]; #ifdef MAC mtx_lock(sema_mtxp); error = mac_check_sysv_semctl(cred, semakptr, cmd); @@ -674,7 +679,7 @@ mac_cleanup_sysv_sem(semakptr); #endif SEMUNDO_LOCK(); - semundo_clear(semid, -1); + semundo_clear(semidx, -1); SEMUNDO_UNLOCK(); wakeup(semakptr); break; @@ -804,7 +809,7 @@ } semakptr->u.sem_base[semnum].semval = arg->val; SEMUNDO_LOCK(); - semundo_clear(semid, semnum); + semundo_clear(semidx, semnum); SEMUNDO_UNLOCK(); wakeup(semakptr); break; @@ -847,7 +852,7 @@ semakptr->u.sem_base[i].semval = usval; } SEMUNDO_LOCK(); - semundo_clear(semid, -1); + semundo_clear(semidx, -1); SEMUNDO_UNLOCK(); wakeup(semakptr); break; ==== //depot/projects/kmacy_sun4v_stable/src/sys/net/if.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.259 2006/06/21 06:02:35 glebius Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.260 2006/06/29 19:22:04 yar Exp $ */ #include "opt_compat.h" @@ -581,12 +581,11 @@ struct ifaddr *ifa, *next; TAILQ_FOREACH_SAFE(ifa, &ifp->if_addrhead, ifa_link, next) { - - if (ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_LINK) + if (ifa->ifa_addr->sa_family == AF_LINK) continue; #ifdef INET /* XXX: Ugly!! ad hoc just for INET */ - if (ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_INET) { + if (ifa->ifa_addr->sa_family == AF_INET) { struct ifaliasreq ifr; bzero(&ifr, sizeof(ifr)); @@ -599,7 +598,7 @@ } #endif /* INET */ #ifdef INET6 - if (ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_INET6) { + if (ifa->ifa_addr->sa_family == AF_INET6) { in6_purgeaddr(ifa); /* ifp_addrhead is already updated */ continue; @@ -2404,8 +2403,7 @@ * the address change. */ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { - if (ifa->ifa_addr != NULL && - ifa->ifa_addr->sa_family == AF_INET) + if (ifa->ifa_addr->sa_family == AF_INET) arp_ifinit(ifp, ifa); } #endif ==== //depot/projects/kmacy_sun4v_stable/src/sys/net/if_atmsubr.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/if_atmsubr.c,v 1.41 2005/08/11 08:14:52 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/net/if_atmsubr.c,v 1.43 2006/06/29 19:22:04 yar Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -383,13 +383,12 @@ #if defined(__NetBSD__) || defined(__OpenBSD__) TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) #elif defined(__FreeBSD__) && (__FreeBSD__ > 2) - for (ifa = TAILQ_FIRST(&ifp->if_addrhead); ifa; - ifa = TAILQ_NEXT(ifa, ifa_link)) + TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) #elif defined(__FreeBSD__) || defined(__bsdi__) for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) #endif - if ((sdl = (struct sockaddr_dl *)ifa->ifa_addr) && - sdl->sdl_family == AF_LINK) { + if (ifa->ifa_addr->sa_family == AF_LINK) { + sdl = (struct sockaddr_dl *)ifa->ifa_addr; sdl->sdl_type = IFT_ATM; sdl->sdl_alen = ifp->if_addrlen; #ifdef notyet /* if using ATMARP, store hardware address using the next line */ ==== //depot/projects/kmacy_sun4v_stable/src/sys/net/if_gif.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/net/if_gif.c,v 1.60 2006/06/02 19:59:32 csjp Exp $ */ +/* $FreeBSD: src/sys/net/if_gif.c,v 1.61 2006/06/29 07:23:49 yar Exp $ */ /* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */ /*- @@ -916,13 +916,6 @@ if (odst) free((caddr_t)odst, M_IFADDR); - if (sc->gif_psrc && sc->gif_pdst) - ifp->if_drv_flags |= IFF_DRV_RUNNING; - else - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - - return 0; - bad: if (sc->gif_psrc && sc->gif_pdst) ifp->if_drv_flags |= IFF_DRV_RUNNING; @@ -953,9 +946,5 @@ #ifdef INET6 (void)in6_gif_detach(sc); #endif - - if (sc->gif_psrc && sc->gif_pdst) - ifp->if_drv_flags |= IFF_DRV_RUNNING; - else - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; } ==== //depot/projects/kmacy_sun4v_stable/src/sys/net/if_stf.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/net/if_stf.c,v 1.54 2006/06/02 19:59:32 csjp Exp $ */ +/* $FreeBSD: src/sys/net/if_stf.c,v 1.56 2006/06/29 19:22:04 yar Exp $ */ /* $KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $ */ /*- @@ -367,12 +367,7 @@ struct sockaddr_in6 *sin6; struct in_addr in; - for (ia = TAILQ_FIRST(&ifp->if_addrlist); - ia; - ia = TAILQ_NEXT(ia, ifa_list)) - { - if (ia->ifa_addr == NULL) - continue; + TAILQ_FOREACH(ia, &ifp->if_addrlist, ifa_list) { if (ia->ifa_addr->sa_family != AF_INET6) continue; sin6 = (struct sockaddr_in6 *)ia->ifa_addr; ==== //depot/projects/kmacy_sun4v_stable/src/sys/net/if_tun.c#3 (text+ko) ==== @@ -13,7 +13,7 @@ * UCL. This driver is based much more on read/write/poll mode of * operation though. * - * $FreeBSD: src/sys/net/if_tun.c,v 1.155 2006/06/02 19:59:32 csjp Exp $ + * $FreeBSD: src/sys/net/if_tun.c,v 1.157 2006/06/29 19:22:04 yar Exp $ */ #include "opt_atalk.h" @@ -393,29 +393,23 @@ ifp->if_drv_flags |= IFF_DRV_RUNNING; getmicrotime(&ifp->if_lastchange); - for (ifa = TAILQ_FIRST(&ifp->if_addrhead); ifa; - ifa = TAILQ_NEXT(ifa, ifa_link)) { - if (ifa->ifa_addr == NULL) - error = EFAULT; - /* XXX: Should maybe return straight off? */ - else { #ifdef INET - if (ifa->ifa_addr->sa_family == AF_INET) { - struct sockaddr_in *si; + TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { + if (ifa->ifa_addr->sa_family == AF_INET) { + struct sockaddr_in *si; - si = (struct sockaddr_in *)ifa->ifa_addr; - mtx_lock(&tp->tun_mtx); - if (si->sin_addr.s_addr) - tp->tun_flags |= TUN_IASET; + si = (struct sockaddr_in *)ifa->ifa_addr; + mtx_lock(&tp->tun_mtx); + if (si->sin_addr.s_addr) + tp->tun_flags |= TUN_IASET; - si = (struct sockaddr_in *)ifa->ifa_dstaddr; - if (si && si->sin_addr.s_addr) - tp->tun_flags |= TUN_DSTADDR; - mtx_unlock(&tp->tun_mtx); - } -#endif + si = (struct sockaddr_in *)ifa->ifa_dstaddr; + if (si && si->sin_addr.s_addr) + tp->tun_flags |= TUN_DSTADDR; + mtx_unlock(&tp->tun_mtx); } } +#endif return (error); } ==== //depot/projects/kmacy_sun4v_stable/src/sys/net/if_vlan.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_vlan.c,v 1.103 2006/06/21 13:48:34 yar Exp $ + * $FreeBSD: src/sys/net/if_vlan.c,v 1.105 2006/06/29 07:52:30 yar Exp $ */ /* @@ -105,17 +105,15 @@ #define PARENT(ifv) ((ifv)->ifv_trunk->parent) int ifv_pflags; /* special flags we have set on parent */ struct ifv_linkmib { - int ifvm_parent; int ifvm_encaplen; /* encapsulation length */ int ifvm_mtufudge; /* MTU fudged by this much */ int ifvm_mintu; /* min transmission unit */ - uint16_t ifvm_proto; /* encapsulation ethertype */ uint16_t ifvm_tag; /* tag to apply on packets leaving if */ } ifv_mib; - SLIST_HEAD(__vlan_mchead, vlan_mc_entry) vlan_mc_listhead; + SLIST_HEAD(, vlan_mc_entry) vlan_mc_listhead; LIST_ENTRY(ifvlan) ifv_list; }; -#define ifv_tag ifv_mib.ifvm_tag +#define ifv_tag ifv_mib.ifvm_tag #define ifv_encaplen ifv_mib.ifvm_encaplen #define ifv_mtufudge ifv_mib.ifvm_mtufudge #define ifv_mintu ifv_mib.ifvm_mintu @@ -177,7 +175,7 @@ static void trunk_destroy(struct ifvlantrunk *trunk); static void vlan_start(struct ifnet *ifp); -static void vlan_ifinit(void *foo); +static void vlan_init(void *foo); static void vlan_input(struct ifnet *ifp, struct mbuf *m); static int vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t addr); static int vlan_setflag(struct ifnet *ifp, int flag, int status, @@ -204,6 +202,7 @@ #ifndef VLAN_ARRAY #define HASH(n, m) ((((n) >> 8) ^ ((n) >> 4) ^ (n)) & (m)) + static void vlan_inithash(struct ifvlantrunk *trunk) { @@ -627,7 +626,7 @@ struct ifvlan *ifv; struct ifnet *ifp; struct ifnet *p; - u_char eaddr[6] = {0,0,0,0,0,0}; + static const u_char eaddr[6]; /* 00:00:00:00:00:00 */ if ((p = vlan_clone_match_ethertag(ifc, name, &tag)) != NULL) { ethertag = 1; @@ -685,7 +684,7 @@ ifp->if_linkmiblen = sizeof(ifv->ifv_mib); /* NB: mtu is not set here */ - ifp->if_init = vlan_ifinit; + ifp->if_init = vlan_init; ifp->if_start = vlan_start; ifp->if_ioctl = vlan_ioctl; ifp->if_snd.ifq_maxlen = ifqmaxlen; @@ -704,8 +703,8 @@ * out all the way, otherwise userland could get * confused. Thus, we destroy the interface. */ + ether_ifdetach(ifp); vlan_unconfig(ifp); - ether_ifdetach(ifp); if_free_type(ifp, IFT_ETHER); free(ifv, M_VLAN); @@ -723,18 +722,13 @@ static int vlan_clone_destroy(struct if_clone *ifc, struct ifnet *ifp) { - int unit; struct ifvlan *ifv = ifp->if_softc; + int unit = ifp->if_dunit; - unit = ifp->if_dunit; - - vlan_unconfig(ifp); - - ether_ifdetach(ifp); + ether_ifdetach(ifp); /* first, remove it from system-wide lists */ + vlan_unconfig(ifp); /* now it can be unconfigured and freed */ if_free_type(ifp, IFT_ETHER); - free(ifv, M_VLAN); - ifc_free_unit(ifc, unit); return (0); @@ -744,9 +738,8 @@ * The ifp->if_init entry point for vlan(4) is a no-op. */ static void -vlan_ifinit(void *foo) +vlan_init(void *foo __unused) { - } /* @@ -1151,9 +1144,6 @@ ifp->if_link_state = LINK_STATE_UNKNOWN; ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - /* Clear our MAC address. */ - bzero(IF_LLADDR(ifp), ETHER_ADDR_LEN); - return (0); } ==== //depot/projects/kmacy_sun4v_stable/src/sys/netinet/if_ether.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if_ether.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/if_ether.c,v 1.152 2006/06/09 00:33:30 thompsa Exp $ + * $FreeBSD: src/sys/netinet/if_ether.c,v 1.153 2006/06/29 19:22:04 yar Exp $ */ /* @@ -654,7 +654,7 @@ * as a dummy address for the rest of the function. */ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) - if (ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_INET) { + if (ifa->ifa_addr->sa_family == AF_INET) { ia = ifatoia(ifa); goto match; } ==== //depot/projects/kmacy_sun4v_stable/src/sys/netinet/in_pcb.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.178 2006/06/27 11:34:44 pjd Exp $ + * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.179 2006/06/29 10:49:49 bz Exp $ */ #include "opt_ipsec.h" @@ -280,7 +280,7 @@ if (nam != NULL && laddr.s_addr != INADDR_ANY) return (EINVAL); if ((so->so_options & (SO_REUSEADDR|SO_REUSEPORT)) == 0) - wild = 1; + wild = INPLOOKUP_WILDCARD; if (nam) { sin = (struct sockaddr_in *)nam; if (nam->sa_len != sizeof (*sin)) ==== //depot/projects/kmacy_sun4v_stable/src/sys/netinet/ip_divert.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_divert.c,v 1.118 2006/04/21 09:25:39 ps Exp $ + * $FreeBSD: src/sys/netinet/ip_divert.c,v 1.119 2006/06/29 19:22:04 yar Exp $ */ #if !defined(KLD_MODULE) @@ -206,8 +206,6 @@ /* Find IP address for receive interface */ TAILQ_FOREACH(ifa, &m->m_pkthdr.rcvif->if_addrhead, ifa_link) { - if (ifa->ifa_addr == NULL) - continue; if (ifa->ifa_addr->sa_family != AF_INET) continue; divsrc.sin_addr = ==== //depot/projects/kmacy_sun4v_stable/src/sys/netinet/ip_fw2.c#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.136 2006/06/22 13:22:54 ume Exp $ + * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.140 2006/06/29 19:22:04 yar Exp $ */ #define DEB(x) @@ -465,8 +465,6 @@ /* XXX lock? */ TAILQ_FOREACH(ia, &ifp->if_addrhead, ifa_link) { - if (ia->ifa_addr == NULL) - continue; if (ia->ifa_addr->sa_family != AF_INET) continue; if (cmd->p.ip.s_addr == ((struct sockaddr_in *) @@ -574,10 +572,7 @@ struct in6_addr copia; TAILQ_FOREACH(mdc, &ifnet, if_link) - for (mdc2 = mdc->if_addrlist.tqh_first; mdc2; - mdc2 = mdc2->ifa_list.tqe_next) { - if (!mdc2->ifa_addr) - continue; + TAILQ_FOREACH(mdc2, &mdc->if_addrlist, ifa_list) { if (mdc2->ifa_addr->sa_family == AF_INET6) { fdm = (struct in6_ifaddr *)mdc2; copia = fdm->ia_addr.sin6_addr; @@ -664,10 +659,9 @@ } static void -send_reject6(struct ip_fw_args *args, int code, u_short offset, u_int hlen) +send_reject6(struct ip_fw_args *args, int code, u_int hlen) { - if (code == ICMP6_UNREACH_RST && offset == 0 && - args->f_id.proto == IPPROTO_TCP) { + if (code == ICMP6_UNREACH_RST && args->f_id.proto == IPPROTO_TCP) { struct ip6_hdr *ip6; struct tcphdr *tcp; tcp_seq ack, seq; @@ -1620,7 +1614,7 @@ * sends a reject message, consuming the mbuf passed as an argument. */ static void -send_reject(struct ip_fw_args *args, int code, u_short offset, int ip_len) +send_reject(struct ip_fw_args *args, int code, int ip_len) { if (code != ICMP_REJECT_RST) { /* Send an ICMP unreach */ @@ -1631,7 +1625,7 @@ ip->ip_off = ntohs(ip->ip_off); } icmp_error(args->m, ICMP_UNREACH, code, 0L, 0); - } else if (offset == 0 && args->f_id.proto == IPPROTO_TCP) { + } else if (args->f_id.proto == IPPROTO_TCP) { struct tcphdr *const tcp = L3HDR(struct tcphdr, mtod(args->m, struct ip *)); if ( (tcp->th_flags & TH_RST) == 0) { @@ -1925,7 +1919,7 @@ wildcard = 0; pi = &tcbinfo; } else if (proto == IPPROTO_UDP) { - wildcard = 1; + wildcard = INPLOOKUP_WILDCARD; pi = &udbinfo; } else return 0; @@ -3126,20 +3120,19 @@ is_icmp_query(ICMP(ulp))) && !(m->m_flags & (M_BCAST|M_MCAST)) && !IN_MULTICAST(ntohl(dst_ip.s_addr))) { - send_reject(args, cmd->arg1, - offset,ip_len); + send_reject(args, cmd->arg1, ip_len); m = args->m; } /* FALLTHROUGH */ #ifdef INET6 case O_UNREACH6: if (hlen > 0 && is_ipv6 && + ((offset & IP6F_OFF_MASK) == 0) && (proto != IPPROTO_ICMPV6 || (is_icmp6_query(args->f_id.flags) == 1)) && !(m->m_flags & (M_BCAST|M_MCAST)) && !IN6_IS_ADDR_MULTICAST(&args->f_id.dst_ip6)) { - send_reject6(args, cmd->arg1, - offset, hlen); + send_reject6(args, cmd->arg1, hlen); m = args->m; } /* FALLTHROUGH */ ==== //depot/projects/kmacy_sun4v_stable/src/sys/netinet/ip_output.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/netinet/ip_output.c,v 1.257 2006/05/21 17:52:08 maxim Exp $ + * $FreeBSD: src/sys/netinet/ip_output.c,v 1.258 2006/06/29 13:38:36 glebius Exp $ */ #include "opt_ipfw.h" @@ -148,7 +148,7 @@ * will wrap around in less than 10 seconds at 100 Mbit/s on a * medium with MTU 1500. See Steven M. Bellovin, "A Technique * for Counting NATted Hosts", Proc. IMW'02, available at - * . + * . */ if ((flags & (IP_FORWARDING|IP_RAWOUTPUT)) == 0) { ip->ip_v = IPVERSION; ==== //depot/projects/kmacy_sun4v_stable/src/sys/netinet/tcp_input.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.302 2006/06/26 16:14:19 andre Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.303 2006/06/29 10:49:49 bz Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -651,7 +651,8 @@ next_hop->sin_port ? ntohs(next_hop->sin_port) : th->th_dport, - 1, m->m_pkthdr.rcvif); + INPLOOKUP_WILDCARD, + m->m_pkthdr.rcvif); } /* Remove the tag from the packet. We don't need it anymore. */ m_tag_delete(m, fwd_tag); @@ -662,13 +663,15 @@ inp = in6_pcblookup_hash(&tcbinfo, &ip6->ip6_src, th->th_sport, &ip6->ip6_dst, th->th_dport, - 1, m->m_pkthdr.rcvif); + INPLOOKUP_WILDCARD, + m->m_pkthdr.rcvif); #endif } else inp = in_pcblookup_hash(&tcbinfo, ip->ip_src, th->th_sport, ip->ip_dst, th->th_dport, - 1, m->m_pkthdr.rcvif); + INPLOOKUP_WILDCARD, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 30 00:20:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC3FF16A4B3; Fri, 30 Jun 2006 00:20:14 +0000 (UTC) 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 9212716A4A0 for ; Fri, 30 Jun 2006 00:20:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8FCD45168 for ; Thu, 29 Jun 2006 23:50:31 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5TNoVxL034819 for ; Thu, 29 Jun 2006 23:50:31 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5TNnZtt034753 for perforce@freebsd.org; Thu, 29 Jun 2006 23:49:35 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 29 Jun 2006 23:49:35 GMT Message-Id: <200606292349.k5TNnZtt034753@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100322 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, 30 Jun 2006 00:20:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=100322 Change 100322 by kmacy@kmacy_storage:sun4v_work_stable on 2006/06/29 23:48:50 IFC note: signal handling still broken, need to integrate bike_sched Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/MAINTAINERS#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/Makefile.inc1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/README#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/UPDATING#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/cd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/eval.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/sh.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/var.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/var.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/binutils/bfd/elf64-sparc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/ChangeLog#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/amigaos#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/animation#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/apple#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/archive#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/audio#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/basis#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/bflt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/bout#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/btsnoop#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/c64#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/cad#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/commands#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/compress#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/console#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/cracklib#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/database#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/diff#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/digital#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/dump#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/elf#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/flash#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/iff#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/images#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/java#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/linux#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/mach#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/maple#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/mup#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/ncr#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/perl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/printer#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/psion#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/python#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/riff#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/scientific#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/sql#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/varied.out#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Makefile.am#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/Makefile.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/aclocal.m4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/apprentice.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/ascmagic.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/compress.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/config.h.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/configure#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/configure.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/file.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/file.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/file.man#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/fsmagic.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/funcs.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/libmagic.man#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/magic.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/magic.man#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/magic.mime#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/magic2mime#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/patchlevel.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/print.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/readelf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/readelf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/file/softmagic.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/netcat/atomicio.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/netcat/atomicio.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/netcat/nc.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/netcat/netcat.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/netcat/socks.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/FREEBSD-upgrade#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/Makefile.am#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/README#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/TODO#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/VERSION#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/Makefile.am#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/auditfilterd/Makefile.am#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/auditfilterd/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/auditfilterd/auditfilterd.8#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/auditfilterd/auditfilterd.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/auditfilterd/auditfilterd.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bsm/Makefile.am#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bsm/audit.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bsm/audit_filter.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bsm/audit_kevents.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bsm/audit_record.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/configure#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/etc/audit_filter#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/libbsm/Makefile.am#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/libbsm/au_open.3#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/libbsm/audit_submit.3#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/libbsm/bsm_audit.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/man/auditctl.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/modules/Makefile.am#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/modules/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/modules/auditfilter_noop/Makefile.am#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/modules/auditfilter_noop/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/Makefile.am#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/bsm/Makefile.am#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/bsm/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/bsm/generate.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/pf/man/pfsync.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/cf/README#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/cf/cf/submit.mc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/cf/feature/dnsbl.m4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/libsm/t-memstat.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/README#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/bf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/domain.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/helpfile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/mci.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/sfsasl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/sfsasl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/tls.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tcpdump.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/traceroute/traceroute.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/config.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/loginrec.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/defaults/rc.conf#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/devd.conf#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/hosts.allow#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/netstart#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/periodic/daily/470.status-named#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/abi#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/auditd#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/bridge#1 branch .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/cached#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/devd#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/jail#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/ldconfig#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/netif#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/pf#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/sysctl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.subr#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/lib/libgcc_r/Makefile#2 delete .. //depot/projects/kmacy_sun4v_stable/src/include/arpa/nameser.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/include/glob.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/include/netdb.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/include/res_update.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/include/resolv.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/kerberos5/lib/libroken/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/csu/common/crtbegin.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/lib/csu/common/crtend.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/lib/libatm/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libbsm/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/arm/SYS.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/gethostname.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/glob.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/glob.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/signal.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/i386/gen/_ctx_start.S#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/include/isc/list.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/nameser/Symbol.map#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/nameser/ns_samedomain.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/net/Symbol.map#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/net/gai_strerror.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/net/gai_strerror.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/net/gethostnamadr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/net/res_mkupdate.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/net/res_update.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/resolv/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/resolv/Symbol.map#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/resolv/h_errno.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/resolv/res_findzonecut.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/resolv/res_mkupdate.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/resolv/res_state.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/resolv/res_update.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdlib/strtol.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdlib/strtoul.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdlib/tsearch.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/string/strlcpy.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/mincore.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/stat.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/truncate.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/wait.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libfetch/ftp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libkvm/kvm_minidump_amd64.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libkvm/kvm_minidump_i386.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libmagic/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libmagic/config.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libpthread/thread/thr_private.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libpthread/thread/thr_sig.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libpthread/thread/thr_sigaction.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libsdp/sdp.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libsdp/util.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libutil/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libutil/kld.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libutil/login_class.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libutil/pidfile.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/libexec/ftpd/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/libexec/ftpd/ftpcmd.y#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/release/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/release/doc/en_US.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/release/pc98/fixit-small_crunch.conf#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/devfs/devfs.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/dhclient/dhclient.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/fdisk/fdisk.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ffsinfo/ffsinfo.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/fsdb/fsdb.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/fsdb/fsdb.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/eli/geli.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/eli/geom_eli.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ggate/ggatec/ggatec.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/add.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/gpt.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/gpt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/gpt.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/label.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/remove.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/show.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ifconfig/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ifconfig/ifgroup.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ifconfig/ifpfsync.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/init/init.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/mount/mount.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/examples/diskless/clone_root#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/aac.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/acpi.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/adv.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/adw.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/altq.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/amd.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/amr.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/audit.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/auditpipe.4#1 branch .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/bge.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/bt.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/carp.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/cpufreq.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/dpt.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/enc.4#1 branch .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/esp.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/fast_ipsec.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/geom.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/geom_fox.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/if_bridge.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/iir.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/ips.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/ktr.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/lmc.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/man4.alpha/Makefile#2 delete .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/man4.alpha/linux.4#2 delete .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/man4.alpha/osf1.4#2 delete .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/man4.i386/linux.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/man4.i386/padlock.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/mpt.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/mxge.4#1 branch .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/myri10ge.4#2 delete .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/ncr.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/ncv.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/nfe.4#1 branch .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/ng_tag.4#1 branch .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/nsp.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/re.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/sched_4bsd.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/sched_core.4#1 branch .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/sched_ule.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/sio.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/snd_csa.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/snd_envy24.4#1 branch .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/snd_gusc.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/snd_ich.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/snd_sbc.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/stg.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/sym.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/umodem.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/uscanner.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/uvisor.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/vinum.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man5/mailer.conf.5#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man7/build.7#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/crypto.9#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/device_get_sysctl.9#1 branch .. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/lock.9#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/vflush.9#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/vgone.9#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/misc/bsd-family-tree#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/misc/iso3166#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/mk/bsd.README#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/monetdef/pt_PT.ISO8859-1.src#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/arm/inckern.S#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/arm/locore.S#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/at91/files.at91#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/sa11x0/sa11x0_reg.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/sa11x0/sa11x0_var.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/boot/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/bsm/audit.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/bsm/audit_record.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/svr4/syscalls.master#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/NOTES#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/files#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/files.amd64#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/files.arm#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/files.i386#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/kern.mk#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/options#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/options.arm#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/ah_soc.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/ap30.inc#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/ap30.opt_ah.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/ap43.inc#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/ap43.opt_ah.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/ap51.inc#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/ap51.opt_ah.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/ap61.inc#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/ap61.opt_ah.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ddb/db_sym.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/awi/awi.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/cm/if_cm_isa.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/cm/smc90cx6reg.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/cm/smc90cx6var.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/digi/digi.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ed/if_ed_novell.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mxge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mxge/if_mxge.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mxge/if_mxge_var.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mxge/mcp_gen_header.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mxge/mxge_mcp.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/my/if_my.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/myri10ge/eth_z8e.dat.gz.uu#2 delete .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#2 delete .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/myri10ge/if_myri10ge.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/myri10ge/if_myri10ge_var.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/myri10ge/mcp_gen_header.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/myri10ge/myri10ge_mcp.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/nfe/if_nfe.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/nfe/if_nfereg.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/nfe/if_nfevar.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/pccbb/pccbb_isa.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/pci/fixup_pci.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/re/if_re.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/safe/safe.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sio/sio.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/driver.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/midi/midi.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/midi/midi.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/midi/midiq.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/midi/mpu401.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/midi/mpu401.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/midi/mpu_if.m#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/midi/mpufoi_if.m#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/midi/sequencer.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/midi/sequencer.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/midi/synth_if.m#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/pci/ak452x.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/pci/ak452x.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/pci/envy24.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/pci/envy24.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/syscons/apm/apm_saver.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/uart/uart.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/uart/uart_dbg.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/ohcireg.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/ohcivar.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/uhcivar.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/usb.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/zs/zs.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Dependencies#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Doxyfile-cam#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Doxyfile-crypto#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Doxyfile-dev_pci#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Doxyfile-dev_sound#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Doxyfile-dev_usb#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Doxyfile-geom#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Doxyfile-i4b#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Doxyfile-kern#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Doxyfile-libkern#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Doxyfile-linux#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Doxyfile-net80211#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Doxyfile-netgraph#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Doxyfile-netinet#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Doxyfile-netinet6#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Doxyfile-netipsec#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Doxyfile-opencrypto#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Doxyfile-vm#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/README#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/common-Doxyfile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/doc/subsys/notreviewed.dox#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gdb/gdb.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gdb/gdb_cons.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gdb/gdb_packet.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/geom/eli/g_eli_integrity.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/geom/eli/g_eli_privacy.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/geom/geom.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/geom/geom_dev.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/geom/geom_io.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/support/debug.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/support/sv.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_acl.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_acl.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_ag.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_alloc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_alloc.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_alloc_btree.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_alloc_btree.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_arch.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_attr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_attr.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_attr_leaf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_attr_leaf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_attr_sf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_behavior.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_behavior.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_bit.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_bmap.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_bmap_btree.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_btree.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_btree.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_buf_item.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_buf_item.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_cap.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_clnt.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_da_btree.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_da_btree.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dfrag.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dfrag.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dinode.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir2.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir2.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir2_block.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir2_block.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir2_data.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir2_data.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir2_leaf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir2_leaf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir2_node.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir2_node.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir2_sf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir2_sf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir2_trace.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir2_trace.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir_leaf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir_leaf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dir_sf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dmapi.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_dmops.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_error.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_error.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_extfree_item.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_extfree_item.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_fs.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_fsops.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_fsops.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_ialloc.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_ialloc_btree.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_ialloc_btree.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_iget.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_imap.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_inode.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_inode_item.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_inode_item.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_inum.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_iocore.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_iomap.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_iomap.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_itable.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_itable.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_log.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_log_priv.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_log_recover.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_mac.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_macros.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_macros.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_mount.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_mount.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_qmops.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_quota.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_refcache.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_refcache.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_rename.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_rtalloc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_rw.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_rw.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_sb.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_trans.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_trans.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_trans_ail.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_trans_buf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_trans_extfree.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_trans_inode.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_trans_item.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_trans_priv.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_trans_space.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_types.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_utils.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_utils.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_vfsops.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/gnu/fs/xfs/xfsidbg.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/bios/apm.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/bios/apm.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/conf/NOTES#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/i386/ptrace_machdep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/include/md_var.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/include/npx.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/isa/npx.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/conf/SKI#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/disasm/disasm.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/disasm/disasm_decode.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/disasm/disasm_extract.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/disasm/disasm_format.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/disasm/disasm_int.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/isa/isa_common.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/isofs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_event.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_exec.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_fork.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_linker.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_module.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_switch.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_synch.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_sysctl.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_tc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/link_elf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/sched_core.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/sched_ule.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/subr_disk.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/subr_stack.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/tty_cons.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/uipc_socket2.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/vfs_init.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/modules/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/modules/acpi/acpi_panasonic/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/modules/ath_hal/Makefile#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 30 01:26:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C553B16A4E6; Fri, 30 Jun 2006 01:26:37 +0000 (UTC) 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 9FEF516A4E0 for ; Fri, 30 Jun 2006 01:26:37 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B96C244746 for ; Fri, 30 Jun 2006 00:59:58 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5U0xwIp047682 for ; Fri, 30 Jun 2006 00:59:58 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5U0xwvZ047679 for perforce@freebsd.org; Fri, 30 Jun 2006 00:59:58 GMT (envelope-from wsalamon@computer.org) Date: Fri, 30 Jun 2006 00:59:58 GMT Message-Id: <200606300059.k5U0xwvZ047679@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 100324 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, 30 Jun 2006 01:26:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=100324 Change 100324 by wsalamon@vh3 on 2006/06/30 00:59:30 When creating subejct32_ex or process32_ex tokens, assert that we have a known address type. However, anyting but AU_IPv6 will get 4 bytes of the address written. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#20 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#20 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#19 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#20 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.4 2006/06/17 13:53:04 wsalamon Exp $ */ @@ -618,14 +618,14 @@ token_t *t; u_char *dptr = NULL; - if (tid->at_type == AU_IPv4) - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + - 10 * sizeof(u_int32_t)); - else if (tid->at_type == AU_IPv6) - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + - 13 * sizeof(u_int32_t)); + KASSERT((tid->at_type == AU_IPv4) || (tid->at_type == AU_IPv6), + ("au_to_process32_ex: type %u", (unsigned int)tid->at_type)); + if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * + sizeof(u_int32_t)); else - return (NULL); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * + sizeof(u_int32_t)); ADD_U_CHAR(dptr, AUT_PROCESS32_EX); ADD_U_INT32(dptr, auid); @@ -955,14 +955,14 @@ token_t *t; u_char *dptr = NULL; - if (tid->at_type == AU_IPv4) - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * - sizeof(u_int32_t)); - else if (tid->at_type == AU_IPv6) + KASSERT((tid->at_type == AU_IPv4) || (tid->at_type == AU_IPv6), + ("au_to_subject32_ex: type %u", (unsigned int)tid->at_type)); + if (tid->at_type == AU_IPv6) GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * sizeof(u_int32_t)); else - return (NULL); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * + sizeof(u_int32_t)); ADD_U_CHAR(dptr, AUT_SUBJECT32_EX); ADD_U_INT32(dptr, auid); From owner-p4-projects@FreeBSD.ORG Fri Jun 30 03:40:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A83E216A4D8; Fri, 30 Jun 2006 03:40:44 +0000 (UTC) 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 6510816A4A0 for ; Fri, 30 Jun 2006 03:40:44 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07E1543D45 for ; Fri, 30 Jun 2006 03:40:44 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5U3ehAH060864 for ; Fri, 30 Jun 2006 03:40:44 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5U3eWTI060860 for perforce@freebsd.org; Fri, 30 Jun 2006 03:40:32 GMT (envelope-from cdjones@FreeBSD.org) Date: Fri, 30 Jun 2006 03:40:32 GMT Message-Id: <200606300340.k5U3eWTI060860@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 100327 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, 30 Jun 2006 03:40:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=100327 Change 100327 by cdjones@cdjones-impulse on 2006/06/30 03:39:35 Gah. Use FreeBSD 6 as the base rather than current; things work much better when you're using the same kernel version for everything, huh. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/Make.tags.inc#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/Makefile#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/bus_if.m#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/clock_if.m#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/cpufreq_if.m#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/device_if.m#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/genassym.sh#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf32.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf64.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_gzip.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/inflate.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/init_main.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_acct.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_acl.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_alq.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_clock.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_conf.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_context.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_environment.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_event.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_exec.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_exit.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_fork.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_idle.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_intr.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_kse.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_linker.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_mac.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_mib.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_module.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_mtxpool.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_ntptime.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_physio.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_poll.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_proc.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_sema.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_subr.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_switch.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_sysctl.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_tc.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_thr.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_time.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/link_elf.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/link_elf_obj.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/linker_if.m#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/md4c.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/md5c.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_ule.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_blist.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_bus.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_clock.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_devstat.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_disk.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_eventhandler.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_firmware.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_hints.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_kobj.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_log.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_mbpool.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_mchain.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_module.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_msgbuf.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_param.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_power.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_prof.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_rman.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_scanf.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_smp.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_stack.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_trap.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_unit.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sys_generic.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sys_process.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sys_socket.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sysv_ipc.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sysv_msg.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_compat.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_conf.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_cons.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_subr.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_tty.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_accf.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_proto.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_socket2.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_export.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_hash.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_init.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vnode_if.src#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_iovec.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_label.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_lock.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_mutex.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_null.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_pthreadtypes.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_sigset.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_task.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_timespec.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_timeval.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_types.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/aac_ioctl.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/acct.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/acl.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/agpio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/aio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/alq.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/assym.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ata.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bitstring.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/blist.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/buf.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bufobj.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bus.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bus_dma.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/callout.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cdefs.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cdio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cdrio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/chio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/clist.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/clock.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/condvar.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/conf.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cons.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/consio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/copyright.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cpu.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ctype.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/dataacq.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/device_port.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/devicestat.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/digiio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/dir.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/dirent.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/disk.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/disklabel.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/diskmbr.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/diskpc98.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/dkstat.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/domain.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/dvdio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf32.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf64.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf_common.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf_generic.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/endian.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/errno.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/eui64.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/event.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/eventhandler.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/eventvar.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/exec.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/extattr.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/fbio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/fcntl.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/fdcio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/file.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/filedesc.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/filio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/firmware.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/fnv_hash.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/gmon.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/gpt.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/hash.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/iconv.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/imgact.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/imgact_aout.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/imgact_elf.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/inflate.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/interrupt.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ioccom.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ioctl.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ioctl_compat.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ipc.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ipmi.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/joystick.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kbio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kdb.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kenv.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kernel.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kerneldump.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kobj.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kse.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kthread.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ktr.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ktrace.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/libkern.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/limits.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/linedisc.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/link_aout.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/link_elf.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/linker.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/linker_set.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/lock.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/lockf.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/lockmgr.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mac.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mac_policy.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/malloc.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mbpool.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mbuf.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mchain.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/md4.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/md5.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mdioctl.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/memrange.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mman.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/module.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mount.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mouse.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/msg.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/msgbuf.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mtio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mutex.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/namei.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/nlist_aout.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/param.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pciio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pcpu.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pioctl.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pipe.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pmc.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pmckern.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pmclog.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/poll.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/power.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/priority.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/proc.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/procfs.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/protosw.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ptio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ptrace.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/queue.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/random.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/reboot.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/refcount.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/regression.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/resource.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/resourcevar.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/rman.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/rtprio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/runq.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sbuf.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sched.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/select.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/selinfo.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sem.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sema.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/serial.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sf_buf.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/shm.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sigio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/signal.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/signalvar.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/smp.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/snoop.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/socket.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/socketvar.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sockio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/soundcard.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/stack.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/stat.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/statvfs.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/stddef.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/stdint.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sun_disklabel.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sx.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscall.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscall.mk#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysctl.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysent.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syslimits.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syslog.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysproto.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/systm.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/taskqueue.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/termios.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/thr.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/tiio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/time.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timeb.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timepps.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timers.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/times.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timespec.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timetc.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timex.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/tree.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/tty.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ttychars.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ttycom.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ttydefaults.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ttydev.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/turnstile.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/types.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ucontext.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ucred.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/uio.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/umtx.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/un.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/unistd.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/unpcb.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/user.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/utsname.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/uuid.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/vmmeter.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/vnode.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/wait.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/watchdog.h#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/xrpuio.h#2 integrate Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/Make.tags.inc#2 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/bus_if.m#2 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/clock_if.m#2 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/cpufreq_if.m#2 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/device_if.m#2 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/genassym.sh#2 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_aout.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/imgact_aout.c,v 1.101 2006/03/16 08:51:59 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/imgact_aout.c,v 1.99.2.2 2006/05/16 00:23:44 davidxu Exp $"); #include #include ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.175 2006/01/21 20:11:49 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.162.2.3 2006/03/16 00:25:31 alc Exp $"); #include "opt_compat.h" @@ -649,8 +649,7 @@ hdr->e_ident[EI_OSABI]); return (ENOEXEC); } - if (hdr->e_type == ET_DYN && - (brand_info->flags & BI_CAN_EXEC_DYN) == 0) + if (hdr->e_type == ET_DYN && brand_info->brand != ELFOSABI_LINUX) return (ENOEXEC); sv = brand_info->sysvec; if (interp != NULL && brand_info->interp_newpath != NULL) ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf32.c#2 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf64.c#2 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_gzip.c#2 (text+ko) ==== @@ -22,7 +22,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/imgact_gzip.c,v 1.55 2005/12/24 04:57:50 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/imgact_gzip.c,v 1.54.2.1 2006/03/16 00:25:32 alc Exp $"); #include #include ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_shell.c#2 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/inflate.c#2 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/init_main.c#2 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/init_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.211 2006/03/23 08:48:37 davidxu Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.213 2006/03/23 08:46:41 davidxu Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.195.2.2 2006/03/17 01:47:32 rwatson Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.198.2.2 2006/03/17 01:47:06 rwatson Exp */ #include "opt_compat.h" @@ -30,169 +30,169 @@ /* The casts are bogus but will do for now. */ struct sysent sysent[] = { { SYF_MPSAFE | 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = syscall */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)fork, AUE_FORK }, /* 2 = fork */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 1 = exit */ + { SYF_MPSAFE | 0, (sy_call_t *)fork, AUE_NULL }, /* 2 = fork */ { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { SYF_MPSAFE | AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC }, /* 5 = open */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ - { SYF_MPSAFE | AS(wait_args), (sy_call_t *)wait4, AUE_WAIT4 }, /* 7 = wait4 */ - { compat(SYF_MPSAFE | AS(ocreat_args),creat), AUE_O_CREAT }, /* 8 = old creat */ - { SYF_MPSAFE | AS(link_args), (sy_call_t *)link, AUE_LINK }, /* 9 = link */ - { SYF_MPSAFE | AS(unlink_args), (sy_call_t *)unlink, AUE_UNLINK }, /* 10 = unlink */ + { SYF_MPSAFE | AS(open_args), (sy_call_t *)open, AUE_NULL }, /* 5 = open */ + { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_NULL }, /* 6 = close */ + { SYF_MPSAFE | AS(wait_args), (sy_call_t *)wait4, AUE_NULL }, /* 7 = wait4 */ + { compat(SYF_MPSAFE | AS(ocreat_args),creat), AUE_NULL }, /* 8 = old creat */ + { SYF_MPSAFE | AS(link_args), (sy_call_t *)link, AUE_NULL }, /* 9 = link */ + { SYF_MPSAFE | AS(unlink_args), (sy_call_t *)unlink, AUE_NULL }, /* 10 = unlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 11 = obsolete execv */ - { SYF_MPSAFE | AS(chdir_args), (sy_call_t *)chdir, AUE_CHDIR }, /* 12 = chdir */ - { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 13 = fchdir */ - { SYF_MPSAFE | AS(mknod_args), (sy_call_t *)mknod, AUE_MKNOD }, /* 14 = mknod */ - { SYF_MPSAFE | AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD }, /* 15 = chmod */ - { SYF_MPSAFE | AS(chown_args), (sy_call_t *)chown, AUE_CHOWN }, /* 16 = chown */ + { SYF_MPSAFE | AS(chdir_args), (sy_call_t *)chdir, AUE_NULL }, /* 12 = chdir */ + { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_NULL }, /* 13 = fchdir */ + { SYF_MPSAFE | AS(mknod_args), (sy_call_t *)mknod, AUE_NULL }, /* 14 = mknod */ + { SYF_MPSAFE | AS(chmod_args), (sy_call_t *)chmod, AUE_NULL }, /* 15 = chmod */ + { SYF_MPSAFE | AS(chown_args), (sy_call_t *)chown, AUE_NULL }, /* 16 = chown */ { SYF_MPSAFE | AS(obreak_args), (sy_call_t *)obreak, AUE_NULL }, /* 17 = break */ - { compat4(SYF_MPSAFE | AS(freebsd4_getfsstat_args),getfsstat), AUE_GETFSSTAT }, /* 18 = old getfsstat */ - { compat(SYF_MPSAFE | AS(olseek_args),lseek), AUE_LSEEK }, /* 19 = old lseek */ - { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_GETPID }, /* 20 = getpid */ - { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT }, /* 21 = mount */ - { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT }, /* 22 = unmount */ - { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 23 = setuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ - { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 25 = geteuid */ - { SYF_MPSAFE | AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE }, /* 26 = ptrace */ - { SYF_MPSAFE | AS(recvmsg_args), (sy_call_t *)recvmsg, AUE_RECVMSG }, /* 27 = recvmsg */ - { SYF_MPSAFE | AS(sendmsg_args), (sy_call_t *)sendmsg, AUE_SENDMSG }, /* 28 = sendmsg */ - { SYF_MPSAFE | AS(recvfrom_args), (sy_call_t *)recvfrom, AUE_RECVFROM }, /* 29 = recvfrom */ - { SYF_MPSAFE | AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT }, /* 30 = accept */ - { SYF_MPSAFE | AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME }, /* 31 = getpeername */ - { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME }, /* 32 = getsockname */ - { SYF_MPSAFE | AS(access_args), (sy_call_t *)access, AUE_ACCESS }, /* 33 = access */ - { SYF_MPSAFE | AS(chflags_args), (sy_call_t *)chflags, AUE_CHFLAGS }, /* 34 = chflags */ - { SYF_MPSAFE | AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS }, /* 35 = fchflags */ - { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ - { SYF_MPSAFE | AS(kill_args), (sy_call_t *)kill, AUE_KILL }, /* 37 = kill */ - { compat(SYF_MPSAFE | AS(ostat_args),stat), AUE_STAT }, /* 38 = old stat */ - { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 39 = getppid */ - { compat(SYF_MPSAFE | AS(olstat_args),lstat), AUE_LSTAT }, /* 40 = old lstat */ - { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ - { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_PIPE }, /* 42 = pipe */ - { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 43 = getegid */ - { SYF_MPSAFE | AS(profil_args), (sy_call_t *)profil, AUE_PROFILE }, /* 44 = profil */ - { SYF_MPSAFE | AS(ktrace_args), (sy_call_t *)ktrace, AUE_KTRACE }, /* 45 = ktrace */ - { compat(SYF_MPSAFE | AS(osigaction_args),sigaction), AUE_SIGACTION }, /* 46 = old sigaction */ - { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_GETGID }, /* 47 = getgid */ - { compat(SYF_MPSAFE | AS(osigprocmask_args),sigprocmask), AUE_SIGPROCMASK }, /* 48 = old sigprocmask */ - { SYF_MPSAFE | AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN }, /* 49 = getlogin */ - { SYF_MPSAFE | AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN }, /* 50 = setlogin */ - { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ - { compat(SYF_MPSAFE | 0,sigpending), AUE_SIGPENDING }, /* 52 = old sigpending */ - { SYF_MPSAFE | AS(sigaltstack_args), (sy_call_t *)sigaltstack, AUE_SIGPENDING }, /* 53 = sigaltstack */ - { SYF_MPSAFE | AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL }, /* 54 = ioctl */ - { SYF_MPSAFE | AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT }, /* 55 = reboot */ - { SYF_MPSAFE | AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE }, /* 56 = revoke */ - { SYF_MPSAFE | AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK }, /* 57 = symlink */ - { SYF_MPSAFE | AS(readlink_args), (sy_call_t *)readlink, AUE_READLINK }, /* 58 = readlink */ - { SYF_MPSAFE | AS(execve_args), (sy_call_t *)execve, AUE_EXECVE }, /* 59 = execve */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ - { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ - { compat(SYF_MPSAFE | AS(ofstat_args),fstat), AUE_FSTAT }, /* 62 = old fstat */ + { compat4(SYF_MPSAFE | AS(freebsd4_getfsstat_args),getfsstat), AUE_NULL }, /* 18 = old getfsstat */ + { compat(SYF_MPSAFE | AS(olseek_args),lseek), AUE_NULL }, /* 19 = old lseek */ + { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ + { AS(mount_args), (sy_call_t *)mount, AUE_NULL }, /* 21 = mount */ + { AS(unmount_args), (sy_call_t *)unmount, AUE_NULL }, /* 22 = unmount */ + { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_NULL }, /* 23 = setuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_NULL }, /* 24 = getuid */ + { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_NULL }, /* 25 = geteuid */ + { SYF_MPSAFE | AS(ptrace_args), (sy_call_t *)ptrace, AUE_NULL }, /* 26 = ptrace */ + { SYF_MPSAFE | AS(recvmsg_args), (sy_call_t *)recvmsg, AUE_NULL }, /* 27 = recvmsg */ + { SYF_MPSAFE | AS(sendmsg_args), (sy_call_t *)sendmsg, AUE_NULL }, /* 28 = sendmsg */ + { SYF_MPSAFE | AS(recvfrom_args), (sy_call_t *)recvfrom, AUE_NULL }, /* 29 = recvfrom */ + { SYF_MPSAFE | AS(accept_args), (sy_call_t *)accept, AUE_NULL }, /* 30 = accept */ + { SYF_MPSAFE | AS(getpeername_args), (sy_call_t *)getpeername, AUE_NULL }, /* 31 = getpeername */ + { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)getsockname, AUE_NULL }, /* 32 = getsockname */ + { SYF_MPSAFE | AS(access_args), (sy_call_t *)access, AUE_NULL }, /* 33 = access */ + { SYF_MPSAFE | AS(chflags_args), (sy_call_t *)chflags, AUE_NULL }, /* 34 = chflags */ + { SYF_MPSAFE | AS(fchflags_args), (sy_call_t *)fchflags, AUE_NULL }, /* 35 = fchflags */ + { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_NULL }, /* 36 = sync */ + { SYF_MPSAFE | AS(kill_args), (sy_call_t *)kill, AUE_NULL }, /* 37 = kill */ + { compat(SYF_MPSAFE | AS(ostat_args),stat), AUE_NULL }, /* 38 = old stat */ + { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_NULL }, /* 39 = getppid */ + { compat(SYF_MPSAFE | AS(olstat_args),lstat), AUE_NULL }, /* 40 = old lstat */ + { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_NULL }, /* 41 = dup */ + { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_NULL }, /* 42 = pipe */ + { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_NULL }, /* 43 = getegid */ + { SYF_MPSAFE | AS(profil_args), (sy_call_t *)profil, AUE_NULL }, /* 44 = profil */ + { SYF_MPSAFE | AS(ktrace_args), (sy_call_t *)ktrace, AUE_NULL }, /* 45 = ktrace */ + { compat(SYF_MPSAFE | AS(osigaction_args),sigaction), AUE_NULL }, /* 46 = old sigaction */ + { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_NULL }, /* 47 = getgid */ + { compat(SYF_MPSAFE | AS(osigprocmask_args),sigprocmask), AUE_NULL }, /* 48 = old sigprocmask */ + { SYF_MPSAFE | AS(getlogin_args), (sy_call_t *)getlogin, AUE_NULL }, /* 49 = getlogin */ + { SYF_MPSAFE | AS(setlogin_args), (sy_call_t *)setlogin, AUE_NULL }, /* 50 = setlogin */ + { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_NULL }, /* 51 = acct */ + { compat(SYF_MPSAFE | 0,sigpending), AUE_NULL }, /* 52 = old sigpending */ + { SYF_MPSAFE | AS(sigaltstack_args), (sy_call_t *)sigaltstack, AUE_NULL }, /* 53 = sigaltstack */ + { SYF_MPSAFE | AS(ioctl_args), (sy_call_t *)ioctl, AUE_NULL }, /* 54 = ioctl */ + { SYF_MPSAFE | AS(reboot_args), (sy_call_t *)reboot, AUE_NULL }, /* 55 = reboot */ + { SYF_MPSAFE | AS(revoke_args), (sy_call_t *)revoke, AUE_NULL }, /* 56 = revoke */ + { SYF_MPSAFE | AS(symlink_args), (sy_call_t *)symlink, AUE_NULL }, /* 57 = symlink */ + { SYF_MPSAFE | AS(readlink_args), (sy_call_t *)readlink, AUE_NULL }, /* 58 = readlink */ + { SYF_MPSAFE | AS(execve_args), (sy_call_t *)execve, AUE_NULL }, /* 59 = execve */ + { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_NULL }, /* 60 = umask */ + { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_NULL }, /* 61 = chroot */ + { compat(SYF_MPSAFE | AS(ofstat_args),fstat), AUE_NULL }, /* 62 = old fstat */ { compat(SYF_MPSAFE | AS(getkerninfo_args),getkerninfo), AUE_NULL }, /* 63 = old getkerninfo */ - { compat(SYF_MPSAFE | 0,getpagesize), AUE_O_GETPAGESIZE }, /* 64 = old getpagesize */ - { SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync, AUE_MSYNC }, /* 65 = msync */ - { SYF_MPSAFE | 0, (sy_call_t *)vfork, AUE_VFORK }, /* 66 = vfork */ + { compat(SYF_MPSAFE | 0,getpagesize), AUE_NULL }, /* 64 = old getpagesize */ + { SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync, AUE_NULL }, /* 65 = msync */ + { SYF_MPSAFE | 0, (sy_call_t *)vfork, AUE_NULL }, /* 66 = vfork */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 67 = obsolete vread */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 68 = obsolete vwrite */ - { SYF_MPSAFE | AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK }, /* 69 = sbrk */ - { SYF_MPSAFE | AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK }, /* 70 = sstk */ - { compat(SYF_MPSAFE | AS(ommap_args),mmap), AUE_MMAP }, /* 71 = old mmap */ - { SYF_MPSAFE | AS(ovadvise_args), (sy_call_t *)ovadvise, AUE_O_VADVISE }, /* 72 = vadvise */ - { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 73 = munmap */ - { SYF_MPSAFE | AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT }, /* 74 = mprotect */ - { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 75 = madvise */ + { SYF_MPSAFE | AS(sbrk_args), (sy_call_t *)sbrk, AUE_NULL }, /* 69 = sbrk */ + { SYF_MPSAFE | AS(sstk_args), (sy_call_t *)sstk, AUE_NULL }, /* 70 = sstk */ + { compat(SYF_MPSAFE | AS(ommap_args),mmap), AUE_NULL }, /* 71 = old mmap */ + { SYF_MPSAFE | AS(ovadvise_args), (sy_call_t *)ovadvise, AUE_NULL }, /* 72 = vadvise */ + { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_NULL }, /* 73 = munmap */ + { SYF_MPSAFE | AS(mprotect_args), (sy_call_t *)mprotect, AUE_NULL }, /* 74 = mprotect */ + { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_NULL }, /* 75 = madvise */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 76 = obsolete vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 77 = obsolete vlimit */ - { SYF_MPSAFE | AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE }, /* 78 = mincore */ - { SYF_MPSAFE | AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS }, /* 79 = getgroups */ - { SYF_MPSAFE | AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS }, /* 80 = setgroups */ - { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 81 = getpgrp */ - { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 82 = setpgid */ - { SYF_MPSAFE | AS(setitimer_args), (sy_call_t *)setitimer, AUE_SETITIMER }, /* 83 = setitimer */ - { compat(SYF_MPSAFE | 0,wait), AUE_WAIT4 }, /* 84 = old wait */ - { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 85 = swapon */ - { SYF_MPSAFE | AS(getitimer_args), (sy_call_t *)getitimer, AUE_GETITIMER }, /* 86 = getitimer */ - { compat(SYF_MPSAFE | AS(gethostname_args),gethostname), AUE_SYSCTL }, /* 87 = old gethostname */ - { compat(SYF_MPSAFE | AS(sethostname_args),sethostname), AUE_SYSCTL }, /* 88 = old sethostname */ - { SYF_MPSAFE | 0, (sy_call_t *)getdtablesize, AUE_GETDTABLESIZE }, /* 89 = getdtablesize */ - { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */ + { SYF_MPSAFE | AS(mincore_args), (sy_call_t *)mincore, AUE_NULL }, /* 78 = mincore */ + { SYF_MPSAFE | AS(getgroups_args), (sy_call_t *)getgroups, AUE_NULL }, /* 79 = getgroups */ + { SYF_MPSAFE | AS(setgroups_args), (sy_call_t *)setgroups, AUE_NULL }, /* 80 = setgroups */ + { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_NULL }, /* 81 = getpgrp */ + { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 82 = setpgid */ + { SYF_MPSAFE | AS(setitimer_args), (sy_call_t *)setitimer, AUE_NULL }, /* 83 = setitimer */ + { compat(SYF_MPSAFE | 0,wait), AUE_NULL }, /* 84 = old wait */ + { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_NULL }, /* 85 = swapon */ + { SYF_MPSAFE | AS(getitimer_args), (sy_call_t *)getitimer, AUE_NULL }, /* 86 = getitimer */ + { compat(SYF_MPSAFE | AS(gethostname_args),gethostname), AUE_NULL }, /* 87 = old gethostname */ + { compat(SYF_MPSAFE | AS(sethostname_args),sethostname), AUE_NULL }, /* 88 = old sethostname */ + { SYF_MPSAFE | 0, (sy_call_t *)getdtablesize, AUE_NULL }, /* 89 = getdtablesize */ + { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_NULL }, /* 90 = dup2 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 91 = getdopt */ - { SYF_MPSAFE | AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL }, /* 92 = fcntl */ - { SYF_MPSAFE | AS(select_args), (sy_call_t *)select, AUE_SELECT }, /* 93 = select */ + { SYF_MPSAFE | AS(fcntl_args), (sy_call_t *)fcntl, AUE_NULL }, /* 92 = fcntl */ + { SYF_MPSAFE | AS(select_args), (sy_call_t *)select, AUE_NULL }, /* 93 = select */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 94 = setdopt */ - { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 95 = fsync */ - { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 96 = setpriority */ - { SYF_MPSAFE | AS(socket_args), (sy_call_t *)socket, AUE_SOCKET }, /* 97 = socket */ - { SYF_MPSAFE | AS(connect_args), (sy_call_t *)connect, AUE_CONNECT }, /* 98 = connect */ - { compat(SYF_MPSAFE | AS(accept_args),accept), AUE_ACCEPT }, /* 99 = old accept */ - { SYF_MPSAFE | AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY }, /* 100 = getpriority */ - { compat(SYF_MPSAFE | AS(osend_args),send), AUE_SEND }, /* 101 = old send */ - { compat(SYF_MPSAFE | AS(orecv_args),recv), AUE_RECV }, /* 102 = old recv */ - { compat(SYF_MPSAFE | AS(osigreturn_args),sigreturn), AUE_SIGRETURN }, /* 103 = old sigreturn */ - { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_BIND }, /* 104 = bind */ - { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT }, /* 105 = setsockopt */ - { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_LISTEN }, /* 106 = listen */ + { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_NULL }, /* 95 = fsync */ + { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_NULL }, /* 96 = setpriority */ + { SYF_MPSAFE | AS(socket_args), (sy_call_t *)socket, AUE_NULL }, /* 97 = socket */ + { SYF_MPSAFE | AS(connect_args), (sy_call_t *)connect, AUE_NULL }, /* 98 = connect */ + { compat(SYF_MPSAFE | AS(accept_args),accept), AUE_NULL }, /* 99 = old accept */ + { SYF_MPSAFE | AS(getpriority_args), (sy_call_t *)getpriority, AUE_NULL }, /* 100 = getpriority */ + { compat(SYF_MPSAFE | AS(osend_args),send), AUE_NULL }, /* 101 = old send */ + { compat(SYF_MPSAFE | AS(orecv_args),recv), AUE_NULL }, /* 102 = old recv */ + { compat(SYF_MPSAFE | AS(osigreturn_args),sigreturn), AUE_NULL }, /* 103 = old sigreturn */ + { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_NULL }, /* 104 = bind */ + { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_NULL }, /* 105 = setsockopt */ + { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_NULL }, /* 106 = listen */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 107 = obsolete vtimes */ { compat(SYF_MPSAFE | AS(osigvec_args),sigvec), AUE_NULL }, /* 108 = old sigvec */ { compat(SYF_MPSAFE | AS(osigblock_args),sigblock), AUE_NULL }, /* 109 = old sigblock */ { compat(SYF_MPSAFE | AS(osigsetmask_args),sigsetmask), AUE_NULL }, /* 110 = old sigsetmask */ { compat(SYF_MPSAFE | AS(osigsuspend_args),sigsuspend), AUE_NULL }, /* 111 = old sigsuspend */ { compat(SYF_MPSAFE | AS(osigstack_args),sigstack), AUE_NULL }, /* 112 = old sigstack */ - { compat(SYF_MPSAFE | AS(orecvmsg_args),recvmsg), AUE_RECVMSG }, /* 113 = old recvmsg */ - { compat(SYF_MPSAFE | AS(osendmsg_args),sendmsg), AUE_SENDMSG }, /* 114 = old sendmsg */ + { compat(SYF_MPSAFE | AS(orecvmsg_args),recvmsg), AUE_NULL }, /* 113 = old recvmsg */ + { compat(SYF_MPSAFE | AS(osendmsg_args),sendmsg), AUE_NULL }, /* 114 = old sendmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = obsolete vtrace */ - { SYF_MPSAFE | AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_GETTIMEOFDAY }, /* 116 = gettimeofday */ - { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE }, /* 117 = getrusage */ - { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT }, /* 118 = getsockopt */ + { SYF_MPSAFE | AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_NULL }, /* 116 = gettimeofday */ + { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_NULL }, /* 117 = getrusage */ + { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_NULL }, /* 118 = getsockopt */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 119 = resuba */ - { SYF_MPSAFE | AS(readv_args), (sy_call_t *)readv, AUE_READV }, /* 120 = readv */ - { SYF_MPSAFE | AS(writev_args), (sy_call_t *)writev, AUE_WRITEV }, /* 121 = writev */ - { SYF_MPSAFE | AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_SETTIMEOFDAY }, /* 122 = settimeofday */ - { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 123 = fchown */ - { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 124 = fchmod */ - { compat(SYF_MPSAFE | AS(recvfrom_args),recvfrom), AUE_RECVFROM }, /* 125 = old recvfrom */ - { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 126 = setreuid */ - { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 127 = setregid */ - { SYF_MPSAFE | AS(rename_args), (sy_call_t *)rename, AUE_RENAME }, /* 128 = rename */ - { compat(SYF_MPSAFE | AS(otruncate_args),truncate), AUE_TRUNCATE }, /* 129 = old truncate */ - { compat(SYF_MPSAFE | AS(oftruncate_args),ftruncate), AUE_FTRUNCATE }, /* 130 = old ftruncate */ - { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 131 = flock */ - { SYF_MPSAFE | AS(mkfifo_args), (sy_call_t *)mkfifo, AUE_MKFIFO }, /* 132 = mkfifo */ - { SYF_MPSAFE | AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO }, /* 133 = sendto */ - { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN }, /* 134 = shutdown */ - { SYF_MPSAFE | AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR }, /* 135 = socketpair */ - { SYF_MPSAFE | AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR }, /* 136 = mkdir */ - { SYF_MPSAFE | AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR }, /* 137 = rmdir */ - { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES }, /* 138 = utimes */ + { SYF_MPSAFE | AS(readv_args), (sy_call_t *)readv, AUE_NULL }, /* 120 = readv */ + { SYF_MPSAFE | AS(writev_args), (sy_call_t *)writev, AUE_NULL }, /* 121 = writev */ + { SYF_MPSAFE | AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_NULL }, /* 122 = settimeofday */ + { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 123 = fchown */ + { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_NULL }, /* 124 = fchmod */ + { compat(SYF_MPSAFE | AS(recvfrom_args),recvfrom), AUE_NULL }, /* 125 = old recvfrom */ + { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_NULL }, /* 126 = setreuid */ + { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_NULL }, /* 127 = setregid */ + { SYF_MPSAFE | AS(rename_args), (sy_call_t *)rename, AUE_NULL }, /* 128 = rename */ + { compat(SYF_MPSAFE | AS(otruncate_args),truncate), AUE_NULL }, /* 129 = old truncate */ + { compat(SYF_MPSAFE | AS(oftruncate_args),ftruncate), AUE_NULL }, /* 130 = old ftruncate */ + { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_NULL }, /* 131 = flock */ + { SYF_MPSAFE | AS(mkfifo_args), (sy_call_t *)mkfifo, AUE_NULL }, /* 132 = mkfifo */ + { SYF_MPSAFE | AS(sendto_args), (sy_call_t *)sendto, AUE_NULL }, /* 133 = sendto */ + { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown, AUE_NULL }, /* 134 = shutdown */ + { SYF_MPSAFE | AS(socketpair_args), (sy_call_t *)socketpair, AUE_NULL }, /* 135 = socketpair */ + { SYF_MPSAFE | AS(mkdir_args), (sy_call_t *)mkdir, AUE_NULL }, /* 136 = mkdir */ + { SYF_MPSAFE | AS(rmdir_args), (sy_call_t *)rmdir, AUE_NULL }, /* 137 = rmdir */ + { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_NULL }, /* 138 = utimes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = obsolete 4.2 sigreturn */ - { SYF_MPSAFE | AS(adjtime_args), (sy_call_t *)adjtime, AUE_ADJTIME }, /* 140 = adjtime */ - { compat(SYF_MPSAFE | AS(ogetpeername_args),getpeername), AUE_GETPEERNAME }, /* 141 = old getpeername */ - { compat(SYF_MPSAFE | 0,gethostid), AUE_SYSCTL }, /* 142 = old gethostid */ - { compat(SYF_MPSAFE | AS(osethostid_args),sethostid), AUE_SYSCTL }, /* 143 = old sethostid */ - { compat(SYF_MPSAFE | AS(ogetrlimit_args),getrlimit), AUE_GETRLIMIT }, /* 144 = old getrlimit */ - { compat(SYF_MPSAFE | AS(osetrlimit_args),setrlimit), AUE_SETRLIMIT }, /* 145 = old setrlimit */ - { compat(SYF_MPSAFE | AS(okillpg_args),killpg), AUE_KILLPG }, /* 146 = old killpg */ - { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 147 = setsid */ - { SYF_MPSAFE | AS(quotactl_args), (sy_call_t *)quotactl, AUE_QUOTACTL }, /* 148 = quotactl */ - { compat(SYF_MPSAFE | 0,quota), AUE_O_QUOTA }, /* 149 = old quota */ - { compat(SYF_MPSAFE | AS(getsockname_args),getsockname), AUE_GETSOCKNAME }, /* 150 = old getsockname */ + { SYF_MPSAFE | AS(adjtime_args), (sy_call_t *)adjtime, AUE_NULL }, /* 140 = adjtime */ + { compat(SYF_MPSAFE | AS(ogetpeername_args),getpeername), AUE_NULL }, /* 141 = old getpeername */ + { compat(SYF_MPSAFE | 0,gethostid), AUE_NULL }, /* 142 = old gethostid */ + { compat(SYF_MPSAFE | AS(osethostid_args),sethostid), AUE_NULL }, /* 143 = old sethostid */ + { compat(SYF_MPSAFE | AS(ogetrlimit_args),getrlimit), AUE_NULL }, /* 144 = old getrlimit */ + { compat(SYF_MPSAFE | AS(osetrlimit_args),setrlimit), AUE_NULL }, /* 145 = old setrlimit */ + { compat(SYF_MPSAFE | AS(okillpg_args),killpg), AUE_NULL }, /* 146 = old killpg */ + { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_NULL }, /* 147 = setsid */ + { SYF_MPSAFE | AS(quotactl_args), (sy_call_t *)quotactl, AUE_NULL }, /* 148 = quotactl */ + { compat(SYF_MPSAFE | 0,quota), AUE_NULL }, /* 149 = old quota */ + { compat(SYF_MPSAFE | AS(getsockname_args),getsockname), AUE_NULL }, /* 150 = old getsockname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = sem_lock */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = sem_wakeup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = asyncdaemon */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 154 = nosys */ { SYF_MPSAFE | AS(nfssvc_args), (sy_call_t *)nosys, AUE_NULL }, /* 155 = nfssvc */ - { compat(AS(ogetdirentries_args),getdirentries), AUE_GETDIRENTRIES }, /* 156 = old getdirentries */ - { compat4(SYF_MPSAFE | AS(freebsd4_statfs_args),statfs), AUE_STATFS }, /* 157 = old statfs */ - { compat4(SYF_MPSAFE | AS(freebsd4_fstatfs_args),fstatfs), AUE_FSTATFS }, /* 158 = old fstatfs */ + { compat(AS(ogetdirentries_args),getdirentries), AUE_NULL }, /* 156 = old getdirentries */ + { compat4(SYF_MPSAFE | AS(freebsd4_statfs_args),statfs), AUE_NULL }, /* 157 = old statfs */ + { compat4(SYF_MPSAFE | AS(freebsd4_fstatfs_args),fstatfs), AUE_NULL }, /* 158 = old fstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 159 = nosys */ - { SYF_MPSAFE | AS(lgetfh_args), (sy_call_t *)lgetfh, AUE_LGETFH }, /* 160 = lgetfh */ - { SYF_MPSAFE | AS(getfh_args), (sy_call_t *)getfh, AUE_NFS_GETFH }, /* 161 = getfh */ - { SYF_MPSAFE | AS(getdomainname_args), (sy_call_t *)getdomainname, AUE_SYSCTL }, /* 162 = getdomainname */ - { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 163 = setdomainname */ + { SYF_MPSAFE | AS(lgetfh_args), (sy_call_t *)lgetfh, AUE_NULL }, /* 160 = lgetfh */ + { SYF_MPSAFE | AS(getfh_args), (sy_call_t *)getfh, AUE_NULL }, /* 161 = getfh */ + { SYF_MPSAFE | AS(getdomainname_args), (sy_call_t *)getdomainname, AUE_NULL }, /* 162 = getdomainname */ + { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_NULL }, /* 163 = setdomainname */ { SYF_MPSAFE | AS(uname_args), (sy_call_t *)uname, AUE_NULL }, /* 164 = uname */ { SYF_MPSAFE | AS(sysarch_args), (sy_call_t *)sysarch, AUE_NULL }, /* 165 = sysarch */ { SYF_MPSAFE | AS(rtprio_args), (sy_call_t *)rtprio, AUE_NULL }, /* 166 = rtprio */ @@ -202,43 +202,43 @@ { SYF_MPSAFE | AS(msgsys_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 170 = msgsys */ { SYF_MPSAFE | AS(shmsys_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 171 = shmsys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 172 = nosys */ - { SYF_MPSAFE | AS(pread_args), (sy_call_t *)pread, AUE_PREAD }, /* 173 = pread */ - { SYF_MPSAFE | AS(pwrite_args), (sy_call_t *)pwrite, AUE_PWRITE }, /* 174 = pwrite */ + { SYF_MPSAFE | AS(pread_args), (sy_call_t *)pread, AUE_NULL }, /* 173 = pread */ + { SYF_MPSAFE | AS(pwrite_args), (sy_call_t *)pwrite, AUE_NULL }, /* 174 = pwrite */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 175 = nosys */ - { SYF_MPSAFE | AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_ADJTIME }, /* 176 = ntp_adjtime */ + { SYF_MPSAFE | AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_NULL }, /* 176 = ntp_adjtime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 177 = sfork */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 178 = getdescriptor */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 179 = setdescriptor */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 180 = nosys */ - { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 181 = setgid */ - { SYF_MPSAFE | AS(setegid_args), (sy_call_t *)setegid, AUE_SETEGID }, /* 182 = setegid */ - { SYF_MPSAFE | AS(seteuid_args), (sy_call_t *)seteuid, AUE_SETEUID }, /* 183 = seteuid */ + { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_NULL }, /* 181 = setgid */ + { SYF_MPSAFE | AS(setegid_args), (sy_call_t *)setegid, AUE_NULL }, /* 182 = setegid */ + { SYF_MPSAFE | AS(seteuid_args), (sy_call_t *)seteuid, AUE_NULL }, /* 183 = seteuid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 184 = lfs_bmapv */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 185 = lfs_markv */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 186 = lfs_segclean */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 187 = lfs_segwait */ - { SYF_MPSAFE | AS(stat_args), (sy_call_t *)stat, AUE_STAT }, /* 188 = stat */ - { SYF_MPSAFE | AS(fstat_args), (sy_call_t *)fstat, AUE_FSTAT }, /* 189 = fstat */ - { SYF_MPSAFE | AS(lstat_args), (sy_call_t *)lstat, AUE_LSTAT }, /* 190 = lstat */ - { SYF_MPSAFE | AS(pathconf_args), (sy_call_t *)pathconf, AUE_PATHCONF }, /* 191 = pathconf */ - { SYF_MPSAFE | AS(fpathconf_args), (sy_call_t *)fpathconf, AUE_FPATHCONF }, /* 192 = fpathconf */ + { SYF_MPSAFE | AS(stat_args), (sy_call_t *)stat, AUE_NULL }, /* 188 = stat */ + { SYF_MPSAFE | AS(fstat_args), (sy_call_t *)fstat, AUE_NULL }, /* 189 = fstat */ + { SYF_MPSAFE | AS(lstat_args), (sy_call_t *)lstat, AUE_NULL }, /* 190 = lstat */ + { SYF_MPSAFE | AS(pathconf_args), (sy_call_t *)pathconf, AUE_NULL }, /* 191 = pathconf */ + { SYF_MPSAFE | AS(fpathconf_args), (sy_call_t *)fpathconf, AUE_NULL }, /* 192 = fpathconf */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 193 = nosys */ - { SYF_MPSAFE | AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT }, /* 194 = getrlimit */ - { SYF_MPSAFE | AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT }, /* 195 = setrlimit */ - { SYF_MPSAFE | AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES }, /* 196 = getdirentries */ - { SYF_MPSAFE | AS(mmap_args), (sy_call_t *)mmap, AUE_MMAP }, /* 197 = mmap */ + { SYF_MPSAFE | AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_NULL }, /* 194 = getrlimit */ + { SYF_MPSAFE | AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_NULL }, /* 195 = setrlimit */ + { SYF_MPSAFE | AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_NULL }, /* 196 = getdirentries */ + { SYF_MPSAFE | AS(mmap_args), (sy_call_t *)mmap, AUE_NULL }, /* 197 = mmap */ { SYF_MPSAFE | 0, (sy_call_t *)nosys, AUE_NULL }, /* 198 = __syscall */ - { SYF_MPSAFE | AS(lseek_args), (sy_call_t *)lseek, AUE_LSEEK }, /* 199 = lseek */ - { SYF_MPSAFE | AS(truncate_args), (sy_call_t *)truncate, AUE_TRUNCATE }, /* 200 = truncate */ - { SYF_MPSAFE | AS(ftruncate_args), (sy_call_t *)ftruncate, AUE_FTRUNCATE }, /* 201 = ftruncate */ - { SYF_MPSAFE | AS(sysctl_args), (sy_call_t *)__sysctl, AUE_SYSCTL }, /* 202 = __sysctl */ - { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 203 = mlock */ - { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 204 = munlock */ - { SYF_MPSAFE | AS(undelete_args), (sy_call_t *)undelete, AUE_UNDELETE }, /* 205 = undelete */ - { SYF_MPSAFE | AS(futimes_args), (sy_call_t *)futimes, AUE_FUTIMES }, /* 206 = futimes */ - { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID }, /* 207 = getpgid */ + { SYF_MPSAFE | AS(lseek_args), (sy_call_t *)lseek, AUE_NULL }, /* 199 = lseek */ + { SYF_MPSAFE | AS(truncate_args), (sy_call_t *)truncate, AUE_NULL }, /* 200 = truncate */ + { SYF_MPSAFE | AS(ftruncate_args), (sy_call_t *)ftruncate, AUE_NULL }, /* 201 = ftruncate */ + { SYF_MPSAFE | AS(sysctl_args), (sy_call_t *)__sysctl, AUE_NULL }, /* 202 = __sysctl */ + { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_NULL }, /* 203 = mlock */ + { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_NULL }, /* 204 = munlock */ + { SYF_MPSAFE | AS(undelete_args), (sy_call_t *)undelete, AUE_NULL }, /* 205 = undelete */ + { SYF_MPSAFE | AS(futimes_args), (sy_call_t *)futimes, AUE_NULL }, /* 206 = futimes */ + { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_NULL }, /* 207 = getpgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 208 = newreboot */ - { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 209 = poll */ + { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_NULL }, /* 209 = poll */ { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL }, /* 210 = lkmnosys */ { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL }, /* 211 = lkmnosys */ { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL }, /* 212 = lkmnosys */ @@ -264,11 +264,11 @@ { SYF_MPSAFE | AS(clock_gettime_args), (sy_call_t *)clock_gettime, AUE_NULL }, /* 232 = clock_gettime */ { SYF_MPSAFE | AS(clock_settime_args), (sy_call_t *)clock_settime, AUE_NULL }, /* 233 = clock_settime */ { SYF_MPSAFE | AS(clock_getres_args), (sy_call_t *)clock_getres, AUE_NULL }, /* 234 = clock_getres */ - { SYF_MPSAFE | AS(ktimer_create_args), (sy_call_t *)ktimer_create, AUE_NULL }, /* 235 = ktimer_create */ - { SYF_MPSAFE | AS(ktimer_delete_args), (sy_call_t *)ktimer_delete, AUE_NULL }, /* 236 = ktimer_delete */ - { SYF_MPSAFE | AS(ktimer_settime_args), (sy_call_t *)ktimer_settime, AUE_NULL }, /* 237 = ktimer_settime */ - { SYF_MPSAFE | AS(ktimer_gettime_args), (sy_call_t *)ktimer_gettime, AUE_NULL }, /* 238 = ktimer_gettime */ - { SYF_MPSAFE | AS(ktimer_getoverrun_args), (sy_call_t *)ktimer_getoverrun, AUE_NULL }, /* 239 = ktimer_getoverrun */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 235 = timer_create */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 236 = timer_delete */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 237 = timer_settime */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 238 = timer_gettime */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 239 = timer_getoverrun */ { SYF_MPSAFE | AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL }, /* 240 = nanosleep */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 241 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 242 = nosys */ @@ -279,14 +279,14 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 247 = nosys */ { SYF_MPSAFE | AS(ntp_gettime_args), (sy_call_t *)ntp_gettime, AUE_NULL }, /* 248 = ntp_gettime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 249 = nosys */ - { SYF_MPSAFE | AS(minherit_args), (sy_call_t *)minherit, AUE_MINHERIT }, /* 250 = minherit */ - { SYF_MPSAFE | AS(rfork_args), (sy_call_t *)rfork, AUE_RFORK }, /* 251 = rfork */ - { SYF_MPSAFE | AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL }, /* 252 = openbsd_poll */ - { SYF_MPSAFE | 0, (sy_call_t *)issetugid, AUE_ISSETUGID }, /* 253 = issetugid */ - { SYF_MPSAFE | AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN }, /* 254 = lchown */ - { SYF_MPSAFE | AS(aio_read_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 255 = aio_read */ - { SYF_MPSAFE | AS(aio_write_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 256 = aio_write */ - { SYF_MPSAFE | AS(lio_listio_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 257 = lio_listio */ + { SYF_MPSAFE | AS(minherit_args), (sy_call_t *)minherit, AUE_NULL }, /* 250 = minherit */ + { SYF_MPSAFE | AS(rfork_args), (sy_call_t *)rfork, AUE_NULL }, /* 251 = rfork */ + { SYF_MPSAFE | AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_NULL }, /* 252 = openbsd_poll */ + { SYF_MPSAFE | 0, (sy_call_t *)issetugid, AUE_NULL }, /* 253 = issetugid */ + { SYF_MPSAFE | AS(lchown_args), (sy_call_t *)lchown, AUE_NULL }, /* 254 = lchown */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 255 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 256 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 257 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 258 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 259 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 260 = nosys */ @@ -301,15 +301,15 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 269 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 270 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 271 = nosys */ - { SYF_MPSAFE | AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS }, /* 272 = getdents */ + { SYF_MPSAFE | AS(getdents_args), (sy_call_t *)getdents, AUE_NULL }, /* 272 = getdents */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = nosys */ - { SYF_MPSAFE | AS(lchmod_args), (sy_call_t *)lchmod, AUE_LCHMOD }, /* 274 = lchmod */ - { SYF_MPSAFE | AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN }, /* 275 = netbsd_lchown */ - { SYF_MPSAFE | AS(lutimes_args), (sy_call_t *)lutimes, AUE_LUTIMES }, /* 276 = lutimes */ - { SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync, AUE_MSYNC }, /* 277 = netbsd_msync */ - { SYF_MPSAFE | AS(nstat_args), (sy_call_t *)nstat, AUE_STAT }, /* 278 = nstat */ - { SYF_MPSAFE | AS(nfstat_args), (sy_call_t *)nfstat, AUE_FSTAT }, /* 279 = nfstat */ - { SYF_MPSAFE | AS(nlstat_args), (sy_call_t *)nlstat, AUE_LSTAT }, /* 280 = nlstat */ + { SYF_MPSAFE | AS(lchmod_args), (sy_call_t *)lchmod, AUE_NULL }, /* 274 = lchmod */ + { SYF_MPSAFE | AS(lchown_args), (sy_call_t *)lchown, AUE_NULL }, /* 275 = netbsd_lchown */ + { SYF_MPSAFE | AS(lutimes_args), (sy_call_t *)lutimes, AUE_NULL }, /* 276 = lutimes */ + { SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync, AUE_NULL }, /* 277 = netbsd_msync */ + { SYF_MPSAFE | AS(nstat_args), (sy_call_t *)nstat, AUE_NULL }, /* 278 = nstat */ + { SYF_MPSAFE | AS(nfstat_args), (sy_call_t *)nfstat, AUE_NULL }, /* 279 = nfstat */ + { SYF_MPSAFE | AS(nlstat_args), (sy_call_t *)nlstat, AUE_NULL }, /* 280 = nlstat */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 281 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 282 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 283 = nosys */ @@ -326,35 +326,35 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 294 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 295 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 296 = nosys */ - { compat4(SYF_MPSAFE | AS(freebsd4_fhstatfs_args),fhstatfs), AUE_FHSTATFS }, /* 297 = old fhstatfs */ - { SYF_MPSAFE | AS(fhopen_args), (sy_call_t *)fhopen, AUE_FHOPEN }, /* 298 = fhopen */ - { SYF_MPSAFE | AS(fhstat_args), (sy_call_t *)fhstat, AUE_FHSTAT }, /* 299 = fhstat */ + { compat4(SYF_MPSAFE | AS(freebsd4_fhstatfs_args),fhstatfs), AUE_NULL }, /* 297 = old fhstatfs */ + { SYF_MPSAFE | AS(fhopen_args), (sy_call_t *)fhopen, AUE_NULL }, /* 298 = fhopen */ + { SYF_MPSAFE | AS(fhstat_args), (sy_call_t *)fhstat, AUE_NULL }, /* 299 = fhstat */ { SYF_MPSAFE | AS(modnext_args), (sy_call_t *)modnext, AUE_NULL }, /* 300 = modnext */ { SYF_MPSAFE | AS(modstat_args), (sy_call_t *)modstat, AUE_NULL }, /* 301 = modstat */ { SYF_MPSAFE | AS(modfnext_args), (sy_call_t *)modfnext, AUE_NULL }, /* 302 = modfnext */ { SYF_MPSAFE | AS(modfind_args), (sy_call_t *)modfind, AUE_NULL }, /* 303 = modfind */ - { SYF_MPSAFE | AS(kldload_args), (sy_call_t *)kldload, AUE_MODLOAD }, /* 304 = kldload */ - { SYF_MPSAFE | AS(kldunload_args), (sy_call_t *)kldunload, AUE_MODUNLOAD }, /* 305 = kldunload */ + { SYF_MPSAFE | AS(kldload_args), (sy_call_t *)kldload, AUE_NULL }, /* 304 = kldload */ + { SYF_MPSAFE | AS(kldunload_args), (sy_call_t *)kldunload, AUE_NULL }, /* 305 = kldunload */ { SYF_MPSAFE | AS(kldfind_args), (sy_call_t *)kldfind, AUE_NULL }, /* 306 = kldfind */ { SYF_MPSAFE | AS(kldnext_args), (sy_call_t *)kldnext, AUE_NULL }, /* 307 = kldnext */ { SYF_MPSAFE | AS(kldstat_args), (sy_call_t *)kldstat, AUE_NULL }, /* 308 = kldstat */ { SYF_MPSAFE | AS(kldfirstmod_args), (sy_call_t *)kldfirstmod, AUE_NULL }, /* 309 = kldfirstmod */ - { SYF_MPSAFE | AS(getsid_args), (sy_call_t *)getsid, AUE_GETSID }, /* 310 = getsid */ - { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 311 = setresuid */ - { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 312 = setresgid */ + { SYF_MPSAFE | AS(getsid_args), (sy_call_t *)getsid, AUE_NULL }, /* 310 = getsid */ + { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_NULL }, /* 311 = setresuid */ + { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_NULL }, /* 312 = setresgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 313 = obsolete signanosleep */ - { SYF_MPSAFE | AS(aio_return_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 314 = aio_return */ - { SYF_MPSAFE | AS(aio_suspend_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 315 = aio_suspend */ - { SYF_MPSAFE | AS(aio_cancel_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 316 = aio_cancel */ - { SYF_MPSAFE | AS(aio_error_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 317 = aio_error */ - { SYF_MPSAFE | AS(oaio_read_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 318 = oaio_read */ - { SYF_MPSAFE | AS(oaio_write_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 319 = oaio_write */ - { SYF_MPSAFE | AS(olio_listio_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 320 = olio_listio */ + { AS(aio_return_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 314 = aio_return */ + { AS(aio_suspend_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 315 = aio_suspend */ + { AS(aio_cancel_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 316 = aio_cancel */ + { AS(aio_error_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 317 = aio_error */ + { AS(aio_read_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 318 = aio_read */ + { AS(aio_write_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 319 = aio_write */ + { AS(lio_listio_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 320 = lio_listio */ { SYF_MPSAFE | 0, (sy_call_t *)yield, AUE_NULL }, /* 321 = yield */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 322 = obsolete thr_sleep */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 323 = obsolete thr_wakeup */ - { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 324 = mlockall */ - { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 325 = munlockall */ + { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_NULL }, /* 324 = mlockall */ + { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_NULL }, /* 325 = munlockall */ { SYF_MPSAFE | AS(__getcwd_args), (sy_call_t *)__getcwd, AUE_NULL }, /* 326 = __getcwd */ { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL }, /* 327 = sched_setparam */ { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL }, /* 328 = sched_getparam */ @@ -365,16 +365,16 @@ { SYF_MPSAFE | AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL }, /* 333 = sched_get_priority_min */ { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL }, /* 334 = sched_rr_get_interval */ { SYF_MPSAFE | AS(utrace_args), (sy_call_t *)utrace, AUE_NULL }, /* 335 = utrace */ - { compat4(SYF_MPSAFE | AS(freebsd4_sendfile_args),sendfile), AUE_SENDFILE }, /* 336 = old sendfile */ + { compat4(SYF_MPSAFE | AS(freebsd4_sendfile_args),sendfile), AUE_NULL }, /* 336 = old sendfile */ { SYF_MPSAFE | AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL }, /* 337 = kldsym */ - { SYF_MPSAFE | AS(jail_args), (sy_call_t *)jail, AUE_JAIL }, /* 338 = jail */ + { SYF_MPSAFE | AS(jail_args), (sy_call_t *)jail, AUE_NULL }, /* 338 = jail */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 339 = pioctl */ - { SYF_MPSAFE | AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK }, /* 340 = sigprocmask */ - { SYF_MPSAFE | AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND }, /* 341 = sigsuspend */ - { compat4(SYF_MPSAFE | AS(freebsd4_sigaction_args),sigaction), AUE_SIGACTION }, /* 342 = old sigaction */ - { SYF_MPSAFE | AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING }, /* 343 = sigpending */ - { compat4(SYF_MPSAFE | AS(freebsd4_sigreturn_args),sigreturn), AUE_SIGRETURN }, /* 344 = old sigreturn */ - { SYF_MPSAFE | AS(sigtimedwait_args), (sy_call_t *)sigtimedwait, AUE_SIGWAIT }, /* 345 = sigtimedwait */ + { SYF_MPSAFE | AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_NULL }, /* 340 = sigprocmask */ + { SYF_MPSAFE | AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_NULL }, /* 341 = sigsuspend */ + { compat4(SYF_MPSAFE | AS(freebsd4_sigaction_args),sigaction), AUE_NULL }, /* 342 = old sigaction */ + { SYF_MPSAFE | AS(sigpending_args), (sy_call_t *)sigpending, AUE_NULL }, /* 343 = sigpending */ + { compat4(SYF_MPSAFE | AS(freebsd4_sigreturn_args),sigreturn), AUE_NULL }, /* 344 = old sigreturn */ + { SYF_MPSAFE | AS(sigtimedwait_args), (sy_call_t *)sigtimedwait, AUE_NULL }, /* 345 = sigtimedwait */ { SYF_MPSAFE | AS(sigwaitinfo_args), (sy_call_t *)sigwaitinfo, AUE_NULL }, /* 346 = sigwaitinfo */ { SYF_MPSAFE | AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL }, /* 347 = __acl_get_file */ { SYF_MPSAFE | AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL }, /* 348 = __acl_set_file */ @@ -388,9 +388,9 @@ { SYF_MPSAFE | AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_NULL }, /* 356 = extattr_set_file */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 30 03:50:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06E1216A415; Fri, 30 Jun 2006 03:50:58 +0000 (UTC) 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 BED0016A40F for ; Fri, 30 Jun 2006 03:50:57 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8232D43D45 for ; Fri, 30 Jun 2006 03:50:57 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5U3ovFn061399 for ; Fri, 30 Jun 2006 03:50:57 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5U3ou0Z061396 for perforce@freebsd.org; Fri, 30 Jun 2006 03:50:56 GMT (envelope-from cdjones@FreeBSD.org) Date: Fri, 30 Jun 2006 03:50:56 GMT Message-Id: <200606300350.k5U3ou0Z061396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 100328 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, 30 Jun 2006 03:50:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=100328 Change 100328 by cdjones@cdjones-impulse on 2006/06/30 03:50:13 Continued fixing for -6 base. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/Makefile#2 integrate .. //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/jail.c#3 integrate Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/jail.8#3 (text+ko) ==== @@ -31,9 +31,9 @@ .\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp .\" ---------------------------------------------------------------------------- .\" -.\" $FreeBSD: src/usr.sbin/jail/jail.8,v 1.80 2006/06/11 12:57:41 bz Exp $ +.\" $FreeBSD: src/usr.sbin/jail/jail.8,v 1.67.2.8 2006/05/28 09:49:42 simon Exp $ .\" -.Dd June 11, 2006 +.Dd May 26, 2006 .Dt JAIL 8 .Os .Sh NAME @@ -141,8 +141,6 @@ .Xr devfs 8 for information on how to use devfs rules to limit access to entries in the per-jail devfs. -A simple devfs ruleset for jails is available as ruleset #4 in -.Pa /etc/defaults/devfs.rules . .Pp In many cases this example would put far more in the jail than needed. In the other extreme case a jail might contain only one file: @@ -161,7 +159,7 @@ to build the jail directory tree. For the sake of this example, we will assume you built it in -.Pa /data/jail/192.0.2.100 , +.Pa /data/jail/192.168.11.100 , named for the jailed IP address. Substitute below as needed with your own directory, IP address, and hostname. @@ -187,11 +185,11 @@ in the host environment: .Bd -literal -offset indent sendmail_enable="NO" -inetd_flags="-wW -a 192.0.2.23" +inetd_flags="-wW -a 192.168.11.23" rpcbind_enable="NO" .Ed .Pp -.Li 192.0.2.23 +.Li 192.168.11.23 is the native IP address for the host system, in this example. Daemons that run out of .Xr inetd 8 @@ -260,7 +258,7 @@ .Pp Start a shell in the jail: .Pp -.Dl "jail /data/jail/192.0.2.100 testhostname 192.0.2.100 /bin/sh" +.Dl "jail /data/jail/192.168.11.100 testhostname 192.168.11.100 /bin/sh" .Pp Assuming no errors, you will end up with a shell prompt within the jail. You can now run @@ -313,7 +311,7 @@ .Xr syslogd 8 in the host environment to listen on the syslog socket in the jail environment; in this example, the syslog socket would be stored in -.Pa /data/jail/192.0.2.100/var/run/log . +.Pa /data/jail/192.168.11.100/var/run/log . .Pp Exit from the shell, and the jail will be shut down. .Ss "Starting the Jail" @@ -340,9 +338,9 @@ If you do decide to set this variable, it must be set before starting any jails, and once each boot. .Bd -literal -offset indent -ifconfig ed0 inet alias 192.0.2.100/32 -mount -t procfs proc /data/jail/192.0.2.100/proc -jail /data/jail/192.0.2.100 testhostname 192.0.2.100 \\ +ifconfig ed0 inet alias 192.168.11.100/32 +mount -t procfs proc /data/jail/192.168.11.100/proc +jail /data/jail/192.168.11.100 testhostname 192.168.11.100 \\ /bin/sh /etc/rc .Ed .Pp ==== //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/jail.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/jail/jail.c,v 1.25 2006/05/12 15:14:43 matteo Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/jail/jail.c,v 1.20.2.3 2006/05/26 10:30:59 matteo Exp $"); #include #include From owner-p4-projects@FreeBSD.ORG Fri Jun 30 03:53:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E961916A416; Fri, 30 Jun 2006 03:53:00 +0000 (UTC) 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 C4C4016A412 for ; Fri, 30 Jun 2006 03:53:00 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AE6A43D48 for ; Fri, 30 Jun 2006 03:53:00 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5U3r0un061487 for ; Fri, 30 Jun 2006 03:53:00 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5U3r0Nt061484 for perforce@freebsd.org; Fri, 30 Jun 2006 03:53:00 GMT (envelope-from cdjones@FreeBSD.org) Date: Fri, 30 Jun 2006 03:53:00 GMT Message-Id: <200606300353.k5U3r0Nt061484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 100329 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, 30 Jun 2006 03:53:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=100329 Change 100329 by cdjones@cdjones-impulse on 2006/06/30 03:52:00 Last bit of -6 move. Whee. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#4 integrate Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#3 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Jun 30 04:02:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88EF616A47E; Fri, 30 Jun 2006 04:02:17 +0000 (UTC) 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 3FB1A16A40F for ; Fri, 30 Jun 2006 04:02:17 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 626E343DD5 for ; Fri, 30 Jun 2006 04:02:12 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5U42CDs063286 for ; Fri, 30 Jun 2006 04:02:12 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5U42BxT063283 for perforce@freebsd.org; Fri, 30 Jun 2006 04:02:11 GMT (envelope-from cdjones@FreeBSD.org) Date: Fri, 30 Jun 2006 04:02:11 GMT Message-Id: <200606300402.k5U42BxT063283@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 100330 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, 30 Jun 2006 04:02:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=100330 Change 100330 by cdjones@cdjones-impulse on 2006/06/30 04:02:05 Hmm. That didn't take. More drastic measures required. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/Make.tags.inc#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/Makefile#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/bus_if.m#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/clock_if.m#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/cpufreq_if.m#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/device_if.m#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/genassym.sh#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_aout.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf32.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf64.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_gzip.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_shell.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/inflate.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/init_main.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/init_sysent.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_acct.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_acl.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_alq.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_clock.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_condvar.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_conf.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_context.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_cpu.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_descrip.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_environment.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_event.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_exec.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_exit.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_fork.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_idle.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_intr.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_kse.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_kthread.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_ktr.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_ktrace.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_linker.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_lock.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_lockf.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_mac.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_malloc.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_mbuf.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_mib.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_module.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_mtxpool.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_mutex.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_ntptime.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_physio.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_pmc.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_poll.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_proc.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_prot.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_resource.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_rwlock.c#2 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_sema.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_shutdown.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_sig.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_subr.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_switch.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_sx.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_synch.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_syscalls.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_sysctl.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_tc.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_thr.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_thread.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_time.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_timeout.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_umtx.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_uuid.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_xxx.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/link_elf.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/link_elf_obj.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/linker_if.m#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/makesyscalls.sh#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/md4c.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/md5c.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_4bsd.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_core.c#2 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_ule.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/serdev_if.m#2 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_autoconf.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_blist.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_bus.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_clock.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_devstat.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_disk.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_eventhandler.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_firmware.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_hints.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_kdb.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_kobj.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_lock.c#2 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_log.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_mbpool.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_mchain.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_module.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_msgbuf.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_param.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_pcpu.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_power.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_prf.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_prof.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_rman.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_sbuf.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_scanf.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_sleepqueue.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_smp.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_stack.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_taskqueue.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_trap.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_turnstile.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_unit.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_witness.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sys_generic.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sys_pipe.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sys_process.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sys_socket.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/syscalls.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/syscalls.master#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sysv_ipc.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sysv_msg.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sysv_sem.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sysv_shm.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_compat.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_conf.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_cons.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_pts.c#2 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_pty.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_subr.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_tty.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_accf.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_cow.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_domain.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_mbuf.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_mbuf2.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_mqueue.c#2 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_proto.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_sem.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_socket.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_socket2.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_syscalls.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_usrreq.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_aio.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_bio.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_cache.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_cluster.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_default.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_export.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_hash.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_init.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_lookup.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_mount.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_subr.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_syscalls.c#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_vnops.c#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vnode_if.src#4 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_iovec.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_label.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_lock.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_mutex.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_null.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_pthreadtypes.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_rwlock.h#2 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_sigset.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_task.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_timespec.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_timeval.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_types.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/aac_ioctl.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/acct.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/acl.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/agpio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/aio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/alq.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/assym.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ata.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bitstring.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/blist.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/buf.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bufobj.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bus.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bus_dma.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/callout.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cdefs.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cdio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cdrio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/chio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/clist.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/clock.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/condvar.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/conf.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cons.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/consio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/copyright.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cpu.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ctype.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/dataacq.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/device_port.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/devicestat.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/digiio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/dir.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/dirent.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/disk.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/disklabel.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/diskmbr.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/diskpc98.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/dkstat.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/domain.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/dvdio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf32.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf64.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf_common.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf_generic.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/endian.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/errno.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/eui64.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/event.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/eventhandler.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/eventvar.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/exec.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/extattr.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/fbio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/fcntl.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/fdcio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/file.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/filedesc.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/filio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/firmware.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/fnv_hash.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/gmon.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/gpt.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/hash.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/iconv.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/imgact.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/imgact_aout.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/imgact_elf.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/inflate.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/interrupt.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ioccom.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ioctl.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ioctl_compat.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ipc.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ipmi.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#5 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/joystick.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kbio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kdb.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kenv.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kernel.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kerneldump.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kobj.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kse.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kthread.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ktr.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ktrace.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/libkern.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/limits.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/linedisc.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/link_aout.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/link_elf.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/linker.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/linker_set.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/lock.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/lockf.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/lockmgr.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mac.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mac_policy.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/malloc.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mbpool.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mbuf.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mchain.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/md4.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/md5.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mdioctl.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/memrange.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mman.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/module.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mount.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mouse.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mqueue.h#2 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/msg.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/msgbuf.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mtio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mutex.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/namei.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/nlist_aout.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/param.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pciio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pcpu.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pioctl.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pipe.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pmc.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pmckern.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pmclog.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/poll.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/power.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/priority.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/proc.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/procfs.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/protosw.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ptio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ptrace.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/queue.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/random.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/reboot.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/refcount.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/regression.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/resource.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/resourcevar.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/rman.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/rtprio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/runq.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/rwlock.h#2 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sbuf.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sched.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/select.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/selinfo.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sem.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sema.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/serial.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sf_buf.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/shm.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sigio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/signal.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/signalvar.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sleepqueue.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/smp.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/snoop.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/socket.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/socketvar.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sockio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/soundcard.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/stack.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/stat.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/statvfs.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/stddef.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/stdint.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sun_disklabel.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sx.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscall.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscall.mk#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscallsubr.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysctl.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysent.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syslimits.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syslog.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysproto.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/systm.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/taskqueue.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/termios.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/thr.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/tiio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/time.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timeb.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timepps.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timers.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/times.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timespec.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timetc.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timex.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/tree.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/tty.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ttychars.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ttycom.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ttydefaults.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ttydev.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/turnstile.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/types.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ucontext.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ucred.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/uio.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/umtx.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/un.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/unistd.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/unpcb.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/user.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/utsname.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/uuid.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/vmmeter.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/vnode.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/wait.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/watchdog.h#3 delete .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/xrpuio.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jun 30 04:07:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7778D16A412; Fri, 30 Jun 2006 04:07:19 +0000 (UTC) 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 4343316A403 for ; Fri, 30 Jun 2006 04:07:19 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F048443D48 for ; Fri, 30 Jun 2006 04:07:18 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5U47IBw064715 for ; Fri, 30 Jun 2006 04:07:18 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5U47IuV064712 for perforce@freebsd.org; Fri, 30 Jun 2006 04:07:18 GMT (envelope-from cdjones@FreeBSD.org) Date: Fri, 30 Jun 2006 04:07:18 GMT Message-Id: <200606300407.k5U47IuV064712@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 100331 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, 30 Jun 2006 04:07:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=100331 Change 100331 by cdjones@cdjones-impulse on 2006/06/30 04:06:54 ... Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jun 30 05:03:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA0F216A552; Fri, 30 Jun 2006 05:03:20 +0000 (UTC) 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 91ED316A50D for ; Fri, 30 Jun 2006 05:03:20 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 80A734457E for ; Fri, 30 Jun 2006 04:36:55 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5U4atrZ078138 for ; Fri, 30 Jun 2006 04:36:55 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5U4atZQ078135 for perforce@freebsd.org; Fri, 30 Jun 2006 04:36:55 GMT (envelope-from cdjones@FreeBSD.org) Date: Fri, 30 Jun 2006 04:36:55 GMT Message-Id: <200606300436.k5U4atZQ078135@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 100332 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, 30 Jun 2006 05:03:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=100332 Change 100332 by cdjones@cdjones-impulse on 2006/06/30 04:36:28 ... and bring things back, now with RELENG_6 goodness. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/Make.tags.inc#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/Makefile#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/bus_if.m#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/clock_if.m#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/cpufreq_if.m#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/device_if.m#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/genassym.sh#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_aout.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf32.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf64.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_gzip.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_shell.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/inflate.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/init_main.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/init_sysent.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_acct.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_acl.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_alq.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_clock.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_condvar.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_conf.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_context.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_cpu.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_descrip.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_environment.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_event.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_exec.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_exit.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_fork.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_idle.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_intr.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_kse.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_kthread.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_ktr.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_ktrace.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_linker.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_lock.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_lockf.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_mac.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_malloc.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_mbuf.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_mib.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_module.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_mtxpool.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_mutex.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_ntptime.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_physio.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_pmc.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_poll.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_proc.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_prot.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_resource.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_sema.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_shutdown.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_sig.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_subr.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_switch.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_sx.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_synch.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_syscalls.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_sysctl.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_tc.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_thr.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_thread.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_time.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_timeout.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_umtx.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_uuid.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_xxx.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/link_elf.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/link_elf_obj.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/linker_if.m#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/makesyscalls.sh#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/md4c.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/md5c.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_4bsd.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_ule.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_autoconf.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_blist.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_bus.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_clock.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_devstat.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_disk.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_eventhandler.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_firmware.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_hints.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_kdb.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_kobj.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_log.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_mbpool.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_mchain.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_module.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_msgbuf.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_param.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_pcpu.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_power.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_prf.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_prof.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_rman.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_sbuf.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_scanf.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_sleepqueue.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_smp.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_stack.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_taskqueue.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_trap.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_turnstile.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_unit.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_witness.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sys_generic.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sys_pipe.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sys_process.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sys_socket.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/syscalls.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/syscalls.master#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sysv_ipc.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sysv_msg.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sysv_sem.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sysv_shm.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_compat.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_conf.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_cons.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_pty.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_subr.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/tty_tty.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_accf.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_cow.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_domain.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_mbuf.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_mbuf2.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_proto.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_sem.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_socket.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_socket2.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_syscalls.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_usrreq.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_aio.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_bio.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_cache.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_cluster.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_default.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_export.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_hash.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_init.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_lookup.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_mount.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_subr.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_syscalls.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_vnops.c#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vnode_if.src#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_iovec.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_label.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_lock.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_mutex.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_null.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_pthreadtypes.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_sigset.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_task.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_timespec.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_timeval.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_types.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/aac_ioctl.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/acct.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/acl.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/agpio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/aio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/alq.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/assym.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ata.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bitstring.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/blist.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/buf.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bufobj.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bus.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bus_dma.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/callout.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cdefs.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cdio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cdrio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/chio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/clist.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/clock.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/condvar.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/conf.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cons.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/consio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/copyright.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cpu.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ctype.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/dataacq.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/device_port.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/devicestat.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/digiio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/dir.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/dirent.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/disk.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/disklabel.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/diskmbr.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/diskpc98.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/dkstat.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/domain.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/dvdio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf32.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf64.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf_common.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf_generic.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/endian.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/errno.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/eui64.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/event.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/eventhandler.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/eventvar.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/exec.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/extattr.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/fbio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/fcntl.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/fdcio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/file.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/filedesc.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/filio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/firmware.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/fnv_hash.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/gmon.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/gpt.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/hash.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/iconv.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/imgact.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/imgact_aout.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/imgact_elf.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/inflate.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/interrupt.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ioccom.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ioctl.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ioctl_compat.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ipc.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ipmi.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/joystick.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kbio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kdb.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kenv.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kernel.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kerneldump.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kobj.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kse.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kthread.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ktr.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ktrace.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/libkern.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/limits.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/linedisc.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/link_aout.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/link_elf.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/linker.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/linker_set.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/lock.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/lockf.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/lockmgr.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mac.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mac_policy.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/malloc.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mbpool.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mbuf.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mchain.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/md4.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/md5.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mdioctl.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/memrange.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mman.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/module.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mount.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mouse.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/msg.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/msgbuf.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mtio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mutex.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/namei.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/nlist_aout.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/param.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pciio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pcpu.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pioctl.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pipe.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pmc.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pmckern.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pmclog.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/poll.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/power.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/priority.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/proc.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/procfs.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/protosw.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ptio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ptrace.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/queue.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/random.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/reboot.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/refcount.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/regression.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/resource.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/resourcevar.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/rman.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/rtprio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/runq.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sbuf.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sched.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/select.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/selinfo.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sem.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sema.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/serial.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sf_buf.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/shm.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sigio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/signal.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/signalvar.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sleepqueue.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/smp.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/snoop.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/socket.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/socketvar.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sockio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/soundcard.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/stack.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/stat.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/statvfs.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/stddef.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/stdint.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sun_disklabel.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sx.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscall.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscall.mk#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscallsubr.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysctl.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysent.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syslimits.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syslog.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysproto.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/systm.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/taskqueue.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/termios.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/thr.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/tiio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/time.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timeb.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timepps.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timers.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/times.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timespec.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timetc.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/timex.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/tree.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/tty.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ttychars.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ttycom.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ttydefaults.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ttydev.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/turnstile.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/types.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ucontext.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ucred.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/uio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/umtx.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/un.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/unistd.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/unpcb.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/user.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/utsname.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/uuid.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/vmmeter.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/vnode.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/wait.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/watchdog.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/xrpuio.h#4 branch .. //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/Makefile#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/jail.8#4 integrate .. //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/jail.c#4 integrate Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/Makefile#3 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/jail.8#4 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/jail.c#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Jun 30 05:03:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAE7216A601; Fri, 30 Jun 2006 05:03:36 +0000 (UTC) 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 9291916A5D5 for ; Fri, 30 Jun 2006 05:03:36 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37DA5446D4 for ; Fri, 30 Jun 2006 04:46:07 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5U4k7wY083589 for ; Fri, 30 Jun 2006 04:46:07 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5U4k7cF083582 for perforce@freebsd.org; Fri, 30 Jun 2006 04:46:07 GMT (envelope-from cdjones@FreeBSD.org) Date: Fri, 30 Jun 2006 04:46:07 GMT Message-Id: <200606300446.k5U4k7cF083582@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 100333 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, 30 Jun 2006 05:03:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=100333 Change 100333 by cdjones@cdjones-impulse on 2006/06/30 04:45:45 And now it's all in sync, including modifications. (Mutter.) Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#5 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#6 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jun 30 05:11:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28D1716A416; Fri, 30 Jun 2006 05:11:49 +0000 (UTC) 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 C257B16A412 for ; Fri, 30 Jun 2006 05:11:48 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 26D7A43D73 for ; Fri, 30 Jun 2006 05:11:38 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5U5Bc5I094179 for ; Fri, 30 Jun 2006 05:11:38 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5U5BclY094168 for perforce@freebsd.org; Fri, 30 Jun 2006 05:11:38 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 30 Jun 2006 05:11:38 GMT Message-Id: <200606300511.k5U5BclY094168@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100334 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, 30 Jun 2006 05:11:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=100334 Change 100334 by kmacy@kmacy_storage:sun4v_work_experimental_sux on 2006/06/30 05:10:49 initial commit to branch Affected files ... .. //depot/projects/kmacy_sun4v_experimental/src/COPYRIGHT#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/LOCKS#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/MAINTAINERS#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/Makefile.inc1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/ObsoleteFiles.inc#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/README#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/UPDATING#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/Makefile.inc#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/cat/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/cat/cat.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/cat/cat.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/chflags/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/chflags/chflags.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/chflags/chflags.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/chio/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/chio/chio.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/chio/chio.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/chio/defs.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/chio/pathnames.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/chmod/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/chmod/chmod.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/chmod/chmod.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/cp/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/cp/cp.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/cp/cp.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/cp/extern.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/cp/utils.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/csh/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/csh/config.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/csh/config_p.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/csh/host.defs#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/csh/iconv.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/csh/iconv_stub.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/date/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/date/date.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/date/date.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/date/extern.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/date/netdate.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/date/vary.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/date/vary.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/args.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/conv.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/conv_tab.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/dd.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/dd.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/dd.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/extern.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/gen.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/misc.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/position.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/ref.ascii#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/ref.ebcdic#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/ref.ibm#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/ref.lcase#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/ref.oldascii#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/ref.oldibm#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/ref.pareven#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/ref.parnone#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/ref.parodd#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/ref.parset#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/ref.swab#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/dd/ref.ucase#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/df/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/df/df.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/df/df.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/domainname/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/domainname/domainname.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/domainname/domainname.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/echo/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/echo/echo.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/echo/echo.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/POSIX#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/README#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/buf.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/cbc.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/ed.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/ed.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/glbl.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/io.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/main.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/re.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/sub.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/=.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/README#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/TODO#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/a.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/a.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/a.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/a1.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/a2.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/addr.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/addr.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/addr.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/addr1.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/addr2.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/ascii.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/bang1.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/bang1.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/bang1.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/bang1.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/bang2.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/c.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/c.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/c.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/c1.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/c2.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/d.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/d.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/d.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/d.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/e1.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/e1.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/e1.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/e1.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/e2.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/e2.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/e2.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/e2.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/e3.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/e3.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/e3.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/e3.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/e4.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/e4.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/e4.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/f1.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/f2.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g1.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g1.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g1.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g1.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g2.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g2.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g2.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g2.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g3.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g3.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g3.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g3.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g4.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g4.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g4.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g5.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g5.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/g5.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/h.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/i.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/i.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/i.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/i1.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/i2.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/i3.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/j.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/j.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/j.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/k.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/k.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/k.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/k1.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/k2.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/k3.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/k4.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/l.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/l.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/l.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/m.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/m.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/m.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/m.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/n.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/n.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/n.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/nl.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/nl1.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/nl1.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/nl1.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/nl2.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/nl2.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/nl2.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/p.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/p.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/p.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/q.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/q.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/q.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/q1.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/r1.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/r1.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/r1.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/r1.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/r2.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/r2.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/r2.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/r2.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/r3.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/r3.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/r3.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s1.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s1.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s1.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s1.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s10.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s2.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s2.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s2.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s2.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s3.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s3.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s3.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s3.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s4.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s5.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s6.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s7.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s8.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/s9.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/t.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/t.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/t1.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/t1.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/t1.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/t1.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/t2.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/t2.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/t2.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/t2.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/u.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/u.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/u.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/u.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/v.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/v.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/v.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/w.d#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/w.r#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/w.t#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/w1.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/w2.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/w3.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/x.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/test/z.err#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ed/undo.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/expr/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/expr/expr.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/expr/expr.y#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/getfacl/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/getfacl/getfacl.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/getfacl/getfacl.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/hostname/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/hostname/hostname.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/hostname/hostname.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/kenv/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/kenv/kenv.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/kenv/kenv.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/kill/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/kill/kill.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/kill/kill.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ln/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ln/ln.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ln/ln.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ln/symlink.7#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ls/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ls/cmp.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ls/extern.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ls/ls.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ls/ls.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ls/ls.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ls/print.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ls/util.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/mkdir/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/mkdir/mkdir.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/mkdir/mkdir.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/mv/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/mv/mv.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/mv/mv.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/ar_io.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/ar_subs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/buf_subs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/cache.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/cache.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/cpio.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/cpio.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/cpio.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/extern.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/file_subs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/ftree.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/ftree.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/gen_subs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/getoldopt.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/options.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/options.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/pat_rep.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/pat_rep.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/pax.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/pax.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/pax.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/sel_subs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/sel_subs.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/tables.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/tables.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/tar.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/tar.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/tar.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pax/tty_subs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ps/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ps/extern.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ps/fmt.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ps/keyword.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ps/nlist.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ps/print.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ps/ps.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ps/ps.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/ps/ps.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pwd/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pwd/pwd.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/pwd/pwd.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/rcp/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/rcp/extern.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/rcp/rcp.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/rcp/rcp.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/rcp/util.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/realpath/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/realpath/realpath.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/realpath/realpath.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/rm/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/rm/rm.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/rm/rm.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/rmail/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/rmdir/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/rmdir/rmdir.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/rmdir/rmdir.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/setfacl/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/setfacl/file.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/setfacl/mask.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/setfacl/merge.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/setfacl/remove.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/setfacl/setfacl.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/setfacl/setfacl.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/setfacl/setfacl.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/setfacl/util.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/TOUR#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/alias.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/alias.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/arith.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/arith.y#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/arith_lex.l#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/bltin/echo.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/bltin/echo.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/builtins.def#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/cd.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/cd.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/error.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/error.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/eval.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/eval.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/exec.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/exec.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/expand.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/expand.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/funcs/cmv#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/funcs/dirs#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/funcs/kill#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/funcs/login#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/funcs/newgrp#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/funcs/popd#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/funcs/pushd#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/funcs/suspend#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/histedit.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/init.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/input.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/input.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/jobs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/jobs.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/mail.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/mail.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/main.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/main.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/memalloc.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/memalloc.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/miscbltin.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/mkbuiltins#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/mkinit.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/mknodes.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/mksyntax.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/mktokens#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/myhistedit.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/mystring.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/mystring.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/nodes.c.pat#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/nodetypes#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/options.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/options.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/output.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/output.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/parser.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/parser.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/redir.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/redir.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/sh.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/shell.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/show.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/show.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/trap.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/trap.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/var.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sh/var.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sleep/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sleep/sleep.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sleep/sleep.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/stty/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/stty/cchar.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/stty/extern.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/stty/gfmt.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/stty/key.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/stty/modes.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/stty/print.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/stty/stty.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/stty/stty.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/stty/stty.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/stty/util.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sync/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sync/sync.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/sync/sync.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/test/Makefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/test/TEST.README#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/test/TEST.csh#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/test/TEST.sh#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/test/test.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/bin/test/test.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/AUTHORS#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/BUGS#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/COPYING#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/ChangeLog#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/INSTALL#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/NEWS#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/README#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/README.ldap#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/README.y2k#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amd.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amd.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amd.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/autil.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/clock.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/conf.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/map.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/opts.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/restart.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/sched.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amq/amq.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amq/amq.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amq/amq.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/bootstrap#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/doc/version.texi#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/libamu/util.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/m4/amindent#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/m4/autopat#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/m4/mkconf#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/tasks#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/AUTHORS#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/ChangeLog#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/FAQ#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/INSTALL#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Makefile.am#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/NEWS#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/README#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/array.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/atan.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/div.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/exp.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/fact.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/jn.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/ln.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/mul.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/raise.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/signum#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/sine.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/Test/timetest#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/acconfig.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/aclocal.m4#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/bc.y#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/const.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/execute.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/global.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/global.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/load.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/main.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/proto.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/scan.l#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/storage.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/bc/util.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/config.h.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/configure#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/configure.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/dc/array.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/dc/dc.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/dc/dc.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/dc/eval.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/dc/misc.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/dc/stack.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/dc/string.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/doc/bc.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/doc/dc.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/h/number.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/install-sh#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/lib/number.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/missing#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bc/stamp-h.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/CHANGES#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/FAQ#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/README#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/acconfig.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/config.guess#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/config.sub#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/config.threads.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/configure.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/kmacy_sun4v_experimental/src/contrib/bind9/doc/rfc/rfc3445.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 30 05:26:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9400216A417; Fri, 30 Jun 2006 05:26:59 +0000 (UTC) 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 4B21C16A412 for ; Fri, 30 Jun 2006 05:26:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E76643D48 for ; Fri, 30 Jun 2006 05:26:59 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5U5QwmX094880 for ; Fri, 30 Jun 2006 05:26:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5U5Qw65094877 for perforce@freebsd.org; Fri, 30 Jun 2006 05:26:58 GMT (envelope-from jb@freebsd.org) Date: Fri, 30 Jun 2006 05:26:58 GMT Message-Id: <200606300526.k5U5Qw65094877@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100336 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, 30 Jun 2006 05:26:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=100336 Change 100336 by jb@jb_freebsd2 on 2006/06/30 05:26:02 Integrate sun4v_stable Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/exception.S#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#2 integrate Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#2 (text+ko) ==== @@ -136,7 +136,7 @@ # Serial (COM) ports #device sab # Siemens SAB82532 based serial ports -device uart # Multi-uart driver +#device uart # Multi-uart driver #device puc # Multi-channel uarts # Parallel port ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/exception.S#2 (text+ko) ==== @@ -46,7 +46,6 @@ #include #include - #include "assym.s" #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#2 (text+ko) ==== @@ -186,6 +186,7 @@ static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); static void pmap_remove_tte(pmap_t pmap, tte_t tte_data, vm_offset_t va); +static void pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot); void pmap_set_ctx_panic(uint64_t error, vm_paddr_t tsb_ra, pmap_t pmap); @@ -383,7 +384,7 @@ { pmap_t pmap, oldpmap; int context, err; - DPRINTF("activating pmap for %d\n", td->td_tid); + int err; critical_enter(); pmap = vmspace_pmap(td->td_proc->p_vmspace); @@ -404,6 +405,8 @@ context = pmap->pm_context; if (pmap->pm_context != 0) if ((err = hv_set_ctxnon0(1, pmap->pm_tsb_ra)) != H_EOK) + panic("failed to set TSB 0x%lx - context == %ld\n", + pmap->pm_tsb_ra, pmap->pm_context); panic("failed to set TSB 0x%lx - context == %d\n", pmap->pm_tsb_ra, context); stxa(MMU_CID_S, ASI_MMU_CONTEXTID, context); @@ -999,9 +1002,49 @@ } -vm_page_t -pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, - vm_page_t mpte) +/* + * Maps a sequence of resident pages belonging to the same object. + * The sequence begins with the given page m_start. This page is + * mapped at the given virtual address start. Each subsequent page is + * mapped at a virtual address that is offset from start by the same + * amount as the page is offset from m_start within the object. The + * last page in the sequence is the page with the largest offset from + * m_start that can be mapped at a virtual address less than the given + * virtual address end. Not every virtual page between start and end + * is mapped; only those for which a resident page exists with the + * corresponding offset from m_start are mapped. + */ +void +pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, + vm_page_t m_start, vm_prot_t prot) +{ + vm_page_t m, mpte; + vm_pindex_t diff, psize; + + VM_OBJECT_LOCK_ASSERT(m_start->object, MA_OWNED); + psize = atop(end - start); + mpte = NULL; + m = m_start; + PMAP_LOCK(pmap); + while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) { + pmap_enter_quick_locked(pmap, start + ptoa(diff), m, + prot); + m = TAILQ_NEXT(m, listq); + } + PMAP_UNLOCK(pmap); +} + +void +pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) +{ + PMAP_LOCK(pmap); + pmap_enter_quick_locked(pmap, va, m, prot); + PMAP_UNLOCK(pmap); + +} + +static void +pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) { tte_t tte_data; @@ -1009,14 +1052,10 @@ if (pmap->pm_context) KDPRINTF("pmap_enter_quick(ctx=0x%lx va=%lx, pa=0x%lx prot=%x)\n", pmap->pm_context, va, VM_PAGE_TO_PHYS(m), prot); - - mtx_assert(&vm_page_queue_mtx, MA_OWNED); - VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); - PMAP_LOCK(pmap); - + PMAP_LOCK_ASSERT(pmap, MA_OWNED); if (tte_hash_lookup(pmap->pm_hash, va)) - goto done; + return; tte_data = VM_PAGE_TO_PHYS(m); /* @@ -1038,10 +1077,7 @@ tte_data |= TTE_KERNEL_MINFLAGS; tte_hash_insert(pmap->pm_hash, va, tte_data | TTE_MINFLAGS); -done: - PMAP_UNLOCK(pmap); - return (0); } /* From owner-p4-projects@FreeBSD.ORG Fri Jun 30 06:23:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE17816A416; Fri, 30 Jun 2006 06:23:08 +0000 (UTC) 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 6BC1316A415 for ; Fri, 30 Jun 2006 06:23:08 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 338CE4448F for ; Fri, 30 Jun 2006 06:23:08 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5U6N8p4098464 for ; Fri, 30 Jun 2006 06:23:08 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5U6N7uq098461 for perforce@freebsd.org; Fri, 30 Jun 2006 06:23:07 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 30 Jun 2006 06:23:07 GMT Message-Id: <200606300623.k5U6N7uq098461@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100338 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, 30 Jun 2006 06:23:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=100338 Change 100338 by kmacy@kmacy_storage:sun4v_work_stable on 2006/06/30 06:22:25 add VM init spam to track down problem with booting on jb's 32GB T2000 Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/vm/vm_init.c#2 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/vm/vm_map.c#3 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/vm/vm_page.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/vm/vm_init.c#2 (text+ko) ==== @@ -114,17 +114,24 @@ * Initializes resident memory structures. From here on, all physical * memory is accounted for, and we use only virtual addresses. */ + printf("set page size\n"); vm_set_page_size(); + printf("virtual_avail=0x%lx\n", virtual_avail); virtual_avail = vm_page_startup(virtual_avail); - + printf("post-vm_page_startup: virtual_avail=0x%lx\n", virtual_avail); /* * Initialize other VM packages */ vm_object_init(); + printf("vm_object_inited\n"); vm_map_startup(); + printf("vm_map_startup\n"); kmem_init(virtual_avail, virtual_end); + printf("kmem_inited\n"); pmap_init(); + printf("pmap_init\n"); vm_pager_init(); + printf("vm_pager_init\n"); } void ==== //depot/projects/kmacy_sun4v_stable/src/sys/vm/vm_map.c#3 (text+ko) ==== @@ -159,6 +159,7 @@ vm_map_startup(void) { mtx_init(&map_sleep_mtx, "vm map sleep mutex", NULL, MTX_DEF); + printf("uma_zcreate\n"); mapzone = uma_zcreate("MAP", sizeof(struct vm_map), NULL, #ifdef INVARIANTS vm_map_zdtor, @@ -166,11 +167,15 @@ NULL, #endif vm_map_zinit, vm_map_zfini, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + printf("uma_prealloc\n"); uma_prealloc(mapzone, MAX_KMAP); + printf("KMAP ENTRY\n"); kmapentzone = uma_zcreate("KMAP ENTRY", sizeof(struct vm_map_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_MTXCLASS | UMA_ZONE_VM); + printf("prealloc kmapentzone\n"); uma_prealloc(kmapentzone, MAX_KMAPENT); + printf("uma_zcreate MAP ENTRY\n"); mapentzone = uma_zcreate("MAP ENTRY", sizeof(struct vm_map_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); } ==== //depot/projects/kmacy_sun4v_stable/src/sys/vm/vm_page.c#3 (text+ko) ==== @@ -222,6 +222,7 @@ nblocks = 0; vaddr = round_page(vaddr); + printf("checking physavail\n"); for (i = 0; phys_avail[i + 1]; i += 2) { phys_avail[i] = round_page(phys_avail[i]); phys_avail[i + 1] = trunc_page(phys_avail[i + 1]); @@ -252,6 +253,7 @@ * Initialize the queue headers for the free queue, the active queue * and the inactive queue. */ + printf("vm_pageq_init\n"); vm_pageq_init(); /* @@ -260,9 +262,12 @@ */ new_end = end - (boot_pages * UMA_SLAB_SIZE); new_end = trunc_page(new_end); + printf("vm_page_startup pmap_map\n"); mapped = pmap_map(&vaddr, new_end, end, VM_PROT_READ | VM_PROT_WRITE); + printf("bzero\n"); bzero((void *)mapped, end - new_end); + printf("uma_startup\n"); uma_startup((void *)mapped, boot_pages); #if defined(__amd64__) || defined(__i386__) @@ -333,6 +338,7 @@ */ cnt.v_page_count = 0; cnt.v_free_count = 0; + printf("checking vm.blacklist\n"); list = getenv("vm.blacklist"); for (i = 0; phys_avail[i + 1] && npages > 0; i += 2) { pa = phys_avail[i]; @@ -347,6 +353,7 @@ pa += PAGE_SIZE; } } + printf("passed vm.blacklist check\n"); freeenv(list); return (vaddr); } From owner-p4-projects@FreeBSD.ORG Fri Jun 30 06:47:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C85316A47C; Fri, 30 Jun 2006 06:47:39 +0000 (UTC) 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 5802916A417 for ; Fri, 30 Jun 2006 06:47:39 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0930F43D53 for ; Fri, 30 Jun 2006 06:47:39 +0000 (GMT) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5U6lc3m099495 for ; Fri, 30 Jun 2006 06:47:38 GMT (envelope-from ryanb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5U6lcKe099492 for perforce@freebsd.org; Fri, 30 Jun 2006 06:47:38 GMT (envelope-from ryanb@FreeBSD.org) Date: Fri, 30 Jun 2006 06:47:38 GMT Message-Id: <200606300647.k5U6lcKe099492@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ryanb@FreeBSD.org using -f From: Ryan Beasley To: Perforce Change Reviews Cc: Subject: PERFORCE change 100341 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, 30 Jun 2006 06:47:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=100341 Change 100341 by ryanb@ryanb_yuki on 2006/06/30 06:46:40 I misinterpreted 4Front's definition of "audio device" as it related to each card's channels, so this was corrected. SNDCTL_SYSINFO and SNDCTL_AUDIOINFO were updated to meet the fixed scheme. Caveats: - /dev/dsp nodes are created when a sound card registers its channels. While instances of snddev_channel reference created nodes, the link is seemingly only cosmetic. For example, when an application opens a device node, the sound subsystem doesn't work on the channel that created said device. Instead, it scans for /any/ available channel. IOW, the data returned by SYSINFO and AUDIOINFO, at the individual channel level, are inaccurate. - Right now, locking on my new code is broken or non-existent. I'll fix that in the next day or two. Affected files ... .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/dsp.c#8 edit .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/sound.c#6 edit Differences ... ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/dsp.c#8 (text+ko) ==== @@ -1306,6 +1306,15 @@ * This routine is supposed to go practically straight to the hardware, * getting capabilities directly from the sound card driver, side-stepping * the intermediate channel interface. + * + * Note, however, that the usefulness of this command is significantly + * decreased when requesting info about any device other than the one serving + * the request. While each snddev_channel refers to a specific device node, + * the converse is *not* true. Currently, when a sound device node is opened, + * the sound subsystem scans for an available audio channel (or channels, if + * opened in read+write) and then assigns them to the si_drv[12] private + * data fields. As a result, any information returned linking a channel to + * a specific character device isn't really accurate. * * @param dev device on which the ioctl was issued * @param ai ioctl request data container @@ -1314,46 +1323,55 @@ * @retval EINVAL ai->dev specifies an invalid device * * @todo Verify correctness of Doxygen tags. ;) + * @todo Ask about device and channel locking; with D_NEEDGIANT, am I safe + * for now? + * @todo Discuss rectifying the channel/cdev relationship. OSS will return + * EBUSY if applications attempt to open a DSP device more than once. */ int dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai) { + struct snddev_channel *sce; + struct pcmchan_caps *caps; + struct pcm_channel *ch; struct snddev_info *d; - struct cdev *t_cdev; /* handle 1 of target device */ - device_t t_dev; /* handle 2 */ - int t_unit = 0; /* unit # of target device */ + struct cdev *t_cdev; + int i, nchan; + + /* If probing handling device, make sure it's a DSP device. */ + if ((ai->dev == -1) && (i_dev->si_devsw != &dsp_cdevsw)) + return EINVAL; + + ch = NULL; + t_cdev = NULL; + nchan = 0; - /* - * Searching by unit number, get device_t and struct cdev handles - * on target audio device. - */ - if (ai->dev == -1) { - t_unit = PCMUNIT(i_dev); - t_cdev = i_dev; + /* Search for the requested audio device. */ + for (i = 0; i < devclass_get_maxunit(pcm_devclass); i++) { + d = devclass_get_softc(pcm_devclass, i); + if (d == NULL) + continue; - if ((i_dev->si_devsw == &dsp_cdevsw) && - (t_unit < devclass_get_maxunit(pcm_devclass))) { - t_dev = devclass_get_device(pcm_devclass, t_unit); - } else { - /* Not an audio device */ - return EINVAL; - } - } else { - t_dev = devclass_get_device(pcm_devclass, ai->dev); - if (t_dev == NULL) - return EINVAL; - t_unit = device_get_unit(t_dev); - - LIST_FOREACH(t_cdev, &dsp_cdevsw.d_devs, si_list) { - if (PCMUNIT(t_cdev) == t_unit) - break; + SLIST_FOREACH(sce, &d->channels, link) { + ch = sce->channel; + if (ai->dev == -1) { + if ((ch == i_dev->si_drv1) || + (ch == i_dev->si_drv2)) { + t_cdev = i_dev; + goto dspfound; + } + } else if (ai->dev == nchan) { + t_cdev = sce->dsp_devt; + goto dspfound; + } + ++nchan; } - - if (t_cdev == NULL) - return EINVAL; } +dspfound: + if (t_cdev == NULL) + return EINVAL; - d = dsp_get_info(t_cdev); + caps = chn_getcaps(ch); /* * With all handles collected, zero out the user's container and @@ -1361,24 +1379,29 @@ */ bzero((void *)ai, sizeof(oss_audioinfo)); - ai->dev = t_unit; - strlcpy(ai->name, device_get_desc(t_dev), sizeof(ai->name)); + strlcpy(ai->name, ch->name, sizeof(ai->name)); + + if ((ch->flags & CHN_F_BUSY) == 0) + ai->busy = 0; + else + ai->busy = (ch->direction == PCMDIR_PLAY) ? OPEN_WRITE : OPEN_READ; + /** - * @todo @c busy requires examining all channels - * * @note - * @c pid - OSSv4 docs: "Value of -1 means that this information is - * not available or the device is currently not open." Since - * multiple processes may open a device, I'm going with the - * former. - * @par - * @c cmd - Same caveat as @c pid. + * @c cmd - OSSv4 docs: "Only supported under Linux at this moment." + * Cop-out, I know, but I'll save running around in the process + * table for later. Is there a risk of leaking information? */ - ai->pid = -1; + ai->pid = ch->pid; + /** - * @todo @c caps - requires going directly to sound card driver - * @todo @c iformats - same todo as @c caps - * @todo @c oformats - same todo as @c caps + * @todo @c caps - Should take the SNDCTL_DSP_GETCAPS route. + * Question: Since no drivers actually use the caps + * field of pcmchan_caps, why not store DSP_CAP_* + * values there? + * @todo @c iformats - chn_getformats includes sw emulated formats, + * but cmd is supposed to ask hardware directly + * @todo @c oformats - same as iformats * * @note * @c magic - OSSv4 docs: "Reserved for internal use by OSS." @@ -1389,6 +1412,11 @@ * Applications should normally not use this field for any * purpose." */ + if (ch->direction == PCMDIR_PLAY) + ai->iformats = chn_getformats(ch); + else + ai->oformats = chn_getformats(ch); + ai->card_number = -1; /** * @todo @c song_name - depends first on SNDCTL_[GS]ETSONG @@ -1397,19 +1425,21 @@ */ ai->port_number = -1; ai->mixer_dev = (d->mixer_dev != NULL) ? PCMUNIT(d->mixer_dev) : -1; - ai->real_device = t_unit; + /** + * @note + * @c real_device - OSSv4 docs: "Obsolete." + */ + ai->real_device = -1; strlcpy(ai->devnode, t_cdev->si_name, sizeof(ai->devnode)); - ai->enabled = device_is_attached(t_dev) ? 1 : 0; + ai->enabled = device_is_attached(d->dev) ? 1 : 0; /** * @note * @c flags - OSSv4 docs: "Reserved for future use." * - * @todo @c min_rate - same todo as @c caps - * @todo @c max_rate - same todo as @c caps - * @todo @c nrates - same todo as @c caps - * @todo @c rates - same todo as @c caps - * @todo @c min_channels - same todo as @c caps - * @todo @c max_channels - same todo as @c caps + * @todo @c nrates - need new interface to query hw driver directly + * @todo @c rates - same todo as @c nrates + * @todo @c min_channels, @c max_channels - A little more research + * is required. * * @note * @c binding - OSSv4 docs: "Reserved for future use." @@ -1417,6 +1447,8 @@ * @todo @c handle - haven't decided how to generate this yet; bus, * vendor, device IDs? */ + ai->min_rate = caps->minspeed; + ai->max_rate = caps->maxspeed; return 0; } ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/sound.c#6 (text+ko) ==== @@ -1139,13 +1139,49 @@ { static char si_product[] = "FreeBSD native OSS ABI"; static char si_version[] = __XSTRING(__FreeBSD_version); + static int intnbits = sizeof(int) * 8; /* Better suited as macro? + Must pester a C guru. */ + + struct snddev_channel *sce; + struct snddev_info *d; + struct pcm_channel *c; + int i, j, ncards; + + ncards = 0; strlcpy(si->product, si_product, sizeof(si->product)); strlcpy(si->version, si_version, sizeof(si->version)); si->versionnum = SOUND_VERSION; - si->numaudios = (pcm_devclass != NULL) ? - devclass_get_count(pcm_devclass) : - 0; + + /* + * Iterate over PCM devices and their channels, gathering up data + * for the numaudios, ncards, and openedaudio fields. + */ + si->numaudios = 0; + bzero((void *)&si->openedaudio, sizeof(si->openedaudio)); + + if (pcm_devclass != NULL) { + j = 0; + + for (i = 0; i < devclass_get_maxunit(pcm_devclass); i++) { + d = devclass_get_softc(pcm_devclass, i); + if (!d) + continue; + si->numaudios += d->devcount; + ++ncards; + + SLIST_FOREACH(sce, &d->channels, link) { + c = sce->channel; + CHN_LOCK(c); + if (c->flags & CHN_F_BUSY) + si->openedaudio[j / intnbits] |= + (1 << (j % intnbits)); + CHN_UNLOCK(c); + j++; + } + } + } + si->numsynths = 0; /* OSSv4 docs: this field is obsolete */ /** * @todo Collect num{midis,timers}. @@ -1161,24 +1197,29 @@ si->nummidis = 0; si->numtimers = 0; si->nummixers = mixer_count; - si->numcards = 0; /* OSSv4 docs: Intended only for test apps; - API doesn't really have much of a concept - of cards. Shouldn't be used by - applications. */ + si->numcards = ncards; + /* OSSv4 docs: Intended only for test apps; API doesn't + really have much of a concept of cards. Shouldn't be + used by applications. */ /** * @todo Fill in "busy devices" fields. * - * si->openedaudio = bitmask of open/busy audio devices * si->openedmidi = " MIDI devices */ - bzero((void *)&si->openedaudio, sizeof(si->openedaudio)); bzero((void *)&si->openedmidi, sizeof(si->openedmidi)); - /* - * XXX Si->filler is a reserved array, but according to docs each + /** + * @todo Ask about altering oss_sysinfo definition to use a macro + * for size of the filler field. Doing so would deviate + * in appearance from 4Front's soundcard.h, and userland + * developers may think that the macro is official. + * + * Si->filler is a reserved array, but according to docs each * element should be set to -1. */ + for (i = 0; i < sizeof(si->filler)/sizeof(si->filler[0]); i++) + si->filler[i] = -1; } #endif /* !OSSV4_EXPERIMENT */ From owner-p4-projects@FreeBSD.ORG Fri Jun 30 13:15:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4764C16A4A7; Fri, 30 Jun 2006 13:15:37 +0000 (UTC) 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 F04DD16A549 for ; Fri, 30 Jun 2006 13:15:36 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A697443DA9 for ; Thu, 29 Jun 2006 19:37:23 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5TJbNbn007978 for ; Thu, 29 Jun 2006 19:37:23 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5TJbNsG007975 for perforce@freebsd.org; Thu, 29 Jun 2006 19:37:23 GMT (envelope-from clem1@FreeBSD.org) Date: Thu, 29 Jun 2006 19:37:23 GMT Message-Id: <200606291937.k5TJbNsG007975@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 100308 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, 30 Jun 2006 13:15:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=100308 Change 100308 by clem1@clem1_ipv6vulns on 2006/06/29 19:37:15 Bug fix: there is not segment_left field in hop-by-hop extension header. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/ipv6.py#5 edit Differences ... ==== //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/ipv6.py#5 (text+ko) ==== @@ -130,7 +130,7 @@ len = pcs.Field("length", 8) type = pcs.Field("type", 8) pcs.Packet.__init__(self, - [next, len, type, segments_left], bytes) + [next, len, type], bytes) def option(self, len = 0): """add option header to the hop-by-hop extension header""" From owner-p4-projects@FreeBSD.ORG Fri Jun 30 13:40:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A108716A567; Fri, 30 Jun 2006 13:40:38 +0000 (UTC) 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 3886416A555 for ; Fri, 30 Jun 2006 13:40:38 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FAF94486C for ; Fri, 30 Jun 2006 13:22:09 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5UDM9Tn043467 for ; Fri, 30 Jun 2006 13:22:09 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5UDM81I043464 for perforce@freebsd.org; Fri, 30 Jun 2006 13:22:08 GMT (envelope-from bushman@freebsd.org) Date: Fri, 30 Jun 2006 13:22:08 GMT Message-Id: <200606301322.k5UDM81I043464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100350 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, 30 Jun 2006 13:40:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=100350 Change 100350 by bushman@bushman_nss_ldap_cached on 2006/06/30 13:21:13 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/tsearch.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/gen/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/gen/test-fpclassify.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/gen/test-wordexp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-btowc.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-btowc.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-iswctype.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-iswctype.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-mblen.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-mblen.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-mbrlen.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-mbrlen.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-mbrtowc.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-mbrtowc.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-mbsnrtowcs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-mbsnrtowcs.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-mbsrtowcs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-mbsrtowcs.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-mbstowcs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-mbstowcs.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-mbtowc.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-mbtowc.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-towctrans.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-towctrans.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-wcrtomb.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-wcrtomb.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-wcsnrtombs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-wcsnrtombs.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-wcsrtombs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-wcsrtombs.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-wcstombs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-wcstombs.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-wctomb.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/locale/test-wctomb.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/net/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/net/test-eui64.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/net/test-eui64_aton.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/net/test-eui64_aton.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/net/test-eui64_line.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/net/test-eui64_line.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/net/test-eui64_ntoa.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/net/test-eui64_ntoa.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/regex/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/resolv/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/resolv/mach#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/resolv/resolv.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/resolv/resolv.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/stdio/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/stdio/test-perror.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/stdio/test-perror.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/stdio/test-printfloat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/stdio/test-printfloat.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/stdio/test-scanfloat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/stdio/test-scanfloat.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/stdlib/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/stdlib/test-heapsort.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/stdlib/test-heapsort.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/stdlib/test-mergesort.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/stdlib/test-mergesort.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/stdlib/test-qsort.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/stdlib/test-qsort.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/stdlib/test-sort.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/string/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/string/test-strerror.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/string/test-strerror.t#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/kgmon/kgmon.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/newsyslog/newsyslog.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/config.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/connect.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/debug.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/list.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/main.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/mkpeer.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/msg.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/name.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/rmhook.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/show.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/shutdown.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/status.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/types.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/write.c#2 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/tsearch.3#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" OpenBSD: tsearch.3,v 1.2 1998/06/21 22:13:49 millert Exp -.\" $FreeBSD: src/lib/libc/stdlib/tsearch.3,v 1.14 2005/01/20 09:17:04 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/tsearch.3,v 1.15 2006/06/23 13:36:33 keramida Exp $ .\" .Dd June 15, 1997 .Dt TSEARCH 3 @@ -42,7 +42,7 @@ .Ft void * .Fn tsearch "const void *key" "void **rootp" "int (*compar) (const void *, const void *)" .Ft void -.Fn twalk "const void *root" "void (*compar) (const void *, VISIT, int)" +.Fn twalk "const void *root" "void (*action) (const void *, VISIT, int)" .Sh DESCRIPTION The .Fn tdelete , ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/kgmon/kgmon.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)kgmon.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$FreeBSD: src/usr.sbin/kgmon/kgmon.c,v 1.14 2004/08/30 03:11:46 marcel Exp $"; + "$FreeBSD: src/usr.sbin/kgmon/kgmon.c,v 1.15 2006/06/29 09:18:16 delphij Exp $"; #endif /* not lint */ #include @@ -178,7 +178,7 @@ } /* - * Check that profiling is enabled and open any ncessary files. + * Check that profiling is enabled and open any necessary files. */ int openfiles(system, kmemf, kvp) ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/newsyslog/newsyslog.c#2 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/newsyslog/newsyslog.c,v 1.103 2006/01/20 05:18:01 gad Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/newsyslog/newsyslog.c,v 1.105 2006/06/27 22:14:09 gad Exp $"); #define OSF #ifndef COMPRESS_POSTFIX @@ -88,12 +88,6 @@ #include "pathnames.h" #include "extern.h" -/* Define this symbol to try out the "new order" for work items. */ -#define TRY_NEWORDER -#ifndef USE_NEWORDER -#define USE_NEWORDER 1 /* Initial value for dbg_new_order */ -#endif - /* * Bit-values for the 'flags' parsed from a config-file entry. */ @@ -165,12 +159,6 @@ SLIST_HEAD(zwlisthead, zipwork_entry) zwhead = SLIST_HEAD_INITIALIZER(zwhead); int dbg_at_times; /* -D Show details of 'trim_at' code */ -/* - * The debug options "neworder" and "oldorder" can be used to change - * which order work is done in. Note that both options will disappear - * in the near future, and the "new" order will be the only order. - */ -int dbg_new_order = USE_NEWORDER; int archtodir = 0; /* Archive old logfiles to other directory */ int createlogs; /* Create (non-GLOB) logfiles which do not */ @@ -194,9 +182,10 @@ struct ptime_data *dbg_timenow; /* A "timenow" value set via -D option */ struct ptime_data *timenow; /* The time to use for checking at-fields */ +#define DAYTIME_LEN 16 +char daytime[DAYTIME_LEN]; /* The current time in human readable form, + * used for rotation-tracking messages. */ char hostname[MAXHOSTNAMELEN]; /* hostname */ -char daytime[16]; /* The current time in human readable form, - * used for rotation-tracking messages. */ static struct conf_entry *get_worklist(char **files); static void parse_file(FILE *cf, const char *cfname, struct conf_entry **work_p, @@ -208,7 +197,6 @@ static void change_attrs(const char *, const struct conf_entry *); static fk_entry do_entry(struct conf_entry *); static fk_entry do_rotate(const struct conf_entry *); -#ifdef TRY_NEWORDER static void do_sigwork(struct sigwork_entry *); static void do_zipwork(struct zipwork_entry *); static struct sigwork_entry * @@ -217,7 +205,6 @@ save_zipwork(const struct conf_entry *, const struct sigwork_entry *, int, const char *); static void set_swpid(struct sigwork_entry *, const struct conf_entry *); -#endif static int sizefile(const char *); static void expand_globs(struct conf_entry **work_p, struct conf_entry **glob_p); @@ -229,10 +216,7 @@ static int parse_doption(const char *doption); static void usage(void); static int log_trim(const char *logname, const struct conf_entry *log_ent); -static void compress_log(char *logname, int dowait); -static void bzcompress_log(char *logname, int dowait); static int age_old_log(char *file); -static int send_signal(const struct conf_entry *ent); static void savelog(char *from, char *to); static void createdir(const struct conf_entry *ent, char *dirpart); static void createlog(const struct conf_entry *ent); @@ -252,10 +236,8 @@ { fk_entry free_or_keep; struct conf_entry *p, *q; -#ifdef TRY_NEWORDER struct sigwork_entry *stmp; struct zipwork_entry *ztmp; -#endif SLIST_INIT(&swhead); SLIST_INIT(&zwhead); @@ -280,7 +262,6 @@ q = p; } -#ifdef TRY_NEWORDER /* * Send signals to any processes which need a signal to tell * them to close and re-open the log file(s) we have rotated. @@ -322,7 +303,6 @@ SLIST_REMOVE_HEAD(&swhead, sw_nextp); free(stmp); } -#endif /* TRY_NEWORDER */ while (wait(NULL) > 0 || errno == EINTR) ; @@ -476,9 +456,9 @@ else if ((ent->flags & CE_CREATE) && createlogs) ent->firstcreate = 1; else if (ent->flags & CE_CREATE) - strncpy(temp_reason, " (no -C option)", REASON_MAX); + strlcpy(temp_reason, " (no -C option)", REASON_MAX); else if (createlogs) - strncpy(temp_reason, " (no C flag)", REASON_MAX); + strlcpy(temp_reason, " (no C flag)", REASON_MAX); if (ent->firstcreate) { if (verbose) @@ -584,102 +564,6 @@ #undef REASON_MAX } -/* Send a signal to the pid specified by pidfile */ -static int -send_signal(const struct conf_entry *ent) -{ - pid_t target_pid; - int did_notify; - FILE *f; - long minok, maxok, rval; - const char *target_name; - char *endp, *linep, line[BUFSIZ]; - - did_notify = 0; - f = fopen(ent->pid_file, "r"); - if (f == NULL) { - warn("can't open pid file: %s", ent->pid_file); - return (did_notify); - /* NOTREACHED */ - } - - if (fgets(line, BUFSIZ, f) == NULL) { - /* - * XXX - If the pid file is empty, is that really a - * problem? Wouldn't that mean that the process - * has shut down? In that case there would be no - * problem with compressing the rotated log file. - */ - if (feof(f)) - warnx("pid file is empty: %s", ent->pid_file); - else - warn("can't read from pid file: %s", ent->pid_file); - (void) fclose(f); - return (did_notify); - /* NOTREACHED */ - } - (void) fclose(f); - - target_name = "daemon"; - minok = MIN_PID; - maxok = MAX_PID; - if (ent->flags & CE_SIGNALGROUP) { - /* - * If we are expected to signal a process-group when - * rotating this logfile, then the value read in should - * be the negative of a valid process ID. - */ - target_name = "process-group"; - minok = -MAX_PID; - maxok = -MIN_PID; - } - - errno = 0; - linep = line; - while (*linep == ' ') - linep++; - rval = strtol(linep, &endp, 10); - if (*endp != '\0' && !isspacech(*endp)) { - warnx("pid file does not start with a valid number: %s", - ent->pid_file); - rval = 0; - } else if (rval < minok || rval > maxok) { - warnx("bad value '%ld' for process number in %s", - rval, ent->pid_file); - if (verbose) - warnx("\t(expecting value between %ld and %ld)", - minok, maxok); - rval = 0; - } - if (rval == 0) { - return (did_notify); - /* NOTREACHED */ - } - - target_pid = rval; - - if (noaction) { - did_notify = 1; - printf("\tkill -%d %d\n", ent->sig, (int) target_pid); - } else if (kill(target_pid, ent->sig)) { - /* - * XXX - Iff the error was "no such process", should that - * really be an error for us? Perhaps the process - * is already gone, in which case there would be no - * problem with compressing the rotated log file. - */ - warn("can't notify %s, pid %d", target_name, - (int) target_pid); - } else { - did_notify = 1; - if (verbose) - printf("%s pid %d notified\n", target_name, - (int) target_pid); - } - - return (did_notify); -} - static void parse_args(int argc, char **argv) { @@ -688,8 +572,7 @@ timenow = ptime_init(NULL); ptimeset_time(timenow, time(NULL)); - (void)strncpy(daytime, ptimeget_ctime(timenow) + 4, 15); - daytime[15] = '\0'; + strlcpy(daytime, ptimeget_ctime(timenow) + 4, DAYTIME_LEN); /* Let's get our hostname */ (void)gethostname(hostname, sizeof(hostname)); @@ -822,20 +705,10 @@ return (1); /* successfully parsed */ } - if (strcmp(doption, "neworder") == 0) { -#ifdef TRY_NEWORDER - dbg_new_order++; -#else - warnx("NOTE: The code for 'neworder' was not compiled in."); -#endif - return (1); /* successfully parsed */ - } - if (strcmp(doption, "oldorder") == 0) { -#ifdef TRY_NEWORDER - dbg_new_order = 0; -#else - warnx("NOTE: The code for 'neworder' was not compiled in."); -#endif + /* XXX - This check could probably be dropped. */ + if ((strcmp(doption, "neworder") == 0) || (strcmp(doption, "oldorder") + == 0)) { + warnx("NOTE: newsyslog always uses 'neworder'."); return (1); /* successfully parsed */ } @@ -1485,8 +1358,9 @@ char file1[MAXPATHLEN], file2[MAXPATHLEN]; char zfile1[MAXPATHLEN], zfile2[MAXPATHLEN]; char jfile1[MAXPATHLEN]; - int flags, notified, need_notification, numlogs_c; + int flags, numlogs_c; fk_entry free_or_keep; + struct sigwork_entry *swork; struct stat st; flags = ent->flags; @@ -1612,90 +1486,27 @@ printf("Start new log...\n"); createlog(ent); -#ifdef TRY_NEWORDER /* * Save all signalling and file-compression to be done after log * files from all entries have been rotated. This way any one * process will not be sent the same signal multiple times when * multiple log files had to be rotated. */ - if (dbg_new_order) { - struct sigwork_entry *swork; - - swork = NULL; - if (ent->pid_file != NULL) - swork = save_sigwork(ent); - if (ent->numlogs > 0 && (flags & (CE_COMPACT | CE_BZCOMPACT))) { - /* - * The zipwork_entry will include a pointer to this - * conf_entry, so the conf_entry should not be freed. - */ - free_or_keep = KEEP_ENT; - save_zipwork(ent, swork, ent->fsize, file1); - } - return (free_or_keep); + swork = NULL; + if (ent->pid_file != NULL) + swork = save_sigwork(ent); + if (ent->numlogs > 0 && (flags & (CE_COMPACT | CE_BZCOMPACT))) { + /* + * The zipwork_entry will include a pointer to this + * conf_entry, so the conf_entry should not be freed. + */ + free_or_keep = KEEP_ENT; + save_zipwork(ent, swork, ent->fsize, file1); } -#endif /* TRY_NEWORDER */ - /* - * Find out if there is a process to signal. If nosignal (-s) was - * specified, then do not signal any process. Note that nosignal - * will trigger a warning message if the rotated logfile needs to - * be compressed, *unless* -R was specified. This is because there - * presumably still are process(es) writing to the old logfile, but - * we assume that a -sR request comes from a process which writes - * to the logfile, and as such, that process has already made sure - * that the logfile is not presently in use. - */ - need_notification = notified = 0; - if (ent->pid_file != NULL) { - need_notification = 1; - if (!nosignal) - notified = send_signal(ent); /* the normal case! */ - else if (rotatereq) - need_notification = 0; - } - - if ((flags & CE_COMPACT) || (flags & CE_BZCOMPACT)) { - if (need_notification && !notified) - warnx( - "log %s.0 not compressed because daemon(s) not notified", - ent->log); - else if (noaction) { - printf("\tsleep 10\n"); - if (flags & CE_COMPACT) - printf("\tgzip %s.0\n", ent->log); - else - printf("\tbzip2 %s.0\n", ent->log); - } else { - if (notified) { - if (verbose) - printf("small pause to allow daemon(s) to close log\n"); - sleep(10); - } - if (archtodir) { - (void) snprintf(file1, sizeof(file1), "%s/%s", - dirpart, namepart); - if (flags & CE_COMPACT) - compress_log(file1, - flags & CE_COMPACTWAIT); - else if (flags & CE_BZCOMPACT) - bzcompress_log(file1, - flags & CE_COMPACTWAIT); - } else { - if (flags & CE_COMPACT) - compress_log(ent->log, - flags & CE_COMPACTWAIT); - else if (flags & CE_BZCOMPACT) - bzcompress_log(ent->log, - flags & CE_COMPACTWAIT); - } - } - } return (free_or_keep); } -#ifdef TRY_NEWORDER static void do_sigwork(struct sigwork_entry *swork) { @@ -2011,7 +1822,6 @@ return; } -#endif /* TRY_NEWORDER */ /* Log the fact that the logs were turned over */ static int @@ -2039,50 +1849,6 @@ return (0); } -/* - * XXX - Note that both compress_log and bzcompress_log will lose the - * NODUMP flag if it was set on somelog.0. Fixing that in newsyslog - * (as opposed to fixing gzip/bzip2) will require some restructuring - * of the code. That restructuring is planned for a later update... - */ -/* Fork of gzip to compress the old log file */ -static void -compress_log(char *logname, int dowait) -{ - pid_t pid; - char tmp[MAXPATHLEN]; - - while (dowait && (wait(NULL) > 0 || errno == EINTR)) - ; - (void) snprintf(tmp, sizeof(tmp), "%s.0", logname); - pid = fork(); - if (pid < 0) - err(1, "gzip fork"); - else if (!pid) { - (void) execl(_PATH_GZIP, _PATH_GZIP, "-f", tmp, (char *)0); - err(1, _PATH_GZIP); - } -} - -/* Fork of bzip2 to compress the old log file */ -static void -bzcompress_log(char *logname, int dowait) -{ - pid_t pid; - char tmp[MAXPATHLEN]; - - while (dowait && (wait(NULL) > 0 || errno == EINTR)) - ; - snprintf(tmp, sizeof(tmp), "%s.0", logname); - pid = fork(); - if (pid < 0) - err(1, "bzip2 fork"); - else if (!pid) { - execl(_PATH_BZIP2, _PATH_BZIP2, "-f", tmp, (char *)0); - err(1, _PATH_BZIP2); - } -} - /* Return size in kilobytes of a file */ static int sizefile(const char *file) ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/config.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/ngctl/config.c,v 1.4 2006/05/24 14:46:54 glebius Exp $ + * $FreeBSD: src/usr.sbin/ngctl/config.c,v 1.5 2006/06/28 10:38:38 glebius Exp $ */ #include @@ -69,7 +69,7 @@ /* Get arguments */ if (ac < 2) - return(CMDRTN_USAGE); + return (CMDRTN_USAGE); path = av[1]; *buf = '\0'; @@ -93,7 +93,7 @@ break; default: warn("send msg"); - return(CMDRTN_ERROR); + return (CMDRTN_ERROR); } } else { if (NgRecvMsg(csock, resp, sizeof(sbuf), NULL) < 0 @@ -106,6 +106,6 @@ printf("No config available for \"%s\"\n", path); else printf("Config for \"%s\":\n%s\n", path, status); - return(CMDRTN_OK); + return (CMDRTN_OK); } ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/connect.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/ngctl/connect.c,v 1.4 2006/05/24 14:46:55 glebius Exp $ + * $FreeBSD: src/usr.sbin/ngctl/connect.c,v 1.5 2006/06/28 10:38:38 glebius Exp $ */ #include @@ -76,15 +76,15 @@ snprintf(con.peerhook, sizeof(con.peerhook), "%s", av[3]); break; default: - return(CMDRTN_USAGE); + return (CMDRTN_USAGE); } /* Send message */ if (NgSendMsg(csock, path, NGM_GENERIC_COOKIE, NGM_CONNECT, &con, sizeof(con)) < 0) { warn("send msg"); - return(CMDRTN_ERROR); + return (CMDRTN_ERROR); } - return(CMDRTN_OK); + return (CMDRTN_OK); } ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/debug.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/ngctl/debug.c,v 1.3 2006/05/24 14:46:55 glebius Exp $ + * $FreeBSD: src/usr.sbin/ngctl/debug.c,v 1.4 2006/06/28 10:38:38 glebius Exp $ */ #include @@ -70,15 +70,15 @@ else if (!strcmp(av[1], "-")) level = NgSetDebug(-1) - 1; else if ((level = atoi(av[1])) < 0) - return(CMDRTN_USAGE); + return (CMDRTN_USAGE); NgSetDebug(level); break; case 1: printf("Current debug level is %d\n", NgSetDebug(-1)); break; default: - return(CMDRTN_USAGE); + return (CMDRTN_USAGE); } - return(CMDRTN_OK); + return (CMDRTN_OK); } ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/list.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/ngctl/list.c,v 1.7 2006/05/24 14:46:55 glebius Exp $ + * $FreeBSD: src/usr.sbin/ngctl/list.c,v 1.8 2006/06/28 10:38:38 glebius Exp $ */ #include @@ -83,7 +83,7 @@ break; case '?': default: - return(CMDRTN_USAGE); + return (CMDRTN_USAGE); break; } } @@ -95,18 +95,18 @@ case 0: break; default: - return(CMDRTN_USAGE); + return (CMDRTN_USAGE); } /* Get list of nodes */ if (NgSendMsg(csock, ".", NGM_GENERIC_COOKIE, named_only ? NGM_LISTNAMES : NGM_LISTNODES, NULL, 0) < 0) { warn("send msg"); - return(CMDRTN_ERROR); + return (CMDRTN_ERROR); } if (NgAllocRecvMsg(csock, &resp, NULL) < 0) { warn("recv msg"); - return(CMDRTN_ERROR); + return (CMDRTN_ERROR); } /* Show each node */ ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/main.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/ngctl/main.c,v 1.19 2006/05/24 14:46:55 glebius Exp $ + * $FreeBSD: src/usr.sbin/ngctl/main.c,v 1.20 2006/06/28 10:38:38 glebius Exp $ * $Whistle: main.c,v 1.12 1999/11/29 19:17:46 archie Exp $ */ @@ -188,7 +188,7 @@ rtn = EX_OSERR; break; } - return(rtn); + return (rtn); } /* @@ -205,10 +205,10 @@ continue; if ((rtn = DoParseCommand(line)) != 0) { warnx("line %d: error in file", num); - return(rtn); + return (rtn); } } - return(CMDRTN_OK); + return (CMDRTN_OK); } /* @@ -280,7 +280,7 @@ break; } } - return(CMDRTN_QUIT); + return (CMDRTN_QUIT); } /* @@ -298,7 +298,7 @@ av[++ac] = strtok(NULL, WHITESPACE)); /* Do command */ - return(DoCommand(ac, av)); + return (DoCommand(ac, av)); } /* @@ -311,12 +311,12 @@ int rtn; if (ac == 0 || *av[0] == 0) - return(CMDRTN_OK); + return (CMDRTN_OK); if ((cmd = FindCommand(av[0])) == NULL) - return(CMDRTN_ERROR); + return (CMDRTN_ERROR); if ((rtn = (*cmd->func)(ac, av)) == CMDRTN_USAGE) warnx("usage: %s", cmd->cmd); - return(rtn); + return (rtn); } /* @@ -331,16 +331,16 @@ if (MatchCommand(cmds[k], string)) { if (found != -1) { warnx("\"%s\": ambiguous command", string); - return(NULL); + return (NULL); } found = k; } } if (found == -1) { warnx("\"%s\": unknown command", string); - return(NULL); + return (NULL); } - return(cmds[found]); + return (cmds[found]); } /* @@ -383,17 +383,17 @@ case 2: if ((fp = fopen(av[1], "r")) == NULL) { warn("%s", av[1]); - return(CMDRTN_ERROR); + return (CMDRTN_ERROR); } break; default: - return(CMDRTN_USAGE); + return (CMDRTN_USAGE); } /* Process it */ rtn = ReadFile(fp); fclose(fp); - return(rtn); + return (rtn); } /* @@ -419,7 +419,7 @@ *s = '\0'; printf(" %-10s %s\n", buf, cmd->desc); } - return(CMDRTN_OK); + return (CMDRTN_OK); default: /* Show help on a specific command */ if ((cmd = FindCommand(av[1])) != NULL) { @@ -462,7 +462,7 @@ } } } - return(CMDRTN_OK); + return (CMDRTN_OK); } /* @@ -471,7 +471,7 @@ static int QuitCmd(int ac __unused, char **av __unused) { - return(CMDRTN_QUIT); + return (CMDRTN_QUIT); } /* ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/mkpeer.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/ngctl/mkpeer.c,v 1.3 2006/05/24 14:46:55 glebius Exp $ + * $FreeBSD: src/usr.sbin/ngctl/mkpeer.c,v 1.4 2006/06/28 10:38:38 glebius Exp $ */ #include @@ -76,15 +76,15 @@ snprintf(mkp.peerhook, sizeof(mkp.peerhook), "%s", av[3]); break; default: - return(CMDRTN_USAGE); + return (CMDRTN_USAGE); } /* Send message */ if (NgSendMsg(csock, path, NGM_GENERIC_COOKIE, NGM_MKPEER, &mkp, sizeof(mkp)) < 0) { warn("send msg"); - return(CMDRTN_ERROR); + return (CMDRTN_ERROR); } - return(CMDRTN_OK); + return (CMDRTN_OK); } ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/msg.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ * OF SUCH DAMAGE. * * $Whistle: msg.c,v 1.2 1999/11/29 23:38:35 archie Exp $ - * $FreeBSD: src/usr.sbin/ngctl/msg.c,v 1.6 2006/05/24 14:46:55 glebius Exp $ + * $FreeBSD: src/usr.sbin/ngctl/msg.c,v 1.7 2006/06/28 10:38:38 glebius Exp $ */ #include @@ -70,7 +70,7 @@ /* Get arguments */ if (ac < 3) - return(CMDRTN_USAGE); + return (CMDRTN_USAGE); path = av[1]; cmdstr = av[2]; @@ -79,7 +79,7 @@ len += strlen(av[i]) + 1; if ((buf = malloc(len)) == NULL) { warn("malloc"); - return(CMDRTN_ERROR); + return (CMDRTN_ERROR); } for (*buf = '\0', i = 3; i < ac; i++) { snprintf(buf + strlen(buf), @@ -90,7 +90,7 @@ if (NgSendAsciiMsg(csock, path, "%s%s", cmdstr, buf) < 0) { free(buf); warn("send msg"); - return(CMDRTN_ERROR); + return (CMDRTN_ERROR); } free(buf); @@ -114,7 +114,7 @@ } /* Done */ - return(CMDRTN_OK); + return (CMDRTN_OK); } /* ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/name.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/ngctl/name.c,v 1.3 2006/05/24 14:46:55 glebius Exp $ + * $FreeBSD: src/usr.sbin/ngctl/name.c,v 1.4 2006/06/28 10:38:38 glebius Exp $ */ #include @@ -67,15 +67,15 @@ snprintf(name.name, sizeof(name.name), "%s", av[2]); break; default: - return(CMDRTN_USAGE); + return (CMDRTN_USAGE); } /* Send message */ if (NgSendMsg(csock, path, NGM_GENERIC_COOKIE, NGM_NAME, &name, sizeof(name)) < 0) { warn("send msg"); - return(CMDRTN_ERROR); + return (CMDRTN_ERROR); } - return(CMDRTN_OK); + return (CMDRTN_OK); } ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/rmhook.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/ngctl/rmhook.c,v 1.4 2006/05/24 14:46:55 glebius Exp $ + * $FreeBSD: src/usr.sbin/ngctl/rmhook.c,v 1.5 2006/06/28 10:38:38 glebius Exp $ */ #include @@ -72,15 +72,15 @@ snprintf(rmh.ourhook, sizeof(rmh.ourhook), "%s", av[1]); break; default: - return(CMDRTN_USAGE); + return (CMDRTN_USAGE); } /* Send message */ if (NgSendMsg(csock, path, NGM_GENERIC_COOKIE, NGM_RMHOOK, &rmh, sizeof(rmh)) < 0) { warn("send msg"); - return(CMDRTN_ERROR); + return (CMDRTN_ERROR); } - return(CMDRTN_OK); + return (CMDRTN_OK); } ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/show.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/ngctl/show.c,v 1.5 2006/05/24 14:46:55 glebius Exp $ + * $FreeBSD: src/usr.sbin/ngctl/show.c,v 1.6 2006/06/28 10:38:38 glebius Exp $ */ #include @@ -77,7 +77,7 @@ break; case '?': default: - return(CMDRTN_USAGE); + return (CMDRTN_USAGE); break; } } @@ -90,18 +90,18 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 30 13:40:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EA7216A716; Fri, 30 Jun 2006 13:40:44 +0000 (UTC) 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 D98CB16A5DB for ; Fri, 30 Jun 2006 13:40:43 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5ABC44074 for ; Fri, 30 Jun 2006 13:17:08 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5UDH1aF043237 for ; Fri, 30 Jun 2006 13:17:01 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5UDH1dg043234 for perforce@freebsd.org; Fri, 30 Jun 2006 13:17:01 GMT (envelope-from bushman@freebsd.org) Date: Fri, 30 Jun 2006 13:17:01 GMT Message-Id: <200606301317.k5UDH1dg043234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100349 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, 30 Jun 2006 13:40:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=100349 Change 100349 by bushman@bushman_nss_ldap_cached on 2006/06/30 13:16:54 shells "dns" source error fixed; some minor bugs in getusershell.c fixed Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getusershell.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_shells.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/tests/getusershell_test/Makefile#4 edit .. //depot/projects/soc2006/nss_ldap_cached/tests/getusershell_test/getusershell_test.c#4 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getusershell.c#3 (text+ko) ==== @@ -50,6 +50,8 @@ #include #include #include "un-namespace.h" +#include "nss_tls.h" +#include "reentrant.h" static const ns_src defaultsrc[] = { { NSSRC_FILES, NS_SUCCESS }, @@ -94,7 +96,7 @@ ret_errno = 0; *retval = NULL; - rv = nsdispatch(retval, dtab, NSDB_SHELLS, "getusershell_r", + rv = _nsdispatch(retval, dtab, NSDB_SHELLS, "getusershell_r", defaultsrc, buffer, bufsize, &ret_errno); if (rv == NS_SUCCESS) @@ -152,7 +154,7 @@ { NULL, NULL, NULL } }; - nsdispatch(NULL, dtab, NSDB_SHELLS, "setusershell"); + _nsdispatch(NULL, dtab, NSDB_SHELLS, "setusershell", defaultsrc); } void @@ -162,5 +164,5 @@ { NULL, NULL, NULL } }; - nsdispatch(NULL, dtab, NSDB_SHELLS, "setusershell"); + _nsdispatch(NULL, dtab, NSDB_SHELLS, "setusershell", defaultsrc); } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_shells.c#2 (text+ko) ==== @@ -120,7 +120,10 @@ if (linesize >= buflen) { *errnop = ERANGE; r = NS_RETURN; - } + } else { + *((char **)rv) = buffer; + r = NS_SUCCESS; + } } hesiod_end(context); ==== //depot/projects/soc2006/nss_ldap_cached/tests/getusershell_test/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/tests/getusershell_test/getusershell_test.c#4 (text+ko) ==== @@ -326,23 +326,23 @@ if ((_res.options & RES_INIT) == 0 && res_init() == -1) return NULL; - printf(":::: %d\n", __LINE__); + //printf(":::: %d %d %s\n", __LINE__, qclass, name); /* Construct the query. */ n = res_mkquery(QUERY, name, qclass, T_TXT, NULL, 0, NULL, qbuf, PACKETSZ); if (n < 0) return NULL; - printf(":::: %d\n", __LINE__); + //printf(":::: %d\n", __LINE__); /* Send the query. */ n = res_send(qbuf, n, abuf, MAX_HESRESP); if (n < 0 || n > MAX_HESRESP) { - printf("%s %d %d %d\n", name, errno, h_errno, n); + //printf("%s %d %d %d\n", name, errno, h_errno, n); errno = ECONNREFUSED; /* XXX */ return NULL; } - printf(":::: %d\n", __LINE__); + //printf(":::: %d\n", __LINE__); /* Parse the header of the result. */ hp = (HEADER *) (void *) abuf; ancount = ntohs(hp->ancount); @@ -350,7 +350,7 @@ p = abuf + sizeof(HEADER); eom = abuf + n; - printf(":::: %d\n", __LINE__); + //printf(":::: %d\n", __LINE__); /* * Skip questions, trying to get to the answer section * which follows. @@ -364,7 +364,7 @@ p += skip + QFIXEDSZ; } - printf(":::: %d\n", __LINE__); + //printf(":::: %d\n", __LINE__); /* Allocate space for the text record answers. */ list = malloc((ancount + 1) * sizeof(char *)); if (!list) { @@ -874,10 +874,10 @@ return (r); snprintf(shellname, sizeof(shellname)-1, "shells-%d", st->counter++); - printf("::%d %s\n", __LINE__, shellname); + //printf("::%d %s\n", __LINE__, shellname); hp = hesiod_resolve(context, shellname, "shells"); if (hp == NULL) { - printf("::%d %d\n", __LINE__, errno); + //printf("::%d %d\n", __LINE__, errno); st->counter = -1; if (errno == ENOENT) @@ -886,22 +886,23 @@ *errnop = errno; r = NS_UNAVAIL; } - printf("::%d\n", __LINE__); + //printf("::%d\n", __LINE__); } else { - printf("::%d\n", __LINE__); + //printf("::%d\n", __LINE__); linesize = strlcpy(buffer, hp[0], buflen); hesiod_free_list(context, hp); - printf("::%d\n", __LINE__); + //printf("::%d\n", __LINE__); if (linesize >= buflen) { *errnop = ERANGE; r = NS_RETURN; } - printf("::%d\n", __LINE__); + //printf("::%d\n", __LINE__); + *((char **)rv) = buffer; } hesiod_end(context); - printf("::%d\n", __LINE__); + //printf("::%d\n", __LINE__); return (r); } From owner-p4-projects@FreeBSD.ORG Fri Jun 30 17:51:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E20A16A565; Fri, 30 Jun 2006 17:51:15 +0000 (UTC) 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 0D9B716A52E for ; Fri, 30 Jun 2006 17:51:15 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DEDB441F2 for ; Fri, 30 Jun 2006 17:25:08 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5UHP8rd065707 for ; Fri, 30 Jun 2006 17:25:08 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5UHP8ea065704 for perforce@freebsd.org; Fri, 30 Jun 2006 17:25:08 GMT (envelope-from bushman@freebsd.org) Date: Fri, 30 Jun 2006 17:25:08 GMT Message-Id: <200606301725.k5UHP8ea065704@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100354 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, 30 Jun 2006 17:51:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=100354 Change 100354 by bushman@bushman_nss_ldap_cached on 2006/06/30 17:24:07 Regression test for services and testutil.h (which will be required for all nsswitch regressions) were added. A bug in test-wordexp.c (in libc/gen regression) fixed. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/gen/test-wordexp.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/Makefile#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getgr.c#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getpw.c#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getserv.c#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getserv.t#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/testutil.h#1 add Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/gen/test-wordexp.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ int r; /* Test that the macros are there. */ - (void)(WRDE_APPEND + WRDE_DOOFS + WRDE_NOCMD + WRDE_REUSE + + (void)(WRDE_APPEND + WRDE_DOOFFS + WRDE_NOCMD + WRDE_REUSE + WRDE_SHOWERR + WRDE_UNDEF); (void)(WRDE_BADCHAR + WRDE_BADVAL + WRDE_CMDSUB + WRDE_NOSPACE + WRDE_SYNTAX); @@ -59,9 +59,9 @@ assert(we.we_wordv[2] == NULL); wordfree(&we); - /* WRDE_DOOFS */ + /* WRDE_DOOFFS */ we.we_offs = 3; - r = wordexp("hello world", &we, WRDE_DOOFS); + r = wordexp("hello world", &we, WRDE_DOOFFS); assert(r == 0); assert(we.we_wordc == 2); assert(we.we_wordv[0] == NULL); @@ -95,13 +95,13 @@ assert(we.we_wordv[4] == NULL); wordfree(&we); - /* WRDE_DOOFS + WRDE_APPEND */ + /* WRDE_DOOFFS + WRDE_APPEND */ we.we_offs = 2; - r = wordexp("this is", &we, WRDE_DOOFS); + r = wordexp("this is", &we, WRDE_DOOFFS); assert(r == 0); - r = wordexp("a test", &we, WRDE_APPEND|WRDE_DOOFS); + r = wordexp("a test", &we, WRDE_APPEND|WRDE_DOOFFS); assert(r == 0); - r = wordexp("of wordexp", &we, WRDE_APPEND|WRDE_DOOFS); + r = wordexp("of wordexp", &we, WRDE_APPEND|WRDE_DOOFFS); assert(r == 0); assert(we.we_wordc == 6); assert(we.we_wordv[0] == NULL); From owner-p4-projects@FreeBSD.ORG Fri Jun 30 18:29:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A05B216A5C3; Fri, 30 Jun 2006 18:29:30 +0000 (UTC) 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 7A20A16A5B5 for ; Fri, 30 Jun 2006 18:29:30 +0000 (UTC) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 845BB43D53 for ; Fri, 30 Jun 2006 18:29:29 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5UITTwb069499 for ; Fri, 30 Jun 2006 18:29:29 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5UITTkk069496 for perforce@freebsd.org; Fri, 30 Jun 2006 18:29:29 GMT (envelope-from deker@FreeBSD.org) Date: Fri, 30 Jun 2006 18:29:29 GMT Message-Id: <200606301829.k5UITTkk069496@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 100357 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, 30 Jun 2006 18:29:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=100357 Change 100357 by deker@sebsd_build on 2006/06/30 18:28:37 Update install instructions to include use of tunefs to enable multilabel support. Affected files ... .. //depot/projects/trustedbsd/sebsd/SEBSD-Installation.txt#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/SEBSD-Installation.txt#5 (text+ko) ==== @@ -41,13 +41,24 @@ # pkg_add -r gmake -3. Install SEBSD sources. After downloading the sources from +3. Enable multilabel support on filesystems. In order for the SEBSD file + labeling to function properly, file label support must be enabled. To + enable multilabel support on your system, boot into single user mode + and use 'tunefs' to enable multilabel support for each filesystem on + your system. Here is an example for /. + + # tunefs -l enable / + + Repeat this step, substituting each other filesystem in place of / as + above. + +4. Install SEBSD sources. After downloading the sources from http://www.trustedbsd.org/sebsd.html, untar them into /usr/src. # cd /usr/src # tar -zxf /path/to/sebsd-.tar.gz -4. Build the SEBSD system. This process is similar to the canonical +5. Build the SEBSD system. This process is similar to the canonical building of world detailed in the FreeBSD Handbook, with a few additional steps, and some re-arranging of the typical order. @@ -85,7 +96,7 @@ the FreeBSD boot loader. Refer to the FreeBSD handbook for more information on the boot loader. -5. Inspect the SEBSD policy. The system comes pre-installed with a +6. Inspect the SEBSD policy. The system comes pre-installed with a sample policy, but local changes might be required. The policy source is located in /etc/security/sebsd/targeted/src/policy and the compiled (binary) version is installed in @@ -108,17 +119,16 @@ /usr/sbin/load_policy /etc/security/sebsd/targeted/policy/policy.20 -6. Label the file system. In step 4b, extended attribute support was - enabled in the fstab file , but the individual filesystems were not - labeled. To label all file systems, login as root and run the - following command: +7. Label the file system. In step 3, extended attribute support was + enabled, but the individual filesystems were not labeled. To label all + file systems, login as root and run the following command: cd /etc/security/sebsd/targeted/src/policy && gmake relabel Note that you will see several errors during the relabel process as well as many permission denials on the system console. This is normal. -7. Reboot the machine, so that applications can use the file labels +8. Reboot the machine, so that applications can use the file labels and will be started in the correct domains. At this point, the machine will be running SEBSD with the sample From owner-p4-projects@FreeBSD.ORG Fri Jun 30 19:40:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDECE16A407; Fri, 30 Jun 2006 19:40:39 +0000 (UTC) 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 B7CD316A412 for ; Fri, 30 Jun 2006 19:40:39 +0000 (UTC) (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 5A23C43D53 for ; Fri, 30 Jun 2006 19:40:39 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5UJedl1073996 for ; Fri, 30 Jun 2006 19:40:39 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5UJdvQv073926 for perforce@freebsd.org; Fri, 30 Jun 2006 19:39:57 GMT (envelope-from peter@freebsd.org) Date: Fri, 30 Jun 2006 19:39:57 GMT Message-Id: <200606301939.k5UJdvQv073926@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 100360 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, 30 Jun 2006 19:40:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=100360 Change 100360 by peter@peter_daintree on 2006/06/30 19:39:36 IFC @100359 - pick up SCHED_CORE stuff. Probably doesn't compile yet. Affected files ... .. //depot/projects/bike_sched/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/bike_sched/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/bike_sched/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/bike_sched/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/bike_sched/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/bike_sched/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/bike_sched/sys/arm/arm/inckern.S#2 integrate .. //depot/projects/bike_sched/sys/arm/arm/locore.S#2 integrate .. //depot/projects/bike_sched/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/bike_sched/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/bike_sched/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/bike_sched/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/bike_sched/sys/arm/at91/files.at91#2 integrate .. //depot/projects/bike_sched/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/bike_sched/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/bike_sched/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/bike_sched/sys/arm/conf/KB920X#2 integrate .. //depot/projects/bike_sched/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/bike_sched/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/bike_sched/sys/arm/include/pmap.h#2 integrate .. //depot/projects/bike_sched/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/bike_sched/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/bike_sched/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/bike_sched/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/bike_sched/sys/boot/Makefile#2 integrate .. //depot/projects/bike_sched/sys/bsm/audit.h#2 integrate .. //depot/projects/bike_sched/sys/bsm/audit_record.h#2 integrate .. //depot/projects/bike_sched/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/bike_sched/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/bike_sched/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/bike_sched/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/bike_sched/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/bike_sched/sys/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/bike_sched/sys/compat/svr4/syscalls.master#2 integrate .. //depot/projects/bike_sched/sys/conf/Makefile.arm#2 integrate .. //depot/projects/bike_sched/sys/conf/NOTES#2 integrate .. //depot/projects/bike_sched/sys/conf/files#3 integrate .. //depot/projects/bike_sched/sys/conf/files.amd64#2 integrate .. //depot/projects/bike_sched/sys/conf/files.arm#2 integrate .. //depot/projects/bike_sched/sys/conf/files.i386#2 integrate .. //depot/projects/bike_sched/sys/conf/files.ia64#2 integrate .. //depot/projects/bike_sched/sys/conf/files.powerpc#2 integrate .. //depot/projects/bike_sched/sys/conf/kern.mk#2 integrate .. //depot/projects/bike_sched/sys/conf/kern.post.mk#2 integrate .. //depot/projects/bike_sched/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/bike_sched/sys/conf/options#2 integrate .. //depot/projects/bike_sched/sys/conf/options.arm#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/ah_soc.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/ap30.hal.o.uu#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/ap30.inc#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/ap30.opt_ah.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/ap43.hal.o.uu#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/ap43.inc#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/ap43.opt_ah.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/ap51.hal.o.uu#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/ap51.inc#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/ap51.opt_ah.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/ap61.hal.o.uu#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/ap61.inc#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/ap61.opt_ah.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/sparc-be-elf.inc#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#1 branch .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/bike_sched/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/bike_sched/sys/ddb/db_sym.c#2 integrate .. //depot/projects/bike_sched/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/bike_sched/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/bike_sched/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/bike_sched/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/bike_sched/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/bike_sched/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/bike_sched/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/bike_sched/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/bike_sched/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/bike_sched/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/bike_sched/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/bike_sched/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/bike_sched/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/bike_sched/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/bike_sched/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/bike_sched/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cm/if_cm_isa.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cm/smc90cx6reg.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cm/smc90cx6var.h#2 integrate .. //depot/projects/bike_sched/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/bike_sched/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/bike_sched/sys/dev/digi/digi.c#2 integrate .. //depot/projects/bike_sched/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/bike_sched/sys/dev/ed/if_ed_novell.c#2 integrate .. //depot/projects/bike_sched/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/bike_sched/sys/dev/em/if_em.c#2 integrate .. //depot/projects/bike_sched/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/bike_sched/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/bike_sched/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/bike_sched/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/bike_sched/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/bike_sched/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/bike_sched/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/bike_sched/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/bike_sched/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/bike_sched/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/bike_sched/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/bike_sched/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/bike_sched/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/bike_sched/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/bike_sched/sys/dev/mxge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/bike_sched/sys/dev/mxge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/bike_sched/sys/dev/mxge/if_mxge.c#1 branch .. //depot/projects/bike_sched/sys/dev/mxge/if_mxge_var.h#1 branch .. //depot/projects/bike_sched/sys/dev/mxge/mcp_gen_header.h#1 branch .. //depot/projects/bike_sched/sys/dev/mxge/mxge_mcp.h#1 branch .. //depot/projects/bike_sched/sys/dev/my/if_my.c#2 integrate .. //depot/projects/bike_sched/sys/dev/myri10ge/eth_z8e.dat.gz.uu#2 delete .. //depot/projects/bike_sched/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#2 delete .. //depot/projects/bike_sched/sys/dev/myri10ge/if_myri10ge.c#2 delete .. //depot/projects/bike_sched/sys/dev/myri10ge/if_myri10ge_var.h#2 delete .. //depot/projects/bike_sched/sys/dev/myri10ge/mcp_gen_header.h#2 delete .. //depot/projects/bike_sched/sys/dev/myri10ge/myri10ge_mcp.h#2 delete .. //depot/projects/bike_sched/sys/dev/nfe/if_nfe.c#1 branch .. //depot/projects/bike_sched/sys/dev/nfe/if_nfereg.h#1 branch .. //depot/projects/bike_sched/sys/dev/nfe/if_nfevar.h#1 branch .. //depot/projects/bike_sched/sys/dev/puc/puc.c#2 integrate .. //depot/projects/bike_sched/sys/dev/puc/puc_cfg.c#2 integrate .. //depot/projects/bike_sched/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/bike_sched/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/bike_sched/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/bike_sched/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/bike_sched/sys/dev/re/if_re.c#2 integrate .. //depot/projects/bike_sched/sys/dev/sio/sio.c#2 integrate .. //depot/projects/bike_sched/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/bike_sched/sys/dev/sound/driver.c#2 integrate .. //depot/projects/bike_sched/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/bike_sched/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/bike_sched/sys/dev/sound/pci/ak452x.c#1 branch .. //depot/projects/bike_sched/sys/dev/sound/pci/ak452x.h#1 branch .. //depot/projects/bike_sched/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/bike_sched/sys/dev/sound/pci/envy24.c#1 branch .. //depot/projects/bike_sched/sys/dev/sound/pci/envy24.h#1 branch .. //depot/projects/bike_sched/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/bike_sched/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/bike_sched/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/bike_sched/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/bike_sched/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/bike_sched/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/bike_sched/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/bike_sched/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/bike_sched/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/bike_sched/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/bike_sched/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/bike_sched/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/bike_sched/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/bike_sched/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/bike_sched/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/bike_sched/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/bike_sched/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/bike_sched/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/bike_sched/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/bike_sched/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/bike_sched/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/bike_sched/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/bike_sched/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/bike_sched/sys/geom/eli/g_eli_integrity.c#1 branch .. //depot/projects/bike_sched/sys/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/bike_sched/sys/geom/eli/g_eli_privacy.c#1 branch .. //depot/projects/bike_sched/sys/geom/geom.h#2 integrate .. //depot/projects/bike_sched/sys/geom/geom_dev.c#2 integrate .. //depot/projects/bike_sched/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/bike_sched/sys/geom/geom_io.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/support/debug.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/support/sv.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#1 branch .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#2 delete .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_acl.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_acl.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_ag.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_alloc.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_alloc.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_alloc_btree.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_alloc_btree.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_arch.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_attr.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_attr.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_attr_leaf.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_attr_leaf.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_attr_sf.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_behavior.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_behavior.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_bit.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_bmap.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_bmap_btree.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_btree.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_btree.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_buf_item.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_buf_item.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_cap.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_clnt.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_da_btree.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_da_btree.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dfrag.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dfrag.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dinode.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir2.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir2.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir2_block.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir2_block.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir2_data.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir2_data.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir2_leaf.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir2_leaf.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir2_node.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir2_node.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir2_sf.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir2_sf.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir2_trace.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir2_trace.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir_leaf.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir_leaf.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dir_sf.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dmapi.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_dmops.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_error.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_error.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_extfree_item.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_extfree_item.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_fs.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_fsops.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_fsops.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_ialloc.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_ialloc_btree.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_ialloc_btree.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_iget.c#1 branch .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_imap.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_inode.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_inode_item.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_inode_item.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_inum.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_iocore.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_iomap.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_iomap.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_itable.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_itable.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_log.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_log_priv.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_log_recover.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_mac.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_macros.c#2 delete .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_macros.h#2 delete .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_mount.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_mount.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_qmops.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_quota.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_refcache.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_refcache.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_rename.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_rtalloc.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_rw.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_rw.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_sb.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_trans.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_trans.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_trans_ail.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_trans_buf.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_trans_extfree.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_trans_inode.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_trans_item.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_trans_priv.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_trans_space.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_types.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_utils.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_utils.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_vfsops.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/xfsidbg.c#2 integrate .. //depot/projects/bike_sched/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/bike_sched/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/bike_sched/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/bike_sched/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/bike_sched/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/bike_sched/sys/i386/conf/NOTES#2 integrate .. //depot/projects/bike_sched/sys/i386/conf/XBOX#2 integrate .. //depot/projects/bike_sched/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/bike_sched/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/bike_sched/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/bike_sched/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/bike_sched/sys/i386/i386/trap.c#3 integrate .. //depot/projects/bike_sched/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/bike_sched/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/bike_sched/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/bike_sched/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/bike_sched/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/bike_sched/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/bike_sched/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/bike_sched/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/bike_sched/sys/ia64/conf/SKI#2 integrate .. //depot/projects/bike_sched/sys/ia64/disasm/disasm.h#2 integrate .. //depot/projects/bike_sched/sys/ia64/disasm/disasm_decode.c#2 integrate .. //depot/projects/bike_sched/sys/ia64/disasm/disasm_extract.c#2 integrate .. //depot/projects/bike_sched/sys/ia64/disasm/disasm_format.c#2 integrate .. //depot/projects/bike_sched/sys/ia64/disasm/disasm_int.h#2 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/emulate.c#1 branch .. //depot/projects/bike_sched/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/bike_sched/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/bike_sched/sys/isa/isa_common.c#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_acct.c#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_clock.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_event.c#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_fork.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_linker.c#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_module.c#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_switch.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_synch.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_tc.c#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_thread.c#4 integrate .. //depot/projects/bike_sched/sys/kern/link_elf.c#2 integrate .. //depot/projects/bike_sched/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/bike_sched/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/bike_sched/sys/kern/sched_core.c#1 branch .. //depot/projects/bike_sched/sys/kern/sched_ule.c#3 integrate .. //depot/projects/bike_sched/sys/kern/subr_bus.c#2 integrate .. //depot/projects/bike_sched/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/bike_sched/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/bike_sched/sys/kern/subr_rman.c#2 integrate .. //depot/projects/bike_sched/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/bike_sched/sys/kern/syscalls.master#3 integrate .. //depot/projects/bike_sched/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/bike_sched/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/bike_sched/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/bike_sched/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/bike_sched/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/bike_sched/sys/kern/uipc_socket2.c#2 integrate .. //depot/projects/bike_sched/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/bike_sched/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/bike_sched/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/bike_sched/sys/kern/vfs_init.c#2 integrate .. //depot/projects/bike_sched/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/bike_sched/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/bike_sched/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/bike_sched/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/bike_sched/sys/modules/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/ath_hal/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/geom/geom_bde/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/if_bridge/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/mxge/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/mxge/mxge/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/mxge/mxge_eth_z8e/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/mxge/mxge_ethp_z8e/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/myri10ge/Makefile#2 delete .. //depot/projects/bike_sched/sys/modules/myri10ge/myri10ge/Makefile#2 delete .. //depot/projects/bike_sched/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#2 delete .. //depot/projects/bike_sched/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#2 delete .. //depot/projects/bike_sched/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/netgraph/tag/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/nfe/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/ppc/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/sound/driver/ak452x/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/sound/driver/envy24/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/xfs/Makefile#2 integrate .. //depot/projects/bike_sched/sys/net/bpf.c#2 integrate .. //depot/projects/bike_sched/sys/net/bpf.h#2 integrate .. //depot/projects/bike_sched/sys/net/if.c#2 integrate .. //depot/projects/bike_sched/sys/net/if.h#2 integrate .. //depot/projects/bike_sched/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/bike_sched/sys/net/if_bridge.c#2 integrate .. //depot/projects/bike_sched/sys/net/if_clone.c#2 integrate .. //depot/projects/bike_sched/sys/net/if_enc.c#1 branch .. //depot/projects/bike_sched/sys/net/if_gif.c#2 integrate .. //depot/projects/bike_sched/sys/net/if_stf.c#2 integrate .. //depot/projects/bike_sched/sys/net/if_tun.c#2 integrate .. //depot/projects/bike_sched/sys/net/if_types.h#2 integrate .. //depot/projects/bike_sched/sys/net/if_var.h#2 integrate .. //depot/projects/bike_sched/sys/net/if_vlan.c#2 integrate .. //depot/projects/bike_sched/sys/net/route.c#2 integrate .. //depot/projects/bike_sched/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/bike_sched/sys/netatalk/COPYRIGHT#2 integrate .. //depot/projects/bike_sched/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_tag.c#1 branch .. //depot/projects/bike_sched/sys/netgraph/ng_tag.h#1 branch .. //depot/projects/bike_sched/sys/netinet/if_ether.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/ip_output.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_seq.h#2 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/bike_sched/sys/netinet6/in6.c#2 integrate .. //depot/projects/bike_sched/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/bike_sched/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/bike_sched/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/bike_sched/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/bike_sched/sys/netinet6/nd6.c#2 integrate .. //depot/projects/bike_sched/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/bike_sched/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/bike_sched/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/bike_sched/sys/netipsec/ipsec_osdep.h#2 integrate .. //depot/projects/bike_sched/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/bike_sched/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/bike_sched/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/bike_sched/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/bike_sched/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/bike_sched/sys/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/bike_sched/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/bike_sched/sys/nfsserver/nfsrvcache.h#2 integrate .. //depot/projects/bike_sched/sys/opencrypto/crypto.c#2 integrate .. //depot/projects/bike_sched/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/bike_sched/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/bike_sched/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/bike_sched/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/bike_sched/sys/pci/agp_i810.c#2 integrate .. //depot/projects/bike_sched/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/bike_sched/sys/posix4/ksched.c#3 integrate .. //depot/projects/bike_sched/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/bike_sched/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/bike_sched/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/bike_sched/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/bike_sched/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/bike_sched/sys/security/audit/audit.c#2 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_ioctl.h#2 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/bike_sched/sys/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/bike_sched/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/bike_sched/sys/sparc64/include/_bus.h#2 integrate .. //depot/projects/bike_sched/sys/sparc64/include/bus.h#2 integrate .. //depot/projects/bike_sched/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/bike_sched/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/bike_sched/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/bike_sched/sys/sys/firmware.h#2 integrate .. //depot/projects/bike_sched/sys/sys/gpt.h#2 integrate .. //depot/projects/bike_sched/sys/sys/linker.h#2 integrate .. //depot/projects/bike_sched/sys/sys/protosw.h#2 integrate .. //depot/projects/bike_sched/sys/sys/rman.h#2 integrate .. //depot/projects/bike_sched/sys/sys/rwlock.h#2 integrate .. //depot/projects/bike_sched/sys/sys/sched.h#3 integrate .. //depot/projects/bike_sched/sys/sys/socketvar.h#2 integrate .. //depot/projects/bike_sched/sys/sys/sockio.h#2 integrate .. //depot/projects/bike_sched/sys/sys/sx.h#2 integrate .. //depot/projects/bike_sched/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/bike_sched/sys/sys/sysctl.h#2 integrate .. //depot/projects/bike_sched/sys/tools/fw_stub.awk#2 integrate .. //depot/projects/bike_sched/sys/vm/pmap.h#2 integrate .. //depot/projects/bike_sched/sys/vm/vm_fault.c#2 integrate .. //depot/projects/bike_sched/sys/vm/vm_map.c#2 integrate .. //depot/projects/bike_sched/sys/vm/vm_meter.c#2 integrate .. //depot/projects/bike_sched/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/bike_sched/sys/vm/vm_page.c#2 integrate .. //depot/projects/bike_sched/sys/vm/vm_pageq.c#2 integrate Differences ... ==== //depot/projects/bike_sched/sys/amd64/amd64/fpu.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.158 2006/04/19 07:00:19 cperciva Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.159 2006/06/19 22:36:01 davidxu Exp $"); #include #include @@ -125,6 +125,10 @@ mxcsr = __INITIAL_MXCSR__; ldmxcsr(mxcsr); fxsave(&fpu_cleanstate); + if (fpu_cleanstate.sv_env.en_mxcsr_mask) + cpu_mxcsr_mask = fpu_cleanstate.sv_env.en_mxcsr_mask; + else + cpu_mxcsr_mask = 0xFFBF; start_emulating(); bzero(fpu_cleanstate.sv_fp, sizeof(fpu_cleanstate.sv_fp)); bzero(fpu_cleanstate.sv_xmm, sizeof(fpu_cleanstate.sv_xmm)); ==== //depot/projects/bike_sched/sys/amd64/amd64/initcpu.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.49 2005/10/14 22:52:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.50 2006/06/19 22:59:28 davidxu Exp $"); #include "opt_cpu.h" @@ -60,6 +60,7 @@ u_int cpu_procinfo2; /* Multicore info */ char cpu_vendor[20]; /* CPU Origin code */ u_int cpu_fxsr; /* SSE enabled */ +u_int cpu_mxcsr_mask; /* Valid bits in mxcsr */ /* * Initialize CPU control registers ==== //depot/projects/bike_sched/sys/amd64/amd64/machdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.649 2006/05/11 17:29:22 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.650 2006/06/19 22:36:01 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1507,7 +1507,7 @@ penv_xmm->en_rip = penv_fpreg->en_rip; penv_xmm->en_rdp = penv_fpreg->en_rdp; penv_xmm->en_mxcsr = penv_fpreg->en_mxcsr; - penv_xmm->en_mxcsr_mask = penv_fpreg->en_mxcsr_mask; + penv_xmm->en_mxcsr_mask = penv_fpreg->en_mxcsr_mask & cpu_mxcsr_mask; /* FPU registers */ for (i = 0; i < 8; ++i) @@ -1634,6 +1634,7 @@ static int set_fpcontext(struct thread *td, const mcontext_t *mcp) { + struct savefpu *fpstate; if (mcp->mc_fpformat == _MC_FPFMT_NODEV) return (0); @@ -1649,7 +1650,9 @@ * be called with interrupts disabled. * XXX obsolete on trap-16 systems? */ - fpusetregs(td, (struct savefpu *)&mcp->mc_fpstate); + fpstate = (struct savefpu *)&mcp->mc_fpstate; + fpstate->sv_env.en_mxcsr &= cpu_mxcsr_mask; + fpusetregs(td, fpstate); } else return (EINVAL); return (0); ==== //depot/projects/bike_sched/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.554 2006/05/01 22:06:59 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.560 2006/06/27 04:28:22 alc Exp $"); /* * Manages physical address maps. @@ -209,6 +209,8 @@ static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); static void pmap_clear_ptes(vm_page_t m, long bit); +static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, + vm_page_t m, vm_prot_t prot, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva, pd_entry_t ptepde); static void pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde); @@ -1004,17 +1006,22 @@ * Note: SMP coherent. Uses a ranged shootdown IPI. */ void -pmap_qenter(vm_offset_t sva, vm_page_t *m, int count) +pmap_qenter(vm_offset_t sva, vm_page_t *ma, int count) { - vm_offset_t va; + pt_entry_t *endpte, oldpte, *pte; - va = sva; - while (count-- > 0) { - pmap_kenter(va, VM_PAGE_TO_PHYS(*m)); - va += PAGE_SIZE; - m++; + oldpte = 0; + pte = vtopte(sva); + endpte = pte + count; + while (pte < endpte) { + oldpte |= *pte; + pte_store(pte, VM_PAGE_TO_PHYS(*ma) | PG_G | PG_RW | PG_V); + pte++; + ma++; } - pmap_invalidate_range(kernel_pmap, sva, va); + if ((oldpte & PG_V) != 0) + pmap_invalidate_range(kernel_pmap, sva, sva + count * + PAGE_SIZE); } /* @@ -1657,7 +1664,7 @@ static const struct timeval printinterval = { 60, 0 }; static struct timeval lastprint; static vm_pindex_t colour; - int bit, field; + int bit, field, page_req; pv_entry_t pv; struct pv_chunk *pc; vm_page_t m; @@ -1690,7 +1697,8 @@ } } /* No free items, allocate another chunk */ - m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + page_req = try ? VM_ALLOC_NORMAL : VM_ALLOC_SYSTEM; + m = vm_page_alloc(NULL, colour, page_req | VM_ALLOC_NOOBJ); if (m == NULL) { if (try) { pv_entry_count--; @@ -2310,6 +2318,38 @@ } /* + * Maps a sequence of resident pages belonging to the same object. + * The sequence begins with the given page m_start. This page is + * mapped at the given virtual address start. Each subsequent page is + * mapped at a virtual address that is offset from start by the same + * amount as the page is offset from m_start within the object. The + * last page in the sequence is the page with the largest offset from + * m_start that can be mapped at a virtual address less than the given + * virtual address end. Not every virtual page between start and end + * is mapped; only those for which a resident page exists with the + * corresponding offset from m_start are mapped. + */ +void +pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, + vm_page_t m_start, vm_prot_t prot) +{ + vm_page_t m, mpte; + vm_pindex_t diff, psize; + + VM_OBJECT_LOCK_ASSERT(m_start->object, MA_OWNED); + psize = atop(end - start); + mpte = NULL; + m = m_start; + PMAP_LOCK(pmap); + while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) { + mpte = pmap_enter_quick_locked(pmap, start + ptoa(diff), m, + prot, mpte); + m = TAILQ_NEXT(m, listq); + } + PMAP_UNLOCK(pmap); +} + +/* * this code makes some *MAJOR* assumptions: * 1. Current pmap & pmap exists. * 2. Not wired. @@ -2318,19 +2358,27 @@ * but is *MUCH* faster than pmap_enter... */ -vm_page_t -pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, - vm_page_t mpte) +void +pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) +{ + + PMAP_LOCK(pmap); + (void) pmap_enter_quick_locked(pmap, va, m, prot, NULL); + PMAP_UNLOCK(pmap); +} + +static vm_page_t +pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, + vm_prot_t prot, vm_page_t mpte) { pt_entry_t *pte; vm_paddr_t pa; KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva || (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0, - ("pmap_enter_quick: managed mapping within the clean submap")); + ("pmap_enter_quick_locked: managed mapping within the clean submap")); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); - PMAP_LOCK(pmap); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); /* * In the case that a page table page is not @@ -2347,7 +2395,6 @@ if (mpte && (mpte->pindex == ptepindex)) { mpte->wire_count++; } else { - retry: /* * Get the page directory entry */ @@ -2365,18 +2412,8 @@ } else { mpte = _pmap_allocpte(pmap, ptepindex, M_NOWAIT); - if (mpte == NULL) { - PMAP_UNLOCK(pmap); - vm_page_busy(m); - vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(m->object); - VM_WAIT; - VM_OBJECT_LOCK(m->object); - vm_page_lock_queues(); - vm_page_wakeup(m); - PMAP_LOCK(pmap); - goto retry; - } + if (mpte == NULL) + return (mpte); } } } else { @@ -2395,16 +2432,20 @@ pmap_unwire_pte_hold(pmap, va, mpte); mpte = NULL; } - goto out; + return (mpte); } /* - * Enter on the PV list if part of our managed memory. Note that we - * raise IPL while manipulating pv_table since pmap_enter can be - * called at interrupt time. + * Enter on the PV list if part of our managed memory. */ - if ((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) - pmap_insert_entry(pmap, va, m); + if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0 && + !pmap_try_insert_pv_entry(pmap, va, m)) { + if (mpte != NULL) { + pmap_unwire_pte_hold(pmap, va, mpte); + mpte = NULL; + } + return (mpte); + } /* * Increment counters @@ -2422,8 +2463,6 @@ pte_store(pte, pa | PG_V | PG_U); else pte_store(pte, pa | PG_V | PG_U | PG_MANAGED); -out: - PMAP_UNLOCK(pmap); return mpte; } @@ -2635,7 +2674,7 @@ PHYS_TO_DMAP(VM_PAGE_TO_PHYS(dstmpde)); pde = &pde[pmap_pde_index(addr)]; if (*pde == 0) { - *pde = srcptepaddr; + *pde = srcptepaddr & ~PG_W; dst_pmap->pm_stats.resident_count += NBPDR / PAGE_SIZE; } else @@ -2658,11 +2697,6 @@ * we only virtual copy managed pages */ if ((ptetemp & PG_MANAGED) != 0) { - /* - * We have to check after allocpte for the - * pte still being around... allocpte can - * block. - */ dstmpte = pmap_allocpte(dst_pmap, addr, M_NOWAIT); if (dstmpte == NULL) @@ -2674,14 +2708,16 @@ pmap_try_insert_pv_entry(dst_pmap, addr, PHYS_TO_VM_PAGE(ptetemp & PG_FRAME))) { /* - * Clear the modified and + * Clear the wired, modified, and * accessed (referenced) bits * during the copy. */ - *dst_pte = ptetemp & ~(PG_M | PG_A); + *dst_pte = ptetemp & ~(PG_W | PG_M | + PG_A); dst_pmap->pm_stats.resident_count++; } else - pmap_unwire_pte_hold(dst_pmap, addr, dstmpte); + pmap_unwire_pte_hold(dst_pmap, addr, + dstmpte); if (dstmpte->wire_count >= srcmpte->wire_count) break; } ==== //depot/projects/bike_sched/sys/amd64/amd64/trap.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.303 2006/03/13 23:55:31 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.304 2006/06/20 12:44:21 yar Exp $"); /* * AMD64 Trap and System call handling @@ -679,15 +679,9 @@ } #ifdef KDB - if (debugger_on_panic || kdb_active) { - register_t rflags; - rflags = intr_disable(); - if (kdb_trap(type, 0, frame)) { - intr_restore(rflags); + if (debugger_on_panic || kdb_active) + if (kdb_trap(type, 0, frame)) return; - } - intr_restore(rflags); - } #endif printf("trap number = %d\n", type); if (type <= MAX_TRAP_MSG) ==== //depot/projects/bike_sched/sys/amd64/conf/DEFAULTS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.5 2006/04/28 21:21:51 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.6 2006/06/12 04:21:49 imp Exp $ machine amd64 @@ -11,3 +11,6 @@ # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device + +# UART chips on this platform +device uart_ns8250 ==== //depot/projects/bike_sched/sys/amd64/conf/GENERIC#2 (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.458 2006/05/17 20:45:44 marius Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.462 2006/06/26 22:03:20 babkin Exp $ cpu HAMMER ident GENERIC @@ -28,6 +28,7 @@ #options SCHED_ULE # ULE scheduler options SCHED_4BSD # 4BSD scheduler +#options SCHED_CORE # CORE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 30 23:50:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 688A616A412; Fri, 30 Jun 2006 23:50:49 +0000 (UTC) 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 2A8EE16A403 for ; Fri, 30 Jun 2006 23:50:49 +0000 (UTC) (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 D4DDA43D53 for ; Fri, 30 Jun 2006 23:50:48 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5UNomTU097134 for ; Fri, 30 Jun 2006 23:50:48 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5UNomSG097131 for perforce@freebsd.org; Fri, 30 Jun 2006 23:50:48 GMT (envelope-from peter@freebsd.org) Date: Fri, 30 Jun 2006 23:50:48 GMT Message-Id: <200606302350.k5UNomSG097131@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 100365 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, 30 Jun 2006 23:50:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=100365 Change 100365 by peter@peter_daintree on 2006/06/30 23:50:43 Convert new code that slipped in from the mainline. Affected files ... .. //depot/projects/bike_sched/sys/kern/sched_4bsd.c#4 edit Differences ... ==== //depot/projects/bike_sched/sys/kern/sched_4bsd.c#4 (text+ko) ==== @@ -1194,11 +1194,9 @@ void sched_relinquish(struct thread *td) { - struct ksegrp *kg; - kg = td->td_ksegrp; mtx_lock_spin(&sched_lock); - if (kg->kg_pri_class == PRI_TIMESHARE) + if (td->td_pri_class == PRI_TIMESHARE) sched_prio(td, PRI_MAX_TIMESHARE); mi_switch(SW_VOL, NULL); mtx_unlock_spin(&sched_lock); From owner-p4-projects@FreeBSD.ORG Fri Jun 30 23:59:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F7D116A40F; Fri, 30 Jun 2006 23:59:00 +0000 (UTC) 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 1BBEA16A403 for ; Fri, 30 Jun 2006 23:59:00 +0000 (UTC) (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 C1B3D43D4C for ; Fri, 30 Jun 2006 23:58:59 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5UNwxvH097446 for ; Fri, 30 Jun 2006 23:58:59 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5UNwxYX097443 for perforce@freebsd.org; Fri, 30 Jun 2006 23:58:59 GMT (envelope-from peter@freebsd.org) Date: Fri, 30 Jun 2006 23:58:59 GMT Message-Id: <200606302358.k5UNwxYX097443@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 100366 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, 30 Jun 2006 23:59:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=100366 Change 100366 by peter@peter_daintree on 2006/06/30 23:58:14 Eliminate now-useless sched_userret(). Saves a wasted function call to code that may or may not do a diagnostic assert. Just do the assert that is the same for all (XXX SCHED_CORE hasn't been de-kse'ed yet, so it still has kse cleanup code in this function) Affected files ... .. //depot/projects/bike_sched/sys/kern/sched_4bsd.c#5 edit .. //depot/projects/bike_sched/sys/kern/sched_core.c#2 edit .. //depot/projects/bike_sched/sys/kern/sched_ule.c#4 edit .. //depot/projects/bike_sched/sys/kern/subr_trap.c#3 edit .. //depot/projects/bike_sched/sys/sys/sched.h#4 edit Differences ... ==== //depot/projects/bike_sched/sys/kern/sched_4bsd.c#5 (text+ko) ==== @@ -1149,14 +1149,6 @@ } void -sched_userret(struct thread *td) -{ - - KASSERT((td->td_flags & TDF_BORROWING) == 0, - ("thread with borrowed priority returning to userland")); -} - -void sched_bind(struct thread *td, int cpu) { struct kse *ke; ==== //depot/projects/bike_sched/sys/kern/sched_core.c#2 (text+ko) ==== @@ -1348,6 +1348,7 @@ #endif } +/* XXXX gone */ void sched_userret(struct thread *td) { ==== //depot/projects/bike_sched/sys/kern/sched_ule.c#4 (text+ko) ==== @@ -1641,14 +1641,6 @@ return (load); } -void -sched_userret(struct thread *td) -{ - - KASSERT((td->td_flags & TDF_BORROWING) == 0, - ("thread with borrowed priority returning to userland")); -} - struct kse * sched_choose(void) { ==== //depot/projects/bike_sched/sys/kern/subr_trap.c#3 (text+ko) ==== @@ -120,10 +120,8 @@ if (p->p_flag & P_PROFIL) addupc_task(td, TRAPF_PC(frame), td->td_pticks * psratio); - /* - * Let the scheduler adjust our priority etc. - */ - sched_userret(td); + KASSERT((td->td_flags & TDF_BORROWING) == 0, + ("userret: thread with borrowed priority returning to userland")); KASSERT(td->td_locks == 0, ("userret: Returning with %d locks held.", td->td_locks)); } ==== //depot/projects/bike_sched/sys/sys/sched.h#4 (text+ko) ==== @@ -65,7 +65,6 @@ void sched_sleep(struct thread *td); void sched_switch(struct thread *td, struct thread *newtd, int flags); void sched_unlend_prio(struct thread *td, u_char prio); -void sched_userret(struct thread *td); void sched_wakeup(struct thread *td); /* From owner-p4-projects@FreeBSD.ORG Sat Jul 1 00:04:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34AB916A47C; Sat, 1 Jul 2006 00:04:07 +0000 (UTC) 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 DC01316A403 for ; Sat, 1 Jul 2006 00:04:06 +0000 (UTC) (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 A20CD43D4C for ; Sat, 1 Jul 2006 00:04:06 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61046jr098904 for ; Sat, 1 Jul 2006 00:04:06 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61046Wd098901 for perforce@freebsd.org; Sat, 1 Jul 2006 00:04:06 GMT (envelope-from peter@freebsd.org) Date: Sat, 1 Jul 2006 00:04:06 GMT Message-Id: <200607010004.k61046Wd098901@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 100367 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 00:04:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=100367 Change 100367 by peter@peter_work on 2006/07/01 00:03:11 Add a special sched_run_ithread() function that is an optimized case for setrunqueue() and the myriad of functions and tests that it makes. For ithreads (now that alpha is gone) on 4bsd, we can actually schedule them really easy. We can eliminate all the priority balancing, tests for IPI'ing, etc. For 4bsd, we either preempt on the current cpu or put it on the run queue. This is identical to what the current code does but in a less claw-your-eyes-out way of writing the code. This certainly breaks compiling with SCHED_ULE because I haven't done the code there. A stub could be put in that just implements sched_run_ithread() as a call to setrunqueue(). Affected files ... .. //depot/projects/bike_sched/sys/kern/kern_intr.c#3 edit .. //depot/projects/bike_sched/sys/kern/sched_4bsd.c#6 edit .. //depot/projects/bike_sched/sys/sys/sched.h#5 edit Differences ... ==== //depot/projects/bike_sched/sys/kern/kern_intr.c#3 (text+ko) ==== @@ -531,7 +531,7 @@ CTR3(KTR_INTR, "%s: schedule pid %d (%s)", __func__, p->p_pid, p->p_comm); TD_CLR_IWAIT(td); - setrunqueue(td, SRQ_INTR); + sched_run_ithread(td); } else { CTR5(KTR_INTR, "%s: pid %d (%s): it_need %d, state %d", __func__, p->p_pid, p->p_comm, it->it_need, td->td_state); ==== //depot/projects/bike_sched/sys/kern/sched_4bsd.c#6 (text+ko) ==== @@ -1084,6 +1084,45 @@ #endif /* SMP */ void +sched_run_ithread(struct thread *td) +{ + struct kse *ke = td->td_kse; + + /* Inline of setrunqueue */ + CTR2(KTR_RUNQ, "sched_run_ithread: td:%p pid:%d", + td, td->td_proc->p_pid); + CTR5(KTR_SCHED, "sched_run_ithread: %p(%s) prio %d by %p(%s)", + td, td->td_proc->p_comm, td->td_priority, ctd, + ctd->td_proc->p_comm); + mtx_assert(&sched_lock, MA_OWNED); + KASSERT((td->td_inhibitors == 0), + ("sched_run_ithread: trying to run inhibitted thread")); + KASSERT((TD_CAN_RUN(td) || TD_IS_RUNNING(td)), + ("sched_run_ithread: bad thread state")); + KASSERT(ke->ke_state != KES_ONRUNQ, + ("sched_run_ithread: kse %p (%s) already in run queue", ke, + td->td_proc->p_comm)); + KASSERT(td->td_proc->p_sflag & PS_INMEM, + ("sched_run_ithread: process swapped out")); + CTR5(KTR_SCHED, "sched_run_ithread: %p(%s) prio %d by %p(%s)", + td, td->td_proc->p_comm, td->td_priority, curthread, + curthread->td_proc->p_comm); + CTR2(KTR_RUNQ, "sched_run_ithread: adding kse:%p (td:%p) to runq", ke, td); + + TD_SET_RUNQ(td); + ke->ke_runq = &runq; + /* Preempt if we can. If we did, we're finished */ + if (maybe_preempt(td)) + return; + /* We didn't preempt. Place on runq */ + if ((td->td_proc->p_flag & P_NOLOAD) == 0) + sched_load_add(); + runq_add(ke->ke_runq, ke, SRQ_INTR); + ke->ke_state = KES_ONRUNQ; + maybe_resched(td); +} + +void sched_rem(struct thread *td) { struct kse *ke; ==== //depot/projects/bike_sched/sys/sys/sched.h#5 (text+ko) ==== @@ -75,6 +75,7 @@ void sched_rem(struct thread *td); void sched_tick(void); void sched_relinquish(struct thread *td); +void sched_run_ithread(struct thread *td); /* * Binding makes cpu affinity permanent while pinning is used to temporarily From owner-p4-projects@FreeBSD.ORG Sat Jul 1 00:06:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C7E016A47E; Sat, 1 Jul 2006 00:06:10 +0000 (UTC) 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 673CA16A417 for ; Sat, 1 Jul 2006 00:06:10 +0000 (UTC) (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 B796243D46 for ; Sat, 1 Jul 2006 00:06:09 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61069Er099012 for ; Sat, 1 Jul 2006 00:06:09 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61069ZH099009 for perforce@freebsd.org; Sat, 1 Jul 2006 00:06:09 GMT (envelope-from peter@freebsd.org) Date: Sat, 1 Jul 2006 00:06:09 GMT Message-Id: <200607010006.k61069ZH099009@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 100368 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 00:06:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=100368 Change 100368 by peter@peter_work on 2006/07/01 00:05:31 On second thoughts, make ULE compile too. Add a trivial sched_run_ithread() which just calls the generic setrunqueue() code. Affected files ... .. //depot/projects/bike_sched/sys/kern/sched_ule.c#5 edit Differences ... ==== //depot/projects/bike_sched/sys/kern/sched_ule.c#5 (text+ko) ==== @@ -1909,6 +1909,13 @@ #endif } +void +sched_run_ithread(struct thread *td) +{ + + setrunqueue(td, SRQ_INTR); +} + int sched_sizeof_proc(void) { From owner-p4-projects@FreeBSD.ORG Sat Jul 1 00:11:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 515F016A412; Sat, 1 Jul 2006 00:11:17 +0000 (UTC) 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 1283116A403 for ; Sat, 1 Jul 2006 00:11:17 +0000 (UTC) (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 CF0A843D46 for ; Sat, 1 Jul 2006 00:11:16 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k610BGuQ099248 for ; Sat, 1 Jul 2006 00:11:16 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k610BGqU099245 for perforce@freebsd.org; Sat, 1 Jul 2006 00:11:16 GMT (envelope-from peter@freebsd.org) Date: Sat, 1 Jul 2006 00:11:16 GMT Message-Id: <200607010011.k610BGqU099245@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 100369 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 00:11:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=100369 Change 100369 by peter@peter_daintree on 2006/07/01 00:11:08 pass the vector to the interrupt handler rather than looking it up again. Affected files ... .. //depot/projects/bike_sched/sys/i386/i386/intr_machdep.c#2 edit .. //depot/projects/bike_sched/sys/i386/i386/local_apic.c#2 edit Differences ... ==== //depot/projects/bike_sched/sys/i386/i386/intr_machdep.c#2 (text+ko) ==== @@ -166,7 +166,7 @@ } void -intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) +intr_execute_handlers(struct intsrc *isrc, u_int vector, struct trapframe *frame) { struct thread *td; struct intr_event *ie; @@ -190,7 +190,6 @@ * XXX: We assume that IRQ 0 is only used for the ISA timer * device (clk). */ - vector = isrc->is_pic->pic_vector(isrc); if (vector == 0) clkintr_pending = 1; ==== //depot/projects/bike_sched/sys/i386/i386/local_apic.c#2 (text+ko) ==== @@ -601,10 +601,11 @@ { struct intsrc *isrc; - if (vector == -1) - panic("Couldn't get vector from ISR!"); + KASSERT(vector >= APIC_IO_INTS && vector != IDT_SYSCALL && + vector <= APIC_IO_INTS + APIC_NUM_IOINTS, + ("Vector %u does not map to an IRQ line", vector)); isrc = intr_lookup_source(apic_idt_to_irq(vector)); - intr_execute_handlers(isrc, &frame); + intr_execute_handlers(isrc, vector, &frame); } void From owner-p4-projects@FreeBSD.ORG Sat Jul 1 00:47:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC05B16A4A0; Sat, 1 Jul 2006 00:47:01 +0000 (UTC) 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 8C77916A47C for ; Sat, 1 Jul 2006 00:47:01 +0000 (UTC) (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 D606E43ED7 for ; Sat, 1 Jul 2006 00:15:23 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k610FNFU099456 for ; Sat, 1 Jul 2006 00:15:23 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k610FNPC099452 for perforce@freebsd.org; Sat, 1 Jul 2006 00:15:23 GMT (envelope-from peter@freebsd.org) Date: Sat, 1 Jul 2006 00:15:23 GMT Message-Id: <200607010015.k610FNPC099452@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 100371 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 00:47:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=100371 Change 100371 by peter@peter_daintree on 2006/07/01 00:15:02 Oops. Remove now unused 'vector' local variable. Missed this in my broken out diff. Affected files ... .. //depot/projects/bike_sched/sys/i386/i386/intr_machdep.c#3 edit Differences ... ==== //depot/projects/bike_sched/sys/i386/i386/intr_machdep.c#3 (text+ko) ==== @@ -171,7 +171,7 @@ struct thread *td; struct intr_event *ie; struct intr_handler *ih; - int error, vector, thread; + int error, thread; td = curthread; From owner-p4-projects@FreeBSD.ORG Sat Jul 1 00:47:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DE7F16A52D; Sat, 1 Jul 2006 00:47:08 +0000 (UTC) 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 49D2616A4E0 for ; Sat, 1 Jul 2006 00:47:08 +0000 (UTC) (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 3628B43ED8 for ; Sat, 1 Jul 2006 00:15:24 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k610FOJU099462 for ; Sat, 1 Jul 2006 00:15:24 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k610FNnY099459 for perforce@freebsd.org; Sat, 1 Jul 2006 00:15:23 GMT (envelope-from peter@freebsd.org) Date: Sat, 1 Jul 2006 00:15:23 GMT Message-Id: <200607010015.k610FNnY099459@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 100372 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 00:47:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=100372 Change 100372 by peter@peter_daintree on 2006/07/01 00:15:21 Oops. Have the atpic methods also pass the vector. Missed this in my broken out diff. Affected files ... .. //depot/projects/bike_sched/sys/i386/isa/atpic.c#2 edit Differences ... ==== //depot/projects/bike_sched/sys/i386/isa/atpic.c#2 (text+ko) ==== @@ -580,7 +580,7 @@ if ((isr & IRQ_MASK(7)) == 0) return; } - intr_execute_handlers(isrc, &frame); + intr_execute_handlers(isrc, vector, &frame); } #ifdef DEV_ISA From owner-p4-projects@FreeBSD.ORG Sat Jul 1 00:47:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F23AD16A49E; Sat, 1 Jul 2006 00:47:14 +0000 (UTC) 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 B866216A514 for ; Sat, 1 Jul 2006 00:47:14 +0000 (UTC) (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 6A25B43D73 for ; Sat, 1 Jul 2006 00:13:20 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k610DKhA099345 for ; Sat, 1 Jul 2006 00:13:20 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k610DK66099342 for perforce@freebsd.org; Sat, 1 Jul 2006 00:13:20 GMT (envelope-from peter@freebsd.org) Date: Sat, 1 Jul 2006 00:13:20 GMT Message-Id: <200607010013.k610DK66099342@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 100370 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 00:47:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=100370 Change 100370 by peter@peter_daintree on 2006/07/01 00:12:46 Eliminate apic_idt_to_irq(). A function call to do a one-line array lookup is a bit excessive. Affected files ... .. //depot/projects/bike_sched/sys/i386/i386/local_apic.c#3 edit .. //depot/projects/bike_sched/sys/i386/include/apicvar.h#2 edit Differences ... ==== //depot/projects/bike_sched/sys/i386/i386/local_apic.c#3 (text+ko) ==== @@ -604,7 +604,7 @@ KASSERT(vector >= APIC_IO_INTS && vector != IDT_SYSCALL && vector <= APIC_IO_INTS + APIC_NUM_IOINTS, ("Vector %u does not map to an IRQ line", vector)); - isrc = intr_lookup_source(apic_idt_to_irq(vector)); + isrc = intr_lookup_source(ioint_irqs[vector - APIC_IO_INTS]); intr_execute_handlers(isrc, vector, &frame); } @@ -741,17 +741,6 @@ mtx_unlock_spin(&icu_lock); } -/* Map an IDT vector (APIC) to an IRQ (interrupt source). */ -u_int -apic_idt_to_irq(u_int vector) -{ - - KASSERT(vector >= APIC_IO_INTS && vector != IDT_SYSCALL && - vector <= APIC_IO_INTS + APIC_NUM_IOINTS, - ("Vector %u does not map to an IRQ line", vector)); - return (ioint_irqs[vector - APIC_IO_INTS]); -} - #ifdef DDB /* * Dump data about APIC IDT vector mappings. ==== //depot/projects/bike_sched/sys/i386/include/apicvar.h#2 (text+ko) ==== @@ -176,7 +176,6 @@ u_int apic_alloc_vector(u_int irq); void apic_enable_vector(u_int vector); void apic_free_vector(u_int vector, u_int irq); -u_int apic_idt_to_irq(u_int vector); void apic_register_enumerator(struct apic_enumerator *enumerator); void *ioapic_create(uintptr_t addr, int32_t id, int intbase); int ioapic_disable_pin(void *cookie, u_int pin); From owner-p4-projects@FreeBSD.ORG Sat Jul 1 00:47:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFB1C16A58E; Sat, 1 Jul 2006 00:47:17 +0000 (UTC) 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 BD6FF16A519 for ; Sat, 1 Jul 2006 00:47:17 +0000 (UTC) (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 6997E441DC for ; Sat, 1 Jul 2006 00:24:36 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k610OaUC099834 for ; Sat, 1 Jul 2006 00:24:36 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k610OaUl099821 for perforce@freebsd.org; Sat, 1 Jul 2006 00:24:36 GMT (envelope-from peter@freebsd.org) Date: Sat, 1 Jul 2006 00:24:36 GMT Message-Id: <200607010024.k610OaUl099821@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 100373 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 00:47:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=100373 Change 100373 by peter@peter_work on 2006/07/01 00:24:00 Eliminate a call to intr_lookup_source() in the critical code paths which collapses to a function index operation. Just do the array lookup. Also, include prototype change for intr_execute_handlers() to include the vector argument. Affected files ... .. //depot/projects/bike_sched/sys/i386/i386/intr_machdep.c#4 edit .. //depot/projects/bike_sched/sys/i386/i386/local_apic.c#4 edit .. //depot/projects/bike_sched/sys/i386/include/intr_machdep.h#2 edit Differences ... ==== //depot/projects/bike_sched/sys/i386/i386/intr_machdep.c#4 (text+ko) ==== @@ -60,9 +60,10 @@ typedef void (*mask_fn)(void *); static int intrcnt_index; -static struct intsrc *interrupt_sources[NUM_IO_INTS]; static struct mtx intr_table_lock; +struct intsrc *interrupt_sources[NUM_IO_INTS]; + #ifdef SMP static int assign_cpu; ==== //depot/projects/bike_sched/sys/i386/i386/local_apic.c#4 (text+ko) ==== @@ -604,7 +604,7 @@ KASSERT(vector >= APIC_IO_INTS && vector != IDT_SYSCALL && vector <= APIC_IO_INTS + APIC_NUM_IOINTS, ("Vector %u does not map to an IRQ line", vector)); - isrc = intr_lookup_source(ioint_irqs[vector - APIC_IO_INTS]); + isrc = interrupt_sources[ioint_irqs[vector - APIC_IO_INTS]]; intr_execute_handlers(isrc, vector, &frame); } ==== //depot/projects/bike_sched/sys/i386/include/intr_machdep.h#2 (text+ko) ==== @@ -109,6 +109,8 @@ u_int is_enabled:1; }; +extern struct intsrc *interrupt_sources[NUM_IO_INTS]; + struct trapframe; extern struct mtx icu_lock; @@ -128,7 +130,8 @@ void *arg, enum intr_type flags, void **cookiep); int intr_config_intr(int vector, enum intr_trigger trig, enum intr_polarity pol); -void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame); +void intr_execute_handlers(struct intsrc *isrc, u_int vector, + struct trapframe *frame); struct intsrc *intr_lookup_source(int vector); int intr_register_source(struct intsrc *isrc); int intr_remove_handler(void *cookie); From owner-p4-projects@FreeBSD.ORG Sat Jul 1 00:58:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9217E16A47B; Sat, 1 Jul 2006 00:58:19 +0000 (UTC) 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 55CCF16A417 for ; Sat, 1 Jul 2006 00:58:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B795A43D45 for ; Sat, 1 Jul 2006 00:58:18 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k610wIk6009105 for ; Sat, 1 Jul 2006 00:58:18 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k610wI85009102 for perforce@freebsd.org; Sat, 1 Jul 2006 00:58:18 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 1 Jul 2006 00:58:18 GMT Message-Id: <200607010058.k610wI85009102@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100374 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 00:58:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=100374 Change 100374 by kmacy@kmacy_storage:sun4v_work_stable on 2006/07/01 00:57:47 don't use memory ranges less than 4M Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/pmap.c#4 edit Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/pmap.c#4 (text+ko) ==== @@ -694,6 +694,12 @@ pa | TTE_KERNEL | VTD_4M, 0); } + for (i = 0; i < 2; i++) { + pa = nucleus_mappings[i]; + tsb_set_tte_real(&kernel_td[TSB4M_INDEX], TLB_PHYS_TO_DIRECT(pa), + pa | TTE_KERNEL | VTD_4M, 0); + + } /* * Get the available physical memory ranges from /memory/reg. These * are only used for kernel dumps, but it may not be wise to do prom @@ -761,6 +767,10 @@ tte_hash_insert(pm->pm_hash, TLB_PHYS_TO_DIRECT(pa), pa | TTE_KERNEL | VTD_4M); #endif + /* XXX relies on the fact that memory ranges only get smaller */ + for (i = 0; phys_avail[i + 2] != 0; i += 2) + if (phys_avail[i + 1] - phys_avail[i] < PAGE_SIZE_4M) + phys_avail[i] = phys_avail[i+1] = 0; } From owner-p4-projects@FreeBSD.ORG Sat Jul 1 03:06:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 712BF16A5F9; Sat, 1 Jul 2006 03:06:26 +0000 (UTC) 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 2DC3216A56E for ; Sat, 1 Jul 2006 03:06:26 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D188943FE1 for ; Sat, 1 Jul 2006 02:48:36 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k612ma8N015882 for ; Sat, 1 Jul 2006 02:48:36 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k612maRJ015879 for perforce@freebsd.org; Sat, 1 Jul 2006 02:48:36 GMT (envelope-from cdjones@FreeBSD.org) Date: Sat, 1 Jul 2006 02:48:36 GMT Message-Id: <200607010248.k612maRJ015879@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 100376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 03:06:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=100376 Change 100376 by cdjones@cdjones-impulse on 2006/07/01 02:47:46 Add to prison structure. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#7 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#7 (text+ko) ==== @@ -19,7 +19,8 @@ char *hostname; u_int32_t ip_number; unsigned int priority; -/* CJ TODO --- add reference to preferred scheduler, e.g. by name? */ +/* struct thread *scheduler; + CJ TODO --- add reference to preferred scheduler, e.g. by name? */ }; struct xprison { @@ -28,6 +29,8 @@ char pr_path[MAXPATHLEN]; char pr_host[MAXHOSTNAMELEN]; u_int32_t pr_ip; + unsigned int priority; + /* struct thread *scheduler; */ }; #define XPRISON_VERSION 1 @@ -67,6 +70,10 @@ * (d) set only during destruction of jail, no mutex needed */ #if defined(_KERNEL) || defined(_WANT_PRISON) + +#include +/*struct proc; */ + struct prison { LIST_ENTRY(prison) pr_list; /* (a) all prisons */ int pr_id; /* (c) prison id */ @@ -80,7 +87,7 @@ struct task pr_task; /* (d) destroy task */ struct mtx pr_mtx; unsigned int pr_priority; /* (p) jail priority */ -/* CJ TODO scheduler reference. */ + struct proc *pr_scheduler; /* (c) scheduler pid */ }; #endif /* _KERNEL || _WANT_PRISON */ From owner-p4-projects@FreeBSD.ORG Sat Jul 1 03:06:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E83716A697; Sat, 1 Jul 2006 03:06:31 +0000 (UTC) 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 D21BF16A519 for ; Sat, 1 Jul 2006 03:06:30 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3548643FE3 for ; Sat, 1 Jul 2006 02:48:37 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k612mbW2015888 for ; Sat, 1 Jul 2006 02:48:37 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k612maJx015885 for perforce@freebsd.org; Sat, 1 Jul 2006 02:48:36 GMT (envelope-from cdjones@FreeBSD.org) Date: Sat, 1 Jul 2006 02:48:36 GMT Message-Id: <200607010248.k612maJx015885@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 100377 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 03:06:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=100377 Change 100377 by cdjones@cdjones-impulse on 2006/07/01 02:47:56 .. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#6 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#6 (text+ko) ==== @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -92,6 +93,13 @@ SYSINIT(prison, SI_SUB_INTRINSIC, SI_ORDER_ANY, init_prison, NULL); +static void +jsched_dummy(void) +{ + int x; + tsleep(&x, 0, "-", hz); +} + /* * MPSAFE * @@ -108,6 +116,9 @@ struct jail_attach_args jaa; int vfslocked, error, tryprid; + struct proc *j_sched_proc; + struct kproc_desc *j_sched_kp; + error = copyin(uap->jail, &j, sizeof(j)); if (error) return (error); @@ -135,6 +146,7 @@ goto e_dropvnref; pr->pr_ip = j.ip_number; pr->pr_linux = NULL; + pr->pr_priority = j.priority; pr->pr_securelevel = securelevel; /* Determine next pr_id and add prison to allprison list. */ @@ -159,26 +171,67 @@ prisoncount++; mtx_unlock(&allprison_mtx); + /* TODO --- Should probably be an #ifdef SCHED_HIER here. */ + printf("A"); + MALLOC(j_sched_kp, struct kproc_desc *, sizeof(struct kproc_desc), M_TEMP, M_WAITOK | M_ZERO); + printf("B"); + if (NULL == j_sched_kp) + goto e_dropprref; + printf("C"); + MALLOC(j_sched_kp->arg0, char *, (7 + 6 + 1) * sizeof(char), M_TEMP, M_WAITOK | M_ZERO); + printf("D"); + if (!j_sched_kp->arg0) + goto e_dropprref; + printf("E"); + snprintf(j_sched_kp->arg0, 7 + 6 + 1, "jsched/%6d", pr->pr_id); + printf("F"); + j_sched_kp->func = jsched_dummy; + printf("G"); + j_sched_kp->global_procpp = &j_sched_proc; + printf("H"); + kproc_start(&j_sched_kp); + printf("I"); + /* pr->pr_scheduler = (j_sched_kp->global_procpp)->p_pid; */ /* TODO - why won't this work? */ + FREE(j_sched_kp->arg0, M_TEMP); + printf("J"); + FREE(j_sched_kp, M_TEMP); + printf("K"); + /* TODO --- probable #endif */ + error = jail_attach(td, &jaa); + printf("L"); if (error) goto e_dropprref; + printf("M"); mtx_lock(&pr->pr_mtx); pr->pr_ref--; mtx_unlock(&pr->pr_mtx); + printf("N"); td->td_retval[0] = jaa.jid; + printf("O"); return (0); e_dropprref: + printf("P"); + if (j_sched_kp && j_sched_kp->arg0) + FREE(j_sched_kp->arg0, M_TEMP); + printf("P1"); + if (j_sched_kp) + FREE(j_sched_kp, M_TEMP); + printf("P2"); mtx_lock(&allprison_mtx); LIST_REMOVE(pr, pr_list); prisoncount--; mtx_unlock(&allprison_mtx); e_dropvnref: + printf("Q"); vfslocked = VFS_LOCK_GIANT(pr->pr_root->v_mount); vrele(pr->pr_root); VFS_UNLOCK_GIANT(vfslocked); e_killmtx: + printf("R"); mtx_destroy(&pr->pr_mtx); FREE(pr, M_PRISON); + printf("Z"); return (error); } From owner-p4-projects@FreeBSD.ORG Sat Jul 1 04:54:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE69A16A49E; Sat, 1 Jul 2006 04:54:15 +0000 (UTC) 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 7A22216A47B for ; Sat, 1 Jul 2006 04:54:15 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 063CF4416D for ; Sat, 1 Jul 2006 04:54:14 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k614sDP7035420 for ; Sat, 1 Jul 2006 04:54:13 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k614sDUl035417 for perforce@freebsd.org; Sat, 1 Jul 2006 04:54:13 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 1 Jul 2006 04:54:13 GMT Message-Id: <200607010454.k614sDUl035417@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 100379 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 04:54:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=100379 Change 100379 by kmacy@kmacy_storage:sun4v_work_stable on 2006/07/01 04:53:23 fix hw.physmem loader option Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/pmap.c#5 edit Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/pmap.c#5 (text+ko) ==== @@ -428,7 +428,7 @@ vm_size_t physsz, virtsz, kernel_hash_size; ihandle_t pmem, vmem; int i, sz, j; - uint64_t tsb_8k_size, tsb_4m_size, error; + uint64_t tsb_8k_size, tsb_4m_size, error, physmem_tunable; /* * Find out what physical memory is available from the prom and @@ -452,20 +452,22 @@ qsort(mra, sz, sizeof (*mra), mr_cmp); physsz = 0; - getenv_quad("hw.physmem", &physmem); - physmem = ctob(physmem); + + if (TUNABLE_ULONG_FETCH("hw.physmem", &physmem_tunable)) + physmem = atop(physmem_tunable); + printf("desired physmem=0x%lx\n", physmem_tunable); for (i = 0, j = 0; i < sz; i++, j += 2) { CTR2(KTR_PMAP, "start=%#lx size=%#lx\n", mra[i].mr_start, mra[i].mr_size); KDPRINTF("start=%#lx size=%#lx\n", mra[i].mr_start, mra[i].mr_size); - if (physmem != 0 && btoc(physsz + mra[i].mr_size) >= physmem) { - if (btoc(physsz) < physmem) { + if (physmem_tunable != 0 && (physsz + mra[i].mr_size) >= physmem_tunable) { + if (physsz < physmem_tunable) { phys_avail[j] = mra[i].mr_start; phys_avail[j + 1] = mra[i].mr_start + - (ctob(physmem) - physsz); - physsz = ctob(physmem); + (physmem_tunable - physsz); + physsz = physmem_tunable; } break; } @@ -607,7 +609,7 @@ * currently (not by design) used for permanent mappings */ - tsb_4m_size = virtsz >> (PAGE_SHIFT_4M - TTE_SHIFT); + tsb_4m_size = (virtsz >> (PAGE_SHIFT_4M - TTE_SHIFT)); pa = pmap_bootstrap_alloc(tsb_4m_size); KDPRINTF("tsb_4m_pa is 0x%lx tsb_4m_size is 0x%lx\n", pa, tsb_4m_size); @@ -688,12 +690,11 @@ * */ pa = PAGE_SIZE_4M; - for (i = 0; phys_avail[i + 2] != 0; i += 2) - for (; pa < phys_avail[i + 1]; pa += PAGE_SIZE_4M) { - tsb_set_tte_real(&kernel_td[TSB4M_INDEX], TLB_PHYS_TO_DIRECT(pa), - pa | TTE_KERNEL | VTD_4M, 0); - } - + for (i = 0; phys_avail[i] != 0; i += 2) + for (; pa < phys_avail[i + 1]; pa += PAGE_SIZE_4M) + tsb_set_tte_real(&kernel_td[TSB4M_INDEX], TLB_PHYS_TO_DIRECT(pa), + pa | TTE_KERNEL | VTD_4M, 0); + for (i = 0; i < 2; i++) { pa = nucleus_mappings[i]; tsb_set_tte_real(&kernel_td[TSB4M_INDEX], TLB_PHYS_TO_DIRECT(pa), @@ -751,6 +752,9 @@ pa = TTE_GET_PA(translations[i].om_tte) + off; tte_hash_insert(pm->pm_hash, va, pa | TTE_KERNEL | VTD_8K); } + KDPRINTF("set om_size=%ld om_start=%lx om_tte=%lx\n", + translations[i].om_size, translations[i].om_start, + translations[i].om_tte); } for (i = 0; i < KSTACK_PAGES; i++) { pa = kstack0_phys + i * PAGE_SIZE; @@ -771,6 +775,7 @@ for (i = 0; phys_avail[i + 2] != 0; i += 2) if (phys_avail[i + 1] - phys_avail[i] < PAGE_SIZE_4M) phys_avail[i] = phys_avail[i+1] = 0; + } From owner-p4-projects@FreeBSD.ORG Sat Jul 1 06:37:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D13516A416; Sat, 1 Jul 2006 06:37:28 +0000 (UTC) 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 38B2B16A412 for ; Sat, 1 Jul 2006 06:37:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE11E43D45 for ; Sat, 1 Jul 2006 06:37:27 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k616bRWq042313 for ; Sat, 1 Jul 2006 06:37:27 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k616bRaO042310 for perforce@freebsd.org; Sat, 1 Jul 2006 06:37:27 GMT (envelope-from imp@freebsd.org) Date: Sat, 1 Jul 2006 06:37:27 GMT Message-Id: <200607010637.k616bRaO042310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 100383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 06:37:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=100383 Change 100383 by imp@imp_lighthouse on 2006/07/01 06:36:29 Revert the passing of an address. There are differences in accessing the two different kinds of EEPROMs that the 4370 and Kwikbyte use. The AT24C164 (4370) will need different code than the AT24C02 (Kwikbyte). Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.c#12 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#14 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#7 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/eeprom.c#6 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#12 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.c#12 (text+ko) ==== @@ -98,8 +98,9 @@ *cPtr++ = 0; } - WriteEEPROM(0, (unsigned)&BootCommandSection, env_table, - sizeof(env_table)); + /* We're executing in low RAM so addr in ram == offset in eeprom */ + WriteEEPROM((unsigned)&BootCommandSection, env_table, + sizeof(env_table)); } ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#14 (text+ko) ==== @@ -62,6 +62,7 @@ {COMMAND_REPLACE_KERNEL_VIA_XMODEM, "K"}, {COMMAND_REPLACE_FLASH_VIA_XMODEM, "I"}, {COMMAND_REPLACE_FPGA_VIA_XMODEM, "F"}, + {COMMAND_REPLACE_ID_EEPROM, "E"}, {COMMAND_FINAL_FLAG, 0} }; @@ -173,6 +174,18 @@ static void +UpdateEEProm(int eeaddr) +{ + char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ + int len; + + while ((len = xmodem_rx(addr)) == -1) + continue; + printf("\r\nDownloaded %u bytes.\r\n", len); + WriteEEPROM(eeaddr, 0, addr, len); +} + +static void UpdateFlash(int offset) { char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ @@ -309,6 +322,11 @@ printf("Updating FLASH image\r\n"); UpdateFlash(FLASH_OFFSET); break; + + case COMMAND_REPLACE_ID_EEPROM: + printf("Updating ID EEPROM image\r\n"); + UpdateEEProm(2); + break; default: break; } ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#7 (text+ko) ==== @@ -45,6 +45,7 @@ COMMAND_REPLACE_KERNEL_VIA_XMODEM, COMMAND_REPLACE_FLASH_VIA_XMODEM, COMMAND_REPLACE_FPGA_VIA_XMODEM, + COMMAND_REPLACE_ID_EEPROM, COMMAND_FINAL_FLAG } e_cmd_t; ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/eeprom.c#6 (text+ko) ==== @@ -83,7 +83,7 @@ * .KB_C_FN_DEFINITION_END */ void -ReadEEPROM(unsigned addr, unsigned ee_off, char *data_addr, unsigned size) +ReadEEPROM(unsigned ee_off, char *data_addr, unsigned size) { const AT91PS_TWI twiPtr = AT91C_BASE_TWI; unsigned int status; @@ -92,7 +92,7 @@ status = twiPtr->TWI_RHR; // Set the TWI Master Mode Register - twiPtr->TWI_MMR = ((TWSI_EEPROM_ADDRESS | addr) << 16) | + twiPtr->TWI_MMR = (TWSI_EEPROM_ADDRESS << 16) | AT91C_TWI_IADRSZ_2_BYTE | AT91C_TWI_MREAD; // Set TWI Internal Address Register @@ -137,7 +137,7 @@ * .KB_C_FN_DEFINITION_END */ void -WriteEEPROM(unsigned addr, unsigned ee_off, char *data_addr, unsigned size) +WriteEEPROM(unsigned ee_off, char *data_addr, unsigned size) { const AT91PS_TWI twiPtr = AT91C_BASE_TWI; unsigned status; @@ -148,7 +148,7 @@ putchar('.'); // Set the TWI Master Mode Register - twiPtr->TWI_MMR = (((TWSI_EEPROM_ADDRESS | addr) << 16) | + twiPtr->TWI_MMR = ((TWSI_EEPROM_ADDRESS << 16) | AT91C_TWI_IADRSZ_2_BYTE) & ~AT91C_TWI_MREAD; // Set TWI Internal Address Register @@ -173,7 +173,7 @@ continue; // wait for write operation to complete - ReadEEPROM(addr, ee_off, &test_data, 1); + ReadEEPROM(ee_off, &test_data, 1); } putchar('\r'); ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#12 (text) ==== @@ -33,9 +33,8 @@ /* The following function write eeprom at ee_addr using data */ /* from data_add for size bytes. */ -void ReadEEPROM(unsigned addr, unsigned eeoff, char *data_addr, unsigned size); -void WriteEEPROM(unsigned addr, unsigned eeoff, char *data_addr, - unsigned size); +void ReadEEPROM(unsigned eeoff, char *data_addr, unsigned size); +void WriteEEPROM(unsigned eeoff, char *data_addr, unsigned size); void InitEEPROM(void); /* XMODEM protocol */ From owner-p4-projects@FreeBSD.ORG Sat Jul 1 07:31:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82D1F16A494; Sat, 1 Jul 2006 07:31:36 +0000 (UTC) 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 4123116A407 for ; Sat, 1 Jul 2006 07:31:36 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD3724407E for ; Sat, 1 Jul 2006 07:31:35 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k617VZEV046055 for ; Sat, 1 Jul 2006 07:31:35 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k617VZsB046052 for perforce@freebsd.org; Sat, 1 Jul 2006 07:31:35 GMT (envelope-from cdjones@FreeBSD.org) Date: Sat, 1 Jul 2006 07:31:35 GMT Message-Id: <200607010731.k617VZsB046052@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 100385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 07:31:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=100385 Change 100385 by cdjones@cdjones-impulse on 2006/07/01 07:30:58 Reduce console output's obnoxiousness, remove dead code. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#8 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#8 (text+ko) ==== @@ -99,18 +99,14 @@ struct prison *pr; pr = arg; - printf("Starting jail scheduler for JID %d\n", pr->pr_id); - for (;;) { if (pr->pr_scheduler_flags & J_SCHED_TD_DIE) break; - printf("jsched: foo\n"); - - tsleep(pr, 0, '-', hz); + /* Scheduling stuff goes here. */ + tsleep(pr, 0, "-", hz); } - printf("Killing jail scheduler for JID %d\n", pr->pr_id); pr->pr_scheduler_flags = J_SCHED_TD_DEAD; kthread_exit(0); } @@ -129,15 +125,9 @@ struct prison *pr, *tpr; struct jail j; struct jail_attach_args jaa; + struct proc *j_sched_proc; int vfslocked, error, tryprid; - static struct proc *j_sched_proc; - /* static struct kproc_desc *j_sched_kp = { - "j_sched", - jsched_dummy, - &j_sched_proc - }; */ - error = copyin(uap->jail, &j, sizeof(j)); if (error) return (error); @@ -192,7 +182,7 @@ /* TODO #ifdef SCHED_HIER */ pr->pr_scheduler_flags = J_SCHED_TD_ACTIVE; - if (kthread_create(jsched_td, pr, (void *) j_sched_proc, 0, 0, "jsched '%d'", pr->pr_id)) + if (kthread_create(jsched_td, pr, (void *) j_sched_proc, 0, 0, "jsched %d", pr->pr_id)) goto e_dropprref; KASSERT(j_sched_proc != NULL, ("NULL j_sched_proc")); pr->pr_scheduler = j_sched_proc; From owner-p4-projects@FreeBSD.ORG Sat Jul 1 07:43:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6118716A50A; Sat, 1 Jul 2006 07:43:43 +0000 (UTC) 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 04E6616A548 for ; Sat, 1 Jul 2006 07:43:43 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8033D43F15 for ; Sat, 1 Jul 2006 07:19:20 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k617JKvc045239 for ; Sat, 1 Jul 2006 07:19:20 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k617JKTv045234 for perforce@freebsd.org; Sat, 1 Jul 2006 07:19:20 GMT (envelope-from cdjones@FreeBSD.org) Date: Sat, 1 Jul 2006 07:19:20 GMT Message-Id: <200607010719.k617JKTv045234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 100384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 07:43:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=100384 Change 100384 by cdjones@cdjones-impulse on 2006/07/01 07:18:33 Create kthread for jail's scheduler on jail() call. Next milestone: add data structures to index processes by jail (per scheduler). Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#7 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#8 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#7 (text+ko) ==== @@ -94,10 +94,25 @@ SYSINIT(prison, SI_SUB_INTRINSIC, SI_ORDER_ANY, init_prison, NULL); static void -jsched_dummy(void) +jsched_td(void *arg) { - int x; - tsleep(&x, 0, "-", hz); + struct prison *pr; + pr = arg; + + printf("Starting jail scheduler for JID %d\n", pr->pr_id); + + for (;;) { + if (pr->pr_scheduler_flags & J_SCHED_TD_DIE) + break; + + printf("jsched: foo\n"); + + tsleep(pr, 0, '-', hz); + } + + printf("Killing jail scheduler for JID %d\n", pr->pr_id); + pr->pr_scheduler_flags = J_SCHED_TD_DEAD; + kthread_exit(0); } /* @@ -116,8 +131,12 @@ struct jail_attach_args jaa; int vfslocked, error, tryprid; - struct proc *j_sched_proc; - struct kproc_desc *j_sched_kp; + static struct proc *j_sched_proc; + /* static struct kproc_desc *j_sched_kp = { + "j_sched", + jsched_dummy, + &j_sched_proc + }; */ error = copyin(uap->jail, &j, sizeof(j)); if (error) @@ -171,67 +190,34 @@ prisoncount++; mtx_unlock(&allprison_mtx); - /* TODO --- Should probably be an #ifdef SCHED_HIER here. */ - printf("A"); - MALLOC(j_sched_kp, struct kproc_desc *, sizeof(struct kproc_desc), M_TEMP, M_WAITOK | M_ZERO); - printf("B"); - if (NULL == j_sched_kp) + /* TODO #ifdef SCHED_HIER */ + pr->pr_scheduler_flags = J_SCHED_TD_ACTIVE; + if (kthread_create(jsched_td, pr, (void *) j_sched_proc, 0, 0, "jsched '%d'", pr->pr_id)) goto e_dropprref; - printf("C"); - MALLOC(j_sched_kp->arg0, char *, (7 + 6 + 1) * sizeof(char), M_TEMP, M_WAITOK | M_ZERO); - printf("D"); - if (!j_sched_kp->arg0) - goto e_dropprref; - printf("E"); - snprintf(j_sched_kp->arg0, 7 + 6 + 1, "jsched/%6d", pr->pr_id); - printf("F"); - j_sched_kp->func = jsched_dummy; - printf("G"); - j_sched_kp->global_procpp = &j_sched_proc; - printf("H"); - kproc_start(&j_sched_kp); - printf("I"); - /* pr->pr_scheduler = (j_sched_kp->global_procpp)->p_pid; */ /* TODO - why won't this work? */ - FREE(j_sched_kp->arg0, M_TEMP); - printf("J"); - FREE(j_sched_kp, M_TEMP); - printf("K"); - /* TODO --- probable #endif */ + KASSERT(j_sched_proc != NULL, ("NULL j_sched_proc")); + pr->pr_scheduler = j_sched_proc; + /* TODO #endif */ error = jail_attach(td, &jaa); - printf("L"); if (error) goto e_dropprref; - printf("M"); mtx_lock(&pr->pr_mtx); pr->pr_ref--; mtx_unlock(&pr->pr_mtx); - printf("N"); td->td_retval[0] = jaa.jid; - printf("O"); return (0); e_dropprref: - printf("P"); - if (j_sched_kp && j_sched_kp->arg0) - FREE(j_sched_kp->arg0, M_TEMP); - printf("P1"); - if (j_sched_kp) - FREE(j_sched_kp, M_TEMP); - printf("P2"); mtx_lock(&allprison_mtx); LIST_REMOVE(pr, pr_list); prisoncount--; mtx_unlock(&allprison_mtx); e_dropvnref: - printf("Q"); vfslocked = VFS_LOCK_GIANT(pr->pr_root->v_mount); vrele(pr->pr_root); VFS_UNLOCK_GIANT(vfslocked); e_killmtx: - printf("R"); mtx_destroy(&pr->pr_mtx); FREE(pr, M_PRISON); - printf("Z"); return (error); } @@ -335,6 +321,10 @@ prisoncount--; mtx_unlock(&allprison_mtx); + /* Tell scheduler to die. No need to wait for it. */ + pr->pr_scheduler_flags |= J_SCHED_TD_DIE; + wakeup(pr); + TASK_INIT(&pr->pr_task, 0, prison_complete, pr); taskqueue_enqueue(taskqueue_thread, &pr->pr_task); return; ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#8 (text+ko) ==== @@ -38,6 +38,10 @@ #define JAIL_MINIMUM_PRIORITY 1 #define JAIL_MAXIMUM_PRIORITY 100 +#define J_SCHED_TD_ACTIVE 0x01 +#define J_SCHED_TD_DIE 0x02 +#define J_SCHED_TD_DEAD 0x04 + #ifndef _KERNEL int jail(struct jail *); @@ -74,6 +78,7 @@ #include /*struct proc; */ + struct prison { LIST_ENTRY(prison) pr_list; /* (a) all prisons */ int pr_id; /* (c) prison id */ @@ -88,6 +93,7 @@ struct mtx pr_mtx; unsigned int pr_priority; /* (p) jail priority */ struct proc *pr_scheduler; /* (c) scheduler pid */ + int pr_scheduler_flags; }; #endif /* _KERNEL || _WANT_PRISON */ From owner-p4-projects@FreeBSD.ORG Sat Jul 1 10:34:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B2B116A412; Sat, 1 Jul 2006 10:34:27 +0000 (UTC) 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 04CA716A403 for ; Sat, 1 Jul 2006 10:34:27 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB3044480B for ; Sat, 1 Jul 2006 10:34:26 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61AYQJk064939 for ; Sat, 1 Jul 2006 10:34:26 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61AYQxd064935 for perforce@freebsd.org; Sat, 1 Jul 2006 10:34:26 GMT (envelope-from bushman@freebsd.org) Date: Sat, 1 Jul 2006 10:34:26 GMT Message-Id: <200607011034.k61AYQxd064935@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100389 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 10:34:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=100389 Change 100389 by bushman@bushman_nss_ldap_cached on 2006/07/01 10:33:42 getservent() test finished. It's code should be used to extend testutil.h and as the base for other nss regressions, Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/Makefile#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getgr.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getpw.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getserv.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getserv.t#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/testutil.h#2 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getgr.c#2 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getpw.c#2 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getserv.c#2 (text+ko) ==== @@ -30,17 +30,20 @@ #include #include +#include #include #include #include #include +#include #include #include "testutil.h" enum test_methods { TEST_GETSERVENT, TEST_GETSERVBYNAME, - TEST_GETSERVBYPORT + TEST_GETSERVBYPORT, + TEST_GETSERVENT_2PASS }; static int debug = 0; @@ -48,17 +51,29 @@ DECLARE_TEST_DATA(servent) +static int check_servent_ambiguity_func(struct servent *, void *); + static void clone_servent(struct servent *, struct servent const *); -static int compare_servent(struct servent *, struct servent *); +static int compare_servent(struct servent *, struct servent *, void *); static void dump_servent(struct servent *); static void free_servent(struct servent *); -static int servent_1pass_test(int (*)(struct servent *)); +static void sdump_servent(struct servent *, char *, size_t); +static int servent_1pass_test(int (*)(struct servent *, void *)); static int servent_2pass_test(); +static int servent_check_ambiguity(struct servent_test_data *, + struct servent *); static void servent_fill_test_data(struct servent_test_data *); -static int servent_test_correctness(struct servent *); -static int servent_test_getservbyname(struct servent *); -static int servent_test_getservbyport(struct servent *); +static int servent_test_correctness(struct servent *, void *); +static int servent_test_getservbyname(struct servent *, void *); +static int servent_test_getservbyport(struct servent *, void *); +static int servent_test_getservent(struct servent *, void *); + +static int servent_read_snapshot_func(struct servent *, char *); +static int servent_read_snapshot(char const *, struct servent_test_data *); +static int servent_write_snapshot(char const *, struct servent_test_data *); +static int servent_write_snapshot_func(struct servent *, void *); + static void usage(void) __attribute__((__noreturn__)); IMPLEMENT_TEST_DATA(servent) @@ -108,7 +123,7 @@ } static int -compare_servent(struct servent *serv1, struct servent *serv2) +compare_servent(struct servent *serv1, struct servent *serv2, void *mdata) { char **c1, **c2; @@ -125,6 +140,10 @@ c1 = serv1->s_aliases; c2 = serv2->s_aliases; + + if ((serv1->s_aliases == NULL) || (serv2->s_aliases == NULL)) + goto errfin; + for (;*c1 && *c2; ++c1, ++c2) if (strcmp(*c1, *c2) != 0) goto errfin; @@ -135,7 +154,7 @@ return 0; errfin: - if (debug) { + if ((debug) && (mdata == NULL)) { printf("following structures are not equal:\n"); dump_servent(serv1); dump_servent(serv2); @@ -144,22 +163,43 @@ return (-1); } +static void +sdump_servent(struct servent *serv, char *buffer, size_t buflen) +{ + char **cp; + int written; + + written = snprintf(buffer, buflen, "%s %d %s", + serv->s_name, ntohs(serv->s_port), serv->s_proto); + buffer += written; + if (written > buflen) + return; + buflen -= written; + + if (serv->s_aliases != NULL) { + if (*(serv->s_aliases) != '\0') { + for (cp = serv->s_aliases; *cp; ++cp) { + written = snprintf(buffer, buflen, " %s",*cp); + buffer += written; + if (written > buflen) + return; + buflen -= written; + + if (buflen == 0) + return; + } + } else + snprintf(buffer, buflen, " noaliases"); + } else + snprintf(buffer, buflen, " (null)"); +} + static void dump_servent(struct servent *result) { - printf("=struct servent (located by %p) dump\n", (void *)result); - printf("\tname: %s\n", result->s_name); - printf("\tport: %d\n", ntohs(result->s_port)); - printf("\tproto: %s\n", result->s_proto); - - if (*(result->s_aliases)!='\0') { - char ** cp; - - printf("\taliases:\n"); - for (cp=result->s_aliases; *cp; ++cp) - printf("\t\t%s\n",*cp); - } else - printf("\tno aliases\n"); + char buffer[1024]; + sdump_servent(result, buffer, sizeof(buffer)); + printf("%s\n", buffer); } static void @@ -175,22 +215,81 @@ } static int -servent_test_correctness(struct servent *serv) +servent_build_snapshot(char const *fname) +{ + struct servent_test_data td; + int rv; + + if (debug) + printf("building snapshot file %s\n", fname); + + test_data_init(&td, clone_servent, free_servent); + + servent_fill_test_data(&td); + rv = servent_write_snapshot(fname, &td); + + test_data_destroy(&td); + + if (debug) + printf("%s\n", rv == 0 ? "ok" : "not ok"); + return (rv); +} + +static int +servent_test_correctness(struct servent *serv, void *mdata) { if (debug) { printf("testing correctness with the following data:\n"); dump_servent(serv); } - FUNC_RET_CHECK(serv->s_name != NULL); - FUNC_RET_CHECK(serv->s_proto != NULL); - FUNC_RET_CHECK(ntohs(serv->s_port >= 0)); - FUNC_RET_CHECK(serv->s_aliases != NULL); + if (serv->s_name == NULL) + goto errfin; + + if (serv->s_proto == NULL) + goto errfin; + + if (ntohs(serv->s_port < 0)) + goto errfin; + + if (serv->s_aliases == NULL) + goto errfin; + + if (debug) + printf("ok\n"); + + return (0); +errfin: + if (debug) + printf("not ok\n"); + + return (-1); +} + +static int +check_servent_ambiguity_func(struct servent *serv, void *mdata) +{ + + assert(serv != NULL); + assert(mdata != NULL); + + return (!compare_servent(serv, (struct servent *)mdata, mdata)); +} + +/* servent_check_ambiguity() is needed when one port+proto is associated with + * more than one service (these cases are usually marked as PROBLEM in + * /etc/services. This functions is needed also when one service+proto is + * associated with several ports. We have to check all the servent structures + * to make sure that serv really exists and correct */ +static int +servent_check_ambiguity(struct servent_test_data *td, struct servent *serv) +{ - return (0); + return (test_data_foreach(td, check_servent_ambiguity_func, + (void *)serv) == 0 ? -1 : 0); } static int -servent_test_getservbyname(struct servent *serv_model) +servent_test_getservbyname(struct servent *serv_model, void *mdata) { char **alias; struct servent *serv; @@ -201,18 +300,32 @@ } serv = getservbyname(serv_model->s_name, serv_model->s_proto); - FUNC_RET_CHECK(compare_servent(serv, serv_model) == 0); + if ((compare_servent(serv, serv_model, NULL) != 0) && + (servent_check_ambiguity((struct servent_test_data *)mdata, serv) + !=0)) + goto errfin; for (alias = serv_model->s_aliases; *alias; ++alias) { serv = getservbyname(*alias, serv_model->s_proto); - FUNC_RET_CHECK(compare_servent(serv, serv_model) == 0); + if ((compare_servent(serv, serv_model, NULL) != 0) && + (servent_check_ambiguity( + (struct servent_test_data *)mdata, serv) != 0)) + goto errfin; } + if (debug) + printf("ok\n"); return (0); + +errfin: + if (debug) + printf("not ok\n"); + + return (-1); } static int -servent_test_getservbyport(struct servent *serv_model) +servent_test_getservbyport(struct servent *serv_model, void *mdata) { struct servent *serv; @@ -222,11 +335,29 @@ } serv = getservbyport(serv_model->s_port, serv_model->s_proto); - return (compare_servent(serv, serv_model)); + if ((compare_servent(serv, serv_model, NULL) != 0) && + (servent_check_ambiguity((struct servent_test_data *)mdata, serv) + != 0)) { + if (debug) + printf("not ok\n"); + return (-1); + } else { + if (debug) + printf("ok\n"); + return (0); + } +} + +static int +servent_test_getservent(struct servent *serv, void *mdata) +{ + /* Only correctness should be checked when doing 1-pass test for + * getservent(). Correctness is always checked in servent_1pass_test */ + return (0); } static int -servent_1pass_test(int (*tf)(struct servent *)) +servent_1pass_test(int (*tf)(struct servent *, void *)) { struct servent_test_data td; int rv; @@ -234,10 +365,10 @@ test_data_init(&td, clone_servent, free_servent); servent_fill_test_data(&td); - rv = test_data_foreach(&td, servent_test_correctness); + rv = test_data_foreach(&td, servent_test_correctness, NULL); if (rv != 0) goto fin; - rv = test_data_foreach(&td, tf); + rv = test_data_foreach(&td, tf, (void *)&td); fin: test_data_destroy(&td); @@ -246,6 +377,32 @@ } static int +servent_snapshot_1pass_test(char const *fname, + int (*tf)(struct servent *, void *)) +{ + struct servent_test_data td; + int rv; + + test_data_init(&td, clone_servent, free_servent); + rv = servent_read_snapshot(fname, &td); + if (rv != 0) { + if (debug) + printf("error reading snapshot file %s\n", fname); + goto fin; + } + + rv = test_data_foreach(&td, servent_test_correctness, NULL); + if (rv != 0) + goto fin; + rv = test_data_foreach(&td, tf, (void *)&td); + +fin: + test_data_destroy(&td); + + return (rv); +} + +static int servent_2pass_test() { struct servent_test_data td1, td2; @@ -259,19 +416,200 @@ if (debug) printf("testing equality of two getservent() result-sets\n"); - rv = test_data_compare(&td1, &td2, compare_servent); + rv = test_data_compare(&td1, &td2, compare_servent, NULL); test_data_destroy(&td1); test_data_destroy(&td2); + + if (debug) + printf("%s\n", rv == 0 ? "ok" : "not ok"); + return (rv); +} + +static int +servent_snapshot_2pass_test(char const *fname) +{ + struct servent_test_data td1, td2; + int rv; + test_data_init(&td1, clone_servent, free_servent); + test_data_init(&td2, clone_servent, free_servent); + + rv = servent_read_snapshot(fname, &td1); + if (rv != 0) { + if (debug) + printf("error reading snapshot file %s\n", fname); + goto fin; + } + servent_fill_test_data(&td2); + + if (debug) + printf("testing equality of snapshot and current result-set\n"); + rv = test_data_compare(&td1, &td2, compare_servent, NULL); + +fin: + test_data_destroy(&td1); + test_data_destroy(&td2); + + if (debug) + printf("%s\n", rv == 0 ? "ok" : "not ok"); return (rv); } +static int +servent_write_snapshot_func(struct servent *serv, void *mdata) +{ + char buffer[1024]; + FILE *fo; + + assert(serv != NULL); + assert(mdata != NULL); + + fo = (FILE *)mdata; + sdump_servent(serv, buffer, sizeof(buffer)); + fputs(buffer, fo); + fputc('\n', fo); + + return (0); +} + +static int +servent_write_snapshot(char const *fname, struct servent_test_data *td) +{ + FILE *fo; + + assert(fname != NULL); + assert(td != NULL); + + fo = fopen(fname, "w"); + if (fo == NULL) + return (-1); + + test_data_foreach(td, servent_write_snapshot_func, (void *)fo); + fclose(fo); + + return (0); +} + +static int +servent_read_snapshot_func(struct servent *serv, char *line) +{ + StringList *sl; + char *s, *ps, *ts; + int i; + + i = 0; + sl = NULL; + ps = line; + memset(serv, 0, sizeof(struct servent)); + while ( (s = strsep(&ps, " ")) != NULL) { + switch (i) { + case 0: + serv->s_name = strdup(s); + assert(serv->s_name != NULL); + break; + + case 1: + serv->s_port = htons( + (int)strtol(s, &ts, 10)); + if (*ts != '\0') { + free(serv->s_name); + return (-1); + } + break; + + case 2: + serv->s_proto = strdup(s); + assert(serv->s_proto != NULL); + break; + + default: + if (sl == NULL) { + if (strcmp(s, "(null)") == 0) + return (0); + + sl = sl_init(); + assert(sl != NULL); + + if (strcmp(s, "noaliases") != 0) { + ts = strdup(s); + assert(ts != NULL); + sl_add(sl, ts); + } + } else { + ts = strdup(s); + assert(ts != NULL); + sl_add(sl, ts); + } + break; + }; + ++i; + } + + if (i < 3) { + free(serv->s_name); + free(serv->s_proto); + memset(serv, 0, sizeof(struct servent)); + return (-1); + } + + sl_add(sl, NULL); + serv->s_aliases = sl->sl_str; + + /* NOTE: is it a dirty hack or not? */ + free(sl); + return (0); +} + +static int +servent_read_snapshot(char const *fname, struct servent_test_data *td) +{ + char buffer[1024]; + struct servent serv; + char *s; + FILE *fi; + size_t len; + int rv; + + assert(fname != NULL); + assert(td != NULL); + + fi = fopen(fname, "r"); + if (fi == NULL) + return (-1); + + memset(buffer, 0, sizeof(buffer)); + while (!feof(fi)) { + s = fgets(buffer, sizeof(buffer), fi); + if (s != NULL) { + len = strlen(s); + if (len == 0) + continue; + if (buffer[len - 1] == '\n') + buffer[len -1] = '\0'; + + rv = servent_read_snapshot_func(&serv, s); + if (rv == 0) { + if (debug) { + printf("1 line read from snapshot:\n"); + dump_servent(&serv); + } + test_data_append(td, &serv); + td->free_func(&serv); + } + } + } + + fclose(fi); + + return (0); +} + static void usage(void) { (void)fprintf(stderr, - "Usage: %s [-dnpe]\n", + "Usage: %s [-dnpe2]\n", getprogname()); exit(1); } @@ -279,13 +617,15 @@ int main(int argc, char **argv) { + char *snapshot_file; int rv; int c; if (argc < 2) usage(); - while ((c = getopt(argc, argv, "nped")) != -1) + snapshot_file = NULL; + while ((c = getopt(argc, argv, "npe2ds:")) != -1) switch (c) { case 'd': debug++; @@ -299,24 +639,62 @@ case 'e': method = TEST_GETSERVENT; break; + case '2': + method = TEST_GETSERVENT_2PASS; + break; + case 's': + snapshot_file = strdup(optarg); + break; default: usage(); } + if (snapshot_file != NULL) { + if (access(snapshot_file, W_OK | R_OK) != 0) { + if (errno == ENOENT) { + rv = servent_build_snapshot(snapshot_file); + goto fin; + } else { + if (debug) + printf("can't access the file %s\n", + snapshot_file); + + rv = -1; + goto fin; + } + } + } + switch (method) { case TEST_GETSERVBYNAME: - rv = servent_1pass_test(servent_test_getservbyname); + if (snapshot_file == NULL) + rv = servent_1pass_test(servent_test_getservbyname); + else + rv = servent_snapshot_1pass_test(snapshot_file, + servent_test_getservbyname); break; case TEST_GETSERVBYPORT: - rv = servent_1pass_test(servent_test_getservbyport); + if (snapshot_file == NULL) + rv = servent_1pass_test(servent_test_getservbyport); + else + rv = servent_snapshot_1pass_test(snapshot_file, + servent_test_getservbyport); break; case TEST_GETSERVENT: + if (snapshot_file == NULL) + rv = servent_1pass_test(servent_test_getservent); + else + rv = servent_snapshot_2pass_test(snapshot_file); + break; + case TEST_GETSERVENT_2PASS: rv = servent_2pass_test(); break; default: rv = -1; break; }; - + +fin: + free(snapshot_file); return (rv); } ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getserv.t#2 (text+ko) ==== @@ -18,7 +18,8 @@ make $executable 2>&1 > /dev/null -echo 1..3 -do_test 1 'getservbyname()' '-n' -do_test 2 'getservbyport()' '-p' -do_test 3 'getservent()' '-e' +echo 1..4 +do_test 1 'getservbyname()' '-n' +do_test 2 'getservbyport()' '-p' +do_test 3 'getservent()' '-e' +do_test 4 'getservent() 2-pass' '-2' ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/testutil.h#2 (text+ko) ==== @@ -28,19 +28,17 @@ #include -#define FUNC_RET_CHECK(x) { if (!(x)) return (-1); } - #define DECLARE_TEST_DATA(ent) \ struct ent##_entry { \ struct ent data; \ - SLIST_ENTRY(ent##_entry) entries; \ + STAILQ_ENTRY(ent##_entry) entries; \ }; \ \ struct ent##_test_data { \ void (*clone_func)(struct ent *, struct ent const *); \ void (*free_func)(struct ent *); \ \ - SLIST_HEAD(ent_head, ent##_entry) snapshot_data; \ + STAILQ_HEAD(ent_head, ent##_entry) snapshot_data; \ }; \ \ static void test_data_init(struct ent##_test_data *, \ @@ -48,9 +46,11 @@ static void test_data_destroy(struct ent##_test_data *); \ \ static void test_data_append(struct ent##_test_data *, struct ent *data);\ -static int test_data_foreach(struct ent##_test_data *, int (*)(struct ent *));\ +static int test_data_foreach(struct ent##_test_data *, int (*)(struct ent *,\ + void *), void *); \ static int test_data_compare(struct ent##_test_data *, \ - struct ent##_test_data *, int (*)(struct ent *, struct ent *)); + struct ent##_test_data *, int (*)(struct ent *, struct ent *, \ + void *), void *); #define IMPLEMENT_TEST_DATA(ent) \ static void \ @@ -65,7 +65,7 @@ memset(td, 0, sizeof(*td)); \ td->clone_func = clonef; \ td->free_func = freef; \ - SLIST_INIT(&td->snapshot_data); \ + STAILQ_INIT(&td->snapshot_data); \ } \ \ static void \ @@ -74,9 +74,9 @@ struct ent##_entry *e; \ assert(td != NULL); \ \ - while (!SLIST_EMPTY(&td->snapshot_data)) { \ - e = SLIST_FIRST(&td->snapshot_data); \ - SLIST_REMOVE_HEAD(&td->snapshot_data, entries); \ + while (!STAILQ_EMPTY(&td->snapshot_data)) { \ + e = STAILQ_FIRST(&td->snapshot_data); \ + STAILQ_REMOVE_HEAD(&td->snapshot_data, entries); \ \ td->free_func(&e->data); \ free(e); \ @@ -96,11 +96,12 @@ memset(e, 0, sizeof(struct ent##_entry)); \ \ td->clone_func(&e->data, app_data); \ - SLIST_INSERT_HEAD(&td->snapshot_data, e, entries); \ + STAILQ_INSERT_TAIL(&td->snapshot_data, e, entries); \ } \ \ static int \ -test_data_foreach(struct ent##_test_data *td, int (*forf)(struct ent *))\ +test_data_foreach(struct ent##_test_data *td, \ + int (*forf)(struct ent *, void *), void *mdata) \ { \ struct ent##_entry *e; \ int rv; \ @@ -109,8 +110,8 @@ assert(forf != NULL); \ \ rv = 0; \ - SLIST_FOREACH(e, &td->snapshot_data, entries) { \ - rv = forf(&e->data); \ + STAILQ_FOREACH(e, &td->snapshot_data, entries) { \ + rv = forf(&e->data, mdata); \ if (rv != 0) \ break; \ } \ @@ -120,7 +121,7 @@ \ static int \ test_data_compare(struct ent##_test_data *td1, struct ent##_test_data *td2,\ - int (*cmp_func)(struct ent *, struct ent *)) \ + int (*cmp_func)(struct ent *, struct ent *, void *), void *mdata)\ { \ struct ent##_entry *e1, *e2; \ int rv; \ @@ -129,8 +130,8 @@ assert(td2 != NULL); \ assert(cmp_func != NULL); \ \ - e1 = SLIST_FIRST(&td1->snapshot_data); \ - e2 = SLIST_FIRST(&td2->snapshot_data); \ + e1 = STAILQ_FIRST(&td1->snapshot_data); \ + e2 = STAILQ_FIRST(&td2->snapshot_data); \ \ rv = 0; \ do { \ @@ -141,9 +142,9 @@ return (-1); \ } \ \ - rv = cmp_func(&e1->data, &e2->data); \ - e1 = SLIST_NEXT(e1, entries); \ - e2 = SLIST_NEXT(e2, entries); \ + rv = cmp_func(&e1->data, &e2->data, mdata); \ + e1 = STAILQ_NEXT(e1, entries); \ + e2 = STAILQ_NEXT(e2, entries); \ } while (rv == 0); \ \ return (rv); \ From owner-p4-projects@FreeBSD.ORG Sat Jul 1 12:17:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFB5816A592; Sat, 1 Jul 2006 12:17:52 +0000 (UTC) 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 708BB16A4D1 for ; Sat, 1 Jul 2006 12:17:52 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F43243D76 for ; Sat, 1 Jul 2006 12:17:37 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61CHbC8071935 for ; Sat, 1 Jul 2006 12:17:37 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61CHbBM071932 for perforce@freebsd.org; Sat, 1 Jul 2006 12:17:37 GMT (envelope-from bushman@freebsd.org) Date: Sat, 1 Jul 2006 12:17:37 GMT Message-Id: <200607011217.k61CHbBM071932@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100392 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 12:17:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=100392 Change 100392 by bushman@bushman_nss_ldap_cached on 2006/07/01 12:17:06 test-getserv.c truncated - some of its functionality was moved to testutil.h in more general form Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getserv.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/testutil.h#3 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getserv.c#3 (text+ko) ==== @@ -43,15 +43,17 @@ TEST_GETSERVENT, TEST_GETSERVBYNAME, TEST_GETSERVBYPORT, - TEST_GETSERVENT_2PASS + TEST_GETSERVENT_2PASS, + TEST_BUILD_SNAPSHOT }; static int debug = 0; static enum test_methods method = TEST_GETSERVENT; DECLARE_TEST_DATA(servent) - -static int check_servent_ambiguity_func(struct servent *, void *); +DECLARE_FILE_SNAPSHOT(servent) +DECLARE_1PASS_TEST(servent) +DECLARE_2PASS_TEST(servent) static void clone_servent(struct servent *, struct servent const *); static int compare_servent(struct servent *, struct servent *, void *); @@ -59,24 +61,24 @@ static void free_servent(struct servent *); static void sdump_servent(struct servent *, char *, size_t); -static int servent_1pass_test(int (*)(struct servent *, void *)); -static int servent_2pass_test(); +static int servent_read_snapshot_func(struct servent *, char *); + +static int check_servent_ambiguity_func(struct servent *, void *); static int servent_check_ambiguity(struct servent_test_data *, struct servent *); -static void servent_fill_test_data(struct servent_test_data *); + +static int servent_fill_test_data(struct servent_test_data *); static int servent_test_correctness(struct servent *, void *); static int servent_test_getservbyname(struct servent *, void *); static int servent_test_getservbyport(struct servent *, void *); static int servent_test_getservent(struct servent *, void *); - -static int servent_read_snapshot_func(struct servent *, char *); -static int servent_read_snapshot(char const *, struct servent_test_data *); -static int servent_write_snapshot(char const *, struct servent_test_data *); -static int servent_write_snapshot_func(struct servent *, void *); static void usage(void) __attribute__((__noreturn__)); IMPLEMENT_TEST_DATA(servent) +IMPLEMENT_FILE_SNAPSHOT(servent) +IMPLEMENT_1PASS_TEST(servent) +IMPLEMENT_2PASS_TEST(servent) static void clone_servent(struct servent *dest, struct servent const *src) @@ -194,6 +196,79 @@ snprintf(buffer, buflen, " (null)"); } +static int +servent_read_snapshot_func(struct servent *serv, char *line) +{ + StringList *sl; + char *s, *ps, *ts; + int i; + + if (debug) + printf("1 line read from snapshot:\n%s\n", line); + + i = 0; + sl = NULL; + ps = line; + memset(serv, 0, sizeof(struct servent)); + while ( (s = strsep(&ps, " ")) != NULL) { + switch (i) { + case 0: + serv->s_name = strdup(s); + assert(serv->s_name != NULL); + break; + + case 1: + serv->s_port = htons( + (int)strtol(s, &ts, 10)); + if (*ts != '\0') { + free(serv->s_name); + return (-1); + } + break; + + case 2: + serv->s_proto = strdup(s); + assert(serv->s_proto != NULL); + break; + + default: + if (sl == NULL) { + if (strcmp(s, "(null)") == 0) + return (0); + + sl = sl_init(); + assert(sl != NULL); + + if (strcmp(s, "noaliases") != 0) { + ts = strdup(s); + assert(ts != NULL); + sl_add(sl, ts); + } + } else { + ts = strdup(s); + assert(ts != NULL); + sl_add(sl, ts); + } + break; + }; + ++i; + } + + if (i < 3) { + free(serv->s_name); + free(serv->s_proto); + memset(serv, 0, sizeof(struct servent)); + return (-1); + } + + sl_add(sl, NULL); + serv->s_aliases = sl->sl_str; + + /* NOTE: is it a dirty hack or not? */ + free(sl); + return (0); +} + static void dump_servent(struct servent *result) { @@ -202,7 +277,7 @@ printf("%s\n", buffer); } -static void +static int servent_fill_test_data(struct servent_test_data *td) { struct servent *serv; @@ -212,27 +287,8 @@ test_data_append(td, serv); } endservent(); -} - -static int -servent_build_snapshot(char const *fname) -{ - struct servent_test_data td; - int rv; - - if (debug) - printf("building snapshot file %s\n", fname); - test_data_init(&td, clone_servent, free_servent); - - servent_fill_test_data(&td); - rv = servent_write_snapshot(fname, &td); - - test_data_destroy(&td); - - if (debug) - printf("%s\n", rv == 0 ? "ok" : "not ok"); - return (rv); + return (0); } static int @@ -255,12 +311,12 @@ goto errfin; if (debug) - printf("ok\n"); + printf("correct\n"); return (0); errfin: if (debug) - printf("not ok\n"); + printf("incorrect\n"); return (-1); } @@ -300,6 +356,9 @@ } serv = getservbyname(serv_model->s_name, serv_model->s_proto); + if (servent_test_correctness(serv, NULL) != 0) + goto errfin; + if ((compare_servent(serv, serv_model, NULL) != 0) && (servent_check_ambiguity((struct servent_test_data *)mdata, serv) !=0)) @@ -307,6 +366,10 @@ for (alias = serv_model->s_aliases; *alias; ++alias) { serv = getservbyname(*alias, serv_model->s_proto); + + if (servent_test_correctness(serv, NULL) != 0) + goto errfin; + if ((compare_servent(serv, serv_model, NULL) != 0) && (servent_check_ambiguity( (struct servent_test_data *)mdata, serv) != 0)) @@ -335,9 +398,10 @@ } serv = getservbyport(serv_model->s_port, serv_model->s_proto); - if ((compare_servent(serv, serv_model, NULL) != 0) && + if ((servent_test_correctness(serv, NULL) != 0) || + ((compare_servent(serv, serv_model, NULL) != 0) && (servent_check_ambiguity((struct servent_test_data *)mdata, serv) - != 0)) { + != 0))) { if (debug) printf("not ok\n"); return (-1); @@ -353,258 +417,9 @@ { /* Only correctness should be checked when doing 1-pass test for * getservent(). Correctness is always checked in servent_1pass_test */ - return (0); + return (servent_test_correctness(serv, NULL)); } -static int -servent_1pass_test(int (*tf)(struct servent *, void *)) -{ - struct servent_test_data td; - int rv; - - test_data_init(&td, clone_servent, free_servent); - servent_fill_test_data(&td); - - rv = test_data_foreach(&td, servent_test_correctness, NULL); - if (rv != 0) - goto fin; - rv = test_data_foreach(&td, tf, (void *)&td); - -fin: - test_data_destroy(&td); - - return (rv); -} - -static int -servent_snapshot_1pass_test(char const *fname, - int (*tf)(struct servent *, void *)) -{ - struct servent_test_data td; - int rv; - - test_data_init(&td, clone_servent, free_servent); - rv = servent_read_snapshot(fname, &td); - if (rv != 0) { - if (debug) - printf("error reading snapshot file %s\n", fname); - goto fin; - } - - rv = test_data_foreach(&td, servent_test_correctness, NULL); - if (rv != 0) - goto fin; - rv = test_data_foreach(&td, tf, (void *)&td); - -fin: - test_data_destroy(&td); - - return (rv); -} - -static int -servent_2pass_test() -{ - struct servent_test_data td1, td2; - int rv; - - test_data_init(&td1, clone_servent, free_servent); - test_data_init(&td2, clone_servent, free_servent); - - servent_fill_test_data(&td1); - servent_fill_test_data(&td2); - - if (debug) - printf("testing equality of two getservent() result-sets\n"); - rv = test_data_compare(&td1, &td2, compare_servent, NULL); - - test_data_destroy(&td1); - test_data_destroy(&td2); - - if (debug) - printf("%s\n", rv == 0 ? "ok" : "not ok"); - return (rv); -} - -static int -servent_snapshot_2pass_test(char const *fname) -{ - struct servent_test_data td1, td2; - int rv; - - test_data_init(&td1, clone_servent, free_servent); - test_data_init(&td2, clone_servent, free_servent); - - rv = servent_read_snapshot(fname, &td1); - if (rv != 0) { - if (debug) - printf("error reading snapshot file %s\n", fname); - goto fin; - } - servent_fill_test_data(&td2); - - if (debug) - printf("testing equality of snapshot and current result-set\n"); - rv = test_data_compare(&td1, &td2, compare_servent, NULL); - -fin: - test_data_destroy(&td1); - test_data_destroy(&td2); - - if (debug) - printf("%s\n", rv == 0 ? "ok" : "not ok"); - return (rv); -} - -static int -servent_write_snapshot_func(struct servent *serv, void *mdata) -{ - char buffer[1024]; - FILE *fo; - - assert(serv != NULL); - assert(mdata != NULL); - - fo = (FILE *)mdata; - sdump_servent(serv, buffer, sizeof(buffer)); - fputs(buffer, fo); - fputc('\n', fo); - - return (0); -} - -static int -servent_write_snapshot(char const *fname, struct servent_test_data *td) -{ - FILE *fo; - - assert(fname != NULL); - assert(td != NULL); - - fo = fopen(fname, "w"); - if (fo == NULL) - return (-1); - - test_data_foreach(td, servent_write_snapshot_func, (void *)fo); - fclose(fo); - - return (0); -} - -static int -servent_read_snapshot_func(struct servent *serv, char *line) -{ - StringList *sl; - char *s, *ps, *ts; - int i; - - i = 0; - sl = NULL; - ps = line; - memset(serv, 0, sizeof(struct servent)); - while ( (s = strsep(&ps, " ")) != NULL) { - switch (i) { - case 0: - serv->s_name = strdup(s); - assert(serv->s_name != NULL); - break; - - case 1: - serv->s_port = htons( - (int)strtol(s, &ts, 10)); - if (*ts != '\0') { - free(serv->s_name); - return (-1); - } - break; - - case 2: - serv->s_proto = strdup(s); - assert(serv->s_proto != NULL); - break; - - default: - if (sl == NULL) { - if (strcmp(s, "(null)") == 0) - return (0); - - sl = sl_init(); - assert(sl != NULL); - - if (strcmp(s, "noaliases") != 0) { - ts = strdup(s); - assert(ts != NULL); - sl_add(sl, ts); - } - } else { - ts = strdup(s); - assert(ts != NULL); - sl_add(sl, ts); - } - break; - }; - ++i; - } - - if (i < 3) { - free(serv->s_name); - free(serv->s_proto); - memset(serv, 0, sizeof(struct servent)); - return (-1); - } - - sl_add(sl, NULL); - serv->s_aliases = sl->sl_str; - - /* NOTE: is it a dirty hack or not? */ - free(sl); - return (0); -} - -static int -servent_read_snapshot(char const *fname, struct servent_test_data *td) -{ - char buffer[1024]; - struct servent serv; - char *s; - FILE *fi; - size_t len; - int rv; - - assert(fname != NULL); - assert(td != NULL); - - fi = fopen(fname, "r"); - if (fi == NULL) - return (-1); - - memset(buffer, 0, sizeof(buffer)); - while (!feof(fi)) { - s = fgets(buffer, sizeof(buffer), fi); - if (s != NULL) { - len = strlen(s); - if (len == 0) - continue; - if (buffer[len - 1] == '\n') - buffer[len -1] = '\0'; - - rv = servent_read_snapshot_func(&serv, s); - if (rv == 0) { - if (debug) { - printf("1 line read from snapshot:\n"); - dump_servent(&serv); - } - test_data_append(td, &serv); - td->free_func(&serv); - } - } - } - - fclose(fi); - - return (0); -} - static void usage(void) { @@ -617,13 +432,14 @@ int main(int argc, char **argv) { + struct servent_test_data td, td_snap, td_2pass; char *snapshot_file; int rv; int c; if (argc < 2) usage(); - + snapshot_file = NULL; while ((c = getopt(argc, argv, "npe2ds:")) != -1) switch (c) { @@ -649,12 +465,13 @@ usage(); } + test_data_init(&td, clone_servent, free_servent); + test_data_init(&td_snap, clone_servent, free_servent); if (snapshot_file != NULL) { if (access(snapshot_file, W_OK | R_OK) != 0) { - if (errno == ENOENT) { - rv = servent_build_snapshot(snapshot_file); - goto fin; - } else { + if (errno == ENOENT) + method = TEST_BUILD_SNAPSHOT; + else { if (debug) printf("can't access the file %s\n", snapshot_file); @@ -662,32 +479,46 @@ rv = -1; goto fin; } - } + } else + snapshot_read(snapshot_file, &td_snap, + servent_read_snapshot_func); } + servent_fill_test_data(&td); switch (method) { case TEST_GETSERVBYNAME: if (snapshot_file == NULL) - rv = servent_1pass_test(servent_test_getservbyname); + rv = servent_1pass_test(&td, + servent_test_getservbyname, (void *)&td); else - rv = servent_snapshot_1pass_test(snapshot_file, - servent_test_getservbyname); + rv = servent_1pass_test(&td_snap, + servent_test_getservbyname, (void *)&td_snap); break; case TEST_GETSERVBYPORT: if (snapshot_file == NULL) - rv = servent_1pass_test(servent_test_getservbyport); + rv = servent_1pass_test(&td, + servent_test_getservbyport, (void *)&td); else - rv = servent_snapshot_1pass_test(snapshot_file, - servent_test_getservbyport); + rv = servent_1pass_test(&td_snap, + servent_test_getservbyport, (void *)&td_snap); break; case TEST_GETSERVENT: if (snapshot_file == NULL) - rv = servent_1pass_test(servent_test_getservent); + rv = servent_1pass_test(&td, servent_test_getservent, + (void *)&td); else - rv = servent_snapshot_2pass_test(snapshot_file); + rv = servent_2pass_test(&td, &td_snap, + compare_servent, NULL); break; case TEST_GETSERVENT_2PASS: - rv = servent_2pass_test(); + test_data_init(&td_2pass, clone_servent, free_servent); + servent_fill_test_data(&td_2pass); + rv = servent_2pass_test(&td, &td_2pass, + compare_servent, NULL); + test_data_destroy(&td_2pass); + break; + case TEST_BUILD_SNAPSHOT: + rv = snapshot_write(snapshot_file, &td, sdump_servent); break; default: rv = -1; @@ -695,6 +526,8 @@ }; fin: + test_data_destroy(&td_snap); + test_data_destroy(&td); free(snapshot_file); return (rv); } ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/testutil.h#3 (text+ko) ==== @@ -42,7 +42,8 @@ }; \ \ static void test_data_init(struct ent##_test_data *, \ - void (*)(struct ent *, struct ent const *), void (*)(struct ent *));\ + void (*)(struct ent *, struct ent const *), \ + void (*freef)(struct ent *)); \ static void test_data_destroy(struct ent##_test_data *); \ \ static void test_data_append(struct ent##_test_data *, struct ent *data);\ @@ -50,7 +51,8 @@ void *), void *); \ static int test_data_compare(struct ent##_test_data *, \ struct ent##_test_data *, int (*)(struct ent *, struct ent *, \ - void *), void *); + void *), void *); \ +static void test_data_clear(struct ent##_test_data *); #define IMPLEMENT_TEST_DATA(ent) \ static void \ @@ -71,16 +73,7 @@ static void \ test_data_destroy(struct ent##_test_data *td) \ { \ - struct ent##_entry *e; \ - assert(td != NULL); \ - \ - while (!STAILQ_EMPTY(&td->snapshot_data)) { \ - e = STAILQ_FIRST(&td->snapshot_data); \ - STAILQ_REMOVE_HEAD(&td->snapshot_data, entries); \ - \ - td->free_func(&e->data); \ - free(e); \ - } \ + test_data_clear(td); \ } \ \ static void \ @@ -148,4 +141,146 @@ } while (rv == 0); \ \ return (rv); \ +} \ + \ +static void \ +test_data_clear(struct ent##_test_data *td) \ +{ \ + struct ent##_entry *e; \ + assert(td != NULL); \ + \ + while (!STAILQ_EMPTY(&td->snapshot_data)) { \ + e = STAILQ_FIRST(&td->snapshot_data); \ + STAILQ_REMOVE_HEAD(&td->snapshot_data, entries); \ + \ + td->free_func(&e->data); \ + free(e); \ + } \ +} + + \ +#define DECLARE_FILE_SNAPSHOT(ent) \ +struct ent##_snp_param { \ + FILE *fp; \ + void (*sdump_func)(struct ent *, char *, size_t); \ +}; \ + \ +static int snapshot_write_func(struct ent *, void *); \ +static int snapshot_write(char const *, struct ent##_test_data *, \ + void (*)(struct ent *, char *, size_t)); \ +static int snapshot_read(char const *, struct ent##_test_data *, \ + int (*)(struct ent *, char *)); + +#define IMPLEMENT_FILE_SNAPSHOT(ent) \ +static int \ +snapshot_write_func(struct ent *data, void *mdata) \ +{ \ + char buffer[1024]; \ + struct ent##_snp_param *param; \ + \ + assert(data != NULL); \ + assert(mdata != NULL); \ + \ + param = (struct ent##_snp_param *)mdata; \ + param->sdump_func(data, buffer, sizeof(buffer)); \ + fputs(buffer, param->fp); \ + fputc('\n', param->fp); \ + \ + return (0); \ +} \ + \ +static int \ +snapshot_write(char const *fname, struct ent##_test_data *td, \ + void (*sdump_func)(struct ent *, char *, size_t)) \ +{ \ + struct ent##_snp_param param; \ + \ + assert(fname != NULL); \ + assert(td != NULL); \ + \ + param.fp = fopen(fname, "w"); \ + if (param.fp == NULL) \ + return (-1); \ + \ + param.sdump_func = sdump_func; \ + test_data_foreach(td, snapshot_write_func, ¶m); \ + fclose(param.fp); \ + \ + return (0); \ +} \ + \ +static int \ +snapshot_read(char const *fname, struct ent##_test_data *td, \ + int (*read_func)(struct ent *, char *)) \ +{ \ + char buffer[1024]; \ + struct ent data; \ + char *s; \ + FILE *fi; \ + size_t len; \ + int rv; \ + \ + assert(fname != NULL); \ + assert(td != NULL); \ + \ + fi = fopen(fname, "r"); \ + if (fi == NULL) \ + return (-1); \ + \ + memset(buffer, 0, sizeof(buffer)); \ + while (!feof(fi)) { \ + s = fgets(buffer, sizeof(buffer), fi); \ + if (s != NULL) { \ + len = strlen(s); \ + if (len == 0) \ + continue; \ + if (buffer[len - 1] == '\n') \ + buffer[len -1] = '\0'; \ + \ + rv = read_func(&data, s); \ + if (rv == 0) { \ + test_data_append(td, &data); \ + td->free_func(&data); \ + } \ + } \ + } \ + \ + fclose(fi); \ + \ + return (0); \ +} + +#define DECLARE_1PASS_TEST(ent) \ +static int ent##_1pass_test(struct ent##_test_data *, \ + int (*)(struct servent *, void *), \ + void *); + +#define IMPLEMENT_1PASS_TEST(ent) \ +static int \ +ent##_1pass_test(struct ent##_test_data *td, \ + int (*tf)(struct servent *, void *), \ + void *mdata) \ +{ \ + int rv; \ + rv = test_data_foreach(td, tf, mdata); \ + \ + return (rv); \ +} + +#define DECLARE_2PASS_TEST(ent) \ +static int ent##_2pass_test(struct ent##_test_data *, \ + struct ent##_test_data *, \ + int (*)(struct ent *, struct ent *, void *), void *); + +#define IMPLEMENT_2PASS_TEST(ent) \ +static int \ +ent##_2pass_test(struct ent##_test_data *td1, \ + struct ent##_test_data *td2, \ + int (*cmp_func)(struct ent *, struct ent *, void *), \ + void *cmp_mdata) \ +{ \ + int rv; \ + \ + rv = test_data_compare(td1, td2, cmp_func, cmp_mdata); \ + return (rv); \ } From owner-p4-projects@FreeBSD.ORG Sat Jul 1 13:11:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A303416A415; Sat, 1 Jul 2006 13:11:44 +0000 (UTC) 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 63D2416A403 for ; Sat, 1 Jul 2006 13:11:44 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17DFA44C05 for ; Sat, 1 Jul 2006 13:11:44 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61DBiBN083165 for ; Sat, 1 Jul 2006 13:11:44 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61DBhDV083162 for perforce@freebsd.org; Sat, 1 Jul 2006 13:11:43 GMT (envelope-from bushman@freebsd.org) Date: Sat, 1 Jul 2006 13:11:43 GMT Message-Id: <200607011311.k61DBhDV083162@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100393 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 13:11:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=100393 Change 100393 by bushman@bushman_nss_ldap_cached on 2006/07/01 13:11:36 "services" database test finished Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getserv.c#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getserv.t#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/testutil.h#4 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getserv.c#4 (text+ko) ==== @@ -51,7 +51,7 @@ static enum test_methods method = TEST_GETSERVENT; DECLARE_TEST_DATA(servent) -DECLARE_FILE_SNAPSHOT(servent) +DECLARE_TEST_FILE_SNAPSHOT(servent) DECLARE_1PASS_TEST(servent) DECLARE_2PASS_TEST(servent) @@ -63,10 +63,8 @@ static void sdump_servent(struct servent *, char *, size_t); static int servent_read_snapshot_func(struct servent *, char *); -static int check_servent_ambiguity_func(struct servent *, void *); static int servent_check_ambiguity(struct servent_test_data *, struct servent *); - static int servent_fill_test_data(struct servent_test_data *); static int servent_test_correctness(struct servent *, void *); static int servent_test_getservbyname(struct servent *, void *); @@ -76,7 +74,7 @@ static void usage(void) __attribute__((__noreturn__)); IMPLEMENT_TEST_DATA(servent) -IMPLEMENT_FILE_SNAPSHOT(servent) +IMPLEMENT_TEST_FILE_SNAPSHOT(servent) IMPLEMENT_1PASS_TEST(servent) IMPLEMENT_2PASS_TEST(servent) @@ -284,7 +282,7 @@ setservent(1); while ((serv = getservent()) != NULL) { - test_data_append(td, serv); + TEST_DATA_APPEND(servent, td, serv); } endservent(); @@ -321,16 +319,6 @@ return (-1); } -static int -check_servent_ambiguity_func(struct servent *serv, void *mdata) -{ - - assert(serv != NULL); - assert(mdata != NULL); - - return (!compare_servent(serv, (struct servent *)mdata, mdata)); -} - /* servent_check_ambiguity() is needed when one port+proto is associated with * more than one service (these cases are usually marked as PROBLEM in * /etc/services. This functions is needed also when one service+proto is @@ -340,8 +328,8 @@ servent_check_ambiguity(struct servent_test_data *td, struct servent *serv) { - return (test_data_foreach(td, check_servent_ambiguity_func, - (void *)serv) == 0 ? -1 : 0); + return (TEST_DATA_FIND(servent, td, serv, compare_servent, + NULL) != NULL ? 0 : -1); } static int @@ -415,8 +403,8 @@ static int servent_test_getservent(struct servent *serv, void *mdata) { - /* Only correctness should be checked when doing 1-pass test for - * getservent(). Correctness is always checked in servent_1pass_test */ + /* Only correctness can be checked when doing 1-pass test for + * getservent(). */ return (servent_test_correctness(serv, NULL)); } @@ -424,7 +412,7 @@ usage(void) { (void)fprintf(stderr, - "Usage: %s [-dnpe2]\n", + "Usage: %s [-dnpe2] [-s ]\n", getprogname()); exit(1); } @@ -465,8 +453,8 @@ usage(); } - test_data_init(&td, clone_servent, free_servent); - test_data_init(&td_snap, clone_servent, free_servent); + TEST_DATA_INIT(servent, &td, clone_servent, free_servent); + TEST_DATA_INIT(servent, &td_snap, clone_servent, free_servent); if (snapshot_file != NULL) { if (access(snapshot_file, W_OK | R_OK) != 0) { if (errno == ENOENT) @@ -480,54 +468,55 @@ goto fin; } } else - snapshot_read(snapshot_file, &td_snap, - servent_read_snapshot_func); + TEST_SNAPSHOT_FILE_READ(servent, snapshot_file, + &td_snap, servent_read_snapshot_func); } servent_fill_test_data(&td); switch (method) { case TEST_GETSERVBYNAME: if (snapshot_file == NULL) - rv = servent_1pass_test(&td, + rv = DO_1PASS_TEST(servent, &td, servent_test_getservbyname, (void *)&td); else - rv = servent_1pass_test(&td_snap, + rv = DO_1PASS_TEST(servent, &td_snap, servent_test_getservbyname, (void *)&td_snap); break; case TEST_GETSERVBYPORT: if (snapshot_file == NULL) - rv = servent_1pass_test(&td, + rv = DO_1PASS_TEST(servent, &td, servent_test_getservbyport, (void *)&td); else - rv = servent_1pass_test(&td_snap, + rv = DO_1PASS_TEST(servent, &td_snap, servent_test_getservbyport, (void *)&td_snap); break; case TEST_GETSERVENT: if (snapshot_file == NULL) - rv = servent_1pass_test(&td, servent_test_getservent, + rv = DO_1PASS_TEST(servent, &td, servent_test_getservent, (void *)&td); else - rv = servent_2pass_test(&td, &td_snap, + rv = DO_2PASS_TEST(servent, &td, &td_snap, compare_servent, NULL); break; case TEST_GETSERVENT_2PASS: - test_data_init(&td_2pass, clone_servent, free_servent); + TEST_DATA_INIT(servent, &td_2pass, clone_servent, free_servent); servent_fill_test_data(&td_2pass); - rv = servent_2pass_test(&td, &td_2pass, + rv = DO_2PASS_TEST(servent, &td, &td_2pass, compare_servent, NULL); - test_data_destroy(&td_2pass); + TEST_DATA_DESTROY(servent, &td_2pass); break; case TEST_BUILD_SNAPSHOT: - rv = snapshot_write(snapshot_file, &td, sdump_servent); + rv = TEST_SNAPSHOT_FILE_WRITE(servent, snapshot_file, &td, + sdump_servent); break; default: - rv = -1; + rv = 0; break; }; fin: - test_data_destroy(&td_snap); - test_data_destroy(&td); + TEST_DATA_DESTROY(servent, &td_snap); + TEST_DATA_DESTROY(servent, &td); free(snapshot_file); return (rv); } ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getserv.t#3 (text+ko) ==== @@ -18,8 +18,12 @@ make $executable 2>&1 > /dev/null -echo 1..4 +echo 1..8 do_test 1 'getservbyname()' '-n' do_test 2 'getservbyport()' '-p' do_test 3 'getservent()' '-e' do_test 4 'getservent() 2-pass' '-2' +do_test 5 'building snapshot, if needed' '-s snapshot' +do_test 6 'getservbyname() snapshot' '-n -s snapshot' +do_test 7 'getservbyport() snapshot' '-p -s snapshot' +do_test 8 'getservent() snapshot' '-e -s snapshot' ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/testutil.h#4 (text+ko) ==== @@ -41,22 +41,36 @@ STAILQ_HEAD(ent_head, ent##_entry) snapshot_data; \ }; \ \ -static void test_data_init(struct ent##_test_data *, \ +void __##ent##_test_data_init(struct ent##_test_data *, \ void (*)(struct ent *, struct ent const *), \ void (*freef)(struct ent *)); \ -static void test_data_destroy(struct ent##_test_data *); \ +void __##ent##_test_data_destroy(struct ent##_test_data *); \ \ -static void test_data_append(struct ent##_test_data *, struct ent *data);\ -static int test_data_foreach(struct ent##_test_data *, int (*)(struct ent *,\ +void __##ent##_test_data_append(struct ent##_test_data *, struct ent *data);\ +int __##ent##_test_data_foreach(struct ent##_test_data *, int (*)(struct ent *,\ void *), void *); \ -static int test_data_compare(struct ent##_test_data *, \ +int __##ent##_test_data_compare(struct ent##_test_data *, \ struct ent##_test_data *, int (*)(struct ent *, struct ent *, \ void *), void *); \ -static void test_data_clear(struct ent##_test_data *); +struct ent *__##ent##_test_data_find(struct ent##_test_data *, struct ent *,\ + int (*)(struct ent *, struct ent *, void *), void *); \ +void __##ent##_test_data_clear(struct ent##_test_data *); + +#define TEST_DATA_INIT(ent, td, clonef, freef)\ + __##ent##_test_data_init(td, clonef, freef) +#define TEST_DATA_DESTROY(ent, td) __##ent##_test_data_destroy(td) +#define TEST_DATA_APPEND(ent, td, d) __##ent##_test_data_append(td, d) +#define TEST_DATA_FOREACH(ent, td, f, mdata)\ + __##ent##_test_data_foreach(td, f, mdata) +#define TEST_DATA_COMPARE(ent, td1, td2, fcmp, mdata)\ + __##ent##_test_data_compare(td1, td2, fcmp, mdata); +#define TEST_DATA_FIND(ent, td, d, fcmp, mdata)\ + __##ent##_test_data_find(td, d, fcmp, mdata) +#define TEST_DATA_CLEAR(ent, td) __##ent##_test_data_clear(td) #define IMPLEMENT_TEST_DATA(ent) \ -static void \ -test_data_init(struct ent##_test_data *td, \ +void \ +__##ent##_test_data_init(struct ent##_test_data *td, \ void (*clonef)(struct ent *, struct ent const *), \ void (*freef)(struct ent *)) \ { \ @@ -70,14 +84,14 @@ STAILQ_INIT(&td->snapshot_data); \ } \ \ -static void \ -test_data_destroy(struct ent##_test_data *td) \ +void \ +__##ent##_test_data_destroy(struct ent##_test_data *td) \ { \ - test_data_clear(td); \ + __##ent##_test_data_clear(td); \ } \ \ -static void \ -test_data_append(struct ent##_test_data *td, struct ent *app_data) \ +void \ +__##ent##_test_data_append(struct ent##_test_data *td, struct ent *app_data) \ { \ struct ent##_entry *e; \ \ @@ -92,8 +106,8 @@ STAILQ_INSERT_TAIL(&td->snapshot_data, e, entries); \ } \ \ -static int \ -test_data_foreach(struct ent##_test_data *td, \ +int \ +__##ent##_test_data_foreach(struct ent##_test_data *td, \ int (*forf)(struct ent *, void *), void *mdata) \ { \ struct ent##_entry *e; \ @@ -112,8 +126,8 @@ return (rv); \ } \ \ -static int \ -test_data_compare(struct ent##_test_data *td1, struct ent##_test_data *td2,\ +int \ +__##ent##_test_data_compare(struct ent##_test_data *td1, struct ent##_test_data *td2,\ int (*cmp_func)(struct ent *, struct ent *, void *), void *mdata)\ { \ struct ent##_entry *e1, *e2; \ @@ -143,8 +157,30 @@ return (rv); \ } \ \ -static void \ -test_data_clear(struct ent##_test_data *td) \ +struct ent * \ +__##ent##_test_data_find(struct ent##_test_data *td, struct ent *data, \ + int (*cmp)(struct ent *, struct ent *, void *), void *mdata) \ +{ \ + struct ent##_entry *e; \ + struct ent *result; \ + \ + assert(td != NULL); \ + assert(cmp != NULL); \ + \ + result = NULL; \ + STAILQ_FOREACH(e, &td->snapshot_data, entries) { \ + if (cmp(&e->data, data, mdata) == 0) { \ + result = &e->data; \ + break; \ + } \ + } \ + \ + return (result); \ +} \ + \ + \ +void \ +__##ent##_test_data_clear(struct ent##_test_data *td) \ { \ struct ent##_entry *e; \ assert(td != NULL); \ @@ -159,27 +195,31 @@ } \ -#define DECLARE_FILE_SNAPSHOT(ent) \ +#define DECLARE_TEST_FILE_SNAPSHOT(ent) \ struct ent##_snp_param { \ FILE *fp; \ void (*sdump_func)(struct ent *, char *, size_t); \ }; \ \ -static int snapshot_write_func(struct ent *, void *); \ -static int snapshot_write(char const *, struct ent##_test_data *, \ +int __##ent##_snapshot_write_func(struct ent *, void *); \ +int __##ent##_snapshot_write(char const *, struct ent##_test_data *, \ void (*)(struct ent *, char *, size_t)); \ -static int snapshot_read(char const *, struct ent##_test_data *, \ +int __##ent##_snapshot_read(char const *, struct ent##_test_data *, \ int (*)(struct ent *, char *)); + +#define TEST_SNAPSHOT_FILE_WRITE(ent, fname, td, f)\ + __##ent##_snapshot_write(fname, td, f) +#define TEST_SNAPSHOT_FILE_READ(ent, fname, td, f)\ + __##ent##_snapshot_read(fname, td, f) -#define IMPLEMENT_FILE_SNAPSHOT(ent) \ -static int \ -snapshot_write_func(struct ent *data, void *mdata) \ +#define IMPLEMENT_TEST_FILE_SNAPSHOT(ent) \ +int \ +__##ent##_snapshot_write_func(struct ent *data, void *mdata) \ { \ char buffer[1024]; \ struct ent##_snp_param *param; \ \ assert(data != NULL); \ - assert(mdata != NULL); \ \ param = (struct ent##_snp_param *)mdata; \ param->sdump_func(data, buffer, sizeof(buffer)); \ @@ -189,8 +229,8 @@ return (0); \ } \ \ -static int \ -snapshot_write(char const *fname, struct ent##_test_data *td, \ +int \ +__##ent##_snapshot_write(char const *fname, struct ent##_test_data *td, \ void (*sdump_func)(struct ent *, char *, size_t)) \ { \ struct ent##_snp_param param; \ @@ -203,14 +243,14 @@ return (-1); \ \ param.sdump_func = sdump_func; \ - test_data_foreach(td, snapshot_write_func, ¶m); \ + __##ent##_test_data_foreach(td, __##ent##_snapshot_write_func, ¶m); \ fclose(param.fp); \ \ return (0); \ } \ \ -static int \ -snapshot_read(char const *fname, struct ent##_test_data *td, \ +int \ +__##ent##_snapshot_read(char const *fname, struct ent##_test_data *td, \ int (*read_func)(struct ent *, char *)) \ { \ char buffer[1024]; \ @@ -239,7 +279,7 @@ \ rv = read_func(&data, s); \ if (rv == 0) { \ - test_data_append(td, &data); \ + __##ent##_test_data_append(td, &data); \ td->free_func(&data); \ } \ } \ @@ -251,36 +291,42 @@ } #define DECLARE_1PASS_TEST(ent) \ -static int ent##_1pass_test(struct ent##_test_data *, \ +int __##ent##_1pass_test(struct ent##_test_data *, \ int (*)(struct servent *, void *), \ void *); + +#define DO_1PASS_TEST(ent, td, f, mdata)\ + __##ent##_1pass_test(td, f, mdata) #define IMPLEMENT_1PASS_TEST(ent) \ -static int \ -ent##_1pass_test(struct ent##_test_data *td, \ +int \ +__##ent##_1pass_test(struct ent##_test_data *td, \ int (*tf)(struct servent *, void *), \ void *mdata) \ { \ int rv; \ - rv = test_data_foreach(td, tf, mdata); \ + rv = __##ent##_test_data_foreach(td, tf, mdata); \ \ return (rv); \ } #define DECLARE_2PASS_TEST(ent) \ -static int ent##_2pass_test(struct ent##_test_data *, \ +int __##ent##_2pass_test(struct ent##_test_data *, \ struct ent##_test_data *, \ int (*)(struct ent *, struct ent *, void *), void *); +#define DO_2PASS_TEST(ent, td1, td2, f, mdata)\ + __##ent##_2pass_test(td1, td2, f, mdata) + #define IMPLEMENT_2PASS_TEST(ent) \ -static int \ -ent##_2pass_test(struct ent##_test_data *td1, \ +int \ +__##ent##_2pass_test(struct ent##_test_data *td1, \ struct ent##_test_data *td2, \ int (*cmp_func)(struct ent *, struct ent *, void *), \ void *cmp_mdata) \ { \ int rv; \ \ - rv = test_data_compare(td1, td2, cmp_func, cmp_mdata); \ + rv = __##ent##_test_data_compare(td1, td2, cmp_func, cmp_mdata); \ return (rv); \ } From owner-p4-projects@FreeBSD.ORG Sat Jul 1 14:13:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B50E16A40F; Sat, 1 Jul 2006 14:13:02 +0000 (UTC) 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 1EDC016A407 for ; Sat, 1 Jul 2006 14:13:02 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF84C43D49 for ; Sat, 1 Jul 2006 14:13:01 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61ED165086821 for ; Sat, 1 Jul 2006 14:13:01 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61ED1cf086817 for perforce@freebsd.org; Sat, 1 Jul 2006 14:13:01 GMT (envelope-from clem1@FreeBSD.org) Date: Sat, 1 Jul 2006 14:13:01 GMT Message-Id: <200607011413.k61ED1cf086817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 100395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 14:13:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=100395 Change 100395 by clem1@clem1_ipv6vulns on 2006/07/01 14:12:38 pyfuzz6 - an ipv6 protocol fuzzer to exercise the stability of an IPv6 stack. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/pyfuzz6/DESCRIPTION#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/pyfuzz6/funcs.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/pyfuzz6/mods/icmp6.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/pyfuzz6/mods/ipv6.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/pyfuzz6/mods/tcp6.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/pyfuzz6/mods/udp6.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/pyfuzz6/pyfuzz6.py#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jul 1 14:21:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52F0616A510; Sat, 1 Jul 2006 14:21:13 +0000 (UTC) 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 2D4F116A50B for ; Sat, 1 Jul 2006 14:21:13 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D646143D46 for ; Sat, 1 Jul 2006 14:21:12 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61ELC0F087689 for ; Sat, 1 Jul 2006 14:21:12 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61ELCDD087685 for perforce@freebsd.org; Sat, 1 Jul 2006 14:21:12 GMT (envelope-from clem1@FreeBSD.org) Date: Sat, 1 Jul 2006 14:21:12 GMT Message-Id: <200607011421.k61ELCDD087685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 100396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 14:21:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=100396 Change 100396 by clem1@clem1_ipv6vulns on 2006/07/01 14:20:17 land6.c - implementation of the IPv4 land attack. KAME is not vulnerable. Some improvements around redir6.c. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/land6.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/redir6.c#2 edit Differences ... ==== //depot/projects/soc2006/clem1_ipv6vulns/libnet/sample/redir6.c#2 (text+ko) ==== @@ -3,6 +3,7 @@ * Implementation of the route implanting attack by Vanhauser * using icmp6 echo request and redirect message. * + * Copyright (c) 2006 Clément Lecigne * Copyright (c) 1998 - 2001 Mike D. Schiffman * All rights reserved. * @@ -38,6 +39,7 @@ void redir6(char *, int , struct libnet_in6_addr, struct libnet_in6_addr, struct libnet_in6_addr, struct libnet_in6_addr, char *, char *); void usage(char *); +void inverse(char *); int main(int ac, char **av) @@ -160,7 +162,8 @@ } pkt = libnet_dump_packet(l); - + inverse(pkt + LIBNET_ETH_H); + libnet_destroy(l); usleep(TIMEWAIT); @@ -236,7 +239,40 @@ libnet_destroy(l); } - + +/* + * inverse src and dsp ip in ipv6 header. + * replace echo request type by echo reply type. + * renew the hop limit. + */ +void inverse(char *pkt){ + char tmp[16]; + + /* + * make sure that pkt starts with an ipv6 header. + */ + if (pkt[0] & 0xf != 6) + { + fprintf(stdout, "%s(): packet does not start with an ipv6 header\n", __func__); + exit(EXIT_FAILURE); + } + + /* restore source */ + memcpy(tmp, pkt + 8, 16); + /* erase ip6 source with ip6 dest */ + memcpy(pkt + 8, pkt + 24, 16); + /* erase ip6 dst with saved ip6 source */ + memcpy(pkt + 24, tmp, 16); + /* renew hl */ + pkt[7] = 255; + /* icmp type */ + pkt[40] = ICMP6_ECHOREPLY; + + /* + * XXX: checksum recalculation. + */ + return; +} void usage(char *prog){ fprintf(stdout, "usage: %s -a attack-ip -v victim-ip -r router-ip -d dest-ip" From owner-p4-projects@FreeBSD.ORG Sat Jul 1 16:03:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42B8716A492; Sat, 1 Jul 2006 16:03:48 +0000 (UTC) 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 0550016A47C for ; Sat, 1 Jul 2006 16:03:48 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8E3743E7B for ; Sat, 1 Jul 2006 15:30:39 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61FUdcr093032 for ; Sat, 1 Jul 2006 15:30:39 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61FUdVU093029 for perforce@freebsd.org; Sat, 1 Jul 2006 15:30:39 GMT (envelope-from bushman@freebsd.org) Date: Sat, 1 Jul 2006 15:30:39 GMT Message-Id: <200607011530.k61FUdVU093029@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100398 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 16:03:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=100398 Change 100398 by bushman@bushman_nss_ldap_cached on 2006/07/01 15:29:47 Regression tests for "passwd" and "group" databases added. Small bug fixes in test-getserv.c Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/Makefile#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getgr.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getgr.t#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getpw.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getpw.t#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getserv.c#5 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getserv.t#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/testutil.h#5 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/Makefile#3 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/tools/regression/lib/libc/net/Makefile,v 1.2 2005/02/12 18:09:20 ru Exp $ +# $FreeBSD$ -TESTS= test-getserv +TESTS= test-getpw test-getgr test-getserv CFLAGS+= -g -Wall .PHONY: tests ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getgr.c#3 (text+ko) ==== @@ -1,0 +1,534 @@ +/*- + * Copyright (c) 2006 Michael Bushkov + * All rights regrped. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "testutil.h" + +enum test_methods { + TEST_GETGRENT, + TEST_GETGRNAM, + TEST_GETGRGID, + TEST_GETGRENT_2PASS, + TEST_BUILD_SNAPSHOT +}; + +static int debug = 0; +static enum test_methods method = TEST_BUILD_SNAPSHOT; + +DECLARE_TEST_DATA(group) +DECLARE_TEST_FILE_SNAPSHOT(group) +DECLARE_1PASS_TEST(group) +DECLARE_2PASS_TEST(group) + +static void clone_group(struct group *, struct group const *); +static int compare_group(struct group *, struct group *, void *); +static void dump_group(struct group *); +static void free_group(struct group *); + +static void sdump_group(struct group *, char *, size_t); +static int group_read_snapshot_func(struct group *, char *); + +static int group_check_ambiguity(struct group_test_data *, + struct group *); +static int group_fill_test_data(struct group_test_data *); +static int group_test_correctness(struct group *, void *); +static int group_test_getgrnam(struct group *, void *); +static int group_test_getgrgid(struct group *, void *); +static int group_test_getgrent(struct group *, void *); + +static void usage(void) __attribute__((__noreturn__)); + +IMPLEMENT_TEST_DATA(group) +IMPLEMENT_TEST_FILE_SNAPSHOT(group) +IMPLEMENT_1PASS_TEST(group) +IMPLEMENT_2PASS_TEST(group) + +static void +clone_group(struct group *dest, struct group const *src) +{ + assert(dest != NULL); + assert(src != NULL); + + char **cp; + int members_num; + + memset(dest, 0, sizeof(struct group)); + + if (src->gr_name != NULL) { + dest->gr_name = strdup(src->gr_name); + assert(dest->gr_name != NULL); + } + + if (src->gr_passwd != NULL) { + dest->gr_passwd = strdup(src->gr_passwd); + assert(dest->gr_passwd != NULL); + } + dest->gr_gid = src->gr_gid; + + if (src->gr_mem != NULL) { + members_num = 0; + for (cp = src->gr_mem; *cp; ++cp) + ++members_num; + + dest->gr_mem = (char **)malloc( + (members_num + 1) * (sizeof(char *))); + assert(dest->gr_mem != NULL); + memset(dest->gr_mem, 0, (members_num+1) * (sizeof(char *))); + + for (cp = src->gr_mem; *cp; ++cp) { + dest->gr_mem[cp - src->gr_mem] = strdup(*cp); + assert(dest->gr_mem[cp - src->gr_mem] != NULL); + } + } +} + +static void +free_group(struct group *grp) +{ + char **cp; + + assert(grp != NULL); + + free(grp->gr_name); + free(grp->gr_passwd); + + for (cp = grp->gr_mem; *cp; ++cp) + free(*cp); + free(grp->gr_mem); +} + +static int +compare_group(struct group *grp1, struct group *grp2, void *mdata) +{ + char **c1, **c2; + + if (grp1 == grp2) + return (0); + + if ((grp1 == NULL) || (grp2 == NULL)) + goto errfin; + + if ((strcmp(grp1->gr_name, grp2->gr_name) != 0) || + (strcmp(grp1->gr_passwd, grp2->gr_passwd) != 0) || + (grp1->gr_gid != grp2->gr_gid)) + goto errfin; + + c1 = grp1->gr_mem; + c2 = grp2->gr_mem; + + if ((grp1->gr_mem == NULL) || (grp2->gr_mem == NULL)) + goto errfin; + + for (;*c1 && *c2; ++c1, ++c2) + if (strcmp(*c1, *c2) != 0) + goto errfin; + + if ((*c1 != '\0') || (*c2 != '\0')) + goto errfin; + + return 0; + +errfin: + if ((debug) && (mdata == NULL)) { + printf("following structures are not equal:\n"); + dump_group(grp1); + dump_group(grp2); + } + + return (-1); +} + +static void +sdump_group(struct group *grp, char *buffer, size_t buflen) +{ + char **cp; + int written; + + written = snprintf(buffer, buflen, "%s %s %d", + grp->gr_name, grp->gr_passwd, grp->gr_gid); + buffer += written; + if (written > buflen) + return; + buflen -= written; + + if (grp->gr_mem != NULL) { + if (*(grp->gr_mem) != '\0') { + for (cp = grp->gr_mem; *cp; ++cp) { + written = snprintf(buffer, buflen, " %s",*cp); + buffer += written; + if (written > buflen) + return; + buflen -= written; + + if (buflen == 0) + return; + } + } else + snprintf(buffer, buflen, " nomem"); + } else + snprintf(buffer, buflen, " (null)"); +} + +static int +group_read_snapshot_func(struct group *grp, char *line) +{ + StringList *sl; + char *s, *ps, *ts; + int i; + + if (debug) + printf("1 line read from snapshot:\n%s\n", line); + + i = 0; + sl = NULL; + ps = line; + memset(grp, 0, sizeof(struct group)); + while ( (s = strsep(&ps, " ")) != NULL) { + switch (i) { + case 0: + grp->gr_name = strdup(s); + assert(grp->gr_name != NULL); + break; + + case 1: + grp->gr_passwd = strdup(s); + assert(grp->gr_passwd != NULL); + break; + + case 2: + grp->gr_gid = (gid_t)strtol(s, &ts, 10); + if (*ts != '\0') { + free(grp->gr_name); + free(grp->gr_passwd); + return (-1); + } + break; + + default: + if (sl == NULL) { + if (strcmp(s, "(null)") == 0) + return (0); + + sl = sl_init(); + assert(sl != NULL); + + if (strcmp(s, "nomem") != 0) { + ts = strdup(s); + assert(ts != NULL); + sl_add(sl, ts); + } + } else { + ts = strdup(s); + assert(ts != NULL); + sl_add(sl, ts); + } + break; + }; + ++i; + } + + if (i < 3) { + free(grp->gr_name); + free(grp->gr_passwd); + memset(grp, 0, sizeof(struct group)); + return (-1); + } + + sl_add(sl, NULL); + grp->gr_mem = sl->sl_str; + + /* NOTE: is it a dirty hack or not? */ + free(sl); + return (0); +} + +static void +dump_group(struct group *result) +{ + if (result != NULL) { + char buffer[1024]; + sdump_group(result, buffer, sizeof(buffer)); + printf("%s\n", buffer); + } else + printf("(null)\n"); +} + +static int +group_fill_test_data(struct group_test_data *td) +{ + struct group *grp; + + setgroupent(1); + while ((grp = getgrent()) != NULL) { + if (group_test_correctness(grp, NULL) == 0) + TEST_DATA_APPEND(group, td, grp); + else + return (-1); + } + endgrent(); + + return (0); +} + +static int +group_test_correctness(struct group *grp, void *mdata) +{ + if (debug) { + printf("testing correctness with the following data:\n"); + dump_group(grp); + } + + if (grp == NULL) + goto errfin; + + if (grp->gr_name == NULL) + goto errfin; + + if (grp->gr_passwd == NULL) + goto errfin; + + if (grp->gr_mem == NULL) + goto errfin; + + if (debug) + printf("correct\n"); + + return (0); +errfin: + if (debug) + printf("incorrect\n"); + + return (-1); +} + +/* group_check_ambiguity() is needed here because when doing the getgrent() + * calls sequence, records from different nsswitch sources can be different, + * though having the same pw_name/pw_uid */ +static int +group_check_ambiguity(struct group_test_data *td, struct group *pwd) +{ + + return (TEST_DATA_FIND(group, td, pwd, compare_group, + NULL) != NULL ? 0 : -1); +} + +static int +group_test_getgrnam(struct group *grp_model, void *mdata) +{ + struct group *grp; + + if (debug) { + printf("testing getgrnam() with the following data:\n"); + dump_group(grp_model); + } + + grp = getgrnam(grp_model->gr_name); + if (group_test_correctness(grp, NULL) != 0) + goto errfin; + + if ((compare_group(grp, grp_model, NULL) != 0) && + (group_check_ambiguity((struct group_test_data *)mdata, grp) + !=0)) + goto errfin; + + if (debug) + printf("ok\n"); + return (0); + +errfin: + if (debug) + printf("not ok\n"); + + return (-1); +} + +static int +group_test_getgrgid(struct group *grp_model, void *mdata) +{ + struct group *grp; + + if (debug) { + printf("testing getgrgid() with the following data...\n"); + dump_group(grp_model); + } + + grp = getgrgid(grp_model->gr_gid); + if ((group_test_correctness(grp, NULL) != 0) || + ((compare_group(grp, grp_model, NULL) != 0) && + (group_check_ambiguity((struct group_test_data *)mdata, grp) + != 0))) { + if (debug) + printf("not ok\n"); + return (-1); + } else { + if (debug) + printf("ok\n"); + return (0); + } +} + +static int +group_test_getgrent(struct group *grp, void *mdata) +{ + /* Only correctness can be checked when doing 1-pass test for + * getgrent(). */ + return (group_test_correctness(grp, NULL)); +} + +static void +usage(void) +{ + (void)fprintf(stderr, + "Usage: %s [-dnge2] [-s ]\n", + getprogname()); + exit(1); +} + +int +main(int argc, char **argv) +{ + struct group_test_data td, td_snap, td_2pass; + char *snapshot_file; + int rv; + int c; + + if (argc < 2) + usage(); + + snapshot_file = NULL; + while ((c = getopt(argc, argv, "nge2ds:")) != -1) + switch (c) { + case 'd': + debug++; + break; + case 'n': + method = TEST_GETGRNAM; + break; + case 'g': + method = TEST_GETGRGID; + break; + case 'e': + method = TEST_GETGRENT; + break; + case '2': + method = TEST_GETGRENT_2PASS; + break; + case 's': + snapshot_file = strdup(optarg); + break; + default: + usage(); + } + + TEST_DATA_INIT(group, &td, clone_group, free_group); + TEST_DATA_INIT(group, &td_snap, clone_group, free_group); + if (snapshot_file != NULL) { + if (access(snapshot_file, W_OK | R_OK) != 0) { + if (errno == ENOENT) + method = TEST_BUILD_SNAPSHOT; + else { + if (debug) + printf("can't access the file %s\n", + snapshot_file); + + rv = -1; + goto fin; + } + } else { + if (method == TEST_BUILD_SNAPSHOT) { + rv = 0; + goto fin; + } + + TEST_SNAPSHOT_FILE_READ(group, snapshot_file, + &td_snap, group_read_snapshot_func); + } + } + + rv = group_fill_test_data(&td); + if (rv == -1) + return (-1); + switch (method) { + case TEST_GETGRNAM: + if (snapshot_file == NULL) + rv = DO_1PASS_TEST(group, &td, + group_test_getgrnam, (void *)&td); + else + rv = DO_1PASS_TEST(group, &td_snap, + group_test_getgrnam, (void *)&td_snap); + break; + case TEST_GETGRGID: + if (snapshot_file == NULL) + rv = DO_1PASS_TEST(group, &td, + group_test_getgrgid, (void *)&td); + else + rv = DO_1PASS_TEST(group, &td_snap, + group_test_getgrgid, (void *)&td_snap); + break; + case TEST_GETGRENT: + if (snapshot_file == NULL) + rv = DO_1PASS_TEST(group, &td, group_test_getgrent, + (void *)&td); + else + rv = DO_2PASS_TEST(group, &td, &td_snap, + compare_group, NULL); + break; + case TEST_GETGRENT_2PASS: + TEST_DATA_INIT(group, &td_2pass, clone_group, free_group); + rv = group_fill_test_data(&td_2pass); + if (rv != -1) + rv = DO_2PASS_TEST(group, &td, &td_2pass, + compare_group, NULL); + TEST_DATA_DESTROY(group, &td_2pass); + break; + case TEST_BUILD_SNAPSHOT: + if (snapshot_file != NULL) + rv = TEST_SNAPSHOT_FILE_WRITE(group, snapshot_file, &td, + sdump_group); + break; + default: + rv = 0; + break; + }; + +fin: + TEST_DATA_DESTROY(group, &td_snap); + TEST_DATA_DESTROY(group, &td); + free(snapshot_file); + return (rv); +} ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getpw.c#3 (text+ko) ==== @@ -1,0 +1,489 @@ +/*- + * Copyright (c) 2006 Michael Bushkov + * All rights repwded. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include "testutil.h" + +enum test_methods { + TEST_GETPWENT, + TEST_GETPWNAM, + TEST_GETPWUID, + TEST_GETPWENT_2PASS, + TEST_BUILD_SNAPSHOT +}; + +static int debug = 0; +static enum test_methods method = TEST_BUILD_SNAPSHOT; + +DECLARE_TEST_DATA(passwd) +DECLARE_TEST_FILE_SNAPSHOT(passwd) +DECLARE_1PASS_TEST(passwd) +DECLARE_2PASS_TEST(passwd) + +static void clone_passwd(struct passwd *, struct passwd const *); +static int compare_passwd(struct passwd *, struct passwd *, void *); +static void free_passwd(struct passwd *); + +static void sdump_passwd(struct passwd *, char *, size_t); +static void dump_passwd(struct passwd *); + +static int passwd_read_snapshot_func(struct passwd *, char *); + +static int passwd_check_ambiguity(struct passwd_test_data *, struct passwd *); +static int passwd_fill_test_data(struct passwd_test_data *); +static int passwd_test_correctness(struct passwd *, void *); +static int passwd_test_getpwnam(struct passwd *, void *); +static int passwd_test_getpwuid(struct passwd *, void *); +static int passwd_test_getpwent(struct passwd *, void *); + +static void usage(void) __attribute__((__noreturn__)); + +IMPLEMENT_TEST_DATA(passwd) +IMPLEMENT_TEST_FILE_SNAPSHOT(passwd) +IMPLEMENT_1PASS_TEST(passwd) +IMPLEMENT_2PASS_TEST(passwd) + +static void +clone_passwd(struct passwd *dest, struct passwd const *src) +{ + assert(dest != NULL); + assert(src != NULL); + + memcpy(dest, src, sizeof(struct passwd)); + if (src->pw_name != NULL) + dest->pw_name = strdup(src->pw_name); + if (src->pw_passwd != NULL) + dest->pw_passwd = strdup(src->pw_passwd); + if (src->pw_class != NULL) + dest->pw_class = strdup(src->pw_class); + if (src->pw_gecos != NULL) + dest->pw_gecos = strdup(src->pw_gecos); + if (src->pw_dir != NULL) + dest->pw_dir = strdup(src->pw_dir); + if (src->pw_shell != NULL) + dest->pw_shell = strdup(dest->pw_shell); +} + +static int +compare_passwd(struct passwd *pwd1, struct passwd *pwd2, void *mdata) +{ + assert(pwd1 != NULL); + assert(pwd2 != NULL); + + if (pwd1 == pwd2) + return (0); + + if ((pwd1->pw_uid != pwd2->pw_uid) || + (pwd1->pw_gid != pwd2->pw_gid) || + (pwd1->pw_change != pwd2->pw_change) || + (pwd1->pw_expire != pwd2->pw_expire) || + (pwd1->pw_fields != pwd2->pw_fields) || + (strcmp(pwd1->pw_name, pwd2->pw_name) != 0) || + (strcmp(pwd1->pw_passwd, pwd2->pw_passwd) != 0) || + (strcmp(pwd1->pw_class, pwd2->pw_class) != 0) || + (strcmp(pwd1->pw_gecos, pwd2->pw_gecos) != 0) || + (strcmp(pwd1->pw_dir, pwd2->pw_dir) != 0) || + (strcmp(pwd1->pw_shell, pwd2->pw_shell) != 0) + ) + return (-1); + else + return (0); +} + +static void +free_passwd(struct passwd *pwd) +{ + free(pwd->pw_name); + free(pwd->pw_passwd); + free(pwd->pw_class); + free(pwd->pw_gecos); + free(pwd->pw_dir); + free(pwd->pw_shell); +} + +static void +sdump_passwd(struct passwd *pwd, char *buffer, size_t buflen) +{ + snprintf(buffer, buflen, "%s:%s:%d:%d:%d:%s:%s:%s:%s:%d:%d", + pwd->pw_name, pwd->pw_passwd, pwd->pw_uid, pwd->pw_gid, + pwd->pw_change, pwd->pw_class, pwd->pw_gecos, pwd->pw_dir, + pwd->pw_shell, pwd->pw_expire, pwd->pw_fields); +} + +static void +dump_passwd(struct passwd *pwd) +{ + if (pwd != NULL) { + char buffer[2048]; + sdump_passwd(pwd, buffer, sizeof(buffer)); + printf("%s\n", buffer); + } else + printf("(null)\n"); +} + +static int +passwd_read_snapshot_func(struct passwd *pwd, char *line) +{ + char *s, *ps, *ts; + int i; + + if (debug) + printf("1 line read from snapshot:\n%s\n", line); + + i = 0; + ps = line; + memset(pwd, 0, sizeof(struct passwd)); + while ( (s = strsep(&ps, ":")) != NULL) { + switch (i) { + case 0: + pwd->pw_name = strdup(s); + assert(pwd->pw_name != NULL); + break; + case 1: + pwd->pw_passwd = strdup(s); + assert(pwd->pw_passwd != NULL); + break; + case 2: + pwd->pw_uid = (uid_t)strtol(s, &ts, 10); + if (*ts != '\0') + goto fin; + break; + case 3: + pwd->pw_gid = (gid_t)strtol(s, &ts, 10); + if (*ts != '\0') + goto fin; + break; + case 4: + pwd->pw_change = (time_t)strtol(s, &ts, 10); + if (*ts != '\0') + goto fin; + break; + case 5: + pwd->pw_class = strdup(s); + assert(pwd->pw_class != NULL); + break; + case 6: + pwd->pw_gecos = strdup(s); + assert(pwd->pw_gecos != NULL); + break; + case 7: + pwd->pw_dir = strdup(s); + assert(pwd->pw_dir != NULL); + break; + case 8: + pwd->pw_shell = strdup(s); + assert(pwd->pw_shell != NULL); + break; + case 9: + pwd->pw_expire = (time_t)strtol(s, &ts, 10); + if (*ts != '\0') + goto fin; + break; + case 10: + pwd->pw_fields = (int)strtol(s, &ts, 10); + if (*ts != '\0') + goto fin; + break; + default: + break; + }; + ++i; + } + +fin: + if (i != 11) { + free_passwd(pwd); + memset(pwd, 0, sizeof(struct passwd)); + return (-1); + } + + return (0); +} + +static int +passwd_fill_test_data(struct passwd_test_data *td) +{ + struct passwd *pwd; + + setpassent(1); + while ((pwd = getpwent()) != NULL) { + if (passwd_test_correctness(pwd, NULL) == 0) + TEST_DATA_APPEND(passwd, td, pwd); + else + return (-1); + } + endpwent(); + + return (0); +} + +static int +passwd_test_correctness(struct passwd *pwd, void *mdata) +{ + if (debug) { + printf("testing correctness with the following data:\n"); + dump_passwd(pwd); + } + + if (pwd == NULL) + return (-1); + + if (pwd->pw_name == NULL) + goto errfin; + + if (pwd->pw_passwd == NULL) + goto errfin; + + if (pwd->pw_class == NULL) + goto errfin; + + if (pwd->pw_gecos == NULL) + goto errfin; + + if (pwd->pw_dir == NULL) + goto errfin; + + if (pwd->pw_shell == NULL) + goto errfin; + + if (debug) + printf("correct\n"); + + return (0); +errfin: + if (debug) + printf("incorrect\n"); + + return (-1); +} + +/* passwd_check_ambiguity() is needed here because when doing the getpwent() + * calls sequence, records from different nsswitch sources can be different, + * though having the same pw_name/pw_uid */ +static int +passwd_check_ambiguity(struct passwd_test_data *td, struct passwd *pwd) +{ + + return (TEST_DATA_FIND(passwd, td, pwd, compare_passwd, + NULL) != NULL ? 0 : -1); +} + +static int +passwd_test_getpwnam(struct passwd *pwd_model, void *mdata) +{ + struct passwd *pwd; + + if (debug) { + printf("testing getpwnam() with the following data:\n"); + dump_passwd(pwd_model); + } + + pwd = getpwnam(pwd_model->pw_name); + if (passwd_test_correctness(pwd, NULL) != 0) + goto errfin; + + if ((compare_passwd(pwd, pwd_model, NULL) != 0) && + (passwd_check_ambiguity((struct passwd_test_data *)mdata, pwd) + !=0)) + goto errfin; + + if (debug) + printf("ok\n"); + return (0); + +errfin: + if (debug) + printf("not ok\n"); + + return (-1); +} + +static int +passwd_test_getpwuid(struct passwd *pwd_model, void *mdata) +{ + struct passwd *pwd; + + if (debug) { + printf("testing getpwuid() with the following data...\n"); + dump_passwd(pwd_model); + } + + pwd = getpwuid(pwd_model->pw_uid); + if ((passwd_test_correctness(pwd, NULL) != 0) || + ((compare_passwd(pwd, pwd_model, NULL) != 0) && + (passwd_check_ambiguity((struct passwd_test_data *)mdata, pwd) + != 0))) { + if (debug) + printf("not ok\n"); + return (-1); + } else { + if (debug) + printf("ok\n"); + return (0); + } +} + +static int +passwd_test_getpwent(struct passwd *pwd, void *mdata) +{ + /* Only correctness can be checked when doing 1-pass test for + * getpwent(). */ + return (passwd_test_correctness(pwd, NULL)); +} + +static void +usage(void) +{ + (void)fprintf(stderr, + "Usage: %s [-dnue2] [-s ]\n", + getprogname()); + exit(1); +} + +int +main(int argc, char **argv) +{ + struct passwd_test_data td, td_snap, td_2pass; + char *snapshot_file; + int rv; + int c; + + if (argc < 2) + usage(); + + snapshot_file = NULL; + while ((c = getopt(argc, argv, "nue2ds:")) != -1) + switch (c) { + case 'd': + debug++; + break; + case 'n': + method = TEST_GETPWNAM; + break; + case 'u': + method = TEST_GETPWUID; + break; + case 'e': + method = TEST_GETPWENT; + break; + case '2': + method = TEST_GETPWENT_2PASS; + break; + case 's': + snapshot_file = strdup(optarg); + break; + default: + usage(); + } + + TEST_DATA_INIT(passwd, &td, clone_passwd, free_passwd); + TEST_DATA_INIT(passwd, &td_snap, clone_passwd, free_passwd); + if (snapshot_file != NULL) { + if (access(snapshot_file, W_OK | R_OK) != 0) { + if (errno == ENOENT) + method = TEST_BUILD_SNAPSHOT; + else { + if (debug) + printf("can't access the file %s\n", + snapshot_file); + + rv = -1; + goto fin; + } + } else { + if (method == TEST_BUILD_SNAPSHOT) { + rv = 0; + goto fin; + } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jul 1 16:51:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0498416A5F0; Sat, 1 Jul 2006 16:51:24 +0000 (UTC) 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 BD64516A5B7 for ; Sat, 1 Jul 2006 16:51:23 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F62843D8A for ; Sat, 1 Jul 2006 16:51:23 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61GpNTA006164 for ; Sat, 1 Jul 2006 16:51:23 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61GpNNJ006161 for perforce@freebsd.org; Sat, 1 Jul 2006 16:51:23 GMT (envelope-from als@FreeBSD.org) Date: Sat, 1 Jul 2006 16:51:23 GMT Message-Id: <200607011651.k61GpNNJ006161@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100401 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 16:51:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=100401 Change 100401 by als@als_head on 2006/07/01 16:50:26 move JMODULE_COUNT into jail. it`s make unneed include jail2_init.h. Affected files ... .. //depot/projects/jail2/sys/sys/jail.h#4 edit .. //depot/projects/jail2/sys/sys/jail2_init.h#2 edit Differences ... ==== //depot/projects/jail2/sys/sys/jail.h#4 (text+ko) ==== @@ -47,6 +47,8 @@ #define JAIL_MAX 999999 #define JAIL_MIN 1 +#define JMODULE_COUNT 3 + #ifdef MALLOC_DECLARE MALLOC_DECLARE(M_PRISON); #endif @@ -56,7 +58,6 @@ #include #include -#include #include #include #include @@ -97,7 +98,7 @@ /* (c) per jail uid info */ LIST_HEAD(uihashhead, uidinfo) *uihashtbl; /* (i) also protected with uihash mutex */ u_long uihash; /* (c) size of hash table - 1 */ - void *mod_data[JMODULE_COUNT] /* (i) modules private data */ + void *mod_data[JMODULE_COUNT]; /* (i) modules private data */ }; #endif /* _KERNEL || _WANT_PRISON */ ==== //depot/projects/jail2/sys/sys/jail2_init.h#2 (text+ko) ==== @@ -3,14 +3,12 @@ #define _JAIL2_INIT_H_ enum jail_modules_id { - JMODULE_NODATA = -1; - JMODULE_SYSVMSQ = 0; - JMODULE_SYSVSEM = 1; - JMODULE_SYSVSHM = 2; + JMODULE_NODATA = -1, + JMODULE_SYSVMSQ = 0, + JMODULE_SYSVSEM = 1, + JMODULE_SYSVSHM = 2 }; -#define JMODULE_COUNT 3 - #ifdef _KERNEL #include From owner-p4-projects@FreeBSD.ORG Sat Jul 1 16:53:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4737A16A4A0; Sat, 1 Jul 2006 16:53:44 +0000 (UTC) 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 1752216A417 for ; Sat, 1 Jul 2006 16:53:44 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 989554423E for ; Sat, 1 Jul 2006 15:31:41 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61FVfHC093103 for ; Sat, 1 Jul 2006 15:31:41 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61FVfLs093100 for perforce@freebsd.org; Sat, 1 Jul 2006 15:31:41 GMT (envelope-from bushman@freebsd.org) Date: Sat, 1 Jul 2006 15:31:41 GMT Message-Id: <200607011531.k61FVfLs093100@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 100399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 16:53:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=100399 Change 100399 by bushman@bushman_nss_ldap_cached on 2006/07/01 15:31:13 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/include/malloc_np.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/malloc.c#3 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/include/malloc_np.h#2 (text) ==== @@ -26,12 +26,16 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/include/malloc_np.h,v 1.1 2006/03/28 22:16:03 jasone Exp $ + * $FreeBSD: src/include/malloc_np.h,v 1.2 2006/06/30 20:57:41 jasone Exp $ */ #ifndef _MALLOC_NP_H_ #define _MALLOC_NP_H_ +#include +#include +__BEGIN_DECLS size_t malloc_usable_size(const void *ptr); +__END_DECLS #endif /* _MALLOC_NP_H_ */ ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/malloc.c#3 (text+ko) ==== @@ -185,7 +185,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.127 2006/06/20 20:38:25 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.128 2006/06/30 20:54:15 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -659,9 +659,6 @@ * Data. */ -/* Used as a special "nil" return value for malloc(0). */ -static const int nil; - /* Number of CPUs. */ static unsigned ncpus; @@ -1642,6 +1639,7 @@ #undef POW2_CASE #undef QUANTUM_CASE assert(regind < bin->nregs); + assert(regind * size == diff); elm = regind >> (SIZEOF_INT_2POW + 3); if (elm < run->regs_minelm) @@ -2239,7 +2237,6 @@ arena_chunk_map_t mapelm; assert(ptr != NULL); - assert(ptr != &nil); assert(CHUNK_ADDR2BASE(ptr) != ptr); /* @@ -2320,7 +2317,6 @@ assert(arena->magic == ARENA_MAGIC); assert(chunk->arena == arena); assert(ptr != NULL); - assert(ptr != &nil); assert(CHUNK_ADDR2BASE(ptr) != ptr); pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> pagesize_2pow); @@ -2353,6 +2349,7 @@ /* Medium allocation. */ size = mapelm.npages << pagesize_2pow; + assert((((uintptr_t)ptr) & (size - 1)) == 0); if (opt_junk) memset(ptr, 0x5a, size); @@ -2815,7 +2812,6 @@ arena_chunk_t *chunk; assert(ptr != NULL); - assert(ptr != &nil); chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr); if (chunk != ptr) { @@ -2850,7 +2846,6 @@ size_t oldsize; assert(ptr != NULL); - assert(ptr != &nil); assert(size != 0); oldsize = isalloc(ptr); @@ -2869,7 +2864,6 @@ arena_chunk_t *chunk; assert(ptr != NULL); - assert(ptr != &nil); chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr); if (chunk != ptr) { @@ -3404,10 +3398,11 @@ if (size == 0) { if (opt_sysv == false) - ret = (void *)&nil; - else + size = 1; + else { ret = NULL; - goto RETURN; + goto RETURN; + } } ret = imalloc(size); @@ -3486,10 +3481,11 @@ num_size = num * size; if (num_size == 0) { if (opt_sysv == false) - ret = (void *)&nil; - else + num_size = 1; + else { ret = NULL; - goto RETURN; + goto RETURN; + } /* * Try to avoid division here. We know that it isn't possible to * overflow during multiplication if neither operand uses any of the @@ -3524,44 +3520,49 @@ { void *ret; - if (size != 0) { - if (ptr != &nil && ptr != NULL) { - assert(malloc_initialized); + if (size == 0) { + if (opt_sysv == false) + size = 1; + else { + if (ptr != NULL) + idalloc(ptr); + ret = NULL; + goto RETURN; + } + } - ret = iralloc(ptr, size); + if (ptr != NULL) { + assert(malloc_initialized); - if (ret == NULL) { - if (opt_xmalloc) { - malloc_printf("%s: (malloc) Error in" - " ralloc(%p, %zu): out of memory\n", - _getprogname(), ptr, size); - abort(); - } - errno = ENOMEM; - } - } else { - if (malloc_init()) - ret = NULL; - else - ret = imalloc(size); + ret = iralloc(ptr, size); - if (ret == NULL) { - if (opt_xmalloc) { - malloc_printf("%s: (malloc) Error in" - " ralloc(%p, %zu): out of memory\n", - _getprogname(), ptr, size); - abort(); - } - errno = ENOMEM; + if (ret == NULL) { + if (opt_xmalloc) { + malloc_printf("%s: (malloc) Error in" + " realloc(%p, %zu): out of memory\n", + _getprogname(), ptr, size); + abort(); } + errno = ENOMEM; } } else { - if (ptr != &nil && ptr != NULL) - idalloc(ptr); + if (malloc_init()) + ret = NULL; + else + ret = imalloc(size); - ret = (void *)&nil; + if (ret == NULL) { + if (opt_xmalloc) { + malloc_printf("%s: (malloc) Error in" + " realloc(%p, %zu): out of memory\n", + _getprogname(), ptr, size); + abort(); + } + errno = ENOMEM; + } } +RETURN: UTRACE(ptr, size, ret); return (ret); } @@ -3571,7 +3572,7 @@ { UTRACE(ptr, 0, 0); - if (ptr != &nil && ptr != NULL) { + if (ptr != NULL) { assert(malloc_initialized); idalloc(ptr); @@ -3592,10 +3593,7 @@ assert(ptr != NULL); - if (ptr == &nil) - return (0); - else - return (isalloc(ptr)); + return (isalloc(ptr)); } /* From owner-p4-projects@FreeBSD.ORG Sat Jul 1 21:04:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4ADCE16A47E; Sat, 1 Jul 2006 21:04:04 +0000 (UTC) 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 CB89C16A6AA for ; Sat, 1 Jul 2006 21:04:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63B644530D for ; Sat, 1 Jul 2006 20:35:11 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61KZ6N5020331 for ; Sat, 1 Jul 2006 20:35:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61KZ5r7020328 for perforce@freebsd.org; Sat, 1 Jul 2006 20:35:05 GMT (envelope-from jb@freebsd.org) Date: Sat, 1 Jul 2006 20:35:05 GMT Message-Id: <200607012035.k61KZ5r7020328@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100408 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 21:04:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=100408 Change 100408 by jb@jb_freebsd2 on 2006/07/01 20:35:00 IFsun4v_stable Affected files ... .. //depot/projects/dtrace/src/sys/boot/sun4v/Makefile#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/Makefile.inc#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/boot1/Makefile#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/boot1/_start.s#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/boot1/boot1#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/boot1/boot1.c#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/Makefile#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/hcall.S#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/help.sparc64#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/locore.S#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/main.c#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/metadata.c#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/version#1 branch .. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#3 integrate Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#3 (text+ko) ==== @@ -432,7 +432,7 @@ vm_size_t physsz, virtsz, kernel_hash_size; ihandle_t pmem, vmem; int i, sz, j; - uint64_t tsb_8k_size, tsb_4m_size, error; + uint64_t tsb_8k_size, tsb_4m_size, error, physmem_tunable; /* * Find out what physical memory is available from the prom and @@ -456,20 +456,22 @@ qsort(mra, sz, sizeof (*mra), mr_cmp); physsz = 0; - getenv_quad("hw.physmem", &physmem); - physmem = ctob(physmem); + + if (TUNABLE_ULONG_FETCH("hw.physmem", &physmem_tunable)) + physmem = atop(physmem_tunable); + printf("desired physmem=0x%lx\n", physmem_tunable); for (i = 0, j = 0; i < sz; i++, j += 2) { CTR2(KTR_PMAP, "start=%#lx size=%#lx\n", mra[i].mr_start, mra[i].mr_size); KDPRINTF("start=%#lx size=%#lx\n", mra[i].mr_start, mra[i].mr_size); - if (physmem != 0 && btoc(physsz + mra[i].mr_size) >= physmem) { - if (btoc(physsz) < physmem) { + if (physmem_tunable != 0 && (physsz + mra[i].mr_size) >= physmem_tunable) { + if (physsz < physmem_tunable) { phys_avail[j] = mra[i].mr_start; phys_avail[j + 1] = mra[i].mr_start + - (ctob(physmem) - physsz); - physsz = ctob(physmem); + (physmem_tunable - physsz); + physsz = physmem_tunable; } break; } @@ -611,7 +613,7 @@ * currently (not by design) used for permanent mappings */ - tsb_4m_size = virtsz >> (PAGE_SHIFT_4M - TTE_SHIFT); + tsb_4m_size = (virtsz >> (PAGE_SHIFT_4M - TTE_SHIFT)); pa = pmap_bootstrap_alloc(tsb_4m_size); KDPRINTF("tsb_4m_pa is 0x%lx tsb_4m_size is 0x%lx\n", pa, tsb_4m_size); @@ -692,12 +694,17 @@ * */ pa = PAGE_SIZE_4M; - for (i = 0; phys_avail[i + 2] != 0; i += 2) - for (; pa < phys_avail[i + 1]; pa += PAGE_SIZE_4M) { - tsb_set_tte_real(&kernel_td[TSB4M_INDEX], TLB_PHYS_TO_DIRECT(pa), - pa | TTE_KERNEL | VTD_4M, 0); - } + for (i = 0; phys_avail[i] != 0; i += 2) + for (; pa < phys_avail[i + 1]; pa += PAGE_SIZE_4M) + tsb_set_tte_real(&kernel_td[TSB4M_INDEX], TLB_PHYS_TO_DIRECT(pa), + pa | TTE_KERNEL | VTD_4M, 0); + + for (i = 0; i < 2; i++) { + pa = nucleus_mappings[i]; + tsb_set_tte_real(&kernel_td[TSB4M_INDEX], TLB_PHYS_TO_DIRECT(pa), + pa | TTE_KERNEL | VTD_4M, 0); + } /* * Get the available physical memory ranges from /memory/reg. These * are only used for kernel dumps, but it may not be wise to do prom @@ -749,6 +756,9 @@ pa = TTE_GET_PA(translations[i].om_tte) + off; tte_hash_insert(pm->pm_hash, va, pa | TTE_KERNEL | VTD_8K); } + KDPRINTF("set om_size=%ld om_start=%lx om_tte=%lx\n", + translations[i].om_size, translations[i].om_start, + translations[i].om_tte); } for (i = 0; i < KSTACK_PAGES; i++) { pa = kstack0_phys + i * PAGE_SIZE; @@ -765,6 +775,11 @@ tte_hash_insert(pm->pm_hash, TLB_PHYS_TO_DIRECT(pa), pa | TTE_KERNEL | VTD_4M); #endif + /* XXX relies on the fact that memory ranges only get smaller */ + for (i = 0; phys_avail[i + 2] != 0; i += 2) + if (phys_avail[i + 1] - phys_avail[i] < PAGE_SIZE_4M) + phys_avail[i] = phys_avail[i+1] = 0; + } From owner-p4-projects@FreeBSD.ORG Sat Jul 1 21:08:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8F5E16A494; Sat, 1 Jul 2006 21:08:48 +0000 (UTC) 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 8B36016A47C for ; Sat, 1 Jul 2006 21:08:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E6C543D5F for ; Sat, 1 Jul 2006 21:08:48 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61L8m0I030683 for ; Sat, 1 Jul 2006 21:08:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61L8msX030680 for perforce@freebsd.org; Sat, 1 Jul 2006 21:08:48 GMT (envelope-from jb@freebsd.org) Date: Sat, 1 Jul 2006 21:08:48 GMT Message-Id: <200607012108.k61L8msX030680@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100409 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 21:08:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=100409 Change 100409 by jb@jb_freebsd2 on 2006/07/01 21:08:18 Suck the OpenSolaris machine dependent elf header for Sparc. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/sparc/sys/machelf.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jul 1 22:27:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 204E716A537; Sat, 1 Jul 2006 22:27:29 +0000 (UTC) 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 D7B2E16A4DE for ; Sat, 1 Jul 2006 22:27:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E7B545274 for ; Sat, 1 Jul 2006 21:31:16 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61LVGYB031618 for ; Sat, 1 Jul 2006 21:31:16 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61LVFdT031615 for perforce@freebsd.org; Sat, 1 Jul 2006 21:31:15 GMT (envelope-from jb@freebsd.org) Date: Sat, 1 Jul 2006 21:31:15 GMT Message-Id: <200607012131.k61LVFdT031615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100410 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 22:27:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=100410 Change 100410 by jb@jb_freebsd2 on 2006/07/01 21:30:43 IFsun4v_stable Affected files ... .. //depot/projects/dtrace/src/lib/libkvm/kvm_sparc64.c#2 integrate Differences ... ==== //depot/projects/dtrace/src/lib/libkvm/kvm_sparc64.c#2 (text+ko) ==== @@ -194,7 +194,9 @@ _kvm_kvatop(kvm_t *kd, u_long va, off_t *pa) { struct vmstate *vm; +#if TARGET != sun4v struct tte tte; +#endif off_t tte_off, pa_off; u_long pg_off, vpn; int rest; @@ -202,6 +204,7 @@ pg_off = va & PAGE_MASK; if (va >= VM_MIN_DIRECT_ADDRESS) pa_off = TLB_DIRECT_TO_PHYS(va) & ~PAGE_MASK; +#if TARGET != sun4v else { vpn = btop(va); tte_off = kd->vmst->vm_tsb_off + @@ -212,6 +215,7 @@ goto invalid; pa_off = TTE_GET_PA(&tte); } +#endif rest = PAGE_SIZE - pg_off; pa_off = _kvm_find_off(kd->vmst, pa_off, rest); if (pa_off == KVM_OFF_NOTFOUND) From owner-p4-projects@FreeBSD.ORG Sat Jul 1 23:08:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FB0A16A407; Sat, 1 Jul 2006 23:08:19 +0000 (UTC) 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 C6E4816A403 for ; Sat, 1 Jul 2006 23:08:18 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8481F4571F for ; Sat, 1 Jul 2006 23:08:18 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61N8IHU038712 for ; Sat, 1 Jul 2006 23:08:18 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61N8Ibt038709 for perforce@freebsd.org; Sat, 1 Jul 2006 23:08:18 GMT (envelope-from jb@freebsd.org) Date: Sat, 1 Jul 2006 23:08:18 GMT Message-Id: <200607012308.k61N8Ibt038709@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100412 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 23:08:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=100412 Change 100412 by jb@jb_freebsd2 on 2006/07/01 23:07:27 Enable DTrace by default on sparc64 Affected files ... .. //depot/projects/dtrace/src/share/mk/bsd.dtrace.mk#2 edit Differences ... ==== //depot/projects/dtrace/src/share/mk/bsd.dtrace.mk#2 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD$ -.if ${MACHINE_ARCH} != "i386" +.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "sparc64" NO_CTF= 1 NO_CDDL= 1 NO_DTRACE= 1 From owner-p4-projects@FreeBSD.ORG Sat Jul 1 23:09:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E108E16A47B; Sat, 1 Jul 2006 23:09:20 +0000 (UTC) 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 BFEBA16A415 for ; Sat, 1 Jul 2006 23:09:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AFD145722 for ; Sat, 1 Jul 2006 23:09:20 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61N9KY2038753 for ; Sat, 1 Jul 2006 23:09:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61N9Jp0038750 for perforce@freebsd.org; Sat, 1 Jul 2006 23:09:19 GMT (envelope-from jb@freebsd.org) Date: Sat, 1 Jul 2006 23:09:19 GMT Message-Id: <200607012309.k61N9Jp0038750@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100413 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jul 2006 23:09:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=100413 Change 100413 by jb@jb_freebsd2 on 2006/07/01 23:09:15 Use OpenSolaris uts/sparc headers for the sparc64 architecture Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libelf/Makefile#3 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/libelf/Makefile#3 (text+ko) ==== @@ -55,6 +55,8 @@ .if ${MACHINE_ARCH} == "i386" CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel +.elif ${MACHINE_ARCH} == "sparc64" +CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc .endif # Check if the build object tree contains sgsmsg